diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-02-13 19:01:47 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-02-13 19:07:19 -0500 |
| commit | 88bbdb6a2ff59b1e00e1ad1020be49f72ccf23da (patch) | |
| tree | 7123f05c98ef43e4f14e94973a661e9776d4c312 /engine/overworld | |
| parent | 53cf08b6b37b319a32b540af452f963747d03e2c (diff) | |
Define TileCollisionTable as a standard 'db' series
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/npc_movement.asm | 8 | ||||
| -rw-r--r-- | engine/overworld/player_movement.asm | 6 |
2 files changed, 7 insertions, 7 deletions
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 |