diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 3b85211..3bea4b0 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -416,7 +416,8 @@ DEF JOHTO_POKEMON EQU const_value const TYRANITAR ; f8 const LUGIA ; f9 const HO_OH ; fa - const KOMAINU + const HYOSHU_YANG + const HYOSHU_YIN 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 a1c9db6..4be6344 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -421,6 +421,7 @@ 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/komainu.asm" +INCLUDE "data/pokemon/base_stats/hyoshu_yang.asm" +INCLUDE "data/pokemon/base_stats/hyoshu_yin.asm" INCLUDE "data/pokemon/base_stats/celebi.asm" .IndirectEnd:: diff --git a/data/pokemon/base_stats/komainu.asm b/data/pokemon/base_stats/hyoshu_yang.asm similarity index 79% rename from data/pokemon/base_stats/komainu.asm rename to data/pokemon/base_stats/hyoshu_yang.asm index 3cd953b..3e09e0e 100644 --- a/data/pokemon/base_stats/komainu.asm +++ b/data/pokemon/base_stats/hyoshu_yang.asm @@ -1,4 +1,3 @@ -; Yang form db 0 ; species ID placeholder db 106, 154, 90, 110, 130, 90 @@ -8,15 +7,15 @@ db 3 ; catch rate db 220 ; base exp db NO_ITEM, NO_ITEM ; items - db GENDER_UNKNOWN ; gender ratio + db GENDER_F0 ; gender ratio db 100 ; unknown 1 db 120 ; step cycles to hatch db 5 ; unknown 2 - INCBIN "gfx/pokemon/komainu/front.dimensions" + INCBIN "gfx/pokemon/hyoshu_yang/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, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, 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, CUT, STRENGTH, FLASH, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/hyoshu_yin.asm b/data/pokemon/base_stats/hyoshu_yin.asm new file mode 100644 index 0000000..7e38736 --- /dev/null +++ b/data/pokemon/base_stats/hyoshu_yin.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 106, 154, 90, 110, 130, 90 + ; hp atk def spd sat sdf + + db ICE, DARK ; type + db 3 ; catch rate + db 220 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 + db 120 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/hyoshu_yin/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, CUT, STRENGTH, ICE_BEAM + ; end diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 29d7a78..0cded88 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -400,6 +400,7 @@ 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 ; KOMAINU (placeholder) + mon_cry CRY_NIDORAN_M, 0, 128 ; HYOSHU_YANG (placeholder) + mon_cry CRY_NIDORAN_M, 0, 128 ; HYOSHU_YIN (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 e8df256..5cd9034 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -393,7 +393,8 @@ 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" -KomainuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/komainu.asm" +HyoshuYangPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hyoshu_yang.asm" +HyoshuYinPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hyoshu_yin.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/hyoshu_yang.asm b/data/pokemon/dex_entries/hyoshu_yang.asm new file mode 100644 index 0000000..d51c2ab --- /dev/null +++ b/data/pokemon/dex_entries/hyoshu_yang.asm @@ -0,0 +1,10 @@ + db "GUARDIAN@" ; species name + dw 1002, 6060 ; height, weight + + db "Leads and protects" + next "those fleeing from" + next "persecution. The" + + page "temari it holds" + next "is vital for it to" + next "ward off evil.@" diff --git a/data/pokemon/dex_entries/hyoshu_yin.asm b/data/pokemon/dex_entries/hyoshu_yin.asm new file mode 100644 index 0000000..9a384f5 --- /dev/null +++ b/data/pokemon/dex_entries/hyoshu_yin.asm @@ -0,0 +1,10 @@ + db "GUARDIAN@" ; species name + dw 1002, 6060 ; height, weight + + db "Folklore states it" + next "raised 3 powerful" + next "beasts. Some say" + + page "this #MON is" + next "a representation" + next "of the end.@" diff --git a/data/pokemon/dex_entries/komainu.asm b/data/pokemon/dex_entries/komainu.asm deleted file mode 100644 index fa0da5d..0000000 --- a/data/pokemon/dex_entries/komainu.asm +++ /dev/null @@ -1,10 +0,0 @@ - db "GUARDIAN@" ; species name - dw 1002, 6060 ; height, weight - - db "Said to be the" - next "embodiment of the" - next "the north wind, it" - - page "leads and protects" - next "those fleeing from" - next "persecution.@" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 304bc9b..505303c 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -395,6 +395,7 @@ PokedexDataPointerTable: dba TyranitarPokedexEntry dba LugiaPokedexEntry dba HoOhPokedexEntry - dba KomainuPokedexEntry + dba HyoshuYangPokedexEntry + dba HyoshuYinPokedexEntry dba CelebiPokedexEntry assert_table_length NUM_POKEMON diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 3ddc8b5..9812bbb 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -151,6 +151,8 @@ AlphabeticalPokedexOrder: dw HORSEA dw HOUNDOOM dw HOUNDOUR + dw HYOSHU_YANG + dw HYOSHU_YIN dw HYPNO dw IGGLYBUFF dw IGUANARCH @@ -312,7 +314,6 @@ AlphabeticalPokedexOrder: dw SEEL dw SENTRET dw SHELLDER - 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 656815e..a8db449 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -394,7 +394,8 @@ NewPokedexOrder: dw TYRANITAR dw LUGIA dw HO_OH - dw KOMAINU + dw HYOSHU_YANG + dw HYOSHU_YIN dw MEWTWO dw MEW dw CELEBI diff --git a/data/pokemon/egg_moves_johto.asm b/data/pokemon/egg_moves_johto.asm index b64f953..b654c0c 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/data/pokemon/egg_moves_johto.asm @@ -186,6 +186,7 @@ EggMovePointers2:: dw NoEggMoves2 dw NoEggMoves2 dw NoEggMoves2 + dw NoEggMoves2 .IndirectEnd:: ChikoritaEggMoves: diff --git a/data/pokemon/evolution_moves.asm b/data/pokemon/evolution_moves.asm index c6070ba..d0287b1 100644 --- a/data/pokemon/evolution_moves.asm +++ b/data/pokemon/evolution_moves.asm @@ -393,7 +393,8 @@ EvolutionMoves:: dw NO_MOVE ;TYRANITAR ; f8 dw NO_MOVE ;LUGIA ; f9 dw NO_MOVE ;HO_OH ; fa - dw NO_MOVE ;KOMAINU + dw NO_MOVE ;HYOSHU_YANG + dw NO_MOVE ;HYOSHU_YIN dw NO_MOVE ;CELEBI ; fb ;--- diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index 306d54d..b855f31 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -183,7 +183,8 @@ EvosAttacksPointers2:: dw TyranitarEvosAttacks dw LugiaEvosAttacks dw HoOhEvosAttacks - dw KomainuEvosAttacks + dw HyoshuYangEvosAttacks + dw HyoshuYinEvosAttacks dw CelebiEvosAttacks .IndirectEnd:: @@ -2719,7 +2720,7 @@ HoOhEvosAttacks: dbw 99, FUTURE_SIGHT db 0 ; no more level-up moves -KomainuEvosAttacks: +HyoshuYangEvosAttacks: db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, LEER @@ -2738,6 +2739,26 @@ KomainuEvosAttacks: dbw 88, FUTURE_SIGHT dbw 96, BLIZZARD db 0 ; no more level-up moves + +HyoshuYinEvosAttacks: + db 0 ; no more evolutions + dbw 1, SCRATCH + dbw 1, LEER + dbw 1, SCARY_FACE + dbw 8, WHIRLWIND + dbw 16, POWDER_SNOW + dbw 24, BEAT_UP + dbw 32, BITE + dbw 40, RECOVER + dbw 48, HAZE + dbw 54, ICE_BEAM + dbw 60, WIND_RIDE ; Signature move + dbw 68, CRUNCH + dbw 74, SWIFT + dbw 80, ANCIENTPOWER + dbw 88, FUTURE_SIGHT + dbw 96, BLIZZARD + db 0 ; no more level-up moves CelebiEvosAttacks: db 0 ; no more evolutions diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index b738e9b..a1aabb9 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -395,6 +395,7 @@ FirstEvoStages:: dw LARVITAR ;f8 dw LUGIA dw HO_OH - dw KOMAINU + dw HYOSHU_YANG + dw HYOSHU_YIN dw CELEBI assert_table_length NUM_POKEMON diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 60bb97e..36ef5ff 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -396,6 +396,7 @@ MonMenuIcons: db ICON_MONSTER ; TYRANITAR db ICON_LUGIA ; LUGIA db ICON_HO_OH ; HO_OH - db ICON_FOX ; KOMAINU + db ICON_FOX ; HYOSHU_YANG + db ICON_FOX ; HYOSHU_YIN db ICON_HUMANSHAPE ; CELEBI assert_table_length NUM_POKEMON diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 9fa6f56..1a93d97 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -399,6 +399,7 @@ PokemonNames:: db "TYRANITAR@" db "LUGIA@@@@@" db "HO-OH@@@@@" - db "KOMAINU@@@" + db "HYOSHU@@@@" + db "HYOSHU@@@@" db "CELEBI@@@@" assert_table_length NUM_POKEMON diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 14d8562..b9c47cd 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -824,8 +824,10 @@ 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/komainu/front.gbcpal", middle_colors -INCLUDE "gfx/pokemon/komainu/shiny.pal" +INCBIN "gfx/pokemon/hyoshu_yang/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/hyoshu_yang/shiny.pal" +INCBIN "gfx/pokemon/hyoshu_yin/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/hyoshu_yin/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 0406bf6..cf2eec1 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -804,8 +804,10 @@ PokemonPicPointers:: dba LugiaBackpic dba HoOhFrontpic dba HoOhBackpic - dba KomainuFrontpic - dba KomainuBackpic + dba HyoshuYangFrontpic + dba HyoshuYangBackpic + dba HyoshuYinFrontpic + dba HyoshuYinBackpic dba CelebiFrontpic dba CelebiBackpic assert_table_length NUM_POKEMON + 1 diff --git a/gfx/footprints/komainu.png b/gfx/footprints/hyoshu_yang.png similarity index 100% rename from gfx/footprints/komainu.png rename to gfx/footprints/hyoshu_yang.png diff --git a/gfx/footprints/hyoshu_yin.png b/gfx/footprints/hyoshu_yin.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/hyoshu_yin.png differ diff --git a/gfx/footprints_johto.asm b/gfx/footprints_johto.asm index cecfc19..f16b859 100644 --- a/gfx/footprints_johto.asm +++ b/gfx/footprints_johto.asm @@ -183,7 +183,8 @@ INCBIN "gfx/footprints/pupitar.1bpp" INCBIN "gfx/footprints/tyranitar.1bpp" INCBIN "gfx/footprints/lugia.1bpp" INCBIN "gfx/footprints/ho_oh.1bpp" -INCBIN "gfx/footprints/komainu.1bpp" +INCBIN "gfx/footprints/hyoshu_yang.1bpp" +INCBIN "gfx/footprints/hyoshu_yin.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 e3c8393..aa10087 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -713,16 +713,14 @@ SECTION "Pics 19", ROMX ; Seems to be an accidental copy of the previous bank -TotartleFrontpic: INCBIN "gfx/pokemon/totartle/front.animated.2bpp.lz" -TotartleBackpic: INCBIN "gfx/pokemon/totartle/back.2bpp.lz" -BlastykeFrontpic: INCBIN "gfx/pokemon/blastyke/front.animated.2bpp.lz" -BlastykeBackpic: INCBIN "gfx/pokemon/blastyke/back.2bpp.lz" 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" -KomainuFrontpic: INCBIN "gfx/pokemon/komainu/front.animated.2bpp.lz" -KomainuBackpic: INCBIN "gfx/pokemon/komainu/back.2bpp.lz" +HyoshuYangFrontpic: INCBIN "gfx/pokemon/hyoshu_yang/front.animated.2bpp.lz" +HyoshuYangBackpic: INCBIN "gfx/pokemon/hyoshu_yang/back.2bpp.lz" +HyoshuYinFrontpic: INCBIN "gfx/pokemon/hyoshu_yin/front.animated.2bpp.lz" +HyoshuYinBackpic: INCBIN "gfx/pokemon/hyoshu_yin/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" @@ -822,6 +820,10 @@ KiwookedFrontpic: INCBIN "gfx/pokemon/kiwooked/front.animated.2bpp.lz" KiwookedBackpic:: INCBIN "gfx/pokemon/kiwooked/back.2bpp.lz" CyclorpFrontpic: INCBIN "gfx/pokemon/cyclorp/front.animated.2bpp.lz" CyclorpBackpic: INCBIN "gfx/pokemon/cyclorp/back.2bpp.lz" +TotartleFrontpic: INCBIN "gfx/pokemon/totartle/front.animated.2bpp.lz" +TotartleBackpic: INCBIN "gfx/pokemon/totartle/back.2bpp.lz" +BlastykeFrontpic: INCBIN "gfx/pokemon/blastyke/front.animated.2bpp.lz" +BlastykeBackpic: INCBIN "gfx/pokemon/blastyke/back.2bpp.lz" SECTION "Pics 22", ROMX CheepFrontpic: INCBIN "gfx/pokemon/cheep/front.animated.2bpp.lz" diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index f1c21ae..9b073ed 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -395,6 +395,7 @@ AnimationPointers: dw TyranitarAnimation dw LugiaAnimation dw HoOhAnimation - dw KomainuAnimation + dw HyoshuYangAnimation + dw HyoshuYinAnimation dw CelebiAnimation assert_table_length NUM_POKEMON diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 15710c4..91627cc 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -394,6 +394,7 @@ 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" -KomainuAnimation: INCLUDE "gfx/pokemon/komainu/anim.asm" +HyoshuYangAnimation: INCLUDE "gfx/pokemon/hyoshu_yang/anim.asm" +HyoshuYinAnimation: INCLUDE "gfx/pokemon/hyoshu_yin/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 527abd2..91f01e1 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -396,6 +396,7 @@ BitmasksPointers: dw TyranitarBitmasks dw LugiaBitmasks dw HoOhBitmasks - dw KomainuBitmasks + dw HyoshuYangBitmasks + dw HyoshuYinBitmasks dw CelebiBitmasks assert_table_length NUM_POKEMON diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index 98729d4..56553f3 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -394,6 +394,7 @@ 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" -KomainuBitmasks: INCLUDE "gfx/pokemon/komainu/bitmask.asm" +HyoshuYangBitmasks: INCLUDE "gfx/pokemon/hyoshu_yang/bitmask.asm" +HyoshuYinBitmasks: INCLUDE "gfx/pokemon/hyoshu_yin/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 8b32eb4..bcca1b9 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -396,6 +396,7 @@ FramesPointers: dba TyranitarFrames dba LugiaFrames dba HoOhFrames - dba KomainuFrames + dba HyoshuYangFrames + dba HyoshuYinFrames dba CelebiFrames assert_table_length NUM_POKEMON diff --git a/gfx/pokemon/komainu/anim.asm b/gfx/pokemon/hyoshu_yang/anim.asm similarity index 100% rename from gfx/pokemon/komainu/anim.asm rename to gfx/pokemon/hyoshu_yang/anim.asm diff --git a/gfx/pokemon/komainu/anim_idle.asm b/gfx/pokemon/hyoshu_yang/anim_idle.asm similarity index 100% rename from gfx/pokemon/komainu/anim_idle.asm rename to gfx/pokemon/hyoshu_yang/anim_idle.asm diff --git a/gfx/pokemon/hyoshu_yang/back.png b/gfx/pokemon/hyoshu_yang/back.png new file mode 100644 index 0000000..ff517dc Binary files /dev/null and b/gfx/pokemon/hyoshu_yang/back.png differ diff --git a/gfx/pokemon/hyoshu_yang/front.png b/gfx/pokemon/hyoshu_yang/front.png new file mode 100644 index 0000000..dd19689 Binary files /dev/null and b/gfx/pokemon/hyoshu_yang/front.png differ diff --git a/gfx/pokemon/hyoshu_yang/shiny.pal b/gfx/pokemon/hyoshu_yang/shiny.pal new file mode 100644 index 0000000..bdc2c0a --- /dev/null +++ b/gfx/pokemon/hyoshu_yang/shiny.pal @@ -0,0 +1,2 @@ + RGB 28, 26, 10 + RGB 22, 20, 05 \ No newline at end of file diff --git a/gfx/pokemon/hyoshu_yin/anim.asm b/gfx/pokemon/hyoshu_yin/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/hyoshu_yin/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/hyoshu_yin/anim_idle.asm b/gfx/pokemon/hyoshu_yin/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/hyoshu_yin/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/hyoshu_yin/back.png b/gfx/pokemon/hyoshu_yin/back.png new file mode 100644 index 0000000..5e09f2a Binary files /dev/null and b/gfx/pokemon/hyoshu_yin/back.png differ diff --git a/gfx/pokemon/hyoshu_yin/front.png b/gfx/pokemon/hyoshu_yin/front.png new file mode 100644 index 0000000..dcf3f3f Binary files /dev/null and b/gfx/pokemon/hyoshu_yin/front.png differ diff --git a/gfx/pokemon/hyoshu_yin/shiny.pal b/gfx/pokemon/hyoshu_yin/shiny.pal new file mode 100644 index 0000000..9760c48 --- /dev/null +++ b/gfx/pokemon/hyoshu_yin/shiny.pal @@ -0,0 +1,2 @@ + RGB 25, 23, 07 + RGB 20, 18, 03 \ No newline at end of file diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index d2b7117..c976d4b 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -395,6 +395,7 @@ AnimationIdlePointers: dw TyranitarAnimationIdle dw LugiaAnimationIdle dw HoOhAnimationIdle - dw KomainuAnimationIdle + dw HyoshuYangAnimationIdle + dw HyoshuYinAnimationIdle dw CelebiAnimationIdle assert_table_length NUM_POKEMON diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 727287c..f8256e6 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -394,6 +394,7 @@ 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" -KomainuAnimationIdle: INCLUDE "gfx/pokemon/komainu/anim_idle.asm" +HyoshuYangAnimationIdle: INCLUDE "gfx/pokemon/hyoshu_yang/anim_idle.asm" +HyoshuYinAnimationIdle: INCLUDE "gfx/pokemon/hyoshu_yin/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 e545eb3..2e174ca 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.asm @@ -184,6 +184,7 @@ 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" -KomainuFrames: INCLUDE "gfx/pokemon/komainu/frames.asm" +HyoshuYangFrames: INCLUDE "gfx/pokemon/hyoshu_yang/frames.asm" +HyoshuYinFrames: INCLUDE "gfx/pokemon/hyoshu_yin/frames.asm" CelebiFrames: INCLUDE "gfx/pokemon/celebi/frames.asm" EggFrames: INCLUDE "gfx/pokemon/egg/frames.asm" diff --git a/gfx/pokemon/komainu/back.png b/gfx/pokemon/komainu/back.png deleted file mode 100644 index 37502cc..0000000 Binary files a/gfx/pokemon/komainu/back.png and /dev/null differ diff --git a/gfx/pokemon/komainu/front.png b/gfx/pokemon/komainu/front.png deleted file mode 100644 index 16e1ebb..0000000 Binary files a/gfx/pokemon/komainu/front.png and /dev/null differ diff --git a/gfx/pokemon/komainu/shiny.pal b/gfx/pokemon/komainu/shiny.pal deleted file mode 100644 index aaf0ff9..0000000 --- a/gfx/pokemon/komainu/shiny.pal +++ /dev/null @@ -1,2 +0,0 @@ - RGB 18, 18, 11 - RGB 25, 25, 18 \ No newline at end of file diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index d5b7fae..0a5f9ec 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -42,15 +42,14 @@ DebugPokemon3Script: cry STROMEN pause 15 closetext - loadvar VAR_BATTLETYPE, BATTLETYPE_SHINY - loadwildmon STROMEN, 60 + loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE + loadwildmon HYOSHU_YIN, 75 startbattle reloadmapafterbattle end DebugTextA: - text "Sparkle..." - line "Sparkle..." + text "Komaiiii!" done DebugPokemon4Script: @@ -60,14 +59,14 @@ DebugPokemon4Script: cry STROMEN pause 15 closetext - loadvar VAR_BATTLETYPE, BATTLETYPE_SAFARI - loadwildmon STROMEN, 60 + loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE + loadwildmon HYOSHU_YANG, 75 startbattle reloadmapafterbattle end DebugTextB: - text "Do-ku-raaagh!" + text "Komaiiii!" done DebugFlyScript: diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 9c2d59e..4daa5b9 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -3987,7 +3987,8 @@ BattleTower_UbersCheck: dw LUGIA dw HO_OH dw CELEBI - dw KOMAINU + dw HYOSHU_YANG + dw HYOSHU_YIN dw -1 .uber_under_70