From e1ef269623a859fca363609d4453ef75a275c314 Mon Sep 17 00:00:00 2001
From: CaptainSegis <F20121237@outlook.com>
Date: Sat, 6 Jan 2018 02:50:23 -0500
Subject: [PATCH] Modified oak script to fit the Kanto starters part, and the
 Mega Bracelet part.

---
 2.5DHero/2.5DHero/2.5DHero.vbproj             |   9 +++++++++
 .../2.5DHero/Scripts/pallet/bulbasaur.dat     | Bin 0 -> 3432 bytes
 .../2.5DHero/Scripts/pallet/charmander.dat    | Bin 0 -> 3624 bytes
 2.5DHero/2.5DHero/Scripts/pallet/oak.dat      | Bin 2606 -> 3720 bytes
 2.5DHero/2.5DHero/Scripts/pallet/squirtle.dat | Bin 0 -> 3426 bytes
 .../V2/ScriptCommands/DoPokemon.vb            |  11 ++++++++++-
 2.5DHero/2.5DHero/maps/pallet/oaklab.dat      | Bin 27372 -> 27366 bytes
 7 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 2.5DHero/2.5DHero/Scripts/pallet/bulbasaur.dat
 create mode 100644 2.5DHero/2.5DHero/Scripts/pallet/charmander.dat
 create mode 100644 2.5DHero/2.5DHero/Scripts/pallet/squirtle.dat

diff --git a/2.5DHero/2.5DHero/2.5DHero.vbproj b/2.5DHero/2.5DHero/2.5DHero.vbproj
index 4dca48d3d..85dbecf80 100644
--- a/2.5DHero/2.5DHero/2.5DHero.vbproj
+++ b/2.5DHero/2.5DHero/2.5DHero.vbproj
@@ -1664,6 +1664,12 @@
     <None Include="Scripts\olivine\voltorb_trade.dat">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Scripts\pallet\bulbasaur.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Scripts\pallet\charmander.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Scripts\pallet\daisy.dat">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -1679,6 +1685,9 @@
     <None Include="Scripts\pallet\oak.dat">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Scripts\pallet\squirtle.dat">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Scripts\pewter\fossilscientist.dat">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/2.5DHero/2.5DHero/Scripts/pallet/bulbasaur.dat b/2.5DHero/2.5DHero/Scripts/pallet/bulbasaur.dat
