shithub: pokecrystal

--- a/data/tilesets/aerodactyl_word_room_collision.asm

+++ b/data/tilesets/aerodactyl_word_room_collision.asm

@@ -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

--- a/data/tilesets/battle_tower_collision.asm

+++ b/data/tilesets/battle_tower_collision.asm

@@ -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

--- a/data/tilesets/battle_tower_outside_collision.asm

+++ b/data/tilesets/battle_tower_outside_collision.asm

@@ -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

--- a/data/tilesets/beta_word_room_collision.asm

+++ b/data/tilesets/beta_word_room_collision.asm

@@ -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

--- a/data/tilesets/cave_collision.asm

+++ b/data/tilesets/cave_collision.asm

@@ -1,64 +1,64 @@

+	tilecoll WALL, WALL, WALL, WALL ; 00

 	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll WALL, WALL, WALL, WALL ; 02

-	tilecoll FLOOR, FLOOR, FLOOR, 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

--- a/data/tilesets/champions_room_collision.asm

+++ b/data/tilesets/champions_room_collision.asm

@@ -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

--- a/data/tilesets/dark_cave_collision.asm

+++ b/data/tilesets/dark_cave_collision.asm

@@ -1,64 +1,64 @@

+	tilecoll WALL, WALL, WALL, WALL ; 00

 	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll WALL, WALL, WALL, WALL ; 02

-	tilecoll FLOOR, FLOOR, FLOOR, 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

--- a/data/tilesets/elite_four_room_collision.asm

+++ b/data/tilesets/elite_four_room_collision.asm

@@ -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

--- a/data/tilesets/facility_collision.asm

+++ b/data/tilesets/facility_collision.asm

@@ -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, 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 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 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

--- a/data/tilesets/forest_collision.asm

+++ b/data/tilesets/forest_collision.asm

@@ -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

--- a/data/tilesets/game_corner_collision.asm

+++ b/data/tilesets/game_corner_collision.asm

@@ -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

--- a/data/tilesets/gate_collision.asm

+++ b/data/tilesets/gate_collision.asm

@@ -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

--- a/data/tilesets/ho_oh_word_room_collision.asm

+++ b/data/tilesets/ho_oh_word_room_collision.asm

@@ -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

--- a/data/tilesets/house_collision.asm

+++ b/data/tilesets/house_collision.asm

@@ -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

--- a/data/tilesets/ice_path_collision.asm

+++ b/data/tilesets/ice_path_collision.asm

@@ -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

--- a/data/tilesets/johto_collision.asm

+++ b/data/tilesets/johto_collision.asm

@@ -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

--- a/data/tilesets/johto_modern_collision.asm

+++ b/data/tilesets/johto_modern_collision.asm

@@ -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

--- a/data/tilesets/kabuto_word_room_collision.asm

+++ b/data/tilesets/kabuto_word_room_collision.asm

@@ -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

--- a/data/tilesets/kanto_collision.asm

+++ b/data/tilesets/kanto_collision.asm

@@ -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

--- a/data/tilesets/lab_collision.asm

+++ b/data/tilesets/lab_collision.asm

@@ -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

--- a/data/tilesets/lighthouse_collision.asm

+++ b/data/tilesets/lighthouse_collision.asm

@@ -1,64 +1,64 @@

+	tilecoll WALL, WALL, WALL, WALL ; 00

 	tilecoll WALL, WALL, WALL, WALL ; 01

 	tilecoll WALL, WALL, WALL, WALL ; 02

 	tilecoll WALL, WALL, WALL, WALL ; 03

-	tilecoll WALL, WALL, WALL, WALL ; 04

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

-	tilecoll WALL, WALL, WALL, WALL ; 06

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 07

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04

+	tilecoll WALL, WALL, WALL, WALL ; 05

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 06

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09

-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0a

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0b

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c

+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 09

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0a

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 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 9C, FLOOR, COUNTER, FLOOR ; 11

+	tilecoll 9C, FLOOR, COUNTER, FLOOR ; 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, WARP_CARPET_DOWN, WALL, WALL ; 15

-	tilecoll WALL, WALL, WALL, WALL ; 16

-	tilecoll 9C, FLOOR, COUNTER, FLOOR ; 17

-	tilecoll WALL, WALL, WALL, WALL ; 18

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 19

-	tilecoll WALL, WALL, WALL, STAIRCASE ; 1a

-	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1b

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c

-	tilecoll WALL, WALL, WALL, WALL ; 1d

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1e

+	tilecoll WALL, WARP_CARPET_DOWN, WALL, WALL ; 14

+	tilecoll WALL, WALL, WALL, WALL ; 15

+	tilecoll 9C, FLOOR, COUNTER, FLOOR ; 16

+	tilecoll WALL, WALL, WALL, WALL ; 17

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 18

+	tilecoll WALL, WALL, WALL, STAIRCASE ; 19

+	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1a

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1b

+	tilecoll WALL, WALL, WALL, WALL ; 1c

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1d

+	tilecoll WALL, WALL, WALL, WALL ; 1e

 	tilecoll WALL, WALL, WALL, WALL ; 1f

-	tilecoll WALL, WALL, WALL, WALL ; 20

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 21

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 22

-	tilecoll WALL, FLOOR, WALL, WALL ; 23

-	tilecoll FLOOR, WALL, WALL, WALL ; 24

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 26

-	tilecoll WALL, WALL, WALL, WALL ; 27

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28

-	tilecoll FLOOR, FLOOR, PIT, PIT ; 29

-	tilecoll WALL, WALL, WINDOW, WINDOW ; 2a

-	tilecoll WALL, WALL, WALL, WALL ; 2b

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2d

-	tilecoll WALL, WALL, WALL, WALL ; 2e

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2f

-	tilecoll WALL, WALL, WALL, BOOKSHELF ; 30

-	tilecoll WALL, WALL, FLOOR, WALL ; 31

-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 32

-	tilecoll WALL, WALL, WALL, WALL ; 33

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 34

-	tilecoll WALL, WALL, PC, FLOOR ; 35

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 36

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 37

-	tilecoll WALL, WALL, WALL, WALL ; 38

-	tilecoll WALL, WALL, FLOOR, WALL ; 39

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3a

-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 20

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 21

+	tilecoll WALL, FLOOR, WALL, WALL ; 22

+	tilecoll FLOOR, WALL, WALL, WALL ; 23

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 25

+	tilecoll WALL, WALL, WALL, WALL ; 26

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27

+	tilecoll FLOOR, FLOOR, PIT, PIT ; 28

+	tilecoll WALL, WALL, WINDOW, WINDOW ; 29

+	tilecoll WALL, WALL, WALL, WALL ; 2a

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2c

+	tilecoll WALL, WALL, WALL, WALL ; 2d

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e

+	tilecoll WALL, WALL, WALL, BOOKSHELF ; 2f

+	tilecoll WALL, WALL, FLOOR, WALL ; 30

+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 31

+	tilecoll WALL, WALL, WALL, WALL ; 32

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 33

+	tilecoll WALL, WALL, PC, FLOOR ; 34

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 35

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 36

+	tilecoll WALL, WALL, WALL, WALL ; 37

+	tilecoll WALL, WALL, FLOOR, WALL ; 38

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 39

+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3a

+	tilecoll WALL, WALL, WALL, WALL ; 3b

 	tilecoll WALL, WALL, WALL, WALL ; 3c

-	tilecoll WALL, WALL, WALL, WALL ; 3d

-	tilecoll WALL, WALL, WINDOW, WALL ; 3e

+	tilecoll WALL, WALL, WINDOW, WALL ; 3d

+	tilecoll WALL, WALL, WALL, WALL ; 3e

 	tilecoll WALL, WALL, WALL, WALL ; 3f

-	tilecoll WALL, WALL, WALL, WALL ; 40

--- a/data/tilesets/mansion_collision.asm

+++ b/data/tilesets/mansion_collision.asm

@@ -1,64 +1,64 @@

+	tilecoll WALL, WALL, WALL, WALL ; 00

 	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll WALL, WALL, WALL, WALL ; 02

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 05

-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06

-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 07

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 04

+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 05

+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 06

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 07

 	tilecoll WALL, WALL, FLOOR, FLOOR ; 08

 	tilecoll WALL, WALL, FLOOR, FLOOR ; 09

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0a

-	tilecoll WALL, WALL, FLOOR, WALL ; 0b

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0c

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d

-	tilecoll WALL, WALL, FLOOR, WALL ; 0e

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0f

-	tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 10

-	tilecoll WALL, WALL, WALL, WALL ; 11

-	tilecoll WALL, WALL, BOOKSHELF, WALL ; 12

-	tilecoll WALL, WALL, WALL, WALL ; 13

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 15

+	tilecoll WALL, WALL, FLOOR, WALL ; 0a

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c

+	tilecoll WALL, WALL, FLOOR, WALL ; 0d

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0e

+	tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 0f

+	tilecoll WALL, WALL, WALL, WALL ; 10

+	tilecoll WALL, WALL, BOOKSHELF, WALL ; 11

+	tilecoll WALL, WALL, WALL, WALL ; 12

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 14

+	tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 15

 	tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 16

-	tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 17

