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