From cdcd29b503674e5ddd6ed6879d0885d6d654e33f Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Wed, 31 Aug 2022 09:40:52 +0100 Subject: [PATCH 1/3] Adding new sprites --- gfx/pokemon/front/animon.png | Bin 0 -> 451 bytes gfx/pokemon/front/barunda.png | Bin 0 -> 556 bytes gfx/pokemon/front/bawligua.png | Bin 0 -> 749 bytes gfx/pokemon/front/bellossom.png | Bin 0 -> 944 bytes gfx/pokemon/front/betobebii.png | Bin 0 -> 256 bytes gfx/pokemon/front/bittybat.png | Bin 0 -> 642 bytes gfx/pokemon/front/blastyke.png | Bin 0 -> 643 bytes gfx/pokemon/front/blottle.png | Bin 0 -> 465 bytes gfx/pokemon/front/buu.png | Bin 0 -> 670 bytes gfx/pokemon/front/cactus.png | Bin 0 -> 723 bytes gfx/pokemon/front/cheep.png | Bin 0 -> 583 bytes gfx/pokemon/front/croakozuna.png | Bin 0 -> 888 bytes gfx/pokemon/front/crocky.png | Bin 0 -> 891 bytes gfx/pokemon/front/cryithan.png | Bin 0 -> 701 bytes gfx/pokemon/front/decilla.png | Bin 0 -> 664 bytes gfx/pokemon/front/deer.png | Bin 0 -> 1085 bytes gfx/pokemon/front/gaotora.png | Bin 0 -> 682 bytes gfx/pokemon/front/gorochu.png | Bin 0 -> 998 bytes gfx/pokemon/front/gorotora.png | Bin 0 -> 904 bytes gfx/pokemon/front/guardia.png | Bin 0 -> 1053 bytes gfx/pokemon/front/gyaoon.png | Bin 0 -> 688 bytes gfx/pokemon/front/gyopin.png | Bin 0 -> 516 bytes gfx/pokemon/front/hinaazu.png | Bin 0 -> 673 bytes gfx/pokemon/front/jabetta.png | Bin 0 -> 809 bytes gfx/pokemon/front/jagg.png | Bin 0 -> 869 bytes gfx/pokemon/front/konya.png | Bin 0 -> 565 bytes gfx/pokemon/front/kotora.png | Bin 0 -> 640 bytes gfx/pokemon/front/madaamu.png | Bin 0 -> 813 bytes gfx/pokemon/front/magnetite.png | Bin 0 -> 771 bytes gfx/pokemon/front/mikon.png | Bin 0 -> 605 bytes gfx/pokemon/front/monja.png | Bin 0 -> 363 bytes gfx/pokemon/front/nidoreign.png | Bin 0 -> 905 bytes gfx/pokemon/front/omega.png | Bin 0 -> 893 bytes gfx/pokemon/front/para.png | Bin 0 -> 594 bytes gfx/pokemon/front/pendraken.png | Bin 0 -> 826 bytes gfx/pokemon/front/puchikoon.png | Bin 0 -> 613 bytes gfx/pokemon/front/pudi.png | Bin 0 -> 505 bytes gfx/pokemon/front/purakkusu.png | Bin 0 -> 625 bytes gfx/pokemon/front/ribbito.png | Bin 0 -> 721 bytes gfx/pokemon/front/scizor.png | Bin 0 -> 693 bytes gfx/pokemon/front/skimper.png | Bin 0 -> 601 bytes gfx/pokemon/front/totartle.png | Bin 0 -> 936 bytes gfx/pokemon/front/trampel.png | Bin 0 -> 882 bytes gfx/pokemon/front/tsubomitto.png | Bin 0 -> 969 bytes gfx/pokemon/front/weirduck.png | Bin 0 -> 722 bytes 45 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 gfx/pokemon/front/animon.png create mode 100644 gfx/pokemon/front/barunda.png create mode 100644 gfx/pokemon/front/bawligua.png create mode 100644 gfx/pokemon/front/bellossom.png create mode 100644 gfx/pokemon/front/betobebii.png create mode 100644 gfx/pokemon/front/bittybat.png create mode 100644 gfx/pokemon/front/blastyke.png create mode 100644 gfx/pokemon/front/blottle.png create mode 100644 gfx/pokemon/front/buu.png create mode 100644 gfx/pokemon/front/cactus.png create mode 100644 gfx/pokemon/front/cheep.png create mode 100644 gfx/pokemon/front/croakozuna.png create mode 100644 gfx/pokemon/front/crocky.png create mode 100644 gfx/pokemon/front/cryithan.png create mode 100644 gfx/pokemon/front/decilla.png create mode 100644 gfx/pokemon/front/deer.png create mode 100644 gfx/pokemon/front/gaotora.png create mode 100644 gfx/pokemon/front/gorochu.png create mode 100644 gfx/pokemon/front/gorotora.png create mode 100644 gfx/pokemon/front/guardia.png create mode 100644 gfx/pokemon/front/gyaoon.png create mode 100644 gfx/pokemon/front/gyopin.png create mode 100644 gfx/pokemon/front/hinaazu.png create mode 100644 gfx/pokemon/front/jabetta.png create mode 100644 gfx/pokemon/front/jagg.png create mode 100644 gfx/pokemon/front/konya.png create mode 100644 gfx/pokemon/front/kotora.png create mode 100644 gfx/pokemon/front/madaamu.png create mode 100644 gfx/pokemon/front/magnetite.png create mode 100644 gfx/pokemon/front/mikon.png create mode 100644 gfx/pokemon/front/monja.png create mode 100644 gfx/pokemon/front/nidoreign.png create mode 100644 gfx/pokemon/front/omega.png create mode 100644 gfx/pokemon/front/para.png create mode 100644 gfx/pokemon/front/pendraken.png create mode 100644 gfx/pokemon/front/puchikoon.png create mode 100644 gfx/pokemon/front/pudi.png create mode 100644 gfx/pokemon/front/purakkusu.png create mode 100644 gfx/pokemon/front/ribbito.png create mode 100644 gfx/pokemon/front/scizor.png create mode 100644 gfx/pokemon/front/skimper.png create mode 100644 gfx/pokemon/front/totartle.png create mode 100644 gfx/pokemon/front/trampel.png create mode 100644 gfx/pokemon/front/tsubomitto.png create mode 100644 gfx/pokemon/front/weirduck.png diff --git a/gfx/pokemon/front/animon.png b/gfx/pokemon/front/animon.png new file mode 100644 index 0000000000000000000000000000000000000000..b282aa037e9d5685f340fe4b443e72464fbf1a5c GIT binary patch literal 451 zcmV;!0X+VRP))IZTKxd!e|550Rz~!7fSjtAOK`O1bl-bGm!Bm0eEzl1R&Gj_vZmn&F3k`)C+Ng z9hjdt1%T8A&G+FQ(8l0ukuJOg+SRu}ED6A)_5kDnsKqqsn16afc-)Oo0J-0KEatfm zhw$jaL7^nr3L)uuUWs;vG&&yUC5SXmR*3!V+IugmtPrOTNSW1aM$2Qh1>$fP3ALKF tlnX!#5{n<#N@Frtt;79KK7`5A_yhize!Y8!xjg^?002ovPDHLkV1inUz=r?; literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/barunda.png b/gfx/pokemon/front/barunda.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9be0b7f54cd21857aba5bcb042f84e24ff054b GIT binary patch literal 556 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA?Bp57i?)wF#SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#KiG8eT9klma!rN?>5Hn!&&zUNC1@pbb!hDaqU2g@M_)rKkhQ<1Fxq zEM{QfI|9OtQ?>b|fr9KMp1!W^PZ{|HE!7`(^aD*~l=pOT4AD5>ddblHu!9K017`Mx z)zkHEepcsW7Z-1RrdU#Ve*TX64-}4GUBvi%(GOuO5!qcK1+O37J9#U^VUo@Ly{BW9 zJM4B;|Fn1~x3j#_Qpa1c>)=0C;DEirO%`uhO8u7%X;;zy>!)1J;MNU_m{Bu63 z#mjTwoA~(Q>zEBiJ4AE@!e^}4XL)J6$#C%`!TX8*h0g26!Yu@JJg-`8R8L6bS;-aK zv$f2_+TzE?BxaVC?Jo~_$o`zCwvCV1=2Qbu#_5V8)AkVd1Dc^dy*Z5kau>fyP7#05 z5Hn!&&zUNC1@pbb!hDaqU2g@M_)rKkhQ<1Fxq zEQY8oHDJ7JTyz#F$X?><>&pI=k%`qzVP)^8KMV|v4?JBQLp09&Uh>Vp;vm8PL4Di8 z)X<hnA`rcf7ISEEnn&( zu*mJh1uIq7r~(kbxCQ9iet>u%u2bD|y7xvE2|&Yw*T^8J^wZ^M#V)`vYl zgzabVD)4*i=x*+)c<$2%=Ql5zo;*IDe8923>HU>^Z_h4x{XqY|Z0ygQ(Gw;qnI;T=}WR_mM#7UjDFP;*NBpo#FA92nrU24+?U1~WfeoNiXTbiA0nUu z&om|R6-7!KUw^)MyWZP@N4NigpS_I$zkmCAWYXV1er=D@^<@NjUDwm|-fiNCwNfhI zgWk&B&uP$((_u52e++nkACPXMk;4CM?{V)(^+mAz3A@(#6&QY2fbpPBI1vJHzHlVM z9-ja}Fdlaa(1G5KC&4Hp2s#)J$GZ?oMF~M;%r^yOM-W0STaF4k$nSW3H80Pz1!y}^ zk~2UChf(48Dis|3q`)ne!U{rxqv|Sx2$Kmgt=?lm%rgbZ&f~I00Wye6fXRX51t900 z%LN695L^sgiRbq$h=V+~L@{SnrQ}Jus-kdcS}M?0#v6H^|v~iD8;ivqQ(tBRNpKo+u4c}hWZSt zoO8>mI-)U9%&GD{^}7prH&tL5+C{AM;4;Ipc+P~2S?Z(F@_piM^}HRgG*K3MzmfPVo)%he40 S(=a~(0000{+|Nxgn_E>AV3g2tF#hXvttG&jqD z+d_t>`;0OWTq~8GqRP)d6?~IRV+wT}^ewu-qv{H;4)7=3rL`v)sgR+5Ff< zSC&EUDy#Jfbl&P<+&yAcE{m?5MrNdtU2+W>HVGSD&A~3MypfoDBO_Onoysy70%lj% zF=A9%7Qgo0G3?Hwi!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4SzPmhPGBtaba4!kxLkVC(1R&avSbl*+?Y4vv{_@B0)f;}@>JM+Hzn#{h^W>7;zTk&95)!n| z@6=sls>{{?osmuSNR7;t@~Nq-I`*)v5n0LlQRK7G67R&_4J#*Hwv%bGmVXg{QN&

}6KcpF3R@o-R#wNvTYb>`2xBIzfj;?BKe$^RvAlJifM| z@8J@g^b;{6lb&uq@}uB;OS*u?m7Srlo_4bYTc0=|zN=P>@i@=MEY5lJg5*KqncP*G}U8Ry0S2?$= z>WX6J-Qd|~zbj9h|8xE^M|Z>Deqf}imbgZgq$HN4S|t~y0x1R~10zFS10XUAF*39= su&^?=)HX1-GBC)k7UxFMkei>9nO2EggN)kx?LZ9-p00i_>zopr0H+G{l>h($ literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/blottle.png b/gfx/pokemon/front/blottle.png new file mode 100644 index 0000000000000000000000000000000000000000..a5a0ee2afa2df70de9ca8d398cd5c96e6c3cfc3a GIT binary patch literal 465 zcmV;?0WSWDP)Px#3{Xr|MgRZ*s;a70RaF2000A>wGynhrV@X6oR5;6Z zlt}^vAqWE{{Qu7*0R*&%Q!iy$Wvy;d8tzXRRKAOdA0V}`O$XPWC17B4Jo3#Ii-%i~ z0?HzU86x6mWEAgrCQK#`V06yjf~OKDL6Y&|g9M>a%RE$H@_0n3c_t6JfmLFO?o4jd zAVZ4G(m*g97;f2&5~O62Doi)M&gnq;Hg01lljfLz>q(ekglB3Z%r2Px#3{Xr|MgRZ*s;a70RaF2000A>wGynhsFiAu~R7l5- zRtXXUF$jb3|3BM=qq}xJI*#LN0)(rY{W=I8`}e@t0T#^yU#wz23C^<^AHWuFUX&0# z_*&n`6Wo2_*YOnvEDBA6`{{$W9X^kD!UJBWy$JMCXywUqW+VwK*bIwO5)H-r;J|}F zP^VV{qD0d(P6x7>S#;7(4+_W+7m*=kozfUN95E=FI zTFJO+h(%|56m+Ps0v^-sM-z3 z*?A)5xagDjI1v5R+OWjQdsO8z82IDxpnAusym}*(d$z^3bZS!NlsX;pBzX^Jwi5Ae zwS>nxn$pc;L>X0{TF9M&nw|E~SE#}m!c|7JYc(4@@k(kWL5tyrPY`l~JhJ1s2Sm`* zxF|e*GPEwB60JCEle7!uLd<%Z=dw_6g>OP_4H-pEIa`oBfbY{pvw4)rC_EV?=w}kT zElTo))b>dL?QVDQ#!C~t#Itd#HTA$^o+i{3+HKQEK(u8(%HH|&Oc z+UlQeGTT{Er`X;V(J|w`H}=h1Me=>$R$=|q-P?>kb<=8}7^vi{HEOAUzufbhnrhR+ zkN*O3(;2{b{Pbhve*D)^1lo}J^G``$wD=ppb)R3q0OkS-KmT8F{Qv*}07*qoM6N<$ Ef?QQLB>(^b literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/cactus.png b/gfx/pokemon/front/cactus.png new file mode 100644 index 0000000000000000000000000000000000000000..2049356def2a2570caab974efe8fbeef438586eb GIT binary patch literal 723 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA?Bp57i?)wF#SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#KiG8eT9klma!rN?>5Hn!&&zUNC1@pbb!hDaqU2g@M_)rKkhQ<1Fxq zEM{QfI|9OtQ?>b|fr9KMp1!W^PZ^mR#MN0DryDUaFdp-CaSYKo?|bRIx3r@O`v=aA z&lW97UwGw+t3lw-52xxX**886f8Y|kXuq{_6Zy5ed*Z>8TStSNZD z{UTG_75y8YC$4_0;Jcpl;{Lxg=PEY#UZ32)MyCAKj4H9%AKtk(rmsG=|M!aw4h?$B zx&OfG^BO5ng8WpLMdqs;7v9Y}aE^c3ls92l(@UklwOl$Wk+9=|r(&0VuCSLR>y?ny z8oA?23?l2|E($3KKHO6)NN4TYqROf|K|U}YSSMcjnTWKDkZUe zvTf(Y`InDMuuK2274=cs!zTEB+0WY#U8YFgnAd-?n{DBX2V%wtRN1Gl6WEcul;NOh zVJOotri0(#Gv~Rhyz1NcsC^c9Z%M+81ADvskJLGeF>U0_n9DG~*IeW5yl(H;^}yI> zP%UwdC`m~yNwrEYN(E93Mg~TPx&}aG9AaQ#Wn^q+Y^iNvY-L~&pMDdVsE{<|=BH$) XRpQp5XO(CH)WG2B>gTe~DWM4fJ-icF literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/cheep.png b/gfx/pokemon/front/cheep.png new file mode 100644 index 0000000000000000000000000000000000000000..59c82f40f5dcbbb97048d324b64de7a5beb5a556 GIT binary patch literal 583 zcmeAS@N?(olHy`uVBq!ia0vp^8X(LBBp4p6{ucmJEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4!qURxk54x>|6=s{m7d`vBjUN<@NUV&)Jy&W5+%BY1+I%#BFtvq$nCK>u%MYo z=yAj9rnZGk;##jszpFdx`(4In|F62k^3uEi@8SA6iBr=2jA82%ZRKy7VS2qYF5GE3 zT4K9>>a8o6&ggI6ZnxLt^qFl%<=;fEDxEp*7iDqt$&&4@%eI<4y>YUmy7_u{$R8E$ zCHL6*v{wetWRYTCGj%JMVR7l2GZS0_1vh7Rh<0pYUUN(Aiua5B zUC^XF`KA=pgkuvq5|U&*KdbLq}lh}vE-NG9Jv)FR(YcW>mKa8$hGr_t3 z{a>cMu73fC+zaA>0jpZ#8c~vxSdwa$T$Bo=7>o>z40R2F$T-Bnz{<$P%FsgFz}U*b iAoAro6BG@(`6-!cmAEx%Y$*f9CxfS}pUXO@geCwZ2iE!k literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/croakozuna.png b/gfx/pokemon/front/croakozuna.png new file mode 100644 index 0000000000000000000000000000000000000000..d6b774419352824f9033098a8be8e7940acf627e GIT binary patch literal 888 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBjMMCP72v%Gf+lpb%qzkzWYo`9cptHjh`VhPdE ze)2WY^^89}T^vI+&ih`r&%f*-!ti19lr1Z~*^@Y}1PmJ<2r$btSc>|xmv1QiW0aEY z%f636DU`)oyNzWMpU;G2xu2Ujv^iGlsd7(dOno^;RP4=(P6kVv=k*)&EnceM-CORvlp{@AMZcuWnTVD=-Il;!nmeT@b*7pyg!ObQwm;}UeJso4_Vl`w z9lP~jTYtA&rrVU2V#^tAt&K$k78?TfNTy1Rz@KPW+00Z2pJfq y7(mG$$YStfl!mi|7&V}3fclw)5$b{JK)?ftL3+Tne9(6jkf5ilpUXO@geCxUG&1BCpEP)(A)_CbI> zf(OMX7BZ(;M&Q(3xCp4j5M;DEo5l<1Ma4?>RMQ9XiLA$DXUr~_jn|terDm+bSZZ$f%s%HPHJ;4 zxoEKyjuKGj-WL>L&h-p@n}CzPSvTR1#K4@lSrFn{BH%VhVyXs^q+2Q~nG~PyLR@$* zPnD!rZME8?N}u?SB+_5z)WPcg8K-mQ5EVrSUda|tB}sropKZvSJ7-kslu2xUS17fR zN(bHy$+F6H!wxO$K$+*6ge9P&;98k;KxIlZIY;r{WeUX&UGR8N)>>W1n$bv8U5J@> zlp_};dsf}w6?Y{8*4`_!m!EfQ$EN;AmK7sg)heqTzm>p>IaTSp%dY(ifh;1sb~}M# zN`7FWcBXe_M+gkdinfx-9Xm>37|s#A_OA)xgmv!@oz9lou^K>-Gumj?egIhTik8JU Rr?3D3002ovPDHLkV1i}Pg>3); literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/cryithan.png b/gfx/pokemon/front/cryithan.png new file mode 100644 index 0000000000000000000000000000000000000000..1fb4ef026b72110b96f32c2c38ec4ccb799eea6c GIT binary patch literal 701 zcmV;u0z&Px#3{Xr|MgRZ*s;a70RaF2000A>wGynhsPf0{UR7l62 zmI-piFbD*J`Tw6|E(wsl*~F=GZEUrH;gEnEPTPRv{vR!lFDzV69!Nd&_OLrAT`N#c`xzTKZu zS~AW&!j(g}*SJRjQImsnF?(Uf(hSa4u}sds+NC6OE-n%Y+l}))&@_0tYBF4HnGFEG zgC<&WbQ&Z{Ritt%Yv?0U)JG**rAL}7m|EO2*m5LpR@|>8p?q!!<+PrV0bzdjrSgqa zFt}~;Rx=?Sg3~~f6BKE97Wbp5=nYh*X-ABx$va?ZHb;m+xF@Z+)hJ947l_5hkTb&9b0z! jh4o|00Q`QS|6<7x2UHAG;l>UC00000NkvXXu0mjf6@@do literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/decilla.png b/gfx/pokemon/front/decilla.png new file mode 100644 index 0000000000000000000000000000000000000000..3c6af7989ae41c972bb826ece3fa487e5fc57e51 GIT binary patch literal 664 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA?Bp57i?)wF#SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#KiG8eT9klma!rN?>5Hn!&&zUNC1@pbb!hDaqU2g@M_)rKkhQ<1Fxq zEM{QfI|9OtQ?>b|fr9KMp1!W^PZ^mR#8~##UT0)rVC?pEaSYKopL)sAo7qr={ew)d zXyFQlms%Dtb(PjRSuWv-eOGn1_{F0;zlDw-T-qJAcW+kn+075c1+<*3cW5+CZeBFm zPwc2;R&tzHMMB#Id7DY!{STESZK$vCUNqhRkblG4zXzSCUNxUA#_W<)>vCMImRaY~ zK3CR_c{?&EI+xf^*~iMBvymf9%-AoLTlI;q#N&>j8^vu`kNUK%%K7-SWw*43x$eE! z64ru0#J+b3e29-pJYysovH8Vn1}1kM;eE0v7%C1XpGv4W$gtqa(s`U;ZJ7(CtwWw| zvuHRFHqESHsdIpKi^ndV>keBJw%b`;UGKgkjkA2wYWE+~c>=Q@i#VNfTktI2VaaEa zyju^r_cZxeD46_|xXz~BA~ZGicn5RV^SKMUH~I9IO*>O%F@sCTkH_vj|6$8R6A$Jt zmo>|Nv)l0g)nA)#>S@k@8S~ZW_1i64jg0w=GaXhiJ(a@E_0nGy zOjaCOm7X-$XYKdz^NlIc# zs#S7PDv)9@GB7gKH2@;x5Ca1%BO@yV6Kw-yD+7c0zgK3WXvob^$xN%ntwC==jw(W000+sMObuGZ)S9NVRB^vM@&RePDdbiWpW@hE;Mn4q~QPn00?w&PDe*f zL^A*Y002sWDIWj;00d`2O+f$vv5yP*I7c|E-BY?l&iZzGpQeDHMY~y|W9kI+;=dASN*{WznOko_?6rd6j42t0bCRCQ;9ORVji{^u? zs|ARGa3=W9Kcf%z+^yLPlKWFN4#yxpG6Xu0S#%|d`(dS;@r;*%GuI3A5_o9=og+68 zmT9)ht3!0W=bD155y)COH>agPYx?QxU+~E>tlCRC-|n)c|USx^NkwI&ZoO#xD&vn`x8ll_MX0mZGRUgRmH;a#*9`EP(m{6MGeLUMg)SgNy0w!v0Q{`8_ho|8 z`hEs5oGUoD_EalZ2@m^Le?JY-1;P89gX<`322lykDS%2n`R@ue>s{Rh;ImeItAN8) zXV2YE^rxI%)vGE%wZ<<4w9X-mVM4RjOM6T_5QH zRcWgIRl$efPVc%65Ft4bEYD%6q@8w8omyr}b!&-Y(71;wC7o&9xik8x$YAMYC0YT^ zHtjZ^op4X5ut_@woypd_aF1Bdf^#qx9B&IsRX>(N7d#6@M@&@aSi~*`RIS*Ic&IIb zeX1?vGC&S=RvA?px<=sCOl z2CT*#b{QZ-X6vUbB3-~?)%)8r72827;O^Q}Cz4YDJDHpD(^AAj$hMRym)N_R3tzK7 z+}d3h89q&8U@L&D6;O^b6A0ElE9CS!?KpmA@C?Y(qdS|uyMM9I6+f-9y1`WYS$n`k zAArw-Y?tWD#*BU{ng0mjPRpeJjCFW9;A7AY)zGzXcTOA$5t7nK00000NkvXXu0mjf D&#vOV literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/gaotora.png b/gfx/pokemon/front/gaotora.png new file mode 100644 index 0000000000000000000000000000000000000000..846b2d565737829966d8c9f0c3c137a3ebf445e0 GIT binary patch literal 682 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA?Bp57i?)wF#SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#KiG8eT9klma!rN?>5Hn!&&zUNC1@pbb!hDaqU2g@M_)rKkhQ<1Fxq zEM{QfI|9OtQ?>b|fr9KMp1!W^PZ^mR#MwME+H)8f80UJrIEHAPpL@yB|4@Jc!-K^u zIA&dGWo^$gV2jLp#IND?C`;*z{KH2%i>53{Oi(;#@gj*e>6P-uqoEgHB=m5`&P_-Y zT*?@9dtUge#+!Qj@%LZveSMd)&*p=^1d}f3(PlY^Esh^Pyttmo&m?zE_<*e2B)Mgu zvV4U5Z9Wuo7%tW1Fxx_t9slk1RX1pEgV92D z)zx)#mD*10Y4giCn3{BNP6=;25X^9o;b_K&Nn#5w za2xO)GS^-ixGQ81cYfE6q^y}6HtQ@`aeCJjP(R_a(5y8RR84LbNnK3TSyy~h z^AhTeWxAHG29nAVTR*h@KCde-k#UVpHHWk1=l!Z#HVbNX6Hd22UY?()|6Y5uS?7h^ z2iqF@n%Ew4e{7BGmR!MeL3z%%s}iz@zKQc{YR<5~5h~wOzU6OCE8)vAc9oQRk zhxb;6=wrS+^Im%Ov%uD{pcnz5e}aLlw|cl%Sr(Jkt(reeo6H|+`g z_U$XwuKhCF2aG$_64!{5l*E!$tK_0oAjM#0U}UIk07S+i1_o9}##RPq+6F+bP0l+XkK^~nH^ literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/gorochu.png b/gfx/pokemon/front/gorochu.png new file mode 100644 index 0000000000000000000000000000000000000000..b53ffd274565d64312da158938ce87e7b6a19544 GIT binary patch literal 998 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBiAJArW!wOuh$SfI^J?Mnk+GGjrM7{Am4QLP)NExG4Y~O#nQ4`{H7K6A zJRhhbDmB70&DWPf3&`eRU}Y3yU;F-Q-XmJj-F0#ude>EaloaX$2tzlTVm4Eu-syRzF@t4~<&_^Zz(tGrf^^VXYX zoW4g_oXO{_eyJs_BHNr0eUU}*7zd|HM&Z=CKUrO6n~oGLu3vO0uSKA2g^&KcwC$$K zY1Mmg21d*8VVAGSue<;K8GBB3%_HG$p*H(mkH&sFsXMQ9`cHS&JcDbGK1~Ts>f3ls zO}=PNF?Mv@?K3Q(=%dhVkL+5(A z+Su(}$rbzR)`rNWk1HD_+%}%~{A&k8zqmi| zRV_Ssl6mTiSK6F&+3xPjW{$YI(m!m%)kn)_Sv9_Tm*KR)CI8IY+ckpUlAM&2_a9lW zf4%&d+m;=E(=Y3Bf4zHEO({s>#QD12ito7#-OkGV-xMqxzfMqH!1QxvERUHB)56Dc zNxknmBokhX=|^`;2>w?4v%$gSWVxMNj<_z{_71m=ZgV1CpXzxQ^sLeQ>g&9#!z;pk zfzz^e-+EYt;uO6aCz~@b-*4aYV1-h!kl8f$$Iss+p3u>&%S*5 za3=C$Q{Io8S!Y(xX8mR^!z)<7?W^1Jb8KN88A^B4|9!Rf>t{Y=*Pyi3GN2mdK II;Vst00Y!+;s5{u literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/gorotora.png b/gfx/pokemon/front/gorotora.png new file mode 100644 index 0000000000000000000000000000000000000000..288c440989f8a8b27a1943d25688ca2eaa514eb4 GIT binary patch literal 904 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBjMMW(IMg;7!4TKuy)2E{-7@=Y205W(X&Wuzx7$ z{PK#^?Z`>hR=u~48nQWpub1{o^4vJKwCP-=m4?QpD);G5({`1dOgOjYmOlU7lBrY5 zGFCdBbDX$sR#VE$q@1MHAK(4kw_8Jk<4O7bE;afj1@8EFV{!EoMwg4Pj{R#W+;x7UY>NAtfI~AgZ|+;^s$PAnU`tf? z!RM_V?S4*Q7k<6+yl9VCO3}}~*2{wgw`-|={$x6J-(q)@u5*@QY|Gi6Jo#{qBVNZQ zc-f`vJUfqlw0b>PXm;MFWIf?m?&=Lpv(Fi93gycCEq$QfNpoSriWlXwLI$T@-4|Z< z&v4!(y7R@XZPQiW?7b!^*3!0hnQ#v0rvHH!DXGCCNj)8Pg(m|ujZay7Uq9a#XeBF+cBckr>+C(qSDRj*(U~Nn(IT?A!3>rbSZuiL+}a@#=Uv-?n%$f4SqP2AQl3g*8S?GejP0lm)VDg>HKB@8fy1 zx+^W#URFD9{E}1eztOL^yX=b5gDl-SyFM&< z9c9>jbm^@ixA#`IzgC~E+1I9b^sf7Isb|X@na$tXMWwB^R1W$7Lun7^N`D)kA1Oua zX4W5?)3Y=8Lsx6AW=X$mm|W^j**6m_MS~iCKApiUsV%whMWTyl#}jU+I^klQWh^(l zEA1R2!?JtN8{R*+HO0QDclTcFV5@(N1GwrL4AwADxzyiw379ffOI#yLQW8s2t&)pU zffR$0fsvuE0T3C77#LU?8Cw}zXd4(?85ry~y$Z|`NE&kUQ!>*kacel0k^2#-fx*+& K&t;ucLK6V}27F!s literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/guardia.png b/gfx/pokemon/front/guardia.png new file mode 100644 index 0000000000000000000000000000000000000000..7e34e2629e7b0e052bc787247e56f5278395ec91 GIT binary patch literal 1053 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBjMMCP72d)d8=!0EHOyi~K?u&o3&U1>~rfxJHzu zB$lLFB^RXvDF!10BST#SATkOuG`BLbv@$Z(HZZU>rMsPHmA``8wc4=k-ahZ|AHNO znM_V`YJGD>@Oo$0L=Sezn-dc!ERz**3>H^bK|`jb0^qEiIm07a7*IL z*!rrRZ^E)!u8|9#nuhA$Xx+29tMWq)+n!akl5g2m>OaqZ5vW{gxB73Jd6t><)Aq|R zyIkE)SuS~bc1zFQ4>oGf7I(g$=W}??KJm`V=>ak)*`@SlCf!)Kx!PiT_r+YH{jYdz zEItb6KU-n`I-q^ql&0q5Wj|*{PRw)O!2HzgZ+e$DSMnUQ`$}!MmdA4#q`s7^*vg|+ z73;ZT(eF*GF7ZFp?Ovesex2FUm1lZvlzu4fzyIrV%PKx=PO*=VHpwnnf2MKynHj6Q z_5a>gNGj=*v|af!`a6FrXZw$k?!Vem@eMqhEwRC`Kiu3JRKU7IrPU!t@LTtEuDi2C z4n=quY?9?Wwf2^}>k6+kqBUyGJ0B?i{?hR4(p$d1(+<7!wzd|`mzrj{(BSrE@8su7 zhdXM`E>Al9{-0kx`=bSG6~sLz{#>+5;aKidy^vHb(G^E}Zq2k1Um+>=)}!Ol4A~|l zE5@p$S9(@zeCE3Nu%o4D;S}*R7kTx>~mXn*hBbw_QExv zZW|{*P&NpBrqRBPx#3{Xr|MgRZ*s;a70RaF2000A>wGynhsLPTF>dW)xAOnhGdNM#Q?@XE)X-eHv#;On-J5w_$3QooJU}T zXiMT4Fk=MuimiYi2mR}+>U+bM5B)!l)^7+iZH>g)=_mPY31oVAQQ#Fa8{Wc078lGE^;bM#B{gqWL7%ymjdWU2TuGcmu>{kVh=)n*4*hAs zc`v+R!PcFSWPXZWcCMIUty5|b=ho+XvfDVk=cSsju?{UDth(2jTq_6lv2zZxxbuP{ z>s;5Bpf)<``!ivt5ykSNbGf5wE|9Jh3sMi0ex)sc?I8O&@ob^!jGJ{qluSK;X`9=u!o?v=j#&>-G-sJy{XQV_k=M>=>H2L3pHI5U7&6Gl5g?Ok z)Q|8`GQo6Za|$U#PC)mhrLPOXJ-Pkk$0000!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4MSo;$lWW_kZ>5 z#;h(oT(3Ec6qFjarTtH2Hxw0HJ8Rb8bp8oHw`>3S@Ac3B^=rw0{{z3;f6#t#xT;#A zxNGl>yDr;m6h6Oy^1uC^Zx2&v-J^g1pVwqxsatT%IPU-d+1s<;vd#*4%vQ2DrQ zSB8|ICB+uN?C%0{*98 z{d7KIdhNge>Hp`wzi{E_zn}d!Q-1zDogOjc@6+eYHC7}tFzi!t+2X#Sr41MaswJ)w zB`Jv|saDBFsX&Us$iT=@*8qr&LktY8jEt;|jI|Antqcrq)W6L_(U6;;l9^VCTf<7F R&}%>q44$rjF6*2Ung9)U%W(hz literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/hinaazu.png b/gfx/pokemon/front/hinaazu.png new file mode 100644 index 0000000000000000000000000000000000000000..e2c3dfe13513bcb76fa2b25d4c627f039b6ff177 GIT binary patch literal 673 zcmV;S0$%-zP)kf@$gpzz$Pg_7$^OUDNUhf6!9530no~G!r!7|DZ?$l0Rt=$B9=vARt>x+#mKn7Kh zvnK)7(UugW_dE~vF|=}$!4B`7Ru$1w?4nf-4ddTDhj%m1IUNkAoQt)Pjy-G)rfMNO z-PO&N03K}|N$ztGJ8%F@M$pg|$SZIxe*knFf{SXZ_!D5K({02ZupoKSy0df|(G(@L ztIEzku7njdM|s-PI#YUO9dzl#Nmt>z=yeCco?^GIQkt=)b@?bH>fR%Wldv$e!mHoG zE;0y#V{(&pAob4cNEzxN5w^zExqT=zXt1k^D9@4a)@fJ&@Ce-XqJmUbRLT)_Qc@7Y z$=cgYXWU&ryVD`fbI#ezf=ijZKy+{pvUI8ov5g={jo)2lr;jVjt*uj!XzDVnjztHP z=CrmafCz?Z;j>fiY`z#=z1odGJ9$lwK6utT$*L5mo09#it6#O?)0bU>bN_)rdo7?l zRaE-aM-%>*K6U`3rcR^?=+;m-<^Vf6H)a8G;&kkpzHaOrgIqbP{pP?`00000NkvXX Hu0mjfgrPHT literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/jabetta.png b/gfx/pokemon/front/jabetta.png new file mode 100644 index 0000000000000000000000000000000000000000..1180351ca6859351433c81f7b2871c41c098bf07 GIT binary patch literal 809 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBjMMK7JK_w)UqNfSP1HT^vI+&ih_=%ocVOVR*3p z)vOENP6|q)H@pOH-8s@Mr)3;ce8GF$q@7RHzdVu`_^u#y;V{>|+(%)PW%pF`h&BaX zaH$fsxzfDgiuYN)mF<%A^V23>vV3!HyYc6Hvv0;aTrT2|Wv)K^p{S&bYxCb=mt~=R z2RZrc5`{l!9Q^pe-1$!Y2MgJRxF5S8d^yVyI6u93-+R4_DY9oGGe6A8n_GD=pvCmc z(jycylc`fm>;qSk*T(NuLe*DqhMGxjG|9SXg{TlAL z*&E+adv)<~wi3^mZOLu1@hz&N-x<`m%&%YH$}#hm`hrCq>ID}A)Hzc;w)Vf1I2ZTz z;eicRM+<%xN!uyTRkSg@Q!RDa*>~ahRc&9bnx(rcR63r&Xn62z<4K<`6 zrsfRwcYlk7Pp;lJd)ls;rAy|F zA4#ka^e{~^*Zumc@8;E|=jTQ5{&?u0&eIcy=@pm$G4mh$tUGbJcptHiBgr9|3l Ppaup{S3j3^P6NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBjMMCP72(EW>Z|Kq1EbBEJyE^NY%70XeEAt`Q|E zi6yC4$wjF^iowXh$WYe+h>SuE&8cptHiBAdFPfb zK-->rx;TbtoDaQZm?LZ`!f-);Yo>L`D~972R96MCM{qDlFI85Zcw^R!Kg_3s6t{78 zwstPmbe_`7S0F0A%4L4zbgW`M!Vuhb#A*2*M%K{h#{a%K*2b+V{|5x= z6Syx)DV$H&m}ioEEc-3b-vycMzr9(zkFR~n+a35iCSh~XxtnY5ZZmdYI=k%Ii=w+$ z5_N4iSbvB!7#%q#6t6jF(?1ER^RxbUe&#f}rCG07mCk4A@so4nUFoF5rgt2VT+Cf# zZ@NYy!L&c;PQkKWKOIh&kK?M$08Tlpk)CCZCzrXVLT z@crkm8A`{PlSEed?PotK7x*MbQ_n7__S#j|RnPkOaewN)SKY)N6f5~;_x&Tv^?@Ze zM-P=Ny|38lzk2$P)A2GN^}7E|%6e0@;e6(UJ*U_{esWv!QhD*Qd+}2*AL)A-7QF1V zd53=JJ;U7o9bT%FuA6>c9PsX0=OG(O#>a|Ft!k4Br(G&Ez7u=KKyG3^qll`H$@(v* z8-Xb#DmB70&DWPf3&`eRU}Y3yUOjB)h(UV5w0zKa6Of>%tDnm{r-UW|2_ZMd literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/konya.png b/gfx/pokemon/front/konya.png new file mode 100644 index 0000000000000000000000000000000000000000..dc4192a918f49de87e191bd903ec7ef831a54c11 GIT binary patch literal 565 zcmeAS@N?(olHy`uVBq!ia0vp^8X(LBBp4p6{ucmJEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4oT7)78&qol`;+02GhZo&W#< literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/kotora.png b/gfx/pokemon/front/kotora.png new file mode 100644 index 0000000000000000000000000000000000000000..e92f41a76ad69f0acfccf5b123c856ccd239ffc6 GIT binary patch literal 640 zcmeAS@N?(olHy`uVBq!ia0vp^8X(LBBp4p6{ucmJEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4!`KtySBAA&AQ9k?yOd{5Pf%@`$KU0-N=KI>zgu6P6S;^ zyPbNXbLGR|X{KUJ1-Dk|9b*bCxy*5Q9yiOPEz=HO-g@wNTY=i?4?6MBClx%BtZ>sl z>;6!ow_Mv~hlW=n^ZC~6nSNcD;u!CxCNbtrd&9No!$FzlTgurU7$%;ZxbmG!RE;Tb zP==MAhG}V0@MeKi@|^RVT~6#-wEcjhlAPwBNzYI9T@3iBzVy}BeP^Oi^_U3E+qBVV zW%-2mxg{Zq(W@rdaO#-mUR^VB_wkU5fLMj?yR0J4TBSHf=I2^{{o(sN~I84lyvWGBU9; qFw-_LwlXj{TC?>#iiX_$l+3hB+#0qh@_GX`FnGH9xvXPx#3{Xr|MgRZ*s;a70RaF2000A>wGynhszez+vR7l62 zRsmw;FbK2Y|9?IsfsGS)*R9>wHI8DC1bB?!z1(g5Ri3 zH;+JBKA_YM+~SIYkPG7G_lOXcCSzUv?_`5)m(^X!d4WhQm~Y)0EP0*R%?$HRzeOMu zieQF9TE{JgQV$Ot_a5NOJmGQ4kVdf;ab20g=6dbEOy?|vN;iQ*?QMv|*KH?&w8o z!#zuytp&b;zM>KBt=GIts3b<{Sj%pYV)Nd9gi9ug!=rcZVzcdiEv2U{BenYoU}N&5 z(sRSj4co$l87;3GYNpBztL(*1%h5t>d1o=s27oO_0L}d9wnlf!Z%tx7zTs%7P7WRD zTIkaZDMjJT&OqfyXA#zhL%B7VX4RcOkqEXtRb=k%((i+<>;OjNi3-=`fXnFGK{~oL zJk+QhJPQI8Lz{|7udt3RMG4dt1LW4D-JTjpDGqfq>Xe;UG<#8-x7w?3&}Lq4QHs#; zJ*n*tvPev_Q}S2_M`U^qYlPrY9zvR{oe#}yU}uWM{B6r9R!wBjDh4fvVo2@e*}QR!iv$)QJHeMfj!!;%(TiTGAv8|Epo>F<`=e9G*P^V-Ph+l{@NNx z-{Htn-Tp05nRZv%7ikK0o~URfd-UN~jL{t&=lqLG;U=9K6&&pN^V1{gZjy-_ZwmU(| z#HT^Y08k`?VEW(=cooZrXN$$NJ@gswoO=;+)&q&e^BTU+YjBq{@!7eM$|$Ckm-~^( zYI5{5@lp9*Dx;XEEQ%|T0>A+(Ggsg zQWe%K!O`_nmnt41s%`e_d=+J$>S!HebB2c%4{vrqA9Sp0ljcqai29rEAx80?mSF^7 zLNINjG8&~=22eG5rvcdLRFMqMi~eP2fJYYsg;j^Ob1tNJ;>Za@L?F>ijr~4>D0`tw zya$oxxP8Z$qG*gCWL}h%G*KY3=(Df1L`Oexo2yI~nmzb%Rsc)AQ1$dwAy|wG;Mu(m zK)pAEZMV}?0IcyVc0LARB3kK}Qh?4=HUe0&!FIBKsVt)%A)eD|5XJ!9Mt1>LAUfTu z`wKcZ@fAQMzG^cj(RTs3dSoK1)&X}?fmnH02>&zZb&r|g$|>Kk1Y)U~1ruI6a zvtbY<0EEC#7UE6G;V=ji06NP$!O55e;g6jQv}ulEhevi!($jZL=WE%{NqTxt>FsO+ z@$UfqaGa*nEdcmbpYFn~DKx1*Z(Aqox@CMlz%Sgp{EfA!4b1=m002ovPDHLkV1gp9 BOw0fP literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/mikon.png b/gfx/pokemon/front/mikon.png new file mode 100644 index 0000000000000000000000000000000000000000..ccc90328ce240c4d5c11e3e3e0710de964490c2c GIT binary patch literal 605 zcmeAS@N?(olHy`uVBq!ia0vp^8X(LBBp4p6{ucmJEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4{K*D|1z2!Sl~|m)cqUu(((K{a)sZri&LNj39_lV)|Yd`n;|NorWb zoH;}J*Nf|nrzVw2{0jIx&8M_EV8Mn!;feBh?krqTSRwM`%raM%Y|bcUXOaD)DK$r? zE`Gl7m(Bu>lY73l>wj3mylwk5>F*Ctwnk`wpTv^iddfhUgAaMQ}JM9Tyj0cr8w*ED^++wxOiOO&ZJe_vC|cTRDl`^}q57OX#OHOuP+ zWp)Z|TRgeMNNpB#cCxWyW=L_z*Oia>ZK|~_PG^}p0E1h##5JNMC9x#cD!C{XNHG{0 z7#Zps0FiNsfq|8gk(Ggowt=ygfkFJ=D>G3v<-@?KN5C~vA z8Xv(}5vm0%4P@Lq6l{qx>2U@dXi%sQ zydB&CE)DMr9t*YJbVwiDt|=5G&FN&ib)iazQ+2o?8xd#HB1*&zgKm*hmK(95iL%-; zd~p|)>N`<+?dT*AmOtZulAlvcZfAJ9w`A^*?ja^Ea#E4?@`n1CRg!002ov JPDHLkV1kwXnS}rV literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/nidoreign.png b/gfx/pokemon/front/nidoreign.png new file mode 100644 index 0000000000000000000000000000000000000000..2d1e75932e865b86744714be5a25ea6a863a2188 GIT binary patch literal 905 zcmV;419tq0P) zC=~Z}#0S8{`Y8a`Y6ZaY%T{LVJ5bJnX*09{RrTPtIB}m6?|`S)9|L3;sPJ*tXMkPn zrvM=;#5nQJJC*ejPMxnjJqF;Ku0*>A)CnIap1rsY@E&Z5&J&=D|E~B>UbM?-M|@b! zm0OPaN_;1b(j@LazSLVrm0T3=#K&C$T@48k7vX_8ECb<^i{jO@WDJmXU=)w* zGw*Q2s~Xx*0NIn7!zw;I9zbF0d%Sxapi0;{+;!b)g1gC4&;qD_;&EA<#QqcjA=&^_ zYu+*0uoj?e{j(;9VYRl^2X?Km8k7^|^2@EqaLXVpfI7JP@#3sn6^E>QR}dc|qz=q} z4rafD`HalN4DCuTdwT)!iY$t#8NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBjMMW(Enib020e25Ktsba4#PI3IfHy#M6@8HNw< zC8Ujf-7W~JsQu$=pL%4X2a{o2nX;6q^YL5kE!@W{9Qdj}@E?$8PqxVEd>vW0=2o5O zox1{cE<9bQ#4Jx9Vg4jS2kpBUkWwk7xhu8M$XG3UfJ*o&Q>?uf3(} zP4mR^NKtwHoAY^&KGkr|~ zESMUwdaqD=>dpN&SzqMuZ{dGz_EXVek@lpj6IwrnqQ1PXJM}j`Qb8bAZql9Qc8fCI zXS@AdDxh%EXL8xS)JO&9Os7M7+$}L)E<$x$)-j4%A5Zn}n|tm)pX2MZTqiRE11pyxdI zqMG5p{lBGpB{mefRWv=${T?7(qvE!%@Y@;}p+w&+TNf_hv!9z=K{lmGOmO~(Wivi+ zX^ZS~@hQAFGl6&B+NHJERs9@YVt##6pHiq5S$U=H^UfzGQg!JeXBZaQS%f~ie2A&j zxMjk@6^wju6Q%{aNgkf_QF887Nu@;xPyZ{vucCF}<+C;C_RslmsQ6{`%*c9051l;5 z8%fKzEek8IOqZCGYF+-HDYyQ)U8{1cGB7!+mbgZgq$HN4S|t~y0x1R~10zFS10XUE xF)*+)GO;o+(>5@+GB7w=v-LZQhTQy=%(P0}8n!6%dIL2uc)I$ztaD0e0sui!a47%) literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/para.png b/gfx/pokemon/front/para.png new file mode 100644 index 0000000000000000000000000000000000000000..85751d2ba6f8fcd0ac28560129a927ddc2fca8c8 GIT binary patch literal 594 zcmV-Y07(r`}sB`*hQ0K3AJN^ z{b!8rXv_M~ZJ8}#)NX*;b_2||8(_AD1H7J(by=2uY~Qmj6krp*S%JX0EDPJ6#qZw# zd48NohK20P9xvkexxddc5aa`Nz`_9V6U8&cF}JQEVb;A8LjgU<9>f!+1$UM73W%`)s#HpA%HDk0LjlYUEdUZ&=C+?1f}uw)vIH=X zlf<(Z`O=nW4p0Gq07e2>F>e7V2o$eQ!90;s01g35Jd0!q1*e`14JXJlS(X3SiVur_nP2>i1<`S})WM(IXx} zxsx?3c?Lj%@QPXw0C%rn1t_Na|1$u1f>QwSMWh8{h1pa9?tQqW=p7N_PXl-rm0?;< zV3eKOsi*(9V5&E`AR7nRtO1c}VPx#3{Xr|MgRZ*s;a70RaF2000A>wGynhs%t=H+R7l5_ zmr=6aFbG49*#Dkukia;}?X>x5?<773g8;v^{_TOsgYVa$pY&P3=6CdJi{~u5sr+ag z?GNL%9>1{o8oqpyR<^eB&EbLBegTlYob5dd$8<7wLUE56gv~YS_>OZ1dHNMqk$|<~ z```*8994;`#^MBt;pLgXVlI=pK4TT9e6O(&kS4wMNL$yUpW4dh zVQl{(hGX+q(<>#hsRgIBfR0r*nc4q@Hf|z3+JJHMvx*T zCtex;TT`VSzhk;>dULUNa&|q#CAc~W-kf&(yVK9Ht7Zp+w%<2Topg?WI3igfsq+Y}14&mOt5K zyh122G~qcsbN*Fs{XB|Vs8p>Q>aQMYv}~Gco>YgXP9APfbx4_-9oeINPV8~lPy<`- z=@=d6R`p8ZvAfsRLg{5%4;k)dCH8*L@nT+ao+dNFtbMMpM5dSJAsFW;Xnw9ERG6ag z^WCZaG3Ttt!lhr%zr_VUPt#Rm*2ev)Fc&Ki4x0VV}-lW)r zFVLU&9ZlRT(V<|!;`-*K!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4H3Cf^|VN-^o1?^UMKuvKlVa_+sZ5H zLZJEzUS`Ji>lG@N=UY7IW7i1DC~|09FZ9-3M(JLVMVCa!q26_2GAFm4UY~hjM#|)3 z?Vp|ty%Hk-YwesgQ=qZH-9=O(j!mBHS zH!8nI?xLH2<2%a_9TLo4_F@4N9SknEC+Dai(@FZ9Q0d6_g7Kp1^?Q#U7EgIvyiIVG zgT9Uaw2ZyV>K7~I9+zC}QY$o{7_P2bhF=f7q>sTC$m+x-H74#l^h?p zR@Y70!mqe8>ubW&r|?#ny9NB4Ij4x_)s!XH$^V#+YW;ox+JDtDV6dx}xJHzuB$lLF zB^RXvDF!10BST#SATkayFt9Q*wlcKPHZZm_FxYK+6&T$}8glbfGSez?YdDpW`w^&t N!PC{xWt~$(6980&+e`oe literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/pudi.png b/gfx/pokemon/front/pudi.png new file mode 100644 index 0000000000000000000000000000000000000000..ff3cab22dff31eaf4f24d942113a41bcd12f9002 GIT binary patch literal 505 zcmVmKmE^xpnG!Rg}PL@NV)GIExa56s`sOKB{o|87q8u?@2&J z;(F4hQ-Fv0`WYWw;JWt2jPAELM;m zEY95mmDQ=pn0W*%^GpG=mr^B*h-)#sKpX(ynw2bO5f{A-#LA4VBm%QXpPI#Gpd+!3 zV6$bQ3YlS+i^K&uUu0_g143Z(zWsn*b(5P;^~1uhk^Iroi*ml00000NkvXXu0mjfzTJ=z>imk2k{i{d zYyt047{D>$kSzwlBnw&d-W+%r5*v=k-ysdW17DyXkb}o@?BakDGhER_3OT{Bmzs3h z5}=b_C68@JdX-R1CR-*{!3=3SCX9tqA-A0Z--BXUwz6%NFKAmtK<%wnTW) zrS}Q@55`Rn4csMjjjKfj`vGg6#UC`)i#l>mr-fdW1AS~!yrl zvK7*i8<#%hOT&7XhtgQEHt)`7LH8-Z=uo;m>7t|>ieWS?`sRk9_Z4e~OX>Pqktt)J z&bh*Inv1(rWy2?rn|69VPRR&S1O1$r1GncWjt3<0==o$0qgBO00T(SHV+OcceE>aXU3C&}%!sy_(N_8gz-y*l% zho4MUD5{@Y8hPOsY?axb0Igoimg)H<;+h>z+QSi9|2R9fik$Z8+%$W#(V_ROX&qJf zXa>h#=cP4dnSjQAr3o)5HcNEK_4zZ6Iej*;Kv!fI&=uz<9MD{3jjo6pK)bpQ_FR^q zOkH^Y9S|D@_;YB2t?_&lknK&5{Z;ci(d;fiuBc70d6$)7^)>hhO?Ov_A!1sM00000 LNkvXXu0mjfY33m3 literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/ribbito.png b/gfx/pokemon/front/ribbito.png new file mode 100644 index 0000000000000000000000000000000000000000..fa8a65ea3607a00865092819fe4cfac07048a682 GIT binary patch literal 721 zcmeAS@N?(olHy`uVBq!ia0vp^8X(LBBp4p6{ucmJEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4GzTA3PX8yHv_7_46=#*LyOH$NpatrAm%i6uls z`^ncp*E0rsx;TbNT(-S<-kZr$g#E+zpR4&2CpbP;wB^{;Zd3AdTeQ1%#;(Wq7nbh% zqQ1r>tmMTNw!22x51*5t=*S_-axp&O;>p=zN=C0=pUp8f_#pY?+=qKM4qNR^TsSh+ z{=Z;e!)lT!XL3~kUC!~Q1CMpL*R5Y_S?=Q;G$(wohoRof{1?+mx}qm+b$p^2n#z!Fc;M=- z8Sysfmwac?&tF#c*R(2t?ai*aQF(K|aJfu#p0j3q=l!M0F4L{q9w_L)sk@i#veEf! z@$pGd14MqmH7eAy%sj0(&#H@cm7=O;X~*IPg!_h@zaxUA)(j7WT2L;H?r;_o-u% zU`?5xD}tcV ztEE_E)xPu-1lN`LryBC|bB}H!z7dNoSLSq&5M}26lboxH&pb17jPRaV!AIVE~}flpL5 zIiOV)&PXB6L##GC)Mrb8?B$sNd;PfsSx>8^d$0?+ITGNKRa8k-C2cf6p6TQ9k1>tp z!(<<=KIxVHK%|K6< zx5ZO7vY;smO}DlDSfM;cU^fVf`9kF%F$C4ptiI{dvFFT+noy5T_WM-L3Zv?c7ZV;U z%&{p|-wreHlU+!{aiE%W-DizL4)pWTMFp+jV*D!;&jkONf;%D$>S000X)^2oCQ_5l b$l>!Bc1$%cg6(QR00000NkvXXu0mjfX2?Kn literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/skimper.png b/gfx/pokemon/front/skimper.png new file mode 100644 index 0000000000000000000000000000000000000000..74287fd8ce6ae427c281b99247979b61ca896c58 GIT binary patch literal 601 zcmeAS@N?(olHy`uVBq!ia0vp^8X(LBBp4p6{ucmJEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4lgXPR|6VX6TFGDc&nwGBG@@;&hF{CeDbtcD7pAKI|(wKE-WM zUs+nWjFw;LxXp$nz87Tp4O}hccu$|e)uA3fA&Y=vcsAkGs9+T zPR?IeaqW`N`kyQQ`^;_s`&H00)|WTsW(*3eaUHy5aZ!PC{xWt~$(699-? B+r9t* literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/totartle.png b/gfx/pokemon/front/totartle.png new file mode 100644 index 0000000000000000000000000000000000000000..cf2c168471f3008045e4a318e3f11b3d47c3f623 GIT binary patch literal 936 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBjMMCQ%N{39O3@ftqG}x;TbtoY%d4Hd{DQfZ>B@ zuGEQxB3qUAvIJh#bL!eVMQE32w0*~=B`2fza5l-ky1!tX+roeg8Mj$&m#Rf>&Ue_; zJ)?_dqo~m9jqTU;vhD`YK4PXbyC>hgcKP3p#+%=qu~As0Wx1Tu*hN8ZADhgvfOi|V zz1VZ*eQ^6(r>oAZi@)m2UOV5X<>;bIyk+DhRHaoBW0S+Kciu@pn!I zUjtvYGfHofjryq5sI$@GMnkRR3r~lLiH%}j&CUIWs@0?kp^&wwReTg;M{kMuMZGmdGQD@ux2M&v- zG%|O$%P5&le&oDct$%BA%FFZia>~qFLj8$RCc6Z@F2`4Bd^EJ{uvi&;U+<+sN7Rw< ze$fu~?K}AD?v>Ab)w^K9y~WNuBkUfBsGTdh^swZW=RCfSTdX^jE#`PFKgzT6Z_``> znOD26gx{)kf7W5~M|!tK4}x;&Ufz2JN{Rzs2C@IqrX#m6A^P%|3BYpX*vh zP{=Ijlo_QRJ|U;L{Eo-25_)9p=xXBb6VSWJO!LH@REOTmsS-tHS5x;d<7tvt-fL7^ zB>HQLPR8SRUF+QU_Po&xnR)u*Gr8iRMV#&165n(fRO`!>7e(K_YnT3XyVF0f^v1i@ z!aZTlU*vP={kZTZp1T>Ca#c%QBT7;dOH!?pi&B9UgOP!ep{@ZC8HE@bS{YbanVM@G m7+V<_{MJsrh@v4kKP5A*61Rq~vb(uJ4Gf;HelF{r5}E+%sC}mZ literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/trampel.png b/gfx/pokemon/front/trampel.png new file mode 100644 index 0000000000000000000000000000000000000000..3584cb6299dccc0c76a019d45b4d9e5fbc30ee79 GIT binary patch literal 882 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBjMMW(ILK&y4mQpr%w$7sn8d^R^ey`wKgYuzv_Y z_3c74YpSJAr^Lh?*P7MhdIEPhm_`X_B*qI@8#zwiCH}uf&1v?DrBB`UD;k`{%jDSq zv+4^RJ~^S{VUo=yVf$D8Cb#?Yw;kPirbcaYrT%;Fpl!{c{xfOTCp(!{PJg!I(N1IK zU?rv5pUy0wk^OFK*i)0YsxxxE+Rdy=*9RKb8SI@fReQ^kzg8@#UTxg{$4|&NoS|%H zyUB}f9dff6KKnFpnakG6#?WKf9^Mu0qO!&0$c*17FY#?&7cG!Fk8gT}`Rfk5+mUJe z-cO3#CLwfNUdF|k>utyMyG5U$GP}DQv$;>rk1(FLtZ(Ma+X>czCD|pq>nzyH{pKm( z{HPt0dhYOvlfh4{ra1k}5)bm3ed4Zs(zJ&GGphPBN+(JNu-JNkF|_CiyU!-mEiJX* zY(0O1)f9&4JuE(5f$w|Mq*yzw!sXZx=evxLh#YpM=Tm}T@;W3Peyc8%+gGf%09f2dsc z;@0a!T^e=aD$R2aY94K#^GIlIW^tG0eAQD0(OU1;B=K(5d%U@;^nl*m9;NmRPe0CD zn-Q|xCMLLk;oFkRcQ5V;1@-4nd{Q?t|Ie;@b02;&xc68va+i|t84bHtuZ3e&_9%s% zk4xW@k;(CpT_p8irl`yw_Jix^W~^rTbf`Ay@x)X1b6fqK&c5=lZ>dxi7u63JmScZn zAEdWRx&9N|XqF6yo1c=IR*73f*k3Utpaup{S3j3^P6`(E#6>QGbn6=Dz|>s^M96Ao8d0~ zuG%pCvcGBsgSvZBdaAXG5E0~T!D(+SSb$hY+Nkv5^ycqy59Q8M6q==u@5O0%Da^ z+eWvFGF-F`MCtE}&J>_K`^`YQb}!oNI_Jiz6s=wvD0^PDXR9(@WV)aX>$Z)T0K6U) z?_a90+|#nW1mHt~IqOwHqt0bJV6}mLQX(KLz^)@Y($W(5P#8C=J%38jG?sdY67@oPu<~Sz)o07uQ~=H7fy*zwTX31|F@$VVK+h)G5O0 zFJ+VR7EU$;88zW9Rn;=cbXOVz`3*yMCd<;7J^k{8*qr~FRPNRnachaMR5xt8`P1k>ap&~k*rH*M$0;qnVzvy z+9TlzbDBQc*tU=+>)c0!DqTn>cn-DA{HpTqcdHR}bG15|igZp1DAf+6Bkf)^lS*;m zjekg|kKAF;^zUSxRHAZ66rF63An#4ln3n{st}pBxE938iT>k$ciZZkt$(`?GuK8Po zq4Q^njEo@p+1-$>Us>>xMH%QKT!nN^^Q^RvOX}*ZA(sJs-rEUT`Y~R1bx#z0D$jJ^ r3Wx^HzMHJ-z5{Y^$=V<*XH6wP)f$ks!)^qp00000NkvXXu0mjf0p!CL literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/weirduck.png b/gfx/pokemon/front/weirduck.png new file mode 100644 index 0000000000000000000000000000000000000000..61830b742e1841f27a00593201f1c7e6d2dd4105 GIT binary patch literal 722 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA?Bp57i?)wF#SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#KiG8eT9klma!rN?>5Hn!&&zUNC1@pbb!hDaqU2g@M_)rKkhQ<1Fxq zEM{QfI|9OtQ?>b|fr9KMp1!W^PZ^mRM0Kw}l3B;Vz>t>_ zD(S7gbnKx_*U_WVE-_Xb*Oy*XEZBL+_MlF?#m^XP3k}CC*_d??WLe!aAH37P@qfWa zG3GFXiF!dS(Jm8a-!d@?(EIx{PA~lPvhNQ+R_y=&*GOqq;C+>?5`nvZ*laB-x&8Ki zT;JifzIRU+maJ>Ix_R<-t0tNG_xci^9kFo!Wyko+`O9_1#IzSR5(f?4HfXO`FtPX3 z$dUFCxOXkQ%|IZFKRGzjSK`4@?at)}dwF-fW7FxB@2x$Orz*MN^Hq(OGS-bw{eH^- z7PQ=0ZI~ta_i56#755D#Pj3HTP*`eS^K4^C-^TppH%~*Zryu8H-4l7s>dVcEN9G;a z?YTd5<2)A)fvLWClWIFt6`$+bZi~3J;BxAN(46CPi=|6~SV}@(sd>M@bgR}u#W5oJ zZ%1aRi@(5*BUT)G%onYg);-WL5wJM2>rkdw&Vgz1KS~oHZf@zwoq2Hk(fiX^t$6)# ziqG@sZ`NkZ)Z8motul|kZhG#y$+|^VE?1{6iax-gn{})>xw$JPvP7X`W$ne26SD4n z{M*TMchj?;{@IdIQu_CQPZIU<|K9byysRz3TVG@Syh|rv{$J3Xs zz&KVdag8WRNi0dVN-jzTQVd20MuxfuKx7Dx%nxX YX_dG&JYRJw1E_())78&qol`;+0D(m(9smFU literal 0 HcmV?d00001 From ac45c8b5bc868492226a9c29409e3b7eb7033a6b Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Wed, 31 Aug 2022 10:17:48 +0100 Subject: [PATCH 2/3] Adding move data, types, and some Pokemon data --- constants/move_constants.asm | 13 +++++ constants/pokedex_constants.asm | 59 +++++++++++++++++++--- constants/pokemon_constants.asm | 87 ++++++++++++++++++--------------- constants/type_constants.asm | 3 ++ data/moves/animations.asm | 26 ++++++++++ data/moves/moves.asm | 13 +++++ data/moves/names.asm | 13 +++++ data/moves/sfx.asm | 13 +++++ data/pokemon/menu_icons.asm | 51 +++++++++++++++++-- data/pokemon/names.asm | 81 ++++++++++++++++-------------- data/pokemon/palettes.asm | 85 ++++++++++++++++++++++++-------- data/types/names.asm | 9 +++- data/types/type_matchups.asm | 28 +++++++++++ engine/battle/core.asm | 9 +++- 14 files changed, 383 insertions(+), 107 deletions(-) diff --git a/constants/move_constants.asm b/constants/move_constants.asm index 570be95e..cd43175b 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -171,6 +171,19 @@ const SLASH ; a3 const SUBSTITUTE ; a4 const STRUGGLE ; a5 + const FAIRY_WIND ; a6 + const DRAININGKISS ; a7 + const METAL_SOUND ; a8 + const MAGNET_BOMB ; a9 + const IRON_DEFENSE ; aa + const DAZZLE_GLEAM ; ab + const NIGHT_SLASH ; ac + const FEINT_ATTACK ; ad + const IRON_HEAD ; ae + const BRUTAL_SWING ; af + const CHARM ; b0 + const SWEET_KISS ; b1 + const BULLET_PUNCH ; b2 DEF NUM_ATTACKS EQU const_value - 1 ; Moves do double duty as animation identifiers. diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index a839a03a..f4d6759e 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -12,7 +12,7 @@ const DEX_CHARIZARD ; 6 const DEX_SQUIRTLE ; 7 const DEX_WARTORTLE ; 8 - const DEX_BLASTOISE ; 9 + const DEX_TOTARTLE ; 9 const DEX_CATERPIE ; 10 const DEX_METAPOD ; 11 const DEX_BUTTERFREE ; 12 @@ -30,6 +30,7 @@ const DEX_ARBOK ; 24 const DEX_PIKACHU ; 25 const DEX_RAICHU ; 26 + const DEX_GOROCHU const DEX_SANDSHREW ; 27 const DEX_SANDSLASH ; 28 const DEX_NIDORAN_F ; 29 @@ -38,29 +39,41 @@ const DEX_NIDORAN_M ; 32 const DEX_NIDORINO ; 33 const DEX_NIDOKING ; 34 + const DEX_NIDOREIGN const DEX_CLEFAIRY ; 35 const DEX_CLEFABLE ; 36 + const DEX_MIKON const DEX_VULPIX ; 37 const DEX_NINETALES ; 38 const DEX_JIGGLYPUFF ; 39 const DEX_WIGGLYTUFF ; 40 + const DEX_BITTYBAT const DEX_ZUBAT ; 41 const DEX_GOLBAT ; 42 const DEX_ODDISH ; 43 const DEX_GLOOM ; 44 const DEX_VILEPLUME ; 45 + const DEX_BELLOSSOM + const DEX_PARA const DEX_PARAS ; 46 const DEX_PARASECT ; 47 const DEX_VENONAT ; 48 const DEX_VENOMOTH ; 49 + const DEX_CHEEP + const DEX_JABETTA + const DEX_RIBBITO + const DEX_CROAKOZUNA const DEX_DIGLETT ; 50 const DEX_DUGTRIO ; 51 + const DEX_KONYA const DEX_MEOWTH ; 52 const DEX_PERSIAN ; 53 const DEX_PSYDUCK ; 54 + const DEX_WEIRDUCK const DEX_GOLDUCK ; 55 const DEX_MANKEY ; 56 const DEX_PRIMEAPE ; 57 + const DEX_PUDI const DEX_GROWLITHE ; 58 const DEX_ARCANINE ; 59 const DEX_POLIWAG ; 60 @@ -75,22 +88,33 @@ const DEX_BELLSPROUT ; 69 const DEX_WEEPINBELL ; 70 const DEX_VICTREEBEL ; 71 + const DEX_TSUBOMITTO const DEX_TENTACOOL ; 72 const DEX_TENTACRUEL ; 73 const DEX_GEODUDE ; 74 const DEX_GRAVELER ; 75 const DEX_GOLEM ; 76 + const DEX_BLOTTLE + const DEX_PENDRAKEN + const DEX_PUCHIKOON const DEX_PONYTA ; 77 const DEX_RAPIDASH ; 78 const DEX_SLOWPOKE ; 79 const DEX_SLOWBRO ; 80 const DEX_MAGNEMITE ; 81 + const DEX_MAGNETITE const DEX_MAGNETON ; 82 - const DEX_FARFETCHD ; 83 + const DEX_BARUNDA + const DEX_FARFETCHD ; 83 + const DEX_MADAAMU + const DEX_BLASTYKE + const DEX_BLASTOISE + const DEX_HINAAZU const DEX_DODUO ; 84 - const DEX_DODRIO ; 85 + const DEX_DODRIO ; 85 const DEX_SEEL ; 86 const DEX_DEWGONG ; 87 + const DEX_BETOBEBII const DEX_GRIMER ; 88 const DEX_MUK ; 89 const DEX_SHELLDER ; 90 @@ -101,14 +125,22 @@ const DEX_ONIX ; 95 const DEX_DROWZEE ; 96 const DEX_HYPNO ; 97 + const DEX_KOTORA + const DEX_GAOTORA + const DEX_GOROTORA const DEX_KRABBY ; 98 const DEX_KINGLER ; 99 const DEX_VOLTORB ; 100 const DEX_ELECTRODE ; 101 + const DEX_CACTUS + const DEX_CROCKY + const DEX_DEER const DEX_EXEGGCUTE ; 102 const DEX_EXEGGUTOR ; 103 const DEX_CUBONE ; 104 const DEX_MAROWAK ; 105 + const DEX_GUARDIA + const DEX_KANGASKHAN ; 115 const DEX_HITMONLEE ; 106 const DEX_HITMONCHAN ; 107 const DEX_LICKITUNG ; 108 @@ -117,26 +149,39 @@ const DEX_RHYHORN ; 111 const DEX_RHYDON ; 112 const DEX_CHANSEY ; 113 - const DEX_TANGELA ; 114 - const DEX_KANGASKHAN ; 115 + const DEX_MONJA + const DEX_TANGELA ; 114 + const DEX_DECILLA + const DEX_GYAOON + const DEX_OMEGA const DEX_HORSEA ; 116 const DEX_SEADRA ; 117 + const DEX_GYOPIN const DEX_GOLDEEN ; 118 const DEX_SEAKING ; 119 + const DEX_SKIMPER + const DEX_BAWLIGUA + const DEX_CRYITHAN const DEX_STARYU ; 120 const DEX_STARMIE ; 121 + const DEX_JAGG const DEX_MR_MIME ; 122 const DEX_SCYTHER ; 123 + const DEX_SCIZOR + const DEX_PINSIR ; 127 + const DEX_PURAKKUSU const DEX_JYNX ; 124 + const DEX_BUU const DEX_ELECTABUZZ ; 125 const DEX_MAGMAR ; 126 - const DEX_PINSIR ; 127 + const DEX_TRAMPEL ; const DEX_TAUROS ; 128 const DEX_MAGIKARP ; 129 const DEX_GYARADOS ; 130 const DEX_LAPRAS ; 131 const DEX_DITTO ; 132 - const DEX_EEVEE ; 133 + const DEX_ANIMON + const DEX_EEVEE ; 133 const DEX_VAPOREON ; 134 const DEX_JOLTEON ; 135 const DEX_FLAREON ; 136 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index ea206bb8..b77d3016 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -37,8 +37,8 @@ const BLASTOISE ; $1C const PINSIR ; $1D const TANGELA ; $1E - const_skip ; $1F - const_skip ; $20 + const GYAOON ; $1F (new) + const NIDOREIGN ; $20 (new) const GROWLITHE ; $21 const ONIX ; $22 const FEAROW ; $23 @@ -56,26 +56,26 @@ const PSYDUCK ; $2F const DROWZEE ; $30 const GOLEM ; $31 - const_skip ; $32 + const BARUNDA ; $32 (new) const MAGMAR ; $33 - const_skip ; $34 + const BUU ; $34 (new) const ELECTABUZZ ; $35 const MAGNETON ; $36 const KOFFING ; $37 - const_skip ; $38 + const DEER ; $38 (new) const MANKEY ; $39 const SEEL ; $3A const DIGLETT ; $3B const TAUROS ; $3C - const_skip ; $3D - const_skip ; $3E - const_skip ; $3F + const TRAMPEL ; $3D (new) + const CROCKY ; $3E (new) + const BLOTTLE ; $3F (new) const FARFETCHD ; $40 const VENONAT ; $41 const DRAGONITE ; $42 - const_skip ; $43 - const_skip ; $44 - const_skip ; $45 + const CACTUS ; $43 (new) + const JAGG ; $44 (new) + const BITTYBAT ; $45 (new) const DODUO ; $46 const POLIWAG ; $47 const JYNX ; $48 @@ -85,23 +85,23 @@ const DITTO ; $4C const MEOWTH ; $4D const KRABBY ; $4E - const_skip ; $4F - const_skip ; $50 - const_skip ; $51 + const CHEEP ; $4F (new) + const JABETTA ; $50 (new) + const MIKON ; $51 (new) const VULPIX ; $52 const NINETALES ; $53 const PIKACHU ; $54 const RAICHU ; $55 - const_skip ; $56 - const_skip ; $57 + const RIBBITO ; $56 (new) + const CROAKOZUNA ; $57 (new) const DRATINI ; $58 const DRAGONAIR ; $59 const KABUTO ; $5A const KABUTOPS ; $5B const HORSEA ; $5C const SEADRA ; $5D - const_skip ; $5E - const_skip ; $5F + const BAWLIGUA ; $5E (new) + const CRYITHAN ; $5F (new) const SANDSHREW ; $60 const SANDSLASH ; $61 const OMANYTE ; $62 @@ -121,38 +121,38 @@ const WEEDLE ; $70 const KAKUNA ; $71 const BEEDRILL ; $72 - const_skip ; $73 + const MADAAMU ; $73 (new) const DODRIO ; $74 const PRIMEAPE ; $75 const DUGTRIO ; $76 const VENOMOTH ; $77 const DEWGONG ; $78 - const_skip ; $79 - const_skip ; $7A + const PURAKKUSU ; $79 (new) + const PENDRAKEN ; $7A (new) const CATERPIE ; $7B const METAPOD ; $7C const BUTTERFREE ; $7D const MACHAMP ; $7E - const_skip ; $7F + const WEIRDUCK ; $7F (new) const GOLDUCK ; $80 const HYPNO ; $81 const GOLBAT ; $82 const MEWTWO ; $83 const SNORLAX ; $84 const MAGIKARP ; $85 - const_skip ; $86 - const_skip ; $87 + const KONYA ; $86 (new) + const OMEGA ; $87 (new) const MUK ; $88 - const_skip ; $89 + const DECILLA ; $89 (new) const KINGLER ; $8A const CLOYSTER ; $8B - const_skip ; $8C + const MAGNETITE ; $8C (new) const ELECTRODE ; $8D const CLEFABLE ; $8E const WEEZING ; $8F const PERSIAN ; $90 const MAROWAK ; $91 - const_skip ; $92 + const GUARDIA ; $92 (new) const HAUNTER ; $93 const ABRA ; $94 const ALAKAZAM ; $95 @@ -162,13 +162,13 @@ const BULBASAUR ; $99 const VENUSAUR ; $9A const TENTACRUEL ; $9B - const_skip ; $9C + const GYOPIN ; $9C (new) const GOLDEEN ; $9D const SEAKING ; $9E - const_skip ; $9F - const_skip ; $A0 - const_skip ; $A1 - const_skip ; $A2 + const KOTORA ; $9F (new) + const GAOTORA ; $A0 (new) + const GOROTORA ; $A1 (new) + const PUCHIKOON ; $A2 (new) const PONYTA ; $A3 const RAPIDASH ; $A4 const RATTATA ; $A5 @@ -178,25 +178,34 @@ const GEODUDE ; $A9 const PORYGON ; $AA const AERODACTYL ; $AB - const_skip ; $AC + const BLASTYKE ; $AC (new) const MAGNEMITE ; $AD - const_skip ; $AE - const_skip ; $AF + const SKIMPER ; $AE (new) + const GOROCHU ; $AF (new) const CHARMANDER ; $B0 const SQUIRTLE ; $B1 const CHARMELEON ; $B2 const WARTORTLE ; $B3 const CHARIZARD ; $B4 - const_skip ; $B5 - const FOSSIL_KABUTOPS ; $B6 - const FOSSIL_AERODACTYL ; $B7 - const MON_GHOST ; $B8 + const TOTARTLE ; $B5 (new) + const FOSSIL_KABUTOPS ; $B6 (missingno.) + const FOSSIL_AERODACTYL ; $B7 (missingno.) + const MON_GHOST ; $B8 (missingno.) const ODDISH ; $B9 const GLOOM ; $BA const VILEPLUME ; $BB const BELLSPROUT ; $BC const WEEPINBELL ; $BD const VICTREEBEL ; $BE + const TSUBOMITTO ; $BF (new) + const ANIMON ; $C0 (new) + const MONJA ; $C1 (new) + const PARA ; $C2 (new) + const HINAAZU ; $C3 (new) + const PUDI ; $C4 (new) + const BETOBEBII ; $C5 (new) + const BELLOSSOM ; $C6 (new) + const SCIZOR ; $C7 (new) DEF NUM_POKEMON_INDEXES EQU const_value - 1 diff --git a/constants/type_constants.asm b/constants/type_constants.asm index e9df7faf..494e6dce 100644 --- a/constants/type_constants.asm +++ b/constants/type_constants.asm @@ -11,6 +11,7 @@ DEF PHYSICAL EQU const_value const BIRD ; $06 const BUG ; $07 const GHOST ; $08 + const STEEL ; $09 const_next 20 @@ -22,5 +23,7 @@ DEF SPECIAL EQU const_value const PSYCHIC_TYPE ; $18 const ICE ; $19 const DRAGON ; $1A + const DARK ; $1B + const FAIRY ; $1C DEF NUM_TYPES EQU const_value diff --git a/data/moves/animations.asm b/data/moves/animations.asm index e30e4379..10374381 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -165,6 +165,19 @@ AttackAnimationPointers: dw SlashAnim dw SubstituteAnim dw StruggleAnim + dw FairyWindAnim + dw DrainingKissAnim + dw MetalSoundAnim + dw MagnetBombAnim + dw IronDefenseAnim + dw DazzleGleamAnim + dw NightSlashAnim + dw FeintAttackAnim + dw IronHeadAnim + dw BrutalSwingAnim + dw CharmAnim + dw SweetKissAnim + dw BulletPunchAnim assert_table_length NUM_ATTACKS dw ShowPicAnim dw EnemyFlashAnim @@ -243,6 +256,7 @@ DoubleSlapAnim: battle_anim DOUBLESLAP, SUBANIM_01, 0, 5 db -1 ; end +BulletPunchAnim: CometPunchAnim: battle_anim COMET_PUNCH, SUBANIM_02, 0, 4 battle_anim COMET_PUNCH, SUBANIM_02, 0, 4 @@ -282,6 +296,7 @@ VicegripAnim: battle_anim VICEGRIP, SUBANIM_2A, 0, 8 db -1 ; end +NightSlashAnim: GuillotineAnim: battle_anim GUILLOTINE, SUBANIM_2A, 0, 6 db -1 ; end @@ -301,6 +316,7 @@ CutAnim: battle_anim NO_MOVE, SUBANIM_16, 0, 4 db -1 ; end +FairyWindAnim: GustAnim: battle_anim GUST, SUBANIM_10, 1, 6 battle_anim NO_MOVE, SUBANIM_02, 0, 6 @@ -410,6 +426,7 @@ ThrashAnim: battle_anim THRASH, SUBANIM_04, 1, 6 db -1 ; end +IronHeadAnim: DoubleEdgeAnim: battle_anim LEECH_SEED, SE_LIGHT_SCREEN_PALETTE battle_anim NO_MOVE, SUBANIM_2D, 0, 6 @@ -565,6 +582,7 @@ DrillPeckAnim: battle_anim DRILL_PECK, SUBANIM_04, 1, 6 db -1 ; end +BrutalSwingAnim: SubmissionAnim: battle_anim SUBMISSION, SE_SLIDE_MON_OFF battle_anim NO_MOVE, SUBANIM_01, 0, 6 @@ -603,6 +621,7 @@ StrengthAnim: battle_anim FIRE_PUNCH, SUBANIM_04, 1, 6 db -1 ; end +DrainingKissAnim: AbsorbAnim: battle_anim ABSORB, SE_LIGHT_SCREEN_PALETTE battle_anim NO_MOVE, SUBANIM_21, 0, 6 @@ -751,6 +770,7 @@ AgilityAnim: battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE db -1 ; end +FeintAttackAnim: QuickAttackAnim: battle_anim QUICK_ATTACK, SE_SLIDE_MON_OFF battle_anim NO_MOVE, SUBANIM_04, 1, 6 @@ -776,6 +796,7 @@ MimicAnim: battle_anim MIMIC, SUBANIM_22, 1, 6 db -1 ; end +MetalSoundAnim: ScreechAnim: battle_anim SCREECH, SUBANIM_12, 1, 6 db -1 ; end @@ -799,6 +820,7 @@ RecoverAnim: battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE db -1 ; end +IronDefenseAnim: HardenAnim: battle_anim HARDEN, SE_LIGHT_SCREEN_PALETTE battle_anim NO_MOVE, SUBANIM_43, 1, 6 @@ -903,6 +925,7 @@ SelfdestructAnim: battle_anim SELFDESTRUCT, SUBANIM_34, 1, 3 db -1 ; end +MagnetBombAnim: EggBombAnim: battle_anim EGG_BOMB, SUBANIM_41, 1, 4 battle_anim EGG_BOMB, SUBANIM_42, 1, 4 @@ -1019,6 +1042,8 @@ LeechLifeAnim: battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH db -1 ; end +SweetKissAnim: +CharmAnim: LovelyKissAnim: battle_anim LOVELY_KISS, SUBANIM_12, 0, 6 db -1 ; end @@ -1052,6 +1077,7 @@ SporeAnim: battle_anim SPORE, SUBANIM_36, 0, 6 db -1 ; end +DazzleGleamAnim: FlashAnim: battle_anim LEECH_SEED, SE_LIGHT_SCREEN_PALETTE battle_anim GLARE, SE_DARK_SCREEN_FLASH diff --git a/data/moves/moves.asm b/data/moves/moves.asm index c32a89cb..413c99b9 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -176,4 +176,17 @@ Moves: move SLASH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 20 move SUBSTITUTE, SUBSTITUTE_EFFECT, 0, NORMAL, 100, 10 move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10 + move FAIRY_WIND, NO_ADDITIONAL_EFFECT, 40, FAIRY, 100, 30 + move DRAININGKISS, DRAIN_HP_EFFECT, 50, FAIRY, 100, 10 + move METAL_SOUND, SPECIAL_DOWN2_EFFECT, 0, STEEL, 85, 40 + move MAGNET_BOMB, SWIFT_EFFECT, 60, STEEL, 100, 20 + move IRON_DEFENSE, DEFENSE_UP2_EFFECT, 0, STEEL, 100, 15 + move DAZZLE_GLEAM, NO_ADDITIONAL_EFFECT, 80, FAIRY, 100, 10 + move NIGHT_SLASH, NO_ADDITIONAL_EFFECT, 70, DARK, 100, 15 + move FEINT_ATTACK, SWIFT_EFFECT, 60, DARK, 100, 20 + move IRON_HEAD, FLINCH_SIDE_EFFECT2, 80, STEEL, 100, 15 + move BRUTAL_SWING, NO_ADDITIONAL_EFFECT, 60, DARK, 100, 20 + move CHARM, ATTACK_DOWN2_EFFECT, 0, FAIRY, 100, 20 + move SWEET_KISS, CONFUSION_EFFECT, 0, FAIRY, 75, 10 + move BULLET_PUNCH, NO_ADDITIONAL_EFFECT, 40, STEEL, 100, 30 assert_table_length NUM_ATTACKS diff --git a/data/moves/names.asm b/data/moves/names.asm index e9591619..66604163 100644 --- a/data/moves/names.asm +++ b/data/moves/names.asm @@ -165,4 +165,17 @@ MoveNames:: li "SLASH" li "SUBSTITUTE" li "STRUGGLE" + li "FAIRY WIND" + li "DRAININGKISS" + li "METAL SOUND" + li "MAGNET BOMB" + li "IRON DEFENSE" + li "DAZZLE GLEAM" + li "NIGHT SLASH" + li "FEINT ATTACK" + li "IRON HEAD" + li "BRUTAL SWING" + li "CHARM" + li "SWEET KISS" + li "BULLET PUNCH" assert_list_length NUM_ATTACKS diff --git a/data/moves/sfx.asm b/data/moves/sfx.asm index c3f01f4e..2cf52108 100644 --- a/data/moves/sfx.asm +++ b/data/moves/sfx.asm @@ -166,5 +166,18 @@ MoveSoundTable: db SFX_NOT_VERY_EFFECTIVE, $01, $ff ; SLASH db SFX_BATTLE_2C, $d8, $04 ; SUBSTITUTE db SFX_BATTLE_0B, $00, $80 ; STRUGGLE + db SFX_BATTLE_12, $00, $c0 ; FAIRY_WIND + db SFX_BATTLE_24, $00, $80 ; DRAININGKISS + db SFX_BATTLE_31, $00, $80 ; METAL_SOUND + db SFX_BATTLE_34, $00, $40 ; MAGNET_BOMB + db SFX_BATTLE_14, $11, $20 ; IRON_DEFENSE + db SFX_BATTLE_13, $f8, $ff ; DAZZLE_GLEAM + db SFX_BATTLE_0F, $00, $80 ; NIGHT_SLASH + db SFX_BATTLE_25, $00, $10 ; FEINT_ATTACK + db SFX_SUPER_EFFECTIVE, $20, $c0 ; IRON_HEAD + db SFX_BATTLE_23, $01, $c0 ; BRUTAL_SWING + db SFX_BATTLE_09, $88, $10 ; CHARM + db SFX_BATTLE_09, $88, $10 ; SWEET_KISS + db SFX_BATTLE_0B, $01, $80 ; BULLET_PUNCH assert_table_length NUM_ATTACKS db SFX_BATTLE_0B, $00, $80 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index d6ed5b35..59fe58db 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -8,7 +8,7 @@ MonPartyData: nybble ICON_MON ; Charizard nybble ICON_WATER ; Squirtle nybble ICON_WATER ; Wartortle - nybble ICON_WATER ; Blastoise + nybble ICON_WATER ; Totartle nybble ICON_BUG ; Caterpie nybble ICON_BUG ; Metapod nybble ICON_BUG ; Butterfree @@ -26,6 +26,7 @@ MonPartyData: nybble ICON_SNAKE ; Arbok nybble ICON_FAIRY ; Pikachu nybble ICON_FAIRY ; Raichu + nybble ICON_FAIRY ; Gorochu nybble ICON_MON ; Sandshrew nybble ICON_MON ; Sandslash nybble ICON_MON ; NidoranF @@ -34,29 +35,41 @@ MonPartyData: nybble ICON_MON ; NidoranM nybble ICON_MON ; Nidorino nybble ICON_MON ; Nidoking + nybble ICON_MON ; Nidoreign nybble ICON_FAIRY ; Clefairy nybble ICON_FAIRY ; Clefable + nybble ICON_QUADRUPED ; Mikon nybble ICON_QUADRUPED ; Vulpix nybble ICON_QUADRUPED ; Ninetales nybble ICON_FAIRY ; Jigglypuff nybble ICON_FAIRY ; Wigglytuff + nybble ICON_MON ; Bittybat nybble ICON_MON ; Zubat nybble ICON_MON ; Golbat nybble ICON_GRASS ; Oddish nybble ICON_GRASS ; Gloom nybble ICON_GRASS ; Vileplume + nybble ICON_GRASS ; Bellossom + nybble ICON_BUG ; Para nybble ICON_BUG ; Paras nybble ICON_BUG ; Parasect nybble ICON_BUG ; Venonat nybble ICON_BUG ; Venomoth + nybble ICON_WATER ; Cheep + nybble ICON_WATER ; Jabetta + nybble ICON_MON ; Ribbito + nybble ICON_MON ; Croakozuna nybble ICON_MON ; Diglett nybble ICON_MON ; Dugtrio + nybble ICON_MON ; Konya nybble ICON_MON ; Meowth nybble ICON_MON ; Persian nybble ICON_MON ; Psyduck + nybble ICON_MON ; Weirduck nybble ICON_MON ; Golduck nybble ICON_MON ; Mankey nybble ICON_MON ; Primeape + nybble ICON_QUADRUPED ; Pudi nybble ICON_QUADRUPED ; Growlithe nybble ICON_QUADRUPED ; Arcanine nybble ICON_MON ; Poliwag @@ -71,22 +84,33 @@ MonPartyData: nybble ICON_GRASS ; Bellsprout nybble ICON_GRASS ; Weepinbell nybble ICON_GRASS ; Victreebel + nybble ICON_GRASS ; Tsubomitto nybble ICON_WATER ; Tentacool nybble ICON_WATER ; Tentacruel nybble ICON_MON ; Geodude nybble ICON_MON ; Graveler nybble ICON_MON ; Golem + nybble ICON_WATER ; Blottle + nybble ICON_WATER ; Pendraken + nybble ICON_QUADRUPED ; Puchikoon nybble ICON_QUADRUPED ; Ponyta nybble ICON_QUADRUPED ; Rapidash nybble ICON_QUADRUPED ; Slowpoke nybble ICON_MON ; Slowbro nybble ICON_BALL ; Magnemite + nybble ICON_BALL ; Magnetite nybble ICON_BALL ; Magneton + nybble ICON_BALL ; Barunda nybble ICON_BIRD ; Farfetch'd + nybble ICON_BIRD ; Madaamu + nybble ICON_WATER ; Blastyke + nybble ICON_WATER ; Blastoise + nybble ICON_BIRD ; Hinaazu nybble ICON_BIRD ; Doduo nybble ICON_BIRD ; Dodrio nybble ICON_WATER ; Seel nybble ICON_WATER ; Dewgong + nybble ICON_MON ; Betobebii nybble ICON_MON ; Grimer nybble ICON_MON ; Muk nybble ICON_HELIX ; Shellder @@ -97,14 +121,22 @@ MonPartyData: nybble ICON_SNAKE ; Onix nybble ICON_MON ; Drowzee nybble ICON_MON ; Hypno + nybble ICON_QUADRUPED ; Kotora + nybble ICON_QUADRUPED ; Gaotora + nybble ICON_QUADRUPED ; Gorotora nybble ICON_WATER ; Krabby nybble ICON_WATER ; Kingler nybble ICON_BALL ; Voltorb nybble ICON_BALL ; Electrode + nybble ICON_GRASS ; Cactus + nybble ICON_MON ; Crocky + nybble ICON_QUADRUPED ; Deer nybble ICON_GRASS ; Exeggcute nybble ICON_GRASS ; Exeggutor nybble ICON_MON ; Cubone nybble ICON_MON ; Marowak + nybble ICON_MON ; Guardia + nybble ICON_MON ; Kangaskhan nybble ICON_MON ; Hitmonlee nybble ICON_MON ; Hitmonchan nybble ICON_MON ; Lickitung @@ -113,25 +145,38 @@ MonPartyData: nybble ICON_QUADRUPED ; Rhyhorn nybble ICON_MON ; Rhydon nybble ICON_FAIRY ; Chansey + nybble ICON_GRASS ; Monja nybble ICON_GRASS ; Tangela - nybble ICON_MON ; Kangaskhan + nybble ICON_MON ; Decilla + nybble ICON_MON ; Gyaoon + nybble ICON_MON ; Omega nybble ICON_WATER ; Horsea nybble ICON_WATER ; Seadra + nybble ICON_WATER ; Gyopin nybble ICON_WATER ; Goldeen nybble ICON_WATER ; Seaking + nybble ICON_MON ; Skimper + nybble ICON_MON ; Bawligua + nybble ICON_MON ; Cryithan nybble ICON_HELIX ; Staryu nybble ICON_HELIX ; Starmie + nybble ICON_WATER ; Jagg nybble ICON_MON ; Mr.Mime nybble ICON_BUG ; Scyther + nybble ICON_BUG ; Scizor + nybble ICON_BUG ; Pinsir + nybble ICON_BUG ; Purakkusu nybble ICON_MON ; Jynx + nybble ICON_MON ; Buu nybble ICON_MON ; Electabuzz nybble ICON_MON ; Magmar - nybble ICON_BUG ; Pinsir + nybble ICON_MON ; Trampel nybble ICON_QUADRUPED ; Tauros nybble ICON_WATER ; Magikarp nybble ICON_SNAKE ; Gyarados nybble ICON_WATER ; Lapras nybble ICON_MON ; Ditto + nybble ICON_MON ; Animon nybble ICON_QUADRUPED ; Eevee nybble ICON_QUADRUPED ; Vaporeon nybble ICON_QUADRUPED ; Jolteon diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 56aa9f5d..f208eb05 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -30,8 +30,8 @@ MonsterNames:: db "BLASTOISE@" db "PINSIR@@@@" db "TANGELA@@@" - db "MISSINGNO." - db "MISSINGNO." + db "GYAOON@@@@" + db "NIDOREIGN@" db "GROWLITHE@" db "ONIX@@@@@@" db "FEAROW@@@@" @@ -49,26 +49,26 @@ MonsterNames:: db "PSYDUCK@@@" db "DROWZEE@@@" db "GOLEM@@@@@" - db "MISSINGNO." + db "BARUNDA@@@" db "MAGMAR@@@@" - db "MISSINGNO." + db "BUU@@@@@@@" db "ELECTABUZZ" db "MAGNETON@@" db "KOFFING@@@" - db "MISSINGNO." + db "DEER@@@@@@" db "MANKEY@@@@" db "SEEL@@@@@@" db "DIGLETT@@@" db "TAUROS@@@@" - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." + db "TRAMPEL@@@" + db "CROCKY@@@@" + db "BLOTTLE@@@" db "FARFETCH'D" db "VENONAT@@@" db "DRAGONITE@" - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." + db "CACTUS@@@@" + db "JAGG@@@@@@" + db "BITTYBAT@@" db "DODUO@@@@@" db "POLIWAG@@@" db "JYNX@@@@@@" @@ -78,23 +78,23 @@ MonsterNames:: db "DITTO@@@@@" db "MEOWTH@@@@" db "KRABBY@@@@" - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." + db "CHEEP@@@@@" + db "JABETTA@@@" + db "MIKON@@@@@" db "VULPIX@@@@" db "NINETALES@" db "PIKACHU@@@" db "RAICHU@@@@" - db "MISSINGNO." - db "MISSINGNO." + db "RIBBITO@@@" + db "CROAKOZUNA" db "DRATINI@@@" db "DRAGONAIR@" db "KABUTO@@@@" db "KABUTOPS@@" db "HORSEA@@@@" db "SEADRA@@@@" - db "MISSINGNO." - db "MISSINGNO." + db "BAWLIGUA@@" + db "CRYITHAN@@" db "SANDSHREW@" db "SANDSLASH@" db "OMANYTE@@@" @@ -114,38 +114,38 @@ MonsterNames:: db "WEEDLE@@@@" db "KAKUNA@@@@" db "BEEDRILL@@" - db "MISSINGNO." + db "MADAAMU@@@" db "DODRIO@@@@" db "PRIMEAPE@@" db "DUGTRIO@@@" db "VENOMOTH@@" db "DEWGONG@@@" - db "MISSINGNO." - db "MISSINGNO." + db "PURAKKUSU@" + db "PENDRAKEN@" db "CATERPIE@@" db "METAPOD@@@" db "BUTTERFREE" db "MACHAMP@@@" - db "MISSINGNO." + db "WEIRDUCK@@" db "GOLDUCK@@@" db "HYPNO@@@@@" db "GOLBAT@@@@" db "MEWTWO@@@@" db "SNORLAX@@@" db "MAGIKARP@@" - db "MISSINGNO." - db "MISSINGNO." + db "KONYA@@@@@" + db "OMEGA@@@@@" db "MUK@@@@@@@" - db "MISSINGNO." + db "DECILLA@@@" db "KINGLER@@@" db "CLOYSTER@@" - db "MISSINGNO." + db "MAGNETITE@" db "ELECTRODE@" db "CLEFABLE@@" db "WEEZING@@@" db "PERSIAN@@@" db "MAROWAK@@@" - db "MISSINGNO." + db "GUARDIA@@@" db "HAUNTER@@@" db "ABRA@@@@@@" db "ALAKAZAM@@" @@ -155,13 +155,13 @@ MonsterNames:: db "BULBASAUR@" db "VENUSAUR@@" db "TENTACRUEL" - db "MISSINGNO." + db "GYOPIN@@@@" db "GOLDEEN@@@" db "SEAKING@@@" - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." + db "KOTORA@@@@" + db "GAOTORA@@@" + db "GOROTORA@@" + db "PUCHIKOON@" db "PONYTA@@@@" db "RAPIDASH@@" db "RATTATA@@@" @@ -171,16 +171,16 @@ MonsterNames:: db "GEODUDE@@@" db "PORYGON@@@" db "AERODACTYL" - db "MISSINGNO." + db "BLASTYKE@@" db "MAGNEMITE@" - db "MISSINGNO." - db "MISSINGNO." + db "SKIMPER@@@" + db "GOROCHU@@@" db "CHARMANDER" db "SQUIRTLE@@" db "CHARMELEON" db "WARTORTLE@" db "CHARIZARD@" - db "MISSINGNO." + db "TOTARTLE@@" db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." @@ -190,4 +190,13 @@ MonsterNames:: db "BELLSPROUT" db "WEEPINBELL" db "VICTREEBEL" + db "TSUBOMITTO" + db "ANIMON@@@@" + db "MONJA@@@@@" + db "PARA@@@@@@" + db "HINAAZU@@@" + db "PUDI@@@@@@" + db "BETOBEBII@" + db "BELLOSSOM@" + db "SCIZOR@@@@" assert_table_length NUM_POKEMON_INDEXES diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 2ce500aa..221412b7 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -9,7 +9,7 @@ MonsterPalettes: db PAL_REDMON ; CHARIZARD db PAL_CYANMON ; SQUIRTLE db PAL_CYANMON ; WARTORTLE - db PAL_CYANMON ; BLASTOISE + db PAL_CYANMON ; TOTARTLE db PAL_GREENMON ; CATERPIE db PAL_GREENMON ; METAPOD db PAL_CYANMON ; BUTTERFREE @@ -19,14 +19,15 @@ MonsterPalettes: db PAL_BROWNMON ; PIDGEY db PAL_BROWNMON ; PIDGEOTTO db PAL_BROWNMON ; PIDGEOT - db PAL_GREYMON ; RATTATA - db PAL_GREYMON ; RATICATE + db PAL_PURPLEMON ; RATTATA + db PAL_BROWNMON ; RATICATE db PAL_BROWNMON ; SPEAROW db PAL_BROWNMON ; FEAROW db PAL_PURPLEMON ; EKANS db PAL_PURPLEMON ; ARBOK db PAL_YELLOWMON ; PIKACHU db PAL_YELLOWMON ; RAICHU + db PAL_YELLOWMON ; GOROCHU db PAL_BROWNMON ; SANDSHREW db PAL_BROWNMON ; SANDSLASH db PAL_BLUEMON ; NIDORAN_F @@ -35,30 +36,42 @@ MonsterPalettes: db PAL_PURPLEMON ; NIDORAN_M db PAL_PURPLEMON ; NIDORINO db PAL_PURPLEMON ; NIDOKING + db PAL_GREYMON ; NIDOREIGN db PAL_PINKMON ; CLEFAIRY db PAL_PINKMON ; CLEFABLE + db PAL_REDMON ; MIKON db PAL_REDMON ; VULPIX db PAL_YELLOWMON ; NINETALES db PAL_PINKMON ; JIGGLYPUFF db PAL_PINKMON ; WIGGLYTUFF + db PAL_BLUEMON ; BITTYBAT db PAL_BLUEMON ; ZUBAT db PAL_BLUEMON ; GOLBAT db PAL_GREENMON ; ODDISH db PAL_REDMON ; GLOOM db PAL_REDMON ; VILEPLUME + db PAL_PURPLEMON ; BELLOSSOM + db PAL_REDMON ; PARA db PAL_REDMON ; PARAS db PAL_REDMON ; PARASECT db PAL_PURPLEMON ; VENONAT db PAL_PURPLEMON ; VENOMOTH + db PAL_PURPLEMON ; CHEEP + db PAL_PURPLEMON ; JABETTA + db PAL_GREENMON ; RIBBITO + db PAL_GREENMON ; CROAKOZUNA db PAL_BROWNMON ; DIGLETT db PAL_BROWNMON ; DUGTRIO + db PAL_YELLOWMON ; KONYA db PAL_YELLOWMON ; MEOWTH db PAL_YELLOWMON ; PERSIAN db PAL_YELLOWMON ; PSYDUCK + db PAL_GREENMON ; WEIRDUCK db PAL_CYANMON ; GOLDUCK db PAL_BROWNMON ; MANKEY db PAL_BROWNMON ; PRIMEAPE - db PAL_BROWNMON ; GROWLITHE + db PAL_REDMON ; PUDI + db PAL_REDMON ; GROWLITHE db PAL_REDMON ; ARCANINE db PAL_BLUEMON ; POLIWAG db PAL_BLUEMON ; POLIWHIRL @@ -72,40 +85,59 @@ MonsterPalettes: db PAL_GREENMON ; BELLSPROUT db PAL_GREENMON ; WEEPINBELL db PAL_GREENMON ; VICTREEBEL + db PAL_GREENMON ; TSUBOMITTO db PAL_CYANMON ; TENTACOOL db PAL_CYANMON ; TENTACRUEL db PAL_GREYMON ; GEODUDE db PAL_GREYMON ; GRAVELER db PAL_GREYMON ; GOLEM + db PAL_MEWMON ; BLOTTLE + db PAL_MEWMON ; PENDRAKEN + db PAL_REDMON ; PUCHIKOON db PAL_REDMON ; PONYTA db PAL_REDMON ; RAPIDASH db PAL_PINKMON ; SLOWPOKE db PAL_PINKMON ; SLOWBRO db PAL_GREYMON ; MAGNEMITE + db PAL_GREYMON ; MAGNETITE db PAL_GREYMON ; MAGNETON + db PAL_PINKMON ; BARUNDA db PAL_BROWNMON ; FARFETCHD + db PAL_BROWNMON ; MADAAMU + db PAL_BLUEMON ; BLASTYKE + db PAL_BLUEMON ; BLASTOISE + db PAL_BROWNMON ; HINAAZU db PAL_BROWNMON ; DODUO db PAL_BROWNMON ; DODRIO db PAL_BLUEMON ; SEEL db PAL_BLUEMON ; DEWGONG + db PAL_PURPLEMON ; BETOBEBII db PAL_PURPLEMON ; GRIMER db PAL_PURPLEMON ; MUK - db PAL_GREYMON ; SHELLDER - db PAL_GREYMON ; CLOYSTER + db PAL_PURPLEMON ; SHELLDER + db PAL_PURPLEMON ; CLOYSTER db PAL_PURPLEMON ; GASTLY db PAL_PURPLEMON ; HAUNTER db PAL_PURPLEMON ; GENGAR db PAL_GREYMON ; ONIX db PAL_YELLOWMON ; DROWZEE db PAL_YELLOWMON ; HYPNO + db PAL_YELLOWMON ; KOTORA + db PAL_YELLOWMON ; GAOTORA + db PAL_YELLOWMON ; GOROTORA db PAL_REDMON ; KRABBY db PAL_REDMON ; KINGLER - db PAL_YELLOWMON ; VOLTORB - db PAL_YELLOWMON ; ELECTRODE + db PAL_REDMON ; VOLTORB + db PAL_REDMON ; ELECTRODE + db PAL_GREENMON ; CACTUS + db PAL_GREENMON ; CROCKY + db PAL_BROWNMON ; DEER db PAL_PINKMON ; EXEGGCUTE db PAL_GREENMON ; EXEGGUTOR - db PAL_GREYMON ; CUBONE - db PAL_GREYMON ; MAROWAK + db PAL_BROWNMON ; CUBONE + db PAL_BROWNMON ; MAROWAK + db PAL_BROWNMON ; GUARDIA + db PAL_BROWNMON ; KANGASKHAN db PAL_BROWNMON ; HITMONLEE db PAL_BROWNMON ; HITMONCHAN db PAL_PINKMON ; LICKITUNG @@ -114,40 +146,53 @@ MonsterPalettes: db PAL_GREYMON ; RHYHORN db PAL_GREYMON ; RHYDON db PAL_PINKMON ; CHANSEY + db PAL_BLUEMON ; MONJA db PAL_BLUEMON ; TANGELA - db PAL_BROWNMON ; KANGASKHAN + db PAL_GREENMON ; DECILLA + db PAL_GREENMON ; GYAOON + db PAL_GREYMON ; OMEGA db PAL_CYANMON ; HORSEA db PAL_CYANMON ; SEADRA + db PAL_REDMON ; GYOPIN db PAL_REDMON ; GOLDEEN db PAL_REDMON ; SEAKING + db PAL_CYANMON ; SKIMPER + db PAL_CYANMON ; BAWLIGUA + db PAL_CYANMON ; CRYITHAN db PAL_REDMON ; STARYU - db PAL_GREYMON ; STARMIE + db PAL_PURPLEMON ; STARMIE + db PAL_BLUEMON ; JAGG db PAL_PINKMON ; MR_MIME db PAL_GREENMON ; SCYTHER - db PAL_MEWMON ; JYNX + db PAL_GREENMON ; SCIZOR + db PAL_BROWNMON ; PINSIR + db PAL_BROWNMON ; PURAKKUSU + db PAL_REDBAR ; JYNX + db PAL_BLUEMON ; BUU db PAL_YELLOWMON ; ELECTABUZZ db PAL_REDMON ; MAGMAR - db PAL_BROWNMON ; PINSIR - db PAL_GREYMON ; TAUROS + db PAL_GREYMON ; TRAMPEL + db PAL_BROWNMON ; TAUROS db PAL_REDMON ; MAGIKARP db PAL_BLUEMON ; GYARADOS db PAL_CYANMON ; LAPRAS - db PAL_GREYMON ; DITTO - db PAL_GREYMON ; EEVEE + db PAL_PURPLEMON ; DITTO + db PAL_PURPLEMON ; ANIMON + db PAL_BROWNMON ; EEVEE db PAL_CYANMON ; VAPOREON db PAL_YELLOWMON ; JOLTEON db PAL_REDMON ; FLAREON - db PAL_GREYMON ; PORYGON + db PAL_MEWMON ; PORYGON db PAL_BLUEMON ; OMANYTE db PAL_BLUEMON ; OMASTAR db PAL_BROWNMON ; KABUTO db PAL_BROWNMON ; KABUTOPS db PAL_GREYMON ; AERODACTYL - db PAL_PINKMON ; SNORLAX + db PAL_MEWMON ; SNORLAX db PAL_BLUEMON ; ARTICUNO db PAL_YELLOWMON ; ZAPDOS db PAL_REDMON ; MOLTRES - db PAL_GREYMON ; DRATINI + db PAL_BLUEMON ; DRATINI db PAL_BLUEMON ; DRAGONAIR db PAL_BROWNMON ; DRAGONITE db PAL_MEWMON ; MEWTWO diff --git a/data/types/names.asm b/data/types/names.asm index b63c072e..fb5ca4a9 100644 --- a/data/types/names.asm +++ b/data/types/names.asm @@ -10,8 +10,9 @@ TypeNames: dw .Bird dw .Bug dw .Ghost + dw .Steel -REPT FIRE - GHOST - 1 +REPT FIRE - STEEL - 1 dw .Normal ENDR @@ -22,6 +23,8 @@ ENDR dw .Psychic dw .Ice dw .Dragon + dw .Dark + dw .Fairy assert_table_length NUM_TYPES @@ -41,3 +44,7 @@ ENDR .Bug: db "BUG@" .Ghost: db "GHOST@" .Dragon: db "DRAGON@" +.Steel: db "STEEL@" +.Fairy: db "FAIRY@" +.Dark: db "DARK@" + diff --git a/data/types/type_matchups.asm b/data/types/type_matchups.asm index 52e3d956..51eca32d 100644 --- a/data/types/type_matchups.asm +++ b/data/types/type_matchups.asm @@ -82,4 +82,32 @@ TypeEffects: db GRASS, DRAGON, NOT_VERY_EFFECTIVE db ICE, DRAGON, SUPER_EFFECTIVE db DRAGON, DRAGON, SUPER_EFFECTIVE + db DARK, PSYCHIC_TYPE, SUPER_EFFECTIVE + db DARK, GHOST, SUPER_EFFECTIVE + db DARK, DARK, SUPER_EFFECTIVE + db DARK, NORMAL, NOT_VERY_EFFECTIVE + db NORMAL, DARK, SUPER_EFFECTIVE + db BUG, DARK, SUPER_EFFECTIVE + db PSYCHIC_TYPE, DARK, NOT_VERY_EFFECTIVE + db GHOST, DARK, NOT_VERY_EFFECTIVE + db STEEL, ROCK, SUPER_EFFECTIVE + db STEEL, WATER, NOT_VERY_EFFECTIVE + db STEEL, ELECTRIC, NOT_VERY_EFFECTIVE + db STEEL, STEEL, NO_EFFECT + db WATER, STEEL, SUPER_EFFECTIVE + db ELECTRIC, STEEL, SUPER_EFFECTIVE + db POISON, STEEL, NOT_VERY_EFFECTIVE + db FIGHTING, STEEL, NOT_VERY_EFFECTIVE + db FAIRY, DRAGON, SUPER_EFFECTIVE + db FAIRY, DARK, SUPER_EFFECTIVE + db FAIRY, FIGHTING, SUPER_EFFECTIVE + db FAIRY, FIRE, NOT_VERY_EFFECTIVE + db FAIRY, POISON, NOT_VERY_EFFECTIVE + db FAIRY, STEEL, NOT_VERY_EFFECTIVE + db BUG, FAIRY, NOT_VERY_EFFECTIVE + db DARK, FAIRY, NOT_VERY_EFFECTIVE + db FIGHTING, FAIRY, NOT_VERY_EFFECTIVE + db POISON, FAIRY, SUPER_EFFECTIVE + db STEEL, FAIRY, SUPER_EFFECTIVE + db DRAGON, FAIRY, NO_EFFECT db -1 ; end diff --git a/engine/battle/core.asm b/engine/battle/core.asm index f84b759c..6d51b0cb 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -368,14 +368,21 @@ MainInBattleLoop: callfar SwitchEnemyMon .noLinkBattle ld a, [wPlayerSelectedMove] + cp BULLET_PUNCH + jr z, .PriorityMoveUsed cp QUICK_ATTACK jr nz, .playerDidNotUseQuickAttack +.PriorityMoveUsed ld a, [wEnemySelectedMove] + cp BULLET_PUNCH + jr z, .compareSpeed cp QUICK_ATTACK jr z, .compareSpeed ; if both used Quick Attack jp .playerMovesFirst ; if player used Quick Attack and enemy didn't .playerDidNotUseQuickAttack ld a, [wEnemySelectedMove] + cp BULLET_PUNCH + jr z, .enemyMovesFirst cp QUICK_ATTACK jr z, .enemyMovesFirst ; if enemy used Quick Attack and player didn't ld a, [wPlayerSelectedMove] @@ -5150,7 +5157,7 @@ MetronomePickMove: and a jr z, .pickMoveLoop cp STRUGGLE - assert NUM_ATTACKS == STRUGGLE ; random numbers greater than STRUGGLE are not moves + assert NUM_ATTACKS == BULLET_PUNCH ; rerolls if greater than the last move in index jr nc, .pickMoveLoop cp METRONOME jr z, .pickMoveLoop From f5a7cc9ffcb6292bf8d51ce9261d1e63a2323b6d Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Wed, 31 Aug 2022 11:47:05 +0100 Subject: [PATCH 3/3] Pokemon data, Gym Leader teams, palette updates and a couple of other fixes --- data/pokemon/cries.asm | 81 ++++++++++++++++++++---------------- data/pokemon/dex_order.asm | 81 ++++++++++++++++++++---------------- data/pokemon/palettes.asm | 4 +- data/pokemon/title_mons.asm | 64 ++++++++++++++--------------- data/sgb/sgb_palettes.asm | 82 ++++++++++++++++++------------------- data/trainers/parties.asm | 36 ++++++++-------- data/wild/maps/Route4.asm | 2 +- data/wild/maps/Route6.asm | 4 +- data/wild/super_rod.asm | 16 ++++---- engine/movie/title.asm | 4 +- engine/movie/title2.asm | 6 +-- maps/CeladonCity.blk | 22 +++------- maps/FuchsiaCity.blk | 18 +++++++- maps/Route23.blk | 2 +- 14 files changed, 221 insertions(+), 201 deletions(-) diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 290f5625..dc054fd8 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -36,8 +36,8 @@ CryData:: mon_cry SFX_CRY_13, $00, $80 ; Blastoise mon_cry SFX_CRY_14, $00, $80 ; Pinsir mon_cry SFX_CRY_12, $00, $80 ; Tangela - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_0F, $00, $80 ; Gyaoon + mon_cry SFX_CRY_0A, $2C, $80 ; Nidoreign mon_cry SFX_CRY_1F, $20, $40 ; Growlithe mon_cry SFX_CRY_17, $FF, $C0 ; Onix mon_cry SFX_CRY_18, $40, $A0 ; Fearow @@ -55,26 +55,26 @@ CryData:: mon_cry SFX_CRY_21, $20, $60 ; Psyduck mon_cry SFX_CRY_0D, $88, $20 ; Drowzee mon_cry SFX_CRY_12, $E0, $40 ; Golem - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_0E, $00, $80 ; Barunda mon_cry SFX_CRY_04, $FF, $30 ; Magmar - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_0D, $2E, $E0 ; Buu mon_cry SFX_CRY_06, $8F, $FF ; Electabuzz mon_cry SFX_CRY_1C, $20, $C0 ; Magneton mon_cry SFX_CRY_12, $E6, $DD ; Koffing - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_15, $40, $A5 ; Deer mon_cry SFX_CRY_0A, $DD, $60 ; Mankey mon_cry SFX_CRY_0C, $88, $C0 ; Seel mon_cry SFX_CRY_0B, $AA, $01 ; Diglett mon_cry SFX_CRY_1D, $11, $40 ; Tauros - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_03, $90, $B0 ; Trampel + mon_cry SFX_CRY_1C, $C6, $F0 ; Crocky + mon_cry SFX_CRY_13, $93, $00 ; Blottle mon_cry SFX_CRY_10, $DD, $01 ; Farfetch'd mon_cry SFX_CRY_1A, $44, $40 ; Venonat mon_cry SFX_CRY_0F, $3C, $C0 ; Dragonite - mon_cry SFX_CRY_00, $80, $10 ; MissingNo. - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. - mon_cry SFX_CRY_1D, $E0, $80 ; MissingNo. + mon_cry SFX_CRY_00, $80, $10 ; Cactus + mon_cry SFX_CRY_17, $C8, $C0 ; Jagg + mon_cry SFX_CRY_1D, $B4, $4E ; Bittybat mon_cry SFX_CRY_0B, $BB, $01 ; Doduo mon_cry SFX_CRY_0E, $FF, $FF ; Poliwag mon_cry SFX_CRY_0D, $FF, $FF ; Jynx @@ -84,23 +84,23 @@ CryData:: mon_cry SFX_CRY_0E, $FF, $FF ; Ditto mon_cry SFX_CRY_19, $77, $10 ; Meowth mon_cry SFX_CRY_20, $20, $E0 ; Krabby - mon_cry SFX_CRY_22, $FF, $40 ; MissingNo. - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. - mon_cry SFX_CRY_0E, $E0, $60 ; MissingNo. + mon_cry SFX_CRY_22, $FF, $40 ; Cheep + mon_cry SFX_CRY_22, $32, $FF ; Jabetta + mon_cry SFX_CRY_0E, $E0, $60 ; Mikon mon_cry SFX_CRY_24, $4F, $10 ; Vulpix mon_cry SFX_CRY_24, $88, $60 ; Ninetales mon_cry SFX_CRY_0F, $EE, $01 ; Pikachu mon_cry SFX_CRY_09, $EE, $08 ; Raichu - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_12, $93, $60 ; Ribbito + mon_cry SFX_CRY_12, $25, $FF ; Croakozuna mon_cry SFX_CRY_0F, $60, $40 ; Dratini mon_cry SFX_CRY_0F, $40, $80 ; Dragonair mon_cry SFX_CRY_16, $BB, $40 ; Kabuto mon_cry SFX_CRY_18, $EE, $01 ; Kabutops mon_cry SFX_CRY_19, $99, $10 ; Horsea mon_cry SFX_CRY_19, $3C, $01 ; Seadra - mon_cry SFX_CRY_0F, $40, $C0 ; MissingNo. - mon_cry SFX_CRY_0F, $20, $C0 ; MissingNo. + mon_cry SFX_CRY_0F, $40, $C0 ; Bawligua + mon_cry SFX_CRY_0F, $20, $C0 ; Cryithan mon_cry SFX_CRY_00, $20, $40 ; Sandshrew mon_cry SFX_CRY_00, $FF, $FF ; Sandslash mon_cry SFX_CRY_1F, $F0, $01 ; Omanyte @@ -120,38 +120,38 @@ CryData:: mon_cry SFX_CRY_15, $EE, $01 ; Weedle mon_cry SFX_CRY_13, $FF, $01 ; Kakuna mon_cry SFX_CRY_13, $60, $80 ; Beedrill - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_18, $19, $FF ; Luxwan mon_cry SFX_CRY_0B, $99, $20 ; Dodrio mon_cry SFX_CRY_0A, $AF, $40 ; Primeape mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio mon_cry SFX_CRY_1A, $29, $80 ; Venomoth mon_cry SFX_CRY_0C, $23, $FF ; Dewgong - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_09, $FF, $20 ; Purakkusu + mon_cry SFX_CRY_13, $3C, $00 ; Pendraken mon_cry SFX_CRY_16, $80, $20 ; Caterpie mon_cry SFX_CRY_1C, $CC, $01 ; Metapod mon_cry SFX_CRY_16, $77, $40 ; Butterfree mon_cry SFX_CRY_1F, $08, $C0 ; Machamp - mon_cry SFX_CRY_11, $20, $10 ; MissingNo. + mon_cry SFX_CRY_21, $93, $50 ; Weirduck mon_cry SFX_CRY_21, $FF, $40 ; Golduck mon_cry SFX_CRY_0D, $EE, $40 ; Hypno mon_cry SFX_CRY_1D, $FA, $80 ; Golbat mon_cry SFX_CRY_1E, $99, $FF ; Mewtwo mon_cry SFX_CRY_05, $55, $01 ; Snorlax mon_cry SFX_CRY_17, $80, $00 ; Magikarp - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_19, $C1, $1C ; Konya + mon_cry SFX_CRY_13, $00, $00 ; Omega mon_cry SFX_CRY_07, $EF, $FF ; Muk - mon_cry SFX_CRY_0F, $40, $80 ; MissingNo. + mon_cry SFX_CRY_0F, $40, $80 ; Decilla mon_cry SFX_CRY_20, $EE, $E0 ; Kingler mon_cry SFX_CRY_18, $6F, $E0 ; Cloyster - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_1C, $B1, $90 ; Magnetite mon_cry SFX_CRY_06, $A8, $90 ; Electrode mon_cry SFX_CRY_19, $AA, $20 ; Clefable mon_cry SFX_CRY_12, $FF, $FF ; Weezing mon_cry SFX_CRY_19, $99, $FF ; Persian mon_cry SFX_CRY_08, $4F, $60 ; Marowak - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_08, $00, $FF ; Guardia mon_cry SFX_CRY_1C, $30, $40 ; Haunter mon_cry SFX_CRY_1C, $C0, $01 ; Abra mon_cry SFX_CRY_1C, $98, $FF ; Alakazam @@ -161,13 +161,13 @@ CryData:: mon_cry SFX_CRY_0F, $80, $01 ; Bulbasaur mon_cry SFX_CRY_0F, $00, $C0 ; Venusaur mon_cry SFX_CRY_1A, $EE, $FF ; Tentacruel - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_16, $89, $0E ; Gyopin mon_cry SFX_CRY_16, $80, $40 ; Goldeen mon_cry SFX_CRY_16, $10, $FF ; Seaking - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_03, $A3, $01 ; Kotora + mon_cry SFX_CRY_03, $2D, $01 ; Gaotora + mon_cry SFX_CRY_03, $05, $01 ; Gorotora + mon_cry SFX_CRY_25, $37, $10 ; Puchikoon mon_cry SFX_CRY_25, $00, $80 ; Ponyta mon_cry SFX_CRY_25, $20, $C0 ; Rapidash mon_cry SFX_CRY_22, $00, $80 ; Rattata @@ -177,16 +177,16 @@ CryData:: mon_cry SFX_CRY_24, $F0, $10 ; Geodude mon_cry SFX_CRY_25, $AA, $FF ; Porygon mon_cry SFX_CRY_23, $20, $F0 ; Aerodactyl - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_13, $F7, $00 ; Blastyke mon_cry SFX_CRY_1C, $80, $60 ; Magnemite - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. - mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_0F, $63, $40 ; Skimper + mon_cry SFX_CRY_17, $C1, $E4 ; Gorochu mon_cry SFX_CRY_04, $60, $40 ; Charmander mon_cry SFX_CRY_1D, $60, $40 ; Squirtle mon_cry SFX_CRY_04, $20, $40 ; Charmeleon mon_cry SFX_CRY_1D, $20, $40 ; Wartortle mon_cry SFX_CRY_04, $00, $80 ; Charizard - mon_cry SFX_CRY_1D, $00, $80 ; MissingNo. + mon_cry SFX_CRY_1D, $00, $80 ; Totartle mon_cry SFX_CRY_00, $00, $00 ; MissingNo. mon_cry SFX_CRY_00, $00, $00 ; MissingNo. mon_cry SFX_CRY_00, $00, $00 ; MissingNo. @@ -196,4 +196,13 @@ CryData:: mon_cry SFX_CRY_21, $55, $01 ; Bellsprout mon_cry SFX_CRY_25, $44, $20 ; Weepinbell mon_cry SFX_CRY_25, $66, $CC ; Victreebel + mon_cry SFX_CRY_21, $DD, $80 ; Tsubomitto + mon_cry SFX_CRY_0E, $50, $FF ; Animon + mon_cry SFX_CRY_12, $93, $00 ; Monja + mon_cry SFX_CRY_1E, $79, $40 ; Para + mon_cry SFX_CRY_00, $00, $00 ; Hinaazu (unfinished) + mon_cry SFX_CRY_1F, $40, $01 ; Pudi + mon_cry SFX_CRY_05, $FF, $40 ; Betobebii + mon_cry SFX_CRY_00, $00, $00 ; Bellossom (unfinished) + mon_cry SFX_CRY_00, $00, $00 ; Scizor (unfinished) assert_table_length NUM_POKEMON_INDEXES diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm index 32e7a79b..b83a7c67 100644 --- a/data/pokemon/dex_order.asm +++ b/data/pokemon/dex_order.asm @@ -30,8 +30,8 @@ PokedexOrder: db DEX_BLASTOISE db DEX_PINSIR db DEX_TANGELA - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. + db DEX_GYAOON + db DEX_NIDOREIGN db DEX_GROWLITHE db DEX_ONIX db DEX_FEAROW @@ -49,26 +49,26 @@ PokedexOrder: db DEX_PSYDUCK db DEX_DROWZEE db DEX_GOLEM - db 0 ; MISSINGNO. + db DEX_BARUNDA db DEX_MAGMAR - db 0 ; MISSINGNO. + db DEX_BUU db DEX_ELECTABUZZ db DEX_MAGNETON db DEX_KOFFING - db 0 ; MISSINGNO. + db DEX_DEER db DEX_MANKEY db DEX_SEEL db DEX_DIGLETT db DEX_TAUROS - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. + db DEX_TRAMPEL + db DEX_CROCKY + db DEX_BLOTTLE db DEX_FARFETCHD db DEX_VENONAT db DEX_DRAGONITE - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. + db DEX_CACTUS + db DEX_JAGG + db DEX_BITTYBAT db DEX_DODUO db DEX_POLIWAG db DEX_JYNX @@ -78,23 +78,23 @@ PokedexOrder: db DEX_DITTO db DEX_MEOWTH db DEX_KRABBY - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. + db DEX_CHEEP + db DEX_JABETTA + db DEX_MIKON db DEX_VULPIX db DEX_NINETALES db DEX_PIKACHU db DEX_RAICHU - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. + db DEX_RIBBITO + db DEX_CROAKOZUNA db DEX_DRATINI db DEX_DRAGONAIR db DEX_KABUTO db DEX_KABUTOPS db DEX_HORSEA db DEX_SEADRA - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. + db DEX_BAWLIGUA + db DEX_CRYITHAN db DEX_SANDSHREW db DEX_SANDSLASH db DEX_OMANYTE @@ -114,38 +114,38 @@ PokedexOrder: db DEX_WEEDLE db DEX_KAKUNA db DEX_BEEDRILL - db 0 ; MISSINGNO. + db DEX_MADAAMU db DEX_DODRIO db DEX_PRIMEAPE db DEX_DUGTRIO db DEX_VENOMOTH db DEX_DEWGONG - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. + db DEX_PURAKKUSU + db DEX_PENDRAKEN db DEX_CATERPIE db DEX_METAPOD db DEX_BUTTERFREE db DEX_MACHAMP - db 0 ; MISSINGNO. + db DEX_WEIRDUCK db DEX_GOLDUCK db DEX_HYPNO db DEX_GOLBAT db DEX_MEWTWO db DEX_SNORLAX db DEX_MAGIKARP - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. + db DEX_KONYA + db DEX_OMEGA db DEX_MUK - db 0 ; MISSINGNO. + db DEX_DECILLA db DEX_KINGLER db DEX_CLOYSTER - db 0 ; MISSINGNO. + db DEX_MAGNETITE db DEX_ELECTRODE db DEX_CLEFABLE db DEX_WEEZING db DEX_PERSIAN db DEX_MAROWAK - db 0 ; MISSINGNO. + db DEX_GUARDIA db DEX_HAUNTER db DEX_ABRA db DEX_ALAKAZAM @@ -155,13 +155,13 @@ PokedexOrder: db DEX_BULBASAUR db DEX_VENUSAUR db DEX_TENTACRUEL - db 0 ; MISSINGNO. + db DEX_GYOPIN db DEX_GOLDEEN db DEX_SEAKING - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. + db DEX_KOTORA + db DEX_GAOTORA + db DEX_GOROTORA + db DEX_PUCHIKOON db DEX_PONYTA db DEX_RAPIDASH db DEX_RATTATA @@ -171,16 +171,16 @@ PokedexOrder: db DEX_GEODUDE db DEX_PORYGON db DEX_AERODACTYL - db 0 ; MISSINGNO. + db DEX_BLASTYKE db DEX_MAGNEMITE - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. + db DEX_SKIMPER + db DEX_GOROCHU db DEX_CHARMANDER db DEX_SQUIRTLE db DEX_CHARMELEON db DEX_WARTORTLE db DEX_CHARIZARD - db 0 ; MISSINGNO. + db DEX_TOTARTLE db 0 ; MISSINGNO. db 0 ; MISSINGNO. db 0 ; MISSINGNO. @@ -190,4 +190,13 @@ PokedexOrder: db DEX_BELLSPROUT db DEX_WEEPINBELL db DEX_VICTREEBEL + db DEX_TSUBOMITTO + db DEX_ANIMON + db DEX_MONJA + db DEX_PARA + db DEX_HINAAZU + db DEX_PUDI + db DEX_BETOBEBII + db DEX_BELLOSSOM + db DEX_SCIZOR assert_table_length NUM_POKEMON_INDEXES diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 221412b7..52ff3229 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -104,8 +104,8 @@ MonsterPalettes: db PAL_PINKMON ; BARUNDA db PAL_BROWNMON ; FARFETCHD db PAL_BROWNMON ; MADAAMU - db PAL_BLUEMON ; BLASTYKE - db PAL_BLUEMON ; BLASTOISE + db PAL_CYANMON ; BLASTYKE + db PAL_CYANMON ; BLASTOISE db PAL_BROWNMON ; HINAAZU db PAL_BROWNMON ; DODUO db PAL_BROWNMON ; DODRIO diff --git a/data/pokemon/title_mons.asm b/data/pokemon/title_mons.asm index 655e9ed0..7d011a79 100644 --- a/data/pokemon/title_mons.asm +++ b/data/pokemon/title_mons.asm @@ -1,38 +1,38 @@ TitleMons: ; mons on the title screen are randomly chosen from here IF DEF(_RED) - db STARTER1 - db STARTER2 - db STARTER3 - db WEEDLE - db NIDORAN_M - db SCYTHER - db PIKACHU - db CLEFAIRY - db RHYDON - db ABRA - db GASTLY - db DITTO - db PIDGEOTTO - db ONIX - db PONYTA - db MAGIKARP + db CHARIZARD + db TOTARTLE + db VENUSAUR + db GOROCHU + db CACTUS + db DEER + db BARUNDA + db RIBBITO + db GYAOON + db PUDI + db MAGNETITE + db MONJA + db ANIMON + db SCIZOR + db BELLOSSOM + db BUU ENDC IF DEF(_BLUE) - db STARTER2 - db STARTER1 - db STARTER3 - db MANKEY - db HITMONLEE - db VULPIX - db CHANSEY - db AERODACTYL - db JOLTEON - db SNORLAX - db GLOOM - db POLIWAG - db DODUO - db PORYGON - db GENGAR - db RAICHU + db TOTARTLE + db CHARIZARD + db VENUSAUR + db GOROCHU + db CROCKY + db TRAMPEL + db JAGG + db CHEEP + db OMEGA + db MIKON + db WEIRDUCK + db BLOTTLE + db MADAAMU + db PURAKKUSU + db TSUBOMITTO + db GUARDIA ENDC diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm index 58aba757..9bf9edd2 100644 --- a/data/sgb/sgb_palettes.asm +++ b/data/sgb/sgb_palettes.asm @@ -1,53 +1,53 @@ SuperPalettes: ; entries correspond to PAL_* constants table_width 2 * 4, SuperPalettes - RGB 31,29,31, 21,28,11, 20,26,31, 03,02,02 ; PAL_ROUTE - RGB 31,29,31, 25,28,27, 20,26,31, 03,02,02 ; PAL_PALLET - RGB 31,29,31, 17,26,03, 20,26,31, 03,02,02 ; PAL_VIRIDIAN - RGB 31,29,31, 23,25,16, 20,26,31, 03,02,02 ; PAL_PEWTER - RGB 31,29,31, 17,20,30, 20,26,31, 03,02,02 ; PAL_CERULEAN - RGB 31,29,31, 27,20,27, 20,26,31, 03,02,02 ; PAL_LAVENDER - RGB 31,29,31, 30,18,00, 20,26,31, 03,02,02 ; PAL_VERMILION - RGB 31,29,31, 16,30,22, 20,26,31, 03,02,02 ; PAL_CELADON - RGB 31,29,31, 31,15,22, 20,26,31, 03,02,02 ; PAL_FUCHSIA - RGB 31,29,31, 26,10,06, 20,26,31, 03,02,02 ; PAL_CINNABAR - RGB 31,29,31, 22,14,24, 20,26,31, 03,02,02 ; PAL_INDIGO - RGB 31,29,31, 27,27,03, 20,26,31, 03,02,02 ; PAL_SAFFRON - RGB 31,29,31, 20,26,31, 17,23,10, 03,02,02 ; PAL_TOWNMAP + RGB 31,31,31, 16,31,04, 11,23,31, 03,03,03 ; PAL_ROUTE + RGB 31,31,31, 23,17,31, 11,23,31, 03,03,03 ; PAL_PALLET + RGB 31,31,31, 19,31,00, 11,23,31, 03,03,03 ; PAL_VIRIDIAN + RGB 31,31,31, 18,18,15, 11,23,31, 03,03,03 ; PAL_PEWTER + RGB 31,31,31, 05,08,31, 11,23,31, 03,03,03 ; PAL_CERULEAN + RGB 31,31,31, 25,04,31, 11,23,31, 03,03,03 ; PAL_LAVENDER + RGB 31,31,31, 31,19,00, 11,23,31, 03,03,03 ; PAL_VERMILION + RGB 31,31,31, 05,31,05, 11,23,31, 03,03,03 ; PAL_CELADON + RGB 31,31,31, 31,15,15, 11,23,31, 03,03,03 ; PAL_FUCHSIA + RGB 31,31,31, 31,08,08, 11,23,31, 03,03,03 ; PAL_CINNABAR + RGB 31,31,31, 11,08,31, 11,23,31, 03,03,03 ; PAL_INDIGO + RGB 31,31,31, 31,31,00, 11,23,31, 03,03,03 ; PAL_SAFFRON + RGB 31,31,31, 00,21,31, 10,28,00, 01,01,01 ; PAL_TOWNMAP IF DEF(_RED) - RGB 31,29,31, 30,30,17, 17,23,10, 21,00,04 ; PAL_LOGO1 + RGB 31,31,31, 31,31,00, 17,23,10, 23,03,03 ; PAL_LOGO1 ENDC IF DEF(_BLUE) - RGB 31,29,31, 30,30,17, 21,00,04, 14,19,29 ; PAL_LOGO1 + RGB 31,31,31, 31,31,00, 21,00,04, 03,03,23 ; PAL_LOGO1 ENDC - RGB 31,29,31, 30,30,17, 18,18,24, 07,07,16 ; PAL_LOGO2 - RGB 31,29,31, 24,20,30, 11,20,30, 03,02,02 ; PAL_0F - RGB 31,29,31, 30,22,17, 16,14,19, 03,02,02 ; PAL_MEWMON - RGB 31,29,31, 18,20,27, 11,15,23, 03,02,02 ; PAL_BLUEMON - RGB 31,29,31, 31,20,10, 26,10,06, 03,02,02 ; PAL_REDMON - RGB 31,29,31, 21,25,29, 14,19,25, 03,02,02 ; PAL_CYANMON - RGB 31,29,31, 27,22,24, 21,15,23, 03,02,02 ; PAL_PURPLEMON - RGB 31,29,31, 28,20,15, 21,14,09, 03,02,02 ; PAL_BROWNMON - RGB 31,29,31, 20,26,16, 09,20,11, 03,02,02 ; PAL_GREENMON - RGB 31,29,31, 30,22,24, 28,15,21, 03,02,02 ; PAL_PINKMON - RGB 31,29,31, 31,28,14, 26,20,00, 03,02,02 ; PAL_YELLOWMON - RGB 31,29,31, 26,21,22, 15,15,18, 03,02,02 ; PAL_GREYMON - RGB 31,29,31, 26,21,22, 27,20,06, 03,02,02 ; PAL_SLOTS1 + RGB 31,31,31, 31,31,00, 07,07,25, 00,00,17 ; PAL_LOGO2 + RGB 31,31,31, 13,01,31, 00,09,31, 01,01,01 ; PAL_0F + RGB 31,31,31, 30,17,11, 11,05,14, 03,03,03 ; PAL_MEWMON + RGB 31,31,31, 16,18,31, 00,01,25, 03,03,03 ; PAL_BLUEMON + RGB 31,31,31, 31,17,00, 31,00,00, 03,03,03 ; PAL_REDMON + RGB 31,31,31, 16,26,31, 00,17,31, 03,03,03 ; PAL_CYANMON + RGB 31,31,31, 25,15,31, 19,00,22, 03,03,03 ; PAL_PURPLEMON + RGB 31,31,31, 29,18,10, 17,09,05, 03,03,03 ; PAL_BROWNMON + RGB 31,31,31, 17,31,11, 01,22,06, 03,03,03 ; PAL_GREENMON + RGB 31,31,31, 31,15,18, 31,00,06, 03,03,03 ; PAL_PINKMON + RGB 31,31,31, 31,31,00, 28,14,00, 03,03,03 ; PAL_YELLOWMON + RGB 31,31,31, 18,18,19, 10,10,10, 03,03,03 ; PAL_GREYMON + RGB 31,31,31, 21,12,15, 21,14,00, 03,03,03 ; PAL_SLOTS1 IF DEF(_RED) - RGB 31,29,31, 31,31,17, 25,17,21, 03,02,02 ; PAL_SLOTS2 - RGB 31,29,31, 22,31,16, 25,17,21, 03,02,02 ; PAL_SLOTS3 - RGB 31,29,31, 16,19,29, 25,17,21, 03,02,02 ; PAL_SLOTS4 + RGB 31,31,31, 31,31,00, 20,08,15, 03,03,03 ; PAL_SLOTS2 + RGB 31,31,31, 03,31,09, 20,08,15, 03,03,03 ; PAL_SLOTS3 + RGB 31,31,31, 09,05,30, 20,08,15, 03,03,03 ; PAL_SLOTS4 ENDC IF DEF(_BLUE) - RGB 31,29,31, 31,31,17, 16,19,29, 03,02,02 ; PAL_SLOTS2 - RGB 31,29,31, 22,31,16, 16,19,29, 03,02,02 ; PAL_SLOTS3 - RGB 31,29,31, 25,17,21, 16,19,29, 03,02,02 ; PAL_SLOTS4 + RGB 31,31,31, 31,31,00, 09,05,30, 03,03,03 ; PAL_SLOTS2 + RGB 31,31,31, 03,31,09, 09,05,30, 03,03,03 ; PAL_SLOTS3 + RGB 31,31,31, 20,08,15, 09,05,30, 03,03,03 ; PAL_SLOTS4 ENDC - RGB 31,29,31, 07,07,07, 02,03,03, 03,02,02 ; PAL_BLACK - RGB 31,29,31, 30,26,15, 09,20,11, 03,02,02 ; PAL_GREENBAR - RGB 31,29,31, 30,26,15, 26,20,00, 03,02,02 ; PAL_YELLOWBAR - RGB 31,29,31, 30,26,15, 26,10,06, 03,02,02 ; PAL_REDBAR - RGB 31,29,31, 30,22,17, 11,15,23, 03,02,02 ; PAL_BADGE - RGB 31,29,31, 21,14,09, 18,24,22, 03,02,02 ; PAL_CAVE - RGB 31,29,31, 31,28,14, 24,20,10, 03,02,02 ; PAL_GAMEFREAK + RGB 31,31,31, 03,03,03, 03,03,03, 03,03,03 ; PAL_BLACK + RGB 31,31,31, 31,31,00, 00,31,00, 03,03,03 ; PAL_GREENBAR + RGB 31,31,31, 31,31,00, 31,18,00, 03,03,03 ; PAL_YELLOWBAR + RGB 31,31,31, 31,31,00, 31,00,00, 03,03,03 ; PAL_REDBAR + RGB 31,31,31, 03,11,06, 03,17,11, 03,03,03 ; PAL_BADGE + RGB 31,31,31, 23,08,00, 17,14,11, 03,03,03 ; PAL_CAVE + RGB 31,31,31, 31,19,00, 19,19,00, 03,03,03 ; PAL_GAMEFREAK assert_table_length NUM_SGB_PALS diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index dddcf653..ed3ff119 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -497,9 +497,9 @@ Green1Data: ProfOakData: ; Unused - db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 69, BLASTOISE, 70, GYARADOS, 0 - db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 69, VENUSAUR, 70, GYARADOS, 0 - db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 69, CHARIZARD, 70, GYARADOS, 0 + db $FF, 66, TAUROS, 67, GYARADOS, 68, ARCANINE, 68, EXEGGUTOR, 69, NIDOKING, 70, TOTARTLE, 0 + db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, GYARADOS, 68, ARCANINE, 60, NIDOKING, 70, VENUSAUR, 0 + db $FF, 66, TAUROS, 67, ARCANINE, 68, EXEGGUTOR, 68, GYARADOS, 69, NIDOKING, 70, CHARIZARD, 0 ChiefData: ; none @@ -537,7 +537,7 @@ GiovanniData: ; Silph Co. 11F db $FF, 37, NIDORINO, 35, KANGASKHAN, 37, RHYHORN, 41, NIDOQUEEN, 0 ; Viridian Gym - db $FF, 45, RHYHORN, 42, DUGTRIO, 44, NIDOQUEEN, 45, NIDOKING, 50, RHYDON, 0 + db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, PERSIAN, 48, NIDOKING, 50, RHYDON, 0 RocketData: ; Mt. Moon B2F @@ -636,28 +636,28 @@ CooltrainerFData: db 43, PERSIAN, NINETALES, RAICHU, 0 BrunoData: - db $FF, 53, ONIX, 55, HITMONCHAN, 55, HITMONLEE, 56, ONIX, 58, MACHAMP, 0 + db $FF, 54, PRIMEAPE, 55, ONIX, 55, POLIWRATH, 56, HITMONLEE, 56, PURAKKUSU, 58, MACHAMP, 0 BrockData: - db $FF, 12, GEODUDE, 14, ONIX, 0 + db $FF, 13, GEODUDE, 12, OMANYTE, 12, KABUTO, 12, DECILLA, 15, ONIX, 0 MistyData: - db $FF, 18, STARYU, 21, STARMIE, 0 + db $FF, 19, HORSEA, 18, CHEEP, 18, BLOTTLE, 19, BLASTYKE, 21, STARMIE, 0 LtSurgeData: - db $FF, 21, VOLTORB, 18, PIKACHU, 24, RAICHU, 0 + db $FF, 22, VOLTORB, 21, GAOTORA, 22, MAGNEMITE, 23, ELECTABUZZ, 24, GOROCHU, 0 ErikaData: - db $FF, 29, VICTREEBEL, 24, TANGELA, 29, VILEPLUME, 0 + db $FF, 28, WEEPINBELL, 29, TANGELA, 28, CACTUS, 28, PARASECT, 31, VILEPLUME, 0 KogaData: - db $FF, 37, KOFFING, 39, MUK, 37, KOFFING, 43, WEEZING, 0 + db $FF, 38, GOLBAT, 39, VENOMOTH, 38, NIDOREIGN, 39, MUK, 41, WEEZING, 0 BlaineData: - db $FF, 42, GROWLITHE, 40, PONYTA, 42, RAPIDASH, 47, ARCANINE, 0 + db $FF, 45, MAGMAR, 44, NINETALES, 45, RAPIDASH, 44, FLAREON, 47, ARCANINE, 0 SabrinaData: - db $FF, 38, KADABRA, 37, MR_MIME, 38, VENOMOTH, 43, ALAKAZAM, 0 + db $FF, 39, HYPNO, 40, MR_MIME, 39, SLOWBRO, 40, JYNX, 43, ALAKAZAM, 0 GentlemanData: ; SS Anne 1F Rooms @@ -680,21 +680,21 @@ Green2Data: db $FF, 25, PIDGEOTTO, 23, GYARADOS, 22, GROWLITHE, 20, KADABRA, 25, IVYSAUR, 0 db $FF, 25, PIDGEOTTO, 23, EXEGGCUTE, 22, GYARADOS, 20, KADABRA, 25, CHARMELEON, 0 ; Silph Co. 7F - db $FF, 37, PIDGEOT, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, BLASTOISE, 0 + db $FF, 37, PIDGEOT, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, TOTARTLE, 0 db $FF, 37, PIDGEOT, 38, GYARADOS, 35, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0 db $FF, 37, PIDGEOT, 38, EXEGGCUTE, 35, GYARADOS, 35, ALAKAZAM, 40, CHARIZARD, 0 ; Route 22 - db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, BLASTOISE, 0 + db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, TOTARTLE, 0 db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GYARADOS, 47, GROWLITHE, 50, ALAKAZAM, 53, VENUSAUR, 0 db $FF, 47, PIDGEOT, 45, RHYHORN, 45, EXEGGCUTE, 47, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0 Green3Data: - db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, ARCANINE, 63, EXEGGUTOR, 65, BLASTOISE, 0 + db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0 db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0 db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0 LoreleiData: - db $FF, 54, DEWGONG, 53, CLOYSTER, 54, SLOWBRO, 56, JYNX, 56, LAPRAS, 0 + db $FF, 54, DEWGONG, 53, CLOYSTER, 54, SLOWBRO, 55, JYNX, 55, BUU, 56, LAPRAS, 0 ChannelerData: ; Unused @@ -736,7 +736,7 @@ ChannelerData: db 33, GASTLY, GASTLY, HAUNTER, 0 AgathaData: - db $FF, 56, GENGAR, 56, GOLBAT, 55, HAUNTER, 58, ARBOK, 60, GENGAR, 0 + db $FF, 57, GENGAR, 56, GOLBAT, 56, HAUNTER, 58, CROAKOZUNA, 58, ARBOK, 60, GENGAR, 0 LanceData: - db $FF, 58, GYARADOS, 56, DRAGONAIR, 56, DRAGONAIR, 60, AERODACTYL, 62, DRAGONITE, 0 + db $FF, 58, CROCKY, 57, GYARADOS, 57, AERODACTYL, 59, CRYITHAN, 59, CHARIZARD, 62, DRAGONITE, 0 diff --git a/data/wild/maps/Route4.asm b/data/wild/maps/Route4.asm index d61fd1c1..f6dc8a97 100644 --- a/data/wild/maps/Route4.asm +++ b/data/wild/maps/Route4.asm @@ -1,7 +1,7 @@ Route4WildMons: def_grass_wildmons 20 ; encounter rate db 10, RATTATA - db 10, RIBITTO + db 10, HINAAZU db 8, KONYA IF DEF(_RED) db 6, EKANS diff --git a/data/wild/maps/Route6.asm b/data/wild/maps/Route6.asm index 0505c2b9..f7e31c71 100644 --- a/data/wild/maps/Route6.asm +++ b/data/wild/maps/Route6.asm @@ -8,7 +8,7 @@ IF DEF(_RED) db 12, MANKEY db 15, BELLSPROUT db 16, BELLSPROUT - db 16, PIDGEY + db 16, HINAAZU db 14, MEOWTH db 16, MEOWTH ENDC @@ -20,7 +20,7 @@ IF DEF(_BLUE) db 12, MEOWTH db 15, ODDISH db 16, ODDISH - db 16, PIDGEY + db 16, HINAAZU db 14, MANKEY db 16, MANKEY ENDC diff --git a/data/wild/super_rod.asm b/data/wild/super_rod.asm index bced41c0..18154ac5 100644 --- a/data/wild/super_rod.asm +++ b/data/wild/super_rod.asm @@ -47,13 +47,13 @@ SuperRodData: db 5, GYOPIN .Group2: - db 2 + db 3 db 10, MAGIKARP db 7, POLIWAG db 10, GYOPIN .Group3: - db 3 + db 5 db 15, SKIMPER db 19, MAGIKARP db 15, KRABBY @@ -61,7 +61,7 @@ SuperRodData: db 15, CHEEP .Group4: - db 2 + db 5 db 20, KRABBY db 20, SHELLDER db 20, TENTACOOL @@ -69,7 +69,7 @@ SuperRodData: db 20, HORSEA .Group5: - db 2 + db 5 db 25, POLIWHIRL db 25, SLOWPOKE db 20, SKIMPER @@ -77,7 +77,7 @@ SuperRodData: db 25, BLOTTLE .Group6: - db 4 + db 6 db 15, DRATINI db 28, KRABBY db 25, CHEEP @@ -86,7 +86,7 @@ SuperRodData: db 32, BAWLIGUA .Group7: - db 4 + db 6 db 40, TENTACRUEL db 40, KINGLER db 40, SEAKING @@ -102,7 +102,7 @@ SuperRodData: db 40, PENDRAKEN .Group9: - db 4 + db 5 db 50, GYARADOS db 50, SEAKING db 50, KINGLER @@ -110,7 +110,7 @@ SuperRodData: db 50, PENDRAKEN .Group10: - db 4 + db 12 db 50, KINGLER db 50, PENDRAKEN db 50, SEAKING diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 1ee0cc25..e646ad89 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -119,10 +119,10 @@ DisplayTitleScreen: call EnableLCD IF DEF(_RED) - ld a, STARTER1 ; which Pokemon to show first on the title screen + ld a, CHARIZARD ; which Pokemon to show first on the title screen ENDC IF DEF(_BLUE) - ld a, STARTER2 ; which Pokemon to show first on the title screen + ld a, TOTARTLE ; which Pokemon to show first on the title screen ENDC ld [wTitleMonSpecies], a call LoadTitleMonSprite diff --git a/engine/movie/title2.asm b/engine/movie/title2.asm index bc75015f..258b63e1 100644 --- a/engine/movie/title2.asm +++ b/engine/movie/title2.asm @@ -90,11 +90,11 @@ TitleBallYTable: TitleScreenAnimateBallIfStarterOut: ; Animate the TitleBall if a starter just got scrolled out. ld a, [wTitleMonSpecies] - cp STARTER1 + cp VENUSAUR jr z, .ok - cp STARTER2 + cp CHARIZARD jr z, .ok - cp STARTER3 + cp TOTARTLE ret nz .ok ld e, 1 ; animate titleball diff --git a/maps/CeladonCity.blk b/maps/CeladonCity.blk index f1fce6bc..d99e84e3 100644 --- a/maps/CeladonCity.blk +++ b/maps/CeladonCity.blk @@ -1,20 +1,8 @@ -lllllllllllllllllllllll - - - - - - - - -oo +lllllllllllllllllllllooooooooo ooo oooooo -n !UUUU !U !UUUUUUUUUmnhi !hiUhi ! ! ! !Umn7~hi7}~y7:~7~7~7~|rUUUhiUUUUUUUUUUUUUUUUUUUU7::sUUUUUUUUUUUUUUUUUUUUUUUUy0 VwwwwUwwwwUUUUUUUUUNTM ! !U ! !nwUUUUUUUUUgj7:~|~U7~7~nUUUUUUUUUCVwwVwUVwww5nUUUUUUUUUUUUUUUUUUUUUUmn !  ! !UU ! ! ! ! ! -n7~7~7~UU7~|~|~7~|~ -nUUUUUyUU !UUUUUUUUUUUU -n/7~UUUUUUUUUUUU -n +n !UUUU !U !UUUUUUUUUmnhi !hiUhi ! ! ! !Umn7~hi7}~y7:~7~7~7~|rUUUhiUUUUUUUUUUUUUUUUUUUU7::sUUUUUUUUUUUUUUUUUUUUUUUUy0 VwwwwUwwwwUUUUUUUUUNTM ! !U ! !nwUUUUUUUgj7:~|~U7~7~nUUUUUUUCVwwVwUVwwwLnUUUUUUUUUUUUUUUUUUUUUUmn !  ! !UU ! ! ! ! !mn7~7~7~UU7~|~|~7~|~mnUUUUUyUU !UUUUUUUUUUUU +n/7~UUUUUUUUUUUUmn @@ -24,5 +12,5 @@ n -llllll26llll -nooooooooooooooooo6ooooo \ No newline at end of file +llllllmnllll +nooooooooooooooooooooooo \ No newline at end of file diff --git a/maps/FuchsiaCity.blk b/maps/FuchsiaCity.blk index e57addb1..324c3018 100644 --- a/maps/FuchsiaCity.blk +++ b/maps/FuchsiaCity.blk @@ -1,4 +1,18 @@ - !zoooooz7:~zooooooznttmVUwnmnwVwVmzoo`wVwVwmzzzzzzznzzzzzzzzzzz !oooo`z !nlllmzz|szzzzzz7:~`wVwmzoooooyzznVUVzzzzzogmzznUlllll11NkkkPRR`Uwwww11NU_tnN>?????????;_t + !zoooooz7:~zooooooznttmVUwnmnwVwVmzzznwVwVwmzzzzzzzzzzzzzzzzzzz !zzzz !znlllmz|szzzz7:~znVwwmoooooyzzzVUVzzzzzogmzzMUlllll11NkkkPRROUwwww11N_tnN1wwwwwwwww1_t -nN$ !WWWW !%_8989nNX|~0|rY1<=<=1nNX11111111Y_Vw1wnNZ\ooo\[11nPRRRR>?;ttttPRRRRRn11111(,)1111>?; \ No newline at end of file +nNn ! + + + + !m_8989nNn|~0|rm1<=<=1nNn11111111m_Vw1wnN + +1ooooo1 + + + + + + + +nPRRRR>?;ttttRRRRRRn11111(,)1111>?; \ No newline at end of file diff --git a/maps/Route23.blk b/maps/Route23.blk index 1ecf1d1a..ecbf73e2 100644 --- a/maps/Route23.blk +++ b/maps/Route23.blk @@ -1,4 +1,4 @@ -566CB556566CB55656++CB,,5656ACBAAA5656BAACCC5656CACBAB5656ACCCBA5656CBBBBA56,+BACBAB,+AACCCBBBAAAAAAAAAAAA)*A56A56AA''56A +566CB556566CB55656++CB,,5656BBAACC5656CACBAB5656BBAACC5656ACAABA5656BBAACC56,+CACBAB,+AAAAAAAAAAAAAAAAAAAA)*A56A56AA''56A H AAA