Use constants for asm collision data

macros.asm

@@ -13,7 +13,7 @@ INCLUDE "macros/rst.asm"
 INCLUDE "macros/mobile.asm"
 INCLUDE "macros/trainer.asm"
 INCLUDE "macros/trade_anim.asm"
-INCLUDE "macros/pals.asm"
+INCLUDE "macros/tilesets.asm"
 
 RGB: MACRO
 	dw ((\3) << 10) + ((\2) << 5) + (\1)

macros/tilesets.asm

@@ -7,3 +7,7 @@ rept (_NARG +- 1) / 2
 	shift
 endr
 endm
+
+tilecoll: MACRO
+	db COLL_\1, COLL_\2, COLL_\3, COLL_\4
+endm

tilesets/aerodactyl_word_room_collision.asm

@@ -0,0 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
+	tilecoll WALL, WALL, WALL, FLOOR ; 15
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 16
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 17
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 19
+	tilecoll WALL, WALL, FLOOR, WALL ; 1a
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
+	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 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 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
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40

tilesets/battle_tower_collision.asm

@@ -0,0 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 03
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 04
+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 05
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 06
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 07
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 08
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 09
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 0a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+	tilecoll DOOR, WALL, FLOOR, FLOOR ; 11
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 12
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 13
+	tilecoll WALL, WALL, WALL, WALL ; 14
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 15
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 16
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 17
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 18
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 19
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1b
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1f
+	tilecoll WALL, WALL, FLOOR, WALL ; 20
+	tilecoll WALL, WALL, WALL, FLOOR ; 21
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 22
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 23
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 25
+	tilecoll WALL, FLOOR, FLOOR, DOOR ; 26
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 27
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 28
+	tilecoll WALL, PC, FLOOR, FLOOR ; 29
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
+	tilecoll WALL, WALL, WALL, FLOOR ; 2b
+	tilecoll WALL, WALL, FLOOR, WALL ; 2c
+	tilecoll FLOOR, FLOOR, FLOOR, DOOR ; 2d
+	tilecoll FLOOR, FLOOR, DOOR, 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, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 35
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
+	tilecoll WALL, WALL, FLOOR, WALL ; 37
+	tilecoll WALL, WALL, WALL, FLOOR ; 38
+	tilecoll WALL, WALL, FLOOR, WALL ; 39
+	tilecoll WALL, WALL, WALL, WALL ; 3a
+	tilecoll WALL, WALL, WALL, FLOOR ; 3b
+	tilecoll WALL, WALL, WALL, WALL ; 3c
+	tilecoll WALL, WALL, FLOOR, WALL ; 3d
+	tilecoll WALL, WALL, FLOOR, WALL ; 3e
+	tilecoll WALL, WALL, WALL, FLOOR ; 3f
+	tilecoll WALL, WALL, FLOOR, WALL ; 40

tilesets/battle_tower_outside_collision.asm

