summaryrefslogtreecommitdiff
path: root/data/tilesets/underground_collision.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/tilesets/underground_collision.asm')
-rw-r--r--data/tilesets/underground_collision.asm92
1 files changed, 46 insertions, 46 deletions
diff --git a/data/tilesets/underground_collision.asm b/data/tilesets/underground_collision.asm
index 0c3120451..e4cee7495 100644
--- a/data/tilesets/underground_collision.asm
+++ b/data/tilesets/underground_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, LADDER, FLOOR, FLOOR ; 02
tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 03
- tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 04
- tilecoll WALL, WALL, WALL, FLOOR ; 05
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
- tilecoll WALL, FLOOR, WALL, FLOOR ; 07
- tilecoll FLOOR, FLOOR, PIT, PIT ; 08
- tilecoll WALL, WALL, WALL, FLOOR ; 09
- tilecoll WALL, WALL, FLOOR, FLOOR ; 0a
- tilecoll WALL, WALL, FLOOR, WALL ; 0b
- tilecoll WALL, WALL, WALL, WALL ; 0c
- tilecoll WALL, FLOOR, WALL, FLOOR ; 0d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
- tilecoll FLOOR, WALL, FLOOR, WALL ; 0f
- tilecoll FLOOR, FLOOR, FLOOR, WARP_PANEL ; 10
- tilecoll WALL, FLOOR, WALL, WALL ; 11
- tilecoll FLOOR, FLOOR, WALL, WALL ; 12
- tilecoll FLOOR, WALL, WALL, WALL ; 13
- tilecoll WALL, WALL, FLOOR, FLOOR ; 14
+ tilecoll WALL, WALL, WALL, FLOOR ; 04
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 06
+ tilecoll FLOOR, FLOOR, PIT, PIT ; 07
+ tilecoll WALL, WALL, WALL, FLOOR ; 08
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 09
+ tilecoll WALL, WALL, FLOOR, WALL ; 0a
+ tilecoll WALL, WALL, WALL, WALL ; 0b
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 0c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 0e
+ tilecoll FLOOR, FLOOR, FLOOR, WARP_PANEL ; 0f
+ tilecoll WALL, FLOOR, WALL, WALL ; 10
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 11
+ tilecoll FLOOR, WALL, WALL, WALL ; 12
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 13
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 14
tilecoll FLOOR, FLOOR, WALL, WALL ; 15
- tilecoll FLOOR, FLOOR, WALL, WALL ; 16
- tilecoll WALL, FLOOR, WALL, WALL ; 17
- tilecoll FLOOR, WALL, WALL, WALL ; 18
- tilecoll FLOOR, WALL, FLOOR, WALL ; 19
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1f
+ tilecoll WALL, FLOOR, WALL, WALL ; 16
+ tilecoll FLOOR, WALL, WALL, WALL ; 17
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 18
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 19
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
+ tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1c
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
+ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1e
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 1f
tilecoll WALL, WALL, FLOOR, FLOOR ; 20
- tilecoll WALL, WALL, FLOOR, FLOOR ; 21
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 22
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 21
+ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 23
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 24
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 25
- tilecoll WALL, WARP_CARPET_UP, FLOOR, FLOOR ; 26
- tilecoll WARP_CARPET_UP, WALL, FLOOR, FLOOR ; 27
- tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 28
- tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 29
- tilecoll FLOOR, WALL, FLOOR, WALL ; 2a
- tilecoll WALL, FLOOR, WALL, FLOOR ; 2b
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24
+ tilecoll WALL, WARP_CARPET_UP, FLOOR, FLOOR ; 25
+ tilecoll WARP_CARPET_UP, WALL, FLOOR, FLOOR ; 26
+ tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 27
+ tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 28
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 29
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 2a
+ tilecoll WALL, WALL, WALL, WALL ; 2b
tilecoll WALL, WALL, WALL, WALL ; 2c
tilecoll WALL, WALL, WALL, WALL ; 2d
- tilecoll WALL, WALL, WALL, WALL ; 2e
- tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 2f
+ tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 2e
+ tilecoll WALL, WALL, WALL, WALL ; 2f
tilecoll WALL, WALL, WALL, WALL ; 30
tilecoll WALL, WALL, WALL, WALL ; 31
tilecoll WALL, WALL, WALL, WALL ; 32
tilecoll WALL, WALL, WALL, WALL ; 33
tilecoll WALL, WALL, WALL, WALL ; 34
tilecoll WALL, WALL, WALL, WALL ; 35
- tilecoll WALL, WALL, WALL, WALL ; 36
- tilecoll WALL, FLOOR, WALL, FLOOR ; 37
- tilecoll FLOOR, WALL, FLOOR, WALL ; 38
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 36
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 37
+ tilecoll WALL, WALL, WALL, WALL ; 38
tilecoll WALL, WALL, WALL, WALL ; 39
tilecoll WALL, WALL, WALL, WALL ; 3a
tilecoll WALL, WALL, WALL, WALL ; 3b
tilecoll WALL, WALL, WALL, WALL ; 3c
- tilecoll WALL, WALL, WALL, WALL ; 3d
- tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 3e
+ tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 3d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40