-	tilecoll WALL, DOOR, FLOOR, FLOOR ; 18

-	tilecoll WALL, WALL, BOOKSHELF, WALL ; 19

-	tilecoll WALL, WALL, WALL, WALL ; 1a

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1d

+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 17

+	tilecoll WALL, WALL, BOOKSHELF, WALL ; 18

+	tilecoll WALL, WALL, WALL, WALL ; 19

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1c

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1d

 	tilecoll FLOOR, FLOOR, WALL, WALL ; 1e

 	tilecoll FLOOR, FLOOR, WALL, WALL ; 1f

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 20

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 21

-	tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 22

-	tilecoll WALL, WALL, FLOOR, WALL ; 23

-	tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 24

-	tilecoll WALL, WALL, WALL, STAIRCASE ; 25

-	tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 26

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 27

-	tilecoll WALL, WALL, DOOR, WALL ; 28

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 29

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 20

+	tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 21

+	tilecoll WALL, WALL, FLOOR, WALL ; 22

+	tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 23

+	tilecoll WALL, WALL, WALL, STAIRCASE ; 24

+	tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 25

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 26

+	tilecoll WALL, WALL, DOOR, WALL ; 27

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 28

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 29

 	tilecoll FLOOR, FLOOR, WALL, WALL ; 2a

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 2b

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c

-	tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2d

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f

-	tilecoll WALL, WALL, WALL, FLOOR ; 30

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b

+	tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2c

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2d

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e

+	tilecoll WALL, WALL, WALL, FLOOR ; 2f

+	tilecoll WALL, WALL, FLOOR, WALL ; 30

 	tilecoll WALL, WALL, FLOOR, WALL ; 31

-	tilecoll WALL, WALL, FLOOR, WALL ; 32

-	tilecoll WALL, WALL, WALL, WALL ; 33

-	tilecoll WALL, WALL, WALL, FLOOR ; 34

-	tilecoll WALL, WALL, WALL, WALL ; 35

-	tilecoll FLOOR, WALL, WALL, WALL ; 36

-	tilecoll WALL, WALL, FLOOR, WALL ; 37

-	tilecoll WALL, FLOOR, WALL, WALL ; 38

-	tilecoll WALL, WALL, FLOOR, WALL ; 39

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 3a

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 3b

+	tilecoll WALL, WALL, WALL, WALL ; 32

+	tilecoll WALL, WALL, WALL, FLOOR ; 33

+	tilecoll WALL, WALL, WALL, WALL ; 34

+	tilecoll FLOOR, WALL, WALL, WALL ; 35

+	tilecoll WALL, WALL, FLOOR, WALL ; 36

+	tilecoll WALL, FLOOR, WALL, WALL ; 37

+	tilecoll WALL, WALL, FLOOR, WALL ; 38

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 39

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 3a

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d

-	tilecoll WALL, FLOOR, WALL, WALL ; 3e

-	tilecoll FLOOR, WALL, WALL, WALL ; 3f

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 40

+	tilecoll WALL, FLOOR, WALL, WALL ; 3d

+	tilecoll FLOOR, WALL, WALL, WALL ; 3e

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 3f

--- a/data/tilesets/mart_collision.asm

+++ b/data/tilesets/mart_collision.asm

@@ -1,64 +1,64 @@

-	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 02

-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 04

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06

-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 07

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 08

-	tilecoll WALL, WALL, FLOOR, COUNTER ; 09

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0a

-	tilecoll WALL, WALL, COUNTER, FLOOR ; 0b

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 0c

-	tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 0d

-	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 0e

-	tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 0f

-	tilecoll FLOOR, WALL, WALL, WALL ; 10

-	tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 11

-	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 12

-	tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 13

+	tilecoll WALL, WALL, WALL, WALL ; 00

+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 01

+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 02

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 03

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04

+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 05

+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 06

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 07

+	tilecoll WALL, WALL, FLOOR, COUNTER ; 08

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 09

+	tilecoll WALL, WALL, COUNTER, FLOOR ; 0a

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 0b

+	tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 0c

+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 0d

+	tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 0e

+	tilecoll FLOOR, WALL, WALL, WALL ; 0f

+	tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 10

+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 11

+	tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 12

+	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 13

 	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 14

 	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 15

-	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 16

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 17

-	tilecoll WALL, WALL, FLOOR, COUNTER ; 18

-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 19

-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1a

-	tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 1b

-	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 1c

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 16

+	tilecoll WALL, WALL, FLOOR, COUNTER ; 17

+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 18

+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 19

+	tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 1a

+	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 1b

+	tilecoll WALL, WALL, WALL, WALL ; 1c

 	tilecoll WALL, WALL, WALL, WALL ; 1d

-	tilecoll WALL, WALL, WALL, WALL ; 1e

-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 1f

-	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 20

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 21

-	tilecoll WALL, WALL, WALL, WALL ; 22

-	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 23

-	tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 24

-	tilecoll WALL, WALL, WALL, WALL ; 25

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 26

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 27

-	tilecoll WALL, WALL, COUNTER, MART_SHELF ; 28

-	tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 29

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2a

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2b

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c

-	tilecoll COUNTER, COUNTER, FLOOR, MART_SHELF ; 2d

-	tilecoll FLOOR, MART_SHELF, COUNTER, COUNTER ; 2e

-	tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 2f

-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 30

-	tilecoll WALL, WALL, WALL, WALL ; 31

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32

-	tilecoll WALL, WALL, WALL, WALL ; 33

-	tilecoll WALL, FLOOR, WALL, WALL ; 34

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 35

-	tilecoll FLOOR, WALL, WALL, WALL ; 36

+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 1e

+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 1f

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 20

+	tilecoll WALL, WALL, WALL, WALL ; 21

+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 22

+	tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 23

+	tilecoll WALL, WALL, WALL, WALL ; 24

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 25

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 26

+	tilecoll WALL, WALL, COUNTER, MART_SHELF ; 27

+	tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 28

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2a

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b

+	tilecoll COUNTER, COUNTER, FLOOR, MART_SHELF ; 2c

+	tilecoll FLOOR, MART_SHELF, COUNTER, COUNTER ; 2d

+	tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 2e

+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 2f

+	tilecoll WALL, WALL, WALL, WALL ; 30

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31

+	tilecoll WALL, WALL, WALL, WALL ; 32

+	tilecoll WALL, FLOOR, WALL, WALL ; 33

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 34

+	tilecoll FLOOR, WALL, WALL, WALL ; 35

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 36

 	tilecoll FLOOR, WALL, FLOOR, WALL ; 37

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 38

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39

-	tilecoll FLOOR, FLOOR, FLOOR, STAIRCASE ; 3a

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38

+	tilecoll FLOOR, FLOOR, FLOOR, STAIRCASE ; 39

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a

+	tilecoll WALL, WALL, WALL, WALL ; 3b

 	tilecoll WALL, WALL, WALL, WALL ; 3c

 	tilecoll WALL, WALL, WALL, WALL ; 3d

-	tilecoll WALL, WALL, WALL, WALL ; 3e

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f

-	tilecoll WALL, WALL, WALL, WALL ; 40

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e

+	tilecoll WALL, WALL, WALL, WALL ; 3f

--- a/data/tilesets/omanyte_word_room_collision.asm

+++ b/data/tilesets/omanyte_word_room_collision.asm

@@ -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

--- a/data/tilesets/park_collision.asm

+++ b/data/tilesets/park_collision.asm

@@ -1,55 +1,56 @@

-	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 TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04

+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06

-	tilecoll WALL, WALL, WALL, WALL ; 07

-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 08

+	tilecoll WALL, WALL, WALL, WALL ; 06

+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 07

+	tilecoll WALL, WALL, WALL, WALL ; 08

 	tilecoll WALL, WALL, WALL, WALL ; 09

-	tilecoll WALL, WALL, WALL, WALL ; 0a

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b

-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0c

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a

+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0b

+	tilecoll WALL, WALL, WALL, WALL ; 0c

 	tilecoll WALL, WALL, WALL, WALL ; 0d

-	tilecoll WALL, WALL, WALL, WALL ; 0e

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0f

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10

-	tilecoll WALL, WALL, WALL, FLOOR ; 11

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 12

-	tilecoll WALL, WALL, FLOOR, WALL ; 13

-	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 14

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 15

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 17

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 18

-	tilecoll WALL, FLOOR, WALL, WALL ; 19

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 1a

-	tilecoll FLOOR, WALL, WALL, WALL ; 1b

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1c

-	tilecoll WALL, WALL, WALL, FLOOR ; 1d

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1e

-	tilecoll WALL, WALL, FLOOR, WALL ; 1f

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 21

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 23

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24

-	tilecoll WALL, FLOOR, WALL, WALL ; 25

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 26

-	tilecoll FLOOR, WALL, WALL, WALL ; 27

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0e

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f

+	tilecoll WALL, WALL, WALL, FLOOR ; 10

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 11

+	tilecoll WALL, WALL, FLOOR, WALL ; 12

+	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 13

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 14

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 16

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17

+	tilecoll WALL, FLOOR, WALL, WALL ; 18

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 19

+	tilecoll FLOOR, WALL, WALL, WALL ; 1a

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1b

