thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-11-04 21:01:01 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hyoshu-Yang & Hyoshu-Yin (Rework)

Browse source 
A rework of the immediately previous rework. Huh.

Changes the Komainu name to Hyoshu, and implements the Yin form too, complete with stats, moves, and a very WIP sprite.
This commit is contained in:
Martha Schilling 2024-08-23 21:57:52 +01:00
parent 8643d40ab1
commit cbf8cbb18c
47 changed files with 138 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
constants/pokemon_constants.asm
View file

@ -416,7 +416,8 @@ DEF JOHTO_POKEMON EQU const_value
const TYRANITAR ; f8 const TYRANITAR ; f8
const LUGIA ; f9 const LUGIA ; f9
const HO_OH ; fa const HO_OH ; fa
const KOMAINU const HYOSHU_YANG
const HYOSHU_YIN
const CELEBI ; fb const CELEBI ; fb
DEF NUM_POKEMON EQU const_value - 1 DEF NUM_POKEMON EQU const_value - 1

3
data/pokemon/base_stats.asm
View file

@ -421,6 +421,7 @@ INCLUDE "data/pokemon/base_stats/pupitar.asm"
INCLUDE "data/pokemon/base_stats/tyranitar.asm" INCLUDE "data/pokemon/base_stats/tyranitar.asm"
INCLUDE "data/pokemon/base_stats/lugia.asm" INCLUDE "data/pokemon/base_stats/lugia.asm"
INCLUDE "data/pokemon/base_stats/ho_oh.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" INCLUDE "data/pokemon/base_stats/celebi.asm"
.IndirectEnd:: .IndirectEnd::

7
data/pokemon/base_stats/komainu.asm → data/pokemon/base_stats/hyoshu_yang.asm
View file

@ -1,4 +1,3 @@
; Yang form
db 0 ; species ID placeholder db 0 ; species ID placeholder
db 106, 154, 90, 110, 130, 90 db 106, 154, 90, 110, 130, 90
@ -8,15 +7,15 @@
db 3 ; catch rate db 3 ; catch rate
db 220 ; base exp db 220 ; base exp
db NO_ITEM, NO_ITEM ; items db NO_ITEM, NO_ITEM ; items
db GENDER_UNKNOWN ; gender ratio db GENDER_F0 ; gender ratio
db 100 ; unknown 1 db 100 ; unknown 1
db 120 ; step cycles to hatch db 120 ; step cycles to hatch
db 5 ; unknown 2 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) dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_SLOW ; growth rate db GROWTH_SLOW ; growth rate
dn EGG_NONE, EGG_NONE ; egg groups dn EGG_NONE, EGG_NONE ; egg groups
; tm/hm learnset ; 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 ; end

21
data/pokemon/base_stats/hyoshu_yin.asm Normal file
View file

@ -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

3
data/pokemon/cries.asm
View file

@ -400,6 +400,7 @@ PokemonCries::
mon_cry CRY_RAIKOU, -256, 384 ; TYRANITAR mon_cry CRY_RAIKOU, -256, 384 ; TYRANITAR
mon_cry CRY_TYPHLOSION, 0, 256 ; LUGIA mon_cry CRY_TYPHLOSION, 0, 256 ; LUGIA
mon_cry CRY_AIPOM, 0, 384 ; HO_OH 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 mon_cry CRY_ENTEI, 330, 273 ; CELEBI
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

3
data/pokemon/dex_entries.asm
View file

@ -393,7 +393,8 @@ PupitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pupitar.asm"
TyranitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tyranitar.asm" TyranitarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tyranitar.asm"
LugiaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lugia.asm" LugiaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lugia.asm"
HoOhPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ho_oh.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" CelebiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/celebi.asm"
MagipreyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magiprey.asm" MagipreyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magiprey.asm"
TerradosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/terrados.asm" TerradosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/terrados.asm"

10
data/pokemon/dex_entries/hyoshu_yang.asm Normal file
View file

@ -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.@"

10
data/pokemon/dex_entries/hyoshu_yin.asm Normal file
View file

@ -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.@"

10
data/pokemon/dex_entries/komainu.asm
View file

@ -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.@"

3
data/pokemon/dex_entry_pointers.asm
View file

@ -395,6 +395,7 @@ PokedexDataPointerTable:
dba TyranitarPokedexEntry dba TyranitarPokedexEntry
dba LugiaPokedexEntry dba LugiaPokedexEntry
dba HoOhPokedexEntry dba HoOhPokedexEntry
dba KomainuPokedexEntry dba HyoshuYangPokedexEntry
dba HyoshuYinPokedexEntry
dba CelebiPokedexEntry dba CelebiPokedexEntry
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

