pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix off-by-one error

Browse Source
This commit is contained in:
Rangi
2018-01-26 20:57:55 -05:00
parent ee55ca8e72
commit ea480fa31e
37 changed files with 1841 additions and 1841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
data/tilesets/aerodactyl_word_room_collision.asm
View File

@@ -1,4 +1,5 @@
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 FLOOR, FLOOR, FLOOR, FLOOR ; 04
@@ -17,20 +18,20 @@
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, WALL, FLOOR ; 14
tilecoll WALL, WALL, FLOOR, 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 FLOOR, FLOOR, FLOOR, FLOOR ; 17
tilecoll WALL, WALL, FLOOR, FLOOR ; 18
tilecoll WALL, WALL, FLOOR, WALL ; 19
tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c
tilecoll WALL, WALL, WALL, 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 FLOOR, FLOOR, FLOOR, FLOOR ; 21
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
@@ -61,4 +62,3 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40

102
data/tilesets/battle_tower_collision.asm
View File

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

78
data/tilesets/battle_tower_outside_collision.asm
View File

@@ -1,37 +1,38 @@
tilecoll 01, 01, 01, 01 ; 01
tilecoll 01, 01, 01, 01 ; 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 FLOOR, FLOOR, FLOOR, FLOOR ; 05
tilecoll WALL, WALL, WALL, WALL ; 06
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 FLOOR, FLOOR, FLOOR, FLOOR ; 08
tilecoll WALL, WALL, WALL, WALL ; 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 FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c
tilecoll FLOOR, WALL, WALL, WALL ; 0d
tilecoll WALL, 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, FLOOR, FLOOR ; 10
tilecoll WALL, WALL, FLOOR, WALL ; 11
tilecoll WALL, WALL, DOOR, DOOR ; 12
tilecoll WALL, WALL, WALL, FLOOR ; 13
tilecoll WALL, WALL, FLOOR, FLOOR ; 14
tilecoll WALL, WALL, WALL, WALL ; 15
tilecoll WALL, WALL, DOOR, WALL ; 16
tilecoll WALL, WALL, WALL, 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 HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 1c
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 1d
tilecoll WALL, WALL, WALL, WALL ; 1e
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 1f
tilecoll FLOOR, FLOOR, WALL, WALL ; 20
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 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
@@ -42,18 +43,18 @@
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 WALL, FLOOR, WALL, WALL ; 2d
tilecoll WALL, WALL, WALL, WALL ; 2e
tilecoll WALL, FLOOR, WALL, WALL ; 2f
tilecoll WALL, WALL, WALL, WALL ; 30
tilecoll WALL, FLOOR, WALL, FLOOR ; 31
tilecoll WALL, HEADBUTT_TREE, WALL, HEADBUTT_TREE ; 32
tilecoll WALL, WALL, WALL, WALL ; 33
tilecoll WHIRLPOOL, FLOOR, WHIRLPOOL, FLOOR ; 34
tilecoll WHIRLPOOL, FLOOR, FLOOR, FLOOR ; 35
tilecoll 5B, FLOOR, FLOOR, FLOOR ; 36
tilecoll 5B, 01, 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
@@ -65,11 +66,11 @@
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 ; 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 ; 48
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4b
@@ -125,4 +126,3 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80

24
data/tilesets/beta_word_room_collision.asm
View File

@@ -1,4 +1,5 @@
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 FLOOR, FLOOR, FLOOR, FLOOR ; 04
@@ -17,20 +18,20 @@
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, WALL, FLOOR ; 14
tilecoll WALL, WALL, FLOOR, 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 FLOOR, FLOOR, FLOOR, FLOOR ; 17
tilecoll WALL, WALL, FLOOR, FLOOR ; 18
tilecoll WALL, WALL, FLOOR, WALL ; 19
tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c
tilecoll WALL, WALL, WALL, 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 FLOOR, FLOOR, FLOOR, FLOOR ; 21
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
@@ -61,4 +62,3 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40

108
data/tilesets/cave_collision.asm
View File

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

112
data/tilesets/champions_room_collision.asm
View File

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

108
data/tilesets/dark_cave_collision.asm
View File

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

110
data/tilesets/elite_four_room_collision.asm
View File

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

114
data/tilesets/facility_collision.asm
View File

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

66
data/tilesets/forest_collision.asm
View File

