Walking Wake and the Guardian Beast!

- Added preliminary data for Walking Wake and the new Legendary Pokemon Shi-Shi.
- Changed Bellignan's dex entry to reference how Sprout Tower was constructed.
- Changed some dialogue in Sprout Tower to reflect this.

Wake sprite by EyeDonutz
Shi-Shi sprite by me, but still unfinished. Will definitely rework sometime.
This commit is contained in:
Martha Schilling 2023-10-26 16:16:00 +01:00
parent a4854f63ba
commit d4170f5fa8
45 changed files with 225 additions and 21 deletions

View file

@ -249,11 +249,13 @@ INCBIN "gfx/footprints/blissey.1bpp"
INCBIN "gfx/footprints/raikou.1bpp"
INCBIN "gfx/footprints/entei.1bpp"
INCBIN "gfx/footprints/suicune.1bpp"
INCBIN "gfx/footprints/walking_wake.1bpp"
INCBIN "gfx/footprints/larvitar.1bpp"
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/celebi.1bpp"
INCBIN "gfx/footprints/252.1bpp"
INCBIN "gfx/footprints/253.1bpp"
@ -261,4 +263,4 @@ INCBIN "gfx/footprints/254.1bpp"
INCBIN "gfx/footprints/255.1bpp"
INCBIN "gfx/footprints/256.1bpp"
assert_table_length $102
assert_table_length $104

BIN
gfx/footprints/shi_shi.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 B

View file

@ -719,6 +719,10 @@ 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"
ShiShiFrontpic: INCBIN "gfx/pokemon/shi_shi/front.animated.2bpp.lz"
ShiShiBackpic: INCBIN "gfx/pokemon/shi_shi/back.2bpp.lz"
INCBIN "gfx/pokemon/poliwag/back.2bpp.lz"
INCBIN "gfx/pokemon/squirtle/back.2bpp.lz"
INCBIN "gfx/pokemon/shuckle/back.2bpp.lz"

View file

@ -248,10 +248,12 @@ AnimationPointers:
dw RaikouAnimation
dw EnteiAnimation
dw SuicuneAnimation
dw WalkingWakeAnimation
dw LarvitarAnimation
dw PupitarAnimation
dw TyranitarAnimation
dw LugiaAnimation
dw HoOhAnimation
dw ShiShiAnimation
dw CelebiAnimation
assert_table_length NUM_POKEMON

View file

@ -246,10 +246,12 @@ BlisseyAnimation: INCLUDE "gfx/pokemon/blissey/anim.asm"
RaikouAnimation: INCLUDE "gfx/pokemon/raikou/anim.asm"
EnteiAnimation: INCLUDE "gfx/pokemon/entei/anim.asm"
SuicuneAnimation: INCLUDE "gfx/pokemon/suicune/anim.asm"
WalkingWakeAnimation: INCLUDE "gfx/pokemon/walking_wake/anim.asm"
LarvitarAnimation: INCLUDE "gfx/pokemon/larvitar/anim.asm"
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"
CelebiAnimation: INCLUDE "gfx/pokemon/celebi/anim.asm"
EggAnimation: INCLUDE "gfx/pokemon/egg/anim.asm"

View file

@ -248,10 +248,12 @@ BitmasksPointers:
dw RaikouBitmasks
dw EnteiBitmasks
dw SuicuneBitmasks
dw WalkingWakeBitmasks
dw LarvitarBitmasks
dw PupitarBitmasks
dw TyranitarBitmasks
dw LugiaBitmasks
dw HoOhBitmasks
dw ShiShiBitmasks
dw CelebiBitmasks
assert_table_length NUM_POKEMON

View file

@ -246,10 +246,12 @@ BlisseyBitmasks: INCLUDE "gfx/pokemon/blissey/bitmask.asm"
RaikouBitmasks: INCLUDE "gfx/pokemon/raikou/bitmask.asm"
EnteiBitmasks: INCLUDE "gfx/pokemon/entei/bitmask.asm"
SuicuneBitmasks: INCLUDE "gfx/pokemon/suicune/bitmask.asm"
WalkingWakeBitmasks: INCLUDE "gfx/pokemon/walking_wake/bitmask.asm"
LarvitarBitmasks: INCLUDE "gfx/pokemon/larvitar/bitmask.asm"
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"
CelebiBitmasks: INCLUDE "gfx/pokemon/celebi/bitmask.asm"
EggBitmasks: INCLUDE "gfx/pokemon/egg/bitmask.asm"

