diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/npc_movement.asm | 8 | ||||
| -rwxr-xr-x | engine/player_movement.asm | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engine/npc_movement.asm b/engine/npc_movement.asm index f9ce7b04e..bc36e3ee9 100755 --- a/engine/npc_movement.asm +++ b/engine/npc_movement.asm @@ -76,7 +76,7 @@ Function6f07: ; 6f07 ld a, [hl] ld d, a call GetTileCollision - and a + and a ; land jr z, Function6f3e scf ret @@ -89,7 +89,7 @@ Function6f2c: ; 6f2c add hl, bc ld a, [hl] call GetTileCollision - cp $1 + cp WATERTILE jr z, Function6f3e scf ret @@ -210,11 +210,11 @@ Function6fa1: ; 6fa1 call GetCoordTile call GetTileCollision pop de - and a + and a ; land jr nz, .asm_6fd7 call GetCoordTile call GetTileCollision - and a + and a ; land jr nz, .asm_6fd7 xor a ret diff --git a/engine/player_movement.asm b/engine/player_movement.asm index 2f6660135..89593da5d 100755 --- a/engine/player_movement.asm +++ b/engine/player_movement.asm @@ -770,7 +770,7 @@ DoPlayerMovement:: ; 80000 ; Otherwise, return carry. call GetTileCollision - cp 1 + cp WATERTILE jr z, .Water ; Can walk back onto land from water. |