summaryrefslogtreecommitdiff
path: root/data/tilesets/port_collision.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-01-26 20:57:55 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-01-26 20:57:55 -0500
commitea480fa31e57dd2880de82f2bdc2116cbb4d205c (patch)
tree4f5f6d7519c2074a716fb33b7df3213f89617050 /data/tilesets/port_collision.asm
parentee55ca8e72b49f9bc2aaaebc792e7ade46c754da (diff)
Fix off-by-one error
Diffstat (limited to 'data/tilesets/port_collision.asm')
-rw-r--r--data/tilesets/port_collision.asm108
1 files changed, 54 insertions, 54 deletions
diff --git a/data/tilesets/port_collision.asm b/data/tilesets/port_collision.asm
index fb37ee11e..8abc712c9 100644
--- a/data/tilesets/port_collision.asm
+++ b/data/tilesets/port_collision.asm
@@ -1,64 +1,64 @@
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
- tilecoll WALL, WALL, WALL, WALL ; 02
- tilecoll BUOY, WATER, BUOY, WATER ; 03
- tilecoll WATER, BUOY, WATER, BUOY ; 04
- tilecoll LADDER, LADDER, LADDER, LADDER ; 05
- tilecoll WALL, WALL, WALL, WATER ; 06
- tilecoll WALL, WALL, WATER, WATER ; 07
- tilecoll WALL, WALL, WATER, WALL ; 08
- tilecoll WATER, WATER, WATER, WATER ; 09
- tilecoll WALL, WATER, WALL, WATER ; 0a
- tilecoll WATER, WATER, WATER, WATER ; 0b
- tilecoll WATER, WALL, WATER, WALL ; 0c
- tilecoll WATER, WATER, FLOOR, FLOOR ; 0d
- tilecoll WALL, WATER, WALL, WALL ; 0e
- tilecoll WATER, WATER, WALL, WALL ; 0f
- tilecoll WATER, WALL, WALL, WALL ; 10
- tilecoll WATER, WATER, WATER, WATER ; 11
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
- tilecoll WATER, WATER, WATER, WATER ; 13
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
+ tilecoll WALL, WALL, WALL, WALL ; 01
+ tilecoll BUOY, WATER, BUOY, WATER ; 02
+ tilecoll WATER, BUOY, WATER, BUOY ; 03
+ tilecoll LADDER, LADDER, LADDER, LADDER ; 04
+ tilecoll WALL, WALL, WALL, WATER ; 05
+ tilecoll WALL, WALL, WATER, WATER ; 06
+ tilecoll WALL, WALL, WATER, WALL ; 07
+ tilecoll WATER, WATER, WATER, WATER ; 08
+ tilecoll WALL, WATER, WALL, WATER ; 09
+ tilecoll WATER, WATER, WATER, WATER ; 0a
+ tilecoll WATER, WALL, WATER, WALL ; 0b
+ tilecoll WATER, WATER, FLOOR, FLOOR ; 0c
+ tilecoll WALL, WATER, WALL, WALL ; 0d
+ tilecoll WATER, WATER, WALL, WALL ; 0e
+ tilecoll WATER, WALL, WALL, WALL ; 0f
+ tilecoll WATER, WATER, WATER, WATER ; 10
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
+ tilecoll WATER, WATER, WATER, WATER ; 12
+ tilecoll WATER, FLOOR, WATER, FLOOR ; 13
tilecoll WATER, FLOOR, WATER, FLOOR ; 14
- tilecoll WATER, FLOOR, WATER, FLOOR ; 15
+ tilecoll WATER, WATER, WATER, WATER ; 15
tilecoll WATER, WATER, WATER, WATER ; 16
- tilecoll WATER, WATER, WATER, WATER ; 17
- tilecoll WATER, FLOOR, WALL, WARP_CARPET_DOWN ; 18
- tilecoll WATER, WATER, WALL, WALL ; 19
- tilecoll WATER, FLOOR, WALL, WALL ; 1a
- tilecoll WALL, WALL, WALL, WALL ; 1b
- tilecoll WALL, WATER, WALL, WALL ; 1c
+ tilecoll WATER, FLOOR, WALL, WARP_CARPET_DOWN ; 17
+ tilecoll WATER, WATER, WALL, WALL ; 18
+ tilecoll WATER, FLOOR, WALL, WALL ; 19
+ tilecoll WALL, WALL, WALL, WALL ; 1a
+ tilecoll WALL, WATER, WALL, WALL ; 1b
+ tilecoll WATER_21, WATER_21, WALL, WALL ; 1c
tilecoll WATER_21, WATER_21, WALL, WALL ; 1d
tilecoll WATER_21, WATER_21, WALL, WALL ; 1e
- tilecoll WATER_21, WATER_21, WALL, WALL ; 1f
- tilecoll WALL, WALL, WALL, WATER ; 20
- tilecoll WALL, FLOOR, WATER, WARP_CARPET_DOWN ; 21
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
- tilecoll BUOY, BUOY, BUOY, WATER ; 23
- tilecoll BUOY, BUOY, WATER, BUOY ; 24
+ tilecoll WALL, WALL, WALL, WATER ; 1f
+ tilecoll WALL, FLOOR, WATER, WARP_CARPET_DOWN ; 20
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
+ tilecoll BUOY, BUOY, BUOY, WATER ; 22
+ tilecoll BUOY, BUOY, WATER, BUOY ; 23
+ tilecoll BUOY, BUOY, WATER, WATER ; 24
tilecoll BUOY, BUOY, WATER, WATER ; 25
- tilecoll BUOY, BUOY, WATER, WATER ; 26
- tilecoll LADDER, LADDER, LADDER, LADDER ; 27
- tilecoll FLOOR, FLOOR, WATER, WATER ; 28
- tilecoll FLOOR, FLOOR, FLOOR, WATER ; 29
- tilecoll FLOOR, FLOOR, WATER, FLOOR ; 2a
- tilecoll WALL, WALL, WALL, WALL ; 2b
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2c
- tilecoll FLOOR, WATER, FLOOR, FLOOR ; 2d
- tilecoll WATER, FLOOR, FLOOR, FLOOR ; 2e
- tilecoll FLOOR, WATER, FLOOR, WATER ; 2f
- tilecoll WATER, FLOOR, WATER, FLOOR ; 30
- tilecoll FLOOR, FLOOR, WATER, WATER ; 31
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
- tilecoll WALL, FLOOR, WALL, FLOOR ; 33
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34
- tilecoll FLOOR, WATER, FLOOR, WATER ; 35
- tilecoll WALL, WALL, FLOOR, LADDER ; 36
- tilecoll WATER, WATER, WATER, WATER ; 37
- tilecoll FLOOR, WATER, FLOOR, WATER ; 38
- tilecoll WATER, FLOOR, WATER, FLOOR ; 39
- tilecoll WATER, WATER, FLOOR, FLOOR ; 3a
+ tilecoll LADDER, LADDER, LADDER, LADDER ; 26
+ tilecoll FLOOR, FLOOR, WATER, WATER ; 27
+ tilecoll FLOOR, FLOOR, FLOOR, WATER ; 28
+ tilecoll FLOOR, FLOOR, WATER, FLOOR ; 29
+ tilecoll WALL, WALL, WALL, WALL ; 2a
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 2b
+ tilecoll FLOOR, WATER, FLOOR, FLOOR ; 2c
+ tilecoll WATER, FLOOR, FLOOR, FLOOR ; 2d
+ tilecoll FLOOR, WATER, FLOOR, WATER ; 2e
+ tilecoll WATER, FLOOR, WATER, FLOOR ; 2f
+ tilecoll FLOOR, FLOOR, WATER, WATER ; 30
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 32
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 33
+ tilecoll FLOOR, WATER, FLOOR, WATER ; 34
+ tilecoll WALL, WALL, FLOOR, LADDER ; 35
+ tilecoll WATER, WATER, WATER, WATER ; 36
+ tilecoll FLOOR, WATER, FLOOR, WATER ; 37
+ tilecoll WATER, FLOOR, WATER, FLOOR ; 38
+ tilecoll WATER, WATER, FLOOR, FLOOR ; 39
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3a
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3b
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3c
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3d
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40