summaryrefslogtreecommitdiff
path: root/tilesets/animations.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-12-10 01:47:10 -0500
committerGitHub <noreply@github.com>2017-12-10 01:47:10 -0500
commit94c7def4883fbdbcd3987a067443a2069b8bb610 (patch)
tree171c67509afba62571266bd6bebbfdb829d2a876 /tilesets/animations.asm
parent89b9292db0898f8ad2b6ea8513a3190762eb58c8 (diff)
parentd554b997c590825f030bd1be71989653b16a2ae0 (diff)
Merge pull request #409 from roukaour/master
Document constants with comments, actual names, and more thorough usage
Diffstat (limited to 'tilesets/animations.asm')
-rw-r--r--tilesets/animations.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/tilesets/animations.asm b/tilesets/animations.asm
index 76b3c65f8..9bc80454c 100644
--- a/tilesets/animations.asm
+++ b/tilesets/animations.asm
@@ -304,7 +304,7 @@ WaitTileAnimation: ; fc2fe
StandingTileFrame8: ; fc2ff
ld a, [TileAnimationTimer]
inc a
- and a, 7
+ and 7
ld [TileAnimationTimer], a
ret
; fc309
@@ -492,7 +492,7 @@ AnimateWaterTile: ; fc402
; fc41c
WaterTileFrames: ; fc41c
- INCBIN "gfx/tilesets/water.2bpp"
+ INCBIN "gfx/tilesets/water/water.2bpp"
; fc45c