pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Define TileCollisionTable as a standard 'db' series

Browse Source
This commit is contained in:
Rangi 2020-02-13 19:01:47 -05:00
parent 53cf08b6b3
commit 88bbdb6a2f
6 changed files with 273 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
constants/collision_constants.asm
View File

@ -1,8 +1,8 @@
; collision permissions (see data/collision_permissions.asm) ; collision permissions (see data/collision_permissions.asm)
LANDTILE EQU $00 LAND_TILE EQU $00
WATERTILE EQU $01 WATER_TILE EQU $01
WALLTILE EQU $0f WALL_TILE EQU $0f
TALK EQU $10 TALK EQU $10
; collision data types (see data/tilesets/*_collision.asm) ; collision data types (see data/tilesets/*_collision.asm)
; TileCollisionTable indexes (see data/collision_permissions.asm) ; TileCollisionTable indexes (see data/collision_permissions.asm)

515
data/collision_permissions.asm
View File

@ -1,261 +1,258 @@
NONTALKABLE EQUS "db"
TALKABLE EQUS "db TALK +"
TileCollisionTable:: TileCollisionTable::
; entries correspond to COLL_* constants ; entries correspond to COLL_* constants
NONTALKABLE LANDTILE ; COLL_FLOOR db LAND_TILE ; COLL_FLOOR
NONTALKABLE LANDTILE ; COLL_01 db LAND_TILE ; COLL_01
NONTALKABLE LANDTILE ; 02 db LAND_TILE ; 02
NONTALKABLE LANDTILE ; COLL_03 db LAND_TILE ; COLL_03
NONTALKABLE LANDTILE ; COLL_04 db LAND_TILE ; COLL_04
NONTALKABLE LANDTILE ; 05 db LAND_TILE ; 05
NONTALKABLE LANDTILE ; 06 db LAND_TILE ; 06
NONTALKABLE WALLTILE ; COLL_WALL db WALL_TILE ; COLL_WALL
NONTALKABLE LANDTILE ; COLL_CUT_08 db LAND_TILE ; COLL_CUT_08
NONTALKABLE LANDTILE ; 09 db LAND_TILE ; 09
NONTALKABLE LANDTILE ; 0a db LAND_TILE ; 0a
NONTALKABLE LANDTILE ; 0b db LAND_TILE ; 0b
NONTALKABLE LANDTILE ; 0c db LAND_TILE ; 0c
NONTALKABLE LANDTILE ; 0d db LAND_TILE ; 0d
NONTALKABLE LANDTILE ; 0e db LAND_TILE ; 0e
NONTALKABLE WALLTILE ; 0f db WALL_TILE ; 0f
NONTALKABLE LANDTILE ; COLL_TALL_GRASS_10 db LAND_TILE ; COLL_TALL_GRASS_10
NONTALKABLE LANDTILE ; 11 db LAND_TILE ; 11
TALKABLE WALLTILE ; COLL_CUT_TREE db WALL_TILE | TALK ; COLL_CUT_TREE
NONTALKABLE LANDTILE ; 13 db LAND_TILE ; 13
NONTALKABLE LANDTILE ; COLL_LONG_GRASS db LAND_TILE ; COLL_LONG_GRASS
TALKABLE WALLTILE ; COLL_HEADBUTT_TREE db WALL_TILE | TALK ; COLL_HEADBUTT_TREE
NONTALKABLE LANDTILE ; 16 db LAND_TILE ; 16
NONTALKABLE LANDTILE ; 17 db LAND_TILE ; 17
NONTALKABLE LANDTILE ; COLL_TALL_GRASS db LAND_TILE ; COLL_TALL_GRASS
NONTALKABLE LANDTILE ; 19 db LAND_TILE ; 19
TALKABLE WALLTILE ; COLL_CUT_TREE_1A db WALL_TILE | TALK ; COLL_CUT_TREE_1A
NONTALKABLE LANDTILE ; 1b db LAND_TILE ; 1b
NONTALKABLE LANDTILE ; COLL_LONG_GRASS_1C db LAND_TILE ; COLL_LONG_GRASS_1C
TALKABLE WALLTILE ; COLL_HEADBUTT_TREE_1D db WALL_TILE | TALK ; COLL_HEADBUTT_TREE_1D
NONTALKABLE LANDTILE ; 1e db LAND_TILE ; 1e
NONTALKABLE LANDTILE ; 1f db LAND_TILE ; 1f
NONTALKABLE WATERTILE ; 20 db WATER_TILE ; 20
NONTALKABLE WATERTILE ; COLL_WATER_21 db WATER_TILE ; COLL_WATER_21
TALKABLE WATERTILE ; 22 db WATER_TILE | TALK ; 22
NONTALKABLE LANDTILE ; COLL_ICE db LAND_TILE ; COLL_ICE
TALKABLE WATERTILE ; COLL_WHIRLPOOL db WATER_TILE | TALK ; COLL_WHIRLPOOL
NONTALKABLE WATERTILE ; 25 db WATER_TILE ; 25
NONTALKABLE WATERTILE ; 26 db WATER_TILE ; 26
NONTALKABLE WALLTILE ; COLL_BUOY db WALL_TILE ; COLL_BUOY
NONTALKABLE WATERTILE ; COLL_CUT_28 db WATER_TILE ; COLL_CUT_28
NONTALKABLE WATERTILE ; COLL_WATER db WATER_TILE ; COLL_WATER
TALKABLE WATERTILE ; 2a db WATER_TILE | TALK ; 2a
NONTALKABLE LANDTILE ; COLL_ICE_2B db LAND_TILE ; COLL_ICE_2B
TALKABLE WATERTILE ; COLL_WHIRLPOOL_2C db WATER_TILE | TALK ; COLL_WHIRLPOOL_2C
NONTALKABLE WATERTILE ; 2d db WATER_TILE ; 2d
NONTALKABLE WATERTILE ; 2e db WATER_TILE ; 2e
NONTALKABLE WALLTILE ; 2f db WALL_TILE ; 2f
NONTALKABLE WATERTILE ; COLL_WATERFALL_RIGHT db WATER_TILE ; COLL_WATERFALL_RIGHT
NONTALKABLE WATERTILE ; COLL_WATERFALL_LEFT db WATER_TILE ; COLL_WATERFALL_LEFT
NONTALKABLE WATERTILE ; COLL_WATERFALL_UP db WATER_TILE ; COLL_WATERFALL_UP
NONTALKABLE WATERTILE ; COLL_WATERFALL db WATER_TILE ; COLL_WATERFALL
NONTALKABLE WATERTILE ; 34 db WATER_TILE ; 34
NONTALKABLE WATERTILE ; 35 db WATER_TILE ; 35
NONTALKABLE WATERTILE ; 36 db WATER_TILE ; 36
NONTALKABLE WATERTILE ; 37 db WATER_TILE ; 37
NONTALKABLE WATERTILE ; COLL_CURRENT_RIGHT db WATER_TILE ; COLL_CURRENT_RIGHT
NONTALKABLE WATERTILE ; COLL_CURRENT_LEFT db WATER_TILE ; COLL_CURRENT_LEFT
NONTALKABLE WATERTILE ; COLL_CURRENT_UP db WATER_TILE ; COLL_CURRENT_UP
NONTALKABLE WATERTILE ; COLL_CURRENT_DOWN db WATER_TILE ; COLL_CURRENT_DOWN
NONTALKABLE WATERTILE ; 3c db WATER_TILE ; 3c
NONTALKABLE WATERTILE ; 3d db WATER_TILE ; 3d
NONTALKABLE WATERTILE ; 3e db WATER_TILE ; 3e
NONTALKABLE WATERTILE ; 3f db WATER_TILE ; 3f
NONTALKABLE LANDTILE ; COLL_BRAKE db LAND_TILE ; COLL_BRAKE
NONTALKABLE LANDTILE ; COLL_WALK_RIGHT db LAND_TILE ; COLL_WALK_RIGHT
NONTALKABLE LANDTILE ; COLL_WALK_LEFT db LAND_TILE ; COLL_WALK_LEFT
NONTALKABLE LANDTILE ; COLL_WALK_UP db LAND_TILE ; COLL_WALK_UP
NONTALKABLE LANDTILE ; COLL_WALK_DOWN db LAND_TILE ; COLL_WALK_DOWN
NONTALKABLE LANDTILE ; COLL_BRAKE_45 db LAND_TILE ; COLL_BRAKE_45
NONTALKABLE LANDTILE ; COLL_BRAKE_46 db LAND_TILE ; COLL_BRAKE_46
NONTALKABLE LANDTILE ; COLL_BRAKE_47 db LAND_TILE ; COLL_BRAKE_47
NONTALKABLE LANDTILE ; COLL_GRASS_48 db LAND_TILE ; COLL_GRASS_48
NONTALKABLE LANDTILE ; COLL_GRASS_49 db LAND_TILE ; COLL_GRASS_49
NONTALKABLE LANDTILE ; COLL_GRASS_4A db LAND_TILE ; COLL_GRASS_4A
NONTALKABLE LANDTILE ; COLL_GRASS_4B db LAND_TILE ; COLL_GRASS_4B
NONTALKABLE LANDTILE ; COLL_GRASS_4C db LAND_TILE ; COLL_GRASS_4C
NONTALKABLE LANDTILE ; 4d db LAND_TILE ; 4d
NONTALKABLE LANDTILE ; 4e db LAND_TILE ; 4e
NONTALKABLE LANDTILE ; 4f db LAND_TILE ; 4f
NONTALKABLE LANDTILE ; COLL_WALK_RIGHT_ALT db LAND_TILE ; COLL_WALK_RIGHT_ALT
NONTALKABLE LANDTILE ; COLL_WALK_LEFT_ALT db LAND_TILE ; COLL_WALK_LEFT_ALT
NONTALKABLE LANDTILE ; COLL_WALK_UP_ALT db LAND_TILE ; COLL_WALK_UP_ALT
NONTALKABLE LANDTILE ; COLL_WALK_DOWN_ALT db LAND_TILE ; COLL_WALK_DOWN_ALT
NONTALKABLE LANDTILE ; COLL_BRAKE_ALT db LAND_TILE ; COLL_BRAKE_ALT
NONTALKABLE LANDTILE ; COLL_BRAKE_55 db LAND_TILE ; COLL_BRAKE_55
NONTALKABLE LANDTILE ; COLL_BRAKE_56 db LAND_TILE ; COLL_BRAKE_56
NONTALKABLE LANDTILE ; COLL_BRAKE_57 db LAND_TILE ; COLL_BRAKE_57
NONTALKABLE LANDTILE ; 58 db LAND_TILE ; 58
NONTALKABLE LANDTILE ; 59 db LAND_TILE ; 59
NONTALKABLE LANDTILE ; 5a db LAND_TILE ; 5a
NONTALKABLE LANDTILE ; COLL_5B db LAND_TILE ; COLL_5B
NONTALKABLE LANDTILE ; 5c db LAND_TILE ; 5c
NONTALKABLE LANDTILE ; 5d db LAND_TILE ; 5d
NONTALKABLE LANDTILE ; 5e db LAND_TILE ; 5e
NONTALKABLE LANDTILE ; 5f db LAND_TILE ; 5f
NONTALKABLE LANDTILE ; COLL_PIT db LAND_TILE ; COLL_PIT
NONTALKABLE LANDTILE ; COLL_VIRTUAL_BOY db LAND_TILE ; COLL_VIRTUAL_BOY
NONTALKABLE WALLTILE ; 62 db WALL_TILE ; 62
NONTALKABLE LANDTILE ; 63 db LAND_TILE ; 63
NONTALKABLE LANDTILE ; COLL_64 db LAND_TILE ; COLL_64
NONTALKABLE LANDTILE ; COLL_65 db LAND_TILE ; COLL_65
NONTALKABLE LANDTILE ; 66 db LAND_TILE ; 66
NONTALKABLE LANDTILE ; 67 db LAND_TILE ; 67
NONTALKABLE LANDTILE ; COLL_PIT_68 db LAND_TILE ; COLL_PIT_68
NONTALKABLE LANDTILE ; 69 db LAND_TILE ; 69
NONTALKABLE WALLTILE ; 6a db WALL_TILE ; 6a
NONTALKABLE LANDTILE ; 6b db LAND_TILE ; 6b
NONTALKABLE LANDTILE ; 6c db LAND_TILE ; 6c
NONTALKABLE LANDTILE ; 6d db LAND_TILE ; 6d
NONTALKABLE LANDTILE ; 6e db LAND_TILE ; 6e
NONTALKABLE LANDTILE ; 6f db LAND_TILE ; 6f
NONTALKABLE LANDTILE ; COLL_WARP_CARPET_DOWN db LAND_TILE ; COLL_WARP_CARPET_DOWN
NONTALKABLE LANDTILE ; COLL_DOOR db LAND_TILE ; COLL_DOOR
NONTALKABLE LANDTILE ; COLL_LADDER db LAND_TILE ; COLL_LADDER
NONTALKABLE LANDTILE ; COLL_STAIRCASE_73 db LAND_TILE ; COLL_STAIRCASE_73
NONTALKABLE LANDTILE ; COLL_CAVE_74 db LAND_TILE ; COLL_CAVE_74
NONTALKABLE LANDTILE ; COLL_DOOR_75 db LAND_TILE ; COLL_DOOR_75
NONTALKABLE LANDTILE ; COLL_WARP_CARPET_LEFT db LAND_TILE ; COLL_WARP_CARPET_LEFT
NONTALKABLE LANDTILE ; COLL_WARP_77 db LAND_TILE ; COLL_WARP_77
NONTALKABLE LANDTILE ; COLL_WARP_CARPET_UP db LAND_TILE ; COLL_WARP_CARPET_UP
NONTALKABLE LANDTILE ; COLL_DOOR_79 db LAND_TILE ; COLL_DOOR_79
NONTALKABLE LANDTILE ; COLL_STAIRCASE db LAND_TILE ; COLL_STAIRCASE
NONTALKABLE LANDTILE ; COLL_CAVE db LAND_TILE ; COLL_CAVE
NONTALKABLE LANDTILE ; COLL_WARP_PANEL db LAND_TILE ; COLL_WARP_PANEL
NONTALKABLE LANDTILE ; COLL_DOOR_7D db LAND_TILE ; COLL_DOOR_7D
NONTALKABLE LANDTILE ; COLL_WARP_CARPET_RIGHT db LAND_TILE ; COLL_WARP_CARPET_RIGHT
NONTALKABLE LANDTILE ; COLL_WARP_7F db LAND_TILE ; COLL_WARP_7F
NONTALKABLE WALLTILE ; 80 db WALL_TILE ; 80
NONTALKABLE WALLTILE ; 81 db WALL_TILE ; 81
NONTALKABLE WALLTILE ; 82 db WALL_TILE ; 82
NONTALKABLE WALLTILE ; 83 db WALL_TILE ; 83
NONTALKABLE WALLTILE ; 84 db WALL_TILE ; 84
NONTALKABLE LANDTILE ; 85 db LAND_TILE ; 85
NONTALKABLE LANDTILE ; 86 db LAND_TILE ; 86
NONTALKABLE LANDTILE ; 87 db LAND_TILE ; 87
NONTALKABLE WALLTILE ; 88 db WALL_TILE ; 88
NONTALKABLE WALLTILE ; 89 db WALL_TILE ; 89
NONTALKABLE WALLTILE ; 8a db WALL_TILE ; 8a
NONTALKABLE WALLTILE ; 8b db WALL_TILE ; 8b
NONTALKABLE WALLTILE ; 8c db WALL_TILE ; 8c
NONTALKABLE LANDTILE ; 8d db LAND_TILE ; 8d
NONTALKABLE LANDTILE ; 8e db LAND_TILE ; 8e
NONTALKABLE LANDTILE ; 8f db LAND_TILE ; 8f
NONTALKABLE WALLTILE ; COLL_COUNTER db WALL_TILE ; COLL_COUNTER
NONTALKABLE WALLTILE ; COLL_BOOKSHELF db WALL_TILE ; COLL_BOOKSHELF
NONTALKABLE WALLTILE ; 92 db WALL_TILE ; 92
NONTALKABLE WALLTILE ; COLL_PC db WALL_TILE ; COLL_PC
NONTALKABLE WALLTILE ; COLL_RADIO db WALL_TILE ; COLL_RADIO
NONTALKABLE WALLTILE ; COLL_TOWN_MAP db WALL_TILE ; COLL_TOWN_MAP
NONTALKABLE WALLTILE ; COLL_MART_SHELF db WALL_TILE ; COLL_MART_SHELF
NONTALKABLE WALLTILE ; COLL_TV db WALL_TILE ; COLL_TV
NONTALKABLE WALLTILE ; COLL_COUNTER_98 db WALL_TILE ; COLL_COUNTER_98
NONTALKABLE WALLTILE ; 99 db WALL_TILE ; 99
NONTALKABLE WALLTILE ; 9a db WALL_TILE ; 9a
NONTALKABLE WALLTILE ; 9b db WALL_TILE ; 9b
NONTALKABLE WALLTILE ; COLL_9C db WALL_TILE ; COLL_9C
NONTALKABLE WALLTILE ; COLL_WINDOW db WALL_TILE ; COLL_WINDOW
NONTALKABLE WALLTILE ; 9e db WALL_TILE ; 9e
NONTALKABLE WALLTILE ; COLL_INCENSE_BURNER db WALL_TILE ; COLL_INCENSE_BURNER
NONTALKABLE LANDTILE ; COLL_HOP_RIGHT db LAND_TILE ; COLL_HOP_RIGHT
NONTALKABLE LANDTILE ; COLL_HOP_LEFT db LAND_TILE ; COLL_HOP_LEFT
NONTALKABLE LANDTILE ; COLL_HOP_UP db LAND_TILE ; COLL_HOP_UP
NONTALKABLE LANDTILE ; COLL_HOP_DOWN db LAND_TILE ; COLL_HOP_DOWN
NONTALKABLE LANDTILE ; COLL_HOP_DOWN_RIGHT db LAND_TILE ; COLL_HOP_DOWN_RIGHT
NONTALKABLE LANDTILE ; COLL_HOP_DOWN_LEFT db LAND_TILE ; COLL_HOP_DOWN_LEFT
NONTALKABLE LANDTILE ; COLL_HOP_UP_RIGHT db LAND_TILE ; COLL_HOP_UP_RIGHT
NONTALKABLE LANDTILE ; COLL_HOP_UP_LEFT db LAND_TILE ; COLL_HOP_UP_LEFT
NONTALKABLE LANDTILE ; a8 db LAND_TILE ; a8
NONTALKABLE LANDTILE ; a9 db LAND_TILE ; a9
NONTALKABLE LANDTILE ; aa db LAND_TILE ; aa
NONTALKABLE LANDTILE ; ab db LAND_TILE ; ab
NONTALKABLE LANDTILE ; ac db LAND_TILE ; ac
NONTALKABLE LANDTILE ; ad db LAND_TILE ; ad
NONTALKABLE LANDTILE ; ae db LAND_TILE ; ae
NONTALKABLE LANDTILE ; af db LAND_TILE ; af
NONTALKABLE LANDTILE ; COLL_RIGHT_WALL db LAND_TILE ; COLL_RIGHT_WALL
NONTALKABLE LANDTILE ; COLL_LEFT_WALL db LAND_TILE ; COLL_LEFT_WALL
NONTALKABLE LANDTILE ; COLL_UP_WALL db LAND_TILE ; COLL_UP_WALL
NONTALKABLE LANDTILE ; COLL_DOWN_WALL db LAND_TILE ; COLL_DOWN_WALL
NONTALKABLE LANDTILE ; COLL_DOWN_RIGHT_WALL db LAND_TILE ; COLL_DOWN_RIGHT_WALL
NONTALKABLE LANDTILE ; COLL_DOWN_LEFT_WALL db LAND_TILE ; COLL_DOWN_LEFT_WALL
NONTALKABLE LANDTILE ; COLL_UP_RIGHT_WALL db LAND_TILE ; COLL_UP_RIGHT_WALL
NONTALKABLE LANDTILE ; COLL_UP_LEFT_WALL db LAND_TILE ; COLL_UP_LEFT_WALL
NONTALKABLE LANDTILE ; b8 db LAND_TILE ; b8
NONTALKABLE LANDTILE ; b9 db LAND_TILE ; b9
NONTALKABLE LANDTILE ; ba db LAND_TILE ; ba
NONTALKABLE LANDTILE ; bb db LAND_TILE ; bb
NONTALKABLE LANDTILE ; bc db LAND_TILE ; bc
NONTALKABLE LANDTILE ; bd db LAND_TILE ; bd
NONTALKABLE LANDTILE ; be db LAND_TILE ; be
NONTALKABLE LANDTILE ; bf db LAND_TILE ; bf
NONTALKABLE WATERTILE ; COLL_RIGHT_BUOY db WATER_TILE ; COLL_RIGHT_BUOY
NONTALKABLE WATERTILE ; COLL_LEFT_BUOY db WATER_TILE ; COLL_LEFT_BUOY
NONTALKABLE WATERTILE ; COLL_UP_BUOY db WATER_TILE ; COLL_UP_BUOY
NONTALKABLE WATERTILE ; COLL_DOWN_BUOY db WATER_TILE ; COLL_DOWN_BUOY
NONTALKABLE WATERTILE ; COLL_DOWN_RIGHT_BUOY db WATER_TILE ; COLL_DOWN_RIGHT_BUOY
NONTALKABLE WATERTILE ; COLL_DOWN_LEFT_BUOY db WATER_TILE ; COLL_DOWN_LEFT_BUOY
NONTALKABLE WATERTILE ; COLL_UP_RIGHT_BUOY db WATER_TILE ; COLL_UP_RIGHT_BUOY
NONTALKABLE WATERTILE ; COLL_UP_LEFT_BUOY db WATER_TILE ; COLL_UP_LEFT_BUOY
NONTALKABLE WATERTILE ; c8 db WATER_TILE ; c8
NONTALKABLE WATERTILE ; c9 db WATER_TILE ; c9
NONTALKABLE WATERTILE ; ca db WATER_TILE ; ca
NONTALKABLE WATERTILE ; cb db WATER_TILE ; cb
NONTALKABLE WATERTILE ; cc db WATER_TILE ; cc
NONTALKABLE WATERTILE ; cd db WATER_TILE ; cd
NONTALKABLE WATERTILE ; ce db WATER_TILE ; ce
NONTALKABLE WATERTILE ; cf db WATER_TILE ; cf
NONTALKABLE LANDTILE ; d0 db LAND_TILE ; d0
NONTALKABLE LANDTILE ; d1 db LAND_TILE ; d1
NONTALKABLE LANDTILE ; d2 db LAND_TILE ; d2
NONTALKABLE LANDTILE ; d3 db LAND_TILE ; d3
NONTALKABLE LANDTILE ; d4 db LAND_TILE ; d4
NONTALKABLE LANDTILE ; d5 db LAND_TILE ; d5
NONTALKABLE LANDTILE ; d6 db LAND_TILE ; d6
NONTALKABLE LANDTILE ; d7 db LAND_TILE ; d7
NONTALKABLE LANDTILE ; d8 db LAND_TILE ; d8
NONTALKABLE LANDTILE ; d9 db LAND_TILE ; d9
NONTALKABLE LANDTILE ; da db LAND_TILE ; da
NONTALKABLE LANDTILE ; db db LAND_TILE ; db
NONTALKABLE LANDTILE ; dc db LAND_TILE ; dc
NONTALKABLE LANDTILE ; dd db LAND_TILE ; dd
NONTALKABLE LANDTILE ; de db LAND_TILE ; de
NONTALKABLE LANDTILE ; df db LAND_TILE ; df
NONTALKABLE LANDTILE ; e0 db LAND_TILE ; e0
NONTALKABLE LANDTILE ; e1 db LAND_TILE ; e1
NONTALKABLE LANDTILE ; e2 db LAND_TILE ; e2
NONTALKABLE LANDTILE ; e3 db LAND_TILE ; e3
NONTALKABLE LANDTILE ; e4 db LAND_TILE ; e4
NONTALKABLE LANDTILE ; e5 db LAND_TILE ; e5
NONTALKABLE LANDTILE ; e6 db LAND_TILE ; e6
NONTALKABLE LANDTILE ; e7 db LAND_TILE ; e7
NONTALKABLE LANDTILE ; e8 db LAND_TILE ; e8
NONTALKABLE LANDTILE ; e9 db LAND_TILE ; e9
NONTALKABLE LANDTILE ; ea db LAND_TILE ; ea
NONTALKABLE LANDTILE ; eb db LAND_TILE ; eb
NONTALKABLE LANDTILE ; ec db LAND_TILE ; ec
NONTALKABLE LANDTILE ; ed db LAND_TILE ; ed
NONTALKABLE LANDTILE ; ee db LAND_TILE ; ee
NONTALKABLE LANDTILE ; ef db LAND_TILE ; ef
NONTALKABLE LANDTILE ; f0 db LAND_TILE ; f0
NONTALKABLE LANDTILE ; f1 db LAND_TILE ; f1
NONTALKABLE LANDTILE ; f2 db LAND_TILE ; f2
NONTALKABLE LANDTILE ; f3 db LAND_TILE ; f3
NONTALKABLE LANDTILE ; f4 db LAND_TILE ; f4
NONTALKABLE LANDTILE ; f5 db LAND_TILE ; f5
NONTALKABLE LANDTILE ; f6 db LAND_TILE ; f6
NONTALKABLE LANDTILE ; f7 db LAND_TILE ; f7
NONTALKABLE LANDTILE ; f8 db LAND_TILE ; f8
NONTALKABLE LANDTILE ; f9 db LAND_TILE ; f9
NONTALKABLE LANDTILE ; fa db LAND_TILE ; fa
NONTALKABLE LANDTILE ; fb db LAND_TILE ; fb
NONTALKABLE LANDTILE ; fc db LAND_TILE ; fc
NONTALKABLE LANDTILE ; fd db LAND_TILE ; fd
NONTALKABLE LANDTILE ; fe db LAND_TILE ; fe
NONTALKABLE WALLTILE ; COLL_FF db WALL_TILE ; COLL_FF

10
engine/events/overworld.asm
View File

@ -360,7 +360,7 @@ SurfFunction:
jr z, .alreadyfail jr z, .alreadyfail
call GetFacingTileCoord call GetFacingTileCoord
call GetTileCollision call GetTileCollision
cp WATERTILE cp WATER_TILE
jr nz, .cannotsurf jr nz, .cannotsurf
call CheckDirection call CheckDirection
jr c, .cannotsurf jr c, .cannotsurf
@ -497,7 +497,7 @@ TrySurfOW::
; Must be facing water. ; Must be facing water.
ld a, [wFacingTileID] ld a, [wFacingTileID]
call GetTileCollision call GetTileCollision
cp WATERTILE cp WATER_TILE
jr nz, .quit jr nz, .quit
; Check tile permissions. ; Check tile permissions.
@ -1453,7 +1453,7 @@ FishFunction:
jr z, .fail jr z, .fail
call GetFacingTileCoord call GetFacingTileCoord
call GetTileCollision call GetTileCollision
cp WATERTILE cp WATER_TILE
jr z, .facingwater jr z, .facingwater
.fail .fail
ld a, $3 ld a, $3
@ -1697,8 +1697,8 @@ BikeFunction:
.ok .ok
call GetPlayerStandingTile call GetPlayerStandingTile
and WALLTILE | WATERTILE ; can't use our bike in a wall or on water and $f ; lo nybble only
jr nz, .nope jr nz, .nope ; not FLOOR_TILE
xor a xor a
ret ret

8
engine/overworld/npc_movement.asm
View File

@ -75,7 +75,7 @@ WillObjectBumpIntoWater:
ld a, [hl] ld a, [hl]
ld d, a ld d, a
call GetTileCollision call GetTileCollision
and a ; LANDTILE and a ; LAND_TILE
jr z, WillObjectBumpIntoTile jr z, WillObjectBumpIntoTile
scf scf
ret ret
@ -87,7 +87,7 @@ WillObjectBumpIntoLand:
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
call GetTileCollision call GetTileCollision
cp WATERTILE cp WATER_TILE
jr z, WillObjectBumpIntoTile jr z, WillObjectBumpIntoTile
scf scf
ret ret
@ -213,11 +213,11 @@ Function6fa1:
call GetCoordTile call GetCoordTile
call GetTileCollision call GetTileCollision
pop de pop de
and a ; LANDTILE and a ; LAND_TILE
jr nz, .not_land jr nz, .not_land
call GetCoordTile call GetCoordTile
call GetTileCollision call GetTileCollision
and a ; LANDTILE and a ; LAND_TILE
jr nz, .not_land jr nz, .not_land
xor a xor a
ret ret

6
engine/overworld/player_movement.asm
View File

@ -738,7 +738,7 @@ ENDM
; Return 0 if tile a is land. Otherwise, return carry. ; Return 0 if tile a is land. Otherwise, return carry.
call GetTileCollision call GetTileCollision
and a ; LANDTILE? and a ; LAND_TILE
ret z ret z
scf scf
ret ret
@ -748,11 +748,11 @@ ENDM
; Otherwise, return carry. ; Otherwise, return carry.
call GetTileCollision call GetTileCollision
cp WATERTILE cp WATER_TILE
jr z, .Water jr z, .Water
; Can walk back onto land from water. ; Can walk back onto land from water.
and a ; LANDTILE? and a ; LAND_TILE
jr z, .Land jr z, .Land
jr .Neither jr .Neither

2
home/map_objects.asm
View File

@ -80,7 +80,7 @@ GetPlayerStandingTile::
CheckOnWater:: CheckOnWater::
ld a, [wPlayerStandingTile] ld a, [wPlayerStandingTile]
call GetTileCollision call GetTileCollision
sub WATERTILE sub WATER_TILE
ret z ret z
and a and a
ret ret