new file mode 100644
index 0000000000000000000000000000000000000000..2d185a4bedd60e39d1a65a0ff49156662d073dd7
GIT binary patch
literal 3432
zcmbuBUvCpf6vgjrD)Akbry3NQQb<7&6iS7vJdmK&66)jHyN+obJGIxCNRhuUUxN1h
z=I(TMy$d{`DE4~x&i!}JJv0A){$Qo8Y;EstX$yO9KieJq!H)HNs?TS7SK5Vst*r`{
z!_G=+g$?Y|a_z6=1<PDkmHlM*>{t1$^lPKtnfzf@XqD&h@%^y&J(b6~VwNHA1AD3G
zN$^}M(onx<%4uuY`n;6YRj6}d5A9I-9qRku|2s!||54edT?0Fl|4Vfuvp==-P~SKD
z-spQ9YN_-@)tS1)=T^O{6mu6osre6OlPiz4p5Mym(mvH$WcEs)<~9!Rb3L!@MI)ax
zWnI<CtXo<ArA*h#=2ZS-{s+o(tH{)SY;FOT2jMRv+U~?qID<o}Saanu(bIc*xYjcm
z-UI|kdIrJdk4~Sep5K)h`{^rOqO&O@Vz=#@TpENZbHyzc>47}ZYqA*2YoYJTZsqT`
z6@iug2<P(9^xS1B3{A|0^Ib1}_>a_4*q<raCWEqimD*w8T%F47A9V@*OW_X=#JSKX
zC{FBdC-1h;p*$5~nqcRV{(lRRb9tt^sr+OCuci78n^wwcs$OL^Pkk4C<E`gK^vp)G
z+$tky{j(bFn~>p9>$yCZ!Ws{c>~Sa4wf1jhS16h@<wjVqwKfTyf#1z(a@M_6-0n<$
zIeHe5b`HX(LVfJc$hZ3lDzT<PU=-LlS<`0n+h7yBF;Z14?eF7q+wzUN;;etv@(%0U
zmdWS0ER)a3&~~nU9X$~XGGXZYGgsfbT9XU6YxRY>2CH4IWUC(AiL4e{N0}=9F`+OX
zZM<*q!qco?AubGaUBnxwNueE0wR9au?Z9*#{4wY5*%j1hX`+ckQ&F-^SvY@OWnr*q
zFsq}&+ssZv)Lc2BT^CZ(ObX~a%@nxjLhpCdfkl`F@@8&57BhZVwGF@WxBJSwVU2$q
zD_F?vqoe6mVbYkFJZQsMY~u`oZMT}fTb)Zodm5Cl$=HKE_3h)qJNYCUm7rYck0XbI
zf$6gDEI1`ip?`D~F7LFC6-u+z{)lX>&?g&)yV6}LTRiz39N825r85i3vR(WBzOI6_
z``K5s*V*NJJg5Iwf0_P1ZQ<;5EhR5{uoM=B?0uT3X(jC7G_x~Nov>!7PfkZPnKKjb
z%#5F9Oy3(>UucDU1MG&!?b(S8PnNIb(@$VO5uMjDe{gYxA|j3`(Yn4;)U~qZy-z6_
z?cYMK^o|;1^=WQb+PiPf4aeuEe~PJqGqbGOL`2THtyWg*7i>pamilvC`a8F?*YW@!
z8|Cl!(=?%UlykyW$=M5PNkce2{4MKKdEi6<J2JyB=wjnMzY2QAc?y<j2RaFAK80;2
zp6d<lr2^{ezj1W$#8K1Zt*lfY>Gm2=O?>X(M5CS+%57mkDsFRT;iq$ln$hm0$LTJ&
zt7}b~7ugVR#_hB9Sb1>f!*lA7J!sxExr4@aRH1K1(=8fnS9R~bEB`EXn@Qs?Gg2ko
z)te_23}8kh8r*h0w|M6z2iBVX?9b*T^bU+sXB2ZG449@a+u`O$NYBEau`<MF|K1g|
LiaEu8#ozw{^N%Wt

literal 0
HcmV?d00001

diff --git a/2.5DHero/2.5DHero/Scripts/pallet/charmander.dat b/2.5DHero/2.5DHero/Scripts/pallet/charmander.dat
new file mode 100644
index 0000000000000000000000000000000000000000..79b1b48e7f322efebb2b796c01594e1c409128d7
GIT binary patch
literal 3624
zcmbuCL2uhe5QXRJ0{sunscK=caS<m$kT!0E7VsfSkq8KKltju_ElaLQ)fHgq|MpKb
zecuijONw-SC<Ketayav5=FQvn=YRjQ(l%Dv!q&F3AMFSG+P<<E`aRe8OFb*?Lcc1j
zgJs@ZDXp-PUD-tM*YbkpL{_yuwr}kx`K<M8tG6@x!>Z6K_y5QDN#lDik4wcY1MVX`
z)BP-XE)^-)uS;RNwHtk3$?7`fIkG2qEPTg?A2R06v7Y}ewCSypy_5edRU)$wdh=M<
zovvH^Cd9}TYblF`{4NylLeFbOENySUX@v|k`#r?|r-_}}YgtgCYkgA<I`FE6<DJmf
zdYg_^9W<Y0TM5NmJ&U-Hgzh%PT<Oj&JfkCJl{(q2K(79Ru2d{CnCXrTZUVAeS<<<&
zZ0KC_N1fg(qu0X4`_vN-jl`UUh{#>LHit$b%2IJl<@volP-9R`<+aeYwmbQ|>qNL~
z^$Pz)crOoa&wX~n%*044-N!l9_pvGp>oZ|(Gbd|S$sOh`RjJJWRFxJ&P2b@iaW3>t
z7iadUSDCKQT%HPjoRz2Q@6RFfM4riRE<ai5*IM<4Pa9#Ht5#XV&tu~)>c&&YMf6M^
zg#9Z$h3zk!ZtnuZT<a5gEY)i~oY=D-(n{}dWmhPgGi4{7mDXl~GnMY!QxrQhRMY#T
zXQ9*1LD*ENjzd%Oa3$$W%xV-kMfcmxY;(Ci9q=#Kh5n$4aSE9QDohPsAw5s#%jbR7
znGv`ds|6QwS#5Q7g&YNC?BXbeHK|ziex`1=ag94(l6Ku^|3-QEbUtj`^^JD75t30C
z%l*DzgdP-ux%g=N8CKbIu{l%yGjVmHjElfy<}Rt`L>0Y}XOt7p?HeWD4A{<OwbJ@j
z*IFNxhRH?Szq60w?y^}SE|cQAjyF1wDkrsPjeTSru<hj+f9REaX5VuTqojCtR%Alq
zdkQN)iH?9BfT+x0X6O2=biY$%c9B>5{VBx5Vi~3bjo2ycD_P*lpDcAH7FzX4x#eH@
z?7#3VZ~EQs6|=+)upgvd5yfEcCqd(;p(<0U!ig07RDX|U`&`#U&UJkcDa1$lBpR8Z
zz|4+!4kf0i>yRz$ZEd7}R1~i7g$gSaa~<rwvoXUoD@0-k%Y(}LoSaGnpB`}kEMRiW
zZtkda`@OyrKAf}XiEelK?x-{SL-j?&hBT5r-1h`<QG<10s8=fs*f#1N>|%Ci!V91F
z`sRej-U4Is&dm6p%=EpH^@UbA_rP3u+?}1s@MQUmeELbkcXsD>#7|$mLvhx;qeScb
zN>MAJ<$0W!ex*1^kz>q0&Fx0-9@f<rhPfG@VxQoJ@^v;*1NMVkt!z{;G=O*4`gmW4
zE4Q~_<$-=|h2KweX+o(e`<<(jvzM;<xdIJg7xbsB&*g!AjoyI_zu?2hd43)AigN+I
zM61wAy5>sWW#W51dHCeS#L<27bjEaN8l~^=TW7NFpQNLn74o;z`5DfonT4Ou9dbsy
zo&U^vI+O03T$AQSHpG*C_k?iYPSidzbCyoE8Q!1Le*sv#s(bBS`7cAYnKaI1V`aks
z8tokl1~8+s8=M?a*FwCa*M5FDtmiPA^H4i_Om|RB{!d_<`fP`rTXp&}yfYO-Y!1(l
N5mm&5E>M&B`#)8=LDm2O

literal 0
HcmV?d00001

diff --git a/2.5DHero/2.5DHero/Scripts/pallet/oak.dat b/2.5DHero/2.5DHero/Scripts/pallet/oak.dat
index ada1b6e98b61fdfb34acaffd818509a5c9e175fe..7e50e4aefc9fb61b2deae1122c3d9d0ad35fae17 100644
GIT binary patch
delta 931
zcmb7CyGjF55IqqkQPfHhL1AqSQ3;Bb0UsdvZ0y8FSk2~v$p+T=YBsHvAo~;Ah+r%D
z1B&0_UwF>kO|%h_TiiQy=ggclGmm38Q%}`w@{pTJ-m~|a#iX5ENj|a*iJu!AUqAt?
zSV09o8aP9M5e#84xgD6edmT-dGn1VdTWIl=;i1jjv#@~oHLY_L5o3o|jbI;<#rd=w
z{B860acpsVcM-EVG+#vDK3}K!Brd=e?Iv@c8S<DOZx|<*O5EaPy??y3hFNS9B(PXF
zdWq$!^+;S=%qiyS6+zkOj4qRK19cXa2q&pZ`@(ETQ6gKU67avqzYtXlEvP$vu05S?
z7E-Zk(mAkK8+pP!21|+by5vezwBx0^zg5PDbfqgSR3*iT@#=Qna)`8YMfO{>w~xyb
zOJ6goS{bmcR60Q2NN5Dz);6gnBvIp^(su*!SV(_)ORFBco@kg&W)QK6bv#B@7!xoy
zW}T3pJu(RCYmr5a4GPhkD2Jle1kESxNy(?PvauG^U5E&nCfxN$n<kLkrScETy8{I+
t?3@<XRuqFM8J%)!cda^!x+Q+gF4>YV{=Vd$f71RR>pwY`o?miDnJ@djrVRi9

delta 69
zcmeB>T_>_3oqcjCvyN~vLkU9?Lk>eJLn=c)Ln1>qgXZKk_Vbg?Icz59v&(I^<@IJ1
QVc=!pf@3S7$~=Y?0B8da+5i9m

diff --git a/2.5DHero/2.5DHero/Scripts/pallet/squirtle.dat b/2.5DHero/2.5DHero/Scripts/pallet/squirtle.dat
new file mode 100644
index 0000000000000000000000000000000000000000..ec45499252faf32de47008380b48b3da2c06a6ca
GIT binary patch
literal 3426
zcmbuB+m72t42F5T0s0P;tGLBN&7o<6AZgPCz1WK!kQyj@DX-<VYp=caAzK56-?uN(
z^#6t$jASWkfx_68G{Yf(l0V7$^!G=rY;7Bx*~*so!XDaJcE_ISd!ql(wO84dzBaav
zl0|2wvat<pZl%s|r3J}SQd_%kU)vATxz*QBr-Sq%HP$Nc|3~+OTK7a67qVGJ+-LSu
z@0U??B};|Arowb<H~K%9)OGZ8U{CB^_|6SIc+AP6_Wu;xd}?6tq<^kR1p7rN&-L8v
zxwCsl<br&uWN#LqV|^3FARSY!AMID2_P7Omuf4hbRU<&(AJQ|6ky=Rl#|Dyj!n@TT
z+BPjbze#c<9B;Lkke><PZM3-5n@hM)XYwoOvK@m$872djY%PTIQg1WayU{z@+sE7u
z^-k`xJ|gv2-n<qr&J$5$F|bDsL|AUiHCZ%>Ru-~b$<nvdK$Jl-lGd@FTRTYKp=IIF
z$QJss@Ie}yn!Egjo0*fay^FIi^Fu`x-UnfAawpWQ_zw3Lid3j`Nv@CjTk3BuTzEHA
zWbbw&)7Du?(^x;}<zwadr)as9X1tq7Pl)+iDc*2tEld-|D%1=;H%<{Zb{!YigIEp!
zm)eEz&+BaOBf>)Kr8HK`H5wk+cO9e~o!?1rENjk`y>M={b{RRd(R;IwQfB&M`g!Xi
zX4*Ljo5qUcE7@3x5v44YdSCyCIFgm*(;za6+~-O;J7MzsD3hWwj8>NNFZYGyPh0Yh
zqT;N7*wPLs+mcylmv?Q+tTS0}S6yF3FT{eN=mh0>CST}5r=6x$-fk2Z>Y7{~>mIi5
zk-d}@9gL`N^`k;zJYDe{^)ue4^$K=jn0G|9F-Pc#xlgi22PTu`bQJYb=dPKF;kl;+
zq1k(95DM?ctT=-m!L+stZ-ZS#tEDi|yROtlgE}DgK(~mjqPF(3J(mQUd}pC2wy5#D
z@~!y7@A!qiqRxLiSFn)Ur;p}&LZwkJW$X>37?n|E+d<WLP=yxuRL_)u=iVu2`*^^l
z!5W^>x#&NhIXW0QT}5wMZ}t@8M?~TBQK*oj)2yPLXEu45(7cS6==??OPF@F(HB-Ou
z)B>1Xvh6!vt$D87LE7=`^V$9E^4(Df`(5#+`ulndv(I}exQM|jGSs6LBDS@12Y;y@
zW;}d4>Oa$wo(yBrPR;l%qx#-R`bsNIc$f>1+qIJzo+V#Nr%zy?h|cSTpS*a6QmuJL
zvDVd<t!{*teXmjwopy$6?crncKG*G9XHTWQ!%#Q<RqPc!lfTX;EHdYAwX#;c=mDHv
z>F0UrkKECImIm^%6Mnx1<q9RD%n9#G&R(+S^OzpO^zdEQC(^(~Aa@``FZhsgo?pj)
z#XKdK^bYzYS@XHkX5t6!{QHfgdmC=o^fPH`-dod@p;}JwpsAmYg>9*uC!EVQ3qPGZ
z_)PD1{!{1qE_bYb%{?!%A>E1FcNFk3^Wi!Erx-MEn%qItI&-hDM)Um{Y47SDd++?y
z7;P$zyUb9Ya7%AaC>TJErfhJdb!_R*3x?Bp_M^Fou_MQHXF4YLYpSWscDT7yrl;}D
SNC=TRy>}&42~&z!`u+zp-YJCu

literal 0
HcmV?d00001

diff --git a/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptCommands/DoPokemon.vb b/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptCommands/DoPokemon.vb
index e8d935f4a..7826b85a1 100644
--- a/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptCommands/DoPokemon.vb
+++ b/2.5DHero/2.5DHero/World/ActionScript/V2/ScriptCommands/DoPokemon.vb
@@ -23,7 +23,7 @@
                         Core.Player.Pokemons.RemoveAt(index)
                     End If
                 Case "add"
-                    ' PokemonID,Level,Method,Ball,Location,IsEgg,TrainerName
+                    ' PokemonID,Level,Method,Ball,Location,IsEgg,TrainerName,HeldItem
 
                     If argument.StartsWith("{") = True Or argument.Remove(0, 1).StartsWith(",{") = True Then
                         Dim insertIndex As Integer = Core.Player.Pokemons.Count
@@ -80,6 +80,11 @@
                             catchTrainer = argument.GetSplit(6)
                         End If
 
+                        Dim heldItem As Integer = 0
+                        If commas > 6 Then
+                            heldItem = CInt(argument.GetSplit(7))
+                        End If
+
                         Dim Pokemon As Pokemon = Pokemon.GetPokemonByID(PokemonID)
                         Pokemon.Generate(Level, True)
 
@@ -97,6 +102,10 @@
                             Pokemon.EggSteps = 0
                         End If
 
+                        If heldItem <> 0 Then
+                            Pokemon.Item = Item.GetItemByID(heldItem)
+                        End If
+
                         Core.Player.Pokemons.Add(Pokemon)
 
                         Dim pokedexType As Integer = 2
diff --git a/2.5DHero/2.5DHero/maps/pallet/oaklab.dat b/2.5DHero/2.5DHero/maps/pallet/oaklab.dat
index 60d0e242353db894df8dd7fefa0f636c7f4a5304..ba0315f0154d9b026c55e4a068be2e09527fe38c 100644
GIT binary patch
delta 92
zcmaEJmGRkC#tmmuC&$I`2_`X=GUPBMF(fh+192%s(d0r7{mBnhSvD)A-C_hOVN9Of
fpDsJOhC>A;JXs;_&19?0S74dq$$K*;kz`5$CDkF`

delta 152
zcmaEMmGRA0#tmmu6;l|B7!n!M8S)wO7>XHE7*c_B3_}T!U&N5ikilR$xsXGD@&i?t
Y&2nkC7>QRtSuX9(WQ)vKB<Uyt02b3Kd;kCd