View file

@ -248,10 +248,12 @@ FramesPointers:
dba RaikouFrames
dba EnteiFrames
dba SuicuneFrames
dba WalkingWakeFrames
dba LarvitarFrames
dba PupitarFrames
dba TyranitarFrames
dba LugiaFrames
dba HoOhFrames
dba ShiShiFrames
dba CelebiFrames
assert_table_length NUM_POKEMON

View file

@ -248,10 +248,12 @@ AnimationIdlePointers:
dw RaikouAnimationIdle
dw EnteiAnimationIdle
dw SuicuneAnimationIdle
dw WalkingWakeAnimationIdle
dw LarvitarAnimationIdle
dw PupitarAnimationIdle
dw TyranitarAnimationIdle
dw LugiaAnimationIdle
dw HoOhAnimationIdle
dw ShiShiAnimationIdle
dw CelebiAnimationIdle
assert_table_length NUM_POKEMON

View file

@ -246,10 +246,12 @@ BlisseyAnimationIdle: INCLUDE "gfx/pokemon/blissey/anim_idle.asm"
RaikouAnimationIdle: INCLUDE "gfx/pokemon/raikou/anim_idle.asm"
EnteiAnimationIdle: INCLUDE "gfx/pokemon/entei/anim_idle.asm"
SuicuneAnimationIdle: INCLUDE "gfx/pokemon/suicune/anim_idle.asm"
WalkingWakeAnimationIdle: INCLUDE "gfx/pokemon/walking_wake/anim_idle.asm"
LarvitarAnimationIdle: INCLUDE "gfx/pokemon/larvitar/anim_idle.asm"
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"
CelebiAnimationIdle: INCLUDE "gfx/pokemon/celebi/anim_idle.asm"
EggAnimationIdle: INCLUDE "gfx/pokemon/egg/anim_idle.asm"

View file

@ -94,10 +94,12 @@ BlisseyFrames: INCLUDE "gfx/pokemon/blissey/frames.asm"
RaikouFrames: INCLUDE "gfx/pokemon/raikou/frames.asm"
EnteiFrames: INCLUDE "gfx/pokemon/entei/frames.asm"
SuicuneFrames: INCLUDE "gfx/pokemon/suicune/frames.asm"
WalkingWakeFrames: INCLUDE "gfx/pokemon/walking_wake/frames.asm"
LarvitarFrames: INCLUDE "gfx/pokemon/larvitar/frames.asm"
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"
CelebiFrames: INCLUDE "gfx/pokemon/celebi/frames.asm"
EggFrames: INCLUDE "gfx/pokemon/egg/frames.asm"

View file

@ -0,0 +1 @@
endanim

View file

@ -0,0 +1 @@
endanim

Binary file not shown.

After

Width:  |  Height:  |  Size: 565 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 888 B

View file

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

View file

@ -0,0 +1,32 @@
frame 0, 04
frame 4, 04
frame 5, 04
frame 6, 04
frame 7, 04
frame 8, 04
frame 5, 04
frame 6, 04
frame 7, 06
frame 8, 06
frame 5, 06
frame 6, 06
frame 7, 06
frame 4, 06
frame 1, 04
frame 2, 04
frame 3, 04
frame 0, 04
frame 1, 04
frame 2, 04
frame 3, 04
frame 1, 08
frame 2, 09
frame 3, 10
frame 9, 03
frame 10, 02
frame 11, 02
frame 0, 04
frame 12, 06
frame 0, 04
frame 12, 06
endanim

View file

@ -0,0 +1,6 @@
frame 12, 35
setrepeat 2
frame 0, 06
frame 12, 06
dorepeat 2
endanim

Binary file not shown.

After

Width:  |  Height:  |  Size: 588 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

View file

@ -0,0 +1,4 @@
RGB 25, 24, 31
RGB 16, 19, 24