@@ -1,43 +1,44 @@
tilecoll WALL, WALL, WALL, WALL ; 01
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
tilecoll WALL, WALL, WALL, WALL ; 00
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
tilecoll WATER, WATER, WATER, WATER ; 02
tilecoll WATER, WATER, WATER, WATER ; 03
tilecoll WATER, WATER, WATER, WATER ; 04
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
tilecoll WALL, WALL, WALL, WALL ; 06
tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 07
tilecoll WATER, WATER, WATER, WATER ; 08
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 09
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 0a
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
tilecoll WALL, WALL, WALL, WALL ; 05
tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 06
tilecoll WATER, WATER, WATER, WATER ; 07
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 08
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 09
tilecoll WATER, WATER, WATER, WATER ; 0a
tilecoll WATER, WATER, WATER, WATER ; 0b
tilecoll WATER, WATER, WATER, WATER ; 0c
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 0d
tilecoll WATER, WATER, WATER, WATER ; 0e
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 0f
tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 10
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 11
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 12
tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 13
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14
tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 15
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 16
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 17
tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 18
tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 19
tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 1a
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1b
tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 1c
tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 1d
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 0c
tilecoll WATER, WATER, WATER, WATER ; 0d
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 0e
tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 0f
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 10
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 11
tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 12
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13
tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 14
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 15
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 16
tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 17
tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 18
tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 19
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1a
tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 1b
tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 1c
tilecoll WALL, WALL, WALL, WALL ; 1d
tilecoll WALL, WALL, WALL, WALL ; 1e
tilecoll WALL, WALL, WALL, WALL ; 1f
tilecoll WALL, WALL, WALL, WALL ; 20
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 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, DOOR ; 25
tilecoll WALL, WALL, WALL, DOOR ; 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, FLOOR, WALL, FLOOR ; 28
tilecoll WALL, FLOOR, WALL, FLOOR ; 29
tilecoll WALL, FLOOR, WALL, FLOOR ; 2a
tilecoll WALL, FLOOR, WALL, FLOOR ; 2b
@@ -61,4 +62,3 @@
tilecoll WALL, FLOOR, WALL, FLOOR ; 3d
tilecoll WALL, FLOOR, WALL, FLOOR ; 3e
tilecoll WALL, FLOOR, WALL, FLOOR ; 3f
tilecoll WALL, FLOOR, WALL, FLOOR ; 40

76
data/tilesets/game_corner_collision.asm
View File

@@ -1,52 +1,53 @@
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 WALL, WALL, WALL, WALL ; 00
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
tilecoll WALL, WALL, FLOOR, FLOOR ; 02
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
tilecoll WALL, WALL, FLOOR, FLOOR ; 04
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
tilecoll COUNTER, COUNTER, COUNTER, COUNTER ; 08
tilecoll COUNTER, COUNTER, COUNTER, COUNTER ; 07
tilecoll FLOOR, FLOOR, 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 ; 0b
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c
tilecoll WALL, WALL, FLOOR, FLOOR ; 0d
tilecoll WALL, WALL, WALL, WALL ; 0e
tilecoll WALL, WALL, WALL, WALL ; 0f
tilecoll WALL, WALL, WALL, WALL ; 10
tilecoll WALL, WALL, COUNTER, COUNTER ; 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 WALL, WALL, WALL, WALL ; 12
tilecoll WALL, WALL, COUNTER, FLOOR ; 13
tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 14
tilecoll WALL, WALL, WALL, WALL ; 15
tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 16
tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 17
tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 18
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 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 FLOOR, COUNTER, COUNTER, COUNTER ; 1b
tilecoll WALL, WALL, FLOOR, COUNTER ; 1c
tilecoll FLOOR, WALL, FLOOR, WALL ; 1d
tilecoll WALL, FLOOR, WALL, FLOOR ; 1e
tilecoll FLOOR, FLOOR, FLOOR, 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, 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, FLOOR, FLOOR ; 26
tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 27
tilecoll WALL, WALL, FLOOR, FLOOR ; 28
tilecoll WALL, WALL, FLOOR, WALL ; 29
tilecoll WALL, FLOOR, WALL, FLOOR ; 2a
tilecoll WALL, WALL, FLOOR, WALL ; 2b
tilecoll FLOOR, FLOOR, WALL, WALL ; 2c
tilecoll WALL, WALL, 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 WALL, WALL, FLOOR, WALL ; 2f
tilecoll WALL, WALL, WALL, 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
@@ -61,4 +62,3 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40

112
data/tilesets/gate_collision.asm
View File

@@ -1,64 +1,64 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
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 ; 02
tilecoll WALL, WALL, WALL, WALL ; 03
tilecoll DOOR, DOOR, FLOOR, FLOOR ; 04
tilecoll WALL, WALL, WALL, WALL ; 05
tilecoll WALL, WALL, FLOOR, FLOOR ; 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 COUNTER, COUNTER, COUNTER, FLOOR ; 08
tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 09
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a
tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b
tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0c
tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0d
tilecoll WALL, WALL, COUNTER, FLOOR ; 0e
tilecoll WALL, WALL, FLOOR, COUNTER ; 0f
tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 10
tilecoll WALL, STAIRCASE, 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 WALL, WALL, FLOOR, COUNTER ; 13
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
tilecoll WALL, WALL, WALL, WALL ; 15
tilecoll WALL, WALL, FLOOR, FLOOR ; 16
tilecoll FLOOR, FLOOR, 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, WALL, WALL ; 19
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1b
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c
tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
tilecoll FLOOR, FLOOR, 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 COUNTER, COUNTER, FLOOR, FLOOR ; 21
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 23
tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 24
tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 26
tilecoll WALL, WALL, WALL, WALL ; 27
tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 28
tilecoll WALL, DOOR, FLOOR, FLOOR ; 29
tilecoll DOOR, WALL, FLOOR, FLOOR ; 2a
tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2b
tilecoll WALL, WALL, FLOOR, PC ; 2c
tilecoll WALL, WALL, FLOOR, FLOOR ; 2d
tilecoll DOOR, WALL, FLOOR, FLOOR ; 2e
tilecoll WALL, WALL, FLOOR, FLOOR ; 2f
tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 30
tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 31
tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 32
tilecoll COUNTER, FLOOR, FLOOR, WALL ; 33
tilecoll COUNTER, FLOOR, COUNTER, 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 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
tilecoll WALL, FLOOR, WALL, FLOOR ; 38
tilecoll WALL, WALL, WALL, WALL ; 39
tilecoll FLOOR, WALL, FLOOR, WALL ; 3a
tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 3b
tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 3c
tilecoll WALL, WALL, FLOOR, FLOOR ; 3d
tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 3e
tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 3f

