diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-24 13:46:34 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-24 14:33:17 -0500 |
| commit | c05b7f41dd5783315e9e4032b63ca84c6ed05893 (patch) | |
| tree | 0c1995c8a928a297f842a75c2e009003534b3ec8 /engine/npc_movement.asm | |
| parent | 20d6c1d876cde19061c458761c7283163e316d8a (diff) | |
Renaming: (fix #412)
- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event
Diffstat (limited to 'engine/npc_movement.asm')
| -rwxr-xr-x | engine/npc_movement.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/npc_movement.asm b/engine/npc_movement.asm index e102cc554..a2508e0f6 100755 --- a/engine/npc_movement.asm +++ b/engine/npc_movement.asm @@ -35,7 +35,7 @@ Function6ec1: ; 6ec1 push hl push bc - call WillPersonBumpIntoSomeoneElse + call WillObjectBumpIntoSomeoneElse pop bc pop hl ret c @@ -44,12 +44,12 @@ Function6ec1: ; 6ec1 bit 5, [hl] jr nz, .bit_5 push hl - call HasPersonReachedMovementLimit + call HasObjectReachedMovementLimit pop hl ret c push hl - call IsPersonMovingOffEdgeOfScreen + call IsObjectMovingOffEdgeOfScreen pop hl ret c @@ -269,7 +269,7 @@ CheckFacingObject:: ; 6fd9 ; 7009 -WillPersonBumpIntoSomeoneElse: ; 7009 +WillObjectBumpIntoSomeoneElse: ; 7009 ld hl, OBJECT_NEXT_MAP_X add hl, bc ld d, [hl] @@ -391,7 +391,7 @@ IsNPCAtCoord: ; 7041 ret ; 70a4 -HasPersonReachedMovementLimit: ; 70a4 +HasObjectReachedMovementLimit: ; 70a4 ld hl, OBJECT_RADIUS add hl, bc ld a, [hl] @@ -451,7 +451,7 @@ HasPersonReachedMovementLimit: ; 70a4 ret ; 70ed -IsPersonMovingOffEdgeOfScreen: ; 70ed +IsObjectMovingOffEdgeOfScreen: ; 70ed ld hl, OBJECT_NEXT_MAP_X add hl, bc ld a, [XCoord] |