summaryrefslogtreecommitdiff
path: root/tilesets/animations.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-11-14 14:41:47 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-11-14 14:41:47 -0500
commited44de4bb4688f6b8c83aeb4f5fd8658d17615fb (patch)
treef5f4eb44bbd16d7d11f25b23c01e1c4d11dd7456 /tilesets/animations.asm
parentcc8c36ee149b287b7a1cabb85abb4bf42873a3b2 (diff)
More map object work
Diffstat (limited to 'tilesets/animations.asm')
-rw-r--r--tilesets/animations.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/tilesets/animations.asm b/tilesets/animations.asm
index d0e44a063..0a681c86b 100644
--- a/tilesets/animations.asm
+++ b/tilesets/animations.asm
@@ -48,7 +48,7 @@ Tileset03Anim: ; 0xfc01b
dw NULL, AnimateFlowerTile
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
- dw NULL, NextTileFrame8
+ dw NULL, CurTileFrame8
dw NULL, DoneTileAnimation
; 0xfc047
@@ -62,7 +62,7 @@ Tileset25Anim: ; 0xfc047
dw NULL, AnimateFlowerTile
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
- dw NULL, NextTileFrame8
+ dw NULL, CurTileFrame8
dw NULL, DoneTileAnimation
; 0xfc073
@@ -77,7 +77,7 @@ Tileset31Anim: ; 0xfc073
dw NULL, AnimateFlowerTile
dw VTiles2 tile $14, AnimateWaterTile
dw NULL, TileAnimationPalette
- dw NULL, NextTileFrame8
+ dw NULL, CurTileFrame8
dw NULL, DoneTileAnimation
; 0xfc0a3
@@ -93,7 +93,7 @@ Tileset01Anim: ; 0xfc0a3
dw WhirlpoolFrames3, AnimateWhirlpoolTile
dw WhirlpoolFrames4, AnimateWhirlpoolTile
dw NULL, WaitTileAnimation
- dw NULL, NextTileFrame8
+ dw NULL, CurTileFrame8
dw NULL, DoneTileAnimation
; 0xfc0d7
@@ -136,7 +136,7 @@ Tileset09Anim: ; 0xfc12f
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
- dw NULL, NextTileFrame8
+ dw NULL, CurTileFrame8
dw NULL, DoneTileAnimation
; 0xfc15f
@@ -147,7 +147,7 @@ Tileset15Anim: ; 0xfc15f
dw NULL, WaitTileAnimation
dw NULL, SafariFountainAnim1
dw NULL, WaitTileAnimation
- dw NULL, NextTileFrame8
+ dw NULL, CurTileFrame8
dw NULL, DoneTileAnimation
; 0xfc17f
@@ -239,7 +239,7 @@ Tileset23Anim: ; 0xfc27f
dw SproutPillarTilePointer4, AnimateSproutPillarTile
dw SproutPillarTilePointer1, AnimateSproutPillarTile
dw SproutPillarTilePointer2, AnimateSproutPillarTile
- dw NULL, NextTileFrame
+ dw NULL, CurTileFrame
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
@@ -302,7 +302,7 @@ WaitTileAnimation: ; fc2fe
ret
; fc2ff
-NextTileFrame8: ; fc2ff
+CurTileFrame8: ; fc2ff
ld a, [TileAnimationTimer]
inc a
and a, 7
@@ -806,7 +806,7 @@ AnimateSproutPillarTile: ; fc645
; fc673
-NextTileFrame: ; fc673
+CurTileFrame: ; fc673
ld hl, TileAnimationTimer
inc [hl]
ret