24
data/tilesets/ho_oh_word_room_collision.asm
View File

@@ -1,4 +1,5 @@
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 FLOOR, FLOOR, FLOOR, FLOOR ; 04
@@ -17,20 +18,20 @@
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, WALL, FLOOR ; 14
tilecoll WALL, WALL, FLOOR, 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 FLOOR, FLOOR, FLOOR, FLOOR ; 17
tilecoll WALL, WALL, FLOOR, FLOOR ; 18
tilecoll WALL, WALL, FLOOR, WALL ; 19
tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c
tilecoll WALL, WALL, WALL, 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 FLOOR, FLOOR, FLOOR, FLOOR ; 21
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
@@ -61,4 +62,3 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40

94
data/tilesets/house_collision.asm
View File

@@ -1,54 +1,55 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 02
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 03
tilecoll WALL, WALL, FLOOR, FLOOR ; 04
tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05
tilecoll WALL, WINDOW, FLOOR, FLOOR ; 06
tilecoll WALL, FLOOR, WALL, FLOOR ; 07
tilecoll FLOOR, WALL, FLOOR, WALL ; 08
tilecoll WALL, WINDOW, FLOOR, FLOOR ; 09
tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 0a
tilecoll WALL, WALL, WALL, WALL ; 0b
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e
tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0f
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
tilecoll WALL, WALL, PC, WALL ; 11
tilecoll WALL, WALL, WALL, FLOOR ; 12
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 01
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 02
tilecoll WALL, WALL, FLOOR, FLOOR ; 03
tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 04
tilecoll WALL, WINDOW, FLOOR, FLOOR ; 05
tilecoll WALL, FLOOR, WALL, FLOOR ; 06
tilecoll FLOOR, WALL, FLOOR, WALL ; 07
tilecoll WALL, WINDOW, FLOOR, FLOOR ; 08
tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 09
tilecoll WALL, WALL, WALL, WALL ; 0a
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d
tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
tilecoll WALL, WALL, PC, WALL ; 10
tilecoll WALL, WALL, WALL, FLOOR ; 11
tilecoll WALL, WALL, FLOOR, FLOOR ; 12
tilecoll WALL, WALL, FLOOR, FLOOR ; 13
tilecoll WALL, WALL, FLOOR, FLOOR ; 14
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 15
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16
tilecoll WINDOW, WALL, FLOOR, FLOOR ; 17
tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 18
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a
tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b
tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1c
tilecoll WALL, WALL, FLOOR, PC ; 1d
tilecoll WALL, WALL, FLOOR, RADIO ; 1e
tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1f
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 15
tilecoll WINDOW, WALL, FLOOR, FLOOR ; 16
tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 17
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 19
tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1a
tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1b
tilecoll WALL, WALL, FLOOR, PC ; 1c
tilecoll WALL, WALL, FLOOR, RADIO ; 1d
tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1e
tilecoll WALL, WALL, WALL, WALL ; 1f
tilecoll WALL, WALL, WALL, WALL ; 20
tilecoll WALL, WALL, WALL, WALL ; 21
tilecoll FLOOR, WALL, FLOOR, WALL ; 22
tilecoll WALL, FLOOR, WALL, FLOOR ; 23
tilecoll FLOOR, WALL, FLOOR, WALL ; 24
tilecoll WALL, FLOOR, WALL, FLOOR ; 25
tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 26
tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 27
tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 28
tilecoll FLOOR, WALL, FLOOR, WALL ; 21
tilecoll WALL, FLOOR, WALL, FLOOR ; 22
tilecoll FLOOR, WALL, FLOOR, WALL ; 23
tilecoll WALL, FLOOR, WALL, FLOOR ; 24
tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 25
tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 26
tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 27
tilecoll WALL, WALL, FLOOR, FLOOR ; 28
tilecoll WALL, WALL, FLOOR, FLOOR ; 29
tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
tilecoll WALL, WALL, FLOOR, FLOOR ; 2b
tilecoll WALL, WALL, FLOOR, FLOOR ; 2c
tilecoll WALL, WALL, WALL, WALL ; 2d
tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
tilecoll WALL, WALL, FLOOR, WALL ; 30
tilecoll WALL, FLOOR, WALL, FLOOR ; 31
tilecoll FLOOR, WALL, FLOOR, WALL ; 32
tilecoll WALL, WINDOW, WALL, WALL ; 33
tilecoll WALL, WALL, WALL, WALL ; 2c
tilecoll WALL, WALL, FLOOR, FLOOR ; 2d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
tilecoll WALL, WALL, FLOOR, WALL ; 2f
tilecoll WALL, FLOOR, WALL, FLOOR ; 30
tilecoll FLOOR, WALL, FLOOR, WALL ; 31
tilecoll WALL, WINDOW, WALL, WALL ; 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
@@ -61,4 +62,3 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40

