From 89b0687a4b2dbc5a4f40906d9ca32f82cc6b9119 Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Tue, 18 Apr 2023 16:01:31 +0100 Subject: [PATCH] Kokana line base stats Also adds Dragonair's and Nite's Yellow catch rates, and rewords Taaban's entry slightly --- data/pokemon/base_stats/carapthor.asm | 26 +++++++++++++++++++ data/pokemon/base_stats/dragonair.asm | 2 +- data/pokemon/base_stats/dragonite.asm | 2 +- data/pokemon/base_stats/kasanagi.asm | 21 +++++++++++++++ data/pokemon/base_stats/kokana.asm | 21 +++++++++++++++ data/pokemon/base_stats/mrmimeg.asm | 26 ------------------- .../base_stats/{ => unused}/missingno.asm | 0 data/pokemon/base_stats/{ => unused}/para.asm | 0 data/pokemon/new_dex_text.asm | 8 +++--- 9 files changed, 74 insertions(+), 32 deletions(-) create mode 100644 data/pokemon/base_stats/carapthor.asm create mode 100644 data/pokemon/base_stats/kasanagi.asm create mode 100644 data/pokemon/base_stats/kokana.asm delete mode 100644 data/pokemon/base_stats/mrmimeg.asm rename data/pokemon/base_stats/{ => unused}/missingno.asm (100%) rename data/pokemon/base_stats/{ => unused}/para.asm (100%) diff --git a/data/pokemon/base_stats/carapthor.asm b/data/pokemon/base_stats/carapthor.asm new file mode 100644 index 00000000..5e857b4e --- /dev/null +++ b/data/pokemon/base_stats/carapthor.asm @@ -0,0 +1,26 @@ + db DEX_CARAPTHOR ; pokedex id + + db 60, 85, 50, 60, 60 + ; hp atk def spd spc + + db BUG, FIGHTING ; type + db 45 ; catch rate + db 161 ; base exp + + INCBIN "gfx/pokemon/front/carapthor.pic", 0, 1 ; sprite dimensions + dw CarapthorPicFront, CarapthorPicBack + + db COMET_PUNCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, RAZOR_WIND, SWORDS_DANCE, MEGA_KICK, TOXIC, \ + BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, MEGA_DRAIN, \ + EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + SUBSTITUTE + ; end + + db BANK(CarapthorPicFront) + assert BANK(CarapthorPicFront) == BANK(CarapthorPicBack) diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm index 04bab83f..c2f43411 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/data/pokemon/base_stats/dragonair.asm @@ -4,7 +4,7 @@ ; hp atk def spd spc db DRAGON, DRAGON ; type - db 45 ; catch rate + db 27 ; catch rate db 144 ; base exp INCBIN "gfx/pokemon/front/dragonair.pic", 0, 1 ; sprite dimensions diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm index ffd0781b..2120f532 100644 --- a/data/pokemon/base_stats/dragonite.asm +++ b/data/pokemon/base_stats/dragonite.asm @@ -4,7 +4,7 @@ ; hp atk def spd spc db DRAGON, FLYING ; type - db 45 ; catch rate + db 9 ; catch rate db 218 ; base exp INCBIN "gfx/pokemon/front/dragonite.pic", 0, 1 ; sprite dimensions diff --git a/data/pokemon/base_stats/kasanagi.asm b/data/pokemon/base_stats/kasanagi.asm new file mode 100644 index 00000000..a2b80374 --- /dev/null +++ b/data/pokemon/base_stats/kasanagi.asm @@ -0,0 +1,21 @@ + db DEX_KASANAGI ; pokedex id + + db 45, 20, 50, 40, 30 + ; hp atk def spd spc + + db BUG, BUG ; type + db 120 ; catch rate + db 73 ; base exp + + INCBIN "gfx/pokemon/front/kasanagi.pic", 0, 1 ; sprite dimensions + dw KasanagiPicFront, KasanagiPicBack + + db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm + ; end + + db BANK(KasanagiPicFront) + assert BANK(KasanagiPicFront) == BANK(KasanagiPicBack) diff --git a/data/pokemon/base_stats/kokana.asm b/data/pokemon/base_stats/kokana.asm new file mode 100644 index 00000000..d6f3c65a --- /dev/null +++ b/data/pokemon/base_stats/kokana.asm @@ -0,0 +1,21 @@ + db DEX_KOKANA ; pokedex id + + db 40, 35, 30, 45, 25 + ; hp atk def spd spc + + db BUG, BUG ; type + db 255 ; catch rate + db 54 ; base exp + + INCBIN "gfx/pokemon/front/kokana.pic", 0, 1 ; sprite dimensions + dw KokanaPicFront, KokanaPicBack + + db LEECH_LIFE, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm + ; end + + db BANK(KokanaPicFront) + assert BANK(KokanaPicFront) == BANK(KokanaPicBack) diff --git a/data/pokemon/base_stats/mrmimeg.asm b/data/pokemon/base_stats/mrmimeg.asm deleted file mode 100644 index a11ee3a4..00000000 --- a/data/pokemon/base_stats/mrmimeg.asm +++ /dev/null @@ -1,26 +0,0 @@ - db DEX_MR_MIME_G ; pokedex id - - db 50, 65, 65, 100, 90 - ; hp atk def spd spc - - db ICE, PSYCHIC_TYPE ; type - db 45 ; catch rate - db 136 ; base exp - - INCBIN "gfx/pokemon/front/mr.mimeg.pic", 0, 1 ; sprite dimensions - dw MrMimeGPicFront, MrMimeGPicBack - - db CONFUSION, BARRIER, NO_MOVE, NO_MOVE ; level 1 learnset - db GROWTH_MEDIUM_FAST ; growth rate - - ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - METRONOME, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ - SUBSTITUTE, FLASH, BLIZZARD, ICE_BEAM - ; end - - db BANK(MrMimeGPicFront) - assert BANK(MrMimeGPicFront) == BANK(MrMimeGPicBack) \ No newline at end of file diff --git a/data/pokemon/base_stats/missingno.asm b/data/pokemon/base_stats/unused/missingno.asm similarity index 100% rename from data/pokemon/base_stats/missingno.asm rename to data/pokemon/base_stats/unused/missingno.asm diff --git a/data/pokemon/base_stats/para.asm b/data/pokemon/base_stats/unused/para.asm similarity index 100% rename from data/pokemon/base_stats/para.asm rename to data/pokemon/base_stats/unused/para.asm diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index 6b4e80af..cb72f731 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -391,11 +391,11 @@ _MonjaDexEntry:: _TaabanDexEntry:: text "It evolved after" next "biting a SLOWPOKE." - next "If it falls off" + next "While draining its" - page "its host, it will" - next "seek out a new" - next "SLOWPOKE to bite" + page "host's nutrients," + next "TAABAN injects it" + next "with potent venom" dex _HinaazuDexEntry::