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