124
data/tilesets/ice_path_collision.asm
View File

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

202
data/tilesets/johto_collision.asm
View File

@@ -1,33 +1,34 @@
tilecoll 01, 01, 01, 01 ; 01
tilecoll 01, 01, 01, 01 ; 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 FLOOR, FLOOR, FLOOR, FLOOR ; 05
tilecoll WALL, WALL, WALL, WALL ; 06
tilecoll LADDER, LADDER, LADDER, LADDER ; 07
tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 08
tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
tilecoll WALL, WALL, WALL, WALL ; 05
tilecoll LADDER, LADDER, LADDER, LADDER ; 06
tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 07
tilecoll WALL, WALL, WALL, WALL ; 08
tilecoll WALL, WALL, WALL, WALL ; 09
tilecoll WALL, WALL, WALL, WALL ; 0a
tilecoll WALL, WALL, WALL, WALL ; 0b
tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c
tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e
tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f
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, WALL ; 14
tilecoll WALL, WALL, WALL, DOOR ; 15
tilecoll WALL, WALL, WALL, WALL ; 16
tilecoll WALL, WALL, WALL, DOOR ; 17
tilecoll WALL, WALL, WALL, DOOR ; 14
tilecoll WALL, WALL, WALL, WALL ; 15
tilecoll WALL, WALL, WALL, DOOR ; 16
tilecoll WALL, WALL, WALL, WALL ; 17
tilecoll WALL, WALL, WALL, WALL ; 18
tilecoll WALL, WALL, WALL, WALL ; 19
tilecoll WALL, WALL, WALL, WALL ; 1a
tilecoll WALL, WALL, WALL, DOOR ; 1b
tilecoll WALL, WALL, WALL, DOOR ; 1a
tilecoll WALL, WALL, WALL, WALL ; 1b
tilecoll WALL, WALL, WALL, WALL ; 1c
tilecoll WALL, WALL, WALL, WALL ; 1d
tilecoll WALL, WALL, DOOR, WALL ; 1e
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
@@ -36,93 +37,92 @@
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, DOOR, WALL ; 28
tilecoll WALL, WALL, WALL, DOOR ; 29
tilecoll WALL, WALL, WALL, WALL ; 2a
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2b
tilecoll WALL, WALL, WALL, WALL ; 2c
tilecoll WALL, WALL, DOOR, WALL ; 27
tilecoll WALL, WALL, WALL, DOOR ; 28
tilecoll WALL, WALL, WALL, WALL ; 29
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2a
tilecoll WALL, WALL, WALL, WALL ; 2b
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2c
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2d
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2e
tilecoll WALL, WALL, WALL, DOOR ; 2f
tilecoll WALL, WALL, WALL, WALL ; 30
tilecoll BUOY, BUOY, BUOY, WATER ; 31
tilecoll BUOY, BUOY, WATER, WATER ; 32
tilecoll BUOY, BUOY, WATER, BUOY ; 33
tilecoll FLOOR, FLOOR, WALL, WALL ; 34
tilecoll BUOY, WATER, BUOY, WATER ; 35
tilecoll WATER, WATER, WATER, WATER ; 36
tilecoll WATER, BUOY, WATER, BUOY ; 37
tilecoll WALL, WALL, WALL, DOOR ; 38
tilecoll BUOY, WATER, BUOY, BUOY ; 39
tilecoll WATER, WATER, BUOY, BUOY ; 3a
tilecoll WATER, BUOY, BUOY, BUOY ; 3b
tilecoll WALL, WALL, WALL, WALL ; 3c
tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3d
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3e
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3f
tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 40
tilecoll WALL, WALL, WALL, FLOOR ; 41
tilecoll WALL, WALL, FLOOR, FLOOR ; 42
tilecoll WALL, WALL, FLOOR, WALL ; 43
tilecoll WATER, WATER, WATER, WATER ; 44
tilecoll WALL, FLOOR, WALL, FLOOR ; 45
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46
tilecoll FLOOR, WALL, FLOOR, WALL ; 47
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48
tilecoll WALL, FLOOR, WALL, WALL ; 49
tilecoll FLOOR, FLOOR, WALL, WALL ; 4a
tilecoll FLOOR, WALL, WALL, WALL ; 4b
tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c
tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d
tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e
tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f
tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50
tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51
tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52
tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53
tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54
tilecoll WALL, WALL, WALL, DOOR ; 2e
tilecoll WALL, WALL, WALL, WALL ; 2f
tilecoll BUOY, BUOY, BUOY, WATER ; 30
tilecoll BUOY, BUOY, WATER, WATER ; 31
tilecoll BUOY, BUOY, WATER, BUOY ; 32
tilecoll FLOOR, FLOOR, WALL, WALL ; 33
tilecoll BUOY, WATER, BUOY, WATER ; 34
tilecoll WATER, WATER, WATER, WATER ; 35
tilecoll WATER, BUOY, WATER, BUOY ; 36
tilecoll WALL, WALL, WALL, DOOR ; 37
tilecoll BUOY, WATER, BUOY, BUOY ; 38
tilecoll WATER, WATER, BUOY, BUOY ; 39
tilecoll WATER, BUOY, BUOY, BUOY ; 3a
tilecoll WALL, WALL, WALL, WALL ; 3b
tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3c
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3d
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3e
tilecoll FLOOR, FLOOR, FLOOR, 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 WATER, WATER, WATER, WATER ; 56
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58
tilecoll WATER, WATER, WATER, WATER ; 58
tilecoll WATER, WATER, WATER, WATER ; 59
tilecoll WATER, WATER, WATER, WATER ; 5a
tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b
tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5c
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5d
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5e
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5f
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 60
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 61
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 62
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 63
tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 64
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 66
tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 67
tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 68
tilecoll WALL, FLOOR, WALL, FLOOR ; 69
tilecoll FLOOR, WALL, FLOOR, WALL ; 6a
tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b
tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c
tilecoll WALL, FLOOR, WALL, WALL ; 6d
tilecoll FLOOR, WALL, WALL, WALL ; 6e
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70
tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72
tilecoll FLOOR, FLOOR, WALL, WALL ; 73
tilecoll FLOOR, FLOOR, CAVE, WALL ; 74
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75
tilecoll WALL, WALL, FLOOR, FLOOR ; 76
tilecoll WATER, WATER, WATER, WATER ; 77
tilecoll WALL, WALL, DOOR, WALL ; 78
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 79
tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a
tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5b
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5c
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5d
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5e
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 5f
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 60
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 61
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 62
tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 63
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 64
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65
tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 66
tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, 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, CAVE, WALL ; 73
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74
tilecoll WALL, WALL, FLOOR, FLOOR ; 75
tilecoll WATER, WATER, WATER, WATER ; 76
tilecoll WALL, WALL, DOOR, WALL ; 77
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 78
tilecoll WATER, WATER, WATER, WATER ; 79
tilecoll WATER, WATER, WATER, WATER ; 7a
tilecoll WATER, WATER, WATER, WATER ; 7b
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
tilecoll WALL, WALL, WALL, WALL ; 80

