10 files changed, 595 insertions, 9 deletions
diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm
index ead3883b..29e0442b 100755
--- a/constants/collision_constants.asm
+++ b/constants/collision_constants.asm
@@ -20,11 +20,13 @@ COLL_TALL_GRASS        EQU $18
 COLL_CUT_TREE_1A       EQU $1a ; unused
 COLL_LONG_GRASS_1C     EQU $1c ; unused
 COLL_HEADBUTT_TREE_1D  EQU $1d ; unused
+COLL_1E                EQU $1e ; ?
+COLL_1F                EQU $1f ; ?
 COLL_WATER_21          EQU $21 ; unused
 COLL_ICE               EQU $23
 COLL_WHIRLPOOL         EQU $24
 COLL_BUOY              EQU $27
-COLL_CUT_28            EQU $28 ; garbage
+COLL_CUT_28            EQU $28
 COLL_WATER             EQU $29
 COLL_ICE_2B            EQU $2b ; unused
 COLL_WHIRLPOOL_2C      EQU $2c ; unused
@@ -45,8 +47,8 @@ COLL_WALK_DOWN         EQU $44 ; unused
 COLL_BRAKE_45          EQU $45 ; garbage
 COLL_BRAKE_46          EQU $46 ; unused
 COLL_BRAKE_47          EQU $47 ; unused
-COLL_GRASS_48          EQU $48 ; unused
-COLL_GRASS_49          EQU $49 ; unused
+COLL_GRASS_48          EQU $48
+COLL_GRASS_49          EQU $49
 COLL_GRASS_4A          EQU $4a ; garbage
 COLL_GRASS_4B          EQU $4b ; garbage
 COLL_GRASS_4C          EQU $4c ; unused
@@ -81,6 +83,8 @@ COLL_WARP_PANEL        EQU $7c
 COLL_DOOR_7D           EQU $7d ; unused
 COLL_WARP_CARPET_RIGHT EQU $7e
 COLL_WARP_7F           EQU $7f ; unused
+COLL_88                EQU $88 ; ?
+COLL_89                EQU $89 ; ?
 COLL_COUNTER           EQU $90
 COLL_BOOKSHELF         EQU $91
 COLL_PC                EQU $93