@@ -0,0 +1,128 @@
+	tilecoll 01, 01, 01, 01 ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+	tilecoll WALL, WALL, WALL, WALL ; 06
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
+	tilecoll WALL, WALL, WALL, WALL ; 09
+	tilecoll WALL, WALL, WALL, WALL ; 0a
+	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll WALL, WALL, WALL, WALL ; 0c
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d
+	tilecoll FLOOR, WALL, WALL, WALL ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
+	tilecoll WALL, WALL, WALL, WALL ; 10
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 11
+	tilecoll WALL, WALL, FLOOR, WALL ; 12
+	tilecoll WALL, WALL, DOOR, DOOR ; 13
+	tilecoll WALL, WALL, WALL, FLOOR ; 14
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 15
+	tilecoll WALL, WALL, WALL, WALL ; 16
+	tilecoll WALL, WALL, DOOR, 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 HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 1d
+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 1e
+	tilecoll WALL, WALL, WALL, WALL ; 1f
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 20
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 21
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 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, 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, WALL ; 2d
+	tilecoll WALL, FLOOR, WALL, WALL ; 2e
+	tilecoll WALL, WALL, WALL, WALL ; 2f
+	tilecoll WALL, FLOOR, WALL, WALL ; 30
+	tilecoll WALL, WALL, WALL, WALL ; 31
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 32
+	tilecoll WALL, HEADBUTT_TREE, WALL, HEADBUTT_TREE ; 33
+	tilecoll WALL, WALL, WALL, WALL ; 34
+	tilecoll WHIRLPOOL, FLOOR, WHIRLPOOL, FLOOR ; 35
+	tilecoll WHIRLPOOL, FLOOR, FLOOR, FLOOR ; 36
+	tilecoll 5B, FLOOR, FLOOR, FLOOR ; 37
+	tilecoll 5B, 01, 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
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 41
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 42
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 43
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 44
+	tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 45
+	tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 46
+	tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 47
+	tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 48
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 50
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 51
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 52
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 53
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 54
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 55
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 56
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 57
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 58
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 59
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 60
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 61
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 62
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 63
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 64
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 65
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 66
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 67
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 68
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 69
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 70
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 73
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 74
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 75
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 76
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 77
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 78
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 79
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80

tilesets/beta_word_room_collision.asm

@@ -0,0 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
+	tilecoll WALL, WALL, WALL, FLOOR ; 15
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 16
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 17
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 19
+	tilecoll WALL, WALL, FLOOR, WALL ; 1a
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
+	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 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 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
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40

tilesets/cave_collision.asm

@@ -0,0 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll WALL, WALL, WALL, WALL ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 05
+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06
+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 07
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 09
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c
+	tilecoll WALL, FLOOR, WALL, WALL ; 0d
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
+	tilecoll FLOOR, WALL, WALL, WALL ; 0f
+	tilecoll WATER, WATER, WATER, WATER ; 10
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13
+	tilecoll FLOOR, FLOOR, WALL, CAVE ; 14
+	tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15
+	tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16
+	tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18
+	tilecoll WALL, WALL, WALL, FLOOR ; 19
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1a
+	tilecoll WALL, WALL, FLOOR, WALL ; 1b
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
+	tilecoll WALL, WALL, WALL, WALL ; 1e
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1f
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20
+	tilecoll WALL, FLOOR, WALL, WALL ; 21
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 22
+	tilecoll FLOOR, WALL, WALL, WALL ; 23
+	tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25
+	tilecoll WATER, WATER, WATER, WATER ; 26
+	tilecoll WATER, WATER, WATER, WATER ; 27
+	tilecoll WATER, WATER, WATER, WATER ; 28
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c
+	tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d
+	tilecoll WALL, WALL, WALL, WALL ; 2e
+	tilecoll WALL, WALL, WALL, WALL ; 2f
+	tilecoll WALL, WALL, WALL, WALL ; 30
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31
+	tilecoll WALL, WALL, WALL, WALL ; 32
+	tilecoll WATER, WATER, WATER, WATER ; 33
+	tilecoll WATER, WATER, WATER, WATER ; 34
+	tilecoll WALL, WALL, WALL, WALL ; 35
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 36
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 37
+	tilecoll WALL, WALL, WALL, CAVE ; 38
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d
+	tilecoll WATER, WATER, WATER, WATER ; 3e
+	tilecoll WATER, WATER, WATER, WATER ; 3f
+	tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40

tilesets/celadon_mansion_collision.asm