190
data/tilesets/johto_modern_collision.asm
View File

@@ -1,40 +1,41 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 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 FLOOR, FLOOR, FLOOR, FLOOR ; 05
tilecoll WALL, WALL, WALL, WALL ; 06
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 FLOOR, FLOOR, FLOOR, FLOOR ; 08
tilecoll WALL, WALL, WALL, WALL ; 08
tilecoll WALL, WALL, WALL, WALL ; 09
tilecoll WALL, WALL, WALL, WALL ; 0a
tilecoll WALL, WALL, WALL, WALL ; 0b
tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c
tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e
tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f
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, WALL ; 14
tilecoll WALL, WALL, WALL, DOOR ; 15
tilecoll WALL, WALL, WALL, WALL ; 16
tilecoll WALL, WALL, WALL, DOOR ; 17
tilecoll WALL, WALL, DOOR, WALL ; 18
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, WALL ; 1a
tilecoll WALL, WALL, WALL, DOOR ; 1b
tilecoll WALL, WALL, WALL, DOOR ; 1a
tilecoll WALL, WALL, WALL, WALL ; 1b
tilecoll WALL, WALL, WALL, WALL ; 1c
tilecoll WALL, WALL, WALL, WALL ; 1d
tilecoll WALL, WALL, DOOR, WALL ; 1e
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, DOOR, WALL ; 25
tilecoll WALL, WALL, DOOR, 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
@@ -42,87 +43,86 @@
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, WALL, WALL, DOOR ; 2e
tilecoll WALL, WALL, WALL, WALL ; 2f
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 30
tilecoll BUOY, BUOY, BUOY, WATER ; 31
tilecoll BUOY, BUOY, WATER, WATER ; 32
tilecoll BUOY, BUOY, WATER, BUOY ; 33
tilecoll WALL, WALL, WALL, WALL ; 34
tilecoll BUOY, WATER, BUOY, WATER ; 35
tilecoll WATER, WATER, WATER, WATER ; 36
tilecoll WATER, BUOY, WATER, BUOY ; 37
tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 38
tilecoll BUOY, WATER, BUOY, BUOY ; 39
tilecoll WATER, WATER, BUOY, BUOY ; 3a
tilecoll WATER, BUOY, BUOY, BUOY ; 3b
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 3c
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3d
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 3e
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3f
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 40
tilecoll WALL, WALL, WALL, FLOOR ; 41
tilecoll WALL, WALL, FLOOR, FLOOR ; 42
tilecoll WALL, WALL, FLOOR, WALL ; 43
tilecoll WATER, WATER, WATER, WATER ; 44
tilecoll WALL, FLOOR, WALL, FLOOR ; 45
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46
tilecoll FLOOR, WALL, FLOOR, WALL ; 47
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48
tilecoll WALL, FLOOR, WALL, WALL ; 49
tilecoll FLOOR, FLOOR, WALL, WALL ; 4a
tilecoll FLOOR, WALL, WALL, WALL ; 4b
tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c
tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d
tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e
tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f
tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50
tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51
tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52
tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53
tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54
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 WATER, WATER, WATER, WATER ; 56
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58
tilecoll WATER, WATER, WATER, WATER ; 58
tilecoll WATER, WATER, WATER, WATER ; 59
tilecoll WATER, WATER, WATER, WATER ; 5a
tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b
tilecoll WALL, WALL, WALL, CAVE ; 5c
tilecoll WALL, FLOOR, WALL, FLOOR ; 5d
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 WALL, WALL, WALL, WALL ; 60
tilecoll WALL, WALL, WALL, WALL ; 5f
tilecoll WATER, WATER, WALL, WALL ; 60
tilecoll WATER, WATER, WALL, WALL ; 61
tilecoll WATER, WATER, WALL, WALL ; 62
tilecoll WATER, WATER, WALL, WALL ; 63
tilecoll WATER, WATER, WATER, WATER ; 64
tilecoll FLOOR, WALL, FLOOR, WALL ; 65
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 66
tilecoll WALL, FLOOR, WALL, FLOOR ; 67
tilecoll WALL, WALL, WALL, WALL ; 68
tilecoll WALL, FLOOR, WALL, FLOOR ; 69
tilecoll FLOOR, WALL, FLOOR, WALL ; 6a
tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b
tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c
tilecoll WALL, FLOOR, WALL, WALL ; 6d
tilecoll FLOOR, WALL, WALL, WALL ; 6e
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70
tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72
tilecoll FLOOR, FLOOR, WALL, WALL ; 73
tilecoll FLOOR, FLOOR, WALL, CAVE ; 74
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75
tilecoll WALL, WALL, FLOOR, FLOOR ; 76
tilecoll WATER, WATER, WATER, WATER ; 77
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 78
tilecoll FLOOR, FLOOR, WALL, WALL ; 79
tilecoll WATER, WATER, WATER, WATER ; 63
tilecoll FLOOR, WALL, FLOOR, WALL ; 64
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 65
tilecoll WALL, FLOOR, WALL, 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 WATER, WATER, WATER, WATER ; 7b
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
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f

