summaryrefslogtreecommitdiff
path: root/tilesets/animations.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-12-26 02:37:23 -0500
committeryenatch <yenatch@gmail.com>2013-12-26 02:37:23 -0500
commit70d5cf467a7091a99edad8d76c902650a3dce3e5 (patch)
treee2494f62b19be00806038287120bf364496bc07e /tilesets/animations.asm
parentd8eed222b7cbe1a481289d19d17ca52713df4b36 (diff)
whirlpool animation graphics
Diffstat (limited to 'tilesets/animations.asm')
-rw-r--r--tilesets/animations.asm19
1 files changed, 17 insertions, 2 deletions
diff --git a/tilesets/animations.asm b/tilesets/animations.asm
index 0dd6b4e25..ece7d2d31 100644
--- a/tilesets/animations.asm
+++ b/tilesets/animations.asm
@@ -92,7 +92,7 @@ Tileset01Anim: ; 0xfc0a3
dw NULL, TileAnimationPalette
dw NULL, WaitTileAnimation
dw NULL, AnimateFlowerTile
- dw $4a98, AnimateWhirlpoolTile
+ dw WhirlpoolFrames, AnimateWhirlpoolTile
dw $4a9c, AnimateWhirlpoolTile
dw $4aa0, AnimateWhirlpoolTile
dw $4aa4, AnimateWhirlpoolTile
@@ -1024,5 +1024,20 @@ SproutPillarTile10:
; fca98
-INCBIN "baserom.gbc", $fca98, $fcba8 - $fca98
+WhirlpoolFrames: ; fca98
+ dw $9320, WhirlpoolFrames1
+ dw $9330, WhirlpoolFrames2
+ dw $9420, WhirlpoolFrames3
+ dw $9430, WhirlpoolFrames4
+; fcaa8
+
+WhirlpoolFrames1: ; fcaa8
+ INCBIN "gfx/tilesets/whirlpool/1.2bpp"
+WhirlpoolFrames2: ; fcae8
+ INCBIN "gfx/tilesets/whirlpool/2.2bpp"
+WhirlpoolFrames3: ; fcb28
+ INCBIN "gfx/tilesets/whirlpool/3.2bpp"
+WhirlpoolFrames4: ; fcb68
+ INCBIN "gfx/tilesets/whirlpool/4.2bpp"
+; fcba8