From 64a9fdbf0032b1f7a5cd18ef0bd645c7abf7c197 Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Thu, 6 Apr 2023 12:29:09 +0100 Subject: [PATCH] A few Alolan forms! Adds Raticate, Raichu, Sandslash and Persian. Also updates Hitmontop's sprite. --- constants/pokedex_constants.asm | 8 +- constants/pokemon_constants.asm | 8 +- data/pokemon/base_stats.asm | 8 +- data/pokemon/base_stats/persiana.asm | 2 +- data/pokemon/base_stats/raichua.asm | 12 +-- data/pokemon/base_stats/raticatea.asm | 4 +- data/pokemon/base_stats/sandslasha.asm | 8 +- data/pokemon/cries.asm | 8 +- data/pokemon/dex_entries.asm | 32 ++++++ data/pokemon/dex_order.asm | 4 + data/pokemon/evos_moves.asm | 133 +++++++++++-------------- data/pokemon/menu_icons.asm | 8 +- data/pokemon/names.asm | 9 +- data/pokemon/new_dex_text.asm | 68 ++++++------- data/pokemon/palettes.asm | 8 +- engine/debug/debug_party.asm | 8 +- gfx/pics.asm | 8 ++ gfx/pokemon/back/hitmontopb.png | Bin 614 -> 576 bytes gfx/pokemon/back/persianab.png | Bin 0 -> 549 bytes gfx/pokemon/back/raichuab.png | Bin 0 -> 589 bytes gfx/pokemon/back/raticateab.png | Bin 0 -> 571 bytes gfx/pokemon/back/sandslashab.png | Bin 0 -> 582 bytes gfx/pokemon/front/hitmontop.png | Bin 612 -> 921 bytes gfx/pokemon/front/persiana.png | Bin 0 -> 916 bytes gfx/pokemon/front/raichua.png | Bin 0 -> 863 bytes gfx/pokemon/front/raticatea.png | Bin 0 -> 899 bytes gfx/pokemon/front/sandslasha.png | Bin 0 -> 957 bytes 27 files changed, 183 insertions(+), 153 deletions(-) create mode 100644 gfx/pokemon/back/persianab.png create mode 100644 gfx/pokemon/back/raichuab.png create mode 100644 gfx/pokemon/back/raticateab.png create mode 100644 gfx/pokemon/back/sandslashab.png create mode 100644 gfx/pokemon/front/persiana.png create mode 100644 gfx/pokemon/front/raichua.png create mode 100644 gfx/pokemon/front/raticatea.png create mode 100644 gfx/pokemon/front/sandslasha.png diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index 1804667d..df4b1b89 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -16,7 +16,7 @@ const DEX_TOTARTLE ; (009) const DEX_PIKACHU ; 25 (010) const DEX_RAICHU ; 26 (011) - ; const DEX_RAICHU_A ; (012) + const DEX_RAICHU_A ; (012) const DEX_GOROCHU ; (013) const DEX_EEVEE ; 133 (014) const DEX_VAPOREON ; 134 (015) @@ -29,7 +29,7 @@ const DEX_SYLVEON ; (022) const DEX_RATTATA ; 19 (023) const DEX_RATICATE ; 20 (024) - ; const DEX_RATICATE_A ; (025) + const DEX_RATICATE_A ; (025) const DEX_PIDGEY ; 16 (026) const DEX_PIDGEOTTO ; 17 (027) const DEX_PIDGEOT ; 18 (028) @@ -42,7 +42,7 @@ const DEX_KONYA ; (035) const DEX_MEOWTH ; 52 (036) const DEX_PERSIAN ; 53 (037) - ; const DEX_PERSIAN_A ; (038) + const DEX_PERSIAN_A ; (038) const DEX_PERRSERKER ; (039) const DEX_SPEAROW ; 21 (040) const DEX_FEAROW ; 22 (041) @@ -50,7 +50,7 @@ const DEX_ARBOK ; 24 (043) const DEX_SANDSHREW ; 27 (044) const DEX_SANDSLASH ; 28 (045) - ; const DEX_SANDSLASH_A ; (046) + const DEX_SANDSLASH_A ; (046) const DEX_NIDORAN_F ; 29 (047) const DEX_NIDORINA ; 30 (048) const DEX_NIDOQUEEN ; 31 (049) diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 893b597a..9c59af80 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -241,12 +241,12 @@ const MELMETAL ; $E8 const ARCANINE_H ; $E9 const ELECTRODE_H ; $EA - ; const RATICATE_A ; $EB - ; const RAICHU_A ; $EC - ; const SANDSLASH_A ; $ED + const RATICATE_A ; $EB + const RAICHU_A ; $EC + const SANDSLASH_A ; $ED ; const NINETALES_A ; $EE ; const DUGTRIO_A ; $EF - ; const PERSIAN_A ; $F0 + const PERSIAN_A ; $F0 ; const GOLEM_A ; $F1 ; const RAPIDASH_G ; $F2 ; const SLOWBRO_G ; $F3 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 2772c782..25108210 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -11,7 +11,7 @@ INCLUDE "data/pokemon/base_stats/wartortle.asm" INCLUDE "data/pokemon/base_stats/totartle.asm" INCLUDE "data/pokemon/base_stats/pikachu.asm" INCLUDE "data/pokemon/base_stats/raichu.asm" -; INCLUDE "data/pokemon/base_stats/raichua.asm" +INCLUDE "data/pokemon/base_stats/raichua.asm" INCLUDE "data/pokemon/base_stats/gorochu.asm" INCLUDE "data/pokemon/base_stats/eevee.asm" INCLUDE "data/pokemon/base_stats/vaporeon.asm" @@ -24,7 +24,7 @@ INCLUDE "data/pokemon/base_stats/glaceon.asm" INCLUDE "data/pokemon/base_stats/sylveon.asm" INCLUDE "data/pokemon/base_stats/rattata.asm" INCLUDE "data/pokemon/base_stats/raticate.asm" -; INCLUDE "data/pokemon/base_stats/raticatea.asm" +INCLUDE "data/pokemon/base_stats/raticatea.asm" INCLUDE "data/pokemon/base_stats/pidgey.asm" INCLUDE "data/pokemon/base_stats/pidgeotto.asm" INCLUDE "data/pokemon/base_stats/pidgeot.asm" @@ -37,7 +37,7 @@ INCLUDE "data/pokemon/base_stats/beedrill.asm" INCLUDE "data/pokemon/base_stats/konya.asm" INCLUDE "data/pokemon/base_stats/meowth.asm" INCLUDE "data/pokemon/base_stats/persian.asm" -; INCLUDE "data/pokemon/base_stats/persiana.asm" +INCLUDE "data/pokemon/base_stats/persiana.asm" INCLUDE "data/pokemon/base_stats/perrserker.asm" INCLUDE "data/pokemon/base_stats/spearow.asm" INCLUDE "data/pokemon/base_stats/fearow.asm" @@ -45,7 +45,7 @@ INCLUDE "data/pokemon/base_stats/ekans.asm" INCLUDE "data/pokemon/base_stats/arbok.asm" INCLUDE "data/pokemon/base_stats/sandshrew.asm" INCLUDE "data/pokemon/base_stats/sandslash.asm" -; INCLUDE "data/pokemon/base_stats/sandslasha.asm" +INCLUDE "data/pokemon/base_stats/sandslasha.asm" INCLUDE "data/pokemon/base_stats/nidoranf.asm" INCLUDE "data/pokemon/base_stats/nidorina.asm" INCLUDE "data/pokemon/base_stats/nidoqueen.asm" diff --git a/data/pokemon/base_stats/persiana.asm b/data/pokemon/base_stats/persiana.asm index 1414f153..762411d0 100644 --- a/data/pokemon/base_stats/persiana.asm +++ b/data/pokemon/base_stats/persiana.asm @@ -1,4 +1,4 @@ - db DEX_PERSIAN ; pokedex id + db DEX_PERSIAN_A ; pokedex id db 65, 60, 60, 115, 75 ; hp atk def spd spc diff --git a/data/pokemon/base_stats/raichua.asm b/data/pokemon/base_stats/raichua.asm index 950fc2fd..d27f995e 100644 --- a/data/pokemon/base_stats/raichua.asm +++ b/data/pokemon/base_stats/raichua.asm @@ -3,7 +3,7 @@ db 60, 85, 50, 100, 95 ; hp atk def spd spc - db ELECTRIC, PSYCHIC ; type + db ELECTRIC, PSYCHIC_TYPE ; type db 75 ; catch rate db 122 ; base exp @@ -15,11 +15,11 @@ ; tm/hm learnset tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, SEISMIC_TOSS, \ - RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ - THUNDER_WAVE, SUBSTITUTE, FLY, SURF, FLASH, \ - PSYCHIC_M, PSYWAVE, TELEPORT, COUNTER ; I forgot why it got this ngl + DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + SUBSTITUTE, FLY, SURF, FLASH ; end db BANK(RaichuAPicFront) diff --git a/data/pokemon/base_stats/raticatea.asm b/data/pokemon/base_stats/raticatea.asm index bb6acabd..59379149 100644 --- a/data/pokemon/base_stats/raticatea.asm +++ b/data/pokemon/base_stats/raticatea.asm @@ -16,8 +16,8 @@ ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ - DIG, MIMIC, DOUBLE_TEAM, \ - BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE + DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + SKULL_BASH, REST, SUBSTITUTE ; end db BANK(RaticateAPicFront) diff --git a/data/pokemon/base_stats/sandslasha.asm b/data/pokemon/base_stats/sandslasha.asm index 7f1347be..2ddc8806 100644 --- a/data/pokemon/base_stats/sandslasha.asm +++ b/data/pokemon/base_stats/sandslasha.asm @@ -15,10 +15,10 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ - FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ - SWIFT, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ - CUT, STRENGTH, BLIZZARD, ICE_BEAM + ICE_BEAM, BLIZZARD, HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, \ + RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \ + ROCK_SLIDE, SUBSTITUTE, CUT, STRENGTH ; end db BANK(SandslashAPicFront) diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 8caddd31..25f178ee 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -240,12 +240,12 @@ CryData:: mon_cry SFX_CRY_11, $F0, $60 ; Melmetal mon_cry SFX_CRY_15, $00, $80 ; Arcanine-H mon_cry SFX_CRY_06, $A8, $90 ; Electrode-H - ; mon_cry SFX_CRY_22, $20, $FF ; Raticate-A - ; mon_cry SFX_CRY_09, $EE, $08 ; Raichu-A - ; mon_cry SFX_CRY_00, $FF, $FF ; Sandslash-A + mon_cry SFX_CRY_22, $20, $FF ; Raticate-A + mon_cry SFX_CRY_09, $EE, $08 ; Raichu-A + mon_cry SFX_CRY_00, $FF, $FF ; Sandslash-A ; mon_cry SFX_CRY_24, $88, $60 ; Ninetales-A ; mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio-A - ; mon_cry SFX_CRY_19, $99, $FF ; Persian-A + mon_cry SFX_CRY_19, $99, $FF ; Persian-A ; mon_cry SFX_CRY_12, $E0, $40 ; Golem-A ; mon_cry SFX_CRY_25, $20, $C0 ; Rapidash-G ; mon_cry SFX_CRY_1F, $00, $80 ; Slowbro-G diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 5a9736ca..19900a15 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -234,6 +234,10 @@ PokedexEntryPointers: dw MelmetalDexEntry dw ArcanineHDexEntry dw ElectrodeHDexEntry + dw RaticateADexEntry + dw RaichuADexEntry + dw SandslashADexEntry + dw PersianADexEntry dw ArticunoGDexEntry dw ZapdosGDexEntry dw MoltresGDexEntry @@ -1869,6 +1873,34 @@ ElectrodeHDexEntry: text_far _ElectrodeHDexEntry text_end +RaticateADexEntry: + db "RAT@" + db 2,4 + dw 560 + text_far _RaticateADexEntry + text_end + +RaichuADexEntry: + db "MOUSE@" + db 2,4 + dw 460 + text_far _RaichuADexEntry + text_end + +SandslashADexEntry: + db "MOUSE@" + db 3,11 + dw 1210 + text_far _SandslashADexEntry + text_end + +PersianADexEntry: + db "CLASSY CAT@" + db 3,7 + dw 730 + text_far _PersianADexEntry + text_end + ArticunoGDexEntry: db "CRUEL@" db 5,7 diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm index fd313d52..a56951c8 100644 --- a/data/pokemon/dex_order.asm +++ b/data/pokemon/dex_order.asm @@ -234,6 +234,10 @@ PokedexOrder: db DEX_MELMETAL db DEX_ARCANINE_H db DEX_ELECTRODE_H + db DEX_RATICATE_A + db DEX_RAICHU_A + db DEX_SANDSLASH_A + db DEX_PERSIAN_A db DEX_ARTICUNO_G db DEX_ZAPDOS_G db DEX_MOLTRES_G diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 5f8f699b..19a63f25 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -56,7 +56,6 @@ EvosMovesPointerTable: dw ChanseyEvosMoves dw MachokeEvosMoves dw MrMimeEvosMoves - ;dw MrMimeGEvosMoves dw HitmonleeEvosMoves dw HitmonchanEvosMoves dw ArbokEvosMoves @@ -105,7 +104,6 @@ EvosMovesPointerTable: ;dw NinetalesAEvosMoves dw PikachuEvosMoves dw RaichuEvosMoves - ;dw RaichuAEvosMoves dw RibbitoEvosMoves dw CroakozunaEvosMoves dw DratiniEvosMoves @@ -118,7 +116,6 @@ EvosMovesPointerTable: dw CryithanEvosMoves dw SandshrewEvosMoves dw SandslashEvosMoves - ;dw SandslashAEvosMoves dw OmanyteEvosMoves dw OmastarEvosMoves dw JigglypuffEvosMoves @@ -169,7 +166,6 @@ EvosMovesPointerTable: dw WeezingEvosMoves ;dw WeezingGEvosMoves dw PersianEvosMoves - ;PersianAEvosMoves dw MarowakEvosMoves ;dw MarowakAEvosMoves dw GuardiaEvosMoves @@ -194,7 +190,6 @@ EvosMovesPointerTable: ;dw RapidashGEvosMoves dw RattataEvosMoves dw RaticateEvosMoves - ;dw RaticateAEvosMoves dw NidorinoEvosMoves dw NidorinaEvosMoves dw GeodudeEvosMoves @@ -264,6 +259,10 @@ EvosMovesPointerTable: dw MelmetalEvosMoves dw ArcanineHEvosMoves dw ElectrodeHEvosMoves + dw RaticateAEvosMoves + dw RaichuAEvosMoves + dw SandslashAEvosMoves + dw PersianAEvosMoves dw ArticunoGEvosMoves dw ZapdosGEvosMoves dw MoltresGEvosMoves @@ -797,18 +796,6 @@ MrMimeEvosMoves: db 47, SUBSTITUTE db 0 -;MrMimeGEvosMoves: -; Evolutions -; db EV_ITEM, ICE_STONE, 1, MR_RIME -; db 0 -; Learnset -; db 23, LIGHT_SCREEN -; db 28, PSYBEAM -; db 31, AURORA_BEAM -; db 39, ICE_BEAM -; db 48, PSYCHIC_M -; db 0 - HitmonleeEvosMoves: ; Evolutions db 0 @@ -1385,21 +1372,6 @@ RaichuEvosMoves: ; Learnset db 0 -;RaichuAEvosMoves: ; pikachu learnset -; Evolutions -; db 0 -; Learnset -; db 6, TAIL_WHIP -; db 8, THUNDER_WAVE -; db 11, QUICK_ATTACK -; db 15, DOUBLE_TEAM -; db 20, SLAM -; db 26, THUNDERBOLT -; db 33, AGILITY -; db 41, THUNDER -; db 50, LIGHT_SCREEN -; db 0 - RibbitoEvosMoves: ; Evolutions db EV_LEVEL, 30, CROAKOZUNA @@ -1543,19 +1515,6 @@ SandslashEvosMoves: db 47, FURY_SWIPES db 0 -;SandslashAEvosMoves: -; Evolutions -; db 0 -; Learnset -; db 21, SWIFT -; db 24, FURY_SWIPES -; db 27, IRON_DEFENSE -; db 30, SLASH -; db 33, IRON_HEAD -; db 36, SWORDS_DANCE -; db 45, BLIZZARD -; db 0 - OmanyteEvosMoves: ; Evolutions db EV_LEVEL, 40, OMASTAR @@ -2138,20 +2097,6 @@ PersianEvosMoves: db 51, SLASH 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 0 - MarowakEvosMoves: ; Evolutions db EV_ITEM, HEART_STONE, 1, GUARDIA @@ -2437,20 +2382,6 @@ RaticateEvosMoves: db 41, SUPER_FANG db 0 -;RaticateAEvosMoves: -; Evolutions -; db 0 -; Learnset -; db 4, QUICK_ATTACK -; db 7, FOCUS_ENERGY -; db 10, BITE -; db 16, HYPER_FANG -; db 20, BRUTAL_SWING -; db 28, SUPER_FANG -; db 31, DOUBLE_EDGE -; db 40, NIGHT_SLASH -; db 0 - NidorinoEvosMoves: ; Evolutions db EV_ITEM, MOON_STONE, 1, NIDOREIGN @@ -3281,6 +3212,62 @@ ElectrodeHEvosMoves: ; voltorb-hisui learnset which is also trode's anyway db 36, SWIFT db 43, EXPLOSION db 0 + +RaticateAEvosMoves: +; Evolutions + db 0 +; Learnset + db 4, QUICK_ATTACK + db 7, FOCUS_ENERGY + db 10, BITE + db 16, HYPER_FANG + db 20, BRUTAL_SWING + db 28, SUPER_FANG + db 31, DOUBLE_EDGE + db 40, NIGHT_SLASH + db 0 + +RaichuAEvosMoves: ; pikachu learnset +; Evolutions + db 0 +; Learnset + db 6, TAIL_WHIP + db 8, THUNDER_WAVE + db 11, QUICK_ATTACK + db 15, DOUBLE_TEAM + db 20, SLAM + db 26, THUNDERBOLT + db 33, AGILITY + db 41, THUNDER + db 50, LIGHT_SCREEN + db 0 + +SandslashAEvosMoves: +; Evolutions + db 0 +; Learnset + db 21, SWIFT + db 24, FURY_SWIPES + db 27, IRON_DEFENSE + db 30, SLASH + db 33, IRON_HEAD + db 36, SWORDS_DANCE + db 45, BLIZZARD + 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 0 ArticunoGEvosMoves: ; Evolutions diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index a5a2a3a1..171db0c6 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -11,7 +11,7 @@ MonPartyData: nybble ICON_WATER ; Totartle nybble ICON_FAIRY ; Pikachu nybble ICON_FAIRY ; Raichu - ; nybble ICON_FAIRY ; Raichu-A + nybble ICON_FAIRY ; Raichu-A nybble ICON_FAIRY ; Gorochu nybble ICON_QUADRUPED ; Eevee nybble ICON_QUADRUPED ; Vaporeon @@ -24,7 +24,7 @@ MonPartyData: nybble ICON_QUADRUPED ; Sylveon nybble ICON_QUADRUPED ; Rattata nybble ICON_QUADRUPED ; Raticate - ; nybble ICON_QUADRUPED ; Raticate-A + nybble ICON_QUADRUPED ; Raticate-A nybble ICON_BIRD ; Pidgey nybble ICON_BIRD ; Pidgeotto nybble ICON_BIRD ; Pidgeot @@ -37,7 +37,7 @@ MonPartyData: nybble ICON_MON ; Konya nybble ICON_MON ; Meowth nybble ICON_MON ; Persian - ; nybble ICON_MON ; Persian-A + nybble ICON_MON ; Persian-A nybble ICON_MON ; Perrserker nybble ICON_BIRD ; Spearow nybble ICON_BIRD ; Fearow @@ -45,7 +45,7 @@ MonPartyData: nybble ICON_SNAKE ; Arbok nybble ICON_MON ; Sandshrew nybble ICON_MON ; Sandslash - ; nybble ICON_MON ; Sandslash-A + nybble ICON_MON ; Sandslash-A nybble ICON_MON ; NidoranF nybble ICON_MON ; Nidorina nybble ICON_MON ; Nidoqueen diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index e67d5cb1..9dbc0fc8 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -44,7 +44,6 @@ MonsterNames:: db "CHANSEY@@@" db "MACHOKE@@@" db "MR.MIME@@@" - ; db "MR.MIME-G@" db "HITMONLEE@" db "HITMONCHAN" db "ARBOK@@@@@" @@ -93,7 +92,6 @@ MonsterNames:: ; db "NINETALESA" db "PIKACHU@@@" db "RAICHU@@@@" - ; db "RAICHU-A@@" db "RIBBITO@@@" db "CROAKOZUNA" db "DRATINI@@@" @@ -105,7 +103,6 @@ MonsterNames:: db "BAWLIGUA@@" db "CRYITHAN@@" db "SANDSHREW@" - ; db "SANDSLASHA" db "SANDSLASH@" db "OMANYTE@@@" db "OMASTAR@@@" @@ -157,7 +154,6 @@ MonsterNames:: db "WEEZING@@@" ; db "WEEZING-G@" db "PERSIAN@@@" - ; db "PERSIAN-A@" db "MAROWAK@@@" ; db "MAROWAK-A@" db "GUARDIA@@@" @@ -182,7 +178,6 @@ MonsterNames:: ; db "RAPIDASH-G" db "RATTATA@@@" db "RATICATE@@" - ; db "RATICATE-A" db "NIDORINO@@" db "NIDORINA@@" db "GEODUDE@@@" @@ -252,6 +247,10 @@ MonsterNames:: db "MELMETAL@@" db "ARCANINE-H" db "ELECTRODEH" + db "RATICATE-A" + db "RAICHU-A@@" + db "SANDSLASHA" + db "PERSIAN-A@" db "ARTICUNO-G" db "ZAPDOS-G@@" db "MOLTRES-G@" diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index d09b34db..89b01bfa 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -828,25 +828,35 @@ _ElectrodeHDexEntry:: next "of 20,000 volts" ; 100 kV in a bolt of lightning on average dex -;_RaticateADexEntry:: ; this entry hypercompresses most Gen 7 entries -; text "It commands nests" -; next "of RATTATA. It" -; next "will greedily" +_RaticateADexEntry:: ; this entry hypercompresses most Gen 7 entries + text "It commands nests" + next "of RATTATA. It" + next "will greedily" -; page "command them to" -; next "gather large" -; next "amounts of food" -; dex + page "command them to" + next "gather large" + next "amounts of food" + dex + +_RaichuADexEntry:: + text "It uses PSI to" + next "ride on its tail" + next "like a surfboard." + + page "It has been known" + next "to teach PIKACHU" + next "how to SURF" + dex -;_SandslashADexEntry:: -; text "It adapted to a" -; next "frigid region." -; next "Wounds caused" +_SandslashADexEntry:: + text "It adapted to a" + next "frigid region." + next "Wounds caused" -; page "by SANDSLASH" -; next "cause severe" -; next "frostbite" -; dex + page "by SANDSLASH" + next "cause severe" + next "frostbite" + dex ;_NinetalesADexEntry:: ; text "Once thought to" @@ -868,15 +878,15 @@ _ElectrodeHDexEntry:: ; next "from attacks" ; dex -;_PersianADexEntry:: -; text "Its round face" -; next "is a symbol of" -; next "prosperity." +_PersianADexEntry:: + text "Its round face" + next "is a symbol of" + next "prosperity." -; page "Despite this, it" -; next "prefers to fight" -; next "underhandedly" -; dex + page "Despite this, it" + next "prefers to fight" + next "underhandedly" + dex ;_GolemADexEntry:: ; text "It fires rocks" @@ -958,16 +968,6 @@ _ElectrodeHDexEntry:: ; next "building factories" ; referencing this: https://ibb.co/ZM2714Q - PLA takes place before RB ; dex -;_MrMimeGDexEntry:: -; text "Although it no" -; next "longer creates" -; next "invisible walls," - -; page "This MR.MIME can" -; next "use PSI to make" -; next "barriers of ice" -; dex - ;_TaurosPDexEntry:: ; text "Known as the" ; next "Combat Breed," diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index da7a42fa..5ed5fdea 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -12,7 +12,7 @@ MonsterPalettes: db PAL_CYANMON ; TOTARTLE db PAL_YELLOWMON ; PIKACHU db PAL_YELLOWMON ; RAICHU - ; db PAL_YELLOWMON ; RAICHU_A + db PAL_YELLOWMON ; RAICHU_A db PAL_YELLOWMON ; GOROCHU db PAL_BROWNMON ; EEVEE db PAL_CYANMON ; VAPOREON @@ -25,7 +25,7 @@ MonsterPalettes: db PAL_FUCHSIA ; SYLVEON db PAL_PURPLEMON ; RATTATA db PAL_BROWNMON ; RATICATE - ; db PAL_GREYMON ; RATICATE_A + db PAL_GREYMON ; RATICATE_A db PAL_BROWNMON ; PIDGEY db PAL_BROWNMON ; PIDGEOTTO db PAL_BROWNMON ; PIDGEOT @@ -38,7 +38,7 @@ MonsterPalettes: db PAL_YELLOWMON ; KONYA db PAL_YELLOWMON ; MEOWTH db PAL_YELLOWMON ; PERSIAN - ; db PAL_BLUEMON ; PERSIAN_A + db PAL_CYANMON ; PERSIAN_A db PAL_GREYMON ; PERRSEKRER db PAL_BROWNMON ; SPEAROW db PAL_BROWNMON ; FEAROW @@ -46,7 +46,7 @@ MonsterPalettes: db PAL_PURPLEMON ; ARBOK db PAL_BROWNMON ; SANDSHREW db PAL_BROWNMON ; SANDSLASH - ; db PAL_CYANMON ; SANDSLASH_A + db PAL_CYANMON ; SANDSLASH_A db PAL_BLUEMON ; NIDORAN_F db PAL_BLUEMON ; NIDORINA db PAL_BLUEMON ; NIDOQUEEN diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index 67edef52..9db6ec00 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -22,11 +22,11 @@ SetIshiharaTeam: IshiharaTeam: db EXEGGUTOR, 90 - db ARCANINE_H, 90 - db ELECTRODE_H, 90 - db MELTAN, 50 + db SANDSLASH_A, 90 + db RATICATE_A, 90 + db PERSIAN_A, 50 IF DEF(_DEBUG) - db RAICHU, 50 + db RAICHU_A, 50 ENDC db -1 ; end diff --git a/gfx/pics.asm b/gfx/pics.asm index ae556d81..0ab51ea7 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -555,6 +555,14 @@ ArcanineHPicFront:: INCBIN "gfx/pokemon/front/arcanineh.pic" ArcanineHPicBack:: INCBIN "gfx/pokemon/back/arcaninehb.pic" ElectrodeHPicFront:: INCBIN "gfx/pokemon/front/electrodeh.pic" ElectrodeHPicBack:: INCBIN "gfx/pokemon/back/electrodehb.pic" +RaticateAPicFront:: INCBIN "gfx/pokemon/front/raticatea.pic" +RaticateAPicBack:: INCBIN "gfx/pokemon/back/raticateab.pic" +RaichuAPicFront:: INCBIN "gfx/pokemon/front/raichua.pic" +RaichuAPicBack:: INCBIN "gfx/pokemon/back/raichuab.pic" +SandslashAPicFront:: INCBIN "gfx/pokemon/front/sandslasha.pic" +SandslashAPicBack:: INCBIN "gfx/pokemon/back/sandslashab.pic" +PersianAPicFront:: INCBIN "gfx/pokemon/front/persiana.pic" +PersianAPicBack:: INCBIN "gfx/pokemon/back/persianab.pic" YujirouPic:: INCBIN "gfx/trainers/yujirou.pic" StudentPic:: INCBIN "gfx/trainers/student.pic" diff --git a/gfx/pokemon/back/hitmontopb.png b/gfx/pokemon/back/hitmontopb.png index 761af06eb80760c7f3bdd602050fe804303a1dae..9bf21a7b884070c6e8deffcb3492133ed17fda53 100644 GIT binary patch delta 296 zcmaFHa)4z*C)aZpHZE?>-Rt*!pEy}X%2?OHMAyJ9#L&RX(9p`nK-<8;%D`ZU$d_Xi zFN))kJ?ZIFHJOPqv;Kgmi(`ny<>VjytUMKxd;!O%+Y20%|0gbRZ28e{#hzgAU;qEF zWH&mpY}SqcJNZ*O+OmHBuT0=i%3%Bd^40(I2BuFkPSme_@SlgfInw!GH4(;#2ki|F{2YWLvi?Z03OlS^P<7 zo=3gpNJ`N?5hcpBDI`nu@}+!a#l(*F-R=labkmg|5*kg@O1TaS?83{1ORO`eZT+! delta 334 zcmX@W@{DCdC)YDhWz{eLIEF}Eu06juiz!fm^#Nz5m~P99x4A4g-ADox{LNEJfC)Ao>9;g1B-N(=9!s#9A|F2JwLVM>#c~5K`erM^!L_?J~rT*`tK9R zo5IkSb#oQg%EZ?{;k@@}&-%yH6kblSB^oQ)k^Wk)l+$)1%UU-1> z_G+>7t;sDNhH(-{Bz|~Km^g2*z@HKq>8AX{wGYnj)O~c|L*cfD8?o{~yVL(2l#e~R Vs`t+NLysANz|+;wWt~$(696Olj70zd diff --git a/gfx/pokemon/back/persianab.png b/gfx/pokemon/back/persianab.png new file mode 100644 index 0000000000000000000000000000000000000000..b95e0041c635d531d92007d722284e82d3ddcf55 GIT binary patch literal 549 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~YoMx)GwzF9Sg&6aT{6ZMdFDjn}3&pqPXa z>VfJ&zypXudcd@N(03Ccd#R_3V~E7%-1CZjhYUp69<(1lll(y7ha7|9!L9?r2U9&5 zf;}@%{F1imh;57(5C{$yuHJKr&$#a6FV(-Zrwc8=AQ0JKJfmN8^5o5d=R4-a`?yP) zo>9FlClS6jIqHLS!-G?69~=lNWbaR9*;d&QbF*O`o1fRI@6jw-m2sznTK+t!`cZi( zby7k)r`qpB(bCq(GG4ApTzl=(MeWTOkNOD&t*DQed%!&R+d<)f!G~&q4rcIl^>bP0 Hl+XkKDuS9V literal 0 HcmV?d00001 diff --git a/gfx/pokemon/back/raichuab.png b/gfx/pokemon/back/raichuab.png new file mode 100644 index 0000000000000000000000000000000000000000..9b156687a32f10559504d1210c50aaf1dea65e8e GIT binary patch literal 589 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~YoTdhI+&2mXg&6aT{6ZMdFDjn}!HZEE&JJSKfT{ro6q7JQ zJy0D8cmOd-515t@`fdVbpY?Qc43W5;{Nw-s|EvoC&NCeO`c2_j{J;JGe>?WPm*4+C znlGv5-|_v`h8>0f!|z*jJdXXkZmPnux3QJlmJU6|>(@-vWia$xe`(fMCY?=QtFt*f zK4vZryDn0v@c6dZTGyt73fj}E)(Y@2Mrxhfddc*P+zAVzEmy9JANe7nr1k0ve^QH8 z3tNMP`}DRpy{GI(eQSAmV>yK;HW^=XayD+<^)KZd4=?M?&+HlkTt+{YC-9ZF88Njs w_I&ntc8+yWdLHh}E1J+y@zegydkYDMom;n*Ui6(^2J{$%r>mdKI;Vst0M+NIX#fBK literal 0 HcmV?d00001 diff --git a/gfx/pokemon/back/raticateab.png b/gfx/pokemon/back/raticateab.png new file mode 100644 index 0000000000000000000000000000000000000000..2b2138733ec7bf7b2aa4a83cd597a89c36c2bcb5 GIT binary patch literal 571 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~YoTh>o^cDh5W?;-O@(W=+zo>i`kfU1S8c~vx zSdwa$T$Bo=7>o>zjCBo6bPdcx3@oiojjasLwG9lc3=C#J?cqhykei>9nO2EKgBe7F z&v|>0hoVv=JkxxA8MJ_G4hB|6AqHk3ixCJJ7^N6MDu65oFGguNJBU#Oss_KkpRo5mTT{cS<@}DlGDrOam|plx9^}5o zy?EmG^4(ra632uOOZP{XY;xP@b|uBpvEbUmQvG9Lvu0m9QjyZLw6;3>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!Ib3f?!v%q+)~s54nJ@ErkR#;MwT(m+A>5>H=O_U9~YoaQ2vip(8=LX7!Eej$wK7nRQfa#TxPBT7;d zOH!?pi&B9UgOP!ev95uMu7O#Ifu)tHsg;p|wt<0_fx+F&N7Yd@$Uf%j;us=vIr#@aD^G+(`0Ir|zrQc+xqUyeXMe!4=id`tc^=At zZx%JYB6cm8-T2e`wzaIre*Xo}vS}t+{QI9E;vsnWcy0X=hc1bj)&JyKHIse_{mV`+ z`y0BTab0BgA}{TR9{z>eho0^Kael);`|K$Zf1mv4x#*x6xHe%y?D~JJcV>P2pFU&O z-``7CN4%(KyZRygxRdOEM#+VN+|F;~|E60=O71d9xf-OPtZS;25_+V*&3~fta+WqT nX350Ng^hyWBKG#2V_?|1@8~Y?jaS=%K4S26^>bP0l+XkK)}pLn literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/hitmontop.png b/gfx/pokemon/front/hitmontop.png index d9e40165c798110a90485003c0d679e5da16feb5..8b7f975cd547d2773cee93c2cceadb7f798c7863 100644 GIT binary patch literal 921 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBkX6HZE?BGb?%$fkKS=MSdZS=NFaF0&-MKTq8;F-Q-XmJj-F0#qgG>EaloaX$5uZ?>?b1p5ch+oHTqEXLycVjETG2IoHuu+m*Q zT_JDM+~w_aSOPEI`NF*=>8lG1-9CQv z?w&0c20Zr9zWy|Jx$83Z(2BV+svaQ?T%7Jak&i<@3y1HI;r_Tg`>$KmXURRPxks!* ztY*Cof3cIvncaoW^99p)hX*TI6BH$FnNJHxeo1f zmI9Z~_T98k*s|&QCD9E^c6JHY(_iyFJ-N4g($48ioYy{?=&ffxB|pko?EcB+Ovm0> z9+jObbU^sq+)X75Y#we7eSM|1#mZtokMbuphK4M3x$Qqx%rtCQTNXvb?A_I05e=HFD~t?0xH5jIt-MGjl4 zQSR^7(j#oTUVn?&Ym${+h_AA1b%?ZzsVSJ)sKKhhw z`Rt$YURvuuD=$|DDTqe8lODrsTPSlme=Nnk@G7{NW(Z=+0cEB^F zreX%SH;OJPSXy+m{JB3L9^5=i)SIMj(g!zxkw+hnXoY%izH;K5T=FbSXO_#yXriW} z`P$>0$wlKYj*tgYciH6hz8Wo%Q24**WKp)R{l8Ze3zolTb9jOF2_Hh|2MwV(9!B!M a0{sD1ha9V|^ph(90000NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBkX6Hcm5@wHwUV0)-g!i~K?u&o3&U1>~rfxJHzu zB$lLFB^RXvDF!10BV%0y6I}zd5CcmqQxhv=Q*8qSD+7Zy&5a5u8glbfGSez?Yq)#Q zat=^KRBD80ny)W|7Ld)sz{)7Zzzk$D0wDvV6a&c1Ko)}+qcofy#HayP0}Lo8VT5|1 zIuP&xVvrs%Eg$sV1gJ{H)5S4F<9zOA$82Fo5rzkz$u>GpE>aWcZP94?s!$Q=a$`bt zai)*)qtK16MS_2rFHUp1>#ZTRVebylH&&myY%5Qx9u&~9?5uiqaCf!FZPy@<&35)G+msvPEVO_chZ%M$>BxMWiPhvHcWhLX`A~qAfwN*sdd%euAg(OZaD0jw(--f z^Bs%&4r{r^T+yv_(K0#jB(^Q~QTpA0dA$!OWeBI9Q7-rtvnV>)OLy-JS{ku))^=EB*&dDPmuzy9wX|Y+_ z^PWlEQr&)C^v!xXJ~jofca7=_QnGS_E6+^x^OI>b>9}n=vv;Ta?svg)$7Y=EYM7fl zuUEn&PH^j0_tqbF^9z)o|5D0cC9>W@Z{J0$hz~+f%%%(fn*DU=+Q55WD2fJv!i#2TC-au6{1-oD!M<NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBkX6HcnH0LH|9^fI^JDq8jjAR%x5pPZvAvca_YV1Z&{`_D>cS4E88@z1*KK=j zcXC?&ruTR6e&&4i)O#P#SCuPoPpRFP*%Gv`c!ku$xduFQCN%k(KFob^=Te#B(-Xz( z>LaU-9-7{I?*3w#jkDsn@BEis>Tfahr0UTt+Tt6(BX9n2ylZLo`p6#bi}9Nev_H}6Ys)U#ZX!GD z?2P-}rCbkP>r;;EI5sP-ILm+G^jtBISNr6w0P)0S#iHU@&mBACAD?xpxTM(GW1)e@@tnWR X2M_5tU2ESD$_@;ku6{1-oD!M<2L(HZ literal 0 HcmV?d00001 diff --git a/gfx/pokemon/front/raticatea.png b/gfx/pokemon/front/raticatea.png new file mode 100644 index 0000000000000000000000000000000000000000..f6f05dbe99c29e27b35cb323066bc66f9585d3cb GIT binary patch literal 899 zcmeAS@N?(olHy`uVBq!ia0vp^79h+4Bp7<%rW^uNEa{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4RdP`(kYX@0Ff!IPFwr$I3o)>?GBvg`G}AUPure^Poz%V)MMG|WN@iLmZVf)? z?Li)jN{#SL^YvxW0aVgRWCvKYJ=rQz%#Mh&PMCZHdM5$b{J zK)?ftL3+Tne9(6jpeklh7sn8f<4>nuoOW1&!)3YrN&ip%Yo!HJ4Gd?$ef{e~aPc04 zM;=Yzo*wwmbX|f$u2CSw$K``{#%qPg`&$KFH10HS6EHTF`8;I@dv2z`7 zgjr+qy1@A#bUkgu7T*-QJ*%q0PC6uNfxMTO&7~FVqw2-^OD28mh2Zdi48;sT$5TUWGp*`BMEnI(DG(eGu_SMCkd?-?)2+Aoh_>Mal$dN{W~V@^|HNKq2l&w>nSsaf*Rw{(A5#YwEV(PF|J&2 zb@J{Q+c!qV>Yts@e*Tj7zeFQ8^RuSq>#~kCx5EDZ>8v{@&$skkDYjVtc!r|+g7_B< z@yDOIiu=!ND$~6G{utkm=PORv?(p>6J3ab|__ODa+w`B9>27yFUezgAm}B|<FPKj1&UF8)JpeOERpjd;5H KxvXNS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBkX6HcoS~nwqd2pb%qzkzWYo`9&u`8WOFdEG72#;16hnf$iOJY0P-@B#o)y#4QB^2YCzQh1Byu) zp&qCX1U!Hkqz6pP2YojIs>GdH z$k4jsI&0P&VOuZ0);lgXkx~I&Qd4zb#Bn7}p0KGhD8QRvagnI5lR(&&Ew)=PDRfMm z&_5|;^XPbzGjro1?=*q8tQfIa2=15HR%hPl9 zP`sA5#vt*?Et9&&JY@PwoE5XgIZWj-2+jH7izV|NL8H zwPQy{kwEPCsS}UyTf4|p+-+`w_Jh2$&jR;ymG5P)TzmA$mjBU#2fz1#BR zzsl7LIow?5{LcM&YaI)x_%gYf-Dhs_9$l!UcKF$muT}U$ITRdZTLM~RFvZi>$E%WZ5>?<`$CWDyG-ZgW16$W$HIAs-zuY@ zmb{mkQk^Y4U95i^v!}m2Sui`U)_v+pxuSMaueZt@&vI|!S7k9u-5EJow4+h-i5WJ zt}@!Wmo+9t{64+S$6|VMs!H4@v#^PL(_U;~N^2HvDE!VnK`Zx`eW6W-&bkXcPWPG) z%(i*Xf4MN|l8=<={JEFPm;9KgYQFF7CTX)flZ_&)CnTMz4tg(fS}x4{l+$^8{ipiz W>UtivZ}ew^QkSQzpUXO@geCwOdtw>@ literal 0 HcmV?d00001