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

Komainu-Yang (Rework)

Browse source 
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
This commit is contained in:
Llinos Evans 2024-08-18 17:23:19 +01:00
parent 0f7ce337f5
commit 8643d40ab1
35 changed files with 51 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/pokemon_constants.asm
View file

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

2
data/pokemon/base_stats.asm
View file

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

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

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

2
data/pokemon/cries.asm
View file

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

2
data/pokemon/dex_entries.asm
View file

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

0
data/pokemon/dex_entries/shi_shi.asm → data/pokemon/dex_entries/komainu.asm
View file

0
data/pokemon/dex_entries/amanobi.asm → data/pokemon/dex_entries/tanobi.asm
View file

2
data/pokemon/dex_entry_pointers.asm
View file

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

2
data/pokemon/dex_order_alpha.asm
View file

@ -312,7 +312,7 @@ AlphabeticalPokedexOrder:
dw SEEL
dw SENTRET
dw SHELLDER
dw SHI_SHI
dw KOMAINU
dw SHUCKLE
dw SKARMORY
dw SKIPLOOM

2
data/pokemon/dex_order_new.asm
View file

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

2
data/pokemon/evolution_moves.asm
View file

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

31
data/pokemon/evos_attacks_johto.asm
View file

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

2
data/pokemon/first_stages.asm
View file

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

2
data/pokemon/menu_icons.asm
View file

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

4
data/pokemon/names.asm
View file

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

4
data/pokemon/palettes.asm
View file

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

4
data/pokemon/pic_pointers.asm
View file

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

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

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 69 B

After

Width:  |  Height:  |  Size: 69 B

2
gfx/footprints_johto.asm
View file

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

4
gfx/pics.asm
View file

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

2
gfx/pokemon/anim_pointers.asm
View file

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

2
gfx/pokemon/anims.asm
View file

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

2
gfx/pokemon/bitmask_pointers.asm
View file

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

2
gfx/pokemon/bitmasks.asm
View file

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

2
gfx/pokemon/frame_pointers.asm
View file

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

2
gfx/pokemon/idle_pointers.asm
View file

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

2
gfx/pokemon/idles.asm
View file

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

2
gfx/pokemon/johto_frames.asm
View file

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

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

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

0
gfx/pokemon/shi_shi/back.png → gfx/pokemon/komainu/back.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 565 B

After

Width:  |  Height:  |  Size: 565 B

0
gfx/pokemon/shi_shi/front.png → gfx/pokemon/komainu/front.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 888 B

After

Width:  |  Height:  |  Size: 888 B

0
gfx/pokemon/shi_shi/shiny.pal → gfx/pokemon/komainu/shiny.pal
View file

2
maps/DebugRoom.asm
View file

@ -126,7 +126,7 @@ DebugFlyScript:
addcellnum PHONE_MOM
readvar VAR_BADGES
givepoke SHI_SHI, 70
givepoke PIDGEOT, 70
closetext
end

2
mobile/mobile_46.asm
View file

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