From 4f9c581eeb524235dfc44e1487cbede1c29036e2 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Wed, 20 Sep 2023 20:12:29 +0100 Subject: [PATCH] New back sprites! Updated back sprites have been added for Galarian Rapidash and Weezing, Alolan Dugtrio and Muk, and Tangrowth! Also fixed an issue where Omegadge had 3 less base speed than it should, putting it just below Gawarhed in terms of BST. Oops. --- constants/pokedex_constants.asm | 2 +- constants/pokemon_constants.asm | 2 +- data/pokemon/base_stats.asm | 2 +- .../base_stats/{kokana.asm => gentlarva.asm} | 2 +- data/pokemon/base_stats/omegadge.asm | 2 +- data/pokemon/names.asm | 40 +++++++++--------- gfx/pokemon/back/dugtrioab.png | Bin 448 -> 628 bytes gfx/pokemon/back/mukab.png | Bin 546 -> 591 bytes gfx/pokemon/back/rapidashgb.png | Bin 577 -> 639 bytes gfx/pokemon/back/tangrowthb.png | Bin 555 -> 624 bytes gfx/pokemon/back/weezinggb.png | Bin 531 -> 654 bytes 11 files changed, 25 insertions(+), 25 deletions(-) rename data/pokemon/base_stats/{kokana.asm => gentlarva.asm} (85%) diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index d7dc9399..ceb581f3 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -43,7 +43,7 @@ const DEX_WEEDLE ; 13 (037) const DEX_KAKUNA ; 14 (038) const DEX_BEEDRILL ; 15 (039) - const DEX_GENTLARVA ; (040) + const DEX_GENTLARVA ; (040) const DEX_PUPAL ; (041) const DEX_CARAPTHOR ; (042) const DEX_KOTORA ; (043) diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index bbbc7c44..448b0c36 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -221,7 +221,7 @@ const ELECTIVIRE ; $D4 const MAGMORTAR ; $D5 const DISTURBAN ; $D6 - const GENTLARVA ; $D7 + const GENTLARVA ; $D7 const PUPAL ; $D8 const CARAPTHOR ; $D9 const MAGNEZONE ; $DA diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 56edcab1..f4deebff 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -39,7 +39,7 @@ INCLUDE "data/pokemon/base_stats/butterfree.asm" INCLUDE "data/pokemon/base_stats/weedle.asm" INCLUDE "data/pokemon/base_stats/kakuna.asm" INCLUDE "data/pokemon/base_stats/beedrill.asm" -INCLUDE "data/pokemon/base_stats/kokana.asm" ; Gentlarva +INCLUDE "data/pokemon/base_stats/gentlarva.asm" INCLUDE "data/pokemon/base_stats/pupal.asm" INCLUDE "data/pokemon/base_stats/carapthor.asm" INCLUDE "data/pokemon/base_stats/kotora.asm" diff --git a/data/pokemon/base_stats/kokana.asm b/data/pokemon/base_stats/gentlarva.asm similarity index 85% rename from data/pokemon/base_stats/kokana.asm rename to data/pokemon/base_stats/gentlarva.asm index ebb2059d..8d2ed7df 100644 --- a/data/pokemon/base_stats/kokana.asm +++ b/data/pokemon/base_stats/gentlarva.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 54 ; base exp - INCBIN "gfx/pokemon/front/kokana.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/gentlarva.pic", 0, 1 ; sprite dimensions dw GentlarvaPicFront, GentlarvaPicBack db LEECH_LIFE, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/omegadge.asm b/data/pokemon/base_stats/omegadge.asm index d1416bcc..a3cd8462 100644 --- a/data/pokemon/base_stats/omegadge.asm +++ b/data/pokemon/base_stats/omegadge.asm @@ -1,6 +1,6 @@ db DEX_OMEGADGE ; pokedex id - db 101, 106, 120, 25, 95 + db 101, 106, 120, 28, 95 ; hp atk def spd spc db STEEL, STEEL ; type diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 5e8e71c4..94a58605 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -30,7 +30,7 @@ MonsterNames:: db "BLASTOISE@" db "PINSIR@@@@" db "TANGELA@@@" - db "GAWARHED@@" + db "GAWARHED@@" ; Gyaoon db "NIDOREIGN@" db "GROWLITHE@" db "ONIX@@@@@@" @@ -49,25 +49,25 @@ MonsterNames:: db "PSYDUCK@@@" db "DROWZEE@@@" db "GOLEM@@@@@" - db "BALUMBA@@@" + db "BALUMBA@@@" ; Barunda db "MAGMAR@@@@" db "BUU@@@@@@@" db "ELECTABUZZ" db "MAGNETON@@" db "KOFFING@@@" - db "RAMOOSE@@@" + db "RAMOOSE@@@" ; Deer db "MANKEY@@@@" db "SEEL@@@@@@" db "DIGLETT@@@" db "TAUROS@@@@" db "TRAMPEL@@@" - db "GAVILLAIN@" + db "GAVILLAIN@" ; Crocky db "BLOTTLE@@@" db "FARFETCH'D" db "VENONAT@@@" db "DRAGONITE@" - db "CACTORMUS@" - db "SHARPOON@@" + db "CACTORMUS@" ; Cactus + db "SHARPOON@@" ; Jagg db "WIGLETT@@@" db "DODUO@@@@@" db "POLIWAG@@@" @@ -80,7 +80,7 @@ MonsterNames:: db "KRABBY@@@@" db "CHEEP@@@@@" db "JABETTA@@@" - db "VULPIII@@@" + db "VULPIII@@@" ; Mikon db "VULPIX@@@@" db "NINETALES@" db "PIKACHU@@@" @@ -93,8 +93,8 @@ MonsterNames:: db "KABUTOPS@@" db "HORSEA@@@@" db "SEADRA@@@@" - db "MINISTARE@" - db "IGUANARCH@" + db "MINISTARE@" ; Bawligua + db "IGUANARCH@" ; Cryithan db "SANDSHREW@" db "SANDSLASH@" db "OMANYTE@@@" @@ -114,13 +114,13 @@ MonsterNames:: db "WEEDLE@@@@" db "KAKUNA@@@@" db "BEEDRILL@@" - db "LUXWAN@@@@" + db "LUXWAN@@@@" ; Madaamu db "DODRIO@@@@" db "PRIMEAPE@@" db "DUGTRIO@@@" db "VENOMOTH@@" db "DEWGONG@@@" - db "TRICULES@@" + db "TRICULES@@" ; Purakkusu db "PENDRAKEN@" db "CATERPIE@@" db "METAPOD@@@" @@ -133,8 +133,8 @@ MonsterNames:: db "MEWTWO@@@@" db "SNORLAX@@@" db "MAGIKARP@@" - db "COINPUR@@@" - db "OMEGADGE@@" + db "COINPUR@@@" ; Konya + db "OMEGADGE@@" ; Omega db "MUK@@@@@@@" db "DECILLA@@@" db "KINGLER@@@" @@ -155,13 +155,13 @@ MonsterNames:: db "BULBASAUR@" db "VENUSAUR@@" db "TENTACRUEL" - db "ORFRY@@@@@" + db "ORFRY@@@@@" ; Gyopin db "GOLDEEN@@@" db "SEAKING@@@" db "KOTORA@@@@" db "GAOTORA@@@" db "GOROTORA@@" - db "KOLTA@@@@@" + db "KOLTA@@@@@" ; Puchikoon db "PONYTA@@@@" db "RAPIDASH@@" db "RATTATA@@@" @@ -173,7 +173,7 @@ MonsterNames:: db "AERODACTYL" db "BLASTYKE@@" db "MAGNEMITE@" - db "SQUEAMATA@" + db "SQUEAMATA@" ; Skimper db "GOROCHU@@@" db "CHARMANDER" db "SQUIRTLE@@" @@ -200,12 +200,12 @@ MonsterNames:: db "LICKILICKY" db "TANGROWTH@" db "KLEAVOR@@@" - db "BELLIGNAN@" + db "BELLIGNAN@" ; Tsubomitto db "STEELIX@@@" db "BLISSEY@@@" db "HITMONTOP@" db "CROBAT@@@@" - db "MIMMEO@@@@" + db "MIMMEO@@@@" ; Animon db "BELLOSSOM@" db "PORYGON2@@" db "KINGDRA@@@" @@ -213,8 +213,8 @@ MonsterNames:: db "SLOWKING@@" db "ELECTIVIRE" db "MAGMORTAR@" - db "DISTURBAN@" - db "GENTLARVA@" ; Gentlarva + db "DISTURBAN@" ; Taaban + db "GENTLARVA@" ; Kokana db "PUPAL@@@@@" ; Kasanagi db "CARAPTHOR@" db "MAGNEZONE@" diff --git a/gfx/pokemon/back/dugtrioab.png b/gfx/pokemon/back/dugtrioab.png index 55f3366169f340f879c004cdd9683557e8298b76..3757931b3d99a5d54e6a32b7945f951db73c56ea 100644 GIT binary patch delta 469 zcmX@W{Doygn$}?k2EN0L$MaXDFfcH%mw5WRvOnh(5oXta&o^}nP>3sNC;MZU`<}b6eR2b%Y&{lz3o7PE04<10 zjqptK^<~fkvN;%78HE^_LDm8x1EUlJE11o|;Ke8nX9qEAK-DlYFfa)t)C1LmfCmr* zbwgx4s(09nzqss`jP*j{8_f0F{~u=07G9OIZ%*$zke5AO{an^LB{Ts5GMbbO delta 310 zcmeyua)5b4TKy3Q2EHSVQ?>b|85kJYOFVsD*`Kp;@QPXPd9u(FDAe!i;us=vIr#@a zE02odz7N(865s9rOlLQK_5Xi8U+`z4V-<|4f8rPu|5URB>8+>aj#PZ-J9T4k)>W-% z+zxCL;!=~t`P0^H`G1#R@M9Hw;+ii}Q+d*KxT7p3&&-gtTr`a-ZHZf{AERNI-&rpn zM#D=%;eISeO6li#e7Sl4ofnuUCM6|x=>L305uP`lpEMcXvYoLF*gG?9;shyi6I}y~ z5JO`tBO@zQb8Q0yD+7bLmfnpM4@!k&kKYk@ z7+P8xSXddFY8x0>85pc^ar!;+qLeolshg6&+<^vZl(+T>u*`SoFI8I0}LIwi9dtcltxapK3OtfQ+!|2Z66 zTfh3qv?ht0|HHSowf#^3vHR8aRjmsT{+HahHfpO;%ByGpdE^&|wYL4K|2h9*Rz`+n z#mdKI;Vst0Qtp~ivR!s delta 296 zcmX@lvWR7Z3NK5#qpu?a!^VE@KZ&dp6&pI|g_Boa zV7kWB%8AYD;wHKVmLZ15R>p=_hGyCZ237_JKQe09PCO`uO{&xMsNiHZ#?1Ofo-U3d z5|@*I@U!xSB*!HF`~Q^TcYWLbDD7AIo|S*ncWlWDt#%7LP|vpZ|LU+6Yk2;h-|*}I z>d>Tx|Ncu}`~QEdk;xT?BNbbfOsYt;}w+8(;mPz?m&YyN?apKQW8s2tx7U;Q;SOya|;-Z z42+C*4UqMiL5$n~bUw>W6%C1D znV0VC+?BTW6?@kIE3Z~<&9V!)zBcT7=<1w?XLF)nY|5Hy8KA;_M1y73$tb}MSx*b) z7wD}ORa_nR=Ra>!OPcP_|NJK+q*j?e{U5K8d@*FDz|Z#%$JVH>Q;dJ|-`Jy4w~%)& zyOhQ%Q$vF@Kxb)*N(foX9}(c?@%+qg?Bt|6omo;o*4g!{*y1Wlab|`^C)fJzoN&Js P7&;7|u6{1-oD!M&pI|g)kSm+!FyTXFb7c7q>0O|_|+2UWCA*|ddjyrC<+hWTKM z(TPcUziq#t3;qA4@Z8Ub95bE>XykHN9(!>~XeRGO;oPTRxC+%~efQ#Crp%VdlU}-If>em?%5cA!lihihhGGT^l2SiZf_eXZVvkSIUcG+u T_b2wifMM`-^>bP0l+XkK0*HU# diff --git a/gfx/pokemon/back/tangrowthb.png b/gfx/pokemon/back/tangrowthb.png index 265999d91138550acdc3ef3b9b54e5fdbcaccb69..5fe6b047706071e967f51dfca2b90379f0a38022 100644 GIT binary patch delta 382 zcmZ3@@_}W7%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf6gf)%*ndStnkdl$tqIDx(1fI zMg}2Eak7ak=!oVcwwt0hS9tCwV%GYX9TqEv;$TQp37? z;lTs8= z@70Ijho-(X_?^*aBe+E-{7mt|nb*DZM3%Q*JDZ?tk)x^ClN5hrVzW}Y8P@~Wr1OkR z6_p%CCi%bS*T%K3^)G@OCli`+b z^|>08kGKar?opU6`C{7UCrquaCmHVStm);pG@PluqU4bkFgO@IUHx3vIVCg!0M{aw AR{#J2 delta 311 zcmeysvYKUr3NK5#qpu?a!^VE@KZ&dp6&pI&la*IP zro4IKsfo=hQbxK4mbwO}A%@0QCI(hUX4(b@Rt5&<_R2>l9u!BHHHFBQcQrnptj3sG zzuMEqF+}2W?Ri74Lk>-C%kE$I812bzHNzRPpL7D9uw4d=%#-&7bn> zfW>CD+-(tZ*8ll+K2~I~O^j(4ENLn?SMrVX@t(Ql-=Ql8-=C+;M(y2yeW9t!4P)7* zze0b6%@aA$cXOIgVQKO|jxOhHrU2V0&+KKNq#ch+30=R)`L17k&f2w;#ZFlSKRM7; yviZQ;oMS1COlDjRpE#FJJR99;yg7c}2WE%%71Jj#xDXEv2nJ7AKbLh*2~7ZKdUY}Y diff --git a/gfx/pokemon/back/weezinggb.png b/gfx/pokemon/back/weezinggb.png index 43c3d381bf100b878fb7dd2cb519d36aaa0d0694..b412d8c90a25cef809134ef621c9ef56fc6878a8 100644 GIT binary patch delta 407 zcmbQt(#JYMWul3b>|q85zQc^i^H-!WFfg!}c>21sKj#z?W;aM;n~^wivbwmXu8~2A zp{139xs{2zwt<0_fkB%AoAtztQr=jkzUS_12O6YN;u=wsl30>zRg#&TT3nKtTfkss zU}UUofUL&?VqBQP`;C*C7&Gf%dAc};NL)_-!OzO`fBvTbUF?ScuKut5|M&mr|2+Hu z*Khv+yZ(KB+xP$JU$6i9{dxYwfBtJ*|7Y9(Prp&0x%7X1_5c4oU!#KG);E;g{mk?8 zzr>LrpA4U{b4MIen_~EcX+q#deJQC`ssHCUW^T;R;0RD|e$mys&@s6Azp+fI4^RD9 z9#$hE7iT9|N1n3*(;5Wa7D$D)D})^vSg?+NQCzUAbEA^H^IoU0CW-mWcCoEx%KX3C z#XuuFmE*!kuV9PtwM>S7zF#9&GN!duZM3ptmUMSEadvKe_UFIE8YL-)PcP;F9cKUG g$g|^qp%Fv9*K*Y$W>I}$U@>^Q`njxgN?>dP08c2R1poj5 delta 281 zcmeBUoy;;pg_kAW(btiIVPik{pG4M)imtLp7#R4DFizFxlV)IGU@!6Xb!C6f!pSSI zv0p3p`NU>*aT8qw%Me3jD`P_|69a7n11kfA%Mos$Cmxi-Cbfw5pZ{bv#?1Q3o-U3d z5|^i*HRL;Fz|)$zxrs%1`imnm6ST~ZIH^8rwUue_d<{c8-fy%+@t# zE@dz0?<dl-YTs?8dS{F4m0<^OK)X)jVgNG2Niz*;>&h$_6okd|toi%Ku