@@ -0,0 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll WALL, WALL, WALL, WALL ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 05
+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 07
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 08
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 09
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0a
+	tilecoll WALL, WALL, FLOOR, WALL ; 0b
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0c
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d
+	tilecoll WALL, WALL, FLOOR, WALL ; 0e
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0f
+	tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 10
+	tilecoll WALL, WALL, WALL, WALL ; 11
+	tilecoll WALL, WALL, BOOKSHELF, WALL ; 12
+	tilecoll WALL, WALL, WALL, WALL ; 13
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 15
+	tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 16
+	tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 17
+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 18
+	tilecoll WALL, WALL, BOOKSHELF, WALL ; 19
+	tilecoll WALL, WALL, WALL, WALL ; 1a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1e
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1f
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 20
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 21
+	tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 22
+	tilecoll WALL, WALL, FLOOR, WALL ; 23
+	tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 24
+	tilecoll WALL, WALL, WALL, STAIRCASE ; 25
+	tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 26
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 27
+	tilecoll WALL, WALL, DOOR, WALL ; 28
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 29
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2a
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
+	tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2d
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
+	tilecoll WALL, WALL, WALL, FLOOR ; 30
+	tilecoll WALL, WALL, FLOOR, WALL ; 31
+	tilecoll WALL, WALL, FLOOR, WALL ; 32
+	tilecoll WALL, WALL, WALL, WALL ; 33
+	tilecoll WALL, WALL, WALL, FLOOR ; 34
+	tilecoll WALL, WALL, WALL, WALL ; 35
+	tilecoll FLOOR, WALL, WALL, WALL ; 36
+	tilecoll WALL, WALL, FLOOR, WALL ; 37
+	tilecoll WALL, FLOOR, WALL, WALL ; 38
+	tilecoll WALL, WALL, FLOOR, WALL ; 39
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 3a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 3b
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
+	tilecoll WALL, FLOOR, WALL, WALL ; 3e
+	tilecoll FLOOR, WALL, WALL, WALL ; 3f
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 40

tilesets/data.asm

@@ -14,7 +14,7 @@ INCBIN "tilesets/kanto_metatiles.bin"
 ; 0x18e06
 
 TilesetKantoColl: ; 0x18e06
-INCBIN "tilesets/kanto_collision.bin"
+INCLUDE "tilesets/kanto_collision.asm"
 ; 0x19006
 
 Tileset0GFX: ; 0x19006
@@ -29,7 +29,7 @@ INCBIN "tilesets/johto_1_metatiles.bin"
 
 Tileset0Coll: ; 0x1a40e
 TilesetJohto1Coll: ; 0x1a40e
-INCBIN "tilesets/johto_1_collision.bin"
+INCLUDE "tilesets/johto_1_collision.asm"
 ; 0x1a60e
 
 TilesetIcePathGFX: ; 0x1a60e
@@ -41,7 +41,7 @@ INCBIN "tilesets/ice_path_metatiles.bin"
 ; 0x1b33e
 
 TilesetIcePathColl: ; 0x1b33e
-INCBIN "tilesets/ice_path_collision.bin"
+INCLUDE "tilesets/ice_path_collision.asm"
 ; 0x1b43e
 
 TilesetPlayersHouse2FGFX: ; 0x1b43e
@@ -53,7 +53,7 @@ INCBIN "tilesets/players_house_2f_metatiles.bin"
 ; 0x1bcfe
 
 TilesetPlayersHouse2FColl: ; 0x1bcfe
-INCBIN "tilesets/players_house_2f_collision.bin"
+INCLUDE "tilesets/players_house_2f_collision.asm"
 ; 0x1bdfe
 
 
@@ -68,7 +68,7 @@ INCBIN "tilesets/pokecenter_metatiles.bin"
 ; 0x1cb3c
 
 TilesetPokecenterColl: ; 0x1cb3c
-INCBIN "tilesets/pokecenter_collision.bin"
+INCLUDE "tilesets/pokecenter_collision.asm"
 ; 0x1cc3c
 
 TilesetPortGFX: ; 0x1cc3c
@@ -80,7 +80,7 @@ INCBIN "tilesets/port_metatiles.bin"
 ; 0x1d44c
 
 TilesetPortColl: ; 0x1d44c
-INCBIN "tilesets/port_collision.bin"
+INCLUDE "tilesets/port_collision.asm"
 ; 0x1d54c
 
 TilesetPlayersHouseGFX: ; 0x1d54c