diff --git a/data/tilesets/johto_modern_collision.asm b/data/tilesets/johto_modern_collision.asm
new file mode 100644
index 00000000..540e27cd
--- /dev/null
+++ b/data/tilesets/johto_modern_collision.asm
@@ -0,0 +1,128 @@
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll WALL, WALL, WALL, WALL ; 05
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+	tilecoll WALL, WALL, WALL, WALL ; 08
+	tilecoll WALL, WALL, WALL, WALL ; 09
+	tilecoll WALL, WALL, WALL, WALL ; 0a
+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b
+	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0c
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0d
+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
+	tilecoll WALL, WALL, WALL, WALL ; 10
+	tilecoll WALL, WALL, WALL, WALL ; 11
+	tilecoll WALL, WALL, WALL, WALL ; 12
+	tilecoll WALL, WALL, WALL, WALL ; 13
+	tilecoll WALL, WALL, WALL, DOOR ; 14
+	tilecoll WALL, WALL, WALL, WALL ; 15
+	tilecoll WALL, WALL, WALL, DOOR ; 16
+	tilecoll WALL, WALL, DOOR, WALL ; 17
+	tilecoll WALL, WALL, WALL, WALL ; 18
+	tilecoll WALL, WALL, WALL, WALL ; 19
+	tilecoll WALL, WALL, WALL, DOOR ; 1a
+	tilecoll WALL, WALL, WALL, WALL ; 1b
+	tilecoll WALL, WALL, WALL, WALL ; 1c
+	tilecoll WALL, WALL, DOOR, WALL ; 1d
+	tilecoll WALL, WALL, WALL, WALL ; 1e
+	tilecoll WALL, WALL, WALL, WALL ; 1f
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 20
+	tilecoll WALL, WALL, WALL, WALL ; 21
+	tilecoll WALL, WALL, WALL, WALL ; 22
+	tilecoll WALL, WALL, WALL, WALL ; 23
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 24
+	tilecoll WALL, WALL, WALL, WALL ; 25
+	tilecoll WALL, WALL, WALL, WALL ; 26
+	tilecoll WALL, WALL, WALL, WALL ; 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 WALL, WALL, WALL, WALL ; 2c
+	tilecoll WALL, WALL, WALL, DOOR ; 2d
+	tilecoll WALL, WALL, WALL, WALL ; 2e
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 2f
+	tilecoll BUOY, BUOY, BUOY, WATER ; 30
+	tilecoll BUOY, BUOY, WATER, WATER ; 31
+	tilecoll BUOY, BUOY, WATER, BUOY ; 32
+	tilecoll WALL, WALL, WALL, WALL ; 33
+	tilecoll BUOY, WATER, BUOY, WATER ; 34
+	tilecoll WATER, WATER, WATER, WATER ; 35
+	tilecoll WATER, BUOY, WATER, BUOY ; 36
+	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 37
+	tilecoll BUOY, WATER, BUOY, BUOY ; 38
+	tilecoll WATER, WATER, BUOY, BUOY ; 39
+	tilecoll WATER, BUOY, BUOY, BUOY ; 3a
+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 3b
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3c
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 3d
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3e
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 3f
+	tilecoll WALL, WALL, WALL, FLOOR ; 40
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 41
+	tilecoll WALL, WALL, FLOOR, WALL ; 42
+	tilecoll WATER, WATER, WATER, WATER ; 43
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 44
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 45
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 46
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 47
+	tilecoll WALL, FLOOR, WALL, WALL ; 48
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 49
+	tilecoll FLOOR, WALL, WALL, WALL ; 4a
+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53
+	tilecoll WATER, WATER, WATER, WATER ; 54
+	tilecoll WATER, WATER, WATER, WATER ; 55
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57
+	tilecoll WATER, WATER, WATER, WATER ; 58
+	tilecoll WATER, WATER, WATER, WATER ; 59
+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a
+	tilecoll WALL, WALL, WALL, CAVE ; 5b
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 5c
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5d
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5e
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5f
+	tilecoll WATER, WATER, WALL, WALL ; 60
+	tilecoll WATER, WATER, WALL, WALL ; 61
+	tilecoll WATER, WATER, WALL, WALL ; 62
+	tilecoll WATER, WATER, WATER, WATER ; 63
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 64
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 65
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 66
+	tilecoll WALL, WALL, WALL, WALL ; 67
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 68
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 69
+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a
+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b
+	tilecoll WALL, FLOOR, WALL, WALL ; 6c
+	tilecoll FLOOR, WALL, WALL, WALL ; 6d
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f
+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 72
+	tilecoll FLOOR, FLOOR, WALL, CAVE ; 73
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 75
+	tilecoll WATER, WATER, WATER, WATER ; 76
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 77
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 78
+	tilecoll WATER, WATER, WATER, WATER ; 79
+	tilecoll WATER, WATER, WATER, WATER ; 7a
+	tilecoll WALL, WALL, WALL, WALL ; 7b
+	tilecoll WALL, WALL, WALL, WALL ; 7c
+	tilecoll WALL, WALL, WALL, WALL ; 7d
+	tilecoll WALL, WALL, WALL, WALL ; 7e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f
diff --git a/data/tilesets/lab_collision.asm b/data/tilesets/lab_collision.asm
new file mode 100644
index 00000000..90b3a245
--- /dev/null
+++ b/data/tilesets/lab_collision.asm
@@ -0,0 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 02
+	tilecoll WALL, WALL, WALL, WALL ; 03
+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 04
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 05
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 06
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 07
+	tilecoll WALL, WALL, WALL, WALL ; 08
+	tilecoll WINDOW, WALL, FLOOR, FLOOR ; 09
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0d
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 0e
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 11
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 12
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 13
+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 14
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 16
+	tilecoll WALL, WALL, WALL, WALL ; 17
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 18
+	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 19
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1c
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1e
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1f
+	tilecoll WINDOW, WINDOW, FLOOR, FLOOR ; 20
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 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
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
diff --git a/data/tilesets/mansion_collision.asm b/data/tilesets/mansion_collision.asm
new file mode 100644
index 00000000..b2de5663
--- /dev/null
+++ b/data/tilesets/mansion_collision.asm
@@ -0,0 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 04
+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 05
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 06
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 07
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 08
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 09
+	tilecoll WALL, WALL, FLOOR, WALL ; 0a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c
+	tilecoll WALL, WALL, FLOOR, WALL ; 0d
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0e
+	tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 0f
+	tilecoll WALL, WALL, WALL, WALL ; 10
+	tilecoll WALL, WALL, BOOKSHELF, WALL ; 11
+	tilecoll WALL, WALL, WALL, WALL ; 12
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 14
+	tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 15
+	tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 16
+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 17
+	tilecoll WALL, WALL, BOOKSHELF, WALL ; 18
+	tilecoll WALL, WALL, WALL, WALL ; 19
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1c
+	tilecoll WALL, FLOOR, WALL, WALL ; 1d
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1e
+	tilecoll WALL, FLOOR, WALL, WALL ; 1f
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 20
+	tilecoll FLOOR, WALL, WALL, WALL ; 21
+	tilecoll WALL, WALL, FLOOR, WALL ; 22
+	tilecoll WALL, WALL, STAIRCASE, WALL ; 23
+	tilecoll WALL, WALL, WALL, STAIRCASE ; 24
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 25
+	tilecoll WALL, WALL, WALL, WALL ; 26
+	tilecoll WALL, WALL, DOOR, WALL ; 27
+	tilecoll WALL, FLOOR, WALL, WALL ; 28
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 29
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 2b
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2c
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2d
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2e
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 2f
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 30
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 31
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 32
+	tilecoll WALL, WALL, WALL, FLOOR ; 33
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 34
+	tilecoll WALL, WALL, WALL, FLOOR ; 35
+	tilecoll WALL, WALL, FLOOR, WALL ; 36
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 37
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 38
+	tilecoll WALL, FLOOR, WALL, WALL ; 39
+	tilecoll FLOOR, WALL, WALL, WALL ; 3a
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3b
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3c
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3d
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3e
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 3f
diff --git a/data/tilesets/mart_collision.asm b/data/tilesets/mart_collision.asm
new file mode 100644
index 00000000..ff32f60e
--- /dev/null
+++ b/data/tilesets/mart_collision.asm
@@ -0,0 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 01
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 02
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 05
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 06
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 07
+	tilecoll WALL, WALL, FLOOR, COUNTER ; 08
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 09
+	tilecoll WALL, WALL, COUNTER, FLOOR ; 0a
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 0b
+	tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 0c
+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 0d
+	tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 0e
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 0f
+	tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 10
+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 11
+	tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 12
+	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 13
+	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 14
+	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 15
+	tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 16
+	tilecoll WALL, WALL, FLOOR, COUNTER ; 17
+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 18
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 19
+	tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 1a
+	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 1b
+	tilecoll WALL, WALL, WALL, WALL ; 1c
+	tilecoll WALL, WALL, WALL, WALL ; 1d
+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 1e
+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 1f
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 20
+	tilecoll WALL, WALL, WALL, WALL ; 21
+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 22
+	tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 23
+	tilecoll WALL, WALL, WALL, WALL ; 24
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 25
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 26
+	tilecoll WALL, WALL, COUNTER, MART_SHELF ; 27
+	tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 28
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+	tilecoll COUNTER, COUNTER, FLOOR, MART_SHELF ; 2c
+	tilecoll FLOOR, MART_SHELF, COUNTER, COUNTER ; 2d
+	tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 2e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 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
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
diff --git a/data/tilesets/radio_tower_collision.asm b/data/tilesets/radio_tower_collision.asm
new file mode 100644
index 00000000..c3b5aa80
--- /dev/null
+++ b/data/tilesets/radio_tower_collision.asm
@@ -0,0 +1,64 @@
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 02
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 04
+	tilecoll FLOOR, FLOOR, WALL, COUNTER ; 05
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 06
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 07
+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 08
+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 09
+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 0a
+	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0c
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0d
+	tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 0e
+	tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 0f
+	tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 10
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 11
+	tilecoll WALL, WALL, PC, FLOOR ; 12
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 15
+	tilecoll WALL, WALL, WALL, WALL ; 16
+	tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 17
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18
+	tilecoll WALL, WALL, FLOOR, COUNTER ; 19
+	tilecoll WALL, COUNTER, FLOOR, COUNTER ; 1a
+	tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 1b
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 1d
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1f
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 20
+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 21
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 22
+	tilecoll WALL, WALL, WALL, WALL ; 23
+	tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 24
+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 25
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 26
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
+	tilecoll WALL, WALL, FLOOR, WALL ; 28
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 29
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
+	tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2d
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2e
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 2f
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 30
+	tilecoll WALL, WALL, FLOOR, WALL ; 31
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 32
+	tilecoll WALL, WALL, WALL, FLOOR ; 33
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 34
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 36
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 37
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 38
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 39
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
diff --git a/data/tilesets/ruins_of_alph_collision.asm b/data/tilesets/ruins_of_alph_collision.asm
new file mode 100644
index 00000000..f20b20f3
--- /dev/null
+++ b/data/tilesets/ruins_of_alph_collision.asm
@@ -0,0 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll WALL, WALL, WALL, FLOOR ; 01
+	tilecoll WALL, WALL, FLOOR, WALL ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll WALL, WALL, WALL, FLOOR ; 05
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 06
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 07
+	tilecoll WALL, WALL, FLOOR, WALL ; 08
+	tilecoll WALL, FLOOR, WALL, WALL ; 09
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0a
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0b
+	tilecoll FLOOR, WALL, WALL, WALL ; 0c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 0e
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0f
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 11
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13
+	tilecoll WALL, FLOOR, WALL, WALL ; 14
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 15
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 16
+	tilecoll FLOOR, WALL, WALL, WALL ; 17
+	tilecoll WALL, WALL, WALL, PIT ; 18
+	tilecoll WALL, WALL, PIT, WALL ; 19
+	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 1a
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1d
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1e
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1f
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 20
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 21
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 22
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 23
+	tilecoll WALL, WALL, WALL, WALL ; 24
+	tilecoll WALL, WALL, WALL, WALL ; 25
+	tilecoll WALL, WALL, WALL, WALL ; 26
+	tilecoll WALL, WALL, WALL, WALL ; 27
+	tilecoll WALL, WALL, WALL, WALL ; 28
+	tilecoll WALL, WALL, WALL, WALL ; 29
+	tilecoll WALL, WALL, WALL, WALL ; 2a
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 2b
+	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 2c
+	tilecoll 88, FLOOR, 88, FLOOR ; 2d
+	tilecoll 88, FLOOR, 88, FLOOR ; 2e
+	tilecoll 89, FLOOR, 89, FLOOR ; 2f
+	tilecoll 1E, FLOOR, GRASS_4A, FLOOR ; 30
+	tilecoll 1F, FLOOR, GRASS_4B, FLOOR ; 31
+	tilecoll GRASS_48, FLOOR, CUT_28, FLOOR ; 32
+	tilecoll GRASS_49, FLOOR, WATER, FLOOR ; 33
+	tilecoll 1E, FLOOR, GRASS_4A, FLOOR ; 34
+	tilecoll 1F, FLOOR, GRASS_4B, FLOOR ; 35
+	tilecoll GRASS_48, FLOOR, CUT_28, FLOOR ; 36
+	tilecoll GRASS_49, FLOOR, WATER, FLOOR ; 37
+	tilecoll 1E, FLOOR, GRASS_4A, FLOOR ; 38
+	tilecoll 1F, FLOOR, GRASS_4B, FLOOR ; 39
+	tilecoll GRASS_48, FLOOR, CUT_28, FLOOR ; 3a
+	tilecoll GRASS_49, FLOOR, WATER, FLOOR ; 3b
+	tilecoll 64, FLOOR, WATERFALL_UP, FLOOR ; 3c
+	tilecoll 65, FLOOR, WATERFALL, FLOOR ; 3d
+	tilecoll WATERFALL_UP, FLOOR, WARP_CARPET_DOWN, FLOOR ; 3e
+	tilecoll WATERFALL, FLOOR, DOOR, FLOOR ; 3f
diff --git a/data/tilesets/unused_johto_collision.asm b/data/tilesets/unused_johto_collision.asm
new file mode 100644
index 00000000..8bbc11f2
--- /dev/null
+++ b/data/tilesets/unused_johto_collision.asm
@@ -0,0 +1,128 @@
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll WALL, WALL, WALL, WALL ; 05
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+	tilecoll WALL, WALL, WALL, WALL ; 08
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
+	tilecoll WALL, WALL, WALL, WALL ; 0a
+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
+	tilecoll WALL, WALL, WALL, WALL ; 10
+	tilecoll WALL, WALL, WALL, WALL ; 11
+	tilecoll WALL, WALL, WALL, WALL ; 12
+	tilecoll WALL, WALL, WALL, WALL ; 13
+	tilecoll WALL, WALL, WALL, DOOR ; 14
+	tilecoll WALL, WALL, WALL, WALL ; 15
+	tilecoll WALL, WALL, WALL, DOOR ; 16
+	tilecoll WALL, WALL, TOWN_MAP, WALL ; 17
+	tilecoll WALL, WALL, WALL, WALL ; 18
+	tilecoll WALL, WALL, WALL, WALL ; 19
+	tilecoll WALL, WALL, WALL, DOOR ; 1a
+	tilecoll WALL, WALL, TOWN_MAP, WALL ; 1b
+	tilecoll WALL, WALL, WALL, WALL ; 1c
+	tilecoll WALL, WALL, DOOR, WALL ; 1d
+	tilecoll WALL, WALL, WALL, WALL ; 1e
+	tilecoll WALL, WALL, WALL, WALL ; 1f
+	tilecoll WALL, WALL, WALL, WALL ; 20
+	tilecoll WALL, WALL, WALL, WALL ; 21
+	tilecoll WALL, WALL, WALL, WALL ; 22
+	tilecoll WALL, WALL, WALL, WALL ; 23
+	tilecoll WALL, WALL, WALL, WALL ; 24
+	tilecoll WALL, WALL, WALL, WALL ; 25
+	tilecoll WALL, WALL, WALL, WALL ; 26
+	tilecoll WALL, WALL, WALL, WALL ; 27
+	tilecoll WALL, WALL, WALL, DOOR ; 28
+	tilecoll WALL, WALL, WALL, WALL ; 29
+	tilecoll WALL, WALL, WALL, DOOR ; 2a
+	tilecoll WALL, WALL, WALL, WALL ; 2b
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2c
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2d
+	tilecoll WALL, WALL, WALL, DOOR ; 2e
+	tilecoll WALL, WALL, WALL, WALL ; 2f
+	tilecoll BUOY, BUOY, BUOY, WATER_21 ; 30
+	tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 31
+	tilecoll BUOY, BUOY, WATER_21, BUOY ; 32
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 33
+	tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 34
+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 35
+	tilecoll WATER_21, BUOY, WATER_21, BUOY ; 36
+	tilecoll WALL, WALL, WALL, WALL ; 37
+	tilecoll BUOY, WATER_21, BUOY, BUOY ; 38
+	tilecoll WATER_21, WATER_21, BUOY, BUOY ; 39
+	tilecoll WATER_21, BUOY, BUOY, BUOY ; 3a
+	tilecoll WALL, WALL, WALL, WALL ; 3b
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3d
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3e
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3f
+	tilecoll WALL, WALL, WALL, FLOOR ; 40
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 41
+	tilecoll WALL, WALL, FLOOR, WALL ; 42
+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 43
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 44
+	tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 45
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 46
+	tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 47
+	tilecoll WALL, FLOOR, WALL, WALL ; 48
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 49
+	tilecoll FLOOR, WALL, WALL, WALL ; 4a
+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53
+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 54
+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 55
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57
+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 58
+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 59
+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a
+	tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5b
+	tilecoll WALL, WALL, WALL, FLOOR ; 5c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 5d
+	tilecoll WALL, WALL, FLOOR, WALL ; 5e
+	tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 5f
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 60
+	tilecoll WALL, WALL, WALL, WALL ; 61
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 62
+	tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 63
+	tilecoll WALL, FLOOR, WALL, WALL ; 64
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 65
+	tilecoll FLOOR, WALL, WALL, WALL ; 66
+	tilecoll CUT_TREE, FLOOR, WALL, FLOOR ; 67
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 68
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 69
+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a
+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b
+	tilecoll WALL, FLOOR, WALL, WALL ; 6c
+	tilecoll FLOOR, WALL, WALL, WALL ; 6d
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f
+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 72
+	tilecoll FLOOR, FLOOR, DOOR, WALL ; 73
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 75
+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 76
+	tilecoll WALL, WALL, WALL, WALL ; 77
+	tilecoll WALL, WALL, WALL, WALL ; 78
+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 79
+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7a
+	tilecoll WALL, WALL, WALL, WALL ; 7b
+	tilecoll WALL, WALL, WALL, WALL ; 7c
+	tilecoll WALL, WALL, WALL, WALL ; 7d
+	tilecoll WALL, WALL, WALL, WALL ; 7e
+	tilecoll WALL, WALL, WALL, WALL ; 7f
diff --git a/data/tilesets/unused_johto_metatiles.bin b/data/tilesets/unused_johto_metatiles.bin
new file mode 100644
index 00000000..b70f1a0e
--- /dev/null
+++ b/data/tilesets/unused_johto_metatiles.bin
diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm
index 201f2a51..2834f3cd 100644
--- a/gfx/tilesets.asm
+++ b/gfx/tilesets.asm
@@ -33,7 +33,13 @@ TilesetJohtoModernMeta::
 INCBIN "data/tilesets/johto_modern_metatiles.bin"
 
 TilesetJohtoModernColl::
