diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-05-24 12:36:35 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-05-24 12:36:35 -0400 |
| commit | 3927bcdb9d0429b5ff303cb787e522878bd01749 (patch) | |
| tree | 19cb65ed9e1d443e2f15bb61c2722e81b86350f6 /engine | |
| parent | a91aa18daeb7fdd24fe512468d549ca49fe524fc (diff) | |
Function6ec1 → CanObjectMoveInDirection
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/overworld/map_objects.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/npc_movement.asm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index e38112db9..6652beead 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -696,7 +696,7 @@ MapObjectMovementPattern: ; 47dd and %00000011 or 0 call InitStep - call Function6ec1 + call CanObjectMoveInDirection jr c, .ok2 ld de, SFX_STRENGTH call PlaySFX @@ -1049,7 +1049,7 @@ MapObjectMovementPattern: ; 47dd .RandomWalkContinue: call InitStep - call Function6ec1 ; check whether the object can move in that direction + call CanObjectMoveInDirection ; check whether the object can move in that direction jr c, .NewDuration call UpdateTallGrassFlags ld hl, OBJECT_ACTION diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 66b64037c..40ced1a5f 100644 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -1,4 +1,4 @@ -Function6ec1: ; 6ec1 +CanObjectMoveInDirection: ; 6ec1 ld hl, OBJECT_PALETTE add hl, bc |