@@ -92,7 +92,7 @@ INCBIN "tilesets/players_house_metatiles.bin"
 ; 0x1dd2c
 
 TilesetPlayersHouseColl: ; 0x1dd2c
-INCBIN "tilesets/players_house_collision.bin"
+INCLUDE "tilesets/players_house_collision.asm"
 ; 0x1de2c
 
 TilesetCeladonMansionGFX: ; 0x1de2c
@@ -104,7 +104,7 @@ INCBIN "tilesets/celadon_mansion_metatiles.bin"
 ; 0x1e98c
 
 TilesetCeladonMansionColl: ; 0x1e98c
-INCBIN "tilesets/celadon_mansion_collision.bin"
+INCLUDE "tilesets/celadon_mansion_collision.asm"
 ; 0x1ea8c
 
 TilesetCaveGFX: ; 0x1ea8c
@@ -118,7 +118,7 @@ INCBIN "tilesets/cave_metatiles.bin"
 
 TilesetCaveColl: ; 0x1f21c
 TilesetWhirlIslandsColl: ; 0x1f21c
-INCBIN "tilesets/cave_collision.bin"
+INCLUDE "tilesets/cave_collision.asm"
 ; 0x1f31c
 
 
@@ -133,7 +133,7 @@ INCBIN "tilesets/sprout_tower_metatiles.bin"
 ; 0x20ae1
 
 TilesetSproutTowerColl: ; 0x20ae1
-INCBIN "tilesets/sprout_tower_collision.bin"
+INCLUDE "tilesets/sprout_tower_collision.asm"
 ; 0x20be1
 
 TilesetLabGFX: ; 0x20be1
@@ -145,7 +145,7 @@ INCBIN "tilesets/lab_metatiles.bin"
 ; 0x217e1
 
 TilesetLabColl: ; 0x217e1
-INCBIN "tilesets/lab_collision.bin"
+INCLUDE "tilesets/lab_collision.asm"
 ; 0x218e1
 
 TilesetMartGFX: ; 0x218e1
@@ -157,7 +157,7 @@ INCBIN "tilesets/mart_metatiles.bin"
 ; 0x22431
 
 TilesetMartColl: ; 0x22431
-INCBIN "tilesets/mart_collision.bin"
+INCLUDE "tilesets/mart_collision.asm"
 ; 0x22531
 
 TilesetGameCornerGFX: ; 0x22531
@@ -169,7 +169,7 @@ INCBIN "tilesets/game_corner_metatiles.bin"
 ; 0x22ef1
 
 TilesetGameCornerColl: ; 0x22ef1
-INCBIN "tilesets/game_corner_collision.bin"
+INCLUDE "tilesets/game_corner_collision.asm"
 ; 0x22ff1
 
 TilesetTrainStationGFX: ; 0x22ff1
@@ -181,7 +181,7 @@ INCBIN "tilesets/train_station_metatiles.bin"
 ; 0x23791
 
 TilesetTrainStationColl: ; 0x23791
-INCBIN "tilesets/train_station_collision.bin"
+INCLUDE "tilesets/train_station_collision.asm"
 ; 0x23891
 
 TilesetIlexForestMeta: ; 0x23891
@@ -200,7 +200,7 @@ INCBIN "tilesets/gym_1_metatiles.bin"
 ; 0x308e0
 
 TilesetGym1Coll: ; 0x308e0
-INCBIN "tilesets/gym_1_collision.bin"
+INCLUDE "tilesets/gym_1_collision.asm"
 ; 0x309e0
 
 TilesetParkGFX: ; 0x309e0
@@ -212,7 +212,7 @@ INCBIN "tilesets/park_metatiles.bin"
 ; 0x31280
 
 TilesetParkColl: ; 0x31280