+	tilecoll WALL, WALL, WALL, FLOOR ; 1c

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1d

+	tilecoll WALL, WALL, FLOOR, WALL ; 1e

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 20

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 22

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23

+	tilecoll WALL, FLOOR, WALL, WALL ; 24

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 25

+	tilecoll FLOOR, WALL, WALL, WALL ; 26

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 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, FLOOR, FLOOR ; 2c

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 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 FLOOR, WALL, FLOOR, FLOOR ; 30

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2f

+	tilecoll WALL, WALL, WALL, WALL ; 30

 	tilecoll WALL, WALL, WALL, WALL ; 31

 	tilecoll WALL, WALL, WALL, WALL ; 32

-	tilecoll WALL, WALL, WALL, WALL ; 33

-	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 34

+	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 33

+	tilecoll WALL, WALL, WALL, WALL ; 34

 	tilecoll WALL, WALL, WALL, WALL ; 35

 	tilecoll WALL, WALL, WALL, WALL ; 36

 	tilecoll WALL, WALL, WALL, WALL ; 37

@@ -60,5 +61,4 @@

 	tilecoll WALL, WALL, WALL, WALL ; 3c

 	tilecoll WALL, WALL, WALL, WALL ; 3d

 	tilecoll WALL, WALL, WALL, WALL ; 3e

-	tilecoll WALL, WALL, WALL, WALL ; 3f

-	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 40

+	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 3f

--- a/data/tilesets/players_house_collision.asm

+++ b/data/tilesets/players_house_collision.asm

@@ -1,43 +1,44 @@

-	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll WINDOW, WALL, FLOOR, FLOOR ; 02

-	tilecoll WALL, WALL, FLOOR, TV ; 03

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04

-	tilecoll WALL, WALL, WALL, WALL ; 05

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 06

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 07

-	tilecoll WALL, WALL, WALL, WALL ; 08

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 09

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0a

+	tilecoll WALL, WALL, WALL, WALL ; 00

+	tilecoll WINDOW, WALL, FLOOR, FLOOR ; 01

+	tilecoll WALL, WALL, FLOOR, TV ; 02

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

+	tilecoll WALL, WALL, WALL, WALL ; 04

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 05

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 06

+	tilecoll WALL, WALL, WALL, WALL ; 07

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 08

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 09

+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0a

 	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0b

-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0c

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f

-	tilecoll WALL, WALL, WALL, WALL ; 10

-	tilecoll WALL, WALL, PC, FLOOR ; 11

-	tilecoll WALL, WALL, TV, WALL ; 12

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13

-	tilecoll FLOOR, TV, FLOOR, WALL ; 14

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 15

-	tilecoll WALL, WALL, FLOOR, WALL ; 16

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 17

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18

-	tilecoll WALL, WALL, RADIO, PC ; 19

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a

-	tilecoll WALL, WALL, RADIO, FLOOR ; 1b

-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1c

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e

-	tilecoll WALL, WALL, VIRTUAL_BOY, FLOOR ; 1f

-	tilecoll WALL, WALL, PC, RADIO ; 20

-	tilecoll WALL, WALL, WALL, WALL ; 21

-	tilecoll WALL, WALL, TV, BOOKSHELF ; 22

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 23

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e

+	tilecoll WALL, WALL, WALL, WALL ; 0f

+	tilecoll WALL, WALL, PC, FLOOR ; 10

+	tilecoll WALL, WALL, TV, WALL ; 11

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12

+	tilecoll FLOOR, TV, FLOOR, WALL ; 13

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 14

+	tilecoll WALL, WALL, FLOOR, WALL ; 15

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 16

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17

+	tilecoll WALL, WALL, RADIO, PC ; 18

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19

+	tilecoll WALL, WALL, RADIO, FLOOR ; 1a

+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1c

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d

+	tilecoll WALL, WALL, VIRTUAL_BOY, FLOOR ; 1e

+	tilecoll WALL, WALL, PC, RADIO ; 1f

+	tilecoll WALL, WALL, WALL, WALL ; 20

+	tilecoll WALL, WALL, TV, BOOKSHELF ; 21

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 22

+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 23

 	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 24

-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 25

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 26

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 28

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 25

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 27

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b

@@ -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

--- a/data/tilesets/players_room_collision.asm

+++ b/data/tilesets/players_room_collision.asm

@@ -1,41 +1,42 @@

+	tilecoll WALL, WALL, WALL, WALL ; 00

 	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll WALL, WALL, WALL, WALL ; 02

-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03

-	tilecoll WALL, WALL, TV, BOOKSHELF ; 04

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 05

+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 02

+	tilecoll WALL, WALL, TV, BOOKSHELF ; 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 WALL, WALL, FLOOR, FLOOR ; 07

 	tilecoll WALL, WALL, FLOOR, FLOOR ; 08

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 09

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0c

+	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 WALL, WALL, FLOOR, FLOOR ; 0f

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0e

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 12

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 11

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 15

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 14

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 18

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 17

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b

 	tilecoll WALL, FLOOR, WALL, FLOOR ; 1c

 	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d

 	tilecoll WALL, FLOOR, WALL, FLOOR ; 1e

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1f

-	tilecoll TOWN_MAP, STAIRCASE, FLOOR, FLOOR ; 20

+	tilecoll TOWN_MAP, STAIRCASE, FLOOR, FLOOR ; 1f

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 20

 	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 22

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 23

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 22

+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 23

 	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 24

 	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 25

-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 26

+	tilecoll FF, FF, FF, FF ; 26

 	tilecoll FF, FF, FF, FF ; 27

 	tilecoll FF, FF, FF, FF ; 28

 	tilecoll FF, FF, FF, FF ; 29

@@ -61,4 +62,3 @@

 	tilecoll FF, FF, FF, FF ; 3d

 	tilecoll FF, FF, FF, FF ; 3e

 	tilecoll FF, FF, FF, FF ; 3f

-	tilecoll FF, FF, FF, FF ; 40

--- a/data/tilesets/pokecenter_collision.asm

+++ b/data/tilesets/pokecenter_collision.asm

@@ -1,64 +1,64 @@

+	tilecoll WALL, WALL, WALL, WALL ; 00

 	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll WALL, WALL, WALL, WALL ; 02

-	tilecoll WALL, WALL, WALL, FLOOR ; 03

-	tilecoll WALL, WALL, FLOOR, WALL ; 04

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

-	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 06

-	tilecoll WALL, COUNTER, FLOOR, FLOOR ; 07

-	tilecoll COUNTER, WALL, FLOOR, FLOOR ; 08

-	tilecoll WALL, WALL, FLOOR, PC ; 09

-	tilecoll WALL, WALL, FLOOR, WALL ; 0a

-	tilecoll WALL, DOOR, FLOOR, FLOOR ; 0b

-	tilecoll WALL, WALL, WALL, WALL ; 0c

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0e

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f

-	tilecoll WALL, WALL, FLOOR, WALL ; 10

-	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 11

-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 12

-	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 13

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 14

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15

-	tilecoll WALL, DOOR, FLOOR, FLOOR ; 16

-	tilecoll WALL, WALL, FLOOR, WALL ; 17

+	tilecoll WALL, WALL, WALL, FLOOR ; 02

+	tilecoll WALL, WALL, FLOOR, WALL ; 03

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04

+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 05

+	tilecoll WALL, COUNTER, FLOOR, FLOOR ; 06

+	tilecoll COUNTER, WALL, FLOOR, FLOOR ; 07

+	tilecoll WALL, WALL, FLOOR, PC ; 08

+	tilecoll WALL, WALL, FLOOR, WALL ; 09

+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 0a

+	tilecoll WALL, WALL, WALL, WALL ; 0b

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0d

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e

+	tilecoll WALL, WALL, FLOOR, WALL ; 0f

+	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 10

+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 11

+	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 12

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 13

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 14

+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 15

+	tilecoll WALL, WALL, FLOOR, 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 WALL, WALL, WALL, WALL ; 1d

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1d

 	tilecoll WALL, WALL, FLOOR, FLOOR ; 1e

 	tilecoll WALL, WALL, FLOOR, FLOOR ; 1f

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 20

-	tilecoll WALL, WALL, WALL, WALL ; 21

-	tilecoll WALL, WALL, FLOOR, PC ; 22

-	tilecoll WALL, WALL, WALL, FLOOR ; 23

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 25

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 26

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 27

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 28

-	tilecoll WALL, WALL, FLOOR, WALL ; 29

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2a

-	tilecoll WALL, WALL, WALL, FLOOR ; 2b

-	tilecoll WALL, DOOR, FLOOR, FLOOR ; 2c

-	tilecoll WALL, WALL, WALL, WALL ; 2d

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2f

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 30

-	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 31

-	tilecoll WALL, WALL, FLOOR, WALL ; 32

-	tilecoll PC, WALL, FLOOR, WALL ; 33

-	tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 34

-	tilecoll DOOR, WALL, FLOOR, FLOOR ; 35

-	tilecoll DOOR, WALL, FLOOR, WALL ; 36

-	tilecoll DOOR, WALL, FLOOR, FLOOR ; 37

-	tilecoll DOOR, WALL, FLOOR, WALL ; 38

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 39