24
data/tilesets/kabuto_word_room_collision.asm
View File

@@ -1,4 +1,5 @@
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 FLOOR, FLOOR, FLOOR, FLOOR ; 04
@@ -17,20 +18,20 @@
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, WALL, FLOOR ; 14
tilecoll WALL, WALL, FLOOR, 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 FLOOR, FLOOR, FLOOR, FLOOR ; 17
tilecoll WALL, WALL, FLOOR, FLOOR ; 18
tilecoll WALL, WALL, FLOOR, WALL ; 19
tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c
tilecoll WALL, WALL, WALL, 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 FLOOR, FLOOR, FLOOR, FLOOR ; 21
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
@@ -61,4 +62,3 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40

210
data/tilesets/kanto_collision.asm
View File

@@ -1,128 +1,128 @@
tilecoll CUT_TREE, CUT_TREE, CUT_TREE, CUT_TREE ; 01
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
tilecoll WALL, WALL, WALL, DOOR ; 03
tilecoll WALL, WALL, WALL, WALL ; 04
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 05
tilecoll LADDER, LADDER, LADDER, LADDER ; 06
tilecoll FLOOR, FLOOR, CAVE, WALL ; 07
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 08
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 09
tilecoll WALL, WALL, WALL, WALL ; 0a
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 0c
tilecoll CUT_TREE, CUT_TREE, CUT_TREE, CUT_TREE ; 00
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
tilecoll WALL, WALL, WALL, DOOR ; 02
tilecoll WALL, WALL, WALL, WALL ; 03
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 04
tilecoll LADDER, LADDER, LADDER, LADDER ; 05
tilecoll FLOOR, FLOOR, CAVE, WALL ; 06
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 07
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 08
tilecoll WALL, WALL, WALL, WALL ; 09
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 0b
tilecoll WALL, WALL, WALL, WALL ; 0c
tilecoll WALL, WALL, WALL, WALL ; 0d
tilecoll WALL, WALL, WALL, WALL ; 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, DOOR, WALL ; 13
tilecoll WALL, WALL, WALL, WALL ; 14
tilecoll WALL, WATER, WALL, WALL ; 15
tilecoll WATER, WALL, WALL, WALL ; 16
tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 17
tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 18
tilecoll WALL, WATER, WALL, WATER ; 19
tilecoll WATER, WALL, WATER, WALL ; 1a
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1b
tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
tilecoll FLOOR, FLOOR, WALL, WALL ; 1d
tilecoll WALL, WALL, DOOR, WALL ; 12
tilecoll WALL, WALL, WALL, WALL ; 13
tilecoll WALL, WATER, WALL, WALL ; 14
tilecoll WATER, WALL, WALL, WALL ; 15
tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 16
tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 17
tilecoll WALL, WATER, WALL, WATER ; 18
tilecoll WATER, WALL, WATER, WALL ; 19
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1a
tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
tilecoll FLOOR, FLOOR, WALL, WALL ; 1c
tilecoll WATER, WATER, WATER, WATER ; 1d
tilecoll WATER, WATER, WATER, WATER ; 1e
tilecoll WATER, WATER, WATER, WATER ; 1f
tilecoll WATER, WATER, WATER, WATER ; 20
tilecoll WALL, WALL, WALL, WALL ; 20
tilecoll WALL, WALL, WALL, WALL ; 21
tilecoll WALL, WALL, WALL, WALL ; 22
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
tilecoll WALL, FLOOR, WALL, WALL ; 25
tilecoll FLOOR, WALL, WALL, WALL ; 26
tilecoll WALL, FLOOR, WALL, WALL ; 24
tilecoll FLOOR, WALL, WALL, WALL ; 25
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
tilecoll WALL, FLOOR, WALL, FLOOR ; 29
tilecoll FLOOR, WALL, FLOOR, WALL ; 2a
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2b
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
tilecoll WALL, FLOOR, WALL, FLOOR ; 28
tilecoll FLOOR, WALL, FLOOR, WALL ; 29
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2b
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
tilecoll WATER, WATER, WATER, WATER ; 2d
tilecoll WATER, WATER, WATER, WATER ; 2e
tilecoll WATER, WATER, WATER, WATER ; 2f
tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 30
tilecoll WALL, WALL, WALL, WALL ; 31
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
tilecoll WALL, CUT_TREE, WALL, FLOOR ; 33
tilecoll WALL, WALL, FLOOR, CUT_TREE ; 34
tilecoll CUT_TREE, FLOOR, WALL, WALL ; 35
tilecoll FLOOR, CUT_TREE, WALL, FLOOR ; 36
tilecoll WALL, WALL, FLOOR, WALL ; 37
tilecoll WALL, WALL, WALL, WALL ; 38
tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 2f
tilecoll WALL, WALL, WALL, WALL ; 30
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
tilecoll WALL, CUT_TREE, WALL, FLOOR ; 32
tilecoll WALL, WALL, FLOOR, CUT_TREE ; 33
tilecoll CUT_TREE, FLOOR, WALL, WALL ; 34
tilecoll FLOOR, CUT_TREE, WALL, FLOOR ; 35
tilecoll WALL, WALL, FLOOR, WALL ; 36
tilecoll WALL, WALL, WALL, WALL ; 37
tilecoll FLOOR, FLOOR, WALL, WALL ; 38
tilecoll FLOOR, FLOOR, WALL, WALL ; 39
tilecoll FLOOR, FLOOR, WALL, WALL ; 3a
tilecoll WALL, WALL, DOOR, WALL ; 3b
tilecoll UP_WALL, WALL, FLOOR, WALL ; 3c
tilecoll WALL, WALL, WALL, DOOR ; 3d
tilecoll WALL, WALL, WALL, WALL ; 3e
tilecoll WALL, UP_WALL, WALL, FLOOR ; 3f
tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 40
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 41
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 42
tilecoll HOP_DOWN, WALL, WALL, WALL ; 43
tilecoll WATER, WATER, WATER, WATER ; 44
tilecoll WALL, WALL, DOOR, WALL ; 3a
tilecoll UP_WALL, WALL, FLOOR, WALL ; 3b
tilecoll WALL, WALL, WALL, DOOR ; 3c
tilecoll WALL, WALL, WALL, WALL ; 3d
tilecoll WALL, UP_WALL, WALL, FLOOR ; 3e
tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 3f
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 40
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 41
tilecoll HOP_DOWN, WALL, WALL, WALL ; 42
tilecoll WATER, WATER, WATER, WATER ; 43
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 44
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 45
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 46
tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 47
tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 48
tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 46
tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 47
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 48
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 4b
tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 4c
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4d
tilecoll FLOOR, WALL, FLOOR, WALL ; 4e
tilecoll WALL, FLOOR, WALL, FLOOR ; 4f
tilecoll FLOOR, WALL, WALL, WALL ; 50
tilecoll WALL, FLOOR, WALL, WALL ; 51
tilecoll WALL, WALL, FLOOR, FLOOR ; 52
tilecoll FLOOR, FLOOR, WALL, WALL ; 53
tilecoll WALL, WALL, WALL, DOOR ; 54
tilecoll WALL, WALL, WALL, WALL ; 55
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 56
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 4a
tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 4b
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4c
tilecoll FLOOR, WALL, FLOOR, WALL ; 4d
tilecoll WALL, FLOOR, WALL, FLOOR ; 4e
tilecoll FLOOR, WALL, WALL, WALL ; 4f
tilecoll WALL, FLOOR, WALL, WALL ; 50
tilecoll WALL, WALL, FLOOR, FLOOR ; 51
tilecoll FLOOR, FLOOR, WALL, WALL ; 52
tilecoll WALL, WALL, WALL, DOOR ; 53
tilecoll WALL, WALL, WALL, WALL ; 54
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 55
tilecoll FLOOR, FLOOR, WALL, WALL ; 56
tilecoll FLOOR, FLOOR, WALL, WALL ; 57
tilecoll FLOOR, FLOOR, WALL, WALL ; 58
tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 59
tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 5a
tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 5b
tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 5c
tilecoll FLOOR, HOP_DOWN, FLOOR, WALL ; 5d
tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 58
tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 59
tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 5a
tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 5b
tilecoll FLOOR, HOP_DOWN, FLOOR, WALL ; 5c
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5f
tilecoll FLOOR, WALL, FLOOR, WALL ; 60
tilecoll FLOOR, WALL, CUT_TREE, WALL ; 61
tilecoll FLOOR, FLOOR, WALL, WALL ; 62
tilecoll WALL, WALL, WALL, FLOOR ; 63
tilecoll WALL, WALL, FLOOR, WALL ; 64
tilecoll FLOOR, WALL, FLOOR, WALL ; 5f
tilecoll FLOOR, WALL, CUT_TREE, WALL ; 60
tilecoll FLOOR, FLOOR, WALL, WALL ; 61
tilecoll WALL, WALL, WALL, FLOOR ; 62
tilecoll WALL, WALL, FLOOR, WALL ; 63
tilecoll WATER, WATER, WATER, WATER ; 64
tilecoll WATER, WATER, WATER, WATER ; 65
tilecoll WATER, WATER, WATER, WATER ; 66
tilecoll WALL, WALL, WALL, WALL ; 67
tilecoll WALL, WATER, WALL, WATER ; 68
tilecoll WALL, WALL, WALL, WALL ; 66
tilecoll WALL, WATER, WALL, WATER ; 67
tilecoll WALL, WALL, WALL, WALL ; 68
tilecoll WALL, WALL, WALL, WALL ; 69
tilecoll WALL, WALL, WALL, WALL ; 6a
tilecoll WATER, WALL, WATER, WALL ; 6b
tilecoll WATER, WATER, WALL, WALL ; 6c
tilecoll WALL, WALL, FLOOR, FLOOR ; 6d
tilecoll WALL, FLOOR, WALL, FLOOR ; 6e
tilecoll FLOOR, WALL, FLOOR, WALL ; 6f
tilecoll FLOOR, FLOOR, WALL, WALL ; 70
tilecoll FLOOR, WALL, CAVE, WALL ; 71
tilecoll WATER, WALL, WATER, WALL ; 6a
tilecoll WATER, WATER, WALL, WALL ; 6b
tilecoll WALL, WALL, FLOOR, FLOOR ; 6c
tilecoll WALL, FLOOR, WALL, FLOOR ; 6d
tilecoll FLOOR, WALL, FLOOR, WALL ; 6e
tilecoll FLOOR, FLOOR, WALL, WALL ; 6f
tilecoll FLOOR, WALL, CAVE, WALL ; 70
tilecoll WALL, WALL, WALL, WALL ; 71
tilecoll WALL, WALL, WALL, WALL ; 72
tilecoll WALL, WALL, WALL, WALL ; 73
tilecoll WALL, WALL, WALL, WALL ; 74
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 75
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 74
tilecoll WALL, WALL, WALL, WALL ; 75
tilecoll WALL, WALL, WALL, WALL ; 76
tilecoll WALL, WALL, WALL, WALL ; 77
tilecoll FLOOR, FLOOR, WALL, WALL ; 78
tilecoll WATER, WATER, WATER, WATER ; 79
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 7a
tilecoll WALL, WALL, WALL, WALL ; 7b
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7c
tilecoll WALL, WALL, WALL, DOOR ; 7d
tilecoll FLOOR, FLOOR, WALL, WALL ; 77
tilecoll WATER, WATER, WATER, WATER ; 78
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 79
tilecoll WALL, WALL, WALL, WALL ; 7a
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7b
tilecoll WALL, WALL, WALL, DOOR ; 7c
tilecoll WALL, WALL, WALL, WALL ; 7d
tilecoll WALL, WALL, WALL, WALL ; 7e
tilecoll WALL, WALL, WALL, WALL ; 7f
tilecoll WALL, WALL, WALL, WALL ; 80