-	dr $1a80c, $1b40c
+INCLUDE "data/tilesets/johto_modern_collision.asm"
+
+UnusedTilesetJohtoMeta::
+INCBIN "data/tilesets/unused_johto_metatiles.bin"
+
+UnusedTilesetJohtoColl::
+INCLUDE "data/tilesets/unused_johto_collision.asm"
 
 TilesetTraditionalHouseGFX::
 INCBIN "gfx/tilesets/traditional_house.2bpp.lz"
@@ -90,7 +96,7 @@ TilesetMansionMeta::
 INCBIN "data/tilesets/mansion_metatiles.bin"
 
 TilesetMansionColl::
-	dr $1eebc, $1efbc
+INCLUDE "data/tilesets/mansion_collision.asm"
 
 TilesetCaveGFX::
 INCBIN "gfx/tilesets/cave.2bpp.lz"
@@ -122,7 +128,7 @@ TilesetLabMeta::
 INCBIN "data/tilesets/lab_metatiles.bin"
 
 TilesetLabColl::
-	dr $21281, $21381
+INCLUDE "data/tilesets/lab_collision.asm"
 
 TilesetFacilityGFX::
 INCBIN "gfx/tilesets/facility.2bpp.lz"
@@ -140,7 +146,7 @@ TilesetMartMeta::
 INCBIN "data/tilesets/mart_metatiles.bin"
 
 TilesetMartColl::
-	dr $22451, $22551
+INCLUDE "data/tilesets/mart_collision.asm"
 
 TilesetGameCornerGFX::
 INCBIN "gfx/tilesets/game_corner.2bpp.lz"
@@ -191,7 +197,7 @@ TilesetRuinsOfAlphMeta::
 INCBIN "data/tilesets/ruins_of_alph_metatiles.bin"
 
 TilesetRuinsOfAlphColl::
-	dr $31a70, $31b70
+INCLUDE "data/tilesets/ruins_of_alph_collision.asm"
 
 TilesetRadioTowerGFX::
 INCBIN "gfx/tilesets/radio_tower.2bpp.lz"
@@ -200,7 +206,7 @@ TilesetRadioTowerMeta::
 INCBIN "data/tilesets/radio_tower_metatiles.bin"
 
 TilesetRadioTowerColl::
-	dr $323c0, $324c0
+INCLUDE "data/tilesets/radio_tower_collision.asm"
 
 TilesetUndergroundGFX::
 INCBIN "gfx/tilesets/underground.2bpp.lz"