thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-07 00:25:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Download patch file Download diff file Expand all files Collapse all files

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

Before After
Before After

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

14
gfx/pics.asm
View file

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

3
gfx/pokemon/anim_pointers.asm
View file

@ -395,6 +395,7 @@ AnimationPointers:
dw TyranitarAnimation
dw LugiaAnimation
dw HoOhAnimation
dw KomainuAnimation
dw HyoshuYangAnimation
dw HyoshuYinAnimation
dw CelebiAnimation
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"
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"

3
gfx/pokemon/bitmask_pointers.asm
View file

@ -396,6 +396,7 @@ BitmasksPointers:
dw TyranitarBitmasks
dw LugiaBitmasks
dw HoOhBitmasks
dw KomainuBitmasks
dw HyoshuYangBitmasks
dw HyoshuYinBitmasks
dw CelebiBitmasks
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"
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"

3
gfx/pokemon/frame_pointers.asm
View file

@ -396,6 +396,7 @@ FramesPointers:
dba TyranitarFrames
dba LugiaFrames
dba HoOhFrames
dba KomainuFrames
dba HyoshuYangFrames
dba HyoshuYinFrames
dba CelebiFrames
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 LugiaAnimationIdle
dw HoOhAnimationIdle
dw KomainuAnimationIdle
dw HyoshuYangAnimationIdle
dw HyoshuYinAnimationIdle
dw CelebiAnimationIdle
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"
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"

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

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