-	tilecoll WALL, WALL, FLOOR, WALL ; 3a

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3b

-	tilecoll WALL, WALL, FLOOR, WALL ; 3c

+	tilecoll WALL, WALL, WALL, WALL ; 20

+	tilecoll WALL, WALL, FLOOR, PC ; 21

+	tilecoll WALL, WALL, WALL, FLOOR ; 22

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 25

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 26

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 27

+	tilecoll WALL, WALL, FLOOR, WALL ; 28

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29

+	tilecoll WALL, WALL, WALL, FLOOR ; 2a

+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 2b

+	tilecoll WALL, WALL, WALL, WALL ; 2c

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2d

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2e

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2f

+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 30

+	tilecoll WALL, WALL, FLOOR, WALL ; 31

+	tilecoll PC, WALL, FLOOR, WALL ; 32

+	tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 33

+	tilecoll DOOR, WALL, FLOOR, FLOOR ; 34

+	tilecoll DOOR, WALL, FLOOR, WALL ; 35

+	tilecoll DOOR, WALL, FLOOR, FLOOR ; 36

+	tilecoll DOOR, WALL, FLOOR, WALL ; 37

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 38

+	tilecoll WALL, WALL, FLOOR, WALL ; 39

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3a

+	tilecoll WALL, WALL, FLOOR, WALL ; 3b

+	tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3c

 	tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3d

-	tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3e

-	tilecoll WARP_PANEL, WARP_PANEL, FLOOR, FLOOR ; 3f

-	tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 40

+	tilecoll WARP_PANEL, WARP_PANEL, FLOOR, FLOOR ; 3e

+	tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 3f

--- a/data/tilesets/pokecom_center_collision.asm

+++ b/data/tilesets/pokecom_center_collision.asm

@@ -1,38 +1,39 @@

-	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02

-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 03

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 04

-	tilecoll WALL, WALL, WALL, FLOOR ; 05

-	tilecoll WALL, WALL, WALL, WALL ; 06

-	tilecoll WALL, WALL, WALL, FLOOR ; 07

-	tilecoll WALL, WALL, FLOOR, PC ; 08

-	tilecoll WALL, WALL, WALL, FLOOR ; 09

+	tilecoll WALL, WALL, WALL, WALL ; 00

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01

+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 02

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 03

+	tilecoll WALL, WALL, WALL, FLOOR ; 04

+	tilecoll WALL, WALL, WALL, WALL ; 05

+	tilecoll WALL, WALL, WALL, FLOOR ; 06

+	tilecoll WALL, WALL, FLOOR, PC ; 07

+	tilecoll WALL, WALL, WALL, FLOOR ; 08

+	tilecoll WALL, COUNTER, FLOOR, FLOOR ; 09

 	tilecoll WALL, COUNTER, FLOOR, FLOOR ; 0a

-	tilecoll WALL, COUNTER, FLOOR, FLOOR ; 0b

-	tilecoll WALL, WALL, WALL, WALL ; 0c

-	tilecoll WALL, WALL, FLOOR, WALL ; 0d

+	tilecoll WALL, WALL, WALL, WALL ; 0b

+	tilecoll WALL, WALL, FLOOR, WALL ; 0c

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d

 	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0e

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0f

-	tilecoll WALL, WALL, FLOOR, WALL ; 10

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 11

-	tilecoll WALL, WALL, WALL, FLOOR ; 12

+	tilecoll WALL, WALL, FLOOR, WALL ; 0f

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 10

+	tilecoll WALL, WALL, WALL, FLOOR ; 11

+	tilecoll WALL, WALL, WALL, WALL ; 12

 	tilecoll WALL, WALL, WALL, WALL ; 13

 	tilecoll WALL, WALL, WALL, WALL ; 14

-	tilecoll WALL, WALL, WALL, WALL ; 15

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 16

+	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, WALL, WALL ; 19

-	tilecoll WALL, WALL, WALL, WALL ; 1a

-	tilecoll WALL, WALL, FLOOR, WALL ; 1b

+	tilecoll WALL, WALL, FLOOR, WALL ; 1a

+	tilecoll WALL, WALL, WALL, WALL ; 1b

 	tilecoll WALL, WALL, WALL, WALL ; 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 FLOOR, FLOOR, FLOOR, FLOOR ; 20

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23

+	tilecoll WALL, WALL, WALL, WALL ; 23

 	tilecoll WALL, WALL, WALL, WALL ; 24

 	tilecoll WALL, WALL, WALL, WALL ; 25

 	tilecoll WALL, WALL, WALL, WALL ; 26

@@ -40,25 +41,24 @@

 	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, FLOOR, FLOOR ; 2c

-	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 2d

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2f

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b

+	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 2c

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2d

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e

+	tilecoll WALL, WALL, WALL, WALL ; 2f

 	tilecoll WALL, WALL, WALL, WALL ; 30

 	tilecoll WALL, WALL, WALL, WALL ; 31

 	tilecoll WALL, WALL, WALL, WALL ; 32

-	tilecoll WALL, WALL, WALL, WALL ; 33

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 34

-	tilecoll WALL, WALL, WALL, WALL ; 35

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 36

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 38

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 33

+	tilecoll WALL, WALL, WALL, WALL ; 34

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 35

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 36

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 37

+	tilecoll WALL, WALL, WALL, WALL ; 38

 	tilecoll WALL, WALL, WALL, WALL ; 39

-	tilecoll WALL, WALL, WALL, WALL ; 3a

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 3c

-	tilecoll WALL, WALL, WALL, WALL ; 3d

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 3e

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 3b

+	tilecoll WALL, WALL, WALL, WALL ; 3c

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 3d

+	tilecoll WALL, WALL, WALL, WALL ; 3e

 	tilecoll WALL, WALL, WALL, WALL ; 3f

-	tilecoll WALL, WALL, WALL, WALL ; 40

--- a/data/tilesets/port_collision.asm

+++ b/data/tilesets/port_collision.asm

@@ -1,64 +1,64 @@

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01

-	tilecoll WALL, WALL, WALL, WALL ; 02

-	tilecoll BUOY, WATER, BUOY, WATER ; 03

-	tilecoll WATER, BUOY, WATER, BUOY ; 04

-	tilecoll LADDER, LADDER, LADDER, LADDER ; 05

-	tilecoll WALL, WALL, WALL, WATER ; 06

-	tilecoll WALL, WALL, WATER, WATER ; 07

-	tilecoll WALL, WALL, WATER, WALL ; 08

-	tilecoll WATER, WATER, WATER, WATER ; 09

-	tilecoll WALL, WATER, WALL, WATER ; 0a

-	tilecoll WATER, WATER, WATER, WATER ; 0b

-	tilecoll WATER, WALL, WATER, WALL ; 0c

-	tilecoll WATER, WATER, FLOOR, FLOOR ; 0d

-	tilecoll WALL, WATER, WALL, WALL ; 0e

-	tilecoll WATER, WATER, WALL, WALL ; 0f

-	tilecoll WATER, WALL, WALL, WALL ; 10

-	tilecoll WATER, WATER, WATER, WATER ; 11

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12

-	tilecoll WATER, WATER, WATER, WATER ; 13

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00

+	tilecoll WALL, WALL, WALL, WALL ; 01

+	tilecoll BUOY, WATER, BUOY, WATER ; 02

+	tilecoll WATER, BUOY, WATER, BUOY ; 03

+	tilecoll LADDER, LADDER, LADDER, LADDER ; 04

+	tilecoll WALL, WALL, WALL, WATER ; 05

+	tilecoll WALL, WALL, WATER, WATER ; 06

+	tilecoll WALL, WALL, WATER, WALL ; 07

+	tilecoll WATER, WATER, WATER, WATER ; 08

+	tilecoll WALL, WATER, WALL, WATER ; 09

+	tilecoll WATER, WATER, WATER, WATER ; 0a

+	tilecoll WATER, WALL, WATER, WALL ; 0b

+	tilecoll WATER, WATER, FLOOR, FLOOR ; 0c

+	tilecoll WALL, WATER, WALL, WALL ; 0d

+	tilecoll WATER, WATER, WALL, WALL ; 0e

+	tilecoll WATER, WALL, WALL, WALL ; 0f

+	tilecoll WATER, WATER, WATER, WATER ; 10

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11

+	tilecoll WATER, WATER, WATER, WATER ; 12

+	tilecoll WATER, FLOOR, WATER, FLOOR ; 13

 	tilecoll WATER, FLOOR, WATER, FLOOR ; 14

-	tilecoll WATER, FLOOR, WATER, FLOOR ; 15

+	tilecoll WATER, WATER, WATER, WATER ; 15

 	tilecoll WATER, WATER, WATER, WATER ; 16

-	tilecoll WATER, WATER, WATER, WATER ; 17

-	tilecoll WATER, FLOOR, WALL, WARP_CARPET_DOWN ; 18

-	tilecoll WATER, WATER, WALL, WALL ; 19

-	tilecoll WATER, FLOOR, WALL, WALL ; 1a

-	tilecoll WALL, WALL, WALL, WALL ; 1b

-	tilecoll WALL, WATER, WALL, WALL ; 1c

+	tilecoll WATER, FLOOR, WALL, WARP_CARPET_DOWN ; 17

