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_nAfYX4aqgba4!kxLkXFJ=dWE0rn5h8zR^i=_}YZIv#n{ zbZ|k(4*4Gpekm7|jNh<^q$DN?9NBoc>25|y!0IOb1c5Ca!gbI8CR~gCS+~RfVZ);) zm6$A*(zZE1FNHH%?$6|m%5p4NpH}enIma)f9)Z^^H#4*g@1@?jtKZI@LvEITsHIJo9C9u7A(7PC0Yikr)78&qol`;+ E03GCxS^xk5 delta 305 zcmey&vXW(j3NK5#qpu?a!^VE@KZ&dp6&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?rteC2pBwF{an^LB{Ts5Gck90 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;%5XdaF?VM<+Z_JeB?e4lBSEK+1 z*-JcqUD==Wu<|Q2?GrCb`XJ;? ztV~TIa;k^aihxFGl(wGlJ+52#Tqk%*2>c z&#>Rq#W6(Ua`F#;R-Ot8`Gg+-Zw{ZB|JS$4|NZ~}|HCi;&wmL2`M-WSL-m3rzUns3 z9)(yxK5xk#Rw!mU^g~1Fkt)7n)UyCyQ9gI&)@&^$p5!)Yuohy@A-nX z`CpAiYIopfuKj{WpQPU2sVolOXObFxo8ufAh!)rd*FI-SicpTEMGGQaj zi5XjTOiY$Yo`^6JK9TVM{DiGKq9-Q&Kfk~`DW+7!{F23Wwe^Sl?KA UAU-nJ85jf%p00i_>zopr0J$2KoB#j- delta 520 zcmaFNa))(-gd_(W0|P^GRn-?D#ggvm>&U>cv7h@-BI`s&ePhl7kH}&M2EHR8%s5q> zPa3F-DaqU2g@M_)rKkhQV=wXab!C6fBF4>VQKjvvKCxL%!oWn=$SB0n(8|Ej%G6Zb zz`zQKCNut;cu*3nocFn%Zj;p*GwK;*JY5_^BHZ6j3kE&MZ|arWO> z7k*LQV&NA4o(Y>Sompp>vd?~o-HGcL>w4;$Pad#2|FhcsrGU~N9dD@{-)*<9pXWQ@ zCv$HNx5+`Nm!=P0qp$rcb-+*w4oB;Loox9x7&}0u@~QKiCvsxAgRGR&F4q1;I$SZ!F~Dx z6+Oo%w|M=};ciJXSm~_2=_QUnO^K2}k~?H`JA4vdy0@mJ zJzmq;QNpdF62f{>IZtt3fJSQvWk?kuAz~x zfoX`Lsg<#@m64IQfq|8QL8am*g^3r%{m^6$A+nZJ1Q>zFX_UA|l%ynM^!}=rP}1GI=r+V`lvUPZ!4!iOZ$uH}W+Z2(UeHdz|)2d&j9K(gwRS zIvi`5Wj-k0iIrKxJh?L}ss7#p_kxr+$_5q!hm@9l<7)1n9`j4JeCKYXyX?k0FHChU zy}Z*q;CWe^VCB!bUTb444HpVB|7fvtYZsaz=G9!?vR98~;aNNX+rf`x8=g%$!60K2 z7QDbfJMP)U9U0GL8jpWVdBBkLB-?DSQtWwNwd9#PcNKH*x6a$U)3c)A~ 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 Q14D+v)78&qol`;+0254nC;$Ke 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{c(IE@n5h?11Vl2ogb%-q!C zlEmBs1|tI_G(AugMMY{3OlD%ttbgk1;us=vx%S*fKPE>J)(hX+#WrzXxFFbiNZvrv z@PfqIO_B4DmbrNF*l*m(kgcp%=3$Wd%v*JH^Z$^EI~i&vyhjIB<3 zrg-*k_3gP&a@Jd~yIEVK$fe6uCwNqD{;t;_m~D=vF1*VbU=_zH%GGtadLggW`a8i+ z_g8$kxahgtUv4N z;us=vIr#@aE04k>h8Z6p{{J8RRpFTW@Bho+9PIh`fBCa!$MB#(oE!UBF`oJH<-e%Qsh9V= zeX126pI&lTJM0&;fN?5m4H75_`xoqH2?)l~Szj#;a= zI_Zd>u#no+Wmu#YaQ5PY&_yd3DzshKx_BXAfu;PGuw89!O+MFVNl8dCZSpoXak(P- fDs{*Gjm8W*q5CRUv#8z&1{H&+tDnm{r-UW|MnQ_x 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$-Xl+UM!w7$R{w z`3FBMk4I1axqxF&&kGzA|9w>8nC|{M4(04gfBgj>zh5Qr`~6pkWAo2U_;I!ne$`)f!yCtKQru`kKIpVHSSJR zc&pI|g^i0_ zbNBi^-+@Am`9*#qjOQ1X&zkJZC@EoJqHAClVrXDxXlP|(plx7aWni#F4t;!isBJnAJ!Qi|@0C{d{sDnNBixSr^Jfv`3 oo=3E_kj>CV!ilw&vr>|YL1OWa6C3RN&w{+@>FVdQ&MBb@0Dx$YVE_OC 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_=JJRX_UA|l%yn0~Cx%=%lNE{-7*mrKtZW*-U=VSTXJG^JpJ_j0~-b7N$9 z{WF&9MH&7T^lNH<{F{BP_cI;+fOog#FDz~1nDj`aX-7%!l_ZVcId)C5T;Kfe7o2P4 zmg85S_(IuiYy1w&eLFOtc*Ji?>$~fIZA)g$Zj)xO4#%n)-m6_q_T8KuI6FXYc@kGa zOI(rmMM=T;Gd&+f89bR9uNWp%@J9R5Ou6{?QAZ|tsXrH!ySj=0c2KFQ=0UyV+kXi& z7)~zWozhueS;M^Qh?5*o&)u0`&sR#s3VjbeZgJ4G@L{=oU;XFvr|Um5ue-Ya_$0~G R(ZIlA@O1TaS?83{1OQ-qmqh>o 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^|EHf}j7#KWV{an^LB{Ts5%)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$-XlI_&A<7$R{w z`N#kN`k(6+5`gq?ZjHzHf~q+lPtln2aV4u(DYM$7{a57A{Mh|J)L_QP^#7|)CLG&d zy4vYLkN@hhwiC`0-p-c}W^Hm}4sY1n-L@<3Rjvu;NGZjZIrZ7Mzy&*K%%-q!dpX8_R=41_r78eFf{@8ab%7 delta 464 zcmeyuyqaZ#3NK5#qpu?a!^VE@KZ&dp6&pI|iA|VI z=h2<$ET9l$evw}YGCPok)>1SsM0(C^CMtG+A`Z8z%*&Gb4j6w{| zKo%nqGB8Rpu!7kP3|@@VaCQ)*22>3b0|S#VLOoC|2zUT7P&b5@5BhEbWUuygaSV~T zTzjs5A>Sbb0k#K99FrzocrM8y!^!-O`Z7Ge>$b8enTjO8@`> diff --git a/gfx/pokemon/back/magnezoneb.png b/gfx/pokemon/back/magnezoneb.png index 5d4868edbbc61a3ca1f62b79265432120bd5d76b..43c14135f91fbe9e6d3dcf952c54f2487b362924 100644 GIT binary patch delta 318 zcmZo=*}yVEWul3b>|q85zQc^i^H-!WFfg!}c>21sKj&fPSJ0Wcd-BzZlU1aQbq$Sl z4NOA}O|6WLtW1ox4GgRd48Hxotvm6exF2@e_GQTvfyQZ+xJHzuB$lLFm1O3o7MCRE z7BCnY7@_GgftV;NQgdK36Jut5kEe@ch{WaOAN;I5Dn|c)I!o@icb5EK?;yE69*Dyn zBVeoYIb6Mw<&;$UZC2sow delta 273 zcmdnM(#kSHg_kAW(btiIVPik{pG4M)imtLp7#R4DFizFxlV)IGU@!6Xb!C6X%_(T6 zvhLLc_leCaQbxLlhPnopA%^BwrY2U#rrHJuRt5%~t~Vb{JSdJswn8E?X0jS%W__!t zi(`ny<>VjytUNA8dILcYHEpkh^j2yVWD-XFxA9c)I$z JtaD0e0szXFY*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!mfkGEOT^vIsE+_x^ z|9?62@Bjb*OaA-6|NnpWmWluW$J=&%EdTmH{;$HZ?V)^8-Htuc+W+TAF(%E4`t$#? zkbv^q|3Bxi{N~WMYA>@uvt*CKv5)^X6-?Ft{{KIhDdmqTPeOeH7mHWz@5A5fIamL$ zZ?mpk_&cnP3-r4)^7a<}Nz6Kh)bfyt%}Y zQI3rvM|G3U)+}!spzkIw7LzbE(lsy*F*L9;F|jf=(={-&GB8*aIFD)KMM)KGa+i73 R_5rmrc)I$ztaD0e0sv{1ijDvP delta 365 zcmcb|+{iMaRGaSz0|Va?#;MwT(hLj?>?NMQuI$fQn1$Gw+QTe?A`FcAMSdZS=NFaF znq0srDPdruYhWB=XklewW@TWgZD3$!U@%kB+H3McM#*|?k}qnSzX6SjN{#SL^YvxW z0bP0 Hl+XkKlF3@# diff --git a/gfx/pokemon/back/moltresgb.png b/gfx/pokemon/back/moltresgb.png index 54b9663bc1e5b4e3708277e94638066f24de05e9..1230abdf9faf0465509caf4730074bac241bbe86 100644 GIT binary patch literal 625 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+IE6C$sR$z3=CCj3=9n|3=F@3LJcn% z7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4?NMQuI$fwSh(3Oo(Wo&0EHOyi~K?u&o3&U1>~rfxJHzuB$lLFB^RXvDF!10BV%1d zBV7ZN5JN*N19K}=Gi?I{D+7bd;zeO78glbfGSez?Yv9n6dIi*=0k@$fGdH!kBr&%D zx1M-wYg3?}sMHA0G+$o^Eg+kNft68+ff>kR1VRQzDF#+Bn}NZLQ5wz;V$^`D0R|?M zFhV_0EeLo3F;F*zmJj-F0%V`{ba4!kxSafhpOweq&l0&)1ryo~{`n>B;Yq7WP6%K$ z&NDEuxY8`)E+HxL#<7PbjGb-5iTiAUY|#^D+4C*r{jAut!mVE5v2^mSrV@e2%E=j% z4LS;&O{aKD9kDnx>yQxBrFjawnoQUHw`aaEL+2R7!~Z<@C7cdN{NVqe{^Nvz)TJ2= zAvMi~&s^9v7c6ym*(`LEpTSkg>2TBzN54=WZ_$VBhAfNII5#v)E?g}&!;$CshBd4` y3db5(glap^ORku(Elaf7?#S|j{f`qE7!E97Zhc`(4=|lDFnGH9xvXb|85kJYOFVsD*`Kp;@~Rr8KdgEJ6guYV;us=vIr#@a zE004>qu?ozL<2_Se`W>+x0)sHOGvOhaqQ{m;p6$EaE$jD1KS17JKeoZ9P!tVdZ1}q!gOglC( zNb)RN$a_X!frnMFT0mL%=)(p7>nBW-?5l53TDWi__e@7WUf$jkR^w%D%eFSi?l&p9 z$~1vrBFt@V)WHD$ls%^|1tn}?H@dg>K>~yEKYfN-n*1L%@4UB=V9@28Wyj)oKpW^K z)e_f;l9a@fRIB8oiSxN63`}$lEJF;9t&GjBObxUR46F;Y!PC{xWt~$(69AKUfkOZQ diff --git a/gfx/pokemon/back/mr.rimeb.png b/gfx/pokemon/back/mr.rimeb.png index cf863f49cb1ca666c473242d2fc9ff0153801a40..df6866291f214a6a4d50dfaafac7b2366d081887 100644 GIT binary patch delta 393 zcmX@Z@|$IX%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf6l|g&7uD&YH`iP$tqIDx`sx& z1|}hfhE@g^Rwky}1_o9J2BlVyZ%n)>?uRC80+C%L5O4u#oJNUjL`h0wNvc&zW^QV6 zNn&mRgOPy|njUkAo+EFwCrxHz%&foe>Eak7ak=)~Mz6yK0>?k*d$6!8{&)D_ym@l4 zF5j-N_AUjl?M=4dKItyduGHGJUa@wPSl4d;1>JpoTusdzpR3;7`||MJ!tc&oPhRD^ zde-Fa!`HiQA;e{)VpBf)<^_im2q<2Sqcckl~xw`gO6aR1A zoBKIz=iz@wG37T{)nx4!)bA?gv9eG+*UqL=^es2SV`j|0ZHre~M96CH=Z~Bz_x#j( zqrx@1=eyaDne7tdo^oI7d64A1sS~F(eu=&5k$65&r}$=>-))=Pzs>ePg?s0UPuOr9 P7%~i=u6{1-oD!M<+T5O@ 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}}` hEUMWq+gr@=|MKo0fsEUyN`N87;OXk;vd$@?2>_ucj~xI2 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!ia0vp^3Lwk`Bp75C+IE6C$sR$z3=CCj3=9n|3=F@3LJcn% z7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4?NMQuI$fwSh(3Oo(Wo&0EHOyi~K?u&o3&U1>~rfxJHzuB$lLFB^RXvDF!10BV%1d zBV7ZN5JN*N19K}=Gi?I{D+7bd;zeO78glbfGSez?Yv9n6dIi*=0k@$fGdH!kBr&%D zx1M-wYg3?}sMHA0G+$o^Eg+kNft68+ff>kR1VRQzDF#+Bn}NZLQ5wz;V$^`D0R|?M zFhV_0EeLo3F;F*zmJj-F0%RZdba4!kxZHc*kn50x0P6*LXAfnME|~*W=CT-9 zFzFU?_9uuQj63p1bIXOO;ANMTHKw(F?7sF$>~!+8&Bok+<^CLM_};mKTZvob`-}py zu56b(YF)(vw|~iKe+%5nH?K2E{QIXBJfi9|RCgU&nt0^Nv_}s`F7e0Oz361n?UV47 zO7fFYY5Xf!CBb(w<#cX!gSe*EZ2@bR-f n9isnU#d>nitTU?r^Otp^)1nt?dmc6by~E(?>gTe~DWM4f+rFxE delta 351 zcmaFPa)Wt-3NK5#qpu?a!^VE@KZ&dp6&pI&N0dQc zq_XZ%0Z@oBzsN6y@%*ClSwPM{PZ!4!iOaS9)?9}Y1X|piTa`N8H(c>naSUcRTz!MH zsdaj1tKb%{6$#%&qLz57PMhb{l=`H+W~<-Enm2sLI%mRvu*aS=emGI!*)~Tx;jD#@ z^-@yTpC~ughVPcxV|IOS{1@K7$>%mz7jj$>z10#O>8dOta@8f~cv6u!ONM|Ar;NeP zC70Tdt_!~Pdf~a?XQqwI&R=R}KEYk);F)nwXo1j$I~P4t&K&SDl{&ZV%ZgW3!u!la z{xlzczGT@lD`P_|BLi(9 h!@!`{Z|22`2gTK}%kl^-<^oM&@O1TaS?83{1OP5#g#`cr 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+|&gV0|KDB}s_n@0F#3Pk+ExEQ%zyad<^R=TH|2kx z|6uw0`l`@>?f;GcoQz^kxx!qU$tY^ww8eXE)YdEVM+Bm`X8EqN?I<+KPSt1;l;TR< z(bm?Kllr4t=)?qeqkY+olJ^^X{G+^`opl{~{!U%EP|D%h{J#!uMjadZHCT;)US73Q zfKAYjm7%os#9Ps{X9g1&NJ05wFVMtG+A`Z8z%*&Gb4j6w{|APa$zfl-Qq70hN}@M4sPvxDjxHK2-^ z7#Ns@5gLGsLBIouf!ZOoe9(80yC!(LIEF}EPX58q%A;b$XW%TkhVfg%G5J9DI)ldy z%*-Br5BsmJVpWjknIHB)>MBFhoT&f#SGlSMlK-y{UH$8z()zHqQ8hp8o3CjpL`KxG zoQn9wc*^1v`>6!eMxz)>g`TMk<2BT#!*n&eX7xf9F43PYOM; zs`cQ1$$j=wrm0t56duQ2U!}UR@!x+*zpS-UTCcMH&wuD~ZPn5~p0EEU_2Sn>nVLS4 z4|sBURp`Ql>wo<>z7w_8$fQDaLSa^D)Qan?PC6VrHPeCZ!kjHzt^}-K>hQhe91ri+ uSxh2=yu7?qxp*24TpW4c)VU`zFvLIKY;$3M(>7pOFnGH9xvXoT 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#8Ko~q-{an^L HB{Ts5j3at* 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^=a@pR%48_|cmMaOULoPf|LJpo>d*KXf8gio z`uYhS9FLoY>J%P#GdD9g+f4X){M6jWgK{S<4rHA_pzvq@!}Tke_a}3Fu5Y^^{6;>G zH}(Jdg8Yx`L#Hluh<*O-fAmMKkni@+q4(DxUA@fUPx^*cQCGKTF?J+w^~w(Aeq7I{ zTfa6mO53&Z*486oYoa!ZWVBAn@CZBMwcy+0b&3lYu5?(rSdVAnLPdwk_H0b9ObuD@ zKD2hV?P8w0>wNyI&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&OZf8mCd>8c~vxSdwa0l9`)YT#}eu zz+hxxgr>(3V&c5at8J5+7&GgidAc};NL;QxZ<~E6L4f@O^F${x@%gSXN6xywdh*Rj zPp@m1{=*ym3CkWWV%rid?&^B@Vfu#HImRWg1GZ1w6~f`zb8P?f%XeqjeLq&n(!%K> z5MXW1X80k!fQgT75?i6y1BIyCA56U8wkULW*ycF)|Ja%qq$a=kXb_v`j*^O+nrUC# zEw;>A?7%+%@b>)7pZ0GpBigp-J!8Enu|-ZJIzA@g_t%|C0UEwj`gWOb(0cc4!5QJ@ zGpiT)p3gR%?l?7V-N8BRE5kOOnwPUQclUwdgKk%6>K^=eS83N>r#;2{)t+76#TU%> czmPp#(Qk*IL7esrU_dc=y85}Sb4q9e06o5;RR910 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>vDlMzaVn3!wiQJYD@<);T3K0RTL0X^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`ypf7elbkkFy&~8r`#}J9j zx##V<4h8VAeULe%r?>8rflY2n-$^r||20ZnBT7;dOH!>$GILXlOA>Pn f7>o>zjCE1;7(vWCRQ#y~sE5JR)z4*}Q$iB}R$h&a delta 465 zcmaFEe2`^=3NK5#qpu?a!^VE@KZ&dp6&pI|g_Bo7 zavgFI zV7*}La_Pp6*P>Hg6iYi!iY+s5ou{<6w^#F$)Py$=I4@N&u@r~ynC6!DuG1+6u%2-g=!Nk8pX6iasxy_QU zm$sNJ>)i6yDOhPnNaQE!#O?{Z8V=39f6>*W%(eB{GPZA0)(zf^QqMg)!LN{9cwzEM zt_rawOgb@hyu50reB)j;)2&~__YT`_k9`X-vDN?k*Dd}zW_`K*zp#9eA3a_DT-G@y GGywoQhmF_( diff --git a/gfx/pokemon/back/taurospcombatb.png b/gfx/pokemon/back/taurospcombatb.png index 782fca2072948167266cf8f86fbbaacdeeffdecb..c4f66f7eb7a2093a0c49dc6daeebf6026fa8aca7 100644 GIT binary patch delta 501 zcmX@f{DNgdTK!=L2EN0L$MaXDFfcH%mw5WRvOnix;pWhr8aw$FP>3Q(Kax!GBCL8`yvNLLvDUb zW?ChN241+1MFIgACU-K*)T0<@1~D#aR)QMPxTw?!&op0O1}z|)gMpP%h=Cc%Vgy14 zMkxkXFq?tFi%}ZR4r0`Rs$pVaU=l{C2dV`D4f$jepck%zCeZdRZCf*#7W(6XC2RoJdEIT zwoo{u?4nSjw0^^nB;NBATaKy4u)TEg36ENCA(0&LL~_aD|MfrF<*%yF%sLn$6bmdKI;Vst0GZ92djJ3c delta 321 zcmaFCa*}yMTKy3Q2EHSVQ?>b|85kJYOFVsD*`Kp;@>(xKCN0c{!|h0ZjjcrWyNddQqb4rXZisW$b3!HjzYxbYrf7$c-mQDLU zb60%Y#0ioT1}3@&mLZ15R;HF#28P-O237_JTJ{fqED`UHx3vIVCg!0MF%h6aWAK 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)QW({X_UA|l%yn4BQ)Y%gmtnTav8ev+q)V~E7%CGtAs}E(J5x8=z)@ivT0av4za;9~xiMsl#|Byh`)-0tN2e)Qj6{-_(&c3>8 zWrCol#N!*QLRTJAICe2qJH1I#e(|NCgI)S<=jL#kS*n`oh^&d2Y$|fdLiB(X*EEe^ r2R=43K6-YvUJPjG`TyG$E}dq0)^^h2W@Mxq&{GVau6{1-oD!M&pI&hg(d> zE@C@9|&fvm3vvzp2k=`0wBUkNK<}AD{p43l})H zU)+0h!z#&r`=bm^xsLqUlQlI%g6r|+RiSGa{uMaZ5>UsXJmsMLnFui{uEaAfhL@b2 zn;q58&*4mEU_H?Df02V5M@ON^368DoUYt!5TL1n_+O>6TYGdPIc6D-Qa*mzb`N@bO Y!sD>TvHY)HKp!)By85}Sb4q9e0D0DD#sB~S diff --git a/gfx/pokemon/back/umbreonb.png b/gfx/pokemon/back/umbreonb.png index 693dba9420c8448f71e1bd8c5405b9c29782d271..31ab72df080616bb4bcc71b817484f645844e007 100644 GIT binary patch delta 349 zcmeBUInOddWul3b>|q85zQc^i^H-!WFfg!}c>21sKj&fPS5*C3BV{mgvWk?kuAz~x zfoX`Lsg<#@m64&gfq|8Qfyc=ednaBL_ror0IYodGXq-lgYeY#(Vo9o1NoH#qSEf#$X=C_1UHshV6h{kA&e^gYB00g+bnm!p zKZ@DqzwXH6upetg^s>)?J91lSyJ4X6r(~Zk3^@x@m>AbDR1}?6BYbJ^-CS#v7RRzm z*Or-D=f8+4#Tf+~2eNUTJ|95>2W0~(VRSEZ_ R-+;bl@O1TaS?83{1OTIje2@SD delta 282 zcmX@l(#JAEg_kAW(btiIVPik{pG4M)imtLp7#R4DFizFxlV)IGU@!6Xb!C6X$tcXC zC%?bx&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 R-Vf+k22WQ%mvv4FO#oHfXcqtg diff --git a/gfx/pokemon/front/carapthor.png b/gfx/pokemon/front/carapthor.png index b773f773517ae52386c5414271edc7cc7355ff8b..c69a5a225e4a81cf3bc68462019432f3f3c3b89c 100644 GIT binary patch delta 772 zcmV+f1N;2k2Y?8WB#|^i9m4VGd000McNliru=L`i8A2{2;ZIqFdCKxd? zEig4yF*Q0fF*-FiD=;uRFffB&PZyEV8B8%UEig4yF*Q0fF*-FhD=;uRFfhaG?KS`a z04Q`tSaf7zbY(hpX>Db5bYX3905UK#Gc7SPEig4yF*Q0fF*-FiD=;uRFfgSS)^w8s z0djxAYtv912k>8(mPt2E)x_&6h}3%6z{?KBm#*tcu}zyd(32O(?9qQ9n^@2x6uj-U z)lK_MVLf>8B3nB*kRHt0T_U@vJEhH7VZ8G5rRfekiSLm2`;eD}-=ylIK-Zywn%r;@#f3wWPp+u3DyrQZ3{w8ZCF{N`9f$~}QbH)ug_%ib|0qdI>~ zg&oC}-}Z`r-r!&*yTszr{CU4y*UC2}tu&;9r*Es}q*f^*C&2sObG=%Y76g3r{nm)F>ixV77m8e97Jbnh~7t!`CDBEoO^gjpELoKVUJ|N&!UY z&7w#LQk!yo+5S+FRFioO4lh^ZskJp~M9hs{8BXkU(O!H?&3SWT;uoOK=e7Ve(=a=| zb+c^0G)Kd$i3++jJ7RDHIE>DsM@tu`9h86k3x5IkdF}L01`J;S0000-K}|sb0I`n?{9y%=Aw?a;000ie0hKEb8vpkg|5kqk?FJHU{h92lZ+~oj*mRAo`BjDf9ODua7XBoXr7z~ z=tCC+AET54@(Omr543 zz@yE!MYBqJY?x$;30=N*$EV;FibU?iR?omj4IJ}0epiMJFhBrXK@GNp#yfE#c{o`Nw3y0V3!$Rn6 Q!~g&Q07*qoM6N<$f*pxotN;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;%5Ln#Y_iLh}zA;mhx4R1ivvEsN2T+u=z$3Dlfr0NZ2s0kfUy%Y7 zWH0gbb!C6f!^$sj?#)oZI;u}B?$ z{niXbvHrr5#jI|fvEon0lw;xs7jLy4DPWz-S-^S6J0LKl zIVvD4DRqrQ@4_8>3(I*L4|#3>om!su?`CWpclTe}Ce`N^M_$ULTWm@b=-B#;=i$5^ zdFMYUYCY%eeBt!)?C~uw70Ms$WlY++9z`Tcm?+=6IlY1_D?7EdOQt~J^fQqQQ<%ek zYKm~?ipbq(^D?kFC=k;dyv_0Iq=eZmp3CG^WtIsa`{`FS=Mv8<&R*Ul-gg(~E!^Dq z5l&YQm7GEnG3!>jX-pxLz;Cc9OeY+bif#!kPKUL=%bZ*^qn9W=G*xt1Z4(3TL zJtli1Ww+1onU^0ITuqcZ`}0##fl7bi*&}|3^Ex-~S=ux!p@?(wiZX^z6E4k&3*hxB zICydA8--|l2KMlbvKYq`i!AC+Jr5GE=P#@L*RyRW!@+6)erwhpH1|EfO2M9kdm}Jv O7(8A5T-G@yGywqZ*50oG delta 883 zcmV-(1C0Fo1;z-F7zqdl000120{MrLAulrta7bBm000ie000ie0hKEb8vpBjmfBU!PGH^DRfwQ>`oXurmFOSD# zx!rEXMr@S-Zb0Gp`+ea{K&cTMHL)3Zy(UK6|qBdZVe?iS;Yf3U(_47dg!5|<*Mu;i zHoD7219=x{iiv&61cDqlM<(VGuH$_+R-^fUAzuR%bDbeZ3JQAdxFYg%#Ik`B%we~i ze_)^mQ`SUVZ{yzPSd0ApOzY8~u|lGnh*{PZ?HV#}-(pxnEI>nuVr--MEP1ln+|yc2 zEulptilI@|!rZqom(Ous>TNZq|GCS-UW+ylA>%RT{D^s=cbJLSWKJ6(*~mv+6dVOo z&Kw$mY$D$uV!)3|#N`!@Fh>D-UKC~?f5&1>jQ_I%|0X~#q>xA!mE%wn9O;RNAp@*@ zOF$MsqD&oPOu&qhXu{QOVeZnr zlGLG}ltKa;$wyYVHisN}5x9?IrFiM%d&+=l1V+tdcpc1xxRE@?_?qAlRuMSbJzBiZ zV?9dG+K6SQ&cG<1mCQGknmfclkzHrtCvh1#o6Er2yt#p8`2*)Y;jl7~TT;MUX=7fku!nFT@Pek4m3)m#5JNMC9x#csw6WvwYVfP zw}8ROz{pq^MUNRokN9oVz{yOEne}R(E{-7@=R+@@&lYwRVgKOi?bX>HcAHhykw556 zmFA<3MjK7rpKbCibN|2}@G5SVxud7j(i>Hr*Vs&^t1UZvm;E2JoXH}$m?gRu-4Pd? z+vaS_^!Sx*e*WaM<7(WeKixDxQ*B(sxo!UbxBM>)%w{>;2(pMqU^r@Em0*N?aB z_s;CUvh?NL*)Nj6UOsrI&pVs5ZT^lmJO?kVIvsBum2vRtw^r|6&n|iFx%4Yyuf09j zN4f6H;`K~#KWfV@di9C1-nG5a(B*f$aBliXy)=RS&!sY6&M{;CpmWT`CNSSLYl>pC zsl33>T_<<4PjFfD(ns%^h5WR}Pk)kk zkMT(+m6LW;@=9iW^G@O4ba&N8)rq+$N>**iYt<5-!?(-sb9v^vMZD@L;<04`cBpemYZ0N@&Fj3IuRd=Rjo%H-t)mu-@V>%r> z&gU4Z&WgJ%P_G&D(0I0a{`^}a#U0ikoN9g7MC+?7&Rxy>e)@c;z8k^iO-WAQGoN1( zd;R%Wk%tW9goLQO3P(*pw3G@etopb{Fu68lwh!yE_gda-XNW$zzwh|N%knHsOMQ~O z*dOYiKM}hAQOkurF-a;0)n~P>xBQ80ZB3s%bz_;!@+PjywZeDpZRUHrMkp*UiA-=* ztB`zqA%x{wqHUC%*oKySNn1FM{`s1>^>egT!oIsN?K^ImyUM<~779#j44$rjF6*2U FngEBBI*R}R delta 714 zcmV;*0yX{02fqi9Bn<>-K}|sb0I`n?{9y%=Aw?a;000ie0hKEb8vp)@Cdjj6`cqSL#E3RiEIJW?QpAwoC**V=i#XVP zKrD&}?ZA80Q6+Qr+xj_|)5&*S1_~-nqhg%vnrBP;tE?cy5?0uKAxmi4OqEA{l&s3t zdwf6;>g>F0$6x+b(NE4#K4 zr`=f$7EN$!_Ux5R*1#Ry%gU^t)KeK{T9%A=Hz@pFo|Pp|n}|V!sUVh@SdN!<{Id5r zr9u#6ELT-7SkkWxnHUBCIb-BOc2)JBCX=#tR%(UAWY~S57>hm%kGmap#T5?07*qoM6N<$f^4NZZ2$lO diff --git a/gfx/pokemon/front/sirfetchd.png b/gfx/pokemon/front/sirfetchd.png index e08bf8488b1bd0c22d2e007bb116fc1d3e957086..d4ab5b73f551b0574b113da4b4a55dc1b8338150 100644 GIT binary patch delta 830 zcmcc1GLv1gGr-TCmrII^fq{Y7)59eQNLzp~6Odpy9$S+<(a=@vFarbMVaDV6D^h@h z>?NMQuI$fwSh!iG7~Lg>fI^J&~Vq_rq zBSD~^sMHA0G+$o^Eg+kNft68+ff?i|AY@>aVqgWc85q16rNQiapfE!aqXtwF(4$Pk z2n|3v5bywEkUB6eAN1V>$o=Z+;uxZFKJ=V#hOnau`v=<@-g+C)=3Nw96Tih!fsJ1@ zrL;FUi_>Y=E?zbBt?SfmD~0^IRjWJXx&oH6Df+H5ote$QS9D?hvSra5(p^uS^cJ`k z>ug_e>G``eeLnXd8rt9cQ15Rc#k#H~cFpG)f78l+D{3EEelj~2seck2Y;E}9MAbWvb_G|o39UbowOh8-OJMneso2-{oBWyW`QN;e!nksR;;;S z9<{ml;Nqp0*6;3ErM_yhc&a1TGABMP=8yyDhvyG|?wF%+=MG~|oNV>ad6(jv;}Z|R z(7&&IWOc%#cH76!Qwn~*xVa_XN8HA2mOZOV)?>NtUzv+tt={@tA3il{uHi4a3-wR- z&poyJ-yA_}_nqCV!}p1vo_v)fvAEvv+WfXZ8vZ+yPZytZ30Zw6KrU`KOZCQ*%Ek{1 zO4FG5Cg0+jTNbd8LDz7v!*YRmuGhMSQK6c*8G{`sEva&6vXd^K@#nmG@QDsrciSd^ z*UET}BN^(4pKd(GeoTIS{`18@U5}l85*r`y_C{&3>C!8z&M7C0);qs!arf@ij(5>K zB*Ck0R&~VjTcj?_L3Oo=DFQbe_9iq;3}N`k_$R?P^x0^boFyt=akR{0H|;= A0RR91 delta 513 zcmbQqewW3tGr-TCmrII^fq{Y7)59eQNE?7K6OdrAxVi5akYY)9^mSxl*x1kgCy{lc zqHFyT1_r((j8nDwq=B;RC7!;n?9X`kI4xAG*37m83Nhvv`Gqi^UsOH|$aeO0aSYKo zKlPHm_hAPKwh!4ymntkYX`0>VD`4OFg)2`l^YGGtKN*~?e)2L+<6~RmEO=$5s;tik z>xhM0#ac>=N((OPs!g+ssolH9_x-hfxB2_(+n+zRWjVB9s=-tipBl#ZN;QmE@(X-E zh{h>>vS)Fr7i0g!#rWZ<;oa4RF3G11cWkSO`p;ouc8=S7%B<$U$C$1ZH>x$9<@%Qs zklCkqDrQSi)TISW??`ga`?4zi0qdGKD`zHf8LgbmT31xMckTCro{3*}P2TD0+>`XM zaCf}nSBZM%4{}YV&WbY}Lv7hNEy;Vsv`F;!9y^=$m|Oq_f)KXzJH!@Sk2j?LP{X4JfLL+}36s+W>?Oue~UA=J&er)_TYO*dEdBN{fx zHtVWrUJ;1(&igw_*l)cRQ`e=e`>A&S_tu=bmhHeV1q@x)iBp87jC2iw$RxzT(#q7# p%Gg}nz`)AD;6lx>#)${T)zD." - 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 zcmV+$1LXYr1?vcq7zqdl000120{MrLAuk{aa7bBm000ie000ie0hKEb8vp?>2K~!i%?UsR#;xG(E;dH+U9|<41*LPx0Q=gMKVJjAiCq-!+ z$DT<-%lT{L^v3*p^l!_@z^nNfcr_mbRj$|T>3lw?jj>e@Hz47c%jLu;Cu@umv&5F* zFg9Udx7+P;mqU!=R^%M^C1&L}QIESEVpx5LXETy^2JZKN``&`ySI$3_K4euB zdb1GAwKs@=rWC7qnVTW~4v^53>6#+Fm0=!cd#kTpSq#jqK9qJq#d!?Z2&zh2jI z>Sk&e@3B57wiu(n%FsYoyoVd1t%z4&Vfb&F+cq zVqprRus)^Jz(7zqLZ0000u*}nRbAuk{TVoOIv00T3Ga)VIka2^4F0ai&wK~yNurP94l0znW5@I5#}DW@E7U}9)|ggf*IY6B-bXsG;X zl*Sh@(b|T@a0QhKa0%Q?P*G@uT2N|YWvoDrp}4(qcMO5TO1JxEcV_fJ<`mGB16KJd6bWq<9^VE^FgU>wT#Zw%zLCB&we#+-k7k>|SdH#&Hxd6eI{`)C@!8c9MsvtiI R3$XwI002ovPDHLkV1iN-yU+jt 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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 delta 9033 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%0Dkea!)9xxJ7(ZQhCVSNG=QXcSIiPo3dAfTGY) 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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 zcmZ{gO-{ow5QUYXhVdpb$O~tec8%kquw~Njs!FY@^0&(+H~={U(i{MeP{ai|0!Qdk z7)mBWmH6zZ(P-@VWbe`#b>qmVuO{>9J41UlaOhMvZa5w5K_KYWp zms3Qx8A9E|i;PEyB;IEmJA~X2$tIqieu5hC8~A5!C`Zf#VmOk{5eq_$g(&{jaK2B_ dnSMj4>nNi}!Vl6X&E`ZReua5;D{N)`$2XHjR>uGU delta 403 zcmZ8cL2kk@5Ojh_oeQLN5Als-k(xNFd}t4K=q-u_B5>bN@POtCNPFQKRQ*7o&?oSe zt`i$o9eHfe&RDzd7uWmKQzSl%W0XCvgm`%sBf3t|CE8`kFeYq>l*N~!h+K4aXVFi* zv_YVWCy0v&nQkCg4aiicxyluIYyh?mKnq)$LYu46|0*ZX@v>sA{oz^7wH{j?vu zkDU>_jz>x=88kHsOfMi?}t!zQI?vGn!SPkn-!g9^9wymWw!tT diff --git a/gfx/tilesets/celeste.png b/gfx/tilesets/celeste.png index c888552d13f094434c43efb405e13f575a08549d..2a50e000988cb69ade04cf5ba5c701af1ad1ef54 100644 GIT binary patch delta 2314 zcmV+l3HA1%7?l!`B!35VNliru=L`rD4OV1ZP1_K>z@;j|==^1poj5 z24YJ`L;(K){{a7>y{D4^00?kNL_t(|oXwdHZX7!dgZGlXWPdN&hZN9)`-PO`nMv^s z7*582l1Ncb`}#Aq*Xz~xYQKN~zBFEKdbj?3+OFE|?4M$l`qx=ge5dn&{rdH{f1UL; zezp2mdu#5izxO6*>boA!UIsoDL^a$6R}I&I@MpKbJHPBu-)N_P=X~9NwM_|D_c;F? zKJ~rq)_uh9n}5{=Wg@_7X1jG0UBN?!oo0OuH^ebZ`P_+qkrw-~b)j&0da>+IBt}VFRQ3E=af$e*M z_Fp9cYk#&=0LGV(PuisG6ZjI3&zhj4dt`8)L7;4DQ&zhg%G#)NcR*)-CJE_VM+jZ3 z?Jfb>lVb7CO>fVrgA@b;In68M98olQF8JE?cU^y?3<-PO8?x!zueoRdl{{*k!Tq*?*9L0oQvc@H-NyjaOQiwJs*9{HBp4 z`*xlKXX?xV274la1}p(exmF-GINj*7jptIK6l?hKcw(rN zVt;0xBft}&r;?x~U~TWRzwT5J?hwFbsrpXBy0XorQ*!Isb>{~GPUPPaArV6jq=L9Q zm&!m#hD}dFRuGvnE~66o3ewg1F=otog5MF2{xI$u|JPN+38DhzE+-($&}})m(^Ie= z2~NiX&J=ayPX@Bg) zTP(|vvgWD;yE8~K5`my~;CITA&Py^rfxaaGU*8)A;2o*}938P}ha-TJ;7x`OI0ALr z$U1dcL2)WT&^pj3*-vs?L8G4zP=4DI;6y1q1)!}u-<1QZ%eOHB=RoXUmi$iO6EJ#D zmoZbOcM8DoDf=sMDa*Jwy#bz90DqU|4tQ4%=)0Dkzy74U#K5TYuBN1YjtGtbdhQ)? z-N>^$(kIY6CF}^WeFIDcP{MWgIt7UGza_xLwA3764ji}dlnmXt0nib)>stc+gaQzo zM1-W)AF-K0bTx0=P6Iiep@7~6eY&UmlptU2Q~{V^rwX8RdY{gBng2m@J%5mmMst= zdvtzP0!V^XZ}l==|5OR!T?CkC>U;;d^OyBI5kU7O0!)5S1aPl;Du0=ie}|1DN&8oT zI;f*Fz=6M2fK3@leM1gPX3Au)*K<1?U4|m317mb-H5>>z=lwR1BNl-@&2fib4Qh*ax<Aq-~`~V1h~dWmO4V<^_%|8EbhQhL~&WqAUid1zHc9aZh!KjyT2pATLJF$Eddy~ zQvy&KI?x>{7=JW9%hmJ_{El2Iy>9K*xOVn+_iG$%EcF)+jB8VXuXNX3KvJXQljOT> zx!csvPU@W`^PJ>=%HT?pG)_LgPn$qVYbFDxkpWP~^Up}@fMko?*JTcUV6fFz2b|k? zLIB3%lmH3r8cUJuXNTLXHf%C85x{}Vp5_%ut$_~2lz%m;Hm1yP>fsRp+)FaDt~>I% z`(6B#gloJQV z8=3FsD}QhuNnD1z=4v(nDsgWQ1+N2=>!!0h;JN=w;%weo1fTal@(6Swr_T8bSbDg1 zWN-nc#J{EP_4%JQ39yq#+)uO(@btMG6ItHAyNf3SX}}!?*w+5dTcFNOC4kOT*3}m0 kcOpPif`2`q#%|w#Q9C~kwDy{m00000NkvXXt^-0~f;~7?`v3p{ delta 3099 zcmV+$4CM2b5}+86B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ie z000ie0hKEb8vpf#&@u5Gnm<-@MNb6{7XbJjlnVDDFO_LYEr+}j_pIh&&0 zxtmwP{%PtS3RVpio50jNR&mr?q1^+l^v+h_S$*a}E9`4?y|atGo`pIv=T?gQ`kjNd zbLj(pjn&5f+kbn(E#JObI~KeV@9xiB9gITF zcgQvcV(=O7z>|4M)(-rNb`EQz%be4_v(-Q6?cQFiGk={i=bYfTrt^C~Ag|~3oaSLO z&KUH4)+1rd5y)-5?>?iCI5-O4wEHq+U=;_{HSSO8vvYJd)(GqFrw!C_R{sp^k*{D= z7kf0e0?rD~i%)H@yYCixf`wODP>iijw4KF(!@-}>mDO3C13znIuDh?lco)w~>wEU< z;vPK(tbYmEtZ$4x)HgA4$31W((58Z|A~UA6CWHSeO-*(COXno6``YU>PpGT!8F8lW zJ2PMhY@i*Q3ti(=uvOcGA6ks}--K!e&iwe;1HV12v8~|uha6_Jj`&+8t>N$1GrDtD zgEP2Z#mKZZmR{oT?z1rK3VS%`3VJ@mX^q4APk;Y#0Upu=UHRSn0yuoNafk!C@5T8L zT^rvS@SkaNRx_Z1wLO3wXDr6U^jlMV`#wW^6zX)wi4WhqbT8BH{u4)&!}t4Zg*9@R zm!h9obHtd|5pC$!66~!tv97uTE4|BMj~ItIZ>2fAIBa6gXK|h>(E2iCnBz=SW9F2< z`hN!U7N4R2DE{G7<0pUjHcyVeA3o8-+S)=*I2; z#?$NH#J=Fe@56H*Fcz(?y7Tr$`p#t$uz$O>6^-@M5gX}e?O@F@PTv{Ue?%LDm2Pu=kun`ta#VZ(=#?oT0V!p^YcEd^;SsSL)Tnv=KOfP2Kmw_`v*h zJCrf{SLi#7nK(-|c%k)K)48EJXnGqj{Zu_ed#e%WU`A>?E8xfGy-iw+I_Ay0yMNU_ z?En2vd4d*kSm@=nIeWq8f#z_+9%}mv&NOxBeN}_sCeN~}InVB1ziVHD+9$2STHPF8 zfDclRgspD;SsWO9G`{CdTi0l1?jMy|Z>4wOt4!O9`oAJD?~VQHPPI>;HtQLS_Uy>= zzXtl1Bfgz|gXWt`eEn$i)YJuH+kZoQW2=o{`LCF9?8W}8TF&Qe(0N&R7UAsHTGgF2 zhP8JJ*zG^;i7?E1hw*QGItbM znmM5L3o(VuQ3`dGN1^taJPNTrxAzO!i!tpnAO1b(D0Iq^z>U4{o`bwAp+2aO!EV}p zWAV-PPAiYn9BL@cF=f`BKD2Yxr!?Pw+8d|e_0;(ETLawJztT4`VMP;W@|jlHUx|Hy zp{upa%=M5xtos$%SAVsg6`yNyZSDH4fmV!hCVML8iZRVq^eeTKBlw^_R(|c(AE!C6 zftdUXw+0tNKL_vO6!*rvR_j+9SJ*KD4u}sGYU5nXBm6Zk}^C z&VGn~>q2WZ_S2sM4(I#oH{|xW?-@B7zE|19ZxnI#W$o{jxqs}jcP?ha|NC6Of8UG; z?A9vStTlb$4AfG0jeZt#raTM1nGMao!dXqv=Xnrqo`XGnpUD&ay>N#Cbl1DMD>?%? z>>XA*^clo(NsT4fTCCfzYkEE+{|}s-b9qOc3DFMhoza-);WHn;o4CTnY7+rl^IKef zg#$JR@gS^up?`d-*!w9cwawnnNWSZ-+oSOaU}J3@v`5+5&$!C*E|^1&%{xakAG+u_ z2fF4kryNB;=p*qiq$9P>cw=@#9C_e+_G)}>Xlaal{b*}m;SAORYwc=aSB$mBPK0&i zTMJre)~__C`x#>meYd{}{P0FBSiN~G@HGy-i~YK^Y>mmwXoy&B{R-?*jbZfZ{yrU>z5g0u413B!knvzSyujCe_uZM z@(VBrnSb4$`4^1D5(7 zR)6M;z}}i1WYz|3eDeD8um^I@pIX=(?`7%72ldZd^qq6-EA!=kl+MT6-tJlJZ~wD? z?VLXI(Aq$uZs-ePB)VjB7pSM01w;5Xg7V zE2w8p_q+MZs{a|*=jLCQqsUEIA45L$mwy#2`wD8o^mlKKuH8dz?Jd~ovx-COudQ*@ zZY^ui*hi&#SM$|2`^(A(A9e=qz^}Z@Be@=|vI8GAJ-Ax?mHrb@OQC=FmFb&kYfMF7 zq2`&sI^+Gn2KtrSuhwUIGPw`o=nrqnOS&D^tE`fBIm7;MMtaJ@vq-rmG$vp#y&s}FYfAb;z#_F1jT zoVod(`w_T5^UpM>vDFU`{cqtgA7u9{pR!_Qcc2yeI{faEjr9Q`^z#x{wANW%edO$B zruRxF%|E-Z(zxEonI@if?RSpBZXCwDoN?yA%3Z+-$AGuosqyVJvZA>aZ1@T`Xq@>I p^BXI(?&N>v-{~E{e*OCAKNR80^?G1Sz}o--002ovPDHLkV1i;Hk4*po diff --git a/gfx/tilesets/ship_port.png b/gfx/tilesets/ship_port.png index fa5bbb27eff172f179b95115491687f69f3262d6..b2882abde708e5d6cdb345918883752c66a68266 100644 GIT binary patch delta 1340 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/@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