From 6d932846f63dbbc3e4bf000049b11e589e324cc7 Mon Sep 17 00:00:00 2001
From: OmegaRuan <ruanpablo9k@gmail.com>
Date: Mon, 20 Aug 2018 15:58:13 -0300
Subject: [PATCH] Updating a few trainers + catch star

---
 .../trainer/ceruleancave/Proton.trainer       | Bin 826 -> 4802 bytes
 .../trainer/ceruleancave/promew2.trainer      | Bin 856 -> 1480 bytes
 .../trainer/chrono/grunts/Proton.trainer      | Bin 888 -> 2746 bytes
 .../Scripts/trainer/floe/lorelei1.trainer     | Bin 5832 -> 5830 bytes
 .../Scripts/trainer/floe/lorelei2.trainer     | Bin 5806 -> 5808 bytes
 .../Data/Scripts/trainer/ilex/001.trainer     |   6 +++---
 .../Scripts/trainer/tohjo/Giovanni.trainer    | Bin 912 -> 4920 bytes
 P3D/Content/Textures/Battle/Other/Star.png    | Bin 0 -> 303 bytes
 P3D/Screens/Battle/BattleCatchScreen.vb       |   2 +-
 9 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 P3D/Content/Textures/Battle/Other/Star.png

diff --git a/P3D/Content/Data/Scripts/trainer/ceruleancave/Proton.trainer b/P3D/Content/Data/Scripts/trainer/ceruleancave/Proton.trainer
index 694b5525d3311e6de161eac74dd17e9fb76bb4c0..543b32e17475200b2ae90e6692355cc10841eb92 100644
GIT binary patch
literal 4802
zcmeI0Z*S8u5XSE{65j#sb%oX>UE7!I%Al~ZX{&fsp{kTH3jG6H#z2&>4m{5}j?*-0
z6IGLthN7gk?|gSY|LoZL^LrqDxsXHY$!mFre^2CC&hUGRy1u-X$MOi0k<28NrJT#P
zEF{7`S4kh`kxWnu@$X2cDBa*%!ootv@)`9JY<5s$J*}N;>rj3`t1kP}kN{6gdax6z
zhf}np{z$IWFQsR4TOfS_i+A!=FKTwt<^%2#^z$tBA^Q&5EqsOW+Rf?N1teGK8GE{v
zSFpv{78)n}djr{(d_>(0c32ui?-Mjww~(Rs!)9OzYjbEUpi4W<mhJHbF**w`3oX#A
z$<BHoU3+S{5gE#R__DcRyN+fh!bpWHev2Y!n{&j(k(}Xojxk%xPua`V?#Td>18IYq
zUn+l&7IXD~4ebHO*h+euftl83>$)1>Xhn7cOW$x$wYC9bY^yUcYHaVrJ})adly?}D
zDeefQQO8fkMxyQbo5=m7<&nz97{?RzcdRAD0W~jC$GLC^IY%+fX}3Bn*eX45Y=q7a
z$7CA!&dae!h9me}Ae*#iEgZxD1Ttp%2J(q~QMrc<xg1R(yHx2s&O|y(5iE~%rq<&u
zv29Ifrg>U#htRaTp6UiVb8F%u@8+4O>&Lovi~ubf>n^^u-5`#E9Oc>V$s6>BIq+er
zw(-eW*6H;&(96}x_Tc{L4H6$!==CtSY;0M2T`nC{50PEwh*WH5%&=RR7Oria8+N@E
z;l-RAc3TPGCJsAhyOZk|lH1fCTTk~#ZZjdU3b`DOdeSn>ZhFo=Y<js1+P*^Cm3JSk
zm!r2)!m44nff<o+b$5D$LVA6~=hn9Squ2SULN8YoJG0i={l9ClyN0%|rki&HhFuT4
z25;*sZC2iv?gO|+7}o7btnV4PyJ$koS6x1>?(Xb13fT?d)9u*GvD-jw?u~8t!e#co
zt)x#?2yUlxktNt!eAsJm8O{v7T&+m&X3`D4Br=G}-NvsECi3^)yYqWc$S>c`Zl;vu
z*Uc-QV`n%$^DMRL#MVsts6uX#dM{+j{de{a?)~8AP}LKg8-r@6HD)27n)C{3$ZeNk
z(QsSGJ8wJV_N>;{J;UmJ;JM4LZ2TI;a+<Cs;$|JcJDIOQ*)KqsVCyTsi<s{w{Pxtr
M37O?u@{bn&0;fhBhX4Qo

delta 150
zcmX@4x{GZ>l&lj&K0`4O@-lES_yXB^45<v23^fd93<eAa8{0QBavK8KmJB)!rVM72
z6`6$jjexR-KxhCKGY5+q1I5gNVy0j*OR$&;P|O4<Y6KRu0E?M|^_qh9nll)H#F)((
QY9@yZ=`)&4?i8{F00fR1#sB~S

diff --git a/P3D/Content/Data/Scripts/trainer/ceruleancave/promew2.trainer b/P3D/Content/Data/Scripts/trainer/ceruleancave/promew2.trainer
index 961cb5910fb0069eaf48113495d402a22ffd205e..872f4eb461f54eab46fdb5d704625b3d9276ab52 100644
GIT binary patch
literal 1480
zcmah}U2oGs5S(Wu{zK?<9^!no^a&*mMS+G?jbBhyMJBkx;MmYOP=x7EFU)N0oYOi&
z)}3!>cjtEZ_U`Y)3_h;V#|ZE7nyUuRG2wqq%*QpJ;~6ypRtS;f61PZ^aU`bkDF=us
zg<PE>rnKgllOe?dUx{br98eN2wy}AK_(iJ|w9!G!@DW)u;~&#Y)&Z8btGp)I9MFCs
z--dn-ddNQ{&yuUpL>A;o_z&^J@O$DZz7df=;M|~m!#UuHX`>wze8MZdu&9QVZ#ZOI
z7ne`n9d(KzWEF=sRl1^P$ttO8Io?@JibHv+c5BW{#*?wi8<Q5a`$7w0Ddtv{vYK<U
zCCp4&t759Wm{h-rF*=5~2N|^Mw$}38&(ZnI!kzA%RdKbD-@vMpS>3Ap9*SH(myAhW
zvEo00$2@=I=n;B^88toj#Wntz{*C3V{cmYKt7t}6ft8`9b%_lvzF<#xK@RmoZ0Jda
zX~KTra<_=;EBX5P$jZhX8M{_CT^#SUx*g^DZzFe}XQo^5950x!x-lb*GMD9)E8VM~
z)GM=a$Lak1y)%$k^$wO1I(wZ-Tx93f@TrH@`zcRTY$d}v_lc-e@2{zkcuS;rxkSXL
zrb&t_I9;Ed8FyBXdgkZRvxg?7Rxy`5Rc+g5d&+wL&$3gndVDdO9Aed6$J#a94o-PW
zk8Pj!V4FSo6z$Za-CDF)iyjwf*^PP?wNJH|b7mk+?{AKmh2&nsDNp1(Z}j%Y>jfV0
LY$Z2$EBXHeefa?g

delta 62
zcmX@XeS>X6l&lj&K0`4O@-lES_yXB^45<v23^fcU3<eAa8(aS~avL(30@*qY<_rdt
OKeEhaG@9JcY6$?!R}P^7

diff --git a/P3D/Content/Data/Scripts/trainer/chrono/grunts/Proton.trainer b/P3D/Content/Data/Scripts/trainer/chrono/grunts/Proton.trainer
index d6aa9ddde76ce535b2e87b8c362a2a8eb82cdd3f..025899f332158163060124c87ba726fe49ccd817 100644
GIT binary patch
literal 2746
zcmd^BO>fgc5S=p;{~`3;L+m7_9FvBkpoUb9FDOEh2__g42O5V`5%}rAd$V4zW5=XD
z^i-{E@6N~D*_pTN{rhJkfm}&f2J%K;qSugf8R0vGERc8dRGvT+%2FcP%B5V(N>V(D
zY66Tyi7|@MJCg-QYqTv8Rx*<>kf*@xVMIC6hUy*3Ev(w&OB0Rq0Z>xKAHs{)q0Dtw
zYDcoE(Y^)V26Ke)jqqhOAJB{NZUDt#CctXQdqw$;xsA^ZUI`l4WNcUR6+N!Dq4FDf
zrqT5w`G_Zk<-Yg==zc)A(I^Je-;=E?*vt_hv$vJk_<n-NO7R)>8oIg4mcZd?2D{I>
z-Bhz<vpNM@0t>E$nPUZP9%IDl5Zp{<1kP&mL(kncI)7TYDo-`LHW&2kX;xBHKiZkM
zE^_)@B5tx{iEknv*7;M8O41{lKyxB5z{6jvf2C_?b+2JP0duTopcz=Iv@GjueBqAn
z0vO-%EL7T&R*p0R?+rGY$!77o;7<&X7<1jKO{)+acZsdPiQHkHscweaUSPdsT?!Pg
zoR(ws$haHmxw0sq(fI{CHK12<FWLy5J!`VaR_E`*BZpJWw?Z|EW)aRYPYfOR&>H#}
z`+<62I%w7^hHk9dB+EoGODT{;-ThvcCHfwtmd)&Kak{Xyw!Yf7aVF4;=Yo0fvu$Oz
z9_mJ1gYM!h;<mFG$fGiDm5Kg;n8^5TG!Mr_SFQUn(Z@cqv6Y$V^5XdM7<tGXc?bDo
zc<9L~+9A#w9{L5g)^pbI@HFSD;Vo-cWnrt9h0m4kw$cyBLdTi=u#h{^tL0&F|2%Fc
z@{Buta@iBH3Etj~iTsb<?L6#&-Br{o6Wd^7RodArJ;|i@U(9<TeTyvJV&#<a#<@iV
b<-6Y)|DJESyO_HT@0>mS#W+6Bd-VSY{-o38

delta 110
zcmdlb`h#skl(Z8=K0`4O@-lES_yXB^45<v23^fcU3<evUIhnW(8O#_g8FUy-8H^|Y
vXA##mWH4kf0P~H&dIErYvVnSX!Fr8>I?aJ9Ou;HlC-ZX^GMY?o<gx?+w(k^S

diff --git a/P3D/Content/Data/Scripts/trainer/floe/lorelei1.trainer b/P3D/Content/Data/Scripts/trainer/floe/lorelei1.trainer
index dc3c0887f177e8e0983357f17e49dbc7739df116..a9135c2204e03d6ac05140ec94ed288bdc807142 100644
GIT binary patch
delta 37
rcmX@1drWsi3~vBKK0`LcONLw^oi{OCnc0ZJWaGrUqKsyf^Ti?o<PHm?

delta 39
tcmX@6dqQ_Y41W+qDnlMaK0`T>Ol3%!n5oQcz+kYk|E?&b$>dzINC4_|3w!_o

diff --git a/P3D/Content/Data/Scripts/trainer/floe/lorelei2.trainer b/P3D/Content/Data/Scripts/trainer/floe/lorelei2.trainer
index f5bbcde9585c95b83172d4e3511a418714bf3346..3fcb2c359e4172635787156ff90707751f7dcd86 100644
GIT binary patch
delta 47
zcmZ3dyFqtC3~vBKK0`LcONLw^oi{OCk=2sHkilr<#HFIlh72Z?O~vFHEhdMGMFIdx
CI1Ii3

delta 45
zcmdm>yH0mP41W+qDnlMaK0`T>Ol3%!n5oEW#$do;u(5xs=wu5qIYyJo;bM^hB8dz$

diff --git a/P3D/Content/Data/Scripts/trainer/ilex/001.trainer b/P3D/Content/Data/Scripts/trainer/ilex/001.trainer
index fa4f89087..65b5ec9b2 100644
--- a/P3D/Content/Data/Scripts/trainer/ilex/001.trainer
+++ b/P3D/Content/Data/Scripts/trainer/ilex/001.trainer
@@ -10,9 +10,9 @@ Region|Johto
 IniMusic|Johto_trainer_intro
 DefeatMusic|trainer_defeat
 BattleMusic|johto_trainer
-Pokemon1|470,55
-Pokemon2|471,55
-Pokemon3|700,55
+Pokemon1|{"Pokemon"[470]}{"Gender"[1]}{"Item"[]}{"ItemData"[]}{"Level"[55]}{"OT"[00000]}{"Ability"[34]}{"Nature"[3]}{"CatchLocation"[Somewhere]}{"CatchTrainer"[Akemi]}{"CatchBall"[5]}{"CatchMethod"[]}{"Friendship"[255]}{"isShiny"[0]}{"Attack1"[14,20,20]}{"Attack2"[348,15,15]}{"Attack3"[241,15,15]}{"Attack4"[216,20,20]}
+Pokemon2|{"Pokemon"[471]}{"Gender"[1]}{"Item"[]}{"ItemData"[]}{"Level"[55]}{"OT"[00000]}{"Ability"[81]}{"Nature"[10]}{"CatchLocation"[Somewhere]}{"CatchTrainer"[Akemi]}{"CatchBall"[5]}{"CatchMethod"[]}{"Friendship"[255]}{"isShiny"[0]}{"Attack1"[258,10,10]}{"Attack2"[243,20,20]}{"Attack3"[59,5,5]}{"Attack4"[247,15,15]}
+Pokemon3|{"Pokemon"[700]}{"Gender"[1]}{"Item"[2009]}{"ItemData"[]}{"Level"[55]}{"OT"[00000]}{"Ability"[182]}{"Nature"[15]}{"CatchLocation"[Somewhere]}{"CatchTrainer"[Akemi]}{"CatchBall"[5]}{"CatchMethod"[]}{"Friendship"[255]}{"isShiny"[0]}{"Attack1"[304,10,10]}{"Attack2"[473,10,10]}{"Attack3"[247,15,15]}{"Attack4"[113,30,30]}
 Pokemon4|
 Pokemon5|
 Pokemon6|
diff --git a/P3D/Content/Data/Scripts/trainer/tohjo/Giovanni.trainer b/P3D/Content/Data/Scripts/trainer/tohjo/Giovanni.trainer
index a45465d8aeefb5a236757222f92ff8f27949c1f5..d8765a640a1fe3a1a0a39091fa2fbe2a66321f32 100644
GIT binary patch
literal 4920
zcmeI0TaVH}6vxlAiQj?jGY_<s%RU)c+zn<|%tG{m7=nmU7m9M(bt8Ut_5VNZFi>tK
z$dja@%*?q==ge<Tr}O7`QyOwFC8^3=d5uy^uBC?mJG3?Aqr8+CkhEneU75>`_%f15
z)B{|;N*gjp-ABEP(v=KQo8X$m%Sbx%fc7c;mQiCnJ>H>A{by)7dgUdfk}BG#@H2u=
zSM}S{Luszkn#{IHKS&?_vL8N43Z*`*Qt|{(V?5Jml-nq=?HO$|d8HmJX!(L4Z8!DU
zfb0ikGqtTsWlI$9q1V&s1kiYc9{R8vX&-!|31mHO8^RZB9q4^s=(TjrCR#0c3!uU0
zWIPyI#*NYO@toF!?J4eoy@rvb<?1-CJvHp?wGby8589PAGE+pbyVCErC#TIjJU3^3
zi2neyJC~nw5o^7WrewtfVZT&*1N}gIA49hZ8jPf>;~#2kyse^7*Itp`!qX#u18pT&
z#;OLQL*E&+@-mW=d_r6Y_)S3vbsTXew~%uM7zRSAm0hW<gSoxMcsp9-Dhbq29VM=v
zC*_g+nLe%E>I$O&_&Qs+;k*o@F}fRkl4Y)e5n@V@#=|w{+lP#?o<Q!)H<fd=c1%8G
zb(IEDJeFfMh3B@eY)5T9DI!{F#4HotO>ZS=8eKQibujDubhE0P10mGRMfXi!y-2gT
z(PvfOV<a4Z7Jkw@@ASS-ue*a@XA#viz05YuQfGP}KpCS@TyPsQyo=t#M$V6?H@lTy
zzIE+-KOMg|HyxIJ9YoPYES`O>#OBcdHTN=aC(XTCFnI~mm{0B8FX!lxT<RsuyP?1J
zynj5o-d1uwkYV3Ory@6p7#RKzBbRS2V;LuRnd&pU9&*tBH+;BnNXo7&1<CJZJlrw3
zST&^F)jbREX3mahH@Ab`{K0$P)t#u>4JX<8+THbG1UrbJiAJ1Y%l4UHW}@Bs)UeA8
zy)WyM$o)Ixklxef-TYQ|m-E`GvThz3!H{<dvxS9KoL9b^jK?#v%(&cZu4ldFU4WrB
zlYmFFW4P3nkmOs9l>fW^uE~cyZ!%w&;VSa<Yi^m;IauHq9#6Zd%@Y9Dd8!hgl+^JJ
W^Bt!v;pq!coyz#eW<9+q(c&*zLN2xd

delta 123
zcmdm?Hi3OZ1{0?-g9(EUgBgRt<Ul52UL%GY24e<8gvjIv>@3`dKoL{0m=Q=7zX?#4
r2~eE@P|TFU0xV_<7BhpIW(YRT3@By_R0lHOaPnRudq$JV|Aj08PBRuE

diff --git a/P3D/Content/Textures/Battle/Other/Star.png b/P3D/Content/Textures/Battle/Other/Star.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0407cefeeddc299cb519dad9a01a07b98a8782c
GIT binary patch
literal 303
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI
z1_r*vAk26?e?<yVkiEpy*OmPdhX|{<^(g_9N}$jlPZ!6Kh{JEEZWKJMz~gEk!{xT%
z3y0*vRJVm+G^WV4UQ(`LnclOYZ;Rr_T9$`5c3ys6^J2~V_2(HmniT#RKgm_f7k(~p
zKCNkYBL70m%ZIHFSQW%v@LiT}vGDx4iCUX})jGYt*8O-!{dpE+m!m=xI&Wm{QCqU0
za$|$fiR2slT>DlOPGw+Nu+qC)+u-k_KHi5urRnW=nk?$r)_>K#appkx-J4PS&N$3v
uKA67S?C&ChKm2m@S9<Gau{a9o9Ti@E!ZoV@aC;=s9}J$ZelF{r5}E)q9eC;h

literal 0
HcmV?d00001

diff --git a/P3D/Screens/Battle/BattleCatchScreen.vb b/P3D/Screens/Battle/BattleCatchScreen.vb
index c1e2c6d72..b7e4bf3ba 100644
--- a/P3D/Screens/Battle/BattleCatchScreen.vb
+++ b/P3D/Screens/Battle/BattleCatchScreen.vb
@@ -286,7 +286,7 @@
                 For i = 0 To 2
                     Dim v As Vector3 = New Vector3(BattleScreen.OppPokemonNPC.Position.X - 0.05F, -0.35F, BattleScreen.OppPokemonNPC.Position.Z)
 
-                    Animations.Add(New BAMove(v, TextureManager.GetTexture("Textures\Battle\Other\YellowCloud"), New Vector3(0.1F), New Vector3(v.X, v.Y + 0.4F, v.Z - ((1 - i) * 0.4F)), 0.01F, 0.0F, 0.0F))
+                    Animations.Add(New BAMove(v, TextureManager.GetTexture("Textures\Battle\Other\Star"), New Vector3(0.1F), New Vector3(v.X, v.Y + 0.4F, v.Z - ((1 - i) * 0.4F)), 0.01F, 0.0F, 0.0F))
                 Next
                 Animations.Add(New BAMove(New Vector3(BattleScreen.OppPokemonNPC.Position.X - 0.05F, -0.35F, BattleScreen.OppPokemonNPC.Position.Z), Ball.Texture, New Vector3(0.3F), New Vector3(BattleScreen.OppPokemonNPC.Position.X - 0.05F, -0.35F, BattleScreen.OppPokemonNPC.Position.Z), 0.02F, 0.0F, 6.0F))
             Case 8