diff --git a/gfx/tilesets/whirlpool/1.2bpp b/gfx/tilesets/whirlpool/1.2bpp new file mode 100644 index 000000000..0a58c6b23 Binary files /dev/null and b/gfx/tilesets/whirlpool/1.2bpp differ diff --git a/gfx/tilesets/whirlpool/2.2bpp b/gfx/tilesets/whirlpool/2.2bpp new file mode 100644 index 000000000..e1f841cf9 Binary files /dev/null and b/gfx/tilesets/whirlpool/2.2bpp differ diff --git a/gfx/tilesets/whirlpool/3.2bpp b/gfx/tilesets/whirlpool/3.2bpp new file mode 100644 index 000000000..9cdec8335 Binary files /dev/null and b/gfx/tilesets/whirlpool/3.2bpp differ diff --git a/gfx/tilesets/whirlpool/4.2bpp b/gfx/tilesets/whirlpool/4.2bpp new file mode 100644 index 000000000..414acce03 Binary files /dev/null and b/gfx/tilesets/whirlpool/4.2bpp differ 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