From 027d9b4ee5496317e224c0153bb6773e73e8946a Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Sat, 22 Apr 2023 12:20:29 +0100 Subject: [PATCH] Kokana, Kasanagi and Carapthor! A three-stage Bug line that mirrors the Caterpie and Weedle lines, being an old design for Weedle's evolutions. Pudi, Hinaazu and Betobebii have been removed, though. --- constants/pokedex_constants.asm | 9 ++-- constants/pokemon_constants.asm | 54 +++++++++---------- crysaudio/cry_headers.asm | 11 ++-- data/pokemon/base_stats.asm | 9 ++-- data/pokemon/dex_entries.asm | 40 +++++++------- data/pokemon/dex_order.asm | 6 +-- data/pokemon/evos_moves.asm | 84 +++++++++++++++++++----------- data/pokemon/menu_icons.asm | 9 ++-- data/pokemon/names.asm | 6 +-- data/pokemon/new_dex_text.asm | 72 ++++++++----------------- data/pokemon/palettes.asm | 9 ++-- data/trainers/parties.asm | 22 ++++---- data/trainers/scaled_parties.asm | 16 +++--- data/wild/maps/Route2.asm | 6 +-- data/wild/maps/Route22.asm | 14 ++--- data/wild/maps/Route4.asm | 6 +-- data/wild/maps/ViridianForest.asm | 2 +- gfx/pics.asm | 12 ++--- gfx/pokemon/back/carapthorb.png | Bin 0 -> 559 bytes gfx/pokemon/back/kasanagib.png | Bin 0 -> 528 bytes gfx/pokemon/back/kokanab.png | Bin 0 -> 504 bytes gfx/pokemon/front/carapthor.png | Bin 0 -> 988 bytes gfx/pokemon/front/kasanagi.png | Bin 0 -> 761 bytes gfx/pokemon/front/kokana.png | Bin 0 -> 644 bytes 24 files changed, 185 insertions(+), 202 deletions(-) create mode 100644 gfx/pokemon/back/carapthorb.png create mode 100644 gfx/pokemon/back/kasanagib.png create mode 100644 gfx/pokemon/back/kokanab.png create mode 100644 gfx/pokemon/front/carapthor.png create mode 100644 gfx/pokemon/front/kasanagi.png create mode 100644 gfx/pokemon/front/kokana.png diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index 712538b4..2c03795c 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -43,9 +43,9 @@ const DEX_WEEDLE ; 13 (037) const DEX_KAKUNA ; 14 (038) const DEX_BEEDRILL ; 15 (039) - ; const DEX_KOKANA ; (040) - ; const DEX_KASANAGI ; (041) - ; const DEX_CARAPTHOR ; (042) + const DEX_KOKANA ; (040) + const DEX_KASANAGI ; (041) + const DEX_CARAPTHOR ; (042) const DEX_SPEAROW ; 21 (043) - Route 22 + Route 3 const DEX_FEAROW ; 22 (044) const DEX_EKANS ; 23 (045) @@ -78,7 +78,6 @@ const DEX_VULPIX ; 37 (072) const DEX_NINETALES ; 38 (073) const DEX_NINETALES_A ; (074) - const DEX_PUDI ; const DEX_GROWLITHE ; 58 (075) const DEX_ARCANINE ; 59 (076) const DEX_ARCANINE_H ; (077) @@ -169,10 +168,8 @@ const DEX_FARFETCHD ; 83 (162) - Routes 13-18 const DEX_MADAAMU ; (163) const DEX_SIRFETCHD ; (164) - const DEX_HINAAZU ; const DEX_DODUO ; 84 (165) const DEX_DODRIO ; 85 (166) - const DEX_BETOBEBII ; const DEX_GRIMER ; 88 (167) const DEX_MUK ; 89 (168) const DEX_MUK_A ; (169) diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 314f5f7a..7ec465b1 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -198,33 +198,33 @@ const WEEPINBELL ; $BD const VICTREEBEL ; $BE const MONJA ; $BF (new pokemon start here) - const PUDI ; $C0 - const SCIZOR ; $C1 - const RHYPERIOR ; $C2 - const ESPEON ; $C3 - const UMBREON ; $C4 - const LEAFEON ; $C5 - const GLACEON ; $C6 - const SYLVEON ; $C7 - const LICKILICKY ; $C8 - const TANGROWTH ; $C9 - const KLEAVOR ; $CA - const TSUBOMITTO ; $CB - const STEELIX ; $CC - const BLISSEY ; $CD - const HITMONTOP ; $CE - const CROBAT ; $CF - const ANIMON ; $D0 - const BELLOSSOM ; $D1 - const PORYGON2 ; $D2 - const KINGDRA ; $D3 - const POLITOED ; $D4 - const SLOWKING ; $D5 - const ELECTIVIRE ; $D6 - const MAGMORTAR ; $D7 - const TAABAN ; $D8 - const HINAAZU ; $D9 - const BETOBEBII ; $DA + const SCIZOR ; $C0 + const RHYPERIOR ; $C1 + const ESPEON ; $C2 + const UMBREON ; $C3 + const LEAFEON ; $C4 + const GLACEON ; $C5 + const SYLVEON ; $C6 + const LICKILICKY ; $C7 + const TANGROWTH ; $C8 + const KLEAVOR ; $C9 + const TSUBOMITTO ; $CA + const STEELIX ; $CB + const BLISSEY ; $CC + const HITMONTOP ; $CD + const CROBAT ; $CE + const ANIMON ; $CF + const BELLOSSOM ; $D0 + const PORYGON2 ; $D1 + const KINGDRA ; $D2 + const POLITOED ; $D3 + const SLOWKING ; $D4 + const ELECTIVIRE ; $D5 + const MAGMORTAR ; $D6 + const TAABAN ; $D7 + const KOKANA ; $D8 + const KASANAGI ; $D9 + const CARAPTHOR ; $DA const MAGNEZONE ; $DB const PORYGONZ ; $DC const ANNIHILAPE ; $DD diff --git a/crysaudio/cry_headers.asm b/crysaudio/cry_headers.asm index 10861e46..88c9a84c 100644 --- a/crysaudio/cry_headers.asm +++ b/crysaudio/cry_headers.asm @@ -45,9 +45,9 @@ PokemonCries:: mon_cry CRY_WEEDLE, 238, 129 ; WEEDLE mon_cry CRY_BLASTOISE, 255, 129 ; KAKUNA mon_cry CRY_BLASTOISE, 96, 256 ; BEEDRILL - ; mon_cry CRY_NIDORAN_M, 0, 0 ; KOKANA (incomplete) - ; mon_cry CRY_NIDORAN_M, 0, 0 ; KASANAGI (incomplete) - ; mon_cry CRY_NIDORAN_M, 0, 0 ; CARAPTHOR(incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; KOKANA (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; KASANAGI (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; CARAPTHOR (incomplete) mon_cry CRY_SPEAROW, 0, 256 ; SPEAROW mon_cry CRY_FEAROW, 64, 288 ; FEAROW mon_cry CRY_EKANS, 18, 192 ; EKANS @@ -80,7 +80,7 @@ PokemonCries:: mon_cry CRY_VULPIX, 79, 144 ; VULPIX mon_cry CRY_VULPIX, 136, 224 ; NINETALES mon_cry CRY_VULPIX, 136, 224 ; NINETALES_A - mon_cry CRY_GROWLITHE, 64, 129 ; PUDI + ; mon_cry CRY_GROWLITHE, 64, 129 ; PUDI mon_cry CRY_GROWLITHE, 32, 192 ; GROWLITHE mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE_H @@ -172,10 +172,9 @@ PokemonCries:: mon_cry CRY_SPEAROW, 221, 129 ; FARFETCHD mon_cry CRY_FEAROW, 25, 383 ; MADAAMU mon_cry CRY_SPEAROW, -112, 192 ; SIRFETCHD - mon_cry CRY_NIDORAN_M, 0, 0 ; HINAAZU mon_cry CRY_DIGLETT, 187, 129 ; DODUO mon_cry CRY_DIGLETT, 153, 160 ; DODRIO - mon_cry CRY_GRIMER, 255, 192 ; BETOBEBII + ; mon_cry CRY_GRIMER, 255, 192 ; BETOBEBII mon_cry CRY_GRIMER, 0, 256 ; GRIMER mon_cry CRY_MUK, 239, 383 ; MUK mon_cry CRY_MUK, 239, 383 ; MUK_A diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 342a3f25..48562536 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -39,9 +39,9 @@ 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" -; INCLUDE "data/pokemon/base_stats/kasanagi.asm" -; INCLUDE "data/pokemon/base_stats/carapthor.asm" +INCLUDE "data/pokemon/base_stats/kokana.asm" +INCLUDE "data/pokemon/base_stats/kasanagi.asm" +INCLUDE "data/pokemon/base_stats/carapthor.asm" INCLUDE "data/pokemon/base_stats/spearow.asm" INCLUDE "data/pokemon/base_stats/fearow.asm" INCLUDE "data/pokemon/base_stats/ekans.asm" @@ -74,7 +74,6 @@ INCLUDE "data/pokemon/base_stats/mikon.asm" INCLUDE "data/pokemon/base_stats/vulpix.asm" INCLUDE "data/pokemon/base_stats/ninetales.asm" INCLUDE "data/pokemon/base_stats/ninetalesa.asm" -INCLUDE "data/pokemon/base_stats/pudi.asm" INCLUDE "data/pokemon/base_stats/growlithe.asm" INCLUDE "data/pokemon/base_stats/arcanine.asm" INCLUDE "data/pokemon/base_stats/arcanineh.asm" @@ -165,10 +164,8 @@ INCLUDE "data/pokemon/base_stats/guardia.asm" INCLUDE "data/pokemon/base_stats/farfetchd.asm" INCLUDE "data/pokemon/base_stats/madaamu.asm" INCLUDE "data/pokemon/base_stats/sirfetchd.asm" -INCLUDE "data/pokemon/base_stats/hinaazu.asm" INCLUDE "data/pokemon/base_stats/doduo.asm" INCLUDE "data/pokemon/base_stats/dodrio.asm" -INCLUDE "data/pokemon/base_stats/betobebii.asm" INCLUDE "data/pokemon/base_stats/grimer.asm" INCLUDE "data/pokemon/base_stats/muk.asm" INCLUDE "data/pokemon/base_stats/muka.asm" diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index aabf1e26..30b25f44 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -191,7 +191,6 @@ PokedexEntryPointers: dw WeepinbellDexEntry dw VictreebelDexEntry dw MonjaDexEntry - dw PudiDexEntry dw ScizorDexEntry dw RhyperiorDexEntry dw EspeonDexEntry @@ -216,8 +215,9 @@ PokedexEntryPointers: dw ElectivireDexEntry dw MagmortarDexEntry dw TaabanDexEntry - dw HinaazuDexEntry - dw BetobebiiDexEntry + dw KokanaDexEntry + dw KasanagiDexEntry + dw CarapthorDexEntry dw MagnezoneDexEntry dw PorygonZDexEntry dw AnnihilapeDexEntry @@ -1668,13 +1668,6 @@ KleavorDexEntry: text_far _KleavorDexEntry text_end -PudiDexEntry: - db "PUPPY@" - db 1,0 - dw 270 - text_far _PudiDexEntry - text_end - MonjaDexEntry: db "VINE@" db 1,4 @@ -1759,18 +1752,25 @@ TaabanDexEntry: text_far _TaabanDexEntry text_end -BetobebiiDexEntry: - db "SLUDGE@" +KokanaDexEntry: + db "GRUB@" db 1,0 - dw 200 - text_far _BetobebiiDexEntry + dw 80 + text_far _KokanaDexEntry text_end - -HinaazuDexEntry: - db "BIRD NEST@" - db 1,4 - dw 200 - text_far _HinaazuDexEntry + +KasanagiDexEntry: + db "PUPA@" + db 2,7 + dw 220 + text_far _KasanagiDexEntry + text_end + +CarapthorDexEntry: + db "DAPPER@" + db 3,11 + dw 760 + text_far _CarapthorDexEntry text_end MagnezoneDexEntry: diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm index aaf810e2..0b97d190 100644 --- a/data/pokemon/dex_order.asm +++ b/data/pokemon/dex_order.asm @@ -191,7 +191,6 @@ PokedexOrder: db DEX_WEEPINBELL db DEX_VICTREEBEL db DEX_MONJA - db DEX_PUDI db DEX_SCIZOR db DEX_RHYPERIOR db DEX_ESPEON @@ -216,8 +215,9 @@ PokedexOrder: db DEX_ELECTIVIRE db DEX_MAGMORTAR db DEX_TAABAN - db DEX_HINAAZU - db DEX_BETOBEBII + db DEX_KOKANA + db DEX_KASANAGI + db DEX_CARAPTHOR db DEX_MAGNEZONE db DEX_PORYGONZ db DEX_ANNIHILAPE diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index d1ddf599..120b768a 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -203,7 +203,6 @@ EvosMovesPointerTable: dw WeepinbellEvosMoves dw VictreebelEvosMoves dw MonjaEvosMoves - dw PudiEvosMoves dw ScizorEvosMoves dw RhyperiorEvosMoves dw EspeonEvosMoves @@ -228,8 +227,9 @@ EvosMovesPointerTable: dw ElectivireEvosMoves dw MagmortarEvosMoves dw TaabanEvosMoves - dw HinaazuEvosMoves - dw BetobebiiEvosMoves + dw KokanaEvosMoves + dw KasanagiEvosMoves + dw CarapthorEvosMoves dw MagnezoneEvosMoves dw PorygonZEvosMoves dw AnnihilapeEvosMoves @@ -2547,17 +2547,17 @@ MonjaEvosMoves: db 40, NIGHT_SHADE db 0 -PudiEvosMoves: +;PudiEvosMoves: ; Evolutions - db EV_LEVEL, 16, GROWLITHE - db 0 +; db EV_LEVEL, 16, GROWLITHE +; db 0 ; Learnset - db 9, EMBER - db 12, LEER - db 15, TAKE_DOWN - db 21, AGILITY - db 30, FLAMETHROWER - db 0 +; db 9, EMBER +; db 12, LEER +; db 15, TAKE_DOWN +; db 21, AGILITY +; db 30, FLAMETHROWER +; db 0 ScizorEvosMoves: ; Evolutions @@ -2841,32 +2841,58 @@ TaabanEvosMoves: db 50, POISON_GAS db 0 -HinaazuEvosMoves: +KokanaEvosMoves: ; Evolutions - db EV_LEVEL, 18, DODUO + db EV_LEVEL, 7, KASANAGI db 0 ; Learnset - db 5, QUICK_ATTACK - db 11, FURY_ATTACK - db 20, DRILL_PECK - db 23, RAGE - db 27, TRI_ATTACK - db 32, AGILITY db 0 -BetobebiiEvosMoves: +KasanagiEvosMoves: ; Evolutions - db EV_LEVEL, 20, GRIMER + db EV_LEVEL, 10, CARAPTHOR db 0 ; Learnset - db 13, POISON_GAS - db 16, ACID - db 19, MINIMIZE - db 22, SLUDGE - db 28, HARDEN - db 33, SCREECH - db 37, ACID_ARMOR db 0 + +CarapthorEvosMoves: +; Evolutions + db 0 +; Learnset + db 12, COMET_PUNCH + db 16, PIN_MISSILE + db 20, DEFENSE_CURL + db 25, SWIFT + db 30, MEGA_PUNCH + db 35, SUBSTITUTE + db 0 + +;HinaazuEvosMoves: +; Evolutions +; db EV_LEVEL, 18, DODUO +; db 0 +; Learnset +; db 5, QUICK_ATTACK +; db 11, FURY_ATTACK +; db 20, DRILL_PECK +; db 23, RAGE +; db 27, TRI_ATTACK +; db 32, AGILITY +; db 0 + +;BetobebiiEvosMoves: +; Evolutions +; db EV_LEVEL, 20, GRIMER +; db 0 +; Learnset +; db 13, POISON_GAS +; db 16, ACID +; db 19, MINIMIZE +; db 22, SLUDGE +; db 28, HARDEN +; db 33, SCREECH +; db 37, ACID_ARMOR +; db 0 MagnezoneEvosMoves: ; Evolutions diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 368451eb..dd97cd8f 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -39,9 +39,9 @@ MonPartyData: nybble ICON_BUG ; Weedle nybble ICON_BUG ; Kakuna nybble ICON_BUG ; Beedrill - ; nybble ICON_BUG ; Kokana - ; nybble ICON_BUG ; Kasanagi - ; nybble ICON_BUG ; Carapthor + nybble ICON_BUG ; Kokana + nybble ICON_BUG ; Kasanagi + nybble ICON_BUG ; Carapthor nybble ICON_BIRD ; Spearow nybble ICON_BIRD ; Fearow nybble ICON_SNAKE ; Ekans @@ -74,7 +74,6 @@ MonPartyData: nybble ICON_QUADRUPED ; Vulpix nybble ICON_QUADRUPED ; Ninetales nybble ICON_QUADRUPED ; Ninetales-A - nybble ICON_QUADRUPED ; Pudi nybble ICON_QUADRUPED ; Growlithe nybble ICON_QUADRUPED ; Arcanine nybble ICON_QUADRUPED ; Arcanine-H @@ -165,10 +164,8 @@ MonPartyData: nybble ICON_BIRD ; Farfetch'd nybble ICON_BIRD ; Madaamu nybble ICON_BIRD ; Sirfetch'd - nybble ICON_BIRD ; Hinaazu nybble ICON_BIRD ; Doduo nybble ICON_BIRD ; Dodrio - nybble ICON_MON ; Betobebii nybble ICON_MON ; Grimer nybble ICON_MON ; Muk nybble ICON_MON ; Muk-A diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 4767cb2b..3a42a1a3 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -191,7 +191,6 @@ MonsterNames:: db "WEEPINBELL" db "VICTREEBEL" db "MONJA@@@@@" - db "PUDI@@@@@@" db "SCIZOR@@@@" db "RHYPERIOR@" db "ESPEON@@@@" @@ -216,8 +215,9 @@ MonsterNames:: db "ELECTIVIRE" db "MAGMORTAR@" db "TAABAN@@@@" - db "HINAAZU@@@" - db "BETOBEBII@" + db "KOKANA@@@@" + db "KASANAGI@@" + db "CARAPTHOR@" db "MAGNEZONE@" db "PORYGON-Z@" db "ANNIHILAPE" diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index 3b81b492..b7f79070 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -398,34 +398,34 @@ _TaabanDexEntry:: next "with potent venom" dex -_HinaazuDexEntry:: - text "One of the three" - next "heads is withdrawn" - next "upon evolution." +_KokanaDexEntry:: + text "Closely related to" + next "WEEDLE. Due to the" + next "lack of a horn," - page "It grows back in" - next "as the angriest" - next "head of DODRIO" + para "it hides under" + next "trees, gnawing" + next "their roots" dex -_PudiDexEntry:: - text "A very popular" - next "family pet, this" - next "affectionate" +_KasanagiDexEntry:: + text "While awaiting" + next "evolution, it" + next "barely moves. If" - page "#MON shoots" - next "out tiny embers" - next "whenever it barks" + page "threatened, it" + next "shudders while" + next "throwing punches" dex -_BetobebiiDexEntry:: - text "Though it has a" - next "cute appearance," - next "it constantly" +_CarapthorDexEntry:: + text "Often called the" + next "Forest Gent," + next "CARAPTHOR strolls" - page "emits an foul" - next "odor that deters" - next "anyone around it" + page "around forests" + next "with swagger, to" + next "BEEDRILL's ire" dex _ScizorDexEntry:: @@ -998,36 +998,6 @@ _TaurosPADexEntry:: next "its horns" dex -_KokanaDexEntry:: - text "Closely related to" - next "WEEDLE. Due to the" - next "lack of a horn," - - para "it hides under" - next "trees, gnawing" - next "their roots" - dex - -_KasanagiDexEntry:: - text "While awaiting" - next "evolution, it" - next "barely moves. If" - - page "threatened, it" - next "shudders while" - next "throwing punches" - dex - -_CarapthorDexEntry:: - text "Often called the" - next "'Forest Gent'," - next "CARAPTHOR strolls" - - page "around forests" - next "with swagger, to" - next "BEEDRILL's ire" - dex - _MissingNoDexEntry:: text "This is a newly" next "discovered" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index f6bfbdbd..6c1ec27a 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -40,9 +40,9 @@ MonsterPalettes: db PAL_YELLOWMON ; WEEDLE db PAL_YELLOWMON ; KAKUNA db PAL_YELLOWMON ; BEEDRILL - ; db PAL_YELLOWMON ; KOKANA - ; db PAL_YELLOWMON ; KASANAGI - ; db PAL_YELLOWMON ; CARAPTHOR + db PAL_YELLOWMON ; KOKANA + db PAL_YELLOWMON ; KASANAGI + db PAL_YELLOWMON ; CARAPTHOR db PAL_BROWNMON ; SPEAROW db PAL_BROWNMON ; FEAROW db PAL_PURPLEMON ; EKANS @@ -75,7 +75,6 @@ MonsterPalettes: db PAL_REDMON ; VULPIX db PAL_YELLOWMON ; NINETALES db PAL_CYANMON ; NINETALES_A - db PAL_REDMON ; PUDI db PAL_REDMON ; GROWLITHE db PAL_REDMON ; ARCANINE db PAL_REDMON ; ARCANINE_A @@ -166,10 +165,8 @@ MonsterPalettes: db PAL_BROWNMON ; FARFETCHD db PAL_BROWNMON ; MADAAMU db PAL_BROWNMON ; SIRFETCHD - db PAL_BROWNMON ; HINAAZU db PAL_BROWNMON ; DODUO db PAL_BROWNMON ; DODRIO - db PAL_PURPLEMON ; BETOBEBII db PAL_PURPLEMON ; GRIMER db PAL_PURPLEMON ; MUK db PAL_GREENMON ; MUK_A diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index eb3e92aa..7b6bcea4 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -87,25 +87,25 @@ YoungsterData: BugCatcherData: ; Viridian Forest db 6, WEEDLE, CATERPIE, 0 - db 7, CATERPIE, KAKUNA, WEEDLE, 0 + db 7, CATERPIE, KAKUNA, KOKANA, 0 db 9, VENONAT, 0 ; Route 3 - db 10, CATERPIE, WEEDLE, WEEDLE, 0 + db 10, CATERPIE, WEEDLE, KOKANA, 0 db 9, WEEDLE, KAKUNA, CATERPIE, METAPOD, 0 db 11, CATERPIE, METAPOD, 0 ; Mt. Moon 1F - db 12, BEEDRILL, 0 - db 10, METAPOD, PARAS, 0 + db 12, PARAS, 0 + db 10, KASANAGI, PARAS, 0 ; Route 24 - db 14, CATERPIE, WEEDLE, 0 + db 14, KOKANA, WEEDLE, 0 ; Route 6 - db 16, WEEDLE, CATERPIE, WEEDLE, 0 + db 16, KOKANA, CATERPIE, WEEDLE, 0 db 17, BUTTERFREE, 0 ; this is that one boss fight-like one, levelled down for learnset reasons ; Unused - this will be used in the Silph Gauntlet - db 62, SCIZOR, BEEDRILL, PARASECT, VENOMOTH, PURAKKUSU, KLEAVOR, 0 + db 62, SCIZOR, CARAPTHOR, PARASECT, VENOMOTH, PURAKKUSU, KLEAVOR, 0 ; Route 9 db 19, BUTTERFREE, BEEDRILL, 0 - db 20, WEEDLE, VENONAT, BEEDRILL, 0 ; holy shit why did they have an L20 Caterpie you psycho, weedle is barely acceptable... + db 20, KASANAGI, VENONAT, BEEDRILL, 0 ; holy shit why did they have an L20 Caterpie you psycho, weedle is barely acceptable... LassData: ; Route 3 @@ -325,7 +325,7 @@ EngineerData: ; Unused - used in celadon university db 36, GOLEM, 0 ; Route 11 - db 21, MAGNEMITE, 0 + db 21, MAGNETITE, 0 db 18, MAGNEMITE, MAGNEMITE, MAGNETITE, 0 FisherData: @@ -665,8 +665,8 @@ ChannelerData: db 33, JYNX, EXEGGCUTE, KADABRA, 0 StudentData: - db 6, PIDGEY, HINAAZU, 0 - db 4, CLEFAIRY, 0 + db 6, PIDGEY, RATTATA, 0 + db 6, CLEFAIRY, 0 FirefighterData: ; For Cerulean Gym diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index ea0bb9f3..7c812721 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -82,7 +82,7 @@ GiovanniData: ; is not scaled as he is always fought last ; Silph Co. 11F db $FF, 37, KANGASKHAN, 36, NIDOKING, 37, NIDOQUEEN, 40, PERSIAN, 42, RHYDON, 0 ; Viridian Gym - db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, PERSIAN, 48, NIDOKING, 50, RHYPERIOR, 0 + db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, GUARDIA, 48, NIDOKING, 50, RHYPERIOR, 0 LoreleiData: db $FF, 54, DEWGONG, 53, CLOYSTER, 54, GLACEON, 55, NINETALES_A, 55, BUU, 56, LAPRAS, 0 @@ -113,13 +113,13 @@ BlackbeltData: ; Koichi parties - unused to make space for rival teams db 12, MACHOP, HITMONLEE, HITMONCHAN, 0 ; 0 badges db 20, MACHOP, MANKEY, HITMONLEE, HITMONCHAN, 0 ; 1 - db 24, MACHOKE, MANKEY, POLIWHIRL, HITMONLEE, HITMONCHAN, 0 ; 2 - db 30, MACHOKE, PRIMEAPE, POLIWHIRL, HITMONLEE, HITMONCHAN, 0 ; 3 - db 40, MACHOKE, PRIMEAPE, POLIWHIRL, HITMONLEE, HITMONCHAN, 0 ; 4 - db 42, MACHAMP, PRIMEAPE, POLIWRATH, HITMONLEE, HITMONCHAN, 0 ; 5 - db 46, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, 0 ; 6 - db 49, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 7 - db 53, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 8 + db 24, MACHOKE, MANKEY, CARAPTHOR, HITMONLEE, HITMONCHAN, 0 ; 2 + db 30, MACHOKE, PRIMEAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, 0 ; 3 + db 40, MACHOKE, PRIMEAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, 0 ; 4 + db 42, MACHAMP, PRIMEAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, 0 ; 5 + db 46, MACHAMP, ANNIHILAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, 0 ; 6 + db 49, MACHAMP, ANNIHILAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 7 + db 53, MACHAMP, ANNIHILAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 8 db 67, MACHAMP, ANNIHILAPE, TAUROS_P, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; Silph Gauntlet ; Fighting Dojo Trainers db 31, CHEEP, CHEEP, JABETTA, 0 diff --git a/data/wild/maps/Route2.asm b/data/wild/maps/Route2.asm index fdcfd806..6a7b65a8 100644 --- a/data/wild/maps/Route2.asm +++ b/data/wild/maps/Route2.asm @@ -7,9 +7,9 @@ Route2WildMons: db 5, KONYA db 4, NIDORAN_F db 3, KONYA - db 5, NIDORAN_M - db 5, MONJA ; replace Monja with Kokana when added - db 6, MONJA + db 4, NIDORAN_M + db 5, KOKANA + db 6, KOKANA end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route22.asm b/data/wild/maps/Route22.asm index 093b9d48..772c7413 100644 --- a/data/wild/maps/Route22.asm +++ b/data/wild/maps/Route22.asm @@ -1,15 +1,15 @@ Route22WildMons: def_grass_wildmons 25 ; encounter rate db 5, RATTATA - db 3, NIDORAN_M - db 4, PUDI db 4, NIDORAN_M - db 2, RATTATA - db 4, MANKEY - db 3, SPEAROW - db 5, MIKON - db 3, NIDORAN_F + db 4, SPEAROW db 4, NIDORAN_F + db 3, RATTATA + db 4, MANKEY + db 4, MIKON + db 5, MIKON + db 5, NIDORAN_F + db 5, NIDORAN_M end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route4.asm b/data/wild/maps/Route4.asm index 650cd50b..a66fd3da 100644 --- a/data/wild/maps/Route4.asm +++ b/data/wild/maps/Route4.asm @@ -3,11 +3,11 @@ Route4WildMons: db 10, RATTATA db 10, PIDGEY db 8, KONYA - db 6, EKANS + db 10, EKANS db 8, SPEAROW db 10, EKANS - db 12, SANDSHREW - db 12, PUDI + db 12, MIKON + db 12, MANKEY db 12, MIKON db 8, MANKEY diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm index a7763455..dd4b037a 100644 --- a/data/wild/maps/ViridianForest.asm +++ b/data/wild/maps/ViridianForest.asm @@ -4,7 +4,7 @@ ViridianForestWildMons: db 6, WEEDLE db 6, CATERPIE db 5, PIDGEY - db 6, MONJA ; KOKANA + db 6, KOKANA db 6, WEEDLE db 8, KAKUNA db 8, METAPOD diff --git a/gfx/pics.asm b/gfx/pics.asm index 18e6167f..2c72fcc8 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -459,8 +459,8 @@ GyaoonPicFront:: INCBIN "gfx/pokemon/front/gyaoon.pic" GyaoonPicBack:: INCBIN "gfx/pokemon/back/gyaoonb.pic" OmegaPicFront:: INCBIN "gfx/pokemon/front/omega.pic" OmegaPicBack:: INCBIN "gfx/pokemon/back/omegab.pic" -PudiPicFront:: INCBIN "gfx/pokemon/front/pudi.pic" -PudiPicBack:: INCBIN "gfx/pokemon/back/pudib.pic" +KokanaPicFront:: INCBIN "gfx/pokemon/front/kokana.pic" +KokanaPicBack:: INCBIN "gfx/pokemon/back/kokanab.pic" ScizorPicFront:: INCBIN "gfx/pokemon/front/scizor.pic" ScizorPicBack:: INCBIN "gfx/pokemon/back/scizorb.pic" RhyperiorPicFront:: INCBIN "gfx/pokemon/front/rhyperior.pic" @@ -524,10 +524,10 @@ MagmortarPicFront:: INCBIN "gfx/pokemon/front/magmortar.pic" MagmortarPicBack:: INCBIN "gfx/pokemon/back/magmortarb.pic" TaabanPicFront:: INCBIN "gfx/pokemon/front/taaban.pic" TaabanPicBack:: INCBIN "gfx/pokemon/back/taabanb.pic" -HinaazuPicFront:: INCBIN "gfx/pokemon/front/hinaazu.pic" -HinaazuPicBack:: INCBIN "gfx/pokemon/back/hinaazub.pic" -BetobebiiPicFront:: INCBIN "gfx/pokemon/front/betobebii.pic" -BetobebiiPicBack:: INCBIN "gfx/pokemon/back/betobebiib.pic" +KasanagiPicFront:: INCBIN "gfx/pokemon/front/kasanagi.pic" +KasanagiPicBack:: INCBIN "gfx/pokemon/back/kasanagib.pic" +CarapthorPicFront:: INCBIN "gfx/pokemon/front/carapthor.pic" +CarapthorPicBack:: INCBIN "gfx/pokemon/back/carapthorb.pic" MagnezonePicFront:: INCBIN "gfx/pokemon/front/magnezone.pic" MagnezonePicBack:: INCBIN "gfx/pokemon/back/magnezoneb.pic" PorygonZPicFront:: INCBIN "gfx/pokemon/front/porygonz.pic" diff --git a/gfx/pokemon/back/carapthorb.png b/gfx/pokemon/back/carapthorb.png new file mode 100644 index 0000000000000000000000000000000000000000..256c1d817f6e124796321288ab7a98584dce5077 GIT binary patch literal 559 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+I9jdmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!Ib3f?!v%q+)~s54nJ@ErkR#;MwT(m+A>5>H=O_U9~O+>91g+Men_A;$b7zYxari^^vKIjSYD5hW>! zC8<`)MX5lF!N|bKSl7Tr*T^Wu(9p`j(8|3&pqPXa>VfJ& zzypXudcd@N(03Ccd%dTNV~E7%-t!x|4mt3!J@`LCX-CP*$<4*qou3^K9t_-v zz}5DG9elB}T)#xN@A#pX*Se0~@OsppBRmfut8=pa(frdO{h?#2x#42X8GCOT)Ervl zqjz{>o9m6B)k2jG%00WR^&IacGKN+}mdgcS-o|rQf6+$%9rB*@B~PDRyX(x>2T|`A z&wP-%Fyk$A)}plvn?)yDa`vdW@ulsa@Pv_F=~citk9L*6YF8fj-@o5*Y{`kj0R4GD Pr!#oE`njxgN@xNALlvHz literal 0 HcmV?d00001 diff --git a/gfx/pokemon/back/kasanagib.png b/gfx/pokemon/back/kasanagib.png new file mode 100644 index 0000000000000000000000000000000000000000..1c8d830f730d0c2eb1185bd234f560994cd5713e GIT binary patch literal 528 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+I9jdmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!Ib3f?!v%q+)~s54nJ@ErkR#;MwT(m+A>5>H=O_U9~O?53)#W%YA`LX7!Eej$wK7nRQfa#TxPBT7;d zOH!?pi&B9UgOP!ev95uMu8~oQfw`5bv6Zozwt<0_fkA6bfC-9*-29Zxv`X9>zA(N3 zIV&nP!ZXd+mq822=3roD6k=covKWDofl-P9!HZEE&JJSKfT{ro6q7JQJy0D8 zcmOd-515t@`VMl|1Wy;o5Q)plKloXBRE+oxoF&&VeoHteAIM&3@R)&_*`x1a|Fu=D z3bH)&!~REIWk{M6^*{eASG7R$|Mj7(e;rg>AGS8C=7)XrH7$jR8kSQLpBPVBd}2S9 zVA^ODBdO3cb>SINSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!Ib3f?!v%q+)~s54nJ@ErkR#;MwT(m+A>5>H=O_U9~O?D~2=k9h2WLX7!Eej$wK7nRQfa#TxPBT7;d zOH!?pi&B9UgOP!ev95uMu8~oQfw`3l5SeNl7+4t?l!@4YJc7`Wo1c=IR*6M}2}Hv} zyMB;Iqf#S0(|mmyw18|523AHP24*0O5eOL=r5He72C^8u7^UItAVv+S8lZkAVT5|1 zIuP&xVvrs%Eg$sV1jw%Nba4!kxSafhpOxoIvdn{aqmX9B9{YuS-vrz^nvGiy9uQzk zt4UAb*~)JC&b-4(;`y|;wqMN>q1p?1R)?-sOlZ4yYNg^ig|?`uRjau>6fKQIt}q_4 zm?kB4iXlmcmzOuS&B*D8BhSSP7asf%XtVG5s4j9!;gB`MVx?0o3pOlm1G<61)78&q Iol`;+0M~DMK>z>% literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/carapthor.png b/gfx/pokemon/front/carapthor.png new file mode 100644 index 0000000000000000000000000000000000000000..b773f773517ae52386c5414271edc7cc7355ff8b GIT binary patch literal 988 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBkX6F?Iu!J-2?}0tzwa7x{%So?lcx3&>F|ag8WR zNi0dVN-jzTQVd20M#j1ZCb~vOAqM7FCKgsEmf8jeRt5$R`*}a3Xvob^$xN%nt-kR1VRQzDF%?2fh-0uMrk-Zh*1No1{hFG!U*+1 zbs*pY#2`IjT0ZEz2~bsxr;B5V#`&q2H)ab5%CLX9|5ZpU^W&m>JGV7?^f+_t$u_;e zWHLFa=;YoeKfP(QF4jMYGF;%wv7t*kCCIN9j ze(HI)`#q9=_t);uZtJ@EI`)dhga0S3PQ2Qn*t+gy_r#Z*A0`Bc`A+W9n$*{CvwmK~ zE#Vgq{RQqXCT7f=!}h{ioLPSH6sAvHWe559=*a~!d`XsQ(D!IKYqR3TmRIGCXWp<{ z@YZZNVv3F~y0`%>2%D;ZDE1?0e1| zoxQ1Aw)EPsJ&#YE-}vL~L{HVkoYjwNZ4;6*WAjoT|c7m52mpRu(0 zY@pn+{0S8iThG*}s0-{`@>%KQj;z2F0-p0brark^G%d~a5U0h|%~O};c|5!L`N6$& zH(#gBl)9p&@G)UoUCqf@_F2>BygD>p{!R9osRyH4?^@R%NL(|KrQ_U9)|q@N=2w4A z`fa!Vh1p}CKE3cqC$ENPxxV>oE9!SA-@Z8=MJ=gSR-S2~M zm`r*1o|q|I6l3Rgxk}LeaKVnU?o+1Ac{jbvU}tdHoN{3C*=??yy{cxUbaKY-tE@U8 z{GHiMBlP!W*1b0(ee)U~eOqzI|L$9_`hPCHmK^t=-@Vgt`<>Jw#acHuot;}JlsN49 z_b$+*+G0=Jngzbb&TZxn2R`T&MeQ+oyWsER_#fQu*WVs?dXWRnSPTrFu6{1-oD!M< DOCE(x literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/kasanagi.png b/gfx/pokemon/front/kasanagi.png new file mode 100644 index 0000000000000000000000000000000000000000..129318f596b02f793f77d2a3514c4e621a6c5f01 GIT binary patch literal 761 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA?Bp57i?)wF#SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#KiG8eT9klma!rN?>5Hn!&&zUNC1@pbb!hDaqU2g@M_)rKkhQ<1Fxq zEM{QfI|9OtQ?>b|fr9KMp1!W^&soIS4Maa|ehoB{fib_xFNE>@qViclj%tZ(L`h0w zNvc(HQ7VvPFfuSQ)-^EEH8Kh@Ft;+Xure~#HZZUQ3F?cab!`VTM8c;RBfMOCxs0XS8 z0S_Ps=>gO7LElY)+)7Uu#}JM4t(W$DA9fI7{}7%nvMXXjv`az3#GIzdD?BgorM(n= z-@Q0k_RigwrUy!Vu~siq1h?4z=VY&Mn7leTywGc{g4d(U@|E^#do|@JeUICBT>0*`_g|QNkY6k0$Fb9@KZ9RJ^yN9-saqGNQsw^H=DgLHrlYETKNU83h<_C>Uj9ZZ zh5K`2r}EVD*)cb#`MU77ua;Ue;n39=EdrC;du#XvMOju^KI>5Xw&C4`mjx}iBZ@uj zZ`n&z8qnhDPwG|Cm3Iul&t}O*Omb S3D&&<#f+z`pUXO@geCymF$sGB literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/kokana.png b/gfx/pokemon/front/kokana.png new file mode 100644 index 0000000000000000000000000000000000000000..7f5b9b65aed0152315b66f280835f8afa0ffc37b GIT binary patch literal 644 zcmeAS@N?(olHy`uVBq!ia0vp^8X(LBBp4p6{ucmJEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4~rfxJHzu zB$lLFB^RXvDF!10BV%0y6I~;t5Cd~76ALR7OKk%KD+2?E{k)%1H00)|WTsW()?oN( zt3OafRBD80ny)W|7Ld)sz{)7Zzzk$D0wDvV6a&c1Ko)}+qcofy#HayP0}Lo8VT5|1 zIuP&xVvrs%Eg$sV1juFaba4!kxEyyR*>fcFc1B@wYwujn z?>uVXr7rwzJ~(&n3ZFF_9F$sTNkqTY2TO=iR|T$=xs8MON!+<3!;usyU)1%tL1s0)(Ma9auyr4 zEn#+wauN!=!`u)N5yvL__O!yvGQ-Gg<<}oQ=Kp(F>t>4fT0T%9dAj