-INCBIN "tilesets/park_collision.bin"
+INCLUDE "tilesets/park_collision.asm"
 ; 0x31380
 
 TilesetRadioTowerGFX: ; 0x31380
@@ -224,7 +224,7 @@ INCBIN "tilesets/radio_tower_metatiles.bin"
 ; 0x31ce0
 
 TilesetRadioTowerColl: ; 0x31ce0
-INCBIN "tilesets/radio_tower_collision.bin"
+INCLUDE "tilesets/radio_tower_collision.asm"
 ; 0x31de0
 
 TilesetUndergroundGFX: ; 0x31de0
@@ -236,7 +236,7 @@ INCBIN "tilesets/underground_metatiles.bin"
 ; 0x325b0
 
 TilesetUndergroundColl: ; 0x325b0
-INCBIN "tilesets/underground_collision.bin"
+INCLUDE "tilesets/underground_collision.asm"
 ; 0x326b0
 
 TilesetWhirlIslandsGFX: ; 0x326b0
@@ -248,7 +248,7 @@ INCBIN "tilesets/unused_whirl_islands_metatiles.bin"
 ; 0x331f0
 
 UnusedTilesetWhirlIslandsColl: ; 0x331f0
-INCBIN "tilesets/unused_whirl_islands_collision.bin"
+INCLUDE "tilesets/unused_whirl_islands_collision.asm"
 ; 0x333f0
 
 
@@ -263,7 +263,7 @@ INCBIN "tilesets/pokecom_center_metatiles.bin"
 ; 0xb4ca0
 
 TilesetPokeComCenterColl: ; 0xb4ca0
-INCBIN "tilesets/pokecom_center_collision.bin"
+INCLUDE "tilesets/pokecom_center_collision.asm"
 ; 0xb4da0
 
 TilesetBattleTowerGFX: ; 0xb4da0
@@ -275,7 +275,7 @@ INCBIN "tilesets/battle_tower_metatiles.bin"
 ; 0xb54e0
 
 TilesetBattleTowerColl: ; 0xb54e0
-INCBIN "tilesets/battle_tower_collision.bin"
+INCLUDE "tilesets/battle_tower_collision.asm"
 ; 0xb55e0
 
 TilesetGateGFX: ; 0xb55e0
@@ -287,7 +287,7 @@ INCBIN "tilesets/gate_metatiles.bin"
 ; 0xb5de0
 
 TilesetGateColl: ; 0xb5de0
-INCBIN "tilesets/gate_collision.bin"
+INCLUDE "tilesets/gate_collision.asm"
 ; 0xb5ee0
 
 TilesetJohto2GFX: ; 0xb5ee0
@@ -300,7 +300,7 @@ INCBIN "tilesets/johto_2_metatiles.bin"
 ; 0xb72e8
 
 TilesetJohto2Coll: ; 0xb72e8
-INCBIN "tilesets/johto_2_collision.bin"
+INCLUDE "tilesets/johto_2_collision.asm"
 ; 0xb74e8
 
 TilesetKurtsHouseGFX: ; 0xb74e8
@@ -312,7 +312,7 @@ INCBIN "tilesets/kurts_house_metatiles.bin"
 ; 0xb7da8
 
 TilesetKurtsHouseColl: ; 0xb7da8
-INCBIN "tilesets/kurts_house_collision.bin"
+INCLUDE "tilesets/kurts_house_collision.asm"
 ; 0xb7ea8
 
 
@@ -331,7 +331,7 @@ INCBIN "tilesets/olivine_gym_metatiles.bin"
 ; 0xdd050
 
 TilesetOlivineGymColl: ; 0xdd050
-INCBIN "tilesets/olivine_gym_collision.bin"
+INCLUDE "tilesets/olivine_gym_collision.asm"
 ; 0xdd150
 
 TilesetHouse1GFX: ; 0xdd150
@@ -343,7 +343,7 @@ INCBIN "tilesets/house_1_metatiles.bin"
 ; 0xdda00
 
 TilesetHouse1Coll: ; 0xdda00
