From 337a05fee4d98624445550e511a970be319cdf1e Mon Sep 17 00:00:00 2001 From: Thorn Avery Date: Tue, 5 Dec 2023 06:42:19 +1100 Subject: [PATCH 1/6] regional trades reset at HoF --- scripts/HallOfFame.asm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index 283a2672..308ccb40 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -210,6 +210,36 @@ ResetLegendaryPokemon: ld a, HS_MEWTWO call ShowThis .skipGalarianBirdsAndMewtwo + + ; trade flags are in groups based on the + ; ordering in data/events/trades.asm + ; the numbering follows LSB -> MSB + ; (ie, trades 8 and 9 are the rightmost two bits) + + ; trades 0-7 + ; ld b, %11111111 + ; ld a, [wCompletedInGameTradeFlags] + ; and b + ; ld [wCompletedInGameTradeFlags], a + + ; trades 8-15 + ld b, %00000011 + ld a, [wCompletedInGameTradeFlags+1] + and b + ld [wCompletedInGameTradeFlags+1], a + + ; trades 16-23 + ld b, %00000000 + ld a, [wCompletedInGameTradeFlags+2] + and b + ld [wCompletedInGameTradeFlags+2], a + + ; trades 24-31 + ld b, %00000000 + ld a, [wCompletedInGameTradeFlags+3] + and b + ld [wCompletedInGameTradeFlags+3], a + ; We set this last to save on processing earlier in the script. SetEvent EVENT_POST_GAME_ATTAINED ret From 5e675af15d22fb210ca1fadbbc3c52851a383a9d Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Tue, 5 Dec 2023 17:15:12 +0000 Subject: [PATCH 2/6] Sprites? No, I prefer 7-Up Added updated sprites for: - Front: Sirfetch'd, Galarian Rapidash, Porygon, Carapthor - Back: Blissey, Carapthor, Espeon, Glaceon, Hitmontop, Kleavor, Lickilicky, Magnezone, Melmetal, Galarian Moltres, Mr. Rime, Perrserker, Pupal, Rhyperior, Sandy Shocks, Scream Tail, Galarian Slowbro, Paldean Tauros Combat Breed, Toedscool, and Umbreon (also some minor text fixes, notably adding Dr. Lava to the credits) Thanks Albatross for being a total legend :3 --- constants/credits_constants.asm | 1 + data/credits/credits_order.asm | 2 +- data/credits/credits_text.asm | 3 +++ data/pokemon/dex_text.asm | 10 +++++----- data/pokemon/palettes.asm | 2 +- gfx/pics.asm | 4 ++-- gfx/pokemon/back/blisseyb.png | Bin 553 -> 627 bytes gfx/pokemon/back/carapthorb.png | Bin 732 -> 611 bytes gfx/pokemon/back/espeonb.png | Bin 572 -> 612 bytes gfx/pokemon/back/glaceonb.png | Bin 589 -> 649 bytes gfx/pokemon/back/hitmontopb.png | Bin 576 -> 495 bytes gfx/pokemon/back/kleavorb.png | Bin 543 -> 638 bytes gfx/pokemon/back/lickilickyb.png | Bin 555 -> 500 bytes gfx/pokemon/back/magnezoneb.png | Bin 517 -> 560 bytes gfx/pokemon/back/melmetalb.png | Bin 513 -> 478 bytes gfx/pokemon/back/moltresgb.png | Bin 503 -> 625 bytes gfx/pokemon/back/mr.rimeb.png | Bin 588 -> 635 bytes gfx/pokemon/back/perrserkerb.png | Bin 472 -> 615 bytes gfx/pokemon/back/pupalb.png | Bin 528 -> 431 bytes gfx/pokemon/back/rhyperiorb.png | Bin 563 -> 621 bytes gfx/pokemon/back/sandyshocksb.png | Bin 595 -> 657 bytes gfx/pokemon/back/screamtailb.png | Bin 546 -> 650 bytes gfx/pokemon/back/slowbrogb.png | Bin 577 -> 492 bytes gfx/pokemon/back/taurospcombatb.png | Bin 457 -> 616 bytes gfx/pokemon/back/toedscoolb.png | Bin 532 -> 566 bytes gfx/pokemon/back/umbreonb.png | Bin 526 -> 591 bytes gfx/pokemon/front/carapthor.png | Bin 988 -> 1024 bytes gfx/pokemon/front/porygon.png | Bin 1094 -> 762 bytes gfx/pokemon/front/rapidashg.png | Bin 959 -> 970 bytes gfx/pokemon/front/sirfetchd.png | Bin 605 -> 921 bytes text/AgathasRoom.asm | 13 +++++-------- text/BrunosRoom.asm | 12 +++++------- text/LancesRoom.asm | 13 +++++-------- text/LoreleisRoom.asm | 8 ++++---- 34 files changed, 32 insertions(+), 36 deletions(-) diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm index a5e2c584..334908e3 100644 --- a/constants/credits_constants.asm +++ b/constants/credits_constants.asm @@ -94,6 +94,7 @@ const CRED_ENI const CRED_VORT const CRED_PRET + const CRED_DR_LAVA DEF NUM_CRED_STRINGS EQU const_value const_def -1, -1 diff --git a/data/credits/credits_order.asm b/data/credits/credits_order.asm index 1ef3f2f1..1008c0ed 100644 --- a/data/credits/credits_order.asm +++ b/data/credits/credits_order.asm @@ -45,6 +45,6 @@ CreditsOrder: db CRED_KEP_THANKS, CRED_FRRF, CRED_MISTY, CRED_THORNAVERY, CRED_TEXT_FADE db CRED_KEP_THANKS, CRED_PRET, CRED_DANNYE, CRED_EROSUNICA, CRED_TEXT_FADE db CRED_KEP_THANKS, CRED_SKYE, CRED_BLUEZANGOOSE, CRED_CHATOT, CRED_TEXT_FADE - db CRED_KEP_THANKS, CRED_ENI, CRED_VORT, CRED_TEXT_FADE_MON + db CRED_KEP_THANKS, CRED_ENI, CRED_VORT, CRED_DR_LAVA, CRED_TEXT_FADE_MON db CRED_COPYRIGHT, CRED_TEXT_FADE_MON db CRED_THE_END diff --git a/data/credits/credits_text.asm b/data/credits/credits_text.asm index d6d469be..f6377817 100644 --- a/data/credits/credits_text.asm +++ b/data/credits/credits_text.asm @@ -95,6 +95,7 @@ CreditsTextPointers: dw CredEni dw CredVort dw CredPret + dw CredDrLava assert_table_length NUM_CRED_STRINGS CredVersion: @@ -285,3 +286,5 @@ CredVort: db -3, "VORTIENE@" CredPret: db -4, "PRET ET AL@" +CredDrLava: + db -3, "DR.LAVA@" diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm index 31f3a472..33adab56 100644 --- a/data/pokemon/dex_text.asm +++ b/data/pokemon/dex_text.asm @@ -890,13 +890,13 @@ _ZubatDexEntry:: ; new entry dex _EkansDexEntry:: ; new entry - text "It flicks its" + text "EKANS flicks its" next "tongue to check" - next "for danger. If" + next "for danger. If it" - page "it eats RATTATA," - next "it can go without" - next "food for a month" + page "eats a RATTATA, it" + next "won't need to eat" + next "again for a month" dex _ParasDexEntry:: ; new entry diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 3ecfa64b..5dd0f70d 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -115,7 +115,7 @@ MonsterPalettes: db PAL_REDMON ; ARCANINE_H db PAL_BROWNMON ; FARFETCHD db PAL_BROWNMON ; LUXWAN - db PAL_BROWNMON ; SIRFETCHD + db PAL_GREENMON ; SIRFETCHD db PAL_YELLOWMON ; DROWZEE db PAL_YELLOWMON ; HYPNO db PAL_GREYMON ; MAGNEMITE diff --git a/gfx/pics.asm b/gfx/pics.asm index 4b65398c..d3759d0b 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -468,8 +468,6 @@ MoltresGPicFront:: INCBIN "gfx/pokemon/front/moltresg.pic" MoltresGPicBack:: INCBIN "gfx/pokemon/back/moltresgb.pic" PerrserkerPicFront:: INCBIN "gfx/pokemon/front/perrserker.pic" PerrserkerPicBack:: INCBIN "gfx/pokemon/back/perrserkerb.pic" -SirfetchdPicFront:: INCBIN "gfx/pokemon/front/sirfetchd.pic" -SirfetchdPicBack:: INCBIN "gfx/pokemon/back/sirfetchdb.pic" MrRimePicFront:: INCBIN "gfx/pokemon/front/mr.rime.pic" MrRimePicBack:: INCBIN "gfx/pokemon/back/mr.rimeb.pic" @@ -584,6 +582,8 @@ MagnetitePicFront:: INCBIN "gfx/pokemon/front/magnetite.pic" MagnetitePicBack:: INCBIN "gfx/pokemon/back/magnetiteb.pic" BittybatPicFront:: INCBIN "gfx/pokemon/front/bittybat.pic" BittybatPicBack:: INCBIN "gfx/pokemon/back/bittybatb.pic" +SirfetchdPicFront:: INCBIN "gfx/pokemon/front/sirfetchd.pic" +SirfetchdPicBack:: INCBIN "gfx/pokemon/back/sirfetchdb.pic" LancePic:: INCBIN "gfx/trainers/lance.pic" YujirouPic:: INCBIN "gfx/trainers/yujirou.pic" diff --git a/gfx/pokemon/back/blisseyb.png b/gfx/pokemon/back/blisseyb.png index 6f63aa52c0f94f2290e5b5e8dadc9e97f2799336..b3661ab8547b97304757d4cd8c6456a130c9ab0d 100644 GIT binary patch delta 381 zcmZ3<@|k6V%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf6l|g&1$-8nu_3 zYC5=}V~6|?2EUYxNycwjLsAkG1deRH+jKW0Bw%%ueuBUj4&l1ze-p07{;bvw^&Z|B~8#5?zt?s=$_IFj<(Ax8kQXyW*l5|8V`q?9X6I+T<_j%lPGXUV%?!e zLjl_+Ve^=W!gJ*BIYjg*$HsC?vY+(k%AdN!ug-Fvd;#0`we{yh&pI|iA|WD zcl)}k(uvJ#5(Y-P24*3KmR1JlR))sf1_o9J2I5EkoF^WXM3pmw$Q^k9*L$)WV`lwI zPZ!4!iOb19_*r>wNY+a(=sErW&A}f1Z`yzV8%zB8|9*2;=7;(=zu)`&!`hf6g=Hmn zI5|82Gj7RP8}&kgE5%}M{nkVK1W#P}^*{UPe^G~Hzy9z3_CH#cCuL9d*1Ary2^*`g zuL|94_4B{+n(D1tq1Qqdh^}sM&=xs$f#)ZGn*Ev*-j)s>?u1r@G(X<2?8cXz6nPdf v%-G1I!BBMGYXU=uAQxMNB+DN@CWg72*6yEt?rtdq0|SGntDnm{r-UW|Gck90 diff --git a/gfx/pokemon/back/carapthorb.png b/gfx/pokemon/back/carapthorb.png index 96b4d1eb268a354ff46371f27c259daf8bd40a28..b29d5ef26cb58a6ae66bae394971c2b13e57dd2d 100644 GIT binary patch delta 398 zcmcb^`j};c1Sb;%0|SH1Lfg)XhWf@#N#5=*49vzYMI8(b44efXk;M!Qe1}1p@p%4< z6b1$c_7YEDSN7*Tto+JMc@Af9PMoYJVQ8dlU>ag*YGrI{WnidnU|?ln!2aoe`^1Zq zJ_tDzD^pX5oa!O9A_fKqjS|<0l9a@fRI8HA+|=Td#M}Y~BLgF2U4$M}D+42l9)X~k z%E?TO8TAbNJzX3_BrYfa;AiEjkdRO4@&D%ViTQthoBZGZ|NlSy^8fsY@Sp$dmoro^ zNaCw*)9g`*_2cuFeB#){tSu>V@L7yN;sbVLGXn#*|EyX6zqdP@Jo)_nKac!>>$bK{ z|NovZNV|XOLcr`(|9MiQw3oBJ$o`XVkQFuU&??p>oy3GNp080K=RdsWbN#{v1%<~U z?J5&CvYeQ)MaRTsiR6h06X6pH|Ibg@sv~-0!vFINOtZ5xGBhqEM#Zi)V2e=^Iizst ZJ%ja)l?UP@bDcpU@9FC2vd$@?2>`hom7D+o delta 520 zcmaFNa))(-gd_(W0|P^GRn->;1_qXNM_)$E)e-c?ID(V|^7I;J!GcfQS0b$0e z+I-Rs3=B+3-tI08%*HK69SjT%>?NMQuI$fQ#JCwPsZfHjZm5b}hBXz6gF@ zTNk{?#c}rMJ0swqH><%yvjB5sr>59Lj68pXKmOx(IRBMVoyi3*P{zx_y(RyXrgRFnM8Z&>f{SUX0J>Y)6m4ShQ!PC{xWt~$( F69AB)&k_It diff --git a/gfx/pokemon/back/espeonb.png b/gfx/pokemon/back/espeonb.png index 76879c0c1f7387b6f9297e625aff89b45faef3af..d9a75fcc973984f91c119f3f4760c1ed3392f43b 100644 GIT binary patch delta 370 zcmdnP@`PoA%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf6l|ouc($#>fJSQvWk?kuAz~x zfoX`Lsg<#@m64IQfq|8QL8am*g^3r%{m^6$A+nZJ1Q;0@7&J;;BT7;dOH!>$GILXl zOA>Pn7>o>zQ1uvFK=hbzE}1-;i7~VOfTxRNh{Wa6^Beh^3L>l~jN4fO|p88)X9vfkR45zHv2oPmlSfTE26)(Oq`qofoFM zmR{cJ9q_y?O|bIkT(7k;mWB%jnSZocxwQ*T5c6uTZrQ8Hvhb{(|Lx$%u?^3roM4bK z2@76epdI&Y;*N}GGL6T-r95CrdXjCnS1I;9uUhgjR%^ rQ*Y}eTO~Oby}QayeEaMFH|t-Ve`vAByQg*x3=9mOu6{1-oD!M<204m5 delta 328 zcmaFDvWI1Y3NK5#qpu?a!^VE@KZ&dp6&pI&lTnyO zPkw*X$%)M>QbxK4mbwOpA%>P#1}0V}X4(b@Rt5&kcrHs#JSdJXYYLHlwzJTBvKnJ% z{T@#j#}J9j$v^m6c`78ue>ifS*zoFq_H+J}Kb2SOe~NZ|tem?3u9v{$dqK~`6OOIq zj9ESH7_;Qe8169Lt?WiFVQU{T8Mj>9A7!%jpZ#I^^?&z=wJ`Ypd-ApZx|X2AC3=j{RaB*7}Ym1>F_lX}YDJ?B+3|rSn zZ8e%=`oo?%;PRyl40Q&|CMFUYeG&l;jq)c1czH`1s?|+QuFTsoU6Fy|)AwDE`0eKU RGcYhPc)I$ztaD0e0ss?Cd?)|_ diff --git a/gfx/pokemon/back/glaceonb.png b/gfx/pokemon/back/glaceonb.png index 9ad0b6c189696d7861b5bc4a86569a56da3c1872..61787efa0b84b5b5a69b24b0c1d65f4def5c2fac 100644 GIT binary patch delta 407 zcmX@h(#bkOWul3b>|q85zQc^i^H-!WFfg!}c>21sKj&fPSJ0Wcd-BzZlU1aQbq$Sl z4NOA}O|6WLtV~R_4GgRd42)x*E}nQ%+z(CG7$V!gEO{aW1A|71YeY#(Vo9o1NoH