+	tilecoll WATER, WATER, WALL, WALL ; 18

+	tilecoll WATER, FLOOR, WALL, WALL ; 19

+	tilecoll WALL, WALL, WALL, WALL ; 1a

+	tilecoll WALL, WATER, WALL, WALL ; 1b

+	tilecoll WATER_21, WATER_21, WALL, WALL ; 1c

 	tilecoll WATER_21, WATER_21, WALL, WALL ; 1d

 	tilecoll WATER_21, WATER_21, WALL, WALL ; 1e

-	tilecoll WATER_21, WATER_21, WALL, WALL ; 1f

-	tilecoll WALL, WALL, WALL, WATER ; 20

-	tilecoll WALL, FLOOR, WATER, WARP_CARPET_DOWN ; 21

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22

-	tilecoll BUOY, BUOY, BUOY, WATER ; 23

-	tilecoll BUOY, BUOY, WATER, BUOY ; 24

+	tilecoll WALL, WALL, WALL, WATER ; 1f

+	tilecoll WALL, FLOOR, WATER, WARP_CARPET_DOWN ; 20

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21

+	tilecoll BUOY, BUOY, BUOY, WATER ; 22

+	tilecoll BUOY, BUOY, WATER, BUOY ; 23

+	tilecoll BUOY, BUOY, WATER, WATER ; 24

 	tilecoll BUOY, BUOY, WATER, WATER ; 25

-	tilecoll BUOY, BUOY, WATER, WATER ; 26

-	tilecoll LADDER, LADDER, LADDER, LADDER ; 27

-	tilecoll FLOOR, FLOOR, WATER, WATER ; 28

-	tilecoll FLOOR, FLOOR, FLOOR, WATER ; 29

-	tilecoll FLOOR, FLOOR, WATER, FLOOR ; 2a

-	tilecoll WALL, WALL, WALL, WALL ; 2b

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2c

-	tilecoll FLOOR, WATER, FLOOR, FLOOR ; 2d

-	tilecoll WATER, FLOOR, FLOOR, FLOOR ; 2e

-	tilecoll FLOOR, WATER, FLOOR, WATER ; 2f

-	tilecoll WATER, FLOOR, WATER, FLOOR ; 30

-	tilecoll FLOOR, FLOOR, WATER, WATER ; 31

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 33

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34

-	tilecoll FLOOR, WATER, FLOOR, WATER ; 35

-	tilecoll WALL, WALL, FLOOR, LADDER ; 36

-	tilecoll WATER, WATER, WATER, WATER ; 37

-	tilecoll FLOOR, WATER, FLOOR, WATER ; 38

-	tilecoll WATER, FLOOR, WATER, FLOOR ; 39

-	tilecoll WATER, WATER, FLOOR, FLOOR ; 3a

+	tilecoll LADDER, LADDER, LADDER, LADDER ; 26

+	tilecoll FLOOR, FLOOR, WATER, WATER ; 27

+	tilecoll FLOOR, FLOOR, FLOOR, WATER ; 28

+	tilecoll FLOOR, FLOOR, WATER, FLOOR ; 29

+	tilecoll WALL, WALL, WALL, WALL ; 2a

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2b

+	tilecoll FLOOR, WATER, FLOOR, FLOOR ; 2c

+	tilecoll WATER, FLOOR, FLOOR, FLOOR ; 2d

+	tilecoll FLOOR, WATER, FLOOR, WATER ; 2e

+	tilecoll WATER, FLOOR, WATER, FLOOR ; 2f

+	tilecoll FLOOR, FLOOR, WATER, WATER ; 30

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 32

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 33

+	tilecoll FLOOR, WATER, FLOOR, WATER ; 34

+	tilecoll WALL, WALL, FLOOR, LADDER ; 35

+	tilecoll WATER, WATER, WATER, WATER ; 36

+	tilecoll FLOOR, WATER, FLOOR, WATER ; 37

+	tilecoll WATER, FLOOR, WATER, FLOOR ; 38

+	tilecoll WATER, WATER, FLOOR, FLOOR ; 39

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3a

 	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3b

 	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3c

 	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3d

 	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e

 	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3f

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40

--- a/data/tilesets/radio_tower_collision.asm

+++ b/data/tilesets/radio_tower_collision.asm

@@ -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, STAIRCASE, FLOOR, FLOOR ; 04

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 05

-	tilecoll FLOOR, FLOOR, WALL, COUNTER ; 06

-	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 07

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 08

-	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 09

-	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 0a

-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 0b

-	tilecoll WALL, WALL, WALL, WALL ; 0c

-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0d

-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0e

-	tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 0f

-	tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 10

-	tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 11

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 12

-	tilecoll WALL, WALL, PC, FLOOR ; 13

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 02

+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 04

+	tilecoll FLOOR, FLOOR, WALL, COUNTER ; 05

+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 06

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 07

+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 08

+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 09

+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 0a

+	tilecoll WALL, WALL, WALL, WALL ; 0b

+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0c

+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0d

+	tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 0e

+	tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 0f

+	tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 10

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 11

+	tilecoll WALL, WALL, PC, FLOOR ; 12

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 16

-	tilecoll WALL, WALL, WALL, WALL ; 17

-	tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 18

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19

-	tilecoll WALL, WALL, FLOOR, COUNTER ; 1a

-	tilecoll WALL, COUNTER, FLOOR, COUNTER ; 1b

-	tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 1c

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1d

-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 1e

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1f

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 20

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 21

-	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 22

-	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 23

-	tilecoll WALL, WALL, WALL, WALL ; 24

-	tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 25

-	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 26

-	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 27

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28

-	tilecoll WALL, WALL, FLOOR, WALL ; 29

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 2a

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2b

-	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2c

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d

-	tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2e

-	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2f

-	tilecoll WALL, WALL, WALL, WALL ; 30

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 31

-	tilecoll WALL, WALL, FLOOR, WALL ; 32

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 33

-	tilecoll WALL, WALL, WALL, FLOOR ; 34

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 35

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 37

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 38

-	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 39

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3a

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b

-	tilecoll WALL, WALL, WALL, WALL ; 3c

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 3d

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 3f

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 15

+	tilecoll WALL, WALL, WALL, WALL ; 16

+	tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 17

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18

+	tilecoll WALL, WALL, FLOOR, COUNTER ; 19

+	tilecoll WALL, COUNTER, FLOOR, COUNTER ; 1a

+	tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 1b

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1c

+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 1d

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1e

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1f

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 20

+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 21

+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 22

+	tilecoll WALL, WALL, WALL, WALL ; 23

+	tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 24

+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 25

+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 26

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27

+	tilecoll WALL, WALL, FLOOR, WALL ; 28

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 29

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2a

+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2b

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c

+	tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2d

+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2e

+	tilecoll WALL, WALL, WALL, WALL ; 2f

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 30

+	tilecoll WALL, WALL, FLOOR, WALL ; 31

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 32

+	tilecoll WALL, WALL, WALL, FLOOR ; 33

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 34

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 36

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 37

+	tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 38

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 39

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a

+	tilecoll WALL, WALL, WALL, WALL ; 3b

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 3c

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3d

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 3e

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f

--- a/data/tilesets/ruins_of_alph_collision.asm

+++ b/data/tilesets/ruins_of_alph_collision.asm

@@ -1,39 +1,40 @@

-	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll WALL, WALL, WALL, FLOOR ; 02

-	tilecoll WALL, WALL, FLOOR, WALL ; 03

+	tilecoll WALL, WALL, WALL, WALL ; 00

+	tilecoll WALL, WALL, WALL, FLOOR ; 01

+	tilecoll WALL, WALL, FLOOR, WALL ; 02

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

-	tilecoll WALL, WALL, WALL, FLOOR ; 06

+	tilecoll WALL, WALL, WALL, FLOOR ; 05

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 06

 	tilecoll WALL, WALL, FLOOR, FLOOR ; 07

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 08

-	tilecoll WALL, WALL, FLOOR, WALL ; 09

-	tilecoll WALL, FLOOR, WALL, WALL ; 0a

+	tilecoll WALL, WALL, FLOOR, WALL ; 08

+	tilecoll WALL, FLOOR, WALL, WALL ; 09

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0a

 	tilecoll FLOOR, FLOOR, WALL, WALL ; 0b

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 0c

-	tilecoll FLOOR, WALL, WALL, WALL ; 0d

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 0f

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 10

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 11

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14

-	tilecoll WALL, FLOOR, WALL, WALL ; 15

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17

-	tilecoll FLOOR, WALL, WALL, WALL ; 18

-	tilecoll WALL, WALL, WALL, PIT ; 19

-	tilecoll WALL, WALL, PIT, WALL ; 1a

-	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 1b

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1c

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1d

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1e

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1f

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 22

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 23

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 24

+	tilecoll FLOOR, WALL, WALL, WALL ; 0c

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 0e

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0f

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 11

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13

+	tilecoll WALL, FLOOR, WALL, WALL ; 14

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 15

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 16

+	tilecoll FLOOR, WALL, WALL, WALL ; 17

+	tilecoll WALL, WALL, WALL, PIT ; 18

+	tilecoll WALL, WALL, PIT, WALL ; 19

