diff options
Diffstat (limited to 'engine/overworld/npc_movement.asm')
| -rw-r--r-- | engine/overworld/npc_movement.asm | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 07881a788..b4b5ef467 100644 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -1,5 +1,4 @@ CanObjectMoveInDirection: - ld hl, OBJECT_PALETTE add hl, bc bit SWIMMING_F, [hl] @@ -58,7 +57,6 @@ CanObjectMoveInDirection: and a ret - WillObjectBumpIntoWater: call Function6f5f ret c @@ -144,9 +142,9 @@ Function6f5f: Function6f7f: ld d, a and $f0 - cp $b0 + cp HI_NYBBLE_SIDE_WALLS jr z, .done - cp $c0 + cp HI_NYBBLE_UNUSED_C0 jr z, .done xor a ret @@ -216,10 +214,7 @@ Function6fa1: scf ret - - CheckFacingObject:: - call GetFacingTileCoord ; Double the distance for counter tiles. @@ -258,7 +253,6 @@ CheckFacingObject:: scf ret - WillObjectBumpIntoSomeoneElse: ld hl, OBJECT_NEXT_MAP_X add hl, bc @@ -532,7 +526,6 @@ Unreferenced_Function7113: scf ret - Function7171: ld hl, OBJECT_NEXT_MAP_X add hl, bc |