summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-12-26 02:46:08 -0500
committeryenatch <yenatch@gmail.com>2013-12-26 02:48:00 -0500
commit502fe13e3026f421f88fa221854b8f6c294ffe8f (patch)
treeee4815a7fe7987831d96fbcd150a438d22cf625b
parentc8c887fb1e13ac98b61096baf9a04e3d8fe4a395 (diff)
flower animation graphics
-rw-r--r--gfx/tilesets/flower/cgb_1.2bpp1
-rw-r--r--gfx/tilesets/flower/cgb_2.2bpp1
-rw-r--r--gfx/tilesets/flower/dmg_1.2bpp1
-rw-r--r--gfx/tilesets/flower/dmg_2.2bpp1
-rw-r--r--tilesets/animations.asm12
5 files changed, 9 insertions, 7 deletions
diff --git a/gfx/tilesets/flower/cgb_1.2bpp b/gfx/tilesets/flower/cgb_1.2bpp
new file mode 100644
index 000000000..ffe58b93e
--- /dev/null
+++ b/gfx/tilesets/flower/cgb_1.2bpp
@@ -0,0 +1 @@
+¢ M’-mL²A¼²HE0 \ No newline at end of file
diff --git a/gfx/tilesets/flower/cgb_2.2bpp b/gfx/tilesets/flower/cgb_2.2bpp
new file mode 100644
index 000000000..5cf6b583f
--- /dev/null
+++ b/gfx/tilesets/flower/cgb_2.2bpp
@@ -0,0 +1 @@
+¢Y$¤Z%Z˜f%Zš$E \ No newline at end of file
diff --git a/gfx/tilesets/flower/dmg_1.2bpp b/gfx/tilesets/flower/dmg_1.2bpp
new file mode 100644
index 000000000..ec9e9c6d4
--- /dev/null
+++ b/gfx/tilesets/flower/dmg_1.2bpp
@@ -0,0 +1 @@
+¢ AŒ! a ’1Œ‚HE0 \ No newline at end of file
diff --git a/gfx/tilesets/flower/dmg_2.2bpp b/gfx/tilesets/flower/dmg_2.2bpp
new file mode 100644
index 000000000..7bf87eab2
--- /dev/null
+++ b/gfx/tilesets/flower/dmg_2.2bpp
@@ -0,0 +1 @@
+¢A$˜BB€fZ‚$E \ No newline at end of file
diff --git a/tilesets/animations.asm b/tilesets/animations.asm
index 5b7e2bed2..cf7eebe2c 100644
--- a/tilesets/animations.asm
+++ b/tilesets/animations.asm
@@ -625,7 +625,7 @@ AnimateFlowerTile: ; fc56d
ld b, h
ld c, l
-; Alternate tile graphc every other frame
+; Alternate tile graphic every other frame
ld a, [TileAnimationTimer]
and 1 << 1
ld e, a
@@ -648,12 +648,10 @@ AnimateFlowerTile: ; fc56d
; fc58c
FlowerTileFrames: ; fc58c
-; frame 0 dmg
-; frame 0 cgb
-; frame 1 dmg
-; frame 1 sgb
-; INCBIN "gfx/tilesets/flower.2bpp"
-INCBIN "baserom.gbc",$fc58c,$fc5cc - $fc58c
+ INCBIN "gfx/tilesets/flower/dmg_1.2bpp"
+ INCBIN "gfx/tilesets/flower/cgb_1.2bpp"
+ INCBIN "gfx/tilesets/flower/dmg_2.2bpp"
+ INCBIN "gfx/tilesets/flower/cgb_2.2bpp"
; fc5cc