+	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 1a

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1c

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1d

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1e

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1f

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 20

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 21

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 22

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 23

+	tilecoll WALL, WALL, WALL, WALL ; 24

 	tilecoll WALL, WALL, WALL, WALL ; 25

 	tilecoll WALL, WALL, WALL, WALL ; 26

 	tilecoll WALL, WALL, WALL, WALL ; 27

@@ -40,25 +41,24 @@

 	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, WARP_CARPET_DOWN, WALL ; 2c

-	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 2d

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 2b

+	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 2c

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2d

 	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2f

-	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 30

-	tilecoll CAVE, WALL, FLOOR, FLOOR ; 31

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 32

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 33

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34

-	tilecoll WALL, WALL, WALL, PIT ; 35

-	tilecoll WALL, WALL, PIT, WALL ; 36

+	tilecoll FLOOR, FLOOR, FLOOR, PIT ; 2f

+	tilecoll CAVE, WALL, FLOOR, FLOOR ; 30

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 31

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 32

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33

+	tilecoll WALL, WALL, WALL, PIT ; 34

+	tilecoll WALL, WALL, PIT, WALL ; 35

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38

-	tilecoll FLOOR, FLOOR, GRASS_4A, FLOOR ; 39

-	tilecoll FLOOR, FLOOR, GRASS_4B, FLOOR ; 3a

-	tilecoll FLOOR, FLOOR, CUT_28, FLOOR ; 3b

-	tilecoll FLOOR, FLOOR, WATER, FLOOR ; 3c

-	tilecoll 64, FLOOR, WATERFALL_UP, FLOOR ; 3d

-	tilecoll 65, FLOOR, WATERFALL, FLOOR ; 3e

-	tilecoll WATERFALL_UP, FLOOR, WARP_CARPET_DOWN, FLOOR ; 3f

-	tilecoll WATERFALL, FLOOR, DOOR, FLOOR ; 40

+	tilecoll FLOOR, FLOOR, GRASS_4A, FLOOR ; 38

+	tilecoll FLOOR, FLOOR, GRASS_4B, FLOOR ; 39

+	tilecoll FLOOR, FLOOR, CUT_28, FLOOR ; 3a

+	tilecoll FLOOR, FLOOR, WATER, FLOOR ; 3b

+	tilecoll 64, FLOOR, WATERFALL_UP, FLOOR ; 3c

+	tilecoll 65, FLOOR, WATERFALL, FLOOR ; 3d

+	tilecoll WATERFALL_UP, FLOOR, WARP_CARPET_DOWN, FLOOR ; 3e

+	tilecoll WATERFALL, FLOOR, DOOR, FLOOR ; 3f

--- a/data/tilesets/tower_collision.asm

+++ b/data/tilesets/tower_collision.asm

@@ -1,64 +1,64 @@

+	tilecoll WALL, WALL, WALL, WALL ; 00

 	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll WALL, WALL, WALL, WALL ; 02

+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 02

 	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 03

-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 04

-	tilecoll WALL, WALL, WALL, FLOOR ; 05

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 06

-	tilecoll WALL, WALL, FLOOR, WALL ; 07

-	tilecoll WALL, WALL, WALL, WALL ; 08

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 09

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b

-	tilecoll WALL, WALL, WALL, WALL ; 0c

-	tilecoll WALL, FLOOR, WALL, WALL ; 0d

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e

-	tilecoll FLOOR, WALL, WALL, WALL ; 0f

-	tilecoll WALL, WALL, WALL, WALL ; 10

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 11

+	tilecoll WALL, WALL, WALL, FLOOR ; 04

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 05

+	tilecoll WALL, WALL, FLOOR, WALL ; 06

+	tilecoll WALL, WALL, WALL, WALL ; 07

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 08

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0a

+	tilecoll WALL, WALL, WALL, WALL ; 0b

+	tilecoll WALL, FLOOR, WALL, WALL ; 0c

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0d

+	tilecoll FLOOR, WALL, WALL, WALL ; 0e

+	tilecoll WALL, WALL, WALL, WALL ; 0f

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 10

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 11

 	tilecoll WALL, FLOOR, WALL, FLOOR ; 12

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 13

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 14

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16

-	tilecoll WALL, FLOOR, WALL, WALL ; 17

-	tilecoll FLOOR, WALL, WALL, WALL ; 18

-	tilecoll WALL, WALL, WALL, WALL ; 19

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1a

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 13

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 14

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15

+	tilecoll WALL, FLOOR, WALL, WALL ; 16

+	tilecoll FLOOR, WALL, WALL, WALL ; 17

+	tilecoll WALL, WALL, WALL, WALL ; 18

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 19

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a

+	tilecoll WALL, WALL, WALL, WALL ; 1b

 	tilecoll WALL, WALL, WALL, WALL ; 1c

-	tilecoll WALL, WALL, WALL, WALL ; 1d

-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 1e

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 1f

+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 1d

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 1e

+	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1f

 	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 20

-	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 21

-	tilecoll WALL, WALL, WALL, FLOOR ; 22

-	tilecoll WALL, WALL, FLOOR, WALL ; 23

-	tilecoll WALL, WALL, WALL, WALL ; 24

-	tilecoll FLOOR, FLOOR, WARP_PANEL, FLOOR ; 25

-	tilecoll WALL, WALL, PIT, FLOOR ; 26

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 27

-	tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 28

+	tilecoll WALL, WALL, WALL, FLOOR ; 21

+	tilecoll WALL, WALL, FLOOR, WALL ; 22

+	tilecoll WALL, WALL, WALL, WALL ; 23

+	tilecoll FLOOR, FLOOR, WARP_PANEL, FLOOR ; 24

+	tilecoll WALL, WALL, PIT, FLOOR ; 25

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 26

+	tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 27

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a

-	tilecoll WALL, WALL, WALL, WALL ; 2b

-	tilecoll WALL, HOP_LEFT, WALL, WALL ; 2c

-	tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2d

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e

-	tilecoll WALL, WALL, WALL, FLOOR ; 2f

-	tilecoll WALL, WALL, FLOOR, WALL ; 30

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 31

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 32

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 33

-	tilecoll WALL, WALL, WALL, FLOOR ; 34

-	tilecoll WALL, WALL, FLOOR, WALL ; 35

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 36

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 37

-	tilecoll PIT, PIT, FLOOR, FLOOR ; 38

-	tilecoll FLOOR, PIT, FLOOR, PIT ; 39

-	tilecoll PIT, FLOOR, PIT, FLOOR ; 3a

-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 3c

-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 3d

-	tilecoll WALL, HOP_DOWN, WALL, WALL ; 3e

-	tilecoll HOP_DOWN, WALL, WALL, WALL ; 3f

-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 40

+	tilecoll WALL, WALL, WALL, WALL ; 2a

+	tilecoll WALL, HOP_LEFT, WALL, WALL ; 2b

+	tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2c

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2d

+	tilecoll WALL, WALL, WALL, FLOOR ; 2e

+	tilecoll WALL, WALL, FLOOR, WALL ; 2f

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 30

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 31

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 32

+	tilecoll WALL, WALL, WALL, FLOOR ; 33

+	tilecoll WALL, WALL, FLOOR, WALL ; 34

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 35

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 36

+	tilecoll PIT, PIT, FLOOR, FLOOR ; 37

+	tilecoll FLOOR, PIT, FLOOR, PIT ; 38

+	tilecoll PIT, FLOOR, PIT, FLOOR ; 39

+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3a

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 3b

+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 3c

+	tilecoll WALL, HOP_DOWN, WALL, WALL ; 3d

+	tilecoll HOP_DOWN, WALL, WALL, WALL ; 3e

+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3f

--- a/data/tilesets/traditional_house_collision.asm

+++ b/data/tilesets/traditional_house_collision.asm

@@ -1,64 +1,64 @@

-	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll WALL, WALL, RADIO, FLOOR ; 02

-	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 03

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 04

+	tilecoll WALL, WALL, WALL, WALL ; 00

+	tilecoll WALL, WALL, RADIO, FLOOR ; 01

+	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 02

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 03

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06

-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 07

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 08

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 09

-	tilecoll WALL, WALL, WALL, WALL ; 0a

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 0c

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d

+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 06

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 07

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 08

+	tilecoll WALL, WALL, WALL, WALL ; 09

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0a

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 0b

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0c

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f

-	tilecoll WALL, WALL, WALL, WALL ; 10

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 12

-	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 13

-	tilecoll WALL, WALL, INCENSE_BURNER, BOOKSHELF ; 14

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 15

+	tilecoll WALL, WALL, WALL, WALL ; 0f

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 11

+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 12

+	tilecoll WALL, WALL, INCENSE_BURNER, BOOKSHELF ; 13

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 14

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15

 	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17

-	tilecoll WALL, WALL, WALL, WALL ; 18

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a

-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1c

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1d

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e

-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f

+	tilecoll WALL, WALL, WALL, WALL ; 17

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 19

+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1a

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1b

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1c

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d

+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1e

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21

-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 22

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 23

-	tilecoll WALL, WALL, RADIO, FLOOR ; 24

-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 26

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 27

-	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 28

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 29