3
data/pokemon/dex_order_alpha.asm
View file

@ -151,6 +151,8 @@ AlphabeticalPokedexOrder:
dw HORSEA dw HORSEA
dw HOUNDOOM dw HOUNDOOM
dw HOUNDOUR dw HOUNDOUR
dw HYOSHU_YANG
dw HYOSHU_YIN
dw HYPNO dw HYPNO
dw IGGLYBUFF dw IGGLYBUFF
dw IGUANARCH dw IGUANARCH
@ -312,7 +314,6 @@ AlphabeticalPokedexOrder:
dw SEEL dw SEEL
dw SENTRET dw SENTRET
dw SHELLDER dw SHELLDER
dw KOMAINU
dw SHUCKLE dw SHUCKLE
dw SKARMORY dw SKARMORY
dw SKIPLOOM dw SKIPLOOM

3
data/pokemon/dex_order_new.asm
View file

@ -394,7 +394,8 @@ NewPokedexOrder:
dw TYRANITAR dw TYRANITAR
dw LUGIA dw LUGIA
dw HO_OH dw HO_OH
dw KOMAINU dw HYOSHU_YANG
dw HYOSHU_YIN
dw MEWTWO dw MEWTWO
dw MEW dw MEW
dw CELEBI dw CELEBI

1
data/pokemon/egg_moves_johto.asm
View file

@ -186,6 +186,7 @@ EggMovePointers2::
dw NoEggMoves2 dw NoEggMoves2
dw NoEggMoves2 dw NoEggMoves2
dw NoEggMoves2 dw NoEggMoves2
dw NoEggMoves2
.IndirectEnd:: .IndirectEnd::
ChikoritaEggMoves: ChikoritaEggMoves:

3
data/pokemon/evolution_moves.asm
View file

@ -393,7 +393,8 @@ EvolutionMoves::
dw NO_MOVE ;TYRANITAR ; f8 dw NO_MOVE ;TYRANITAR ; f8
dw NO_MOVE ;LUGIA ; f9 dw NO_MOVE ;LUGIA ; f9
dw NO_MOVE ;HO_OH ; fa 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 dw NO_MOVE ;CELEBI ; fb
;--- ;---

25
data/pokemon/evos_attacks_johto.asm
View file

@ -183,7 +183,8 @@ EvosAttacksPointers2::
dw TyranitarEvosAttacks dw TyranitarEvosAttacks
dw LugiaEvosAttacks dw LugiaEvosAttacks
dw HoOhEvosAttacks dw HoOhEvosAttacks
dw KomainuEvosAttacks dw HyoshuYangEvosAttacks
dw HyoshuYinEvosAttacks
dw CelebiEvosAttacks dw CelebiEvosAttacks
.IndirectEnd:: .IndirectEnd::
@ -2719,7 +2720,7 @@ HoOhEvosAttacks:
dbw 99, FUTURE_SIGHT dbw 99, FUTURE_SIGHT
db 0 ; no more level-up moves db 0 ; no more level-up moves
KomainuEvosAttacks: HyoshuYangEvosAttacks:
db 0 ; no more evolutions db 0 ; no more evolutions
dbw 1, SCRATCH dbw 1, SCRATCH
dbw 1, LEER dbw 1, LEER
@ -2738,6 +2739,26 @@ KomainuEvosAttacks:
dbw 88, FUTURE_SIGHT dbw 88, FUTURE_SIGHT
dbw 96, BLIZZARD dbw 96, BLIZZARD
db 0 ; no more level-up moves 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: CelebiEvosAttacks:
db 0 ; no more evolutions db 0 ; no more evolutions

3
data/pokemon/first_stages.asm
View file

@ -395,6 +395,7 @@ FirstEvoStages::
dw LARVITAR ;f8 dw LARVITAR ;f8
dw LUGIA dw LUGIA
dw HO_OH dw HO_OH
dw KOMAINU dw HYOSHU_YANG
dw HYOSHU_YIN
dw CELEBI dw CELEBI
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

3
data/pokemon/menu_icons.asm
View file

@ -396,6 +396,7 @@ MonMenuIcons:
db ICON_MONSTER ; TYRANITAR db ICON_MONSTER ; TYRANITAR
db ICON_LUGIA ; LUGIA db ICON_LUGIA ; LUGIA
db ICON_HO_OH ; HO_OH db ICON_HO_OH ; HO_OH
db ICON_FOX ; KOMAINU db ICON_FOX ; HYOSHU_YANG
db ICON_FOX ; HYOSHU_YIN
db ICON_HUMANSHAPE ; CELEBI db ICON_HUMANSHAPE ; CELEBI
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