72
data/tilesets/lab_collision.asm
View File

@@ -1,50 +1,51 @@
tilecoll WALL, WALL, WALL, WALL ; 01
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 03
tilecoll WALL, WALL, WALL, WALL ; 04
tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05
tilecoll WALL, WALL, FLOOR, FLOOR ; 06
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 FLOOR, FLOOR, WALL, WALL ; 08
tilecoll WALL, WALL, WALL, WALL ; 09
tilecoll WINDOW, WALL, FLOOR, FLOOR ; 0a
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 FLOOR, FLOOR, FLOOR, FLOOR ; 0d
tilecoll WALL, WALL, FLOOR, FLOOR ; 0e
tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 0f
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 10
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
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, FLOOR, FLOOR ; 14
tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 15
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16
tilecoll WALL, WALL, FLOOR, FLOOR ; 17
tilecoll WALL, WALL, WALL, WALL ; 18
tilecoll WALL, WALL, FLOOR, FLOOR ; 19
tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 1a
tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
tilecoll WALL, FLOOR, WALL, FLOOR ; 1e
tilecoll FLOOR, WALL, FLOOR, WALL ; 1f
tilecoll FLOOR, FLOOR, WALL, WALL ; 20
tilecoll WINDOW, WINDOW, FLOOR, FLOOR ; 21
tilecoll FLOOR, FLOOR, WALL, WALL ; 22
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, 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 FLOOR, FLOOR, FLOOR, FLOOR ; 26
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 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, FLOOR, FLOOR ; 29
tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
tilecoll WALL, WALL, FLOOR, FLOOR ; 2b
tilecoll WALL, WALL, FLOOR, FLOOR ; 2c
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2f
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 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
@@ -61,4 +62,3 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40

Some files were not shown because too many files have changed in this diff Show More