From 70d5cf467a7091a99edad8d76c902650a3dce3e5 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Thu, 26 Dec 2013 02:37:23 -0500
Subject: [PATCH] whirlpool animation graphics

---
 gfx/tilesets/whirlpool/1.2bpp | Bin 0 -> 64 bytes
 gfx/tilesets/whirlpool/2.2bpp | Bin 0 -> 64 bytes
 gfx/tilesets/whirlpool/3.2bpp | Bin 0 -> 64 bytes
 gfx/tilesets/whirlpool/4.2bpp | Bin 0 -> 64 bytes
 tilesets/animations.asm       |  19 +++++++++++++++++--
 5 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 gfx/tilesets/whirlpool/1.2bpp
 create mode 100644 gfx/tilesets/whirlpool/2.2bpp
 create mode 100644 gfx/tilesets/whirlpool/3.2bpp
 create mode 100644 gfx/tilesets/whirlpool/4.2bpp

diff --git a/gfx/tilesets/whirlpool/1.2bpp b/gfx/tilesets/whirlpool/1.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..0a58c6b238411d20efb7d517a6b080d962caa526
GIT binary patch
literal 64
zcmZQ5VmQyRf!{&mxIv%d3>9I9{R}tQ4LIBd&I$4eom861u%4lS{eVrggFV9shUXGT
Uf&3lp7x)t-+y#0B&I)h?0DS-x^Z)<=

literal 0
HcmV?d00001

diff --git a/gfx/tilesets/whirlpool/2.2bpp b/gfx/tilesets/whirlpool/2.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..e1f841cf96cc3a680d21e8470e12edda49c29f5b
GIT binary patch
literal 64
zcmV-G0KfkLX8>FP3-AUQ;|y^OkqprQb^sgT1u(@JVu&&bvq+Kv(*Rn41#pK5^8`7>
W86?R7?GWY&bBHpC5e(4;Sp?aN9~E8z

literal 0
HcmV?d00001

diff --git a/gfx/tilesets/whirlpool/3.2bpp b/gfx/tilesets/whirlpool/3.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..9cdec83359b910a6070827e2e82bc2c41c424eb4
GIT binary patch
literal 64
zcmV-G0KfkvlOvcQoDk0r;Q^okS^&!+n;@DnixG$sOc2fpX8^Y_i!g~Wju^)eU;xkn
WIsoPpNf6BuOc+KCqX(b>*Z^+5h!pGq

literal 0
HcmV?d00001

diff --git a/gfx/tilesets/whirlpool/4.2bpp b/gfx/tilesets/whirlpool/4.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..414acce03251970078cfaacc487c8962f8065da7
GIT binary patch
literal 64
zcmV-G0KfkjqX6ds4+8u=!QcY`4gmEC&<L{#F&N_T2H*<-9RT$t$b=aTaTw$90ssvF
W^8ijnnMjj}FbH!H;@}Jb8vy;+gBET8

literal 0
HcmV?d00001

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