-	tilecoll WALL, WALL, WALL, WALL ; 2a

+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 21

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 22

+	tilecoll WALL, WALL, RADIO, FLOOR ; 23

+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 24

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 25

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 26

+	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 27

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 28

+	tilecoll WALL, WALL, WALL, WALL ; 29

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c

-	tilecoll FLOOR, FLOOR, HOP_DOWN, HOP_DOWN ; 2d

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2f

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 30

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 31

+	tilecoll FLOOR, FLOOR, HOP_DOWN, HOP_DOWN ; 2c

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2d

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2e

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2f

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 30

+	tilecoll WALL, WALL, WALL, WALL ; 31

 	tilecoll WALL, WALL, WALL, WALL ; 32

-	tilecoll WALL, WALL, WALL, WALL ; 33

+	tilecoll WALL, WALL, WALL, FLOOR ; 33

 	tilecoll WALL, WALL, WALL, FLOOR ; 34

-	tilecoll WALL, WALL, WALL, FLOOR ; 35

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 36

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37

-	tilecoll WALL, WALL, FLOOR, WALL ; 38

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 39

-	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 3a

-	tilecoll 04, 03, 03, 03 ; 3b

-	tilecoll 03, 03, 03, 03 ; 3c

-	tilecoll 03, 03, 04, 04 ; 3d

-	tilecoll 04, 04, 04, 04 ; 3e

-	tilecoll 03, 03, 03, 03 ; 3f

-	tilecoll WARP_CARPET_DOWN, 04, 03, 03 ; 40

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 35

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 36

+	tilecoll WALL, WALL, FLOOR, WALL ; 37

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 38

+	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 39

+	tilecoll 04, 03, 03, 03 ; 3a

+	tilecoll 03, 03, 03, 03 ; 3b

+	tilecoll 03, 03, 04, 04 ; 3c

+	tilecoll 04, 04, 04, 04 ; 3d

+	tilecoll 03, 03, 03, 03 ; 3e

+	tilecoll WARP_CARPET_DOWN, 04, 03, 03 ; 3f

--- a/data/tilesets/train_station_collision.asm

+++ b/data/tilesets/train_station_collision.asm

@@ -1,64 +1,64 @@

-	tilecoll FF, FF, FF, FF ; 01

-	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 02

-	tilecoll UP_WALL, FLOOR, UP_WALL, FLOOR ; 03

+	tilecoll FF, FF, FF, FF ; 00

+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 01

+	tilecoll UP_WALL, FLOOR, UP_WALL, FLOOR ; 02

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 07

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 08

-	tilecoll WALL, FLOOR, WALL, WALL ; 09

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a

-	tilecoll WALL, WALL, WALL, WALL ; 0b

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 0d

-	tilecoll WALL, WALL, WALL, WALL ; 0e

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0f

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 06

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 07

+	tilecoll WALL, FLOOR, WALL, WALL ; 08

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 09

+	tilecoll WALL, WALL, WALL, WALL ; 0a

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 0c

+	tilecoll WALL, WALL, WALL, WALL ; 0d

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0e

+	tilecoll WALL, WALL, WALL, WALL ; 0f

 	tilecoll WALL, WALL, WALL, WALL ; 10

-	tilecoll WALL, WALL, WALL, WALL ; 11

-	tilecoll WALL, WALL, DOOR, WALL ; 12

-	tilecoll WALL, WALL, WALL, DOOR ; 13

+	tilecoll WALL, WALL, DOOR, WALL ; 11

+	tilecoll WALL, WALL, WALL, DOOR ; 12

+	tilecoll WALL, WALL, WALL, WALL ; 13

 	tilecoll WALL, WALL, WALL, WALL ; 14

 	tilecoll WALL, WALL, WALL, WALL ; 15

 	tilecoll WALL, WALL, WALL, WALL ; 16

 	tilecoll WALL, WALL, WALL, WALL ; 17

-	tilecoll WALL, WALL, WALL, WALL ; 18

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a

+	tilecoll WALL, WALL, WALL, WALL ; 1a

 	tilecoll WALL, WALL, WALL, WALL ; 1b

-	tilecoll WALL, WALL, WALL, WALL ; 1c

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1e

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1f

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 20

-	tilecoll WALL, WALL, WALL, WALL ; 21

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 22

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 23

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1e

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1f

+	tilecoll WALL, WALL, WALL, WALL ; 20

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 21

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 22

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 23

 	tilecoll WALL, WALL, FLOOR, FLOOR ; 24

 	tilecoll WALL, WALL, FLOOR, FLOOR ; 25

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 26

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 27

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 28

-	tilecoll WALL, WALL, WALL, FLOOR ; 29

-	tilecoll WALL, WALL, FLOOR, WALL ; 2a

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 2b

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 26

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 27

+	tilecoll WALL, WALL, WALL, FLOOR ; 28

+	tilecoll WALL, WALL, FLOOR, WALL ; 29

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2a

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 2b

 	tilecoll FLOOR, WALL, FLOOR, WALL ; 2c

 	tilecoll FLOOR, WALL, FLOOR, WALL ; 2d

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 2e

-	tilecoll WALL, WALL, WALL, WALL ; 2f

+	tilecoll WALL, WALL, WALL, WALL ; 2e

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2f

 	tilecoll WALL, WALL, FLOOR, FLOOR ; 30

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 31

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 32

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 33

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 34

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 35

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 36

-	tilecoll WALL, WALL, WALL, FLOOR ; 37

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 38

-	tilecoll WALL, WALL, FLOOR, WALL ; 39

-	tilecoll WALL, FLOOR, WALL, WALL ; 3a

-	tilecoll WALL, WALL, WALL, WALL ; 3b

-	tilecoll FLOOR, WALL, WALL, WALL ; 3c

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 31

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 32

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 33

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 34

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 35

+	tilecoll WALL, WALL, WALL, FLOOR ; 36

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 37

+	tilecoll WALL, WALL, FLOOR, WALL ; 38

+	tilecoll WALL, FLOOR, WALL, WALL ; 39

+	tilecoll WALL, WALL, WALL, WALL ; 3a

+	tilecoll FLOOR, WALL, WALL, WALL ; 3b

+	tilecoll WALL, WALL, WALL, WALL ; 3c

 	tilecoll WALL, WALL, WALL, WALL ; 3d

 	tilecoll WALL, WALL, WALL, WALL ; 3e

 	tilecoll WALL, WALL, WALL, WALL ; 3f

-	tilecoll WALL, WALL, WALL, WALL ; 40

--- a/data/tilesets/underground_collision.asm

+++ b/data/tilesets/underground_collision.asm

@@ -1,50 +1,51 @@

+	tilecoll WALL, WALL, WALL, WALL ; 00

 	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll WALL, WALL, WALL, WALL ; 02

+	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 02

 	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 03

-	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 04

-	tilecoll WALL, WALL, WALL, FLOOR ; 05

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 07

-	tilecoll FLOOR, FLOOR, PIT, PIT ; 08

-	tilecoll WALL, WALL, WALL, FLOOR ; 09

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0a

-	tilecoll WALL, WALL, FLOOR, WALL ; 0b

-	tilecoll WALL, WALL, WALL, WALL ; 0c

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 0d

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0f

-	tilecoll FLOOR, FLOOR, FLOOR, WARP_PANEL ; 10

-	tilecoll WALL, FLOOR, WALL, WALL ; 11

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 12

-	tilecoll FLOOR, WALL, WALL, WALL ; 13

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 14

+	tilecoll WALL, WALL, WALL, FLOOR ; 04

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 06

+	tilecoll FLOOR, FLOOR, PIT, PIT ; 07

+	tilecoll WALL, WALL, WALL, FLOOR ; 08

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 09

+	tilecoll WALL, WALL, FLOOR, WALL ; 0a

+	tilecoll WALL, WALL, WALL, WALL ; 0b

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 0c

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0e

+	tilecoll FLOOR, FLOOR, FLOOR, WARP_PANEL ; 0f

+	tilecoll WALL, FLOOR, WALL, WALL ; 10

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 11

+	tilecoll FLOOR, WALL, WALL, WALL ; 12

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 13

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 14

 	tilecoll FLOOR, FLOOR, WALL, WALL ; 15

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 16

-	tilecoll WALL, FLOOR, WALL, WALL ; 17

-	tilecoll FLOOR, WALL, WALL, WALL ; 18

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 19

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1a

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1c

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1d

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1e

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1f

+	tilecoll WALL, FLOOR, WALL, WALL ; 16

+	tilecoll FLOOR, WALL, WALL, WALL ; 17

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 18

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 19

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1c

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1d

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1e

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1f

 	tilecoll WALL, WALL, FLOOR, FLOOR ; 20

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 21

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 22

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 21

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22

 	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 23

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 24

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 25

-	tilecoll WALL, WARP_CARPET_UP, FLOOR, FLOOR ; 26

-	tilecoll WARP_CARPET_UP, WALL, FLOOR, FLOOR ; 27

-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 28

-	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 29

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 2a

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 2b

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24

+	tilecoll WALL, WARP_CARPET_UP, FLOOR, FLOOR ; 25

+	tilecoll WARP_CARPET_UP, WALL, FLOOR, FLOOR ; 26

