diff options
Diffstat (limited to 'tilesets')
| -rw-r--r-- | tilesets/animations.asm | 4 | ||||
| -rwxr-xr-x | tilesets/collision.asm | 6 | ||||
| -rw-r--r-- | tilesets/tileset_headers.asm | 2 |
3 files changed, 4 insertions, 8 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 diff --git a/tilesets/collision.asm b/tilesets/collision.asm index 29b61feed..84397cb5d 100755 --- a/tilesets/collision.asm +++ b/tilesets/collision.asm @@ -1,9 +1,3 @@ - -; 00 land -; 01 water -; 0f wall -; 11 talkable water -; 1f talkable wall NONTALKABLE EQUS "db" TALKABLE EQUS "db TALK +" NONTALKABLE LANDTILE ; 00 diff --git a/tilesets/tileset_headers.asm b/tilesets/tileset_headers.asm index 752ff1cc0..d0debd2b7 100644 --- a/tilesets/tileset_headers.asm +++ b/tilesets/tileset_headers.asm @@ -1,3 +1,5 @@ +; entries correspond to TILESET_* constants + tileset: macro dba \1GFX, \1Meta, \1Coll dw \1Anim |