|&cZFI*68JtS|S zXm~;5?54>1N6TD1cF44n`EpukOHVTfH(xlEkSJiSQrw*09vy3Nv4y}BYq9=0a>hC!^I*%@M@-G*={(xcSg- delta 345 zcmeBVJgtUv4N z;us=vIr#@aE04k>h8Z6p{{J8RRpFTW@Bho+9PIh`fBCa!$*JCw9zQ zwbe;S^n``frY^%Gt$?!^7lbZaxlp0)y4J-D0SheUw}kC#YishkHcLuEifNO#sfo)K h$ycd6?r$_^&-gQu&X%Q~loCICi3iqil9 diff --git a/gfx/pokemon/back/hitmontopb.png b/gfx/pokemon/back/hitmontopb.png index 9bf21a7b884070c6e8deffcb3492133ed17fda53..a1d9b1fc88d0eaec5fb0fb18228aae2a1766e6d3 100644 GIT binary patch delta 362 zcmX@W@}7Bu%0v^V`ojzie1{p2=dVa%U|?V`@$_|Nf6l`ypr@Pen$^I-z_8EL#W6(U za`F#;RvwR@`f~xto}L#tCjR@Vz%kwZbsWmslm7Y(Jbu4Q;P?Bl4#(!7negv?uYy~K z$0v2&-~V~yU73~trTqGz{^P|fsZZ)6Cw62Wkc>IckuvAU`UAPYoqlH6Hy^v7#A@7~ zrtsMR|HJ5We-e)U_o-fB8TploM@d23?`HAZEGEOeuj`_=G9CG0qL_WvYr?F2Z^&pI|g^i0_ zbNBi^-x(Mf81sw#LKx34DxWpkmr+u}z(m);EX2^j%Fxit#6a7?z{lj|5I z>#<3m^z^A>U|@(!jqptK^<~gvU|`^2U}Y3yUUB(UE1dZv5ZLpVHBm_49va0)J8l+y9rZ{+~B6eUfpae&vJzJlxHZ z&i}fZB)u!-*sjYn82Lo`~itdRhQKn5HS)!LO1xz@xF;v^d`EO%SfAHq0gFW_(64x#~ rq;OoGN3^t%&Co@{iM5rpQj&>5V)2d>8|?efg1qVJ>gTe~DWM4ffM||k diff --git a/gfx/pokemon/back/kleavorb.png b/gfx/pokemon/back/kleavorb.png index 2d2a5ad87fbc090b98c5f324678a53419474ff39..249de7fbe058651bb85b3524b760db9f25254699 100644 GIT binary patch delta 396 zcmbQw@{eVL%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf6l|g&CVWBF77#TvWk?kuAz~x zfk}v=p_PHTm4TVIfq|8Qf#KveMiVcJ`=QC2LSzfo_=Fi47&J;;BT7;dOH!>$GILXl zOA>Pn7>o>z(Dax?^lV&X_jEE7V`lv=PZ!4!iOZ$u4YLmgh_F6bY?@NA!FxI1xw$bi zy#5)>^`Z>_3i>rQKmN_W*87=`e!#n1@)wpiaZGxo(X^u^_ezpR?;N`(S*~w>_Y2N7 za?A0nPkf*if zpe3$I`=X@a`E@J{J0udHESb;L=Ir|0fWujeZzVuij39=AAXTKKTsy|4cB`P20unb%$2eteST S>1YN91_n=8KbLh*2~7ZCdY452 delta 299 zcmeyzGM{CF3NK5#qpu?a!^VE@KZ&dp6&pI&la*Ip zK2zw;{)x>hQbxK4mbwO}A%@0Q#+Fvb2HFM&Rt5&X*&3P?4~pZEwK1D8b+Q^`X8n9m z7sn8Z%cbWHxtI(ESTArEz81aW{YG_@!nH_);(2?Udd&;CpG$SM>af^&HsvPxBr#<_ z3|as4zwv>m4L5sP_pO~Ex=7)R^(2E`0dMVhDTU-CV)ck$&34?6S=+*lTArX4JD zpM0j`($2HC{o1SUJQn;a6vld__NdmQV~OdeE;;uKEWQ-VZ+pW&@lo4seSr&Wj0Jk1 jF@+X9k=LpF-_AcdWJi^|EVCm60|SGntDnm{r-UW|%)D;e diff --git a/gfx/pokemon/back/lickilickyb.png b/gfx/pokemon/back/lickilickyb.png index 09aad09add3c0f82d25910c39ad1205e64784eaf..f4ce0da47397627e65a16adaf5ca9cf98e9930ac 100644 GIT binary patch delta 367 zcmZ3@@`ZVV%0v^V`ojzie1{p2=dVa%U|?V`@$_|Nf6l`ypr@Pen$^I-z;M{p#W6(U za`KP=|MfrDDf310+m&{!*+t5k#o4hZ-#gdY+39a%Pqeo4 zVVA}p`j>rraA~N4RvS?SsZ?&pI|iA|VI z=h2<$ECvP!#{43`5XSS1%4ab!FsPQeMwFx^mZVxG7o{eaq%s&87#Zst80i|Ag&0~| z8JJm_7;76CSQ!{>c&;spq9HdwB{QuOLqolli4jCc`q>$R3=9lWsS%!OzP=1v3=9k$ z46KYo49p-`FfcMOFiJ77g4qlVUX0Rkb`YZmR1FgY1Cub6&By=)9#B1CT0ZEz2?GPe zYEKu(5Q)pR=js>o9WoGLd!WQIX~Ko)k{mLe%-^`5IlfW-CL$cXqIYZC_k#&DWs+1< zPG5W-TKwvCef_Oq7wt!ZCUwu7&cD{En4RjdRJmWValw2Ro7E9kmC}<|9PKl_*PF1x z^oQ%!+nYYTc-5_PcO?gd!1*0-3Nnfg9*eu{#oYbI?Ui8itR-zB7GXQ*=6OUOUV7!= yyhd9I)d>|>Vz@fne~Uy+Hd0lOF3*}_|AUd&d=u})si7-CKJs++b6Mw<&;$Tm?u||q85zQc^i^H-!WFfg!}c>21sKj&fPSJ0Wcd-BzZlU1aQbq$Sl z4NOA}O|6WLtW1ox4GgRd48Hxotvm6exF2@e_GQTv85kHeN?apKQW8s2tx7U;Q;SOy za|;-Z42;n9m_SSv6{$HenTav8zQ@zWF+}2W@(+Gi9u=d1KbLQ{jWl!efsT2cJ^&Xf8vdrCF9TSk4WTCs+b=?@hMNrpV+UNi5(mhK4xAO zy59&dYLHm8aA9NPnp6KJBb=R`nV7}?rw4HG@}@qGQu;XG lvD?tZB;hL8q8cuS-BT{7YyUrfkb!}L!PC{xWt~$(69A(nZuVjytUNA8dILcYHEpkh^j2yVWD-XABGs44$rj JF6*2UngGg|Y*PRL diff --git a/gfx/pokemon/back/melmetalb.png b/gfx/pokemon/back/melmetalb.png index 65b26c7912509ec976e12c96d826fa0a11bbb7d6..748814ebe0b06370757267b0f16ebef90f3400f8 100644 GIT binary patch delta 330 zcmZovSq26M_7YEDSN7*TtSmYf%8k!m85kHYdb&7Maxh|Btur_*nk+fBavCW7|XdqPiV>qP73ek77)k6ZPl+ zWg!9Owf}$4U-`|UZPi|8fo91bgJU26Ybuzk|NZ}eE>p@MQ=WwS1TGe@+TVx2)pM@? zU*Be3x$t*b8^{0j9rlJMS*wyi)VF=MmXMHeaqNj*xlnQ4iJs#94LuGDk1wA;ap8c& zf^YWI9NaigtYdbFJ)^MOuC1-@SMyyPQxlOlKgzY84{vLh_#N)c8_ivGY=5Y?b9i%! zBcmJ}Lyqbuo2^;iG7Jn16Bmm~7#issn1&b{SeckunVRVum{}PZEDD^*H1VRO3O2dR UJZk$G7#J8lUHx3vIVCg!0BMzqjsO4v delta 365 zcmcb|+{iMaRGaSz0|Va?#;MwT(hLj?>?NMQuI$fQn1$Gw+QTdv7#J8B^NajK7|$;% zpEbFFQBuOdMAyJL#L&XZz|6|PP}{)3%D`ZzqP5rLg^ZH**d$-nG=F1YV2DbM@J#dd zWzb?^VBlb2WfWpy1{u!4$iToT#lQ+?Gcb5DO2gSfj2ciiObiT6!caCN$W37E0o4Ph z<%7PPFw`?JG!u(7jU(2w7|G0C$iw#R zKTni{8%KcU3_-@UHC$(-7}FR|vL>)82dvdN5wl=fK)a;CqCLzEQs1{;uT_x|0Xfps L)z4*}Q$iB}lF3@# diff --git a/gfx/pokemon/back/moltresgb.png b/gfx/pokemon/back/moltresgb.png index 54b9663bc1e5b4e3708277e94638066f24de05e9..1230abdf9faf0465509caf4730074bac241bbe86 100644 GIT binary patch delta 534 zcmey){E=lsTK!=L2EN0L$MaXDFfcH%mw5WRvOnix;bymZCTLZ{z`($mU*s3Ucz#j& zECvP!)e_f;l9a@fRIB8o)Wnih1|tI_V_icdT?3O4LqjVAb1PFbZ36=<1B1%qMPVo! za`RI%(<(7E)Wdaf=t;d|U|`UITTzmkn_66wm|K9M39cvJ+S-(Xfgvh2!ZXd+mqCkx zfq{d8l~IU+8RT*XMg|5(DF#+Bn}NZLQ5wz;V$^`Bsb^qfU|+5 zV-HIhJKKa4_t^s3q9@F<=Ud48S+Qq@TfM+z>Ev5YB?6C?lQSk8)OQp%n@;hRI%08X z)*&ILOY;b|85kJYOFVsD*`Kp;@~Rr8KdgGfz`$_K)5S4F;&Sp2 zepVibnnuA>9*G8w#{bL=3T`z^+?SAGdE(g9&%?*_N8uRnF$T5`9!#s5>uoy}6=p5q zyQZqJElA=_Mn}v`&NPdbUAr12>Ls07?>hAO_e@k;JPW_rlriI=AjSW~fxS4ir zV36clw2=3VyaEraV6}j?uRC80+C%L5O9HkfkC6hHKHUXu_V>1Br`X) zxFj*RfWgSX2u+VUM9-18*^?$SF=p0Z_jGX#k+@uYZll-X0)gWn^F3JD75_W@Z{9pP zSeI|tS9_O&*Y+mcZ=ZA*Xjf`&TCZ3;Nvvx(|AOv5KCY(bjn7qY?tOXqZsB+5ttYQ? zT|H~^_TlSY&dL|(_wZ)R|G9U>puuOEm+-ntBLp3Yo@-}QDf*Th;W0C2-?qi8EFxqz_wz^2lzV>a zyiwsA-Sge-$INyKaZkCg^*l&&-qeXx8o$Ke^hi9Pr&D~h%{yMo}mB$ delta 344 zcmey(a)xDs3NK5#qpu?a!^VE@KZ&dp6&pI&M^Zq> z!mRq?jET)EQbxLlM!H6(A%WJOhiFF;rh#!I~v7LcBlzuZ@gU~**77(fTK&H!=*96 zf-$|L!{zY@3F~#nSHsWDHeca=mA{I!zdEFF+17>KAHza*w}s9w`{=hO^Tv6H_x}}` iEUMWq+gr@=|MKo0fsEUyN*EXz7(8A5T-G@yGywpiCXXEe diff --git a/gfx/pokemon/back/perrserkerb.png b/gfx/pokemon/back/perrserkerb.png index 88a3540c08483c01155671c79f17a484934d1f60..cad15ef2a7f53bb80b8a8a3c089c1536442c998f 100644 GIT binary patch literal 615 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;ICI$uu2APGnoghxKN02WALzNl>LqiJ#!!HH~ zhK3gm45bDP46hOx7_4S6Fo+k-*%fHRz`($i*xsj6w{|Acr$BGB7YoF|dN! z3=Ce3(r|VVqXtwB69WU2FqF**3Rp1qfa(F$@S#w#8E0}bPIQtVs55^sNqq*fmRPeG(${N$!K6YPwBz8La*=A$z zzjA*LHGJ<}!L7tC@_j~uSXZ{o9ks6FfZM-hw7&)Jw%=3La7Q8LGREEKNM} zWZI*LBA57M?Ot>;==Mo?N+tQps5JhStCHZmm~uL|xb8J@k~V|)4!2YW`&0|# zogFv2=G_#CS*#Vta`^b!o(|D}uVOtpXVw|j|M|;0(P`0(v^@_SK%Vq;^>bP0l+XkK D+rFxE delta 351 zcmaFPa)Wt-3NK5#qpu?a!^VE@KZ&dp6&pI&N0dQc zq_XZ%0RsaAV}6le2;=!h<+B(V81{L(IEF}EuI;zxI+P&L;@;e<)ZxD2inoemFuURE z8=Ot8(>q%Qw{WdU_$Csy#8Y+JJg27AC*?I;{WjLT;WO4b6aIre_MGvwDwB@b*nUx2d|220JQbxLlM!H6ZAqECk#)ei# m2HFM&Rt5&OelsslJSeV)U6w~!F_(dXfx*+&&t;ucLK6TkVub|& diff --git a/gfx/pokemon/back/pupalb.png b/gfx/pokemon/back/pupalb.png index 1c8d830f730d0c2eb1185bd234f560994cd5713e..d41dd004392b87bf8635bea37309f6fd2dd5dee3 100644 GIT binary patch delta 280 zcmbQhvYvTDX?>{y14F3+<6YyTvkVLj>?NMQuI$fwSef+||2Y}OnsSA?G?P)(x@n8|+NiBp_+>t871#G_V`D6J3H$-^8B5;aG{jLvH5=;+Kf6j@@udf{k*(t zr2w0t9V4~?ZY0nHME|8QkG}1LN4Kc8^GBLL@HqtdPvobJ9yz`iQ;zdanY;ppP T(c2jq7#KWV{an^LB{Ts5Gt+DY delta 400 zcmZ3_Jb`6GsW#sc1_r((j8nDwq!}0(*h@TpUD=!I@y872arS)NJqiTNGH(%3I zh>WOVITi7V@s!0U_EQO_jYct&3O!R7o-t@MxFDmDoT*_y!>~AuW5&d3Vp2i>=RbUM tW~Q;Tv%@(LZeCVnJEoTx5+2oXF|3h1cx?y&go_|od%F6$taD0e0sxlEYnlK6 diff --git a/gfx/pokemon/back/rhyperiorb.png b/gfx/pokemon/back/rhyperiorb.png index 8b4f49c73dffd8215f6e81b65620e49027aed5f9..07edf19eea8cab8c6a7898a9ef106b5467441709 100644 GIT binary patch delta 379 zcmdnY@|Ig#W6(Ua`F#;RvwKWdxK-?)f$g&dJPOq(Tqw3%IgH1^mluBlslys?Mdn|ZC6-M{l6t|x__ zSk-#)zvMpqDAUxdE((w1uCG#E*!b_iq+izBD6Lmn|K~sSxVCC(AJ5nSl6vv$qD)Pn z$Ok;Ryef3z!S%oX8{diAYGhI&I-xKtG-}25RVN*eoto*uc45wzEms28FLn6dagK-g v>MSM^L0(?osa!mb1}=^~Z|d9=85rW9Z??IxziAr-0|SGntDnm{r-UW|L@<&C delta 319 zcmaFMvYBOq3NK5#qpu?a!^VE@KZ&dp6&pI&laWJL z+xo#$n~BXTQbxK4mbwOpAqEy!CZ<*<#@Yr3Rt5&Ix83$5b{MvlRVMU)J`F*{_y4ZP+m>;*PFf)QQEede8f^ z6{|klrA@IrC-tRPG*|L#cgQ3i-VpXnmlAE1FL`$Kv>)eSXFFx8$z#TL&ShoI=hS|V z)Wn6GLoS^>&=J=0@7w{4(*nyEG9F|-rI?>MS^v++-|X{tZIN0wX=w!m0|SGntDnm{ Hr-UW|j3at* diff --git a/gfx/pokemon/back/sandyshocksb.png b/gfx/pokemon/back/sandyshocksb.png index 2b776bba6bc284a093416c90092dfdc5c5ce75e7..fc4bb6bc5bfbf4a2475424867608d19a3729835c 100644 GIT binary patch delta 416 zcmcc2GLdzH%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf6l|oudJ^e;r zKTp@!Pw3!y+$>b5@VJ|~nYr0!!pGyM<~AObJ7IAk>-+(QKl2~1U%|XTnd5VP+x_4- z@^QSW|IZiXe_S6rb)iG-^Jo8~KWc@1w|5S`zy9dzWd?uJH>`@fx;=}rBXO%&b}0Ab zdN$qqwV_eku8p_09tm3$wMitSbxMXu*a@!%-xjY^T)1$h!^*{aJPQ{pI!v}_V{&C` z$a?powX1Cx^W0tM^H(Kz*iHz{+afY;Ume;`XivPn|5>x-p(O3*#-794 qO|H(4J?FLmDE9mhXlQ3-khnj?Vnw_37X}6f22WQ%7nXHS2~7aHsjh4Q delta 351 zcmbQpdYNT{3NK5#qpu?a!^VE@KZ&dp6&pI&hgFzI zB<#h>kcrJIQbxLlM!E*3A%>P#hDKI~mf8jeRt5&=r@s3;@t`;k*?lL%94D(WX4YT! zba4!kxLkW~BiA7V0k#L;x$Ln$LiZhGLJIP^Pd-QrHrc#ee_=EKBc%*ECy~Ob`x;kU zY~|ontys2p-Mue`|LY4HW=P2kG8#(%JD@FNy!}w?1xHrDyF!r+m(v)9s*N^zOyzKG z^r>XroSq;td5g|`jVoRf4SAi{PhC8H|q85zQc^i^H-!WFfg!}c>21sKj&fLW;J&H+E_PnvWk?kuAz~x zfk}v=p_PHDm8pTYfq|8Qfn1n-;KYmKe%NL6x&OaqU|`TFag8WRNi0dVD#^@EEiOsS zEnqM*FhbK~2r+S9=GC^zOpKZJ&pcfmLnJQOp0~|Dlpw(Vfq9~nnD~6xm?LLhUp@Ke zqo>z3OaI{w{)A>T5g*8$t7?F!*=>^Zjo`Q^K_>%Jc=WNG2_ z5D2igW;6VdUcki1Hi@m!>w!X4?GGm2Z(9_)J8W|t`+sar3sRF`d^Ctnb4N)#mJw~+^PaI@l-MGt5gi{B@cZk|qyP=yDSf-lH)y^4wcw2K z@|o2Oe9vbaPIsJ|w(j5@_LX6qPR+|%n!Ecz@Ikk$Gj$LCyQ{S8uG604{c6uH@8Sz) d`(MZ&uIRTz&md0w1p@;EgQu&X%Q~loCICIYp;Z6? delta 302 zcmeBTUBog$g_kAW(btiIVPik{pG4M)imtLp7#R4DFizFxlV)IGU@!6Xb!C6X!z#>e z7__$g%EV?BDI;A&BV7a25JO8VLqjVQ3vB}fD+7a5rU7~r4~pZE-JS7b(quKp%=$&1 zE{-7*ms`(o9an*l}SujjCeA<_bbS}TARYS lbh@hH0ly>vDlMzaVn3kC)T22WQ%mvv4FO#nP?X^a2> diff --git a/gfx/pokemon/back/slowbrogb.png b/gfx/pokemon/back/slowbrogb.png index a34ca4e30ea6c3298c672cc79f314d4bc014b66a..776e0372be8f43a53c715bf7e4e4b6e835767f11 100644 GIT binary patch delta 359 zcmX@e@`ibW%0v^V`ojzie1{p2=dVa%U|?V`@$_|Nf6l`ypf7elbkkD?28P|9E{-7* zmvhhCa~%rcVf!F+NKbFwBgrY-nu;~wN|#(;I9(uI-0|&$EZr@ZP2Ici9gu#Zuwuaj z`A6avlT8l)u4|d_!6PS-)n?B;?Jv5wuRL^kVffMadVfpa)~c*oT?VNqAM+NxEtG3N zusnQSQgdRVoAcuxU3FPDu`eX9NEpvLwpBtSNX5LMY2s1g*^*Q5>RwY%Sgz61SClr7 zsk)MJ<^@OV&ypYR8R>5{*tuZyfs0~NGMW=I6B3(V>HmMs-mJGpHRa-Z(}@ctB@B&p z4NOA}&8$q!t&9w{4GgRd46a@-?3#E{G6I|2lD?B>3=9k!C9V-ADTyViRwbFasl_FU ixdjYH21drZD0++_<{c{jRKmc(z~JfX=d#Wzp$Pz1UX6?Z delta 465 zcmaFEe2`^=3NK5#qpu?a!^VE@KZ&dp6&pI|g_Bo7 zy{8E6|ASQ!}nWB5`&xtdY39-Cx;tj}o%28O8A2+uTMUj{7(1_llWRz@KPW{`yp zj0_BnQVgtMHUonfqcofy#HayP!^FVABn)LUGQfZbR1cVz5BhGxP|v_{(9^{+MB;Mp zc|)#44g#zfY+Wwhxba$aii=`t$4Rke=B@LT*7o*lUXq&d<^kuW3Wod#fUO_QmvAUQWHy38H@~!jCBo-bPY^G3=OReEUZjSv<(cb3=A&&zQ{q* zkei>9nO2FRffuf0kwCzO$(@Wc^(e-fL5xe9m7vDJzz~%h;hE;^%b>-;z`()4$|%IZ z400j^BLf4Y6ay=m&A{NrC=F)^F={~7FflMN2}9Y83^3pU)dQyGgT9+E)H5&~@pN$v zk+__D-k$4_fynWX@jYG53EeJTt0()#IrLn}YZ9F7UBUU0E%uJJMo9m|`A0qT7nlbW z1gtm`e%tfRmxp`bOEb;3|HFKK;tQGZyXO@`+sb)2i>Fq6nPD5)=KbiaM5;w}cv$H5 zq-@sN2^kx`w_JGRxkEcy%Wy5b|85kJYOFVsD*`Kp;@>( zG}l}ZDbd=Kb3c_wErsP|huaY~8<(a>dXFxf8{AyFQowT8EiI?0E6z>qtC%@9yfHp> z_DMzGjr&Iq-tKsMXx+TCr#lU5W~y^`X_sf3sOFRyT@=aT-WNFa;MVLvyZ^H1^DUe9 zedezCw22cWB@9e-4J<Atqcsc4GgRd47k`&a!oua8G%i%I;wCR0|SFbiEBhj qN@7W>RY_)UYH>+oZUKXlfswH;Ha$B20htU83=E#GelF{r5}E+d<#iMQ diff --git a/gfx/pokemon/back/toedscoolb.png b/gfx/pokemon/back/toedscoolb.png index dc282006537ae7b93fd5a3b3396741393793f3fb..29a5f6f273139ec93153790f177540df0ede4c4c 100644 GIT binary patch delta 324 zcmbQjvW;be%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf6l|ouVk??Tvco0WECl6T|*;X z1Je*gQ!8T=D^oLV0|P4qgVget;E5N-{m^7hA+oB6)QT7w7&J;;BT7;dOH!>$GILXl zOA>Pn7>o>z(DXn}bhei@n9RhOSwG3s#W6(Ua`F#;R-Pk<>kOPE>bHiSY?i!#ZG9A9 z+MT=qv-D;Z>eYv`&Inw&RqM3ek$|gFOF7dz))qhAJYHOC#jDuUVt_sx&IA>p7 zwK73aQ{wTBRiP^nDIB{Ps-4~>DZltq(7`VKwsUj1%q&$+bVSxfOg0rcWFdM$iffw2 uuLB<&86Q16S})ctdH?+X?FyGpGdycM>2NbLQjLLufx*+&&t;ucLK6T#*>uGK delta 288 zcmdnSGKFP=3NK5#qpu?a!^VE@KZ&dp6&pI&hg(d> z|q85zQc^i^H-!WFfg!}c>21sKj&fPS5*C3BV{mgvWk?kuAz~x zfoX`Lsg<#@m64&gfq|8Qfyc=ednaBL_ror0IYoexfq_Az#5JNMC9x#csw6WvwYVfP zw}8ROzz9{3u{p%VgTGm-CNnW+*01(-aSV~TTzg)T?~sE4>xKIPD{_2=n+_&hIH@zX zGccAv5NmLpT+piZuCdX(pk-Q!!YrQu`72W=&$Kc8oi2XvbBdz{C+BQg4w0PTX}WjZ zwI9Xo@?Ur4aoCSFB6`{9za6&a@2ne~01 zE{-7*mrKv@^)U^#*M0u4HI$0%DSyL}O{@3GjQ1qJm z{k@ZU-5z$QD#*9Fh&gM|5HXs%wAY+1FK^bZ`<13AD&L7rciFB@p#(-hn2S8HO2uo{ArNlP&Y|`RV^386B4|l71Ap S-j9KSfx*+&&t;ucLK6U0+h`X6 diff --git a/gfx/pokemon/front/carapthor.png b/gfx/pokemon/front/carapthor.png index b773f773517ae52386c5414271edc7cc7355ff8b..c69a5a225e4a81cf3bc68462019432f3f3c3b89c 100644 GIT binary patch delta 772 zcmcb^-oP|q85zQc^i^H-!WFfg!}c>21sKj&fPm$$gRKX=N+$!ZdYM!E*3 zA%><_#)ej=X4(b@Rt5&masJ{HFG~8L$eBXq4!?eD#=yX!QQ{g=l9E`GYE_b%n_66w zm|MVLWME{hi=qc=-cqq^C6k#Li|P+%Uk;FA{}4ZIny0zX)g!O9I<8dRIB=Tp==623 zJvaK!Hoq`g{P>%T^$N2iE+~rZdAsGR?{A+(+lmiL(bnb@aH=9=vvIZwo0erP<|cG|s_y|r!UwB5el`!P4_R-Ym3p3KfS`Eob)mrvT;#$7Q# z_4duwvZeQaUfOcxdBmS*5l*LU8{Nz^9P>`!GgMh@RqxX(dvxmkZ(Viw9weylKJw_| zpUVBw*H4+NtTkEEv^;j@I-X5-eZ_0IOpBr>&oAB)4CISADx?PpI~^+i_zuz*+m}gL9>f$ zZvG3H5Hh)vhfhEJ@ye~HSuSUKVsob*V1!MW$#7)&l3Snn;pSoi(l z9i^+LTb~$eKUh*RCGCn(AN#|KQ@UE$_6Vh24gSX1@XX`H;j`-;i-Xc~rlia)4Bb1%m&s14|HEC+_`UM&7e6+hcm@Ur22WQ%mvv4F FO#raSXH5VA delta 734 zcmZqRxWhg{g_kAW(btiIVPik{pG4M)imtLp7#R4DFizFxlV)IGU@!6Xb!C6fBF1iD zvgg+CTN9hrBn(V+jf_GJ%&kl;tV}Gm4GgRd3>^0Jex7(x604lyqpkjv)fkKFH)ab5 z%CLX9|5ZpU^W&m>JGV7?^f+_t$u_;eWHLFa=;YoeKfP(QF4jMYGF;%wv7t*kCCIN9je(HI)`#q9=_t);uZtJ@EI`)dhga0S3PQ2Qn z*t+gy_r#Z*A0`Bc`A+W9n$*{CvwmK~E#dkX4*do0FD7Qpo5S|PS)5sZ@f4;{TxAFO z_vpz5F?>muXwdg)IBT=w#gSJbm30FyX_ku1-z=}*ZeZQI z@>8;hi*Nl5i4u|Pb-PbLt8Cu;^o&xsd-3zXd9m7e1A3C?OU>K2c8ZYO&W@&r7oVP| zEnRZPn@x@-X_4SXF{{|!>En*9z!L(V z^E;+Kxmq+W&GZnb#njDHm*jaoyZHIRy>mBTr_7YPqNVULVOf1$&B<8yS<~jcIy7DW zP4=0o2cuf=TGt;)Tr-iSUSsP zU~GlgTg&R4H{uI4)3!74+};#D*YsxH?}KlcOnLX7m?>NoW9N0bO3?jq!H%--Q>M## zH@(VWXK>h@a$xbJw#acHuot;}JlsN49_b$+*+G0=Jngzbb&TZxn2R`T&MeQ+o gyWsER_#fQu*WVs?dXaO4fq{X+)78&qol`;+03C^5tN;K2 diff --git a/gfx/pokemon/front/porygon.png b/gfx/pokemon/front/porygon.png index 68ec471b614b717ec1069ac2922b4eaeb85897e9..ff5aa17342425aad9e518962dd3e526e028cf66d 100644 GIT binary patch delta 548 zcmX@c@r!kW1Sb;%0|SG_&3(TnD(V|EC3(BMFfbdp6m>8#FmM)lL>4nJ@ErzW#^d=b zQWzK**h@TpUD==Wu=2~BdovWUPHa{eH_|mQ4KXyeGB&g_HPtpSure^%v@Nu2;z22I zEK-MGzcpiEV9+RWjVMV;EJ?L0$;?eHE=kNSU@$T;GS)T3qG!s#GcPBrF=o^=hIzU; zhG?8$dTFm8lcNCp2U`m#&E+!r2}v0>E!JN+vY6GaGgkb`m~u?q;Nq>eBL%EeISV-N zcn1V#G)DzwC8e%$=v}yDZ(%u4;~}r@zf;T8{@sji?|+obxu;>b&xbc;=C0v%g_ z@jRTjBk%kNMXl$&oiCgoo;|+Br9$~*y^Kja*Q1Ce2@~a8H>X!{Wo4(fcF7b7oPH*9 zVG48DPfZcdToJkZY+eQy2L)n!gSRo>H~5-{NaUV?p%W$Gh3*6g&_At#5auCD1%D`={z$gU+pc4zqa+AKSZj z!NELnO-*3&jgXX^HS1H(Y RaBl>q2TxZ&mvv4FO#toI-md@v delta 883 zcmeyxdW>U&1Sba@0|P@i)6e#aiu%T!1s;*b3=DinK$vl=HlH*D0|Qf%x4R1ivvEsN z2Ll5Gdx@v7EBkY986FAYrKT1B6Pwk=4RwtyLJWMu}@gNlIc#s#Qs5ZfbE!Vr~J0k%5u1t|77>ONgG&58m}mR%6Vl zXIkXx;uwQXHygO`;RB@yqkB_EoaLAJcozhf7d?rc33GWZMspiVsG4S zX5(|;9qL*yPY+-&?D=+MANNcNgU>Z~+g~d$bkncTzoOWaxZ~Jyz6%Lge(GFv5YP=4 z;z|>@IT>SX-dr7W-vN*-Dqs z!7n(3ZSGfn7wqLc>K$`MOrFhaH-r0(j`i;R*}Z34pYffD6W+t7yqf>ZJF&-Go#*~c zS+I?J!*LeNtool`3K9T>(`IN2m@ znlt71#kn2af`Jx0BX~}fHf)^O`f48I^%Os8g_|ebV?<}gV`ZF3nq2+yB%hxDn;HMBIp{5!;2}2kae$D_%g%O1<~23m4q`#G zrH@xXdT7A>@qpv{9UmtpxPC2&JAY(dc*YdLg~}1;dW(EylY9>JOw2fRH7D`ir9G3b zESx{ZiAn0Dd)Rifc9}}S9sS8mD_%aXKGl%H;&wKrLiSAaj)^u$f6RIy5GH7G%QkAy zxnx_f^S3%umz_JHF>mS_^C`2ekJwL)O@E+XC}}bK^nsgub~dK|WPWb@aD!3*6Hx{R O1_n=8KbLh*2~7a|Lxy4i diff --git a/gfx/pokemon/front/rapidashg.png b/gfx/pokemon/front/rapidashg.png index 6abaf33549ad289e05a7032c7ef6ce4e36e4461c..e345a154876af9cc4e5df1e3c2ec1a01692d6335 100644 GIT binary patch delta 727 zcmdnbeu{m9%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf6l|g&CaG?pniYiWHkvxBV7ZN z5JN*N19K|_Q*8qSD+2?D>TT;MUX=7fku!nFT@Pek&cMK+QQ{g=l9E`GYE_b%n_66w zm|MVLWME{hi=xL2qDTC;Y2aig#>{#(PZ!4!jq{c}5- zrb_eCMx%|U?awxOmbri64|o-~%G}XYY3YqB&TDKY)76$8z03ZOSN@Q)1PjdpQ$#k;oLTV|6Bf-1?F}K4u59evQNRTyi;9J{_Drv z^?PUbUs?Kc?(7%IUoRiL)90Pd**1U28lHm}R-KMFj>!V!vW$}8Zw;#3T7QOn!Snt~2Xz21gUN|@Xqh6Z8{^wE|FXx!Ce$Y8)ViTBenl(kS z*;HO&=dP1G*(bQHdFi9~%tC%zU>P4^FkdYohhl73Z$zeLsD^Q{Ro?@}?xG@0ri9 zh`s*&tH?u!aY91WU4^5jA6iNU6;^#*BbZzpGTVps*n2JSwKGJY+~0Tn;bnQ2rKLVe zUhEHb&z}fg|ET4{o|q&RgX*)|)?5BWwzj5Ep1QHjWqA|VbP0 Hl+XkKhm$&s delta 714 zcmX@bzMp-93NK5#qpu?a!^VE@KZ&dp6&pI|gG;3SUB;ZBv!eL@(!|-)fhAD?LA!_ zLp08ZUiQrvc9dXvuwCAf^J>esgZwPaOH=1||6;ewT%xcu$Fs~~PxyuS2fE(;QqGB@ zQXABhuN}F&Qsa?hes4(N_X|_2PCFivzp!a&Fq?JgfFdxwIMIlgk(mE9&vv z6&wjx@3<~FTRBJU;!?rt=|b1 zoJk#Vp_+XGYsA$~Y)<|a99(>)!z@_GO0YiY$b|dqPfFywEpF5}=yb8aJy3l$P__8$ z?O&GDFP|)rVdK*BS)4TI^{jO7U#r(B92N?@QLE^kanon2d+n4pr><7lI0y!ppElCI z6tSqjy>a&yMSaB$=D{Xsjwq^i>^jyLq1PaPadYSgty|9~B+c`B_Fg8?J!9jZ+y!Uk zCvFqmx6vlt@W#L9q~FdS%zw?_2k!ajt7@wE+In|?(rUAm{V`iN`k(rgvMln3V!xlV z)+TAWWUeULO-_Zq(h6EWAJ6z%E&Ug9--y35Sml=K-+G?A`?HwNZMHGhZJnL5EBAoR z<(~Lc=XPARPYGDP!E$-aOg6)++z)H5?kK6|#Ccr4XSd~zVbQ$jFQ2!v>{8pJqrH2Z z;PShXJYv2DS>N7F^|^LH_Ri^3Yvx@EmQ0PB)>Ce-@h5iPR8_y(9gfW_6{by(=$l^p zXVZ6!rA`9LI^m&u5tr6;&y-;OZ<+kWu`KlKJhjQ2O2e{R52v|`3O{0NI{bA<>qf`d z!W?qX|0tGC&ie70`;epAPD|q&?z0;Ymio=Bk$U)p|335U07cwv~FnGH9xvX|%gP%L*DBQWj zm=h;k{d3->xaRo8!!PvjD<4^%u&CYkvGbIIpD%81iT4q=F`H%2s*?3sZu?i}VpprT zzSf6NO`2=?OYTDbll^l~t^PMh(As@x_v-L{qNgWcvWF zjLx1ejv*T7r(Ux6KI|aD_96S|QiX*kO|$!a1?(HYaOLS`9$xzICxesKPhO^Jd~8dc z1+T1BmG${x9kFn$SW8J!X~9KZwP{u{wR^YtzQ4BbHh*7z`}3!^EQc0MHJHlcQ^WXP zsfO`Neu2*i(Kw|~_AD;-V(fpo7(W~}yt}&4CHa)$j%^iD|2Zto&T)HBnbrLF7}J&F zMzw~sT>o+cGW+yS#cTF9ZAl4Usk0*U|sWO<;(;wqm`3c>xxSEuKixnGx5u= z$vZurdy*a&?v6M7Dp9ZeL9VIPS#gGAs4e@ZC3$a{7Kz@z{K!O^KjY0Uy|#V#)V?v00ngjG9+&=-q!>^-}VVsW(?Egt|HRw9Re4 z>E^0_M8oFTW?dD{D+00Jd4DGf`>nTP>bjJ5Kh^I4-kLMlvK{!P7#J8-Cr%NTGSW3P z(ls;*F|f2UHM24{*ETS)GBCJM^Q&>." - para "What are you" - line "waiting for?" - - para "Off to the next" - line "room!" + para "So, what are you" + line "waiting for? Off" + cont "to the next room!" done diff --git a/text/BrunosRoom.asm b/text/BrunosRoom.asm index 874ff723..e3e810a3 100644 --- a/text/BrunosRoom.asm +++ b/text/BrunosRoom.asm @@ -44,14 +44,12 @@ _BrunoRematchText:: cont "from here!" para "Now it's time to" - line "show you the" - cont "power of my" - cont "#MON!" + line "show you the true" + cont "power of my team!" - para "They've been" - line "training just" - cont "as hard as" - cont "yours, surely!" + para "We have trained" + line "just as hard as" + cont "you have, surely!" para "Hoo hah!" diff --git a/text/LancesRoom.asm b/text/LancesRoom.asm index 079d68b4..aa17ad6e 100644 --- a/text/LancesRoom.asm +++ b/text/LancesRoom.asm @@ -1,6 +1,6 @@ _LanceBeforeBattleText:: text "Ah! I heard about" - line "you !" + line "you, !" para "I lead the ELITE" line "FOUR! You can" @@ -65,10 +65,8 @@ _LanceAfterBattleText:: _LanceRematchText:: text "I'm glad you've" - line "come." - - para "Thanks to you," - line "the #MON" + line "come. Thanks to" + cont "you, the #MON" cont "LEAGUE's rep has" cont "really taken off!" @@ -91,12 +89,11 @@ _LanceRematchAfterBattleText:: line "dragon brigade is" cont "weak..." - para "Hm? I'm saying" + para "I'm saying that" line "your strength is" cont "truly incredible!" - para "Now then..." - line "." + para "Now, ." para "You know what's" line "next, don't you?" diff --git a/text/LoreleisRoom.asm b/text/LoreleisRoom.asm index 4ee81c68..868cb7f3 100644 --- a/text/LoreleisRoom.asm +++ b/text/LoreleisRoom.asm @@ -41,11 +41,11 @@ _LoreleiRematchText:: text "Welcome to the" line "#MON LEAGUE!" - para "Hey, fantastic" - line "timing! I was" - cont "just thinking" + para "Fantastic timing!" + line "I was thinking" cont "how I'd like to" - cont "battle you." + cont "battle you just" + cont "now." para "I hope you're" line "ready!" From 9ffacf00d88da583f9186a9deed8e8fc9ff5698f Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Tue, 5 Dec 2023 13:30:57 -0500 Subject: [PATCH 3/6] More polishing up porygon --- gfx/pokemon/front/porygon.png | Bin 762 -> 1131 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/pokemon/front/porygon.png b/gfx/pokemon/front/porygon.png index ff5aa17342425aad9e518962dd3e526e028cf66d..993fd202e5c92b6e4163e5bfede8dcbe56bcd132 100644 GIT binary patch delta 795 zcmeyx`kG^c1Sba@0|P@i)6e#aiuwwi1s;*b3=DinK$vl=HlH*D0|Qf%x4R1ivvEsN z$HoFV#(JjXo-U3d8P0E~HTFF+;Bk3avY$hqQ-0_5@+80D`I9XYwZ%HsT{ESR&+~LT z{WJUVmt%jbzT}@ieqi-ai3(GB=FoN5U%#xeTi&}dl+Rq@;q=o_kEp9>_Xuu2GVOtZ zSz`S5+iwe}JNG;adm{5qHSMW+VE=BJq=?$~bmK{7Z129;|Gsag72|l^?Z}*&6^6-4 z=?#lSs;;qA#x#f>n^++qoV#HCj2nMDJWsj&dMY34&~##@nuN27)62-8k!5UmY&pYy z6r6T1ui-ntC7_FW-p|^p&$3Idwy=a%mMt%5yWthTRa98$ePzq+#p>(NSteUK#e|=; zpJJC1DqOW$;Ph7Wj{0RHt1D*CR{YC1;lkvXvy}EuO_WQkUcEjhlIP4CyD4Q3N2{zG zcTTHt-#yV#TP}!MW#WVz+kFhy&EPm6S=pPe7FFzCQm!Bt*3apZ;F2qLer0x+@AF$> zyEzYU(fznT?t0;?v@G%W8|~D$Ni5!X>ViYqo_6VlYdgZ@6My7i*{j4l z3{+{Ya!UJPvnu#x>@CIw@uVbsp)J=0KeA3J>?jn-?s?)X$#7_|!F3bP&&f(6?>|TF zXzbdukTJ~fEsc zdJnax2>Sl`BX;KFj#Zt{1TVef?quV9Ka)YeywEn~$n&p#!Pgly6w{0Z<8+)K-@GGc zthQ@Eqs!zas&Z*ZErlc|R-C_G#aMFR=~nAJ#)XR{XDZzNJtyLD@(bgYOW!lROWxR{ zlXT40@Y#Otr=qi7pP!S;yeP@#@yw36l^JS6XS+3-4|S)eEfSE7(lBLXKEI*U`Rcl( z>AUQk^3Tqi8ED_2IaB|VK@EJ>QGcYhPc)I$ztaD0e F0sz6?X_){3 delta 423 zcmaFO@r!kW1Sb;%0|SG_&3(TnD(WjRC3(BMFfbdp6m>8#FmM)lL>4nJ@ErzW#^d=b zQZ^RIG1fDNdAc};Xq;bqX|ErXqX7E{TMH-69@B9Zvt>?U*FPt8pJ-)@ILiuC8j7dA!qlhF46Xjbsr&n-g zWv8}w$rK2jekO8Z3Uk;`O%cvq5xM(pUIrEi1!8)Gw>e&&lrX!+bD5l~%rfC)KmCg4 zT;f^9*~@#x`|iTLg`4|+ypqzMQnj<+;%h}?LG;_lyV>UyJP-e^Z+D|5&^$2vr|MjT z&aHb6vv~_2+q-tb!90nj$7D~W?DqLR^YY_@tBF!)e|{<|Q0Wgmd&KW>UgyR=OPgjT z6mc$IQO59T!lfB;0lYp12QTh?qY!P+z#g7a7UOtgkwx99=RxB2{AHE@dbaIkI5_R! cZ_T=c=Dz1wDcEyxZv;h&r>mdKI;Vst08$dW&;S4c From c93beb4d72fad46337e5c3bf47a622c509f27e35 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Thu, 7 Dec 2023 23:10:42 +0000 Subject: [PATCH 4/6] Improving movesets! (Improvesets?) - Rhyhorn's evolution line get moves at earlier levels, and now learns Rock Slide and Earthquake by level up. - Clefairy gets Body Slam by level up. - Nidoking and Nidoqueen get Earthquake by level up. Nidoreign instead gets Rock Slide and Body Slam. - Grimer and Muk get moves at earlier levels, and also Acid and Haze (from Smujj) - Scyther gets Wing Attack much earlier. Scizor keeps Double Team as a level up move, instead getting Iron Head at Level 1. - Tangela and Tangrowth get moves at earlier levels, and also Night Shade (from Burgela) - Geodude's evolution line now get Rock Slide by level up. - Paras and Parasect get Absorb (from Paraspor). - Psyduck learns Tail Whip earlier. - Magnemite's evolution line get moves at earlier levels. - Koffing and Weezing get moves at earlier levels. - Seel and Dewgong get moves at earlier levels, and also Powder Snow. - All Tauros forms get a new move by level up (Body Slam, Low Kick, Flamethrower and Water Gun respectively) and learn Tail Whip much earlier. - Trampel gets moves at earlier levels, plus Body Slam and Earthquake as level up moves. - Gavillain gets ThunderShock, with a few moves pushed back to later levels. - Sharpoon gets moves at earlier levels, plus Smart Strike. - Bittybat's evolution line get moves at earlier levels, and Golbat evolves into Crobat slightly earlier. - Doduo's evolution line get moves at earlier levels, plus Quick Attack (from Dodaerie) - Jynx gets Powder Snow as a level up move. - Meowth, Persian and Perrserker get moves at earlier levels. - Vulpiii's evolution line get moves at earlier levels. - Ribbito and Croakozuna get moves at earlier levels. - Omanyte, Omastar, Kabuto, Kabutops and Aerodactyl all learn Rock Throw by level up. - Seadra gets Pin Missile. - Ministare and Iguanarch get moves at later levels, and Ministare evolves slightly later to match Dragonair. - Sandshrew and Kantonian Sandslash get Earthquake by level up. - All 3 cocoon Pokemon their pre-evolution's moves as Level 1 moves, and try to learn Harden each level before evolving again. - Beedrill gets Fury Attack slightly earlier. - Pendraken gets moves at earlier levels. - Weirduck gets moves at earlier levels, and evolves into Golduck slightly earlier to match vanilla. - Golduck also gets moves at earlier levels. - Guardia gets a few moves it was missing from prior evolutions. - Orfry gets Fury Attack slightly later, but both Goldeen and Seaking get moves at earlier levels. Seaking also gets Swords Dance by level up. - Ponyta and Rapidash get moves at earlier levels. - Bellignan gets a few moves it was missing from prior evolutions. - Hitmontop learns Focus Energy earlier. - Wugtrio gets moves at later levels to match Dugtrio. - Sirfetch'd learns Leer and Double Kick later, but all other moves earlier. - Melmetal no longer gets Smart Strike. - Alolan Dugtrio gets Sand-Attack and a slight moveset shuffle. - Alolan Golem gets Defense Curl, Rock Slide by level up, and a slight moveset shuffle. - Galarian Slowbro and Slowking learn moves at later levels, with Slowbro getting Withdraw and Sludge. - Various evolved Pokemon getting L1 moveset additions to remain consistent. --- 3DS Border/KEPBorder.png | Bin 9770 -> 9768 bytes crysaudio/cry_headers.asm | 2 +- data/credits/credits_text.asm | 2 +- data/pokemon/base_stats/beedrill.asm | 2 +- data/pokemon/base_stats/bellossom.asm | 2 +- data/pokemon/base_stats/bittybat.asm | 2 +- data/pokemon/base_stats/butterfree.asm | 2 +- data/pokemon/base_stats/carapthor.asm | 2 +- data/pokemon/base_stats/croakozuna.asm | 2 +- data/pokemon/base_stats/crobat.asm | 2 +- data/pokemon/base_stats/disturban.asm | 2 +- data/pokemon/base_stats/doduo.asm | 2 +- data/pokemon/base_stats/gaotora.asm | 2 +- data/pokemon/base_stats/golbat.asm | 2 +- data/pokemon/base_stats/golduck.asm | 2 +- data/pokemon/base_stats/gorotora.asm | 2 +- data/pokemon/base_stats/guardia.asm | 2 +- data/pokemon/base_stats/hitmontop.asm | 2 +- data/pokemon/base_stats/iguanarch.asm | 2 +- data/pokemon/base_stats/jabetta.asm | 2 +- data/pokemon/base_stats/kakuna.asm | 2 +- data/pokemon/base_stats/kingdra.asm | 2 +- data/pokemon/base_stats/kotora.asm | 2 +- data/pokemon/base_stats/lickilicky.asm | 2 +- data/pokemon/base_stats/luxwan.asm | 2 +- data/pokemon/base_stats/magnetite.asm | 2 +- data/pokemon/base_stats/magneton.asm | 2 +- data/pokemon/base_stats/magnezone.asm | 2 +- data/pokemon/base_stats/melmetal.asm | 2 +- data/pokemon/base_stats/metapod.asm | 2 +- data/pokemon/base_stats/ministare.asm | 2 +- data/pokemon/base_stats/mrrime.asm | 2 +- data/pokemon/base_stats/nidoking.asm | 2 +- data/pokemon/base_stats/nidoreign.asm | 2 +- data/pokemon/base_stats/omastar.asm | 2 +- data/pokemon/base_stats/pendraken.asm | 2 +- data/pokemon/base_stats/perrserker.asm | 2 +- data/pokemon/base_stats/politoed.asm | 2 +- data/pokemon/base_stats/ponyta.asm | 2 +- data/pokemon/base_stats/pupal.asm | 2 +- data/pokemon/base_stats/scizor.asm | 2 +- data/pokemon/base_stats/sharpoon.asm | 2 +- data/pokemon/base_stats/tangrowth.asm | 2 +- data/pokemon/base_stats/tauros.asm | 2 +- data/pokemon/base_stats/taurosp.asm | 2 +- data/pokemon/base_stats/taurospa.asm | 2 +- data/pokemon/base_stats/taurospb.asm | 2 +- data/pokemon/base_stats/toedscruel.asm | 2 +- data/pokemon/base_stats/totartle.asm | 2 +- data/pokemon/base_stats/trampel.asm | 2 +- data/pokemon/base_stats/wugtrio.asm | 2 +- data/pokemon/base_stats/zubat.asm | 2 +- data/pokemon/evos_moves.asm | 667 ++++++++++++++----------- data/wild/maps/DiglettsCave.asm | 8 +- 54 files changed, 424 insertions(+), 353 deletions(-) diff --git a/3DS Border/KEPBorder.png b/3DS Border/KEPBorder.png index 3f7643b2b8b6f8486d26357efda8f6a764b43108..d34ec1778662f6d2acb08e6b445e4624c07b899a 100644 GIT binary patch delta 9056 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 diff --git a/crysaudio/cry_headers.asm b/crysaudio/cry_headers.asm index 8d458072..b0080372 100644 --- a/crysaudio/cry_headers.asm +++ b/crysaudio/cry_headers.asm @@ -239,7 +239,7 @@ PokemonCries:: mon_cry CRY_GRIMER, 85, 129 ; SNORLAX mon_cry CRY_PIDGEY, 250, 256 ; SCREAM_TAIL mon_cry CRY_METAPOD, 31, 349 ; SANDY_SHOCKS - mon_cry CRY_BULBASAUR, 99, 192 ; SQUEAMATA + mon_cry CRY_BULBASAUR, 100, 320 ; SQUEAMATA mon_cry CRY_BULBASAUR, 64, 320 ; MINISTARE mon_cry CRY_BULBASAUR, 32, 320 ; IGUANARCH mon_cry CRY_BULBASAUR, 96, 192 ; DRATINI diff --git a/data/credits/credits_text.asm b/data/credits/credits_text.asm index f6377817..4ed3585a 100644 --- a/data/credits/credits_text.asm +++ b/data/credits/credits_text.asm @@ -285,6 +285,6 @@ CredEni: CredVort: db -3, "VORTIENE@" CredPret: - db -4, "PRET ET AL@" + db -2, "PRET@" CredDrLava: db -3, "DR.LAVA@" diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm index 1335e22b..971fff25 100644 --- a/data/pokemon/base_stats/beedrill.asm +++ b/data/pokemon/base_stats/beedrill.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/beedrill.pic", 0, 1 ; sprite dimensions dw BeedrillPicFront, BeedrillPicBack - db FURY_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db FURY_ATTACK, POISON_STING, STRING_SHOT, HARDEN ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm index 1f991445..c1a85ccc 100644 --- a/data/pokemon/base_stats/bellossom.asm +++ b/data/pokemon/base_stats/bellossom.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/bellossom.pic", 0, 1 ; sprite dimensions dw BellossomPicFront, BellossomPicBack - db ABSORB, STUN_SPORE, PETAL_DANCE, NO_MOVE ; level 1 learnset + db STUN_SPORE, SLEEP_POWDER, ABSORB, PETAL_DANCE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/bittybat.asm b/data/pokemon/base_stats/bittybat.asm index 5aeb223d..c11c4e4e 100644 --- a/data/pokemon/base_stats/bittybat.asm +++ b/data/pokemon/base_stats/bittybat.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/bittybat.pic", 0, 1 ; sprite dimensions dw BittybatPicFront, BittybatPicBack - db LEECH_LIFE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db LEECH_LIFE, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm index b99f932b..462673b8 100644 --- a/data/pokemon/base_stats/butterfree.asm +++ b/data/pokemon/base_stats/butterfree.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/butterfree.pic", 0, 1 ; sprite dimensions dw ButterfreePicFront, ButterfreePicBack - db CONFUSION, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db CONFUSION, TACKLE, STRING_SHOT, HARDEN ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/carapthor.asm b/data/pokemon/base_stats/carapthor.asm index 4ed854f0..df189a51 100644 --- a/data/pokemon/base_stats/carapthor.asm +++ b/data/pokemon/base_stats/carapthor.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/carapthor.pic", 0, 1 ; sprite dimensions dw CarapthorPicFront, CarapthorPicBack - db COMET_PUNCH, UPPERCUT, NO_MOVE, NO_MOVE ; level 1 learnset + db UPPERCUT, LEECH_LIFE, STRING_SHOT, HARDEN ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/croakozuna.asm b/data/pokemon/base_stats/croakozuna.asm index d302e842..ede1bac5 100644 --- a/data/pokemon/base_stats/croakozuna.asm +++ b/data/pokemon/base_stats/croakozuna.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/croakozuna.pic", 0, 1 ; sprite dimensions dw CroakozunaPicFront, CroakozunaPicBack - db DOUBLE_TEAM, DOUBLESLAP, BUBBLE, NO_MOVE ; level 1 learnset + db DOUBLE_TEAM, DOUBLESLAP, BUBBLE, MEDITATE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm index f65c4228..9b037371 100644 --- a/data/pokemon/base_stats/crobat.asm +++ b/data/pokemon/base_stats/crobat.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/crobat.pic", 0, 1 ; sprite dimensions dw CrobatPicFront, CrobatPicBack - db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; level 1 learnset + db LEECH_LIFE, TACKLE, BITE, SCREECH ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/disturban.asm b/data/pokemon/base_stats/disturban.asm index d1e785f0..c003eb43 100644 --- a/data/pokemon/base_stats/disturban.asm +++ b/data/pokemon/base_stats/disturban.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/disturban.pic", 0, 1 ; sprite dimensions dw DisturbanPicFront, DisturbanPicBack - db TACKLE, WITHDRAW, BITE, WATER_GUN ; level 1 learnset + db WITHDRAW, SUPERSONIC, CLAMP, BITE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm index 5616ff69..62c0dc53 100644 --- a/data/pokemon/base_stats/doduo.asm +++ b/data/pokemon/base_stats/doduo.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/doduo.pic", 0, 1 ; sprite dimensions dw DoduoPicFront, DoduoPicBack - db PECK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db PECK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/gaotora.asm b/data/pokemon/base_stats/gaotora.asm index 689dab60..392e7240 100644 --- a/data/pokemon/base_stats/gaotora.asm +++ b/data/pokemon/base_stats/gaotora.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/gaotora.pic", 0, 1 ; sprite dimensions dw GaotoraPicFront, GaotoraPicBack - db THUNDERSHOCK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset + db THUNDERSHOCK, TACKLE, LEER, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm index 90230067..ca2270ae 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/data/pokemon/base_stats/golbat.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/golbat.pic", 0, 1 ; sprite dimensions dw GolbatPicFront, GolbatPicBack - db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; level 1 learnset + db LEECH_LIFE, TACKLE, BITE, SCREECH ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm index 3314c452..48e167ec 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/golduck.pic", 0, 1 ; sprite dimensions dw GolduckPicFront, GolduckPicBack - db SCRATCH, TAIL_WHIP, DISABLE, NO_MOVE ; level 1 learnset + db SCRATCH, TAIL_WHIP, AMNESIA, DISABLE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/gorotora.asm b/data/pokemon/base_stats/gorotora.asm index fb24cc29..d1cb3190 100644 --- a/data/pokemon/base_stats/gorotora.asm +++ b/data/pokemon/base_stats/gorotora.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/gorotora.pic", 0, 1 ; sprite dimensions dw GorotoraPicFront, GorotoraPicBack - db THUNDERSHOCK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset + db THUNDERSHOCK, TACKLE, LEER, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/guardia.asm b/data/pokemon/base_stats/guardia.asm index 43a63497..b1adbcee 100644 --- a/data/pokemon/base_stats/guardia.asm +++ b/data/pokemon/base_stats/guardia.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/guardia.pic", 0, 1 ; sprite dimensions dw GuardiaPicFront, GuardiaPicBack - db BONE_CLUB, TAIL_WHIP, GROWL, HEADBUTT ; level 1 learnset + db BONE_CLUB, GROWL, LEER, TAIL_WHIP ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm index f1d9fc01..5f0aea28 100644 --- a/data/pokemon/base_stats/hitmontop.asm +++ b/data/pokemon/base_stats/hitmontop.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/hitmontop.pic", 0, 1 ; sprite dimensions dw HitmontopPicFront, HitmontopPicBack - db ROLLING_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db ROLLING_KICK, FOCUS_ENERGY, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/iguanarch.asm b/data/pokemon/base_stats/iguanarch.asm index a3cc4ed4..b45a15ad 100644 --- a/data/pokemon/base_stats/iguanarch.asm +++ b/data/pokemon/base_stats/iguanarch.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/iguanarch.pic", 0, 1 ; sprite dimensions dw IguanarchPicFront, IguanarchPicBack - db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset + db SCRATCH, TAIL_WHIP, LEER, BITE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/jabetta.asm b/data/pokemon/base_stats/jabetta.asm index 15f42ff9..804fb04d 100644 --- a/data/pokemon/base_stats/jabetta.asm +++ b/data/pokemon/base_stats/jabetta.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/jabetta.pic", 0, 1 ; sprite dimensions dw JabettaPicFront, JabettaPicBack - db BUBBLE, PECK, NO_MOVE, NO_MOVE ; level 1 learnset + db BUBBLE, PECK, COUNTER, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm index eb46ee62..298f8ef0 100644 --- a/data/pokemon/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/kakuna.pic", 0, 1 ; sprite dimensions dw KakunaPicFront, KakunaPicBack - db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db POISON_STING, STRING_SHOT, HARDEN, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm index a13e70cc..008e82be 100644 --- a/data/pokemon/base_stats/kingdra.asm +++ b/data/pokemon/base_stats/kingdra.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/kingdra.pic", 0, 1 ; sprite dimensions dw KingdraPicFront, KingdraPicBack - db BUBBLE, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset + db BUBBLE, SMOKESCREEN, LEER, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/kotora.asm b/data/pokemon/base_stats/kotora.asm index 3f584eaf..ff4c2369 100644 --- a/data/pokemon/base_stats/kotora.asm +++ b/data/pokemon/base_stats/kotora.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/kotora.pic", 0, 1 ; sprite dimensions dw KotoraPicFront, KotoraPicBack - db THUNDERSHOCK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db THUNDERSHOCK, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/lickilicky.asm b/data/pokemon/base_stats/lickilicky.asm index 9360cd66..0a7a13a9 100644 --- a/data/pokemon/base_stats/lickilicky.asm +++ b/data/pokemon/base_stats/lickilicky.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/lickilicky.pic", 0, 1 ; sprite dimensions dw LickilickyPicFront, LickilickyPicBack - db WRAP, SUPERSONIC, NO_MOVE, NO_MOVE ; level 1 learnset + db WRAP, SUPERSONIC, STOMP, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/luxwan.asm b/data/pokemon/base_stats/luxwan.asm index b77fd8c3..7b4e7520 100644 --- a/data/pokemon/base_stats/luxwan.asm +++ b/data/pokemon/base_stats/luxwan.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/luxwan.pic", 0, 1 ; sprite dimensions dw LuxwanPicFront, LuxwanPicBack - db PECK, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset + db PECK, SAND_ATTACK, LEER, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/magnetite.asm b/data/pokemon/base_stats/magnetite.asm index a15e6512..f69a558b 100644 --- a/data/pokemon/base_stats/magnetite.asm +++ b/data/pokemon/base_stats/magnetite.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/magnetite.pic", 0, 1 ; sprite dimensions dw MagnetitePicFront, MagnetitePicBack - db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db TACKLE, THUNDERSHOCK, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm index 29a80d5f..db4cef9b 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/magneton.pic", 0, 1 ; sprite dimensions dw MagnetonPicFront, MagnetonPicBack - db TACKLE, SONICBOOM, THUNDERSHOCK, NO_MOVE ; level 1 learnset + db TACKLE, THUNDERSHOCK, SONICBOOM, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/magnezone.asm b/data/pokemon/base_stats/magnezone.asm index 25435484..20bcd0fa 100644 --- a/data/pokemon/base_stats/magnezone.asm +++ b/data/pokemon/base_stats/magnezone.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/magnezone.pic", 0, 1 ; sprite dimensions dw MagnezonePicFront, MagnezonePicBack - db TACKLE, SONICBOOM, THUNDERSHOCK, NO_MOVE ; level 1 learnset + db TACKLE, THUNDERSHOCK, SONICBOOM, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/melmetal.asm b/data/pokemon/base_stats/melmetal.asm index f009148b..7f54fe61 100644 --- a/data/pokemon/base_stats/melmetal.asm +++ b/data/pokemon/base_stats/melmetal.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/melmetal.pic", 0, 1 ; sprite dimensions dw MelmetalPicFront, MelmetalPicBack - db THUNDERSHOCK, HARDEN, THUNDER_WAVE, TAIL_WHIP ; level 1 learnset + db THUNDERSHOCK, HARDEN, TAIL_WHIP, HEADBUTT ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm index 515d53d8..de51a72b 100644 --- a/data/pokemon/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/metapod.pic", 0, 1 ; sprite dimensions dw MetapodPicFront, MetapodPicBack - db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db TACKLE, STRING_SHOT, HARDEN, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/ministare.asm b/data/pokemon/base_stats/ministare.asm index 942422b4..5450b99e 100644 --- a/data/pokemon/base_stats/ministare.asm +++ b/data/pokemon/base_stats/ministare.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/ministare.pic", 0, 1 ; sprite dimensions dw MinistarePicFront, MinistarePicBack - db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset + db SCRATCH, TAIL_WHIP, LEER, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/mrrime.asm b/data/pokemon/base_stats/mrrime.asm index b79420a8..dbbf1278 100644 --- a/data/pokemon/base_stats/mrrime.asm +++ b/data/pokemon/base_stats/mrrime.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/mr.rime.pic", 0, 1 ; sprite dimensions dw MrRimePicFront, MrRimePicBack - db CONFUSION, REFLECT, NO_MOVE, NO_MOVE ; level 1 learnset + db CONFUSION, BARRIER, REFLECT, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm index e0094618..0799d962 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/nidoking.pic", 0, 1 ; sprite dimensions dw NidokingPicFront, NidokingPicBack - db TACKLE, HORN_ATTACK, POISON_STING, THRASH ; level 1 learnset + db TACKLE, HORN_ATTACK, FOCUS_ENERGY, THRASH ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/nidoreign.asm b/data/pokemon/base_stats/nidoreign.asm index a9c89110..c2520653 100644 --- a/data/pokemon/base_stats/nidoreign.asm +++ b/data/pokemon/base_stats/nidoreign.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/nidoreign.pic", 0, 1 ; sprite dimensions dw NidoreignPicFront, NidoreignPicBack - db TACKLE, SPIKE_CANNON, POISON_STING, THRASH ; level 1 learnset + db TACKLE, POISON_STING, DOUBLE_KICK, SPIKE_CANNON ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm index 13118b68..4382f8f7 100644 --- a/data/pokemon/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/omastar.pic", 0, 1 ; sprite dimensions dw OmastarPicFront, OmastarPicBack - db WATER_GUN, WITHDRAW, HORN_ATTACK, NO_MOVE ; level 1 learnset + db WATER_GUN, WITHDRAW, ROCK_THROW, HORN_ATTACK ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/pendraken.asm b/data/pokemon/base_stats/pendraken.asm index 276a275a..7b257222 100644 --- a/data/pokemon/base_stats/pendraken.asm +++ b/data/pokemon/base_stats/pendraken.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/pendraken.pic", 0, 1 ; sprite dimensions dw PendrakenPicFront, PendrakenPicBack - db CONSTRICT, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset + db CONSTRICT, SMOKESCREEN, BUBBLE, WRAP ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/perrserker.asm b/data/pokemon/base_stats/perrserker.asm index 7514c3a9..7efc1bb7 100644 --- a/data/pokemon/base_stats/perrserker.asm +++ b/data/pokemon/base_stats/perrserker.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/perrserker.pic", 0, 1 ; sprite dimensions dw PerrserkerPicFront, PerrserkerPicBack - db GROWL, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm index 58592cbb..45f5d124 100644 --- a/data/pokemon/base_stats/politoed.asm +++ b/data/pokemon/base_stats/politoed.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/politoed.pic", 0, 1 ; sprite dimensions dw PolitoedPicFront, PolitoedPicBack - db HYPNOSIS, WATER_GUN, DOUBLESLAP, NO_MOVE ; level 1 learnset + db HYPNOSIS, WATER_GUN, DOUBLESLAP, BODY_SLAM ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm index a17fc6a3..3f42aae7 100644 --- a/data/pokemon/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/ponyta.pic", 0, 1 ; sprite dimensions dw PonytaPicFront, PonytaPicBack - db EMBER, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/pupal.asm b/data/pokemon/base_stats/pupal.asm index 7393291a..ea88c64a 100644 --- a/data/pokemon/base_stats/pupal.asm +++ b/data/pokemon/base_stats/pupal.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/pupal.pic", 0, 1 ; sprite dimensions dw PupalPicFront, PupalPicBack - db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db LEECH_LIFE, STRING_SHOT, HARDEN, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm index f3c5eb16..5381e056 100644 --- a/data/pokemon/base_stats/scizor.asm +++ b/data/pokemon/base_stats/scizor.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/scizor.pic", 0, 1 ; sprite dimensions dw ScizorPicFront, ScizorPicBack - db QUICK_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db QUICK_ATTACK, IRON_HEAD, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/sharpoon.asm b/data/pokemon/base_stats/sharpoon.asm index b0f71c29..3553f128 100644 --- a/data/pokemon/base_stats/sharpoon.asm +++ b/data/pokemon/base_stats/sharpoon.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/sharpoon.pic", 0, 1 ; sprite dimensions dw SharpoonPicFront, SharpoonPicBack - db BITE, LEER, NO_MOVE, NO_MOVE ; level 1 learnset + db BITE, LEER, WATER_GUN, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/tangrowth.asm b/data/pokemon/base_stats/tangrowth.asm index c23add24..f842fa1b 100644 --- a/data/pokemon/base_stats/tangrowth.asm +++ b/data/pokemon/base_stats/tangrowth.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/tangrowth.pic", 0, 1 ; sprite dimensions dw TangrowthPicFront, TangrowthPicBack - db CONSTRICT, BIND, NO_MOVE, NO_MOVE ; level 1 learnset + db CONSTRICT, BIND, ABSORB, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm index 15f7751e..d3ec7d98 100644 --- a/data/pokemon/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/tauros.pic", 0, 1 ; sprite dimensions dw TaurosPicFront, TaurosPicBack - db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/taurosp.asm b/data/pokemon/base_stats/taurosp.asm index 10627b46..a0fa1279 100644 --- a/data/pokemon/base_stats/taurosp.asm +++ b/data/pokemon/base_stats/taurosp.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/taurospcombat.pic", 0, 1 ; sprite dimensions dw TaurosPPicFront, TaurosPPicBack - db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db DOUBLE_KICK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/taurospa.asm b/data/pokemon/base_stats/taurospa.asm index 52dabb4a..5afddeea 100644 --- a/data/pokemon/base_stats/taurospa.asm +++ b/data/pokemon/base_stats/taurospa.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/taurospaqua.pic", 0, 1 ; sprite dimensions dw TaurosPAPicFront, TaurosPAPicBack - db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db DOUBLE_KICK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/taurospb.asm b/data/pokemon/base_stats/taurospb.asm index 77a60350..14df4bcd 100644 --- a/data/pokemon/base_stats/taurospb.asm +++ b/data/pokemon/base_stats/taurospb.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/taurospblaze.pic", 0, 1 ; sprite dimensions dw TaurosPBPicFront, TaurosPBPicBack - db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db DOUBLE_KICK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/toedscruel.asm b/data/pokemon/base_stats/toedscruel.asm index e0a9395c..210af29d 100644 --- a/data/pokemon/base_stats/toedscruel.asm +++ b/data/pokemon/base_stats/toedscruel.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/toedscruel.pic", 0, 1 ; sprite dimensions dw ToedscruelPicFront, ToedscruelPicBack - db ABSORB, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db ABSORB, SUPERSONIC, WRAP, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/totartle.asm b/data/pokemon/base_stats/totartle.asm index 4da90085..6b88f9f6 100644 --- a/data/pokemon/base_stats/totartle.asm +++ b/data/pokemon/base_stats/totartle.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/totartle.pic", 0, 1 ; sprite dimensions dw TotartlePicFront, TotartlePicBack - db TACKLE, TAIL_WHIP, BUBBLE, NO_MOVE ; level 1 learnset + db TACKLE, TAIL_WHIP, BUBBLE, WATER_GUN ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/trampel.asm b/data/pokemon/base_stats/trampel.asm index 5596476c..9c999c0f 100644 --- a/data/pokemon/base_stats/trampel.asm +++ b/data/pokemon/base_stats/trampel.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/trampel.pic", 0, 1 ; sprite dimensions dw TrampelPicFront, TrampelPicBack - db TACKLE, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db TACKLE, GROWL, HORN_ATTACK, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/wugtrio.asm b/data/pokemon/base_stats/wugtrio.asm index 1b935f81..4a20bd1d 100644 --- a/data/pokemon/base_stats/wugtrio.asm +++ b/data/pokemon/base_stats/wugtrio.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/wugtrio.pic", 0, 1 ; sprite dimensions dw WugtrioPicFront, WugtrioPicBack - db WATER_GUN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db WATER_GUN, SAND_ATTACK, WRAP, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm index cc8fe9a2..79f4117e 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/zubat.pic", 0, 1 ; sprite dimensions dw ZubatPicFront, ZubatPicBack - db LEECH_LIFE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db LEECH_LIFE, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 5629a741..99f6e906 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -272,11 +272,13 @@ RhydonEvosMoves: db EV_ITEM, PROTECTOR, 1, RHYPERIOR db 0 ; Learnset - db 30, STOMP - db 35, TAIL_WHIP - db 40, FURY_ATTACK - db 48, HORN_DRILL - db 55, LEER + db 20, STOMP + db 25, TAIL_WHIP + db 30, FURY_ATTACK + db 35, ROCK_SLIDE + db 40, HORN_DRILL + db 48, LEER + db 55, EARTHQUAKE db 64, TAKE_DOWN db 0 @@ -313,6 +315,7 @@ ClefairyEvosMoves: db 18, DOUBLESLAP db 24, MINIMIZE db 31, METRONOME + db 35, BODY_SLAM db 39, DEFENSE_CURL db 48, LIGHT_SCREEN db 0 @@ -348,6 +351,7 @@ NidokingEvosMoves: db 8, HORN_ATTACK db 14, POISON_STING db 23, THRASH + db 36, EARTHQUAKE db 0 SlowbroEvosMoves: @@ -414,12 +418,14 @@ GrimerEvosMoves: db EV_LEVEL, 38, MUK db 0 ; Learnset - db 30, POISON_GAS - db 33, MINIMIZE - db 37, SLUDGE - db 42, HARDEN - db 48, SCREECH - db 55, ACID_ARMOR + db 11, POISON_GAS + db 15, ACID + db 19, MINIMIZE + db 24, SLUDGE + db 29, HARDEN + db 35, SCREECH + db 41, ACID_ARMOR + db 47, HAZE db 0 GengarEvosMoves: @@ -450,6 +456,7 @@ NidoqueenEvosMoves: db 8, SCRATCH db 14, POISON_STING db 23, BODY_SLAM + db 36, EARTHQUAKE db 0 CuboneEvosMoves: @@ -472,11 +479,13 @@ RhyhornEvosMoves: db EV_LEVEL, 42, RHYDON db 0 ; Learnset - db 30, STOMP - db 35, TAIL_WHIP - db 40, FURY_ATTACK - db 45, HORN_DRILL - db 50, LEER + db 20, STOMP + db 25, TAIL_WHIP + db 30, FURY_ATTACK + db 35, ROCK_SLIDE + db 40, HORN_DRILL + db 45, LEER + db 50, EARTHQUAKE db 55, TAKE_DOWN db 0 @@ -567,9 +576,9 @@ ScytherEvosMoves: db 20, FOCUS_ENERGY db 24, DOUBLE_TEAM db 29, SLASH + db 32, WING_ATTACK db 35, SWORDS_DANCE db 42, AGILITY - db 50, WING_ATTACK db 0 StaryuEvosMoves: @@ -618,14 +627,15 @@ TangelaEvosMoves: db EV_LEVEL, 44, TANGROWTH db 0 ; Learnset - db 24, BIND - db 27, ABSORB - db 29, VINE_WHIP - db 32, POISONPOWDER - db 36, STUN_SPORE - db 39, SLEEP_POWDER - db 45, SLAM - db 48, GROWTH + db 13, BIND + db 19, ABSORB + db 24, VINE_WHIP + db 28, POISONPOWDER + db 31, STUN_SPORE + db 34, SLEEP_POWDER + db 40, SLAM + db 46, GROWTH + db 52, NIGHT_SHADE db 0 GawarhedEvosMoves: @@ -642,6 +652,8 @@ NidoreignEvosMoves: ; Evolutions db 0 ; Learnset + db 36, ROCK_SLIDE + db 43, BODY_SLAM db 50, THRASH db 0 @@ -732,6 +744,7 @@ GravelerEvosMoves: db 29, HARDEN db 36, EARTHQUAKE db 43, EXPLOSION + db 50, ROCK_SLIDE db 0 ChanseyEvosMoves: @@ -808,6 +821,7 @@ ParasectEvosMoves: ; Evolutions db 0 ; Learnset + db 6, ABSORB db 13, STUN_SPORE db 20, LEECH_LIFE db 30, SPORE @@ -820,7 +834,7 @@ PsyduckEvosMoves: db EV_LEVEL, 22, WEIRDUCK db 0 ; Learnset - db 14, TAIL_WHIP + db 12, TAIL_WHIP db 15, AMNESIA db 18, DISABLE db 26, CONFUSION @@ -851,6 +865,7 @@ GolemEvosMoves: db 29, HARDEN db 36, EARTHQUAKE db 43, EXPLOSION + db 50, ROCK_SLIDE db 0 BalumbaEvosMoves: @@ -905,12 +920,12 @@ MagnetonEvosMoves: db EV_ITEM, THUNDER_STONE, 1, MAGNEZONE db 0 ; Learnset - db 21, SONICBOOM - db 25, THUNDERSHOCK - db 29, SUPERSONIC - db 38, THUNDER_WAVE - db 46, SWIFT - db 54, SCREECH + db 6, THUNDERSHOCK + db 11, SONICBOOM + db 16, SUPERSONIC + db 24, THUNDER_WAVE + db 38, SWIFT + db 45, SCREECH db 0 KoffingEvosMoves: @@ -918,11 +933,11 @@ KoffingEvosMoves: db EV_LEVEL, 35, WEEZING db 0 ; Learnset - db 32, SLUDGE - db 37, SMOKESCREEN - db 40, SELFDESTRUCT - db 45, HAZE - db 48, EXPLOSION + db 17, SLUDGE + db 21, SMOKESCREEN + db 25, SELFDESTRUCT + db 33, HAZE + db 41, EXPLOSION db 0 RamooseEvosMoves: @@ -960,11 +975,12 @@ SeelEvosMoves: db EV_LEVEL, 34, DEWGONG db 0 ; Learnset - db 30, GROWL - db 35, AURORA_BEAM - db 40, REST - db 45, TAKE_DOWN - db 50, ICE_BEAM + db 15, POWDER_SNOW + db 20, GROWL + db 25, AURORA_BEAM + db 30, REST + db 35, TAKE_DOWN + db 40, ICE_BEAM db 0 DiglettEvosMoves: @@ -984,8 +1000,8 @@ TaurosEvosMoves: db 0 ; Learnset db 21, STOMP - db 28, TAIL_WHIP - db 35, LEER + db 28, LEER + db 35, BODY_SLAM db 44, RAGE db 51, TAKE_DOWN db 0 @@ -994,12 +1010,13 @@ TrampelEvosMoves: ; Evolutions db 0 ; Learnset - db 10, HORN_ATTACK - db 23, STOMP - db 30, RAGE - db 38, FURY_ATTACK + db 16, STOMP + db 23, RAGE + db 30, FURY_ATTACK + db 38, BODY_SLAM db 44, LEER db 50, ROAR + db 56, EARTHQUAKE db 0 GavillainEvosMoves: @@ -1008,10 +1025,11 @@ GavillainEvosMoves: ; Learnset db 7, SUPERSONIC db 12, BITE - db 20, DRAGON_RAGE - db 24, SLASH - db 30, SCREECH - db 38, GLARE + db 20, THUNDERSHOCK + db 24, DRAGON_RAGE + db 30, SLASH + db 35, SCREECH + db 41, GLARE db 46, CONFUSE_RAY db 0 @@ -1086,11 +1104,11 @@ SharpoonEvosMoves: ; Evolutions db 0 ; Learnset - db 15, WATER_GUN - db 24, SCREECH - db 29, HORN_ATTACK - db 34, FURY_ATTACK - db 38, BRUTAL_SWING + db 15, SCREECH + db 24, HORN_ATTACK + db 29, BRUTAL_SWING + db 34, SMART_STRIKE + db 38, FURY_ATTACK db 42, IRON_HEAD db 49, HYDRO_PUMP db 55, HORN_DRILL @@ -1102,10 +1120,9 @@ BittybatEvosMoves: db 0 ; Learnset db 7, WING_ATTACK - db 14, GUST - db 18, CONFUSE_RAY - db 22, BITE - db 26, TACKLE + db 12, GUST + db 18, BITE + db 22, CONFUSE_RAY db 30, DISABLE db 34, HAZE db 0 @@ -1115,12 +1132,12 @@ DoduoEvosMoves: db EV_LEVEL, 31, DODRIO db 0 ; Learnset - db 20, GROWL - db 24, FURY_ATTACK - db 30, DRILL_PECK - db 36, RAGE - db 40, TRI_ATTACK - db 44, AGILITY + db 11, FURY_ATTACK + db 20, QUICK_ATTACK + db 24, RAGE + db 28, DRILL_PECK + db 33, TRI_ATTACK + db 38, AGILITY db 0 PoliwagEvosMoves: @@ -1140,6 +1157,7 @@ JynxEvosMoves: ; Evolutions db 0 ; Learnset + db 13, POWDER_SNOW db 18, LICK db 23, DOUBLESLAP db 31, ICE_PUNCH @@ -1187,11 +1205,13 @@ MeowthEvosMoves: db EV_LEVEL, 28, PERSIAN db 0 ; Learnset - db 12, BITE - db 17, PAY_DAY - db 24, SCREECH - db 33, FURY_SWIPES - db 44, SLASH + db 5, PAY_DAY + db 8, TAIL_WHIP + db 12, SAND_ATTACK + db 21, BITE + db 26, FURY_SWIPES + db 33, SCREECH + db 38, SLASH db 0 KrabbyEvosMoves: @@ -1244,10 +1264,10 @@ VulpiiiEvosMoves: ; Learnset db 7, QUICK_ATTACK db 14, ROAR - db 21, DOUBLE_TEAM - db 28, CONFUSE_RAY - db 35, FLAMETHROWER - db 42, FIRE_SPIN + db 19, DOUBLE_TEAM + db 25, CONFUSE_RAY + db 31, FLAMETHROWER + db 38, FIRE_SPIN db 0 VulpixEvosMoves: @@ -1255,8 +1275,9 @@ VulpixEvosMoves: db EV_ITEM, FIRE_STONE, 1, NINETALES db 0 ; Learnset - db 16, QUICK_ATTACK - db 21, ROAR + db 7, QUICK_ATTACK + db 14, ROAR + db 21, DOUBLE_TEAM db 28, CONFUSE_RAY db 35, FLAMETHROWER db 42, FIRE_SPIN @@ -1301,22 +1322,23 @@ RibbitoEvosMoves: db 19, WATER_GUN db 24, FEINT_ATTACK db 31, SUBSTITUTE - db 41, KOWTOW_CLEAVE - db 49, HYDRO_PUMP - db 53, NIGHT_SLASH + db 37, KOWTOW_CLEAVE + db 44, HYDRO_PUMP + db 50, NIGHT_SLASH db 0 CroakozunaEvosMoves: ; Evolutions db 0 ; Learnset + db 7, BUBBLE db 13, MEDITATE db 19, WATER_GUN - db 26, FEINT_ATTACK - db 31, SUBSTITUTE - db 45, KOWTOW_CLEAVE - db 53, HYDRO_PUMP - db 58, NIGHT_SLASH + db 24, FEINT_ATTACK + db 35, SUBSTITUTE + db 41, KOWTOW_CLEAVE + db 49, HYDRO_PUMP + db 53, NIGHT_SLASH db 0 DratiniEvosMoves: @@ -1348,6 +1370,7 @@ KabutoEvosMoves: db EV_LEVEL, 40, KABUTOPS db 0 ; Learnset + db 21, ROCK_THROW db 34, ABSORB db 39, SLASH db 44, LEER @@ -1358,6 +1381,7 @@ KabutopsEvosMoves: ; Evolutions db 0 ; Learnset + db 21, ROCK_THROW db 34, ABSORB db 39, SLASH db 46, LEER @@ -1384,20 +1408,21 @@ SeadraEvosMoves: db 19, SMOKESCREEN db 24, LEER db 30, WATER_GUN + db 32, PIN_MISSILE db 41, AGILITY db 52, HYDRO_PUMP db 0 MinistareEvosMoves: ; Evolutions - db EV_LEVEL, 50, IGUANARCH + db EV_LEVEL, 55, IGUANARCH db 0 ; Learnset db 10, LEER db 20, BITE - db 30, GLARE - db 40, DRAGON_RAGE - db 50, SLASH + db 35, GLARE + db 45, DRAGON_RAGE + db 55, SLASH db 0 IguanarchEvosMoves: @@ -1406,9 +1431,9 @@ IguanarchEvosMoves: ; Learnset db 10, LEER db 20, BITE - db 30, GLARE - db 40, DRAGON_RAGE - db 50, SLASH + db 35, GLARE + db 45, DRAGON_RAGE + db 60, SLASH db 0 SandshrewEvosMoves: @@ -1420,6 +1445,7 @@ SandshrewEvosMoves: db 17, SLASH db 24, POISON_STING db 31, SWIFT + db 35, EARTHQUAKE db 38, FURY_SWIPES db 0 @@ -1431,6 +1457,7 @@ SandslashEvosMoves: db 17, SLASH db 27, POISON_STING db 36, SWIFT + db 42, EARTHQUAKE db 47, FURY_SWIPES db 0 @@ -1439,6 +1466,7 @@ OmanyteEvosMoves: db EV_LEVEL, 40, OMASTAR db 0 ; Learnset + db 21, ROCK_THROW db 34, HORN_ATTACK db 39, LEER db 46, SPIKE_CANNON @@ -1449,6 +1477,7 @@ OmastarEvosMoves: ; Evolutions db 0 ; Learnset + db 21, ROCK_THROW db 34, HORN_ATTACK db 39, LEER db 44, SPIKE_CANNON @@ -1555,11 +1584,13 @@ ZubatEvosMoves: db EV_LEVEL, 23, GOLBAT db 0 ; Learnset - db 10, SUPERSONIC - db 15, BITE - db 21, CONFUSE_RAY - db 28, WING_ATTACK - db 36, HAZE + db 7, WING_ATTACK + db 12, GUST + db 14, SUPERSONIC + db 20, BITE + db 24, CONFUSE_RAY + db 29, DISABLE + db 34, HAZE db 0 EkansEvosMoves: @@ -1579,6 +1610,7 @@ ParasEvosMoves: db EV_LEVEL, 24, PARASECT db 0 ; Learnset + db 6, ABSORB db 13, STUN_SPORE db 20, LEECH_LIFE db 27, SPORE @@ -1620,13 +1652,16 @@ KakunaEvosMoves: db EV_LEVEL, 10, BEEDRILL db 0 ; Learnset + db 7, HARDEN + db 8, HARDEN + db 9, HARDEN db 0 BeedrillEvosMoves: ; Evolutions db 0 ; Learnset - db 12, FURY_ATTACK + db 10, FURY_ATTACK db 16, FOCUS_ENERGY db 20, TWINEEDLE db 25, RAGE @@ -1650,12 +1685,12 @@ DodrioEvosMoves: ; Evolutions db 0 ; Learnset - db 20, GROWL - db 24, FURY_ATTACK - db 30, DRILL_PECK - db 39, RAGE - db 45, TRI_ATTACK - db 51, AGILITY + db 11, FURY_ATTACK + db 20, QUICK_ATTACK + db 24, RAGE + db 28, DRILL_PECK + db 36, TRI_ATTACK + db 42, AGILITY db 0 PrimeapeEvosMoves: @@ -1700,11 +1735,12 @@ DewgongEvosMoves: ; Evolutions db 0 ; Learnset - db 30, GROWL - db 35, AURORA_BEAM - db 44, REST - db 50, TAKE_DOWN - db 56, ICE_BEAM + db 15, POWDER_SNOW + db 20, GROWL + db 25, AURORA_BEAM + db 30, REST + db 39, TAKE_DOWN + db 45, ICE_BEAM db 0 TriculesEvosMoves: @@ -1724,14 +1760,14 @@ PendrakenEvosMoves: ; Evolutions db 0 ; Learnset - db 10, BUBBLE - db 14, WRAP - db 24, FAIRY_WIND - db 29, HYPNOSIS - db 32, SUPERSONIC - db 44, DAZZLE_GLEAM - db 50, HAZE - db 54, HYDRO_PUMP + db 8, BUBBLE + db 13, WRAP + db 19, FAIRY_WIND + db 23, HYPNOSIS + db 27, SUPERSONIC + db 35, DAZZLE_GLEAM + db 42, HAZE + db 47, HYDRO_PUMP db 0 CaterpieEvosMoves: @@ -1747,6 +1783,8 @@ MetapodEvosMoves: db 0 ; Learnset db 7, HARDEN + db 8, HARDEN + db 9, HARDEN db 0 ButterfreeEvosMoves: @@ -1776,27 +1814,33 @@ MachampEvosMoves: WeirduckEvosMoves: ; Evolutions - db EV_LEVEL, 35, GOLDUCK + db EV_LEVEL, 33, GOLDUCK db 0 ; Learnset + db 12, TAIL_WHIP + db 15, AMNESIA db 22, SUPERSONIC db 25, DISABLE - db 29, CONFUSION - db 34, GLARE + db 28, CONFUSION + db 32, GLARE db 39, FURY_SWIPES db 41, PSYBEAM - db 55, HYDRO_PUMP + db 46, HYDRO_PUMP db 0 GolduckEvosMoves: ; Evolutions db 0 ; Learnset - db 28, TAIL_WHIP - db 31, DISABLE - db 39, CONFUSION - db 48, FURY_SWIPES - db 59, HYDRO_PUMP + db 12, TAIL_WHIP + db 15, AMNESIA + db 22, SUPERSONIC + db 25, DISABLE + db 28, CONFUSION + db 32, GLARE + db 42, FURY_SWIPES + db 47, PSYBEAM + db 52, HYDRO_PUMP db 0 HypnoEvosMoves: @@ -1813,14 +1857,17 @@ HypnoEvosMoves: GolbatEvosMoves: ; Evolutions - db EV_LEVEL, 44, CROBAT + db EV_LEVEL, 40, CROBAT db 0 ; Learnset - db 10, SUPERSONIC - db 15, BITE - db 21, CONFUSE_RAY - db 32, WING_ATTACK - db 43, HAZE + db 7, WING_ATTACK + db 12, GUST + db 14, SUPERSONIC + db 20, BITE + db 26, CONFUSE_RAY + db 32, DISABLE + db 38, SCREECH + db 42, HAZE db 0 MewtwoEvosMoves: @@ -1879,12 +1926,14 @@ MukEvosMoves: ; Evolutions db 0 ; Learnset - db 30, POISON_GAS - db 33, MINIMIZE - db 37, SLUDGE - db 45, HARDEN - db 53, SCREECH - db 60, ACID_ARMOR + db 11, POISON_GAS + db 15, ACID + db 19, MINIMIZE + db 24, SLUDGE + db 29, HARDEN + db 35, SCREECH + db 46, ACID_ARMOR + db 53, HAZE db 0 DecillaEvosMoves: @@ -1921,12 +1970,12 @@ MagnetiteEvosMoves: db EV_LEVEL, 30, MAGNETON db 0 ; Learnset - db 21, SONICBOOM - db 25, THUNDERSHOCK - db 29, SUPERSONIC - db 35, THUNDER_WAVE - db 41, SWIFT - db 47, SCREECH + db 6, THUNDERSHOCK + db 11, SONICBOOM + db 16, SUPERSONIC + db 24, THUNDER_WAVE + db 36, SWIFT + db 42, SCREECH db 0 ElectrodeEvosMoves: @@ -1950,22 +1999,24 @@ WeezingEvosMoves: ; Evolutions db 0 ; Learnset - db 32, SLUDGE - db 39, SMOKESCREEN - db 43, SELFDESTRUCT - db 49, HAZE - db 53, EXPLOSION + db 17, SLUDGE + db 21, SMOKESCREEN + db 25, SELFDESTRUCT + db 33, HAZE + db 46, EXPLOSION db 0 PersianEvosMoves: ; Evolutions db 0 ; Learnset - db 12, BITE - db 17, PAY_DAY - db 24, SCREECH - db 37, FURY_SWIPES - db 51, SLASH + db 5, PAY_DAY + db 8, TAIL_WHIP + db 12, SAND_ATTACK + db 21, BITE + db 26, FURY_SWIPES + db 35, SCREECH + db 40, SLASH db 0 MarowakEvosMoves: @@ -1987,6 +2038,9 @@ GuardiaEvosMoves: ; Evolutions db 0 ; Learnset + db 10, BONE_CLUB + db 13, TAIL_WHIP + db 18, HEADBUTT db 25, LEER db 33, FOCUS_ENERGY db 41, THRASH @@ -2101,7 +2155,7 @@ OrfryEvosMoves: ; Learnset db 7, SUPERSONIC db 12, HORN_ATTACK - db 16, FURY_ATTACK + db 18, FURY_ATTACK db 26, WATERFALL db 30, HORN_DRILL db 34, AGILITY @@ -2112,24 +2166,25 @@ GoldeenEvosMoves: db EV_LEVEL, 33, SEAKING db 0 ; Learnset - db 19, SUPERSONIC - db 24, HORN_ATTACK - db 30, FURY_ATTACK - db 37, WATERFALL - db 45, HORN_DRILL - db 54, AGILITY + db 7, SUPERSONIC + db 12, HORN_ATTACK + db 20, FURY_ATTACK + db 29, WATERFALL + db 34, HORN_DRILL + db 39, AGILITY db 0 SeakingEvosMoves: ; Evolutions db 0 ; Learnset - db 19, SUPERSONIC - db 24, HORN_ATTACK - db 30, FURY_ATTACK - db 39, WATERFALL - db 48, HORN_DRILL - db 54, AGILITY + db 7, SUPERSONIC + db 12, HORN_ATTACK + db 20, FURY_ATTACK + db 29, WATERFALL + db 37, HORN_DRILL + db 41, AGILITY + db 46, SWORDS_DANCE db 0 KotoraEvosMoves: @@ -2188,24 +2243,26 @@ PonytaEvosMoves: db EV_LEVEL, 40, RAPIDASH db 0 ; Learnset - db 30, TAIL_WHIP - db 32, STOMP - db 35, GROWL - db 39, FIRE_SPIN - db 43, TAKE_DOWN - db 48, AGILITY + db 7, QUICK_ATTACK + db 14, GROWL + db 24, STOMP + db 31, FLAMETHROWER + db 37, AGILITY + db 43, FIRE_SPIN + db 47, TAKE_DOWN db 0 RapidashEvosMoves: ; Evolutions db 0 ; Learnset - db 30, TAIL_WHIP - db 32, STOMP - db 35, GROWL - db 39, FIRE_SPIN - db 47, TAKE_DOWN - db 55, AGILITY + db 7, QUICK_ATTACK + db 14, GROWL + db 24, STOMP + db 31, FLAMETHROWER + db 37, AGILITY + db 46, FIRE_SPIN + db 52, TAKE_DOWN db 0 RattataEvosMoves: @@ -2270,6 +2327,7 @@ GeodudeEvosMoves: db 26, HARDEN db 31, EARTHQUAKE db 36, EXPLOSION + db 41, ROCK_SLIDE db 0 PorygonEvosMoves: @@ -2287,6 +2345,7 @@ AerodactylEvosMoves: ; Evolutions db 0 ; Learnset + db 21, ROCK_THROW db 33, SUPERSONIC db 38, BITE db 45, TAKE_DOWN @@ -2311,12 +2370,12 @@ MagnemiteEvosMoves: db EV_LEVEL, 20, MAGNETITE db 0 ; Learnset - db 21, SONICBOOM - db 25, THUNDERSHOCK - db 29, SUPERSONIC - db 35, THUNDER_WAVE - db 41, SWIFT - db 47, SCREECH + db 6, THUNDERSHOCK + db 11, SONICBOOM + db 16, SUPERSONIC + db 21, THUNDER_WAVE + db 33, SWIFT + db 39, SCREECH db 0 SqueamataEvosMoves: @@ -2409,7 +2468,8 @@ TotartleEvosMoves: ; Evolutions db 0 ; Learnset - db 18, WATER_GUN + db 8, BUBBLE + db 15, WATER_GUN db 24, BITE db 31, WITHDRAW db 42, SKULL_BASH @@ -2540,7 +2600,7 @@ ScizorEvosMoves: ; Learnset db 17, LEER db 20, FOCUS_ENERGY - db 24, IRON_HEAD + db 24, DOUBLE_TEAM db 29, SLASH db 35, SWORDS_DANCE db 42, AGILITY @@ -2551,11 +2611,13 @@ RhyperiorEvosMoves: ; Evolutions db 0 ; Learnset - db 30, STOMP - db 35, TAIL_WHIP - db 40, FURY_ATTACK - db 48, HORN_DRILL - db 55, LEER + db 20, STOMP + db 25, TAIL_WHIP + db 30, FURY_ATTACK + db 35, ROCK_SLIDE + db 40, HORN_DRILL + db 48, LEER + db 55, EARTHQUAKE db 64, TAKE_DOWN db 0 @@ -2640,14 +2702,15 @@ TangrowthEvosMoves: ; Evolutions db 0 ; Learnset - db 24, BIND - db 27, ABSORB - db 29, VINE_WHIP - db 32, POISONPOWDER - db 36, STUN_SPORE - db 39, SLEEP_POWDER - db 45, SLAM - db 48, GROWTH + db 13, BIND + db 19, ABSORB + db 24, VINE_WHIP + db 28, POISONPOWDER + db 31, STUN_SPORE + db 34, SLEEP_POWDER + db 40, SLAM + db 50, GROWTH + db 56, NIGHT_SHADE db 0 KleavorEvosMoves: @@ -2666,7 +2729,10 @@ KleavorEvosMoves: BellignanEvosMoves: ; Evolutions db 0 -; Learnset +; Learnset + db 13, WRAP + db 15, POISONPOWDER + db 18, SLEEP_POWDER db 40, LOVELY_KISS db 48, SOLARBEAM db 0 @@ -2701,7 +2767,6 @@ HitmontopEvosMoves: ; Evolutions db 0 ; Learnset - db 7, FOCUS_ENERGY db 33, QUICK_ATTACK db 38, COUNTER db 43, AGILITY @@ -2713,14 +2778,15 @@ CrobatEvosMoves: ; Evolutions db 0 ; Learnset - db 7, GUST - db 10, SUPERSONIC - db 15, BITE - db 17, QUICK_ATTACK - db 21, CONFUSE_RAY - db 26, SLUDGE - db 32, WING_ATTACK - db 43, HAZE + db 7, WING_ATTACK + db 12, GUST + db 14, SUPERSONIC + db 20, BITE + db 26, CONFUSE_RAY + db 32, DISABLE + db 38, SCREECH + db 42, SLUDGE + db 46, HAZE db 50, AGILITY db 0 @@ -2828,6 +2894,9 @@ PupalEvosMoves: db EV_LEVEL, 10, CARAPTHOR db 0 ; Learnset + db 7, HARDEN + db 8, HARDEN + db 9, HARDEN db 0 CarapthorEvosMoves: @@ -2911,8 +2980,8 @@ WugtrioEvosMoves: db 15, SAND_ATTACK db 19, WRAP db 24, HEADBUTT - db 31, DIG - db 40, HYDRO_PUMP + db 35, DIG + db 47, HYDRO_PUMP db 0 ToedscoolEvosMoves: @@ -2948,29 +3017,28 @@ PerrserkerEvosMoves: ; Evolutions db 0 ; Learnset - db 8, SCRATCH - db 12, PAY_DAY - db 17, BITE - db 25, SMART_STRIKE - db 29, FURY_SWIPES - db 32, SCREECH - db 36, SLASH - db 40, METAL_SOUND - db 45, IRON_HEAD + db 5, PAY_DAY + db 8, BITE + db 12, FURY_SWIPES + db 21, SMART_STRIKE + db 26, SCREECH + db 35, METAL_SOUND + db 40, SLASH + db 46, IRON_HEAD db 0 SirfetchdEvosMoves: ; Evolutions db 0 ; Learnset - db 7, LEER - db 15, DOUBLE_KICK - db 23, BRUTAL_SWING - db 31, LOW_KICK - db 39, SWORDS_DANCE - db 44, JUMP_KICK - db 49, ROLLING_KICK - db 55, HI_JUMP_KICK + db 13, LEER + db 17, DOUBLE_KICK + db 21, BRUTAL_SWING + db 25, SWORDS_DANCE + db 29, LOW_KICK + db 33, JUMP_KICK + db 41, ROLLING_KICK + db 45, HI_JUMP_KICK db 0 MrRimeEvosMoves: @@ -3002,14 +3070,12 @@ MelmetalEvosMoves: db 0 ; Learnset db 9, TAIL_WHIP - db 16, HEADBUTT - db 18, THUNDER_WAVE - db 20, THUNDERSHOCK - db 27, THUNDERPUNCH - db 36, ACID_ARMOR - db 45, MAGNET_BOMB - db 51, MEGA_PUNCH - db 63, SMART_STRIKE + db 18, HEADBUTT + db 27, THUNDER_WAVE + db 36, THUNDERPUNCH + db 45, ACID_ARMOR + db 54, MAGNET_BOMB + db 63, MEGA_PUNCH db 72, IRON_HEAD db 81, SUBMISSION db 90, HYPER_BEAM @@ -3098,90 +3164,94 @@ DugtrioAEvosMoves: ; Evolutions db 0 ; Learnset - db 6, GROWL - db 20, SLASH - db 31, DIG - db 35, IRON_HEAD - db 39, EARTHQUAKE - db 43, FISSURE + db 15, GROWL + db 19, DIG + db 24, SAND_ATTACK + db 30, IRON_HEAD + db 35, SLASH + db 43, EARTHQUAKE + db 47, FISSURE db 0 PersianAEvosMoves: ; Evolutions db 0 ; Learnset - db 6, BITE - db 14, FURY_SWIPES - db 17, SCREECH - db 22, FEINT_ATTACK - db 30, PAY_DAY - db 33, SLASH - db 38, NASTY_PLOT - db 49, NIGHT_SLASH + db 5, PAY_DAY + db 8, BITE + db 12, FURY_SWIPES + db 21, FEINT_ATTACK + db 26, SCREECH + db 35, NASTY_PLOT + db 40, SLASH + db 46, NIGHT_SLASH db 0 GolemAEvosMoves: ; Evolutions db 0 ; Learnset + db 11, DEFENSE_CURL db 16, ROCK_THROW - db 22, THUNDERPUNCH - db 24, SELFDESTRUCT - db 36, EXPLOSION - db 40, DOUBLE_EDGE + db 21, SELFDESTRUCT + db 29, THUNDERPUNCH + db 36, DOUBLE_EDGE + db 43, EXPLOSION + db 50, ROCK_SLIDE db 0 RapidashGEvosMoves: ; Evolutions db 0 ; Learnset - db 30, TAIL_WHIP - db 32, CONFUSION - db 35, FAIRY_WIND - db 39, AGILITY - db 42, PSYBEAM - db 46, STOMP - db 47, TAKE_DOWN - db 52, DAZZLE_GLEAM - db 55, PSYCHIC_M + db 7, QUICK_ATTACK + db 14, FAIRY_WIND + db 24, STOMP + db 31, PSYBEAM + db 37, AGILITY + db 46, DAZZLE_GLEAM + db 52, TAKE_DOWN + db 56, PSYCHIC_M db 0 SlowbroGEvosMoves: ; Evolutions db 0 ; Learnset - db 8, ACID - db 14, CONFUSION - db 22, DISABLE - db 30, HEADBUTT - db 38, AMNESIA - db 42, PSYCHIC_M + db 18, DISABLE + db 22, HEADBUTT + db 27, GROWL + db 33, ACID + db 37, WITHDRAW + db 44, AMNESIA + db 49, SLUDGE + db 55, PSYCHIC_M db 0 SlowkingGEvosMoves: ; Evolutions db 0 ; Learnset - db 8, ACID - db 14, CONFUSION - db 22, DISABLE - db 30, HEADBUTT - db 38, AMNESIA - db 42, PSYCHIC_M + db 18, DISABLE + db 22, HEADBUTT + db 27, GROWL + db 33, ACID + db 44, AMNESIA + db 55, PSYCHIC_M db 0 MukAEvosMoves: ; Evolutions db 0 ; Learnset - db 6, HARDEN - db 12, MINIMIZE - db 18, DISABLE + db 11, POISON_GAS + db 15, MINIMIZE + db 19, SLUDGE db 24, BRUTAL_SWING - db 30, SCREECH - db 36, NIGHT_SLASH - db 42, ACID_ARMOR - db 48, SLUDGE + db 29, HARDEN + db 35, SCREECH + db 46, NIGHT_SLASH + db 53, ACID_ARMOR db 0 ExeggutorAEvosMoves: @@ -3204,7 +3274,7 @@ MarowakAEvosMoves: db 25, LEER db 33, EMBER db 41, THRASH - db 46, BONEMERANG + db 48, BONEMERANG db 55, FLAMETHROWER db 0 @@ -3212,21 +3282,22 @@ WeezingGEvosMoves: ; Evolutions db 0 ; Learnset - db 32, SLUDGE - db 37, SMOKESCREEN - db 40, SELFDESTRUCT - db 43, DAZZLE_GLEAM - db 49, HAZE - db 53, EXPLOSION + db 9, FAIRY_WIND + db 17, SLUDGE + db 21, SMOKESCREEN + db 25, SELFDESTRUCT + db 33, HAZE + db 39, DAZZLE_GLEAM + db 46, EXPLOSION db 0 TaurosPEvosMoves: ; Evolutions db 0 ; Learnset - db 21, ROLLING_KICK - db 28, TAIL_WHIP - db 35, LEER + db 21, LOW_KICK + db 28, LEER + db 35, ROLLING_KICK db 44, RAGE db 51, JUMP_KICK db 0 @@ -3236,8 +3307,8 @@ TaurosPAEvosMoves: db 0 ; Learnset db 21, LOW_KICK - db 28, TAIL_WHIP - db 35, LEER + db 28, LEER + db 35, WATER_GUN db 44, RAGE db 51, HYDRO_PUMP db 0 @@ -3247,8 +3318,8 @@ TaurosPBEvosMoves: db 0 ; Learnset db 21, LOW_KICK - db 28, TAIL_WHIP - db 35, LEER + db 28, LEER + db 35, FLAMETHROWER db 44, RAGE db 51, FIRE_SPIN db 0 diff --git a/data/wild/maps/DiglettsCave.asm b/data/wild/maps/DiglettsCave.asm index 16d3dbe8..7aa6600a 100644 --- a/data/wild/maps/DiglettsCave.asm +++ b/data/wild/maps/DiglettsCave.asm @@ -8,8 +8,8 @@ DiglettsCaveWildMons: db 16, DIGLETT db 21, DIGLETT db 22, DIGLETT - db 29, DUGTRIO - db 31, DUGTRIO + db 28, DUGTRIO + db 30, DUGTRIO end_grass_wildmons def_water_wildmons 5 ; encounter rate @@ -21,6 +21,6 @@ DiglettsCaveWildMons: db 15, WIGLETT db 21, WIGLETT db 22, WIGLETT - db 29, WUGTRIO - db 31, WUGTRIO + db 28, WUGTRIO + db 30, WUGTRIO end_water_wildmons From bed705ac0dadf611e98fb888bcaf4e88208d14ab Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 8 Dec 2023 14:11:16 +0000 Subject: [PATCH 5/6] More precise Helix Chamber credits In actuality, only RacieBeep and Orchid ever had sprites used. This fixes everything and makes them more precise. --- README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 187d61cb..1c3feb47 100644 --- a/README.md +++ b/README.md @@ -384,7 +384,7 @@ If you use our implementations of anything at all, it is encouraged to submit Pu * HeadBoiSkye - Helped with writing NPC dialogue and Pokédex entries for new Pokémon such as Gyopin. * ZumiIsawhat? - Restorations of prototype OST. * FrenchOrange - Reconstructions of various overworld prototype sprites. -* Helix Chamber, RacieBeep, loumilouminosus, Orchid, GBCRetro, & catstorm26 - Prototype Pokémon sprites. Precise credits are available [here](https://cdn.discordapp.com/attachments/1014321591657709569/1015347305483878521/unknown.png). +* Helix Chamber (RacieBeep & Orchid) - Prototype Pokémon sprites. Precise credits are available [here](https://cdn.discordapp.com/attachments/1014321591657709569/1015347305483878521/unknown.png) and below. * Vortiene/Vortyne - Reused a bit of code from their pureRGB hack, including their Trainer AI and Pokedex stats page. Assisted in bug fixes. Used their sprite sheet generator. * Pigu-A, RevoSucks, walle303 - Contributors to Pokemon Anniversary Red's repository, where we reused the Green/FemC sprites and the Battle Tent. * Rangi - Reused a bit of code from their Red* / Blue* hack to make HMs usable in the overworld, and generally being an amazing individual. @@ -400,13 +400,17 @@ If you use our implementations of anything at all, it is encouraged to submit Pu * Dr. Lava - Translations of some content used in this hack, particularly the 1996 Pokedex book's entries for DYKG. * Nob Ogasawara - Prototype Pokemon names, produced for DYKG. -Helix Chamber sprites: Balumba, Blastyke, Blottle, Buu, Cactormus, Cheep, Coinpur, Croakozuna, Decilla, Fossils, Gaotora, Gavillain (edited by Albatross), Gawarhed, Gorochu (edited by Martha’s Against Humanity), Gorotora, Guardia, Jabetta (edited by Martha’s Against Humanity), Kolta, Kotora, Luxwan, Nidoreign, Omegadge, Orfry, Pendraken, Ramoose, Ribbito, Sharpoon, Totartle, Trampel, Vulpiii, Weirduck - Albatross sprites: Articuno-G, Blissey, Dugtrio-A, Electivire, Electrode-H, Exeggutor-A, Gentlarva, Glaceon, Golem-A, Hitmontop, Iguanarch, Kleavor, Leafeon, Lickilicky, Marowak-A, Melmetal, Meltan, Moltres-G, Mr. Rime, Muk-A, Ninetales-A, Perrserker, Persian-A, Politoed, Porygon-Z, Pupal, Raichu-A, Rapidash-G, Raticate-A, Rhyperior, Sandslash-A, Sandy Shocks, Scizor, Sirfetch’d, Slowbro-G, Slowking-G, Tangrowth, Toedscool, Toedscruel, Weezing-G, Wiglett, Zapdos-G Martha’s Against Humanity sprites: Bellignan (with help from PvK), Mimmeo, Sylveon (with help from Albatross) -Albatross’ sprites refined by either Martha’s Against Humanity or PvK: Annihilape, Arcanine-H, Bellossom, Carapthor, Kingdra, Magmortar, Magnezone, Ministare, Porygon2, Scream Tail, Squeamata, Tauros-P, Wugtrio +Albatross sprites refined by either Martha’s Against Humanity or PvK: Annihilape, Arcanine-H, Bellossom, Carapthor, Kingdra, Magmortar, Magnezone, Ministare, Porygon2, Scream Tail, Squeamata, Tauros-P, Wugtrio + +RacieBeep sprites: Balumba, Blastyke, Blottle, Buu, Cactormus, Cheep, Coinpur, Croakozuna, Decilla, Fossils, Gaotora, Gavillain (edited by Albatross), Gawarhed, Gorochu (edited by Martha’s Against Humanity), Gorotora, Guardia, Jabetta (edited by Martha’s Against Humanity), Kolta, Kotora, Luxwan, Nidoreign, Omegadge (front/back), Orfry, Pendraken, Ramoose, Ribbito, Sharpoon, Totartle, Trampel, Vulpiii, Weirduck, Fossil Aerodactyl, Fossil Kabutops, Ghost, Articuno (back), Meowth (back) + +Orchid: Ghost (back), Luxwan (back), Buu (back) + +Zeta_Null: Porygon (front) Official sprites: Crobat, Disturban, Espeon (edited by Martha’s Against Humanity), Slowking, Steelix, Tricules (edited by Martha’s Against Humanity), Umbreon (edited by Martha’s Against Humanity) From 2b2c95e52b247d99a19aa48d89a1ca4e65c17171 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 8 Dec 2023 17:37:41 +0000 Subject: [PATCH 6/6] Actually working postgame warps! FINALLY managed to get this working. The bugged warps are now working and the jank ones are less jank. Also removed the cocoon's pre-evolved moves again. --- README.md | 16 +++++++--------- constants/map_constants.asm | 2 +- data/pokemon/base_stats/kakuna.asm | 2 +- data/pokemon/base_stats/metapod.asm | 2 +- data/pokemon/base_stats/perrserker.asm | 2 +- data/pokemon/base_stats/pupal.asm | 2 +- data/tilesets/collision_tile_ids.asm | 2 +- data/tilesets/door_tile_ids.asm | 4 ---- data/tilesets/pair_collision_tile_ids.asm | 3 +++ data/tilesets/warp_carpet_tile_ids.asm | 4 ++-- data/tilesets/warp_tile_ids.asm | 2 +- gfx/blocksets/celeste.bst | Bin 2272 -> 2304 bytes gfx/tilesets/celeste.png | Bin 3104 -> 2325 bytes gfx/tilesets/ship_port.png | Bin 1125 -> 1347 bytes home/overworld.asm | 6 ++++++ maps/BrunswickGlade.blk | 2 +- maps/CelesteHill.blk | 2 +- maps/CelesteHillOutside.blk | 2 +- maps/FarawayIslandInside.blk | 4 +++- maps/FarawayIslandOutside.blk | 2 +- 20 files changed, 32 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 1c3feb47..01604e04 100644 --- a/README.md +++ b/README.md @@ -261,8 +261,6 @@ Comprehensive list can be found on Discord. - Occasionally, menu text sets itself to scroll. - The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1. - Fake Tears and Nasty Plot don't quite look right when done from the opponent's side. -- Citrine Dock's warp doesn't work, meaning you have to leave Citrine using Fly -- LAST_MAP isn't updated properly when sailing from Vermilion to Citrine - After reloading the game after beating the Elite Four, Pallet Town's correct palette isn't loaded in until after leaving the house. - The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle @@ -285,7 +283,7 @@ New Pokemon: - Electabuzz -> Electivire | Use Thunder Stone - Farfetch'd -> Luxwan | L24 - Gloom -> Bellossom | Use Leaf Stone -- Golbat -> Crobat | L44 +- Golbat -> Crobat | L40 - Lickitung -> Lickilicky | L32 - Magmar -> Magmortar | Use Fire Stone - Magneton -> Magnezone | Use Thunder Stone @@ -322,7 +320,7 @@ Kanto Prototype Pokemon: - Psyduck -> Weirduck -> Golduck | L22, L33 - Raichu -> Gorochu | Trade - Ribbito -> Croakozuna | L30 -- Squeamata -> Ministare -> Iguanarch | L30, L50 +- Squeamata -> Ministare -> Iguanarch | L30, L55 - Vulpiii -> Vulpix | L15 - Wartortle -> Totartle | L36, replaces Blastoise @@ -400,19 +398,19 @@ If you use our implementations of anything at all, it is encouraged to submit Pu * Dr. Lava - Translations of some content used in this hack, particularly the 1996 Pokedex book's entries for DYKG. * Nob Ogasawara - Prototype Pokemon names, produced for DYKG. -Albatross sprites: Articuno-G, Blissey, Dugtrio-A, Electivire, Electrode-H, Exeggutor-A, Gentlarva, Glaceon, Golem-A, Hitmontop, Iguanarch, Kleavor, Leafeon, Lickilicky, Marowak-A, Melmetal, Meltan, Moltres-G, Mr. Rime, Muk-A, Ninetales-A, Perrserker, Persian-A, Politoed, Porygon-Z, Pupal, Raichu-A, Rapidash-G, Raticate-A, Rhyperior, Sandslash-A, Sandy Shocks, Scizor, Sirfetch’d, Slowbro-G, Slowking-G, Tangrowth, Toedscool, Toedscruel, Weezing-G, Wiglett, Zapdos-G +Albatross sprites: Articuno-G, Blissey, Dugtrio-A, Electivire, Electrode-H, Espeon (back), Exeggutor-A, Gentlarva, Glaceon, Golem-A, Hitmontop, Iguanarch, Kleavor, Leafeon, Lickilicky, Marowak-A, Melmetal, Meltan, Moltres-G, Mr. Rime, Muk-A, Ninetales-A, Perrserker, Persian-A, Politoed, Porygon-Z, Pupal, Raichu-A, Rapidash-G, Raticate-A, Rhyperior, Sandslash-A, Sandy Shocks, Scizor, Sirfetch’d, Slowbro-G, Slowking (back), Slowking-G, Sylveon (back), Tangrowth, Tauros-P (all forms), Toedscool, Toedscruel, Umbreon (back), Weezing-G, Wiglett, Zapdos-G -Martha’s Against Humanity sprites: Bellignan (with help from PvK), Mimmeo, Sylveon (with help from Albatross) +Martha’s Against Humanity sprites: Bellignan (front, with help from PvK), Mimmeo (front), Sylveon (front, with help from Albatross) -Albatross sprites refined by either Martha’s Against Humanity or PvK: Annihilape, Arcanine-H, Bellossom, Carapthor, Kingdra, Magmortar, Magnezone, Ministare, Porygon2, Scream Tail, Squeamata, Tauros-P, Wugtrio +Albatross sprites refined by either Martha’s Against Humanity or PvK: Annihilape, Arcanine-H, Bellossom, Carapthor, Kingdra, Magmortar, Magnezone, Ministare, Porygon2, Scream Tail, Squeamata, Tauros-P (all forms), Wugtrio RacieBeep sprites: Balumba, Blastyke, Blottle, Buu, Cactormus, Cheep, Coinpur, Croakozuna, Decilla, Fossils, Gaotora, Gavillain (edited by Albatross), Gawarhed, Gorochu (edited by Martha’s Against Humanity), Gorotora, Guardia, Jabetta (edited by Martha’s Against Humanity), Kolta, Kotora, Luxwan, Nidoreign, Omegadge (front/back), Orfry, Pendraken, Ramoose, Ribbito, Sharpoon, Totartle, Trampel, Vulpiii, Weirduck, Fossil Aerodactyl, Fossil Kabutops, Ghost, Articuno (back), Meowth (back) -Orchid: Ghost (back), Luxwan (back), Buu (back) +Orchid: Luxwan (back), Buu (back) Zeta_Null: Porygon (front) -Official sprites: Crobat, Disturban, Espeon (edited by Martha’s Against Humanity), Slowking, Steelix, Tricules (edited by Martha’s Against Humanity), Umbreon (edited by Martha’s Against Humanity) +Official sprites: Crobat (front, edited by Martha’s Against Humanity), Disturban, Espeon (front, edited by Martha’s Against Humanity), Slowking (front), Steelix (front), Tricules, Umbreon (front, edited by Martha’s Against Humanity) Original README.md proceeding; # Pokémon Red and Blue [![Build Status][ci-badge]][ci] diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 07a46bcc..c94c40e0 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -136,7 +136,7 @@ DEF FIRST_INDOOR_MAP EQU const_value map_const SILPH_GAUNTLET_6F, 12, 12 ; $71 - Was UNUSED_MAP_6F map_const SILPH_GAUNTLET_7F, 6, 5 ; $72 - Was UNUSED_MAP_70 map_const LANCES_ROOM, 13, 13 ; $73 - map_const FARAWAY_ISLAND_OUTSIDE, 15, 18 ; $74 - Was UNUSED_MAP_72 + map_const FARAWAY_ISLAND_OUTSIDE, 15, 20 ; $74 - Was UNUSED_MAP_72 map_const FARAWAY_ISLAND_INSIDE, 15, 11 ; $75 - Was UNUSED_MAP_73 map_const POKEMON_MANSION_B2F, 15, 12 ; $76 - Was UNUSED_MAP_74 map_const MT_MOON_CRATER, 25, 25 ; $77 - Was UNUSED_MAP_75 diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm index 298f8ef0..eb46ee62 100644 --- a/data/pokemon/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/kakuna.pic", 0, 1 ; sprite dimensions dw KakunaPicFront, KakunaPicBack - db POISON_STING, STRING_SHOT, HARDEN, NO_MOVE ; level 1 learnset + db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm index de51a72b..515d53d8 100644 --- a/data/pokemon/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/metapod.pic", 0, 1 ; sprite dimensions dw MetapodPicFront, MetapodPicBack - db TACKLE, STRING_SHOT, HARDEN, NO_MOVE ; level 1 learnset + db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/perrserker.asm b/data/pokemon/base_stats/perrserker.asm index 7efc1bb7..514b5454 100644 --- a/data/pokemon/base_stats/perrserker.asm +++ b/data/pokemon/base_stats/perrserker.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/perrserker.pic", 0, 1 ; sprite dimensions dw PerrserkerPicFront, PerrserkerPicBack - db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db SCRATCH, GROWL, BITE, SCREECH ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/pupal.asm b/data/pokemon/base_stats/pupal.asm index ea88c64a..7393291a 100644 --- a/data/pokemon/base_stats/pupal.asm +++ b/data/pokemon/base_stats/pupal.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/pupal.pic", 0, 1 ; sprite dimensions dw PupalPicFront, PupalPicBack - db LEECH_LIFE, STRING_SHOT, HARDEN, NO_MOVE ; level 1 learnset + db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index 184b4d90..ba42e2dd 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/data/tilesets/collision_tile_ids.asm @@ -75,7 +75,7 @@ Citrine_Coll:: coll_tiles $2C, $31, $3F, $55, $0E, $2F, $23, $20, $10, $03, $1C, $1B, $0B, $0C, $21, $39, $3C, $48, $49, $58, $59 Celeste_Coll:: - coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $40, $51, $52, $5a, $5c, $5e, $5f, $09, $08, $18, $19, $0c, $1c + coll_tiles $20, $2e, $30, $37, $39, $40, $51, $53, $5a, $5c, $5e, $5f, $09, $08, $18, $19, $0c, $1c RocketHouse_Coll:: coll_tiles $13, $31, $01, $53 diff --git a/data/tilesets/door_tile_ids.asm b/data/tilesets/door_tile_ids.asm index 5a097dc1..1237f6ce 100644 --- a/data/tilesets/door_tile_ids.asm +++ b/data/tilesets/door_tile_ids.asm @@ -15,7 +15,6 @@ DoorTileIDPointers: dbw INTERIOR, .InteriorDoorTileIDs ; fixes weirdness in silph co. dbw CITRINE, .CitrineDoorTileIDs dbw CELESTE, .CelesteDoorTileIDs - dbw SEAGALLOPPORT, .SeagallopPortDoorTileIDs db -1 ; end MACRO door_tiles @@ -66,6 +65,3 @@ ENDM .CelesteDoorTileIDs: door_tiles $0C, $1C - -.SeagallopPortDoorTileIDs: - door_tiles $0E, $1E diff --git a/data/tilesets/pair_collision_tile_ids.asm b/data/tilesets/pair_collision_tile_ids.asm index ec0d8fc8..a339d044 100644 --- a/data/tilesets/pair_collision_tile_ids.asm +++ b/data/tilesets/pair_collision_tile_ids.asm @@ -6,6 +6,9 @@ TilePairCollisionsLand:: db CAVERN, $20, $05 db CAVERN, $41, $05 + db CELESTE, $30, $2E + db CELESTE, $18, $2E + db CELESTE, $5E, $2E db FOREST, $30, $2E db CAVERN, $2A, $05 db CAVERN, $05, $21 diff --git a/data/tilesets/warp_carpet_tile_ids.asm b/data/tilesets/warp_carpet_tile_ids.asm index 1b8ebbbe..443a8a01 100644 --- a/data/tilesets/warp_carpet_tile_ids.asm +++ b/data/tilesets/warp_carpet_tile_ids.asm @@ -12,10 +12,10 @@ MACRO warp_carpet_tiles ENDM .FacingDownWarpTiles: - warp_carpet_tiles $01, $12, $17, $3D, $04, $18, $33 + warp_carpet_tiles $01, $0B, $12, $16, $23, $17, $3D, $04, $18, $33, $51, $52 .FacingUpWarpTiles: - warp_carpet_tiles $01, $5C + warp_carpet_tiles $01, $34, $36, $5C, $5F, .FacingLeftWarpTiles: warp_carpet_tiles $1A, $4B diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index 0282b6b6..4e4423b6 100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -107,7 +107,7 @@ ENDM warp_tiles $1B, $1C, $0B, $0C, $58, $59 .CelesteWarpTileIDs: - warp_tiles $5A, $5C, $3A, $30, $50, $51 ; Like Forest but a bit better + warp_tiles $5A, $5C .RocketHouseWarpTileIDs: warp_tiles diff --git a/gfx/blocksets/celeste.bst b/gfx/blocksets/celeste.bst index bb0f6fae478b59226b67df481717061f554a7549..c9304c13c9dec9096fa3aad052b26bca46568834 100644 GIT binary patch delta 423 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 delta 3099 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 P7#KWV{an^LB{Ts5Vj+)B diff --git a/gfx/tilesets/ship_port.png b/gfx/tilesets/ship_port.png index fa5bbb27eff172f179b95115491687f69f3262d6..b2882abde708e5d6cdb345918883752c66a68266 100644 GIT binary patch delta 1340 zcmaFLahPj@L_G^L0|SHht^8gF1_t&LPhVH|=R6z&`W(j%!lM}&7{p6lBT9nv(@M${ zi&7cfeOvt%SfeQ<5yb;F0z`&T~?e4+ewLy zUuyN+D!YbLF{fWLXl)QT*|(f?Lp|%Yg3B4nFVuegU})UHopyicV^%xg1{;gA@6ksR`X;hMAcR;4Bxm- zfrTx>Po$G^BKHsee;+E!c5W0pB6*v^+N~!x`oZ@6T}JEPD|^g*GU>Cn+<86G8?#m) zpVkmiG-cJ+yCD;7wf5PEepYlj^2G40V)`Fksb(`>$J-mvU=I@+`R=31h>`@Z5I zh72*^au~GPJzFnCx&|={pRQ*-%&?u=CO*xpmcioTEA!$+?H>$Y2ZHlArXD&wV<+m&tABPBBivG9oK!ZBN&x!W>GF%K9`$b(W8V)Vq|K;Pf`hBN& z%5YssmY!{WU61wRqys{k{P}xS?O&byxl5Yir{qEL3j5bz8A9@3F(x~mVoNaJ_2PB_ zL#DRF&F^VTuV^iwsi>R$C+xssZ=pFI@!Oc>L^T?CIl_8Qd|!FMZ<<_qwX<9Tw{HQf z_&)yzc_)?*?GA6o|5ByD7kIn9{#P^M?~3|YdJkCU*sZuX(JfJbkC0m2uBKNFiqa3> zzW>~4?(Bc@lM~}2>9y>0xQ>}P{^K)xW+;7@W$T5fHz(#!`1cAhuF@humT1NPKJF-AC+gZH*Gm|Wo?f8ZT1PF0qakL13o-cnjY^pN-^g-TNt{x{`;P5GR>_P-d0yJ#@y*Y_efqXq?3!-HxW}OCSxxz|^~xvr zD5w2D*v)l+m&SuOrjwbBPju@UZp{4Kb^YuqliCBnjsG706E*w7-hWJQ-hB67Y^k+3 ztNbx9N7$=*ox%lfCq*Jm^$Kpydi}p4lvSo|`XAN@QKwnw|1R3gsKR2dd}d!E(?90Z Wd`5bStyb4Tg_NhOpUXO@geCxHLPHY( delta 1116 zcmX@i^^{|RL_HG&0|Uc0ebd7X3@kdHE{-7;w|u9>XGEup9PlrazG6@73z8J0aJlpLWyRqWN8D*oH=f5@yZ} z=Y{#VCx3CAG$laty3F~V(?i~WpH%bnY5Bj}@64Ai-4`#~AI4aJ&shArK)IUrrUOqZ z*Mya*_Hsz=*WBQHuurc*ru$oD*!_*h7jmt699S5Z?LYm%lHtbTdD&IWlVz9lo^d&I z=X&g$#$rlltCjzh z*3R!eX#Fnw>sf1o=~*-O@-rSXQMWC4eA2_L*EZSUZ^E@dik!jX|HK}w$lN%6N4-vK z%t;;omGi_O)aGnbJ&+dM@bbNmoO||!`?Jj-GwWz?a5x*wY9!d%Fr9@XbwSbRlB->l zVl^e3y}42p_H8;?T$HAx>P8F>FXN@5-f@h49^turUlGDw5m^c|KRZ@D}yljg^ajCHUZ$@y!jn z|E{t}71h5=HoWP``b$lMegB_@Y|DR_G-gcBQ*@g?O^waq!QFeuBTYA0-U(6Q+pvg@ z!Jnbzq42(MK0H^~S>`b01aTOyVLM`P%FchOZ@%-bHx({x890g}rfYGf{@4`jWO(K5 zIg3>eya&!R9@w-Z^g}{vga%vN#+DTapB!8gB0Wt&`L^Hb`p#b)FJHg@bVm<|Vy@Wn zB?%eZ7W|6T)lD}NXUI-1Y1iF9cVnAR!r|7xiKlJsm;BDoa5afy`5!;SML#{ zs>@tYAg%YM)vQ3<|XU}!>1pzTrbCwF`+I#vf zWuLDtaOi7a0C~#onksu8ZcKcDHW+)SQ}q+SH@F zO7a)O)^9s=U+(XGCKw*PGuX=1j`7R1lBeA~J$5&4-t_Xl$z)Qc&Y*WvHS`AC>4`Gu z1angZ>W%&}CwMj3HXKc6VBIuhf{G}|Dk0~kA)2*}-Pw!}ejTpcTEgV8BVfwZi{3Ge hK5Z%|W*_DJpud&pk;HU~MeLw*#M9N!Wt~$(69B`~1swnY diff --git a/home/overworld.asm b/home/overworld.asm index 88768280..604c1d37 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -773,6 +773,12 @@ ExtraWarpCheck:: jr z, .useFunction2 cp SHIP_PORT ; Vermilion Port tileset jr z, .useFunction2 + cp SEAGALLOPPORT ; Ferry Port tileset + jr z, .useFunction2 + cp CITRINE ; Citrine tileset + jr z, .useFunction2 + cp CELESTE ; Celeste/Faraway tileset + jr z, .useFunction2 cp PLATEAU ; Indigo Plateau tileset jr z, .useFunction2 .useFunction1 diff --git a/maps/BrunswickGlade.blk b/maps/BrunswickGlade.blk index 857ba53c..166aee27 100644 --- a/maps/BrunswickGlade.blk +++ b/maps/BrunswickGlade.blk @@ -1,2 +1,2 @@ Xg;"Z7bbb -7 $g)g. 7779 g):7 )I( g,,_(gg_)#g_.bZU_}}}}I_UgU_;_U._8_bUg7.L8_aU_6igbhgY \ No newline at end of file +7 $g)g. 7779 g):7 )I8 g_:gg_)#g_.bZU_}}}}I_UgU_;_U._8_bUg7.L8_aU_6igbhgY \ No newline at end of file diff --git a/maps/CelesteHill.blk b/maps/CelesteHill.blk index b6b79066..22b8510f 100644 --- a/maps/CelesteHill.blk +++ b/maps/CelesteHill.blk @@ -1 +1 @@ -@B@B@B@$.%B@B@B@aU_aB@iaaiB@jjjB@s)BDEFYDEF \ No newline at end of file +@B@B@B@$.%B@B@B@aU_aB@iiB@jVVVVB@)BDEFYDEF \ No newline at end of file diff --git a/maps/CelesteHillOutside.blk b/maps/CelesteHillOutside.blk index b366f25a..90b92bba 100644 --- a/maps/CelesteHillOutside.blk +++ b/maps/CelesteHillOutside.blk @@ -1 +1 @@ -,X,,a(,.geanjsUg.ggg)aggcj,g.s,(((g_dH9:g!)gggg%gg)g./,((((AAAAB@C(EEE?B@Bdsggg@B@Bggggggg@B@Bggg@BD?>gg<=CFD?>gjV/@ABgDFg<>_DdFgDFg%0ggAAAg/sV,AAABsV/sV@AAABAAAAB@CD?ACFEEE?B@BDdFggg@B@Bggggggg@B@Bggg@BD?>gg<=CFD?>gAB----@BADFEF-l--@BDE?CF----<=@ANA@CGF-----@DEFADFAB--k--@-DEEEEGF-----@-pYk--k-DE \ No newline at end of file +@BB@BB@BB@BnB@B(nXB@B'n((*BDF*(((B+F*+bCF-@C''bAAB--@BACEF--@B<>AB----@BADFEF-l--@BDE?CF----<=@ANA@CGF-----@DEFADFAB-----@-DEEEEGF-l---@--pk---l-DE--pmmm-----------------k---- \ No newline at end of file