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