summaryrefslogtreecommitdiff
path: root/data/tilesets/house_collision.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/tilesets/house_collision.asm')
-rw-r--r--data/tilesets/house_collision.asm94
1 files changed, 47 insertions, 47 deletions
diff --git a/data/tilesets/house_collision.asm b/data/tilesets/house_collision.asm
index ae5580782..7c7f3fca5 100644
--- a/data/tilesets/house_collision.asm
+++ b/data/tilesets/house_collision.asm
@@ -1,54 +1,55 @@
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 02
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 03
- tilecoll WALL, WALL, FLOOR, FLOOR ; 04
- tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05
- tilecoll WALL, WINDOW, FLOOR, FLOOR ; 06
- tilecoll WALL, FLOOR, WALL, FLOOR ; 07
- tilecoll FLOOR, WALL, FLOOR, WALL ; 08
- tilecoll WALL, WINDOW, FLOOR, FLOOR ; 09
- tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 0a
- tilecoll WALL, WALL, WALL, WALL ; 0b
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e
- tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
- tilecoll WALL, WALL, PC, WALL ; 11
- tilecoll WALL, WALL, WALL, FLOOR ; 12
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 01
+ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 02
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 03
+ tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 04
+ tilecoll WALL, WINDOW, FLOOR, FLOOR ; 05
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 06
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 07
+ tilecoll WALL, WINDOW, FLOOR, FLOOR ; 08
+ tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 09
+ tilecoll WALL, WALL, WALL, WALL ; 0a
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b
+ tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c
+ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d
+ tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
+ tilecoll WALL, WALL, PC, WALL ; 10
+ tilecoll WALL, WALL, WALL, FLOOR ; 11
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 12
tilecoll WALL, WALL, FLOOR, FLOOR ; 13
- tilecoll WALL, WALL, FLOOR, FLOOR ; 14
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 15
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16
- tilecoll WINDOW, WALL, FLOOR, FLOOR ; 17
- tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 18
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a
- tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b
- tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1c
- tilecoll WALL, WALL, FLOOR, PC ; 1d
- tilecoll WALL, WALL, FLOOR, RADIO ; 1e
- tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1f
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14
+ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 15
+ tilecoll WINDOW, WALL, FLOOR, FLOOR ; 16
+ tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 17
+ tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18
+ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 19
+ tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1a
+ tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1b
+ tilecoll WALL, WALL, FLOOR, PC ; 1c
+ tilecoll WALL, WALL, FLOOR, RADIO ; 1d
+ tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1e
+ tilecoll WALL, WALL, WALL, WALL ; 1f
tilecoll WALL, WALL, WALL, WALL ; 20
- tilecoll WALL, WALL, WALL, WALL ; 21
- tilecoll FLOOR, WALL, FLOOR, WALL ; 22
- tilecoll WALL, FLOOR, WALL, FLOOR ; 23
- tilecoll FLOOR, WALL, FLOOR, WALL ; 24
- tilecoll WALL, FLOOR, WALL, FLOOR ; 25
- tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 26
- tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 27
- tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 28
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 21
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 22
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 23
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 24
+ tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 25
+ tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 26
+ tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 27
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 28
tilecoll WALL, WALL, FLOOR, FLOOR ; 29
tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
tilecoll WALL, WALL, FLOOR, FLOOR ; 2b
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2c
- tilecoll WALL, WALL, WALL, WALL ; 2d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
- tilecoll WALL, WALL, FLOOR, WALL ; 30
- tilecoll WALL, FLOOR, WALL, FLOOR ; 31
- tilecoll FLOOR, WALL, FLOOR, WALL ; 32
- tilecoll WALL, WINDOW, WALL, WALL ; 33
+ tilecoll WALL, WALL, WALL, WALL ; 2c
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 2d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
+ tilecoll WALL, WALL, FLOOR, WALL ; 2f
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 30
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 31
+ tilecoll WALL, WINDOW, WALL, WALL ; 32
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
@@ -61,4 +62,3 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40