+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 27

+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 28

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 29

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2a

+	tilecoll WALL, WALL, WALL, WALL ; 2b

 	tilecoll WALL, WALL, WALL, WALL ; 2c

 	tilecoll WALL, WALL, WALL, WALL ; 2d

-	tilecoll WALL, WALL, WALL, WALL ; 2e

-	tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 2f

+	tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 2e

+	tilecoll WALL, WALL, WALL, WALL ; 2f

 	tilecoll WALL, WALL, WALL, WALL ; 30

 	tilecoll WALL, WALL, WALL, WALL ; 31

 	tilecoll WALL, WALL, WALL, WALL ; 32

@@ -51,14 +52,13 @@

 	tilecoll WALL, WALL, WALL, WALL ; 33

 	tilecoll WALL, WALL, WALL, WALL ; 34

 	tilecoll WALL, WALL, WALL, WALL ; 35

-	tilecoll WALL, WALL, WALL, WALL ; 36

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 37

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 38

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 36

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 37

+	tilecoll WALL, WALL, WALL, WALL ; 38

 	tilecoll WALL, WALL, WALL, WALL ; 39

 	tilecoll WALL, WALL, WALL, WALL ; 3a

 	tilecoll WALL, WALL, WALL, WALL ; 3b

 	tilecoll WALL, WALL, WALL, WALL ; 3c

-	tilecoll WALL, WALL, WALL, WALL ; 3d

-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 3e

+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 3d

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40

--- a/data/tilesets/unused_dark_cave_collision.asm

+++ b/data/tilesets/unused_dark_cave_collision.asm

@@ -1,33 +1,34 @@

+	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_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 04

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

-	tilecoll WALL, WALL, WALL, WALL ; 06

+	tilecoll TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 03

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04

+	tilecoll WALL, WALL, WALL, WALL ; 05

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06

 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08

-	tilecoll WALL, WALL, WALL, WALL ; 09

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a

-	tilecoll WALL, WALL, WALL, WALL ; 0b

-	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0d

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e

-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f

+	tilecoll WALL, WALL, WALL, WALL ; 08

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09

+	tilecoll WALL, WALL, WALL, WALL ; 0a

+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0c

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d

+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e

+	tilecoll WALL, WALL, WALL, WALL ; 0f

 	tilecoll WALL, WALL, WALL, WALL ; 10

 	tilecoll WALL, WALL, WALL, WALL ; 11

 	tilecoll WALL, WALL, WALL, WALL ; 12

 	tilecoll WALL, WALL, WALL, WALL ; 13

-	tilecoll WALL, WALL, WALL, WALL ; 14

-	tilecoll WALL, WALL, WALL, DOOR ; 15

-	tilecoll WALL, WALL, WALL, WALL ; 16

-	tilecoll WALL, WALL, WALL, DOOR ; 17

-	tilecoll WALL, WALL, TOWN_MAP, WALL ; 18

+	tilecoll WALL, WALL, WALL, DOOR ; 14

+	tilecoll WALL, WALL, WALL, WALL ; 15

+	tilecoll WALL, WALL, WALL, DOOR ; 16

+	tilecoll WALL, WALL, TOWN_MAP, WALL ; 17

+	tilecoll WALL, WALL, WALL, WALL ; 18

 	tilecoll WALL, WALL, WALL, WALL ; 19

-	tilecoll WALL, WALL, WALL, WALL ; 1a

-	tilecoll WALL, WALL, WALL, DOOR ; 1b

-	tilecoll WALL, WALL, TOWN_MAP, WALL ; 1c

-	tilecoll WALL, WALL, WALL, WALL ; 1d

-	tilecoll WALL, WALL, DOOR, WALL ; 1e

+	tilecoll WALL, WALL, WALL, DOOR ; 1a

+	tilecoll WALL, WALL, TOWN_MAP, WALL ; 1b

+	tilecoll WALL, WALL, WALL, WALL ; 1c

+	tilecoll WALL, WALL, DOOR, WALL ; 1d

+	tilecoll WALL, WALL, WALL, WALL ; 1e

 	tilecoll WALL, WALL, WALL, WALL ; 1f

 	tilecoll WALL, WALL, WALL, WALL ; 20

 	tilecoll WALL, WALL, WALL, WALL ; 21

@@ -37,92 +38,91 @@

 	tilecoll WALL, WALL, WALL, WALL ; 25

 	tilecoll WALL, WALL, WALL, WALL ; 26

 	tilecoll WALL, WALL, WALL, WALL ; 27

-	tilecoll WALL, WALL, WALL, WALL ; 28

-	tilecoll WALL, WALL, WALL, DOOR ; 29

-	tilecoll WALL, WALL, WALL, WALL ; 2a

-	tilecoll WALL, WALL, WALL, DOOR ; 2b

-	tilecoll WALL, WALL, WALL, WALL ; 2c

+	tilecoll WALL, WALL, WALL, DOOR ; 28

+	tilecoll WALL, WALL, WALL, WALL ; 29

+	tilecoll WALL, WALL, WALL, DOOR ; 2a

+	tilecoll WALL, WALL, WALL, WALL ; 2b

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2c

 	tilecoll FLOOR, FLOOR, WALL, WALL ; 2d

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 2e

-	tilecoll WALL, WALL, WALL, DOOR ; 2f

-	tilecoll WALL, WALL, WALL, WALL ; 30

-	tilecoll BUOY, BUOY, BUOY, WATER_21 ; 31

-	tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 32

-	tilecoll BUOY, BUOY, WATER_21, BUOY ; 33

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 34

-	tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 35

-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 36

-	tilecoll WATER_21, BUOY, WATER_21, BUOY ; 37

-	tilecoll WALL, WALL, WALL, WALL ; 38

-	tilecoll BUOY, WATER_21, BUOY, BUOY ; 39

-	tilecoll WATER_21, WATER_21, BUOY, BUOY ; 3a

-	tilecoll WATER_21, BUOY, BUOY, BUOY ; 3b

-	tilecoll WALL, WALL, WALL, WALL ; 3c

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3d

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3e

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3f

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40

-	tilecoll WALL, WALL, WALL, FLOOR ; 41

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 42

-	tilecoll WALL, WALL, FLOOR, WALL ; 43

-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 44

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 45

-	tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 46

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 47

-	tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 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_21 ; 30

+	tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 31

+	tilecoll BUOY, BUOY, WATER_21, BUOY ; 32

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 33

+	tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 34

+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 35

+	tilecoll WATER_21, BUOY, WATER_21, BUOY ; 36

+	tilecoll WALL, WALL, WALL, WALL ; 37

+	tilecoll BUOY, WATER_21, BUOY, BUOY ; 38

+	tilecoll WATER_21, WATER_21, BUOY, BUOY ; 39

+	tilecoll WATER_21, BUOY, BUOY, BUOY ; 3a

+	tilecoll WALL, WALL, WALL, WALL ; 3b

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3d

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3e

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3f

+	tilecoll WALL, WALL, WALL, FLOOR ; 40

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 41

+	tilecoll WALL, WALL, FLOOR, WALL ; 42

+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 43

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 44

+	tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 45

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 46

+	tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 47

+	tilecoll WALL, FLOOR, WALL, WALL ; 48

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 49

+	tilecoll FLOOR, WALL, WALL, WALL ; 4a

+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b

+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c

+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d

+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e

+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f

+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50

+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51

+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52

+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53

+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 54

 	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 55

-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 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_21, WATER_21, WATER_21, WATER_21 ; 58

 	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 59

-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 5a

-	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b

-	tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5c

-	tilecoll WALL, WALL, WALL, FLOOR ; 5d

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 5e

-	tilecoll WALL, WALL, FLOOR, WALL ; 5f

-	tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 60

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 61

-	tilecoll WALL, WALL, WALL, WALL ; 62

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 63

-	tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 64

-	tilecoll WALL, FLOOR, WALL, WALL ; 65

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 66

-	tilecoll FLOOR, WALL, WALL, WALL ; 67

-	tilecoll CUT_TREE, FLOOR, WALL, 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, DOOR, WALL ; 74

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 76

-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 77

+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a

+	tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5b

+	tilecoll WALL, WALL, WALL, FLOOR ; 5c

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 5d

+	tilecoll WALL, WALL, FLOOR, WALL ; 5e

+	tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 5f

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 60

+	tilecoll WALL, WALL, WALL, WALL ; 61

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 62

+	tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 63

+	tilecoll WALL, FLOOR, WALL, WALL ; 64

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 65

+	tilecoll FLOOR, WALL, WALL, WALL ; 66

+	tilecoll CUT_TREE, FLOOR, WALL, FLOOR ; 67

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 68

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 69

+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a

+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b

+	tilecoll WALL, FLOOR, WALL, WALL ; 6c

+	tilecoll FLOOR, WALL, WALL, WALL ; 6d

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f

+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 72

+	tilecoll FLOOR, FLOOR, DOOR, WALL ; 73

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 75

+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 76

+	tilecoll WALL, WALL, WALL, WALL ; 77

 	tilecoll WALL, WALL, WALL, WALL ; 78

-	tilecoll WALL, WALL, WALL, WALL ; 79

+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 79

 	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7a

-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 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