Fix off-by-one error

1 files changed, 58 insertions, 58 deletions

diff --git a/data/tilesets/tower_collision.asm b/data/tilesets/tower_collision.asm
index 9d02e9640..30e74a56f 100644
--- a/data/tilesets/tower_collision.asm
+++ b/data/tilesets/tower_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 FLOOR, FLOOR, FLOOR, LADDER ; 02
 	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 03
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 04
-	tilecoll WALL, WALL, WALL, FLOOR ; 05
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 06
-	tilecoll WALL, WALL, FLOOR, WALL ; 07
-	tilecoll WALL, WALL, WALL, WALL ; 08
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 09
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
-	tilecoll WALL, WALL, WALL, WALL ; 0c
-	tilecoll WALL, FLOOR, WALL, WALL ; 0d
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
-	tilecoll FLOOR, WALL, WALL, WALL ; 0f
-	tilecoll WALL, WALL, WALL, WALL ; 10
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 11
+	tilecoll WALL, WALL, WALL, FLOOR ; 04
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 05
+	tilecoll WALL, WALL, FLOOR, WALL ; 06
+	tilecoll WALL, WALL, WALL, WALL ; 07
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 08
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0a
+	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll WALL, FLOOR, WALL, WALL ; 0c
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0d
+	tilecoll FLOOR, WALL, WALL, WALL ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 10
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 11
 	tilecoll WALL, FLOOR, WALL, FLOOR ; 12
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 13
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 14
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16
-	tilecoll WALL, FLOOR, WALL, WALL ; 17
-	tilecoll FLOOR, WALL, WALL, WALL ; 18
-	tilecoll WALL, WALL, WALL, WALL ; 19
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 13
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 14
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15
+	tilecoll WALL, FLOOR, WALL, WALL ; 16
+	tilecoll FLOOR, WALL, WALL, WALL ; 17
+	tilecoll WALL, WALL, WALL, WALL ; 18
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 19
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
+	tilecoll WALL, WALL, WALL, WALL ; 1b
 	tilecoll WALL, WALL, WALL, WALL ; 1c
-	tilecoll WALL, WALL, WALL, WALL ; 1d
-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 1e
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 1f
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 1d
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 1e
+	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1f
 	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 20
-	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 21
-	tilecoll WALL, WALL, WALL, FLOOR ; 22
-	tilecoll WALL, WALL, FLOOR, WALL ; 23
-	tilecoll WALL, WALL, WALL, WALL ; 24
-	tilecoll FLOOR, FLOOR, WARP_PANEL, FLOOR ; 25
-	tilecoll WALL, WALL, PIT, FLOOR ; 26
-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 27
-	tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 28
+	tilecoll WALL, WALL, WALL, FLOOR ; 21
+	tilecoll WALL, WALL, FLOOR, WALL ; 22
+	tilecoll WALL, WALL, WALL, WALL ; 23
+	tilecoll FLOOR, FLOOR, WARP_PANEL, FLOOR ; 24
+	tilecoll WALL, WALL, PIT, FLOOR ; 25
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 26
+	tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 27
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
-	tilecoll WALL, WALL, WALL, WALL ; 2b
-	tilecoll WALL, HOP_LEFT, WALL, WALL ; 2c
-	tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2d
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
-	tilecoll WALL, WALL, WALL, FLOOR ; 2f
-	tilecoll WALL, WALL, FLOOR, WALL ; 30
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 31
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 32
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 33
-	tilecoll WALL, WALL, WALL, FLOOR ; 34
-	tilecoll WALL, WALL, FLOOR, WALL ; 35
-	tilecoll WALL, FLOOR, WALL, FLOOR ; 36
-	tilecoll FLOOR, WALL, FLOOR, WALL ; 37
-	tilecoll PIT, PIT, FLOOR, FLOOR ; 38
-	tilecoll FLOOR, PIT, FLOOR, PIT ; 39
-	tilecoll PIT, FLOOR, PIT, FLOOR ; 3a
-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 3c
-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 3d
-	tilecoll WALL, HOP_DOWN, WALL, WALL ; 3e
-	tilecoll HOP_DOWN, WALL, WALL, WALL ; 3f
-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 40
+	tilecoll WALL, WALL, WALL, WALL ; 2a
+	tilecoll WALL, HOP_LEFT, WALL, WALL ; 2b
+	tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2d
+	tilecoll WALL, WALL, WALL, FLOOR ; 2e
+	tilecoll WALL, WALL, FLOOR, WALL ; 2f
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 30
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 31
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 32
+	tilecoll WALL, WALL, WALL, FLOOR ; 33
+	tilecoll WALL, WALL, FLOOR, WALL ; 34
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 35
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 36
+	tilecoll PIT, PIT, FLOOR, FLOOR ; 37
+	tilecoll FLOOR, PIT, FLOOR, PIT ; 38
+	tilecoll PIT, FLOOR, PIT, FLOOR ; 39
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3a
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 3b
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 3c
+	tilecoll WALL, HOP_DOWN, WALL, WALL ; 3d
+	tilecoll HOP_DOWN, WALL, WALL, WALL ; 3e
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3f