3
data/pokemon/names.asm
View file

@ -399,6 +399,7 @@ PokemonNames::
db "TYRANITAR@" db "TYRANITAR@"
db "LUGIA@@@@@" db "LUGIA@@@@@"
db "HO-OH@@@@@" db "HO-OH@@@@@"
db "KOMAINU@@@" db "HYOSHU@@@@"
db "HYOSHU@@@@"
db "CELEBI@@@@" db "CELEBI@@@@"
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

6
data/pokemon/palettes.asm
View file

@ -824,8 +824,10 @@ INCBIN "gfx/pokemon/lugia/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/lugia/shiny.pal" INCLUDE "gfx/pokemon/lugia/shiny.pal"
INCBIN "gfx/pokemon/ho_oh/front.gbcpal", middle_colors INCBIN "gfx/pokemon/ho_oh/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/ho_oh/shiny.pal" INCLUDE "gfx/pokemon/ho_oh/shiny.pal"
INCBIN "gfx/pokemon/komainu/front.gbcpal", middle_colors INCBIN "gfx/pokemon/hyoshu_yang/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/komainu/shiny.pal" 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 INCBIN "gfx/pokemon/celebi/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/celebi/shiny.pal" INCLUDE "gfx/pokemon/celebi/shiny.pal"

6
data/pokemon/pic_pointers.asm
View file

@ -804,8 +804,10 @@ PokemonPicPointers::
dba LugiaBackpic dba LugiaBackpic
dba HoOhFrontpic dba HoOhFrontpic
dba HoOhBackpic dba HoOhBackpic
dba KomainuFrontpic dba HyoshuYangFrontpic
dba KomainuBackpic dba HyoshuYangBackpic
dba HyoshuYinFrontpic
dba HyoshuYinBackpic
dba CelebiFrontpic dba CelebiFrontpic
dba CelebiBackpic dba CelebiBackpic
assert_table_length NUM_POKEMON + 1 assert_table_length NUM_POKEMON + 1

0
gfx/footprints/komainu.png → gfx/footprints/hyoshu_yang.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 69 B

After

Width:  |  Height:  |  Size: 69 B

BIN
gfx/footprints/hyoshu_yin.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 69 B

3
gfx/footprints_johto.asm
View file

@ -183,7 +183,8 @@ INCBIN "gfx/footprints/pupitar.1bpp"
INCBIN "gfx/footprints/tyranitar.1bpp" INCBIN "gfx/footprints/tyranitar.1bpp"
INCBIN "gfx/footprints/lugia.1bpp" INCBIN "gfx/footprints/lugia.1bpp"
INCBIN "gfx/footprints/ho_oh.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/celebi.1bpp"
INCBIN "gfx/footprints/252.1bpp" INCBIN "gfx/footprints/252.1bpp"
INCBIN "gfx/footprints/253.1bpp" INCBIN "gfx/footprints/253.1bpp"

14
gfx/pics.asm
View file

@ -713,16 +713,14 @@ SECTION "Pics 19", ROMX
; Seems to be an accidental copy of the previous bank ; 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" BellignanFrontpic: INCBIN "gfx/pokemon/bellignan/front.animated.2bpp.lz"
BellignanBackpic: INCBIN "gfx/pokemon/bellignan/back.2bpp.lz" BellignanBackpic: INCBIN "gfx/pokemon/bellignan/back.2bpp.lz"
WalkingWakeFrontpic: INCBIN "gfx/pokemon/walking_wake/front.animated.2bpp.lz" WalkingWakeFrontpic: INCBIN "gfx/pokemon/walking_wake/front.animated.2bpp.lz"
WalkingWakeBackpic: INCBIN "gfx/pokemon/walking_wake/back.2bpp.lz" WalkingWakeBackpic: INCBIN "gfx/pokemon/walking_wake/back.2bpp.lz"
KomainuFrontpic: INCBIN "gfx/pokemon/komainu/front.animated.2bpp.lz" HyoshuYangFrontpic: INCBIN "gfx/pokemon/hyoshu_yang/front.animated.2bpp.lz"
KomainuBackpic: INCBIN "gfx/pokemon/komainu/back.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" MunchlaxFrontpic: INCBIN "gfx/pokemon/munchlax/front.animated.2bpp.lz"
MunchlaxBackpic: INCBIN "gfx/pokemon/munchlax/back.2bpp.lz" MunchlaxBackpic: INCBIN "gfx/pokemon/munchlax/back.2bpp.lz"
NidoreignFrontpic: INCBIN "gfx/pokemon/nidoreign/front.animated.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" KiwookedBackpic:: INCBIN "gfx/pokemon/kiwooked/back.2bpp.lz"
CyclorpFrontpic: INCBIN "gfx/pokemon/cyclorp/front.animated.2bpp.lz" CyclorpFrontpic: INCBIN "gfx/pokemon/cyclorp/front.animated.2bpp.lz"
CyclorpBackpic: INCBIN "gfx/pokemon/cyclorp/back.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 SECTION "Pics 22", ROMX
CheepFrontpic: INCBIN "gfx/pokemon/cheep/front.animated.2bpp.lz" CheepFrontpic: INCBIN "gfx/pokemon/cheep/front.animated.2bpp.lz"