-INCBIN "tilesets/house_1_collision.bin"
+INCLUDE "tilesets/house_1_collision.asm"
 ; 0xddb00
 
 TilesetLighthouseGFX: ; 0xddb00
@@ -355,11 +355,11 @@ INCBIN "tilesets/lighthouse_metatiles.bin"
 ; 0xde370
 
 TilesetLighthouseColl: ; 0xde370
-INCBIN "tilesets/lighthouse_collision.bin"
+INCLUDE "tilesets/lighthouse_collision.asm"
 ; 0xde470
 
 TilesetIlexForestColl: ; 0xde470
-INCBIN "tilesets/ilex_forest_collision.bin"
+INCLUDE "tilesets/ilex_forest_collision.asm"
 ; 0xde570
 
 TilesetPowerPlantGFX: ; 0xde570
@@ -371,7 +371,7 @@ INCBIN "tilesets/power_plant_metatiles.bin"
 ; 0xded90
 
 TilesetPowerPlantColl: ; 0xded90
-INCBIN "tilesets/power_plant_collision.bin"
+INCLUDE "tilesets/power_plant_collision.asm"
 ; 0xdee90
 
 TilesetBattleTowerOutsideMeta: ; 0xdee90
@@ -379,7 +379,7 @@ INCBIN "tilesets/battle_tower_outside_metatiles.bin"
 ; 0xdf690
 
 TilesetBattleTowerOutsideColl: ; 0xdf690
-INCBIN "tilesets/battle_tower_outside_collision.bin"
+INCLUDE "tilesets/battle_tower_outside_collision.asm"
 ; 0xdf890
 
 TilesetBetaWordRoomMeta: ; 0xdf890
@@ -391,7 +391,7 @@ TilesetHoOhWordRoomColl: ; 0xdfc90
 TilesetKabutoWordRoomColl: ; 0xdfc90
 TilesetOmanyteWordRoomColl: ; 0xdfc90
 TilesetAerodactylWordRoomColl: ; 0xdfc90
-INCBIN "tilesets/beta_word_room_collision.bin"
+INCLUDE "tilesets/beta_word_room_collision.asm"
 ; 0xdfd90
 
 
@@ -411,7 +411,7 @@ INCBIN "tilesets/ruins_of_alph_metatiles.bin"
 ; 0x1dd5a9
 
 TilesetRuinsOfAlphColl: ; 0x1dd5a9
-INCBIN "tilesets/ruins_of_alph_collision.bin"
+INCLUDE "tilesets/ruins_of_alph_collision.asm"
 ; 0x1dd6a9
 
 

tilesets/game_corner_collision.asm

@@ -0,0 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 05
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+	tilecoll COUNTER, COUNTER, COUNTER, COUNTER ; 08
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 09
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0a
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b
+	tilecoll WALL, WALL, WALL, WALL ; 0c
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
+	tilecoll WALL, WALL, WALL, WALL ; 10
+	tilecoll WALL, WALL, COUNTER, COUNTER ; 11
+	tilecoll WALL, WALL, COUNTER, COUNTER ; 12
+	tilecoll WALL, WALL, WALL, WALL ; 13
+	tilecoll WALL, WALL, COUNTER, FLOOR ; 14
+	tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 15
+	tilecoll WALL, WALL, WALL, WALL ; 16
+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 17
+	tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 18
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 19
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b
+	tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 1c
+	tilecoll WALL, WALL, FLOOR, COUNTER ; 1d
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1e
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 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 WALL, WALL, WALL, WALL ; 24
+	tilecoll WALL, WALL, WALL, WALL ; 25
+	tilecoll WALL, WALL, WALL, WALL ; 26
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 27
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 28
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 29
+	tilecoll WALL, WALL, FLOOR, WALL ; 2a
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2b
+	tilecoll WALL, WALL, FLOOR, WALL ; 2c
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2d
+	tilecoll WALL, WALL, WALL, WALL ; 2e
+	tilecoll WALL, WALL, WALL, WALL ; 2f
+	tilecoll WALL, WALL, FLOOR, WALL ; 30
+	tilecoll WALL, WALL, WALL, 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
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40

