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