diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/overworld.asm | 10 | ||||
| -rw-r--r-- | engine/overworld/npc_movement.asm | 8 | ||||
| -rw-r--r-- | engine/overworld/player_movement.asm | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index cf393ca92..09fc92aa7 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -360,7 +360,7 @@ SurfFunction: jr z, .alreadyfail call GetFacingTileCoord call GetTileCollision - cp WATERTILE + cp WATER_TILE jr nz, .cannotsurf call CheckDirection jr c, .cannotsurf @@ -497,7 +497,7 @@ TrySurfOW:: ; Must be facing water. ld a, [wFacingTileID] call GetTileCollision - cp WATERTILE + cp WATER_TILE jr nz, .quit ; Check tile permissions. @@ -1453,7 +1453,7 @@ FishFunction: jr z, .fail call GetFacingTileCoord call GetTileCollision - cp WATERTILE + cp WATER_TILE jr z, .facingwater .fail ld a, $3 @@ -1697,8 +1697,8 @@ BikeFunction: .ok call GetPlayerStandingTile - and WALLTILE | WATERTILE ; can't use our bike in a wall or on water - jr nz, .nope + and $f ; lo nybble only + jr nz, .nope ; not FLOOR_TILE xor a ret diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index f4c730247..d6b02fc45 100644 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -75,7 +75,7 @@ WillObjectBumpIntoWater: ld a, [hl] ld d, a call GetTileCollision - and a ; LANDTILE + and a ; LAND_TILE jr z, WillObjectBumpIntoTile scf ret @@ -87,7 +87,7 @@ WillObjectBumpIntoLand: add hl, bc ld a, [hl] call GetTileCollision - cp WATERTILE + cp WATER_TILE jr z, WillObjectBumpIntoTile scf ret @@ -213,11 +213,11 @@ Function6fa1: call GetCoordTile call GetTileCollision pop de - and a ; LANDTILE + and a ; LAND_TILE jr nz, .not_land call GetCoordTile call GetTileCollision - and a ; LANDTILE + and a ; LAND_TILE jr nz, .not_land xor a ret diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index 9f372640b..3beec6ccb 100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -738,7 +738,7 @@ ENDM ; Return 0 if tile a is land. Otherwise, return carry. call GetTileCollision - and a ; LANDTILE? + and a ; LAND_TILE ret z scf ret @@ -748,11 +748,11 @@ ENDM ; Otherwise, return carry. call GetTileCollision - cp WATERTILE + cp WATER_TILE jr z, .Water ; Can walk back onto land from water. - and a ; LANDTILE? + and a ; LAND_TILE jr z, .Land jr .Neither |