summaryrefslogtreecommitdiff
path: root/data/tilesets/mansion_collision.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/tilesets/mansion_collision.asm')
-rw-r--r--data/tilesets/mansion_collision.asm108
1 files changed, 54 insertions, 54 deletions
diff --git a/data/tilesets/mansion_collision.asm b/data/tilesets/mansion_collision.asm
index 5db409be7..2c8edd747 100644
--- a/data/tilesets/mansion_collision.asm
+++ b/data/tilesets/mansion_collision.asm
@@ -1,64 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 00
tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll WALL, WALL, WALL, WALL ; 02
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
- tilecoll WALL, WALL, FLOOR, FLOOR ; 05
- tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06
- tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 07
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 04
+ tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 05
+ tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 06
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 07
tilecoll WALL, WALL, FLOOR, FLOOR ; 08
tilecoll WALL, WALL, FLOOR, FLOOR ; 09
- tilecoll WALL, WALL, FLOOR, FLOOR ; 0a
- tilecoll WALL, WALL, FLOOR, WALL ; 0b
- tilecoll FLOOR, WALL, FLOOR, WALL ; 0c
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d
- tilecoll WALL, WALL, FLOOR, WALL ; 0e
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0f
- tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 10
- tilecoll WALL, WALL, WALL, WALL ; 11
- tilecoll WALL, WALL, BOOKSHELF, WALL ; 12
- tilecoll WALL, WALL, WALL, WALL ; 13
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
- tilecoll WALL, FLOOR, WALL, FLOOR ; 15
+ tilecoll WALL, WALL, FLOOR, WALL ; 0a
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
+ tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c
+ tilecoll WALL, WALL, FLOOR, WALL ; 0d
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0e
+ tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 0f
+ tilecoll WALL, WALL, WALL, WALL ; 10
+ tilecoll WALL, WALL, BOOKSHELF, WALL ; 11
+ tilecoll WALL, WALL, WALL, WALL ; 12
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 14
+ tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 15
tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 16
- tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 17
- tilecoll WALL, DOOR, FLOOR, FLOOR ; 18
- tilecoll WALL, WALL, BOOKSHELF, WALL ; 19
- tilecoll WALL, WALL, WALL, WALL ; 1a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
+ tilecoll WALL, DOOR, FLOOR, FLOOR ; 17
+ tilecoll WALL, WALL, BOOKSHELF, WALL ; 18
+ tilecoll WALL, WALL, WALL, WALL ; 19
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 1c
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 1d
tilecoll FLOOR, FLOOR, WALL, WALL ; 1e
tilecoll FLOOR, FLOOR, WALL, WALL ; 1f
- tilecoll FLOOR, FLOOR, WALL, WALL ; 20
- tilecoll FLOOR, WALL, FLOOR, WALL ; 21
- tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 22
- tilecoll WALL, WALL, FLOOR, WALL ; 23
- tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 24
- tilecoll WALL, WALL, WALL, STAIRCASE ; 25
- tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 26
- tilecoll FLOOR, WALL, FLOOR, WALL ; 27
- tilecoll WALL, WALL, DOOR, WALL ; 28
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 29
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 20
+ tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 21
+ tilecoll WALL, WALL, FLOOR, WALL ; 22
+ tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 23
+ tilecoll WALL, WALL, WALL, STAIRCASE ; 24
+ tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 25
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 26
+ tilecoll WALL, WALL, DOOR, WALL ; 27
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 28
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 29
tilecoll FLOOR, FLOOR, WALL, WALL ; 2a
- tilecoll FLOOR, FLOOR, WALL, WALL ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
- tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2d
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
- tilecoll WALL, WALL, WALL, FLOOR ; 30
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+ tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2c
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
+ tilecoll WALL, WALL, WALL, FLOOR ; 2f
+ tilecoll WALL, WALL, FLOOR, WALL ; 30
tilecoll WALL, WALL, FLOOR, WALL ; 31
- tilecoll WALL, WALL, FLOOR, WALL ; 32
- tilecoll WALL, WALL, WALL, WALL ; 33
- tilecoll WALL, WALL, WALL, FLOOR ; 34
- tilecoll WALL, WALL, WALL, WALL ; 35
- tilecoll FLOOR, WALL, WALL, WALL ; 36
- tilecoll WALL, WALL, FLOOR, WALL ; 37
- tilecoll WALL, FLOOR, WALL, WALL ; 38
- tilecoll WALL, WALL, FLOOR, WALL ; 39
- tilecoll WALL, FLOOR, WALL, FLOOR ; 3a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 3b
+ tilecoll WALL, WALL, WALL, WALL ; 32
+ tilecoll WALL, WALL, WALL, FLOOR ; 33
+ tilecoll WALL, WALL, WALL, WALL ; 34
+ tilecoll FLOOR, WALL, WALL, WALL ; 35
+ tilecoll WALL, WALL, FLOOR, WALL ; 36
+ tilecoll WALL, FLOOR, WALL, WALL ; 37
+ tilecoll WALL, WALL, FLOOR, WALL ; 38
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 39
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 3a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll WALL, FLOOR, WALL, WALL ; 3e
- tilecoll FLOOR, WALL, WALL, WALL ; 3f
- tilecoll FLOOR, FLOOR, WALL, WALL ; 40
+ tilecoll WALL, FLOOR, WALL, WALL ; 3d
+ tilecoll FLOOR, WALL, WALL, WALL ; 3e
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 3f