tilesets/gate_collision.asm

@@ -0,0 +1,64 @@
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 03
+	tilecoll WALL, WALL, WALL, WALL ; 04
+	tilecoll DOOR, DOOR, FLOOR, FLOOR ; 05
+	tilecoll WALL, WALL, WALL, WALL ; 06
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 07
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 08
+	tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 09
+	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 0a
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b
+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0c
+	tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0d
+	tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0e
+	tilecoll WALL, WALL, COUNTER, FLOOR ; 0f
+	tilecoll WALL, WALL, FLOOR, COUNTER ; 10
+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 11
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 12
+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 13
+	tilecoll WALL, WALL, FLOOR, COUNTER ; 14
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15
+	tilecoll WALL, WALL, WALL, WALL ; 16
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 17
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 22
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 24
+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 26
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 27
+	tilecoll WALL, WALL, WALL, WALL ; 28
+	tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 29
+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 2a
+	tilecoll DOOR, WALL, FLOOR, FLOOR ; 2b
+	tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2c
+	tilecoll WALL, WALL, FLOOR, PC ; 2d
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
+	tilecoll DOOR, WALL, FLOOR, FLOOR ; 2f
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 30
+	tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 31
+	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 32
+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 33
+	tilecoll COUNTER, FLOOR, FLOOR, WALL ; 34
+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 35
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 39
+	tilecoll WALL, WALL, WALL, WALL ; 3a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 3b
+	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 3c
+	tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 3d
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 3e
+	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 3f
+	tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 40

tilesets/gym_1_collision.asm

@@ -0,0 +1,64 @@
+	tilecoll WALL, WALL, WALL, WALL ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 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, PIT, FLOOR ; 0a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0c
+	tilecoll WALL, FLOOR, WALL, WALL ; 0d
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
+	tilecoll FLOOR, WALL, WALL, WALL ; 0f
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 11
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14
+	tilecoll WALL, WALL, WALL, WALL ; 15
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 16
+	tilecoll LADDER, LADDER, FLOOR, FLOOR ; 17
+	tilecoll WALL, WALL, WALL, WALL ; 18
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 19
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
+	tilecoll WALL, FLOOR, WALL, WALL ; 1c
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1d
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1e
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1f
+	tilecoll WALL, WALL, WALL, WALL ; 20
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 21
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 22
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 23
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 24
+	tilecoll WALL, WALL, WALL, WALL ; 25
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 26
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 27
+	tilecoll WALL, WALL, WALL, WALL ; 28
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 29
+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 2a
+	tilecoll WALL, WALL, WALL, WALL ; 2b
+	tilecoll WALL, WALL, WALL, WALL ; 2c
+	tilecoll WALL, WALL, WALL, WALL ; 2d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
+	tilecoll ICE, ICE, ICE, FLOOR ; 2f
+	tilecoll ICE, ICE, FLOOR, ICE ; 30
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 31
+	tilecoll FLOOR, ICE, ICE, ICE ; 32
+	tilecoll ICE, FLOOR, ICE, ICE ; 33
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 34
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 35
+	tilecoll ICE, WALL, ICE, WALL ; 36
+	tilecoll WALL, ICE, WALL, ICE ; 37
+	tilecoll WALL, WALL, WALL, WALL ; 38
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
+	tilecoll ICE, ICE, ICE, ICE ; 3a
+	tilecoll WALL, FLOOR, FLOOR, WALL ; 3b
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c
+	tilecoll DOOR, DOOR, FLOOR, FLOOR ; 3d
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 3e
+	tilecoll WALL, WALL, WALL, WALL ; 3f
+	tilecoll WALL, WALL, WALL, WALL ; 40