Komainu-Yang (Rework)

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

gfx/footprints_johto.asm

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

gfx/pics.asm

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

gfx/pokemon/anim_pointers.asm

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

gfx/pokemon/anims.asm

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

gfx/pokemon/bitmask_pointers.asm

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

gfx/pokemon/bitmasks.asm

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

gfx/pokemon/frame_pointers.asm

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

gfx/pokemon/idle_pointers.asm

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

gfx/pokemon/idles.asm

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

gfx/pokemon/johto_frames.asm

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