From 8643d40ab128bdc5c9c9f3eba2121de7a722bcd3 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sun, 18 Aug 2024 17:23:19 +0100 Subject: [PATCH] Komainu-Yang (Rework) This reworks Shi-Shi into Komainu, a legendary Pokemon more in-touch with the mythology surrounding its design origins. It'll have two forms, centred around the yin/yang, considering its origins. See spreadsheet for more information. Also rip fly shi-shi --- constants/pokemon_constants.asm | 2 +- data/pokemon/base_stats.asm | 2 +- .../base_stats/{shi_shi.asm => komainu.asm} | 7 ++-- data/pokemon/cries.asm | 2 +- data/pokemon/dex_entries.asm | 2 +- .../dex_entries/{shi_shi.asm => komainu.asm} | 0 .../dex_entries/{amanobi.asm => tanobi.asm} | 0 data/pokemon/dex_entry_pointers.asm | 2 +- data/pokemon/dex_order_alpha.asm | 2 +- data/pokemon/dex_order_new.asm | 2 +- data/pokemon/evolution_moves.asm | 2 +- data/pokemon/evos_attacks_johto.asm | 31 ++++++++++-------- data/pokemon/first_stages.asm | 2 +- data/pokemon/menu_icons.asm | 2 +- data/pokemon/names.asm | 4 +-- data/pokemon/palettes.asm | 4 +-- data/pokemon/pic_pointers.asm | 4 +-- gfx/footprints/{shi_shi.png => komainu.png} | Bin gfx/footprints_johto.asm | 2 +- gfx/pics.asm | 4 +-- gfx/pokemon/anim_pointers.asm | 2 +- gfx/pokemon/anims.asm | 2 +- gfx/pokemon/bitmask_pointers.asm | 2 +- gfx/pokemon/bitmasks.asm | 2 +- gfx/pokemon/frame_pointers.asm | 2 +- gfx/pokemon/idle_pointers.asm | 2 +- gfx/pokemon/idles.asm | 2 +- gfx/pokemon/johto_frames.asm | 2 +- gfx/pokemon/{shi_shi => komainu}/anim.asm | 0 .../{shi_shi => komainu}/anim_idle.asm | 0 gfx/pokemon/{shi_shi => komainu}/back.png | Bin gfx/pokemon/{shi_shi => komainu}/front.png | Bin gfx/pokemon/{shi_shi => komainu}/shiny.pal | 0 maps/DebugRoom.asm | 2 +- mobile/mobile_46.asm | 2 +- 35 files changed, 51 insertions(+), 45 deletions(-) rename data/pokemon/base_stats/{shi_shi.asm => komainu.asm} (70%) rename data/pokemon/dex_entries/{shi_shi.asm => komainu.asm} (100%) rename data/pokemon/dex_entries/{amanobi.asm => tanobi.asm} (100%) rename gfx/footprints/{shi_shi.png => komainu.png} (100%) rename gfx/pokemon/{shi_shi => komainu}/anim.asm (100%) rename gfx/pokemon/{shi_shi => komainu}/anim_idle.asm (100%) rename gfx/pokemon/{shi_shi => komainu}/back.png (100%) rename gfx/pokemon/{shi_shi => komainu}/front.png (100%) rename gfx/pokemon/{shi_shi => komainu}/shiny.pal (100%) diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index b89eda3..3b85211 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -416,7 +416,7 @@ DEF JOHTO_POKEMON EQU const_value const TYRANITAR ; f8 const LUGIA ; f9 const HO_OH ; fa - const SHI_SHI + const KOMAINU const CELEBI ; fb DEF NUM_POKEMON EQU const_value - 1 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 36304d0..a1c9db6 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -421,6 +421,6 @@ INCLUDE "data/pokemon/base_stats/pupitar.asm" INCLUDE "data/pokemon/base_stats/tyranitar.asm" INCLUDE "data/pokemon/base_stats/lugia.asm" INCLUDE "data/pokemon/base_stats/ho_oh.asm" -INCLUDE "data/pokemon/base_stats/shi_shi.asm" +INCLUDE "data/pokemon/base_stats/komainu.asm" INCLUDE "data/pokemon/base_stats/celebi.asm" .IndirectEnd:: diff --git a/data/pokemon/base_stats/shi_shi.asm b/data/pokemon/base_stats/komainu.asm similarity index 70% rename from data/pokemon/base_stats/shi_shi.asm rename to data/pokemon/base_stats/komainu.asm index d8f296f..3cd953b 100644 --- a/data/pokemon/base_stats/shi_shi.asm +++ b/data/pokemon/base_stats/komainu.asm @@ -1,9 +1,10 @@ +; Yang form db 0 ; species ID placeholder db 106, 154, 90, 110, 130, 90 ; hp atk def spd sat sdf - db ICE, FLYING ; type + db ICE, FAIRY ; type db 3 ; catch rate db 220 ; base exp db NO_ITEM, NO_ITEM ; items @@ -11,11 +12,11 @@ db 100 ; unknown 1 db 120 ; step cycles to hatch db 5 ; unknown 2 - INCBIN "gfx/pokemon/shi_shi/front.dimensions" + INCBIN "gfx/pokemon/komainu/front.dimensions" dw NULL, NULL ; unused (beta front/back pics) db GROWTH_SLOW ; growth rate dn EGG_NONE, EGG_NONE ; egg groups ; tm/hm learnset - tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, THIEF, NIGHTMARE, FLY, STRENGTH, FLASH, ICE_BEAM + tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, STRENGTH, FLASH, ICE_BEAM ; end diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 2d87592..29d7a78 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -400,6 +400,6 @@ PokemonCries:: mon_cry CRY_RAIKOU, -256, 384 ; TYRANITAR mon_cry CRY_TYPHLOSION, 0, 256 ; LUGIA mon_cry CRY_AIPOM, 0, 384 ; HO_OH - mon_cry CRY_NIDORAN_M, 0, 128 ; SHI_SHI (placeholder) + mon_cry CRY_NIDORAN_M, 0, 128 ; KOMAINU (placeholder) mon_cry CRY_ENTEI, 330, 273 ; CELEBI assert_table_length NUM_POKEMON diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index c144b5c..e8df256 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -393,7 +393,7 @@ PupitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pupitar.asm" TyranitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tyranitar.asm" LugiaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lugia.asm" HoOhPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ho_oh.asm" -ShiShiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/shi_shi.asm" +KomainuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/komainu.asm" CelebiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/celebi.asm" MagipreyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magiprey.asm" TerradosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/terrados.asm" diff --git a/data/pokemon/dex_entries/shi_shi.asm b/data/pokemon/dex_entries/komainu.asm similarity index 100% rename from data/pokemon/dex_entries/shi_shi.asm rename to data/pokemon/dex_entries/komainu.asm diff --git a/data/pokemon/dex_entries/amanobi.asm b/data/pokemon/dex_entries/tanobi.asm similarity index 100% rename from data/pokemon/dex_entries/amanobi.asm rename to data/pokemon/dex_entries/tanobi.asm diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 601f7a2..304bc9b 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -395,6 +395,6 @@ PokedexDataPointerTable: dba TyranitarPokedexEntry dba LugiaPokedexEntry dba HoOhPokedexEntry - dba ShiShiPokedexEntry + dba KomainuPokedexEntry dba CelebiPokedexEntry assert_table_length NUM_POKEMON diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 744b76a..3ddc8b5 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -312,7 +312,7 @@ AlphabeticalPokedexOrder: dw SEEL dw SENTRET dw SHELLDER - dw SHI_SHI + dw KOMAINU dw SHUCKLE dw SKARMORY dw SKIPLOOM diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 8e919db..656815e 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -394,7 +394,7 @@ NewPokedexOrder: dw TYRANITAR dw LUGIA dw HO_OH - dw SHI_SHI + dw KOMAINU dw MEWTWO dw MEW dw CELEBI diff --git a/data/pokemon/evolution_moves.asm b/data/pokemon/evolution_moves.asm index 2e5dac1..c6070ba 100644 --- a/data/pokemon/evolution_moves.asm +++ b/data/pokemon/evolution_moves.asm @@ -393,7 +393,7 @@ EvolutionMoves:: dw NO_MOVE ;TYRANITAR ; f8 dw NO_MOVE ;LUGIA ; f9 dw NO_MOVE ;HO_OH ; fa - dw NO_MOVE ;SHI_SHI + dw NO_MOVE ;KOMAINU dw NO_MOVE ;CELEBI ; fb ;--- diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index f8da0c8..306d54d 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -183,7 +183,7 @@ EvosAttacksPointers2:: dw TyranitarEvosAttacks dw LugiaEvosAttacks dw HoOhEvosAttacks - dw ShiShiEvosAttacks + dw KomainuEvosAttacks dw CelebiEvosAttacks .IndirectEnd:: @@ -2719,19 +2719,24 @@ HoOhEvosAttacks: dbw 99, FUTURE_SIGHT db 0 ; no more level-up moves -ShiShiEvosAttacks: +KomainuEvosAttacks: db 0 ; no more evolutions - dbw 1, WIND_RIDE - dbw 11, SAFEGUARD - dbw 22, GUST - dbw 33, RECOVER - dbw 44, BLIZZARD - dbw 55, CRUNCH - dbw 66, EXTREMESPEED - dbw 70, WIND_RIDE ; (allows it to have its signature move when caught) - dbw 77, WHIRLWIND - dbw 88, ANCIENTPOWER - dbw 99, FUTURE_SIGHT + dbw 1, SCRATCH + dbw 1, LEER + dbw 1, SCARY_FACE + dbw 8, WHIRLWIND + dbw 16, POWDER_SNOW + dbw 24, SAFEGUARD + dbw 32, RECOVER ; Fairy Wind + dbw 40, RECOVER + dbw 48, MIST + dbw 54, ICE_BEAM + dbw 60, WIND_RIDE ; Signature move + dbw 68, RECOVER ; Dazzling Gleam + dbw 74, SWIFT + dbw 80, ANCIENTPOWER + dbw 88, FUTURE_SIGHT + dbw 96, BLIZZARD db 0 ; no more level-up moves CelebiEvosAttacks: diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index 6f8d32d..b738e9b 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -395,6 +395,6 @@ FirstEvoStages:: dw LARVITAR ;f8 dw LUGIA dw HO_OH - dw SHI_SHI + dw KOMAINU dw CELEBI assert_table_length NUM_POKEMON diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 5cf3932..60bb97e 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -396,6 +396,6 @@ MonMenuIcons: db ICON_MONSTER ; TYRANITAR db ICON_LUGIA ; LUGIA db ICON_HO_OH ; HO_OH - db ICON_FOX ; SHI_SHI + db ICON_FOX ; KOMAINU db ICON_HUMANSHAPE ; CELEBI assert_table_length NUM_POKEMON diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 9345f5c..9fa6f56 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -361,7 +361,7 @@ PokemonNames:: db "CACAWPHONY" db "TREBIR@@@@" db "SAKURAZE@@" - db "TANOBI@@@" + db "TANOBI@@@@" db "TRUSTAN@@@" db "KUWAGUARD@" db "TONQUITO@@" @@ -399,6 +399,6 @@ PokemonNames:: db "TYRANITAR@" db "LUGIA@@@@@" db "HO-OH@@@@@" - db "SHI-SHI@@@" + db "KOMAINU@@@" db "CELEBI@@@@" assert_table_length NUM_POKEMON diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index a171c12..14d8562 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -824,8 +824,8 @@ INCBIN "gfx/pokemon/lugia/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/lugia/shiny.pal" INCBIN "gfx/pokemon/ho_oh/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/ho_oh/shiny.pal" -INCBIN "gfx/pokemon/shi_shi/front.gbcpal", middle_colors -INCLUDE "gfx/pokemon/shi_shi/shiny.pal" +INCBIN "gfx/pokemon/komainu/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/komainu/shiny.pal" INCBIN "gfx/pokemon/celebi/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/celebi/shiny.pal" diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 5d44322..0406bf6 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -804,8 +804,8 @@ PokemonPicPointers:: dba LugiaBackpic dba HoOhFrontpic dba HoOhBackpic - dba ShiShiFrontpic - dba ShiShiBackpic + dba KomainuFrontpic + dba KomainuBackpic dba CelebiFrontpic dba CelebiBackpic assert_table_length NUM_POKEMON + 1 diff --git a/gfx/footprints/shi_shi.png b/gfx/footprints/komainu.png similarity index 100% rename from gfx/footprints/shi_shi.png rename to gfx/footprints/komainu.png diff --git a/gfx/footprints_johto.asm b/gfx/footprints_johto.asm index 50cc9c9..cecfc19 100644 --- a/gfx/footprints_johto.asm +++ b/gfx/footprints_johto.asm @@ -183,7 +183,7 @@ INCBIN "gfx/footprints/pupitar.1bpp" INCBIN "gfx/footprints/tyranitar.1bpp" INCBIN "gfx/footprints/lugia.1bpp" INCBIN "gfx/footprints/ho_oh.1bpp" -INCBIN "gfx/footprints/shi_shi.1bpp" +INCBIN "gfx/footprints/komainu.1bpp" INCBIN "gfx/footprints/celebi.1bpp" INCBIN "gfx/footprints/252.1bpp" INCBIN "gfx/footprints/253.1bpp" diff --git a/gfx/pics.asm b/gfx/pics.asm index 0c6f334..e3c8393 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -721,8 +721,8 @@ BellignanFrontpic: INCBIN "gfx/pokemon/bellignan/front.animated.2bpp.lz" BellignanBackpic: INCBIN "gfx/pokemon/bellignan/back.2bpp.lz" WalkingWakeFrontpic: INCBIN "gfx/pokemon/walking_wake/front.animated.2bpp.lz" WalkingWakeBackpic: INCBIN "gfx/pokemon/walking_wake/back.2bpp.lz" -ShiShiFrontpic: INCBIN "gfx/pokemon/shi_shi/front.animated.2bpp.lz" -ShiShiBackpic: INCBIN "gfx/pokemon/shi_shi/back.2bpp.lz" +KomainuFrontpic: INCBIN "gfx/pokemon/komainu/front.animated.2bpp.lz" +KomainuBackpic: INCBIN "gfx/pokemon/komainu/back.2bpp.lz" MunchlaxFrontpic: INCBIN "gfx/pokemon/munchlax/front.animated.2bpp.lz" MunchlaxBackpic: INCBIN "gfx/pokemon/munchlax/back.2bpp.lz" NidoreignFrontpic: INCBIN "gfx/pokemon/nidoreign/front.animated.2bpp.lz" diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 9c1a8c4..f1c21ae 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -395,6 +395,6 @@ AnimationPointers: dw TyranitarAnimation dw LugiaAnimation dw HoOhAnimation - dw ShiShiAnimation + dw KomainuAnimation dw CelebiAnimation assert_table_length NUM_POKEMON diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 0d199cd..15710c4 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -394,6 +394,6 @@ PupitarAnimation: INCLUDE "gfx/pokemon/pupitar/anim.asm" TyranitarAnimation: INCLUDE "gfx/pokemon/tyranitar/anim.asm" LugiaAnimation: INCLUDE "gfx/pokemon/lugia/anim.asm" HoOhAnimation: INCLUDE "gfx/pokemon/ho_oh/anim.asm" -ShiShiAnimation: INCLUDE "gfx/pokemon/shi_shi/anim.asm" +KomainuAnimation: INCLUDE "gfx/pokemon/komainu/anim.asm" CelebiAnimation: INCLUDE "gfx/pokemon/celebi/anim.asm" EggAnimation: INCLUDE "gfx/pokemon/egg/anim.asm" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index 13bfd58..527abd2 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -396,6 +396,6 @@ BitmasksPointers: dw TyranitarBitmasks dw LugiaBitmasks dw HoOhBitmasks - dw ShiShiBitmasks + dw KomainuBitmasks dw CelebiBitmasks assert_table_length NUM_POKEMON diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index 3cc4dc0..98729d4 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -394,6 +394,6 @@ PupitarBitmasks: INCLUDE "gfx/pokemon/pupitar/bitmask.asm" TyranitarBitmasks: INCLUDE "gfx/pokemon/tyranitar/bitmask.asm" LugiaBitmasks: INCLUDE "gfx/pokemon/lugia/bitmask.asm" HoOhBitmasks: INCLUDE "gfx/pokemon/ho_oh/bitmask.asm" -ShiShiBitmasks: INCLUDE "gfx/pokemon/shi_shi/bitmask.asm" +KomainuBitmasks: INCLUDE "gfx/pokemon/komainu/bitmask.asm" CelebiBitmasks: INCLUDE "gfx/pokemon/celebi/bitmask.asm" EggBitmasks: INCLUDE "gfx/pokemon/egg/bitmask.asm" diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index 86dac5c..8b32eb4 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -396,6 +396,6 @@ FramesPointers: dba TyranitarFrames dba LugiaFrames dba HoOhFrames - dba ShiShiFrames + dba KomainuFrames dba CelebiFrames assert_table_length NUM_POKEMON diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index 868ae00..d2b7117 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -395,6 +395,6 @@ AnimationIdlePointers: dw TyranitarAnimationIdle dw LugiaAnimationIdle dw HoOhAnimationIdle - dw ShiShiAnimationIdle + dw KomainuAnimationIdle dw CelebiAnimationIdle assert_table_length NUM_POKEMON diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 3f1091e..727287c 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -394,6 +394,6 @@ PupitarAnimationIdle: INCLUDE "gfx/pokemon/pupitar/anim_idle.asm" TyranitarAnimationIdle: INCLUDE "gfx/pokemon/tyranitar/anim_idle.asm" LugiaAnimationIdle: INCLUDE "gfx/pokemon/lugia/anim_idle.asm" HoOhAnimationIdle: INCLUDE "gfx/pokemon/ho_oh/anim_idle.asm" -ShiShiAnimationIdle: INCLUDE "gfx/pokemon/shi_shi/anim_idle.asm" +KomainuAnimationIdle: INCLUDE "gfx/pokemon/komainu/anim_idle.asm" CelebiAnimationIdle: INCLUDE "gfx/pokemon/celebi/anim_idle.asm" EggAnimationIdle: INCLUDE "gfx/pokemon/egg/anim_idle.asm" diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm index 54fdf9b..e545eb3 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.asm @@ -184,6 +184,6 @@ PupitarFrames: INCLUDE "gfx/pokemon/pupitar/frames.asm" TyranitarFrames: INCLUDE "gfx/pokemon/tyranitar/frames.asm" LugiaFrames: INCLUDE "gfx/pokemon/lugia/frames.asm" HoOhFrames: INCLUDE "gfx/pokemon/ho_oh/frames.asm" -ShiShiFrames: INCLUDE "gfx/pokemon/shi_shi/frames.asm" +KomainuFrames: INCLUDE "gfx/pokemon/komainu/frames.asm" CelebiFrames: INCLUDE "gfx/pokemon/celebi/frames.asm" EggFrames: INCLUDE "gfx/pokemon/egg/frames.asm" diff --git a/gfx/pokemon/shi_shi/anim.asm b/gfx/pokemon/komainu/anim.asm similarity index 100% rename from gfx/pokemon/shi_shi/anim.asm rename to gfx/pokemon/komainu/anim.asm diff --git a/gfx/pokemon/shi_shi/anim_idle.asm b/gfx/pokemon/komainu/anim_idle.asm similarity index 100% rename from gfx/pokemon/shi_shi/anim_idle.asm rename to gfx/pokemon/komainu/anim_idle.asm diff --git a/gfx/pokemon/shi_shi/back.png b/gfx/pokemon/komainu/back.png similarity index 100% rename from gfx/pokemon/shi_shi/back.png rename to gfx/pokemon/komainu/back.png diff --git a/gfx/pokemon/shi_shi/front.png b/gfx/pokemon/komainu/front.png similarity index 100% rename from gfx/pokemon/shi_shi/front.png rename to gfx/pokemon/komainu/front.png diff --git a/gfx/pokemon/shi_shi/shiny.pal b/gfx/pokemon/komainu/shiny.pal similarity index 100% rename from gfx/pokemon/shi_shi/shiny.pal rename to gfx/pokemon/komainu/shiny.pal diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index ff0db73..d5b7fae 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -126,7 +126,7 @@ DebugFlyScript: addcellnum PHONE_MOM readvar VAR_BADGES - givepoke SHI_SHI, 70 + givepoke PIDGEOT, 70 closetext end diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index e06df7e..9c2d59e 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -3987,7 +3987,7 @@ BattleTower_UbersCheck: dw LUGIA dw HO_OH dw CELEBI - dw SHI_SHI + dw KOMAINU dw -1 .uber_under_70