From c15e7b86193539b1cefc9057d5e36d3b66d1ba30 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Wed, 22 May 2013 02:56:25 -0400
Subject: [PATCH] safari fountain tile animations

---
 gfx/tilesets/safari/1.2bpp | Bin 0 -> 16 bytes
 gfx/tilesets/safari/2.2bpp | Bin 0 -> 16 bytes
 gfx/tilesets/safari/3.2bpp | Bin 0 -> 16 bytes
 gfx/tilesets/safari/4.2bpp | Bin 0 -> 16 bytes
 main.asm                   |  58 +++++++++++++++++++++++++++++++++++--
 5 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 gfx/tilesets/safari/1.2bpp
 create mode 100644 gfx/tilesets/safari/2.2bpp
 create mode 100644 gfx/tilesets/safari/3.2bpp
 create mode 100644 gfx/tilesets/safari/4.2bpp

diff --git a/gfx/tilesets/safari/1.2bpp b/gfx/tilesets/safari/1.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..d25f1badcec46e993e395aa480901208ba331c4c
GIT binary patch
literal 16
YcmZSh-%v04T;;IDbEp5d|BC(t07E$l(f|Me

literal 0
HcmV?d00001

diff --git a/gfx/tilesets/safari/2.2bpp b/gfx/tilesets/safari/2.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..bdb3c8cf5cd96b95d895df2b8cd7a686e1a97e02
GIT binary patch
literal 16
YcmZ?R&+*;p@1Od*-@n%D{Ac(N08oMn^#A|>

literal 0
HcmV?d00001

diff --git a/gfx/tilesets/safari/3.2bpp b/gfx/tilesets/safari/3.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..2016d2bd6b9c42ff3b5d69bd26cbad1e6263efc6
GIT binary patch
literal 16
WcmZSh&-kyQUg)jPe~$kQKnMUq^9U^f

literal 0
HcmV?d00001

diff --git a/gfx/tilesets/safari/4.2bpp b/gfx/tilesets/safari/4.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..e0142c688e16b07d0f2680cb6e2f80d04a84cb54
GIT binary patch
literal 16
ScmZSh&j5xT-<|%;09gP*)CgAq

literal 0
HcmV?d00001

diff --git a/main.asm b/main.asm
index 99f39bdfd..e612dc339 100644
--- a/main.asm
+++ b/main.asm
@@ -16374,11 +16374,11 @@ Tileset09Anim: ; 0xfc12f
 
 Tileset15Anim: ; 0xfc15f
 ;	   param, function
-	dw $0000, $45eb
+	dw $0000, SafariFountainAnim2
 	dw $0000, WaitTileAnimation
 	dw $0000, WaitTileAnimation
 	dw $0000, WaitTileAnimation
-	dw $0000, $45cc
+	dw $0000, SafariFountainAnim1
 	dw $0000, WaitTileAnimation
 	dw $0000, NextTileFrame8
 	dw $0000, DoneTileAnimation
@@ -16911,7 +16911,59 @@ FlowerTileFrames: ; fc58c
 INCBIN "baserom.gbc", $fc58c, $fc5cc - $fc58c
 ; fc5cc
 
-INCBIN "baserom.gbc", $fc5cc, $fc673 - $fc5cc
+
+SafariFountainAnim1: ; fc5cc
+; Splash in the bottom-right corner of the fountain.
+	ld hl, [sp+0]
+	ld b, h
+	ld c, l
+	ld a, [TileAnimationTimer]
+	and 6
+	srl a
+	inc a
+	inc a
+	and 3
+	swap a
+	ld e, a
+	ld d, 0
+	ld hl, SafariFountainFrames
+	add hl, de
+	ld sp, hl
+	ld hl, $95b0
+	jp WriteTile
+; fc5eb
+
+
+SafariFountainAnim2: ; fc5eb
+; Splash in the top-left corner of the fountain.
+	ld hl, [sp+0]
+	ld b, h
+	ld c, l
+	ld a, [TileAnimationTimer]
+	and 6
+	add a
+	add a
+	add a
+	ld e, a
+	ld d, 0
+	ld hl, SafariFountainFrames
+	add hl, de
+	ld sp, hl
+	ld hl, $9380
+	jp WriteTile
+; fc605
+
+
+SafariFountainFrames: ; fc605
+	INCBIN "gfx/tilesets/safari/1.2bpp"
+	INCBIN "gfx/tilesets/safari/2.2bpp"
+	INCBIN "gfx/tilesets/safari/3.2bpp"
+	INCBIN "gfx/tilesets/safari/4.2bpp"
+; fc645
+
+
+INCBIN "baserom.gbc", $fc645, $fc673 - $fc645
+
 
 NextTileFrame: ; fc673
 	ld hl, TileAnimationTimer