summaryrefslogtreecommitdiff
path: root/data/tilesets/park_collision.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/tilesets/park_collision.asm')
-rw-r--r--data/tilesets/park_collision.asm88
1 files changed, 44 insertions, 44 deletions
diff --git a/data/tilesets/park_collision.asm b/data/tilesets/park_collision.asm
index c5965e0c9..d24de1ec1 100644
--- a/data/tilesets/park_collision.asm
+++ b/data/tilesets/park_collision.asm
@@ -1,55 +1,56 @@
- 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 TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
+ tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
- tilecoll WALL, WALL, WALL, WALL ; 07
- tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 08
+ tilecoll WALL, WALL, WALL, WALL ; 06
+ tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 07
+ tilecoll WALL, WALL, WALL, WALL ; 08
tilecoll WALL, WALL, WALL, WALL ; 09
- tilecoll WALL, WALL, WALL, WALL ; 0a
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b
- tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0c
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a
+ tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0b
+ tilecoll WALL, WALL, WALL, WALL ; 0c
tilecoll WALL, WALL, WALL, WALL ; 0d
- tilecoll WALL, WALL, WALL, WALL ; 0e
- tilecoll WALL, WALL, FLOOR, FLOOR ; 0f
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10
- tilecoll WALL, WALL, WALL, FLOOR ; 11
- tilecoll WALL, WALL, FLOOR, FLOOR ; 12
- tilecoll WALL, WALL, FLOOR, WALL ; 13
- tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 14
- tilecoll WALL, FLOOR, WALL, FLOOR ; 15
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16
- tilecoll FLOOR, WALL, FLOOR, WALL ; 17
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 18
- tilecoll WALL, FLOOR, WALL, WALL ; 19
- tilecoll FLOOR, FLOOR, WALL, WALL ; 1a
- tilecoll FLOOR, WALL, WALL, WALL ; 1b
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1c
- tilecoll WALL, WALL, WALL, FLOOR ; 1d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
- tilecoll WALL, WALL, FLOOR, WALL ; 1f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20
- tilecoll WALL, FLOOR, WALL, FLOOR ; 21
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
- tilecoll FLOOR, WALL, FLOOR, WALL ; 23
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
- tilecoll WALL, FLOOR, WALL, WALL ; 25
- tilecoll FLOOR, FLOOR, WALL, WALL ; 26
- tilecoll FLOOR, WALL, WALL, WALL ; 27
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 0e
+ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f
+ tilecoll WALL, WALL, WALL, FLOOR ; 10
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 11
+ tilecoll WALL, WALL, FLOOR, WALL ; 12
+ tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 13
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 14
+ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 16
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17
+ tilecoll WALL, FLOOR, WALL, WALL ; 18
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 19
+ tilecoll FLOOR, WALL, WALL, WALL ; 1a
+ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1b
+ tilecoll WALL, WALL, WALL, FLOOR ; 1c
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
+ tilecoll WALL, WALL, FLOOR, WALL ; 1e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 20
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 22
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
+ tilecoll WALL, FLOOR, WALL, WALL ; 24
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 25
+ tilecoll FLOOR, WALL, WALL, WALL ; 26
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
+ tilecoll WALL, WALL, WALL, WALL ; 28
tilecoll WALL, WALL, WALL, WALL ; 29
tilecoll WALL, WALL, WALL, WALL ; 2a
- tilecoll WALL, WALL, WALL, WALL ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+ tilecoll WALL, WALL, WALL, WALL ; 2c
tilecoll WALL, WALL, WALL, WALL ; 2d
tilecoll WALL, WALL, WALL, WALL ; 2e
- tilecoll WALL, WALL, WALL, WALL ; 2f
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 30
+ tilecoll FLOOR, WALL, FLOOR, FLOOR ; 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 LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 34
+ tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 33
+ tilecoll WALL, WALL, WALL, WALL ; 34
tilecoll WALL, WALL, WALL, WALL ; 35
tilecoll WALL, WALL, WALL, WALL ; 36
tilecoll WALL, WALL, WALL, WALL ; 37
@@ -60,5 +61,4 @@
tilecoll WALL, WALL, WALL, WALL ; 3c
tilecoll WALL, WALL, WALL, WALL ; 3d
tilecoll WALL, WALL, WALL, WALL ; 3e
- tilecoll WALL, WALL, WALL, WALL ; 3f
- tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 40
+ tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 3f