ref: 78d489733c8da46b901ecb47e82e2fc45498b387
parent: 93c32e35806af6c0a8b731c5322ee5df58c797f9
parent: 05ac706f6052ade04a0d258862a705d3f41283bf
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Tue Dec 12 15:15:15 EST 2017
Merge branch 'master' of https://github.com/pret/pokecrystal
--- a/constants.asm
+++ b/constants.asm
@@ -35,6 +35,7 @@
INCLUDE "constants/sprite_constants.asm"
INCLUDE "constants/sprite_data_constants.asm"
INCLUDE "constants/tileset_constants.asm"
+INCLUDE "constants/collision_constants.asm"
INCLUDE "constants/cgb_constants.asm"
INCLUDE "constants/battle_tower_constants.asm"
INCLUDE "constants/cry_constants.asm"
--- /dev/null
+++ b/constants/collision_constants.asm
@@ -1,0 +1,115 @@
+; collision permissions (see tilesets/collision_permissions.asm)
+LANDTILE EQU $00
+WATERTILE EQU $01
+WALLTILE EQU $0f
+TALK EQU $10
+
+; collision data types (see tilesets/*_collision.asm)
+; TileCollisionTable indexes (see data/collision_permissions.asm)
+COLL_FLOOR EQU $00
+COLL_01 EQU $01 ; garbage
+COLL_03 EQU $03 ; garbage
+COLL_04 EQU $04 ; garbage
+COLL_WALL EQU $07
+COLL_CUT_08 EQU $08 ; unused
+COLL_TALL_GRASS_10 EQU $10 ; unused
+COLL_CUT_TREE EQU $12
+COLL_LONG_GRASS EQU $14
+COLL_HEADBUTT_TREE EQU $15
+COLL_TALL_GRASS EQU $18
+COLL_CUT_TREE_1A EQU $1a ; unused
+COLL_LONG_GRASS_1C EQU $1c ; unused
+COLL_HEADBUTT_TREE_1D EQU $1d ; unused
+COLL_WATER_21 EQU $21 ; ???
+COLL_ICE EQU $23
+COLL_WHIRLPOOL EQU $24
+COLL_BUOY EQU $27
+COLL_CUT_28 EQU $28 ; garbage
+COLL_WATER EQU $29
+COLL_ICE_2B EQU $2b ; unused
+COLL_WHIRLPOOL_2C EQU $2c ; unused
+COLL_WATERFALL_RIGHT EQU $30 ; unused !!!
+COLL_WATERFALL_LEFT EQU $31 ; unused !!!
+COLL_WATERFALL_UP EQU $32 ; unused !!!
+COLL_WATERFALL EQU $33
+COLL_CURRENT_RIGHT EQU $38 ; unused !!!
+COLL_CURRENT_LEFT EQU $39 ; unused !!!
+COLL_CURRENT_UP EQU $3a ; unused !!!
+COLL_CURRENT_DOWN EQU $3b ; unused !!!
+COLL_BRAKE EQU $40 ; unused !!!
+COLL_WALK_RIGHT EQU $41 ; unused !!!
+COLL_WALK_LEFT EQU $42 ; unused !!!
+COLL_WALK_UP EQU $43 ; unused !!!
+COLL_WALK_DOWN EQU $44 ; unused !!!
+COLL_BRAKE_45 EQU $45 ; garbage
+COLL_BRAKE_46 EQU $46 ; unused
+COLL_BRAKE_47 EQU $47 ; unused
+COLL_GRASS_48 EQU $48 ; unused
+COLL_GRASS_49 EQU $49 ; unused
+COLL_GRASS_4A EQU $4a ; garbage
+COLL_GRASS_4B EQU $4b ; garbage
+COLL_GRASS_4C EQU $4c ; unused
+COLL_WALK_RIGHT_ALT EQU $50 ; unused
+COLL_WALK_LEFT_ALT EQU $51 ; unused
+COLL_WALK_UP_ALT EQU $52 ; unused
+COLL_WALK_DOWN_ALT EQU $53 ; unused
+COLL_BRAKE_ALT EQU $54 ; unused
+COLL_BRAKE_55 EQU $55 ; unused
+COLL_BRAKE_56 EQU $56 ; unused
+COLL_BRAKE_57 EQU $57 ; unused
+COLL_5B EQU $5b ; garbage
+COLL_PIT EQU $60
+COLL_VIRTUAL_BOY EQU $61 ; garbage
+COLL_64 EQU $64 ; garbage
+COLL_65 EQU $65 ; garbage
+COLL_PIT_68 EQU $68 ; unused
+COLL_WARP_CARPET_DOWN EQU $70
+COLL_DOOR EQU $71
+COLL_LADDER EQU $72
+COLL_STAIRCASE_73 EQU $73 ; unused
+COLL_CAVE_74 EQU $74 ; unused
+COLL_DOOR_75 EQU $75 ; unused
+COLL_WARP_CARPET_LEFT EQU $76
+COLL_WARP_77 EQU $77 ; unused
+COLL_WARP_CARPET_UP EQU $78
+COLL_DOOR_79 EQU $79 ; unused
+COLL_STAIRCASE EQU $7a
+COLL_CAVE EQU $7b
+COLL_WARP_PANEL EQU $7c
+COLL_DOOR_7D EQU $7d ; unused
+COLL_WARP_CARPET_RIGHT EQU $7e
+COLL_WARP_7F EQU $7f ; unused
+COLL_COUNTER EQU $90
+COLL_BOOKSHELF EQU $91
+COLL_PC EQU $93
+COLL_RADIO EQU $94
+COLL_TOWN_MAP EQU $95
+COLL_MART_SHELF EQU $96
+COLL_TV EQU $97
+COLL_COUNTER_98 EQU $98 ; unused
+COLL_9C EQU $9c ; garbage
+COLL_WINDOW EQU $9d
+COLL_INCENSE_BURNER EQU $9f
+COLL_HOP_RIGHT EQU $a0
+COLL_HOP_LEFT EQU $a1
+COLL_HOP_UP EQU $a2 ; unused !!!
+COLL_HOP_DOWN EQU $a3
+COLL_HOP_DOWN_RIGHT EQU $a4
+COLL_HOP_DOWN_LEFT EQU $a5
+COLL_HOP_UP_RIGHT EQU $a6 ; unused !!!
+COLL_HOP_UP_LEFT EQU $a7 ; unused !!!
+COLL_RIGHT_WALL EQU $b0
+COLL_LEFT_WALL EQU $b1
+COLL_UP_WALL EQU $b2
+COLL_DOWN_WALL EQU $b3 ; unused !!!
+COLL_FF EQU $ff ; garbage
+
+; collision data type nybbles
+LO_NYBBLE_GRASS EQU $07
+HI_NYBBLE_TALL_GRASS EQU $10
+HI_NYBBLE_WATER EQU $20
+HI_NYBBLE_CURRENT EQU $30
+HI_NYBBLE_WALK EQU $40
+HI_NYBBLE_WALK_ALT EQU $50
+HI_NYBBLE_WARPS EQU $70
+HI_NYBBLE_LEDGES EQU $a0
--- a/constants/tileset_constants.asm
+++ b/constants/tileset_constants.asm
@@ -1,9 +1,3 @@
-; collision values (see tilesets/collision.asm)
-LANDTILE EQU $0
-WATERTILE EQU $1
-WALLTILE EQU $f
-TALK EQU $10
-
; Tilesets indexes (see tilesets/tileset_headers.asm)
const_value SET 1
const TILESET_JOHTO_1 ; 01
--- /dev/null
+++ b/data/collision_permissions.asm
@@ -1,0 +1,262 @@
+NONTALKABLE EQUS "db"
+TALKABLE EQUS "db TALK +"
+
+TileCollisionTable:: ; 4ce1f
+; entries correspond to COLL_* constants
+ NONTALKABLE LANDTILE ; COLL_FLOOR
+ NONTALKABLE LANDTILE ; COLL_01
+ NONTALKABLE LANDTILE ; 02
+ NONTALKABLE LANDTILE ; COLL_03
+ NONTALKABLE LANDTILE ; COLL_04
+ NONTALKABLE LANDTILE ; 05
+ NONTALKABLE LANDTILE ; 06
+ NONTALKABLE WALLTILE ; COLL_WALL
+ NONTALKABLE LANDTILE ; COLL_CUT_08
+ NONTALKABLE LANDTILE ; 09
+ NONTALKABLE LANDTILE ; 0a
+ NONTALKABLE LANDTILE ; 0b
+ NONTALKABLE LANDTILE ; 0c
+ NONTALKABLE LANDTILE ; 0d
+ NONTALKABLE LANDTILE ; 0e
+ NONTALKABLE WALLTILE ; 0f
+ NONTALKABLE LANDTILE ; COLL_TALL_GRASS_10
+ NONTALKABLE LANDTILE ; 11
+ TALKABLE WALLTILE ; COLL_CUT_TREE
+ NONTALKABLE LANDTILE ; 13
+ NONTALKABLE LANDTILE ; COLL_LONG_GRASS
+ TALKABLE WALLTILE ; COLL_HEADBUTT_TREE
+ NONTALKABLE LANDTILE ; 16
+ NONTALKABLE LANDTILE ; 17
+ NONTALKABLE LANDTILE ; COLL_TALL_GRASS
+ NONTALKABLE LANDTILE ; 19
+ TALKABLE WALLTILE ; COLL_CUT_TREE_1A
+ NONTALKABLE LANDTILE ; 1b
+ NONTALKABLE LANDTILE ; COLL_LONG_GRASS_1C
+ TALKABLE WALLTILE ; COLL_HEADBUTT_TREE_1D
+ NONTALKABLE LANDTILE ; 1e
+ NONTALKABLE LANDTILE ; 1f
+ NONTALKABLE WATERTILE ; 20
+ NONTALKABLE WATERTILE ; COLL_WATER_21
+ TALKABLE WATERTILE ; 22
+ NONTALKABLE LANDTILE ; COLL_ICE
+ TALKABLE WATERTILE ; COLL_WHIRLPOOL
+ NONTALKABLE WATERTILE ; 25
+ NONTALKABLE WATERTILE ; 26
+ NONTALKABLE WALLTILE ; COLL_BUOY
+ NONTALKABLE WATERTILE ; COLL_CUT_28
+ NONTALKABLE WATERTILE ; COLL_WATER
+ TALKABLE WATERTILE ; 2a
+ NONTALKABLE LANDTILE ; COLL_ICE_2B
+ TALKABLE WATERTILE ; COLL_WHIRLPOOL_2C
+ NONTALKABLE WATERTILE ; 2d
+ NONTALKABLE WATERTILE ; 2e
+ NONTALKABLE WALLTILE ; 2f
+ NONTALKABLE WATERTILE ; COLL_WATERFALL_RIGHT
+ NONTALKABLE WATERTILE ; COLL_WATERFALL_LEFT
+ NONTALKABLE WATERTILE ; COLL_WATERFALL_UP
+ NONTALKABLE WATERTILE ; COLL_WATERFALL
+ NONTALKABLE WATERTILE ; 34
+ NONTALKABLE WATERTILE ; 35
+ NONTALKABLE WATERTILE ; 36
+ NONTALKABLE WATERTILE ; 37
+ NONTALKABLE WATERTILE ; COLL_CURRENT_RIGHT
+ NONTALKABLE WATERTILE ; COLL_CURRENT_LEFT
+ NONTALKABLE WATERTILE ; COLL_CURRENT_UP
+ NONTALKABLE WATERTILE ; COLL_CURRENT_DOWN
+ NONTALKABLE WATERTILE ; 3c
+ NONTALKABLE WATERTILE ; 3d
+ NONTALKABLE WATERTILE ; 3e
+ NONTALKABLE WATERTILE ; 3f
+ NONTALKABLE LANDTILE ; COLL_BRAKE
+ NONTALKABLE LANDTILE ; COLL_WALK_RIGHT
+ NONTALKABLE LANDTILE ; COLL_WALK_LEFT
+ NONTALKABLE LANDTILE ; COLL_WALK_UP
+ NONTALKABLE LANDTILE ; COLL_WALK_DOWN
+ NONTALKABLE LANDTILE ; COLL_BRAKE_45
+ NONTALKABLE LANDTILE ; COLL_BRAKE_46
+ NONTALKABLE LANDTILE ; COLL_BRAKE_47
+ NONTALKABLE LANDTILE ; COLL_GRASS_48
+ NONTALKABLE LANDTILE ; COLL_GRASS_49
+ NONTALKABLE LANDTILE ; COLL_GRASS_4A
+ NONTALKABLE LANDTILE ; COLL_GRASS_4B
+ NONTALKABLE LANDTILE ; COLL_GRASS_4C
+ NONTALKABLE LANDTILE ; 4d
+ NONTALKABLE LANDTILE ; 4e
+ NONTALKABLE LANDTILE ; 4f
+ NONTALKABLE LANDTILE ; COLL_WALK_RIGHT_ALT
+ NONTALKABLE LANDTILE ; COLL_WALK_LEFT_ALT
+ NONTALKABLE LANDTILE ; COLL_WALK_UP_ALT
+ NONTALKABLE LANDTILE ; COLL_WALK_DOWN_ALT
+ NONTALKABLE LANDTILE ; COLL_BRAKE_ALT
+ NONTALKABLE LANDTILE ; COLL_BRAKE_55
+ NONTALKABLE LANDTILE ; COLL_BRAKE_56
+ NONTALKABLE LANDTILE ; COLL_BRAKE_57
+ NONTALKABLE LANDTILE ; 58
+ NONTALKABLE LANDTILE ; 59
+ NONTALKABLE LANDTILE ; 5a
+ NONTALKABLE LANDTILE ; COLL_5B
+ NONTALKABLE LANDTILE ; 5c
+ NONTALKABLE LANDTILE ; 5d
+ NONTALKABLE LANDTILE ; 5e
+ NONTALKABLE LANDTILE ; 5f
+ NONTALKABLE LANDTILE ; COLL_PIT
+ NONTALKABLE LANDTILE ; COLL_VIRTUAL_BOY
+ NONTALKABLE WALLTILE ; 62
+ NONTALKABLE LANDTILE ; 63
+ NONTALKABLE LANDTILE ; COLL_64
+ NONTALKABLE LANDTILE ; COLL_65
+ NONTALKABLE LANDTILE ; 66
+ NONTALKABLE LANDTILE ; 67
+ NONTALKABLE LANDTILE ; COLL_PIT_68
+ NONTALKABLE LANDTILE ; 69
+ NONTALKABLE WALLTILE ; 6a
+ NONTALKABLE LANDTILE ; 6b
+ NONTALKABLE LANDTILE ; 6c
+ NONTALKABLE LANDTILE ; 6d
+ NONTALKABLE LANDTILE ; 6e
+ NONTALKABLE LANDTILE ; 6f
+ NONTALKABLE LANDTILE ; COLL_WARP_CARPET_DOWN
+ NONTALKABLE LANDTILE ; COLL_DOOR
+ NONTALKABLE LANDTILE ; COLL_LADDER
+ NONTALKABLE LANDTILE ; COLL_STAIRCASE_73
+ NONTALKABLE LANDTILE ; COLL_CAVE_74
+ NONTALKABLE LANDTILE ; COLL_DOOR_75
+ NONTALKABLE LANDTILE ; COLL_WARP_CARPET_LEFT
+ NONTALKABLE LANDTILE ; COLL_WARP_77
+ NONTALKABLE LANDTILE ; COLL_WARP_CARPET_UP
+ NONTALKABLE LANDTILE ; COLL_DOOR_79
+ NONTALKABLE LANDTILE ; COLL_STAIRCASE
+ NONTALKABLE LANDTILE ; COLL_CAVE
+ NONTALKABLE LANDTILE ; COLL_WARP_PANEL
+ NONTALKABLE LANDTILE ; COLL_DOOR_7D
+ NONTALKABLE LANDTILE ; COLL_WARP_CARPET_RIGHT
+ NONTALKABLE LANDTILE ; COLL_WARP_7F
+ NONTALKABLE WALLTILE ; 80
+ NONTALKABLE WALLTILE ; 81
+ NONTALKABLE WALLTILE ; 82
+ NONTALKABLE WALLTILE ; 83
+ NONTALKABLE WALLTILE ; 84
+ NONTALKABLE LANDTILE ; 85
+ NONTALKABLE LANDTILE ; 86
+ NONTALKABLE LANDTILE ; 87
+ NONTALKABLE WALLTILE ; 88
+ NONTALKABLE WALLTILE ; 89
+ NONTALKABLE WALLTILE ; 8a
+ NONTALKABLE WALLTILE ; 8b
+ NONTALKABLE WALLTILE ; 8c
+ NONTALKABLE LANDTILE ; 8d
+ NONTALKABLE LANDTILE ; 8e
+ NONTALKABLE LANDTILE ; 8f
+ NONTALKABLE WALLTILE ; COLL_COUNTER
+ NONTALKABLE WALLTILE ; COLL_BOOKSHELF
+ NONTALKABLE WALLTILE ; 92
+ NONTALKABLE WALLTILE ; COLL_PC
+ NONTALKABLE WALLTILE ; COLL_RADIO
+ NONTALKABLE WALLTILE ; COLL_TOWN_MAP
+ NONTALKABLE WALLTILE ; COLL_MART_SHELF
+ NONTALKABLE WALLTILE ; COLL_TV
+ NONTALKABLE WALLTILE ; COLL_COUNTER_98
+ NONTALKABLE WALLTILE ; 99
+ NONTALKABLE WALLTILE ; 9a
+ NONTALKABLE WALLTILE ; 9b
+ NONTALKABLE WALLTILE ; COLL_9C
+ NONTALKABLE WALLTILE ; COLL_WINDOW
+ NONTALKABLE WALLTILE ; 9e
+ NONTALKABLE WALLTILE ; COLL_INCENSE_BURNER
+ NONTALKABLE LANDTILE ; COLL_HOP_RIGHT
+ NONTALKABLE LANDTILE ; COLL_HOP_LEFT
+ NONTALKABLE LANDTILE ; COLL_HOP_UP
+ NONTALKABLE LANDTILE ; COLL_HOP_DOWN
+ NONTALKABLE LANDTILE ; COLL_HOP_DOWN_RIGHT
+ NONTALKABLE LANDTILE ; COLL_HOP_DOWN_LEFT
+ NONTALKABLE LANDTILE ; COLL_HOP_UP_RIGHT
+ NONTALKABLE LANDTILE ; COLL_HOP_UP_LEFT
+ NONTALKABLE LANDTILE ; a8
+ NONTALKABLE LANDTILE ; a9
+ NONTALKABLE LANDTILE ; aa
+ NONTALKABLE LANDTILE ; ab
+ NONTALKABLE LANDTILE ; ac
+ NONTALKABLE LANDTILE ; ad
+ NONTALKABLE LANDTILE ; ae
+ NONTALKABLE LANDTILE ; af
+ NONTALKABLE LANDTILE ; COLL_RIGHT_WALL
+ NONTALKABLE LANDTILE ; COLL_LEFT_WALL
+ NONTALKABLE LANDTILE ; COLL_UP_WALL
+ NONTALKABLE LANDTILE ; COLL_DOWN_WALL
+ NONTALKABLE LANDTILE ; b4
+ NONTALKABLE LANDTILE ; b5
+ NONTALKABLE LANDTILE ; b6
+ NONTALKABLE LANDTILE ; b7
+ NONTALKABLE LANDTILE ; b8
+ NONTALKABLE LANDTILE ; b9
+ NONTALKABLE LANDTILE ; ba
+ NONTALKABLE LANDTILE ; bb
+ NONTALKABLE LANDTILE ; bc
+ NONTALKABLE LANDTILE ; bd
+ NONTALKABLE LANDTILE ; be
+ NONTALKABLE LANDTILE ; bf
+ NONTALKABLE WATERTILE ; c0
+ NONTALKABLE WATERTILE ; c1
+ NONTALKABLE WATERTILE ; c2
+ NONTALKABLE WATERTILE ; c3
+ NONTALKABLE WATERTILE ; c4
+ NONTALKABLE WATERTILE ; c5
+ NONTALKABLE WATERTILE ; c6
+ NONTALKABLE WATERTILE ; c7
+ NONTALKABLE WATERTILE ; c8
+ NONTALKABLE WATERTILE ; c9
+ NONTALKABLE WATERTILE ; ca
+ NONTALKABLE WATERTILE ; cb
+ NONTALKABLE WATERTILE ; cc
+ NONTALKABLE WATERTILE ; cd
+ NONTALKABLE WATERTILE ; ce
+ NONTALKABLE WATERTILE ; cf
+ NONTALKABLE LANDTILE ; d0
+ NONTALKABLE LANDTILE ; d1
+ NONTALKABLE LANDTILE ; d2
+ NONTALKABLE LANDTILE ; d3
+ NONTALKABLE LANDTILE ; d4
+ NONTALKABLE LANDTILE ; d5
+ NONTALKABLE LANDTILE ; d6
+ NONTALKABLE LANDTILE ; d7
+ NONTALKABLE LANDTILE ; d8
+ NONTALKABLE LANDTILE ; d9
+ NONTALKABLE LANDTILE ; da
+ NONTALKABLE LANDTILE ; db
+ NONTALKABLE LANDTILE ; dc
+ NONTALKABLE LANDTILE ; dd
+ NONTALKABLE LANDTILE ; de
+ NONTALKABLE LANDTILE ; df
+ NONTALKABLE LANDTILE ; e0
+ NONTALKABLE LANDTILE ; e1
+ NONTALKABLE LANDTILE ; e2
+ NONTALKABLE LANDTILE ; e3
+ NONTALKABLE LANDTILE ; e4
+ NONTALKABLE LANDTILE ; e5
+ NONTALKABLE LANDTILE ; e6
+ NONTALKABLE LANDTILE ; e7
+ NONTALKABLE LANDTILE ; e8
+ NONTALKABLE LANDTILE ; e9
+ NONTALKABLE LANDTILE ; ea
+ NONTALKABLE LANDTILE ; eb
+ NONTALKABLE LANDTILE ; ec
+ NONTALKABLE LANDTILE ; ed
+ NONTALKABLE LANDTILE ; ee
+ NONTALKABLE LANDTILE ; ef
+ NONTALKABLE LANDTILE ; f0
+ NONTALKABLE LANDTILE ; f1
+ NONTALKABLE LANDTILE ; f2
+ NONTALKABLE LANDTILE ; f3
+ NONTALKABLE LANDTILE ; f4
+ NONTALKABLE LANDTILE ; f5
+ NONTALKABLE LANDTILE ; f6
+ NONTALKABLE LANDTILE ; f7
+ NONTALKABLE LANDTILE ; f8
+ NONTALKABLE LANDTILE ; f9
+ NONTALKABLE LANDTILE ; fa
+ NONTALKABLE LANDTILE ; fb
+ NONTALKABLE LANDTILE ; fc
+ NONTALKABLE LANDTILE ; fd
+ NONTALKABLE LANDTILE ; fe
+ NONTALKABLE WALLTILE ; COLL_FF
+; 4cf1f
--- /dev/null
+++ b/data/collision_stdscripts.asm
@@ -1,0 +1,13 @@
+; stdscripts associated with tile collisions
+
+TileCollisionStdScripts:
+ ; collision type, stdscript
+ dbw COLL_BOOKSHELF, magazinebookshelf
+ dbw COLL_PC, pcscript
+ dbw COLL_RADIO, radio1
+ dbw COLL_TOWN_MAP, townmap
+ dbw COLL_MART_SHELF, merchandiseshelf
+ dbw COLL_TV, tv
+ dbw COLL_WINDOW, window
+ dbw COLL_INCENSE_BURNER, incenseburner
+ db -1 ; end
--- a/engine/player_movement.asm
+++ b/engine/player_movement.asm
@@ -128,13 +128,13 @@
.not_whirlpool
and $f0
- cp $30 ; moving water
+ cp HI_NYBBLE_CURRENT
jr z, .water
- cp $40 ; moving land 1
+ cp HI_NYBBLE_WALK
jr z, .land1
- cp $50 ; moving land 2
+ cp HI_NYBBLE_WALK_ALT
jr z, .land2
- cp $70 ; warps
+ cp HI_NYBBLE_WARPS
jr z, .warps
jr .no_walk
@@ -150,10 +150,10 @@
jr .continue_walk
.water_table
- db RIGHT
- db LEFT
- db UP
- db DOWN
+ db RIGHT ; COLL_WATERFALL_RIGHT
+ db LEFT ; COLL_WATERFALL_LEFT
+ db UP ; COLL_WATERFALL_UP
+ db DOWN ; COLL_WATERFALL
.land1
ld a, c
@@ -169,14 +169,14 @@
jr .continue_walk
.land1_table
- db STANDING
- db RIGHT
- db LEFT
- db UP
- db DOWN
- db STANDING
- db STANDING
- db STANDING
+ db STANDING ; COLL_BRAKE
+ db RIGHT ; COLL_WALK_RIGHT
+ db LEFT ; COLL_WALK_LEFT
+ db UP ; COLL_WALK_UP
+ db DOWN ; COLL_WALK_DOWN
+ db STANDING ; COLL_BRAKE_45
+ db STANDING ; COLL_BRAKE_46
+ db STANDING ; COLL_BRAKE_47
.land2
ld a, c
@@ -192,24 +192,24 @@
jr .continue_walk
.land2_table
- db RIGHT
- db LEFT
- db UP
- db DOWN
- db STANDING
- db STANDING
- db STANDING
- db STANDING
+ db RIGHT ; COLL_WALK_RIGHT_ALT
+ db LEFT ; COLL_WALK_LEFT_ALT
+ db UP ; COLL_WALK_UP_ALT
+ db DOWN ; COLL_WALK_DOWN_ALT
+ db STANDING ; COLL_BRAKE_ALT
+ db STANDING ; COLL_BRAKE_55
+ db STANDING ; COLL_BRAKE_56
+ db STANDING ; COLL_BRAKE_57
.warps
ld a, c
- cp $71 ; door
+ cp COLL_DOOR
jr z, .down
- cp $79
+ cp COLL_DOOR_79
jr z, .down
- cp $7a ; stairs
+ cp COLL_STAIRCASE
jr z, .down
- cp $7b ; cave
+ cp COLL_CAVE
jr nz, .no_walk
.down
@@ -365,7 +365,7 @@
ld a, [PlayerStandingTile]
ld e, a
and $f0
- cp $a0 ; ledge
+ cp HI_NYBBLE_LEDGES
jr nz, .DontJump
ld a, e
@@ -391,14 +391,14 @@
ret
.data_8021e
- db FACE_RIGHT
- db FACE_LEFT
- db FACE_UP
- db FACE_DOWN
- db FACE_RIGHT | FACE_DOWN
- db FACE_DOWN | FACE_LEFT
- db FACE_UP | FACE_RIGHT
- db FACE_UP | FACE_LEFT
+ db FACE_RIGHT ; COLL_HOP_RIGHT
+ db FACE_LEFT ; COLL_HOP_LEFT
+ db FACE_UP ; COLL_HOP_UP
+ db FACE_DOWN ; COLL_HOP_DOWN
+ db FACE_RIGHT | FACE_DOWN ; COLL_HOP_DOWN_RIGHT
+ db FACE_DOWN | FACE_LEFT ; COLL_HOP_DOWN_LEFT
+ db FACE_UP | FACE_RIGHT ; COLL_HOP_UP_RIGHT
+ db FACE_UP | FACE_LEFT ; COLL_HOP_UP_LEFT
; 80226
.CheckWarp: ; 80226
@@ -443,7 +443,10 @@
ret
.EdgeWarps:
- db $70, $78, $76, $7e
+ db COLL_WARP_CARPET_DOWN
+ db COLL_WARP_CARPET_UP
+ db COLL_WARP_CARPET_LEFT
+ db COLL_WARP_CARPET_RIGHT
; 8025f
.DoStep:
@@ -759,7 +762,7 @@
; Return 0 if tile a is land. Otherwise, return carry.
call GetTileCollision
- and a ; land
+ and a ; LANDTILE?
ret z
scf
ret
@@ -774,7 +777,7 @@
jr z, .Water
; Can walk back onto land from water.
- and a
+ and a ; LANDTILE?
jr z, .Land
jr .Neither
--- a/engine/tile_events.asm
+++ b/engine/tile_events.asm
@@ -1,12 +1,12 @@
CheckWarpCollision:: ; 1499a
; Is this tile a warp?
ld a, [PlayerStandingTile]
- cp $60
+ cp COLL_PIT
jr z, .warp
- cp $68
+ cp COLL_PIT_68
jr z, .warp
and $f0
- cp $70
+ cp HI_NYBBLE_WARPS
jr z, .warp
and a
ret
@@ -20,13 +20,13 @@
; If this is a directional warp, clear carry (press the designated button to warp).
; Else, set carry (immediate warp).
ld a, [PlayerStandingTile]
- cp $70 ; Warp on down
+ cp COLL_WARP_CARPET_DOWN
jr z, .directional
- cp $76 ; Warp on left
+ cp COLL_WARP_CARPET_LEFT
jr z, .directional
- cp $78 ; Warp on up
+ cp COLL_WARP_CARPET_UP
jr z, .directional
- cp $7e ; Warp on right
+ cp COLL_WARP_CARPET_RIGHT
jr z, .directional
scf
ret
@@ -45,15 +45,15 @@
; 149d3
.blocks ; 149d3
- db $71 ; door
- db $79
- db $7a ; stairs
- db $73
- db $7b ; cave entrance
- db $74
- db $7c ; warp pad
- db $75
- db $7d
+ db COLL_DOOR
+ db COLL_DOOR_79
+ db COLL_STAIRCASE
+ db COLL_STAIRCASE_73
+ db COLL_CAVE
+ db COLL_CAVE_74
+ db COLL_WARP_PANEL
+ db COLL_DOOR_75
+ db COLL_DOOR_7D
db -1
; 149dd
@@ -66,16 +66,16 @@
; 149ea
.blocks ; 149ea
- db $08
- db $18 ; tall grass
- db $14 ; tall grass
- db $28
- db $29
- db $48
- db $49
- db $4a
- db $4b
- db $4c
+ db COLL_CUT_08
+ db COLL_TALL_GRASS
+ db COLL_LONG_GRASS
+ db COLL_CUT_28
+ db COLL_WATER
+ db COLL_GRASS_48
+ db COLL_GRASS_49
+ db COLL_GRASS_4A
+ db COLL_GRASS_4B
+ db COLL_GRASS_4C
db -1
; 149f5
@@ -88,12 +88,12 @@
; 14a00
.blocks ; 14a00
- db $12 ; cut tree
- db $1a ; cut tree
- db $10 ; tall grass
- db $18 ; tall grass
- db $14 ; tall grass
- db $1c ; tall grass
+ db COLL_CUT_TREE
+ db COLL_CUT_TREE_1A
+ db COLL_TALL_GRASS_10
+ db COLL_TALL_GRASS
+ db COLL_LONG_GRASS
+ db COLL_LONG_GRASS_1C
db -1
; 14a07
@@ -100,10 +100,10 @@
GetWarpSFX:: ; 14a07
ld a, [PlayerStandingTile]
ld de, SFX_ENTER_DOOR
- cp $71 ; door
+ cp COLL_DOOR
ret z
ld de, SFX_WARP_TO
- cp $7c ; warp pad
+ cp COLL_WARP_PANEL
ret z
ld de, SFX_EXIT_BUILDING
ret
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -120,23 +120,23 @@
CheckGrassTile:: ; 1875
ld d, a
and $f0
- cp $10
- jr z, .ok_10
- cp $20
- jr z, .ok_20
+ cp HI_NYBBLE_TALL_GRASS
+ jr z, .grass
+ cp HI_NYBBLE_WATER
+ jr z, .water
scf
ret
-.ok_10
+.grass
ld a, d
- and 7
+ and LO_NYBBLE_GRASS
ret z
scf
ret
; For some reason, the above code is duplicated down here.
-.ok_20
+.water
ld a, d
- and 7
+ and LO_NYBBLE_GRASS
ret z
scf
ret
@@ -143,44 +143,44 @@
; 188e
CheckSuperTallGrassTile:: ; 188e
- cp $14
+ cp COLL_LONG_GRASS
ret z
- cp $1c
+ cp COLL_LONG_GRASS_1C
ret
; 1894
CheckCutTreeTile:: ; 1894
- cp $12
+ cp COLL_CUT_TREE
ret z
- cp $1a
+ cp COLL_CUT_TREE_1A
ret
; 189a
CheckHeadbuttTreeTile:: ; 189a
- cp $15
+ cp COLL_HEADBUTT_TREE
ret z
- cp $1d
+ cp COLL_HEADBUTT_TREE_1D
ret
; 18a0
CheckCounterTile:: ; 18a0
- cp $90
+ cp COLL_COUNTER
ret z
- cp $98
+ cp COLL_COUNTER_98
ret
; 18a6
CheckPitTile:: ; 18a6
- cp $60
+ cp COLL_PIT
ret z
- cp $68
+ cp COLL_PIT_68
ret
; 18ac
CheckIceTile:: ; 18ac
- cp $23
+ cp COLL_ICE
ret z
- cp $2b
+ cp COLL_ICE_2B
ret z
scf
ret
@@ -188,9 +188,9 @@
CheckWhirlpoolTile:: ; 18b4
nop
- cp $24
+ cp COLL_WHIRLPOOL
ret z
- cp $2c
+ cp COLL_WHIRLPOOL_2C
ret z
scf
ret
@@ -197,21 +197,21 @@
; 18bd
CheckWaterfallTile:: ; 18bd
- cp $33
+ cp COLL_WATERFALL
ret z
- cp $3b
+ cp COLL_CURRENT_DOWN
ret
; 18c3
CheckStandingOnEntrance:: ; 18c3
ld a, [PlayerStandingTile]
- cp $71 ; door
+ cp COLL_DOOR
ret z
- cp $79
+ cp COLL_DOOR_79
ret z
- cp $7a ; stairs
+ cp COLL_STAIRCASE
ret z
- cp $7b ; cave
+ cp COLL_CAVE
ret
; 18d2
--- a/macros.asm
+++ b/macros.asm
@@ -13,7 +13,7 @@
INCLUDE "macros/mobile.asm"
INCLUDE "macros/trainer.asm"
INCLUDE "macros/trade_anim.asm"
-INCLUDE "macros/pals.asm"
+INCLUDE "macros/tilesets.asm"
RGB: MACRO
dw ((\3) << 10) + ((\2) << 5) + (\1)
--- a/macros/pals.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-tilepal: MACRO
-; vram bank, pals
-x = \1 << OAM_TILE_BANK
-rept (_NARG +- 1) / 2
- dn (x | PAL_BG_\3), (x | PAL_BG_\2)
- shift
- shift
-endr
-endm
--- /dev/null
+++ b/macros/tilesets.asm
@@ -1,0 +1,13 @@
+tilepal: MACRO
+; vram bank, pals
+x = \1 << OAM_TILE_BANK
+rept (_NARG +- 1) / 2
+ dn (x | PAL_BG_\3), (x | PAL_BG_\2)
+ shift
+ shift
+endr
+endm
+
+tilecoll: MACRO
+ db COLL_\1, COLL_\2, COLL_\3, COLL_\4
+endm
--- a/main.asm
+++ b/main.asm
@@ -506,7 +506,7 @@
; Checks to see if the tile you're facing has a std script associated with it. If so, executes the script and returns carry.
ld a, c
ld de, 3
- ld hl, .table1
+ ld hl, TileCollisionStdScripts
call IsInArray
jr nc, .notintable
@@ -527,16 +527,7 @@
xor a
ret
-.table1
- dbw $91, magazinebookshelf
- dbw $93, pcscript
- dbw $94, radio1
- dbw $95, townmap
- dbw $96, merchandiseshelf
- dbw $97, tv
- dbw $9d, window
- dbw $9f, incenseburner
- db -1 ; end
+INCLUDE "data/collision_stdscripts.asm"
Script_JumpStdFromRAM: ; 0x1369a
jump wJumpStdScriptBuffer
@@ -1950,7 +1941,7 @@
INCLUDE "tilesets/palette_maps.asm"
-INCLUDE "tilesets/collision.asm"
+INCLUDE "data/collision_permissions.asm"
EmptyAllSRAMBanks: ; 4cf1f
ld a, $0
--- /dev/null
+++ b/tilesets/aerodactyl_word_room_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 01
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
+ tilecoll WALL, WALL, WALL, FLOOR ; 15
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 16
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 17
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 19
+ tilecoll WALL, WALL, FLOOR, WALL ; 1a
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
+ tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d
+ tilecoll WALL, WALL, WALL, WALL ; 1e
+ tilecoll WALL, WALL, WALL, WALL ; 1f
+ tilecoll WALL, WALL, WALL, WALL ; 20
+ tilecoll WALL, WALL, WALL, WALL ; 21
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
binary files a/tilesets/aerodactyl_word_room_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/battle_tower_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 01
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 03
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 04
+ tilecoll WALL, DOOR, FLOOR, FLOOR ; 05
+ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 06
+ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 07
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 08
+ tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 09
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 0a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 0c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+ tilecoll DOOR, WALL, FLOOR, FLOOR ; 11
+ tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 12
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 13
+ tilecoll WALL, WALL, WALL, WALL ; 14
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 15
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 16
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 17
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 18
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 19
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
+ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1b
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 1c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 1f
+ tilecoll WALL, WALL, FLOOR, WALL ; 20
+ tilecoll WALL, WALL, WALL, FLOOR ; 21
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 22
+ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 23
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 25
+ tilecoll WALL, FLOOR, FLOOR, DOOR ; 26
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 27
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 28
+ tilecoll WALL, PC, FLOOR, FLOOR ; 29
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
+ tilecoll WALL, WALL, WALL, FLOOR ; 2b
+ tilecoll WALL, WALL, FLOOR, WALL ; 2c
+ tilecoll FLOOR, FLOOR, FLOOR, DOOR ; 2d
+ tilecoll FLOOR, FLOOR, DOOR, FLOOR ; 2e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 35
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
+ tilecoll WALL, WALL, FLOOR, WALL ; 37
+ tilecoll WALL, WALL, WALL, FLOOR ; 38
+ tilecoll WALL, WALL, FLOOR, WALL ; 39
+ tilecoll WALL, WALL, WALL, WALL ; 3a
+ tilecoll WALL, WALL, WALL, FLOOR ; 3b
+ tilecoll WALL, WALL, WALL, WALL ; 3c
+ tilecoll WALL, WALL, FLOOR, WALL ; 3d
+ tilecoll WALL, WALL, FLOOR, WALL ; 3e
+ tilecoll WALL, WALL, WALL, FLOOR ; 3f
+ tilecoll WALL, WALL, FLOOR, WALL ; 40
binary files a/tilesets/battle_tower_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/battle_tower_outside_collision.asm
@@ -1,0 +1,128 @@
+ tilecoll 01, 01, 01, 01 ; 01
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+ tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+ tilecoll WALL, WALL, WALL, WALL ; 06
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
+ tilecoll WALL, WALL, WALL, WALL ; 09
+ tilecoll WALL, WALL, WALL, WALL ; 0a
+ tilecoll WALL, WALL, WALL, WALL ; 0b
+ tilecoll WALL, WALL, WALL, WALL ; 0c
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d
+ tilecoll FLOOR, WALL, WALL, WALL ; 0e
+ tilecoll WALL, WALL, WALL, WALL ; 0f
+ tilecoll WALL, WALL, WALL, WALL ; 10
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 11
+ tilecoll WALL, WALL, FLOOR, WALL ; 12
+ tilecoll WALL, WALL, DOOR, DOOR ; 13
+ tilecoll WALL, WALL, WALL, FLOOR ; 14
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 15
+ tilecoll WALL, WALL, WALL, WALL ; 16
+ tilecoll WALL, WALL, DOOR, WALL ; 17
+ tilecoll WALL, WALL, WALL, WALL ; 18
+ tilecoll WALL, WALL, WALL, WALL ; 19
+ tilecoll WALL, WALL, WALL, WALL ; 1a
+ tilecoll WALL, WALL, WALL, WALL ; 1b
+ tilecoll WALL, WALL, WALL, WALL ; 1c
+ tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 1d
+ tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 1e
+ tilecoll WALL, WALL, WALL, WALL ; 1f
+ tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 20
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 21
+ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 22
+ tilecoll WALL, WALL, WALL, WALL ; 23
+ tilecoll WALL, WALL, WALL, WALL ; 24
+ tilecoll WALL, WALL, WALL, WALL ; 25
+ tilecoll WALL, WALL, WALL, WALL ; 26
+ tilecoll WALL, WALL, WALL, WALL ; 27
+ tilecoll WALL, WALL, WALL, WALL ; 28
+ tilecoll WALL, WALL, WALL, WALL ; 29
+ tilecoll WALL, WALL, WALL, WALL ; 2a
+ tilecoll WALL, WALL, WALL, WALL ; 2b
+ tilecoll WALL, WALL, WALL, WALL ; 2c
+ tilecoll WALL, WALL, WALL, WALL ; 2d
+ tilecoll WALL, FLOOR, WALL, WALL ; 2e
+ tilecoll WALL, WALL, WALL, WALL ; 2f
+ tilecoll WALL, FLOOR, WALL, WALL ; 30
+ tilecoll WALL, WALL, WALL, WALL ; 31
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 32
+ tilecoll WALL, HEADBUTT_TREE, WALL, HEADBUTT_TREE ; 33
+ tilecoll WALL, WALL, WALL, WALL ; 34
+ tilecoll WHIRLPOOL, FLOOR, WHIRLPOOL, FLOOR ; 35
+ tilecoll WHIRLPOOL, FLOOR, FLOOR, FLOOR ; 36
+ tilecoll 5B, FLOOR, FLOOR, FLOOR ; 37
+ tilecoll 5B, 01, FLOOR, FLOOR ; 38
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 41
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 42
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 43
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 44
+ tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 45
+ tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 46
+ tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 47
+ tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 48
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 50
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 51
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 52
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 53
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 54
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 55
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 56
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 57
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 58
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 59
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 60
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 61
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 62
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 63
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 64
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 65
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 66
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 67
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 68
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 69
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 70
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 73
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 74
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 75
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 76
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 77
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 78
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 79
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80
binary files a/tilesets/battle_tower_outside_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/beta_word_room_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 01
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
+ tilecoll WALL, WALL, WALL, FLOOR ; 15
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 16
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 17
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 19
+ tilecoll WALL, WALL, FLOOR, WALL ; 1a
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
+ tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d
+ tilecoll WALL, WALL, WALL, WALL ; 1e
+ tilecoll WALL, WALL, WALL, WALL ; 1f
+ tilecoll WALL, WALL, WALL, WALL ; 20
+ tilecoll WALL, WALL, WALL, WALL ; 21
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
binary files a/tilesets/beta_word_room_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/cave_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 01
+ tilecoll WALL, WALL, WALL, WALL ; 02
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+ tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
+ tilecoll WALL, UP_WALL, WALL, FLOOR ; 05
+ tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06
+ tilecoll UP_WALL, WALL, FLOOR, WALL ; 07
+ tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 09
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
+ tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c
+ tilecoll WALL, FLOOR, WALL, WALL ; 0d
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
+ tilecoll FLOOR, WALL, WALL, WALL ; 0f
+ tilecoll WATER, WATER, WATER, WATER ; 10
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11
+ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12
+ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13
+ tilecoll FLOOR, FLOOR, WALL, CAVE ; 14
+ tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15
+ tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16
+ tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17
+ tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18
+ tilecoll WALL, WALL, WALL, FLOOR ; 19
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 1a
+ tilecoll WALL, WALL, FLOOR, WALL ; 1b
+ tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
+ tilecoll WALL, WALL, WALL, WALL ; 1e
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 1f
+ tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20
+ tilecoll WALL, FLOOR, WALL, WALL ; 21
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 22
+ tilecoll FLOOR, WALL, WALL, WALL ; 23
+ tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24
+ tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25
+ tilecoll WATER, WATER, WATER, WATER ; 26
+ tilecoll WATER, WATER, WATER, WATER ; 27
+ tilecoll WATER, WATER, WATER, WATER ; 28
+ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29
+ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a
+ tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c
+ tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d
+ tilecoll WALL, WALL, WALL, WALL ; 2e
+ tilecoll WALL, WALL, WALL, WALL ; 2f
+ tilecoll WALL, WALL, WALL, WALL ; 30
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31
+ tilecoll WALL, WALL, WALL, WALL ; 32
+ tilecoll WATER, WATER, WATER, WATER ; 33
+ tilecoll WATER, WATER, WATER, WATER ; 34
+ tilecoll WALL, WALL, WALL, WALL ; 35
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 36
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 37
+ tilecoll WALL, WALL, WALL, CAVE ; 38
+ tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39
+ tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a
+ tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b
+ tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c
+ tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d
+ tilecoll WATER, WATER, WATER, WATER ; 3e
+ tilecoll WATER, WATER, WATER, WATER ; 3f
+ tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40
binary files a/tilesets/cave_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/celadon_mansion_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 01
+ tilecoll WALL, WALL, WALL, WALL ; 02
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 05
+ tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06
+ tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 07
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 08
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 09
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 0a
+ tilecoll WALL, WALL, FLOOR, WALL ; 0b
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 0c
+ tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d
+ tilecoll WALL, WALL, FLOOR, WALL ; 0e
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0f
+ tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 10
+ tilecoll WALL, WALL, WALL, WALL ; 11
+ tilecoll WALL, WALL, BOOKSHELF, WALL ; 12
+ tilecoll WALL, WALL, WALL, WALL ; 13
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 15
+ tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 16
+ tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 17
+ tilecoll WALL, DOOR, FLOOR, FLOOR ; 18
+ tilecoll WALL, WALL, BOOKSHELF, WALL ; 19
+ tilecoll WALL, WALL, WALL, WALL ; 1a
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 1e
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 1f
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 20
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 21
+ tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 22
+ tilecoll WALL, WALL, FLOOR, WALL ; 23
+ tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 24
+ tilecoll WALL, WALL, WALL, STAIRCASE ; 25
+ tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 26
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 27
+ tilecoll WALL, WALL, DOOR, WALL ; 28
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 29
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 2a
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 2b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
+ tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2d
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
+ tilecoll WALL, WALL, WALL, FLOOR ; 30
+ tilecoll WALL, WALL, FLOOR, WALL ; 31
+ tilecoll WALL, WALL, FLOOR, WALL ; 32
+ tilecoll WALL, WALL, WALL, WALL ; 33
+ tilecoll WALL, WALL, WALL, FLOOR ; 34
+ tilecoll WALL, WALL, WALL, WALL ; 35
+ tilecoll FLOOR, WALL, WALL, WALL ; 36
+ tilecoll WALL, WALL, FLOOR, WALL ; 37
+ tilecoll WALL, FLOOR, WALL, WALL ; 38
+ tilecoll WALL, WALL, FLOOR, WALL ; 39
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 3a
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 3b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
+ tilecoll WALL, FLOOR, WALL, WALL ; 3e
+ tilecoll FLOOR, WALL, WALL, WALL ; 3f
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 40
binary files a/tilesets/celadon_mansion_collision.bin /dev/null differ
--- a/tilesets/collision.asm
+++ /dev/null
@@ -1,262 +1,0 @@
-NONTALKABLE EQUS "db"
-TALKABLE EQUS "db TALK +"
-
-TileCollisionTable:: ; 4ce1f
-; entries correspond to collision ids
- NONTALKABLE LANDTILE ; 00
- NONTALKABLE LANDTILE ; 01
- NONTALKABLE LANDTILE ; 02
- NONTALKABLE LANDTILE ; 03
- NONTALKABLE LANDTILE ; 04
- NONTALKABLE LANDTILE ; 05
- NONTALKABLE LANDTILE ; 06
- NONTALKABLE WALLTILE ; 07
- NONTALKABLE LANDTILE ; 08
- NONTALKABLE LANDTILE ; 09
- NONTALKABLE LANDTILE ; 0a
- NONTALKABLE LANDTILE ; 0b
- NONTALKABLE LANDTILE ; 0c
- NONTALKABLE LANDTILE ; 0d
- NONTALKABLE LANDTILE ; 0e
- NONTALKABLE WALLTILE ; 0f
- NONTALKABLE LANDTILE ; 10
- NONTALKABLE LANDTILE ; 11
- TALKABLE WALLTILE ; 12
- NONTALKABLE LANDTILE ; 13
- NONTALKABLE LANDTILE ; 14
- TALKABLE WALLTILE ; 15
- NONTALKABLE LANDTILE ; 16
- NONTALKABLE LANDTILE ; 17
- NONTALKABLE LANDTILE ; 18
- NONTALKABLE LANDTILE ; 19
- TALKABLE WALLTILE ; 1a
- NONTALKABLE LANDTILE ; 1b
- NONTALKABLE LANDTILE ; 1c
- TALKABLE WALLTILE ; 1d
- NONTALKABLE LANDTILE ; 1e
- NONTALKABLE LANDTILE ; 1f
- NONTALKABLE WATERTILE ; 20
- NONTALKABLE WATERTILE ; 21
- TALKABLE WATERTILE ; 22
- NONTALKABLE LANDTILE ; 23
- TALKABLE WATERTILE ; 24
- NONTALKABLE WATERTILE ; 25
- NONTALKABLE WATERTILE ; 26
- NONTALKABLE WALLTILE ; 27
- NONTALKABLE WATERTILE ; 28
- NONTALKABLE WATERTILE ; 29
- TALKABLE WATERTILE ; 2a
- NONTALKABLE LANDTILE ; 2b
- TALKABLE WATERTILE ; 2c
- NONTALKABLE WATERTILE ; 2d
- NONTALKABLE WATERTILE ; 2e
- NONTALKABLE WALLTILE ; 2f
- NONTALKABLE WATERTILE ; 30
- NONTALKABLE WATERTILE ; 31
- NONTALKABLE WATERTILE ; 32
- NONTALKABLE WATERTILE ; 33
- NONTALKABLE WATERTILE ; 34
- NONTALKABLE WATERTILE ; 35
- NONTALKABLE WATERTILE ; 36
- NONTALKABLE WATERTILE ; 37
- NONTALKABLE WATERTILE ; 38
- NONTALKABLE WATERTILE ; 39
- NONTALKABLE WATERTILE ; 3a
- NONTALKABLE WATERTILE ; 3b
- NONTALKABLE WATERTILE ; 3c
- NONTALKABLE WATERTILE ; 3d
- NONTALKABLE WATERTILE ; 3e
- NONTALKABLE WATERTILE ; 3f
- NONTALKABLE LANDTILE ; 40
- NONTALKABLE LANDTILE ; 41
- NONTALKABLE LANDTILE ; 42
- NONTALKABLE LANDTILE ; 43
- NONTALKABLE LANDTILE ; 44
- NONTALKABLE LANDTILE ; 45
- NONTALKABLE LANDTILE ; 46
- NONTALKABLE LANDTILE ; 47
- NONTALKABLE LANDTILE ; 48
- NONTALKABLE LANDTILE ; 49
- NONTALKABLE LANDTILE ; 4a
- NONTALKABLE LANDTILE ; 4b
- NONTALKABLE LANDTILE ; 4c
- NONTALKABLE LANDTILE ; 4d
- NONTALKABLE LANDTILE ; 4e
- NONTALKABLE LANDTILE ; 4f
- NONTALKABLE LANDTILE ; 50
- NONTALKABLE LANDTILE ; 51
- NONTALKABLE LANDTILE ; 52
- NONTALKABLE LANDTILE ; 53
- NONTALKABLE LANDTILE ; 54
- NONTALKABLE LANDTILE ; 55
- NONTALKABLE LANDTILE ; 56
- NONTALKABLE LANDTILE ; 57
- NONTALKABLE LANDTILE ; 58
- NONTALKABLE LANDTILE ; 59
- NONTALKABLE LANDTILE ; 5a
- NONTALKABLE LANDTILE ; 5b
- NONTALKABLE LANDTILE ; 5c
- NONTALKABLE LANDTILE ; 5d
- NONTALKABLE LANDTILE ; 5e
- NONTALKABLE LANDTILE ; 5f
- NONTALKABLE LANDTILE ; 60
- NONTALKABLE LANDTILE ; 61
- NONTALKABLE WALLTILE ; 62
- NONTALKABLE LANDTILE ; 63
- NONTALKABLE LANDTILE ; 64
- NONTALKABLE LANDTILE ; 65
- NONTALKABLE LANDTILE ; 66
- NONTALKABLE LANDTILE ; 67
- NONTALKABLE LANDTILE ; 68
- NONTALKABLE LANDTILE ; 69
- NONTALKABLE WALLTILE ; 6a
- NONTALKABLE LANDTILE ; 6b
- NONTALKABLE LANDTILE ; 6c
- NONTALKABLE LANDTILE ; 6d
- NONTALKABLE LANDTILE ; 6e
- NONTALKABLE LANDTILE ; 6f
- NONTALKABLE LANDTILE ; 70
- NONTALKABLE LANDTILE ; 71
- NONTALKABLE LANDTILE ; 72
- NONTALKABLE LANDTILE ; 73
- NONTALKABLE LANDTILE ; 74
- NONTALKABLE LANDTILE ; 75
- NONTALKABLE LANDTILE ; 76
- NONTALKABLE LANDTILE ; 77
- NONTALKABLE LANDTILE ; 78
- NONTALKABLE LANDTILE ; 79
- NONTALKABLE LANDTILE ; 7a
- NONTALKABLE LANDTILE ; 7b
- NONTALKABLE LANDTILE ; 7c
- NONTALKABLE LANDTILE ; 7d
- NONTALKABLE LANDTILE ; 7e
- NONTALKABLE LANDTILE ; 7f
- NONTALKABLE WALLTILE ; 80
- NONTALKABLE WALLTILE ; 81
- NONTALKABLE WALLTILE ; 82
- NONTALKABLE WALLTILE ; 83
- NONTALKABLE WALLTILE ; 84
- NONTALKABLE LANDTILE ; 85
- NONTALKABLE LANDTILE ; 86
- NONTALKABLE LANDTILE ; 87
- NONTALKABLE WALLTILE ; 88
- NONTALKABLE WALLTILE ; 89
- NONTALKABLE WALLTILE ; 8a
- NONTALKABLE WALLTILE ; 8b
- NONTALKABLE WALLTILE ; 8c
- NONTALKABLE LANDTILE ; 8d
- NONTALKABLE LANDTILE ; 8e
- NONTALKABLE LANDTILE ; 8f
- NONTALKABLE WALLTILE ; 90
- NONTALKABLE WALLTILE ; 91
- NONTALKABLE WALLTILE ; 92
- NONTALKABLE WALLTILE ; 93
- NONTALKABLE WALLTILE ; 94
- NONTALKABLE WALLTILE ; 95
- NONTALKABLE WALLTILE ; 96
- NONTALKABLE WALLTILE ; 97
- NONTALKABLE WALLTILE ; 98
- NONTALKABLE WALLTILE ; 99
- NONTALKABLE WALLTILE ; 9a
- NONTALKABLE WALLTILE ; 9b
- NONTALKABLE WALLTILE ; 9c
- NONTALKABLE WALLTILE ; 9d
- NONTALKABLE WALLTILE ; 9e
- NONTALKABLE WALLTILE ; 9f
- NONTALKABLE LANDTILE ; a0
- NONTALKABLE LANDTILE ; a1
- NONTALKABLE LANDTILE ; a2
- NONTALKABLE LANDTILE ; a3
- NONTALKABLE LANDTILE ; a4
- NONTALKABLE LANDTILE ; a5
- NONTALKABLE LANDTILE ; a6
- NONTALKABLE LANDTILE ; a7
- NONTALKABLE LANDTILE ; a8
- NONTALKABLE LANDTILE ; a9
- NONTALKABLE LANDTILE ; aa
- NONTALKABLE LANDTILE ; ab
- NONTALKABLE LANDTILE ; ac
- NONTALKABLE LANDTILE ; ad
- NONTALKABLE LANDTILE ; ae
- NONTALKABLE LANDTILE ; af
- NONTALKABLE LANDTILE ; b0
- NONTALKABLE LANDTILE ; b1
- NONTALKABLE LANDTILE ; b2
- NONTALKABLE LANDTILE ; b3
- NONTALKABLE LANDTILE ; b4
- NONTALKABLE LANDTILE ; b5
- NONTALKABLE LANDTILE ; b6
- NONTALKABLE LANDTILE ; b7
- NONTALKABLE LANDTILE ; b8
- NONTALKABLE LANDTILE ; b9
- NONTALKABLE LANDTILE ; ba
- NONTALKABLE LANDTILE ; bb
- NONTALKABLE LANDTILE ; bc
- NONTALKABLE LANDTILE ; bd
- NONTALKABLE LANDTILE ; be
- NONTALKABLE LANDTILE ; bf
- NONTALKABLE WATERTILE ; c0
- NONTALKABLE WATERTILE ; c1
- NONTALKABLE WATERTILE ; c2
- NONTALKABLE WATERTILE ; c3
- NONTALKABLE WATERTILE ; c4
- NONTALKABLE WATERTILE ; c5
- NONTALKABLE WATERTILE ; c6
- NONTALKABLE WATERTILE ; c7
- NONTALKABLE WATERTILE ; c8
- NONTALKABLE WATERTILE ; c9
- NONTALKABLE WATERTILE ; ca
- NONTALKABLE WATERTILE ; cb
- NONTALKABLE WATERTILE ; cc
- NONTALKABLE WATERTILE ; cd
- NONTALKABLE WATERTILE ; ce
- NONTALKABLE WATERTILE ; cf
- NONTALKABLE LANDTILE ; d0
- NONTALKABLE LANDTILE ; d1
- NONTALKABLE LANDTILE ; d2
- NONTALKABLE LANDTILE ; d3
- NONTALKABLE LANDTILE ; d4
- NONTALKABLE LANDTILE ; d5
- NONTALKABLE LANDTILE ; d6
- NONTALKABLE LANDTILE ; d7
- NONTALKABLE LANDTILE ; d8
- NONTALKABLE LANDTILE ; d9
- NONTALKABLE LANDTILE ; da
- NONTALKABLE LANDTILE ; db
- NONTALKABLE LANDTILE ; dc
- NONTALKABLE LANDTILE ; dd
- NONTALKABLE LANDTILE ; de
- NONTALKABLE LANDTILE ; df
- NONTALKABLE LANDTILE ; e0
- NONTALKABLE LANDTILE ; e1
- NONTALKABLE LANDTILE ; e2
- NONTALKABLE LANDTILE ; e3
- NONTALKABLE LANDTILE ; e4
- NONTALKABLE LANDTILE ; e5
- NONTALKABLE LANDTILE ; e6
- NONTALKABLE LANDTILE ; e7
- NONTALKABLE LANDTILE ; e8
- NONTALKABLE LANDTILE ; e9
- NONTALKABLE LANDTILE ; ea
- NONTALKABLE LANDTILE ; eb
- NONTALKABLE LANDTILE ; ec
- NONTALKABLE LANDTILE ; ed
- NONTALKABLE LANDTILE ; ee
- NONTALKABLE LANDTILE ; ef
- NONTALKABLE LANDTILE ; f0
- NONTALKABLE LANDTILE ; f1
- NONTALKABLE LANDTILE ; f2
- NONTALKABLE LANDTILE ; f3
- NONTALKABLE LANDTILE ; f4
- NONTALKABLE LANDTILE ; f5
- NONTALKABLE LANDTILE ; f6
- NONTALKABLE LANDTILE ; f7
- NONTALKABLE LANDTILE ; f8
- NONTALKABLE LANDTILE ; f9
- NONTALKABLE LANDTILE ; fa
- NONTALKABLE LANDTILE ; fb
- NONTALKABLE LANDTILE ; fc
- NONTALKABLE LANDTILE ; fd
- NONTALKABLE LANDTILE ; fe
- NONTALKABLE WALLTILE ; ff
-; 4cf1f
--- a/tilesets/data.asm
+++ b/tilesets/data.asm
@@ -14,7 +14,7 @@
; 0x18e06
TilesetKantoColl: ; 0x18e06
-INCBIN "tilesets/kanto_collision.bin"
+INCLUDE "tilesets/kanto_collision.asm"
; 0x19006
Tileset0GFX: ; 0x19006
@@ -29,7 +29,7 @@
Tileset0Coll: ; 0x1a40e
TilesetJohto1Coll: ; 0x1a40e
-INCBIN "tilesets/johto_1_collision.bin"
+INCLUDE "tilesets/johto_1_collision.asm"
; 0x1a60e
TilesetIcePathGFX: ; 0x1a60e
@@ -41,7 +41,7 @@
; 0x1b33e
TilesetIcePathColl: ; 0x1b33e
-INCBIN "tilesets/ice_path_collision.bin"
+INCLUDE "tilesets/ice_path_collision.asm"
; 0x1b43e
TilesetPlayersHouse2FGFX: ; 0x1b43e
@@ -53,7 +53,7 @@
; 0x1bcfe
TilesetPlayersHouse2FColl: ; 0x1bcfe
-INCBIN "tilesets/players_house_2f_collision.bin"
+INCLUDE "tilesets/players_house_2f_collision.asm"
; 0x1bdfe
@@ -68,7 +68,7 @@
; 0x1cb3c
TilesetPokecenterColl: ; 0x1cb3c
-INCBIN "tilesets/pokecenter_collision.bin"
+INCLUDE "tilesets/pokecenter_collision.asm"
; 0x1cc3c
TilesetPortGFX: ; 0x1cc3c
@@ -80,7 +80,7 @@
; 0x1d44c
TilesetPortColl: ; 0x1d44c
-INCBIN "tilesets/port_collision.bin"
+INCLUDE "tilesets/port_collision.asm"
; 0x1d54c
TilesetPlayersHouseGFX: ; 0x1d54c
@@ -92,7 +92,7 @@
; 0x1dd2c
TilesetPlayersHouseColl: ; 0x1dd2c
-INCBIN "tilesets/players_house_collision.bin"
+INCLUDE "tilesets/players_house_collision.asm"
; 0x1de2c
TilesetCeladonMansionGFX: ; 0x1de2c
@@ -104,7 +104,7 @@
; 0x1e98c
TilesetCeladonMansionColl: ; 0x1e98c
-INCBIN "tilesets/celadon_mansion_collision.bin"
+INCLUDE "tilesets/celadon_mansion_collision.asm"
; 0x1ea8c
TilesetCaveGFX: ; 0x1ea8c
@@ -118,7 +118,7 @@
TilesetCaveColl: ; 0x1f21c
TilesetWhirlIslandsColl: ; 0x1f21c
-INCBIN "tilesets/cave_collision.bin"
+INCLUDE "tilesets/cave_collision.asm"
; 0x1f31c
@@ -133,7 +133,7 @@
; 0x20ae1
TilesetSproutTowerColl: ; 0x20ae1
-INCBIN "tilesets/sprout_tower_collision.bin"
+INCLUDE "tilesets/sprout_tower_collision.asm"
; 0x20be1
TilesetLabGFX: ; 0x20be1
@@ -145,7 +145,7 @@
; 0x217e1
TilesetLabColl: ; 0x217e1
-INCBIN "tilesets/lab_collision.bin"
+INCLUDE "tilesets/lab_collision.asm"
; 0x218e1
TilesetMartGFX: ; 0x218e1
@@ -157,7 +157,7 @@
; 0x22431
TilesetMartColl: ; 0x22431
-INCBIN "tilesets/mart_collision.bin"
+INCLUDE "tilesets/mart_collision.asm"
; 0x22531
TilesetGameCornerGFX: ; 0x22531
@@ -169,7 +169,7 @@
; 0x22ef1
TilesetGameCornerColl: ; 0x22ef1
-INCBIN "tilesets/game_corner_collision.bin"
+INCLUDE "tilesets/game_corner_collision.asm"
; 0x22ff1
TilesetTrainStationGFX: ; 0x22ff1
@@ -181,7 +181,7 @@
; 0x23791
TilesetTrainStationColl: ; 0x23791
-INCBIN "tilesets/train_station_collision.bin"
+INCLUDE "tilesets/train_station_collision.asm"
; 0x23891
TilesetIlexForestMeta: ; 0x23891
@@ -200,7 +200,7 @@
; 0x308e0
TilesetGym1Coll: ; 0x308e0
-INCBIN "tilesets/gym_1_collision.bin"
+INCLUDE "tilesets/gym_1_collision.asm"
; 0x309e0
TilesetParkGFX: ; 0x309e0
@@ -212,7 +212,7 @@
; 0x31280
TilesetParkColl: ; 0x31280
-INCBIN "tilesets/park_collision.bin"
+INCLUDE "tilesets/park_collision.asm"
; 0x31380
TilesetRadioTowerGFX: ; 0x31380
@@ -224,7 +224,7 @@
; 0x31ce0
TilesetRadioTowerColl: ; 0x31ce0
-INCBIN "tilesets/radio_tower_collision.bin"
+INCLUDE "tilesets/radio_tower_collision.asm"
; 0x31de0
TilesetUndergroundGFX: ; 0x31de0
@@ -236,7 +236,7 @@
; 0x325b0
TilesetUndergroundColl: ; 0x325b0
-INCBIN "tilesets/underground_collision.bin"
+INCLUDE "tilesets/underground_collision.asm"
; 0x326b0
TilesetWhirlIslandsGFX: ; 0x326b0
@@ -248,7 +248,7 @@
; 0x331f0
UnusedTilesetWhirlIslandsColl: ; 0x331f0
-INCBIN "tilesets/unused_whirl_islands_collision.bin"
+INCLUDE "tilesets/unused_whirl_islands_collision.asm"
; 0x333f0
@@ -263,7 +263,7 @@
; 0xb4ca0
TilesetPokeComCenterColl: ; 0xb4ca0
-INCBIN "tilesets/pokecom_center_collision.bin"
+INCLUDE "tilesets/pokecom_center_collision.asm"
; 0xb4da0
TilesetBattleTowerGFX: ; 0xb4da0
@@ -275,7 +275,7 @@
; 0xb54e0
TilesetBattleTowerColl: ; 0xb54e0
-INCBIN "tilesets/battle_tower_collision.bin"
+INCLUDE "tilesets/battle_tower_collision.asm"
; 0xb55e0
TilesetGateGFX: ; 0xb55e0
@@ -287,7 +287,7 @@
; 0xb5de0
TilesetGateColl: ; 0xb5de0
-INCBIN "tilesets/gate_collision.bin"
+INCLUDE "tilesets/gate_collision.asm"
; 0xb5ee0
TilesetJohto2GFX: ; 0xb5ee0
@@ -300,7 +300,7 @@
; 0xb72e8
TilesetJohto2Coll: ; 0xb72e8
-INCBIN "tilesets/johto_2_collision.bin"
+INCLUDE "tilesets/johto_2_collision.asm"
; 0xb74e8
TilesetKurtsHouseGFX: ; 0xb74e8
@@ -312,7 +312,7 @@
; 0xb7da8
TilesetKurtsHouseColl: ; 0xb7da8
-INCBIN "tilesets/kurts_house_collision.bin"
+INCLUDE "tilesets/kurts_house_collision.asm"
; 0xb7ea8
@@ -331,7 +331,7 @@
; 0xdd050
TilesetOlivineGymColl: ; 0xdd050
-INCBIN "tilesets/olivine_gym_collision.bin"
+INCLUDE "tilesets/olivine_gym_collision.asm"
; 0xdd150
TilesetHouse1GFX: ; 0xdd150
@@ -343,7 +343,7 @@
; 0xdda00
TilesetHouse1Coll: ; 0xdda00
-INCBIN "tilesets/house_1_collision.bin"
+INCLUDE "tilesets/house_1_collision.asm"
; 0xddb00
TilesetLighthouseGFX: ; 0xddb00
@@ -355,11 +355,11 @@
; 0xde370
TilesetLighthouseColl: ; 0xde370
-INCBIN "tilesets/lighthouse_collision.bin"
+INCLUDE "tilesets/lighthouse_collision.asm"
; 0xde470
TilesetIlexForestColl: ; 0xde470
-INCBIN "tilesets/ilex_forest_collision.bin"
+INCLUDE "tilesets/ilex_forest_collision.asm"
; 0xde570
TilesetPowerPlantGFX: ; 0xde570
@@ -371,7 +371,7 @@
; 0xded90
TilesetPowerPlantColl: ; 0xded90
-INCBIN "tilesets/power_plant_collision.bin"
+INCLUDE "tilesets/power_plant_collision.asm"
; 0xdee90
TilesetBattleTowerOutsideMeta: ; 0xdee90
@@ -379,7 +379,7 @@
; 0xdf690
TilesetBattleTowerOutsideColl: ; 0xdf690
-INCBIN "tilesets/battle_tower_outside_collision.bin"
+INCLUDE "tilesets/battle_tower_outside_collision.asm"
; 0xdf890
TilesetBetaWordRoomMeta: ; 0xdf890
@@ -391,7 +391,7 @@
TilesetKabutoWordRoomColl: ; 0xdfc90
TilesetOmanyteWordRoomColl: ; 0xdfc90
TilesetAerodactylWordRoomColl: ; 0xdfc90
-INCBIN "tilesets/beta_word_room_collision.bin"
+INCLUDE "tilesets/beta_word_room_collision.asm"
; 0xdfd90
@@ -411,7 +411,7 @@
; 0x1dd5a9
TilesetRuinsOfAlphColl: ; 0x1dd5a9
-INCBIN "tilesets/ruins_of_alph_collision.bin"
+INCLUDE "tilesets/ruins_of_alph_collision.asm"
; 0x1dd6a9
--- /dev/null
+++ b/tilesets/game_corner_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 01
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 03
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 05
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+ tilecoll COUNTER, COUNTER, COUNTER, COUNTER ; 08
+ tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 09
+ tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0a
+ tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b
+ tilecoll WALL, WALL, WALL, WALL ; 0c
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 0e
+ tilecoll WALL, WALL, WALL, WALL ; 0f
+ tilecoll WALL, WALL, WALL, WALL ; 10
+ tilecoll WALL, WALL, COUNTER, COUNTER ; 11
+ tilecoll WALL, WALL, COUNTER, COUNTER ; 12
+ tilecoll WALL, WALL, WALL, WALL ; 13
+ tilecoll WALL, WALL, COUNTER, FLOOR ; 14
+ tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 15
+ tilecoll WALL, WALL, WALL, WALL ; 16
+ tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 17
+ tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 18
+ tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 19
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b
+ tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 1c
+ tilecoll WALL, WALL, FLOOR, COUNTER ; 1d
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 1e
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 1f
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 20
+ tilecoll WALL, WALL, WALL, WALL ; 21
+ tilecoll WALL, WALL, WALL, WALL ; 22
+ tilecoll WALL, WALL, WALL, WALL ; 23
+ tilecoll WALL, WALL, WALL, WALL ; 24
+ tilecoll WALL, WALL, WALL, WALL ; 25
+ tilecoll WALL, WALL, WALL, WALL ; 26
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 27
+ tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 28
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 29
+ tilecoll WALL, WALL, FLOOR, WALL ; 2a
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 2b
+ tilecoll WALL, WALL, FLOOR, WALL ; 2c
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 2d
+ tilecoll WALL, WALL, WALL, WALL ; 2e
+ tilecoll WALL, WALL, WALL, WALL ; 2f
+ tilecoll WALL, WALL, FLOOR, WALL ; 30
+ tilecoll WALL, WALL, WALL, FLOOR ; 31
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
binary files a/tilesets/game_corner_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/gate_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 03
+ tilecoll WALL, WALL, WALL, WALL ; 04
+ tilecoll DOOR, DOOR, FLOOR, FLOOR ; 05
+ tilecoll WALL, WALL, WALL, WALL ; 06
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 07
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 08
+ tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 09
+ tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 0a
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b
+ tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0c
+ tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0d
+ tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0e
+ tilecoll WALL, WALL, COUNTER, FLOOR ; 0f
+ tilecoll WALL, WALL, FLOOR, COUNTER ; 10
+ tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 11
+ tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 12
+ tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 13
+ tilecoll WALL, WALL, FLOOR, COUNTER ; 14
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15
+ tilecoll WALL, WALL, WALL, WALL ; 16
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 17
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 1a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
+ tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 22
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
+ tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 24
+ tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25
+ tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 26
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 27
+ tilecoll WALL, WALL, WALL, WALL ; 28
+ tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 29
+ tilecoll WALL, DOOR, FLOOR, FLOOR ; 2a
+ tilecoll DOOR, WALL, FLOOR, FLOOR ; 2b
+ tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2c
+ tilecoll WALL, WALL, FLOOR, PC ; 2d
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
+ tilecoll DOOR, WALL, FLOOR, FLOOR ; 2f
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 30
+ tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 31
+ tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 32
+ tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 33
+ tilecoll COUNTER, FLOOR, FLOOR, WALL ; 34
+ tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 35
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 39
+ tilecoll WALL, WALL, WALL, WALL ; 3a
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 3b
+ tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 3c
+ tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 3d
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 3e
+ tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 3f
+ tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 40
binary files a/tilesets/gate_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/gym_1_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 01
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 04
+ tilecoll WALL, WALL, WALL, FLOOR ; 05
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 06
+ tilecoll WALL, WALL, FLOOR, WALL ; 07
+ tilecoll WALL, WALL, WALL, WALL ; 08
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 09
+ tilecoll FLOOR, FLOOR, PIT, FLOOR ; 0a
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
+ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0c
+ tilecoll WALL, FLOOR, WALL, WALL ; 0d
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
+ tilecoll FLOOR, WALL, WALL, WALL ; 0f
+ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 11
+ tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14
+ tilecoll WALL, WALL, WALL, WALL ; 15
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 16
+ tilecoll LADDER, LADDER, FLOOR, FLOOR ; 17
+ tilecoll WALL, WALL, WALL, WALL ; 18
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 19
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 1a
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
+ tilecoll WALL, FLOOR, WALL, WALL ; 1c
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1d
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 1e
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 1f
+ tilecoll WALL, WALL, WALL, WALL ; 20
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 21
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 22
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 23
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 24
+ tilecoll WALL, WALL, WALL, WALL ; 25
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 26
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 27
+ tilecoll WALL, WALL, WALL, WALL ; 28
+ tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 29
+ tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 2a
+ tilecoll WALL, WALL, WALL, WALL ; 2b
+ tilecoll WALL, WALL, WALL, WALL ; 2c
+ tilecoll WALL, WALL, WALL, WALL ; 2d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
+ tilecoll ICE, ICE, ICE, FLOOR ; 2f
+ tilecoll ICE, ICE, FLOOR, ICE ; 30
+ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 31
+ tilecoll FLOOR, ICE, ICE, ICE ; 32
+ tilecoll ICE, FLOOR, ICE, ICE ; 33
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 34
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 35
+ tilecoll ICE, WALL, ICE, WALL ; 36
+ tilecoll WALL, ICE, WALL, ICE ; 37
+ tilecoll WALL, WALL, WALL, WALL ; 38
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
+ tilecoll ICE, ICE, ICE, ICE ; 3a
+ tilecoll WALL, FLOOR, FLOOR, WALL ; 3b
+ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c
+ tilecoll DOOR, DOOR, FLOOR, FLOOR ; 3d
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 3e
+ tilecoll WALL, WALL, WALL, WALL ; 3f
+ tilecoll WALL, WALL, WALL, WALL ; 40
binary files a/tilesets/gym_1_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/ho_oh_word_room_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 01
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
+ tilecoll WALL, WALL, WALL, FLOOR ; 15
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 16
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 17
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 19
+ tilecoll WALL, WALL, FLOOR, WALL ; 1a
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
+ tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d
+ tilecoll WALL, WALL, WALL, WALL ; 1e
+ tilecoll WALL, WALL, WALL, WALL ; 1f
+ tilecoll WALL, WALL, WALL, WALL ; 20
+ tilecoll WALL, WALL, WALL, WALL ; 21
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
binary files a/tilesets/ho_oh_word_room_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/house_1_collision.asm
@@ -1,0 +1,64 @@
+ 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 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 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 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 FLOOR, FLOOR, FLOOR, FLOOR ; 34
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
binary files a/tilesets/house_1_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/ice_path_collision.asm
@@ -1,0 +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, 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, 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
binary files a/tilesets/ice_path_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/ilex_forest_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 01
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 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 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 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, 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, WALL ; 26
+ tilecoll WALL, WALL, WALL, WALL ; 27
+ tilecoll WALL, WALL, WALL, WALL ; 28
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 29
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 2a
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 2b
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 2c
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 2d
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 2e
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 2f
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 30
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 31
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 32
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 33
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 34
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 35
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 36
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 37
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 38
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 39
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 3a
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 3b
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 3c
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 3d
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 3e
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 3f
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 40
binary files a/tilesets/ilex_forest_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/johto_1_collision.asm
@@ -1,0 +1,128 @@
+ tilecoll 01, 01, 01, 01 ; 01
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+ tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+ tilecoll WALL, WALL, WALL, WALL ; 06
+ tilecoll LADDER, LADDER, LADDER, LADDER ; 07
+ tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 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 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, WALL ; 18
+ tilecoll WALL, WALL, WALL, WALL ; 19
+ tilecoll WALL, WALL, WALL, WALL ; 1a
+ tilecoll WALL, WALL, WALL, DOOR ; 1b
+ tilecoll WALL, WALL, WALL, WALL ; 1c
+ tilecoll WALL, WALL, WALL, WALL ; 1d
+ tilecoll WALL, WALL, DOOR, WALL ; 1e
+ tilecoll WALL, WALL, WALL, WALL ; 1f
+ tilecoll WALL, WALL, WALL, WALL ; 20
+ tilecoll WALL, WALL, WALL, WALL ; 21
+ tilecoll WALL, WALL, WALL, WALL ; 22
+ tilecoll WALL, WALL, WALL, WALL ; 23
+ tilecoll WALL, WALL, WALL, WALL ; 24
+ tilecoll WALL, WALL, WALL, WALL ; 25
+ tilecoll WALL, WALL, WALL, WALL ; 26
+ tilecoll WALL, WALL, WALL, WALL ; 27
+ tilecoll WALL, WALL, 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 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 WATER, WATER, WATER, WATER ; 55
+ tilecoll WATER, WATER, WATER, WATER ; 56
+ tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57
+ tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 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 WATER, WATER, WATER, WATER ; 7a
+ tilecoll WATER, WATER, WATER, WATER ; 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
binary files a/tilesets/johto_1_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/johto_2_collision.asm
@@ -1,0 +1,128 @@
+ 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 FLOOR, FLOOR, FLOOR, FLOOR ; 07
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
+ tilecoll WALL, WALL, WALL, WALL ; 09
+ tilecoll WALL, WALL, WALL, WALL ; 0a
+ tilecoll WALL, WALL, WALL, WALL ; 0b
+ tilecoll 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 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, WALL ; 19
+ tilecoll WALL, WALL, WALL, WALL ; 1a
+ tilecoll WALL, WALL, WALL, DOOR ; 1b
+ tilecoll WALL, WALL, WALL, WALL ; 1c
+ tilecoll WALL, WALL, WALL, WALL ; 1d
+ tilecoll WALL, WALL, DOOR, 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, WALL, WALL ; 26
+ tilecoll WALL, WALL, WALL, WALL ; 27
+ tilecoll WALL, WALL, WALL, WALL ; 28
+ tilecoll WALL, WALL, WALL, WALL ; 29
+ tilecoll WALL, WALL, WALL, WALL ; 2a
+ tilecoll WALL, WALL, WALL, WALL ; 2b
+ tilecoll WALL, WALL, WALL, WALL ; 2c
+ tilecoll WALL, WALL, WALL, WALL ; 2d
+ tilecoll WALL, 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 WATER, WATER, WATER, WATER ; 55
+ tilecoll WATER, WATER, WATER, WATER ; 56
+ tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57
+ tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 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 WALL, FLOOR, FLOOR, FLOOR ; 5e
+ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5f
+ tilecoll WALL, WALL, 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 ; 7a
+ tilecoll WATER, WATER, WATER, WATER ; 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
binary files a/tilesets/johto_2_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/kabuto_word_room_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 01
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
+ tilecoll WALL, WALL, WALL, FLOOR ; 15
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 16
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 17
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 19
+ tilecoll WALL, WALL, FLOOR, WALL ; 1a
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
+ tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d
+ tilecoll WALL, WALL, WALL, WALL ; 1e
+ tilecoll WALL, WALL, WALL, WALL ; 1f
+ tilecoll WALL, WALL, WALL, WALL ; 20
+ tilecoll WALL, WALL, WALL, WALL ; 21
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
binary files a/tilesets/kabuto_word_room_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/kanto_collision.asm
@@ -1,0 +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 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 WATER, WATER, WATER, WATER ; 1e
+ tilecoll WATER, WATER, WATER, WATER ; 1f
+ tilecoll WATER, WATER, WATER, WATER ; 20
+ tilecoll WALL, WALL, WALL, WALL ; 21
+ tilecoll WALL, WALL, WALL, WALL ; 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 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 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 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 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, 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, 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 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 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 ; 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 WALL, WALL, WALL, WALL ; 72
+ tilecoll WALL, WALL, WALL, WALL ; 73
+ tilecoll WALL, WALL, WALL, WALL ; 74
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 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 WALL, WALL, WALL, WALL ; 7e
+ tilecoll WALL, WALL, WALL, WALL ; 7f
+ tilecoll WALL, WALL, WALL, WALL ; 80
binary files a/tilesets/kanto_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/kurts_house_collision.asm
@@ -1,0 +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 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, 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 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 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, 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 WALL, WALL, WALL, WALL ; 32
+ tilecoll WALL, WALL, WALL, WALL ; 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
binary files a/tilesets/kurts_house_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/lab_collision.asm
@@ -1,0 +1,64 @@
+ 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 FLOOR, FLOOR, WALL, WALL ; 07
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 08
+ tilecoll WALL, WALL, WALL, WALL ; 09
+ tilecoll WINDOW, WALL, 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 ; 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, WALL, WALL ; 23
+ tilecoll WALL, WALL, WALL, WALL ; 24
+ tilecoll WALL, WALL, WALL, WALL ; 25
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
+ tilecoll WALL, WALL, WALL, WALL ; 27
+ tilecoll WALL, WALL, WALL, WALL ; 28
+ tilecoll WALL, WALL, WALL, WALL ; 29
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 2b
+ tilecoll WALL, WALL, 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, FLOOR, FLOOR ; 30
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
binary files a/tilesets/lab_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/lighthouse_collision.asm
@@ -1,0 +1,64 @@
+ 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 ; 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 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 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, 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, WALL, WALL, WALL ; 3c
+ tilecoll WALL, WALL, WALL, WALL ; 3d
+ tilecoll WALL, WALL, WINDOW, WALL ; 3e
+ tilecoll WALL, WALL, WALL, WALL ; 3f
+ tilecoll WALL, WALL, WALL, WALL ; 40
binary files a/tilesets/lighthouse_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/mart_collision.asm
@@ -1,0 +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, 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, 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, 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 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
binary files a/tilesets/mart_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/olivine_gym_collision.asm
@@ -1,0 +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 ; 26
+ tilecoll WALL, WALL, WALL, WALL ; 27
+ tilecoll FLOOR, WALL, FLOOR, 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 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 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, WALL, WALL ; 3b
+ tilecoll WALL, WALL, WALL, WALL ; 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
binary files a/tilesets/olivine_gym_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/omanyte_word_room_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 01
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
+ tilecoll WALL, WALL, WALL, FLOOR ; 15
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 16
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 17
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 19
+ tilecoll WALL, WALL, FLOOR, WALL ; 1a
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
+ tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d
+ tilecoll WALL, WALL, WALL, WALL ; 1e
+ tilecoll WALL, WALL, WALL, WALL ; 1f
+ tilecoll WALL, WALL, WALL, WALL ; 20
+ tilecoll WALL, WALL, WALL, WALL ; 21
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
binary files a/tilesets/omanyte_word_room_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/park_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 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 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 ; 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 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, WALL, WALL ; 29
+ tilecoll WALL, WALL, WALL, WALL ; 2a
+ tilecoll WALL, WALL, WALL, WALL ; 2b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 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 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 WALL, WALL, WALL, WALL ; 35
+ tilecoll WALL, WALL, WALL, WALL ; 36
+ tilecoll WALL, WALL, WALL, 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, WALL, WALL ; 3e
+ tilecoll WALL, WALL, WALL, WALL ; 3f
+ tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 40
binary files a/tilesets/park_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/players_house_2f_collision.asm
@@ -1,0 +1,64 @@
+ 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 FLOOR, FLOOR, FLOOR, FLOOR ; 06
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 08
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 09
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 0c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 0f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 12
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 15
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17
+ tilecoll WALL, WALL, 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 ; 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 FLOOR, WALL, FLOOR, FLOOR ; 21
+ tilecoll FLOOR, WALL, FLOOR, FLOOR ; 22
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 23
+ tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 24
+ tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 25
+ tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 26
+ tilecoll FF, FF, FF, FF ; 27
+ tilecoll FF, FF, FF, FF ; 28
+ tilecoll FF, FF, FF, FF ; 29
+ tilecoll FF, FF, FF, FF ; 2a
+ tilecoll FF, FF, FF, FF ; 2b
+ tilecoll FF, FF, FF, FF ; 2c
+ tilecoll FF, FF, FF, FF ; 2d
+ tilecoll FF, FF, FF, FF ; 2e
+ tilecoll FF, FF, FF, FF ; 2f
+ tilecoll FF, FF, FF, FF ; 30
+ tilecoll FF, FF, FF, FF ; 31
+ tilecoll FF, FF, FF, FF ; 32
+ tilecoll FF, FF, FF, FF ; 33
+ tilecoll FF, FF, FF, FF ; 34
+ tilecoll FF, FF, FF, FF ; 35
+ tilecoll FF, FF, FF, FF ; 36
+ tilecoll FF, FF, FF, FF ; 37
+ tilecoll FF, FF, FF, FF ; 38
+ tilecoll FF, FF, FF, FF ; 39
+ tilecoll FF, FF, FF, FF ; 3a
+ tilecoll FF, FF, FF, FF ; 3b
+ tilecoll FF, FF, FF, FF ; 3c
+ tilecoll FF, FF, FF, FF ; 3d
+ tilecoll FF, FF, FF, FF ; 3e
+ tilecoll FF, FF, FF, FF ; 3f
+ tilecoll FF, FF, FF, FF ; 40
binary files a/tilesets/players_house_2f_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/players_house_collision.asm
@@ -1,0 +1,64 @@
+ 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, 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 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, FLOOR, FLOOR ; 29
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
binary files a/tilesets/players_house_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/pokecenter_collision.asm
@@ -1,0 +1,64 @@
+ 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, 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 ; 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 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
binary files a/tilesets/pokecenter_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/pokecom_center_collision.asm
@@ -1,0 +1,64 @@
+ 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, COUNTER, FLOOR, FLOOR ; 0a
+ tilecoll WALL, COUNTER, FLOOR, FLOOR ; 0b
+ tilecoll WALL, WALL, WALL, WALL ; 0c
+ tilecoll WALL, WALL, FLOOR, WALL ; 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, WALL, WALL ; 13
+ tilecoll WALL, WALL, WALL, WALL ; 14
+ tilecoll WALL, WALL, WALL, WALL ; 15
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 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, 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 ; 21
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
+ tilecoll WALL, WALL, WALL, WALL ; 24
+ tilecoll WALL, WALL, WALL, WALL ; 25
+ tilecoll WALL, WALL, WALL, WALL ; 26
+ tilecoll WALL, WALL, WALL, WALL ; 27
+ tilecoll WALL, WALL, WALL, WALL ; 28
+ tilecoll WALL, WALL, WALL, WALL ; 29
+ tilecoll WALL, WALL, WALL, WALL ; 2a
+ tilecoll 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 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 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 WALL, WALL, WALL, WALL ; 3f
+ tilecoll WALL, WALL, WALL, WALL ; 40
binary files a/tilesets/pokecom_center_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/port_collision.asm
@@ -1,0 +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 WATER, FLOOR, WATER, FLOOR ; 14
+ tilecoll WATER, FLOOR, WATER, FLOOR ; 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_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 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 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
binary files a/tilesets/port_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/power_plant_collision.asm
@@ -1,0 +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 WALL, WALL, WALL, WALL ; 13
+ tilecoll WALL, WALL, WALL, WALL ; 14
+ tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 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 ; 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 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 WALL, WALL, FLOOR, FLOOR ; 36
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 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
binary files a/tilesets/power_plant_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/radio_tower_collision.asm
@@ -1,0 +1,64 @@
+ 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 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
binary files a/tilesets/radio_tower_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/ruins_of_alph_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 01
+ tilecoll WALL, WALL, WALL, FLOOR ; 02
+ tilecoll WALL, WALL, FLOOR, WALL ; 03
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+ tilecoll WALL, WALL, WALL, 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 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 WALL, WALL, WALL, WALL ; 25
+ tilecoll WALL, WALL, WALL, WALL ; 26
+ tilecoll WALL, WALL, WALL, WALL ; 27
+ tilecoll WALL, WALL, WALL, WALL ; 28
+ tilecoll WALL, WALL, WALL, WALL ; 29
+ tilecoll WALL, WALL, WALL, WALL ; 2a
+ tilecoll WALL, WALL, WALL, WALL ; 2b
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 2c
+ tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 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, 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
binary files a/tilesets/ruins_of_alph_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/sprout_tower_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 01
+ tilecoll WALL, WALL, WALL, WALL ; 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, 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 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 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 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
binary files a/tilesets/sprout_tower_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/train_station_collision.asm
@@ -1,0 +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 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 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, 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 ; 19
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 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 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 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, 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, WALL, WALL, WALL ; 3d
+ tilecoll WALL, WALL, WALL, WALL ; 3e
+ tilecoll WALL, WALL, WALL, WALL ; 3f
+ tilecoll WALL, WALL, WALL, WALL ; 40
binary files a/tilesets/train_station_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/underground_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 01
+ tilecoll WALL, WALL, WALL, WALL ; 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 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, WALL, FLOOR, FLOOR ; 20
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 21
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 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 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 WALL, WALL, WALL, WALL ; 30
+ tilecoll WALL, WALL, WALL, WALL ; 31
+ tilecoll WALL, WALL, WALL, WALL ; 32
+ 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, 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 FLOOR, FLOOR, FLOOR, FLOOR ; 3f
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
binary files a/tilesets/underground_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/unused_whirl_islands_collision.asm
@@ -1,0 +1,128 @@
+ 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 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 ; 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, 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, WALL ; 1f
+ tilecoll WALL, WALL, WALL, WALL ; 20
+ tilecoll WALL, WALL, WALL, WALL ; 21
+ tilecoll WALL, WALL, WALL, WALL ; 22
+ tilecoll WALL, WALL, WALL, WALL ; 23
+ tilecoll WALL, WALL, WALL, WALL ; 24
+ tilecoll WALL, WALL, WALL, WALL ; 25
+ tilecoll WALL, WALL, WALL, WALL ; 26
+ tilecoll WALL, WALL, WALL, WALL ; 27
+ tilecoll WALL, WALL, WALL, 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 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 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 ; 57
+ tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 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 WALL, WALL, WALL, WALL ; 78
+ tilecoll WALL, WALL, WALL, WALL ; 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 ; 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
binary files a/tilesets/unused_whirl_islands_collision.bin /dev/null differ
--- /dev/null
+++ b/tilesets/whirl_islands_collision.asm
@@ -1,0 +1,64 @@
+ tilecoll WALL, WALL, WALL, WALL ; 01
+ tilecoll WALL, WALL, WALL, WALL ; 02
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+ tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
+ tilecoll WALL, UP_WALL, WALL, FLOOR ; 05
+ tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06
+ tilecoll UP_WALL, WALL, FLOOR, WALL ; 07
+ tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 09
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
+ tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c
+ tilecoll WALL, FLOOR, WALL, WALL ; 0d
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
+ tilecoll FLOOR, WALL, WALL, WALL ; 0f
+ tilecoll WATER, WATER, WATER, WATER ; 10
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11
+ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12
+ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13
+ tilecoll FLOOR, FLOOR, WALL, CAVE ; 14
+ tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15
+ tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16
+ tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17
+ tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18
+ tilecoll WALL, WALL, WALL, FLOOR ; 19
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 1a
+ tilecoll WALL, WALL, FLOOR, WALL ; 1b
+ tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
+ tilecoll WALL, WALL, WALL, WALL ; 1e
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 1f
+ tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20
+ tilecoll WALL, FLOOR, WALL, WALL ; 21
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 22
+ tilecoll FLOOR, WALL, WALL, WALL ; 23
+ tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24
+ tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25
+ tilecoll WATER, WATER, WATER, WATER ; 26
+ tilecoll WATER, WATER, WATER, WATER ; 27
+ tilecoll WATER, WATER, WATER, WATER ; 28
+ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29
+ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a
+ tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c
+ tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d
+ tilecoll WALL, WALL, WALL, WALL ; 2e
+ tilecoll WALL, WALL, WALL, WALL ; 2f
+ tilecoll WALL, WALL, WALL, WALL ; 30
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31
+ tilecoll WALL, WALL, WALL, WALL ; 32
+ tilecoll WATER, WATER, WATER, WATER ; 33
+ tilecoll WATER, WATER, WATER, WATER ; 34
+ tilecoll WALL, WALL, WALL, WALL ; 35
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 36
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 37
+ tilecoll WALL, WALL, WALL, CAVE ; 38
+ tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39
+ tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a
+ tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b
+ tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c
+ tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d
+ tilecoll WATER, WATER, WATER, WATER ; 3e
+ tilecoll WATER, WATER, WATER, WATER ; 3f
+ tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40
binary files a/tilesets/whirl_islands_collision.bin /dev/null differ