3
gfx/pokemon/anim_pointers.asm
View file

@ -395,6 +395,7 @@ AnimationPointers:
dw TyranitarAnimation dw TyranitarAnimation
dw LugiaAnimation dw LugiaAnimation
dw HoOhAnimation dw HoOhAnimation
dw KomainuAnimation dw HyoshuYangAnimation
dw HyoshuYinAnimation
dw CelebiAnimation dw CelebiAnimation
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

3
gfx/pokemon/anims.asm
View file

@ -394,6 +394,7 @@ PupitarAnimation: INCLUDE "gfx/pokemon/pupitar/anim.asm"
TyranitarAnimation: INCLUDE "gfx/pokemon/tyranitar/anim.asm" TyranitarAnimation: INCLUDE "gfx/pokemon/tyranitar/anim.asm"
LugiaAnimation: INCLUDE "gfx/pokemon/lugia/anim.asm" LugiaAnimation: INCLUDE "gfx/pokemon/lugia/anim.asm"
HoOhAnimation: INCLUDE "gfx/pokemon/ho_oh/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" CelebiAnimation: INCLUDE "gfx/pokemon/celebi/anim.asm"
EggAnimation: INCLUDE "gfx/pokemon/egg/anim.asm" EggAnimation: INCLUDE "gfx/pokemon/egg/anim.asm"

3
gfx/pokemon/bitmask_pointers.asm
View file

@ -396,6 +396,7 @@ BitmasksPointers:
dw TyranitarBitmasks dw TyranitarBitmasks
dw LugiaBitmasks dw LugiaBitmasks
dw HoOhBitmasks dw HoOhBitmasks
dw KomainuBitmasks dw HyoshuYangBitmasks
dw HyoshuYinBitmasks
dw CelebiBitmasks dw CelebiBitmasks
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

3
gfx/pokemon/bitmasks.asm
View file

@ -394,6 +394,7 @@ PupitarBitmasks: INCLUDE "gfx/pokemon/pupitar/bitmask.asm"
TyranitarBitmasks: INCLUDE "gfx/pokemon/tyranitar/bitmask.asm" TyranitarBitmasks: INCLUDE "gfx/pokemon/tyranitar/bitmask.asm"
LugiaBitmasks: INCLUDE "gfx/pokemon/lugia/bitmask.asm" LugiaBitmasks: INCLUDE "gfx/pokemon/lugia/bitmask.asm"
HoOhBitmasks: INCLUDE "gfx/pokemon/ho_oh/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" CelebiBitmasks: INCLUDE "gfx/pokemon/celebi/bitmask.asm"
EggBitmasks: INCLUDE "gfx/pokemon/egg/bitmask.asm" EggBitmasks: INCLUDE "gfx/pokemon/egg/bitmask.asm"

3
gfx/pokemon/frame_pointers.asm
View file

@ -396,6 +396,7 @@ FramesPointers:
dba TyranitarFrames dba TyranitarFrames
dba LugiaFrames dba LugiaFrames
dba HoOhFrames dba HoOhFrames
dba KomainuFrames dba HyoshuYangFrames
dba HyoshuYinFrames
dba CelebiFrames dba CelebiFrames
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

0
gfx/pokemon/komainu/anim.asm → gfx/pokemon/hyoshu_yang/anim.asm
View file

0
gfx/pokemon/komainu/anim_idle.asm → gfx/pokemon/hyoshu_yang/anim_idle.asm
View file

BIN
gfx/pokemon/hyoshu_yang/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 441 B

BIN
gfx/pokemon/hyoshu_yang/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 759 B

2
gfx/pokemon/hyoshu_yang/shiny.pal Normal file
View file

@ -0,0 +1,2 @@
RGB 28, 26, 10
RGB 22, 20, 05

1
gfx/pokemon/hyoshu_yin/anim.asm Normal file
View file

@ -0,0 +1 @@
endanim

1
gfx/pokemon/hyoshu_yin/anim_idle.asm Normal file
View file

@ -0,0 +1 @@
endanim

BIN
gfx/pokemon/hyoshu_yin/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 438 B

BIN
gfx/pokemon/hyoshu_yin/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 739 B

2
gfx/pokemon/hyoshu_yin/shiny.pal Normal file
View file

@ -0,0 +1,2 @@
RGB 25, 23, 07
RGB 20, 18, 03

3
gfx/pokemon/idle_pointers.asm
View file

@ -395,6 +395,7 @@ AnimationIdlePointers:
dw TyranitarAnimationIdle dw TyranitarAnimationIdle
dw LugiaAnimationIdle dw LugiaAnimationIdle
dw HoOhAnimationIdle dw HoOhAnimationIdle
dw KomainuAnimationIdle dw HyoshuYangAnimationIdle
dw HyoshuYinAnimationIdle
dw CelebiAnimationIdle dw CelebiAnimationIdle
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

3
gfx/pokemon/idles.asm
View file

@ -394,6 +394,7 @@ PupitarAnimationIdle: INCLUDE "gfx/pokemon/pupitar/anim_idle.asm"
TyranitarAnimationIdle: INCLUDE "gfx/pokemon/tyranitar/anim_idle.asm" TyranitarAnimationIdle: INCLUDE "gfx/pokemon/tyranitar/anim_idle.asm"
LugiaAnimationIdle: INCLUDE "gfx/pokemon/lugia/anim_idle.asm" LugiaAnimationIdle: INCLUDE "gfx/pokemon/lugia/anim_idle.asm"
HoOhAnimationIdle: INCLUDE "gfx/pokemon/ho_oh/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" CelebiAnimationIdle: INCLUDE "gfx/pokemon/celebi/anim_idle.asm"
EggAnimationIdle: INCLUDE "gfx/pokemon/egg/anim_idle.asm" EggAnimationIdle: INCLUDE "gfx/pokemon/egg/anim_idle.asm"

3
gfx/pokemon/johto_frames.asm
View file

@ -184,6 +184,7 @@ PupitarFrames: INCLUDE "gfx/pokemon/pupitar/frames.asm"
TyranitarFrames: INCLUDE "gfx/pokemon/tyranitar/frames.asm" TyranitarFrames: INCLUDE "gfx/pokemon/tyranitar/frames.asm"
LugiaFrames: INCLUDE "gfx/pokemon/lugia/frames.asm" LugiaFrames: INCLUDE "gfx/pokemon/lugia/frames.asm"
HoOhFrames: INCLUDE "gfx/pokemon/ho_oh/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" CelebiFrames: INCLUDE "gfx/pokemon/celebi/frames.asm"
EggFrames: INCLUDE "gfx/pokemon/egg/frames.asm" EggFrames: INCLUDE "gfx/pokemon/egg/frames.asm"

BIN
gfx/pokemon/komainu/back.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 565 B

BIN
gfx/pokemon/komainu/front.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 888 B

2
gfx/pokemon/komainu/shiny.pal
View file

@ -1,2 +0,0 @@
RGB 18, 18, 11
RGB 25, 25, 18

13
maps/DebugRoom.asm
View file

@ -42,15 +42,14 @@ DebugPokemon3Script:
cry STROMEN cry STROMEN
pause 15 pause 15
closetext closetext
loadvar VAR_BATTLETYPE, BATTLETYPE_SHINY loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE
loadwildmon STROMEN, 60 loadwildmon HYOSHU_YIN, 75
startbattle startbattle
reloadmapafterbattle reloadmapafterbattle
end end
DebugTextA: DebugTextA:
text "Sparkle..." text "Komaiiii!"
line "Sparkle..."
done done
DebugPokemon4Script: DebugPokemon4Script:
@ -60,14 +59,14 @@ DebugPokemon4Script:
cry STROMEN cry STROMEN
pause 15 pause 15
closetext closetext
loadvar VAR_BATTLETYPE, BATTLETYPE_SAFARI loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE
loadwildmon STROMEN, 60 loadwildmon HYOSHU_YANG, 75
startbattle startbattle
reloadmapafterbattle reloadmapafterbattle
end end
DebugTextB: DebugTextB:
text "Do-ku-raaagh!" text "Komaiiii!"
done done
DebugFlyScript: DebugFlyScript:

3
mobile/mobile_46.asm
View file

@ -3987,7 +3987,8 @@ BattleTower_UbersCheck:
dw LUGIA dw LUGIA
dw HO_OH dw HO_OH
dw CELEBI dw CELEBI
dw KOMAINU dw HYOSHU_YANG
dw HYOSHU_YIN
dw -1 dw -1
.uber_under_70 .uber_under_70