diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-21 05:19:27 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-12-21 05:19:27 -0500 |
| commit | 68cdd7b1cb5a293b3de42185fe17d85b4067b3ad (patch) | |
| tree | 65b32493ea3eaef107ac73f804d23563da0f9ada /src/event_object_lock.c | |
| parent | 949509aade2627ded031669c296453c3d0ea9e59 (diff) | |
| parent | 026e1108b26f4ce5cea362997135bd8efc7cb28a (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'src/event_object_lock.c')
| -rw-r--r-- | src/event_object_lock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/event_object_lock.c b/src/event_object_lock.c index 1f1be8d5a..b728f7774 100644 --- a/src/event_object_lock.c +++ b/src/event_object_lock.c @@ -8,7 +8,7 @@ #include "trainer_see.h" #include "constants/event_objects.h" -bool8 walkrun_is_standing_still(void) +bool8 IsPlayerStandingStill(void) { if (gPlayerAvatar.tileTransitionState == T_TILE_TRANSITION) return FALSE; @@ -18,7 +18,7 @@ bool8 walkrun_is_standing_still(void) static void sub_80983A4(u8 taskId) { - if (walkrun_is_standing_still()) + if (IsPlayerStandingStill()) { sub_808B864(); DestroyTask(taskId); @@ -49,7 +49,7 @@ static void sub_8098400(u8 taskId) { struct Task *task = &gTasks[taskId]; - if (!task->data[0] && walkrun_is_standing_still() == TRUE) + if (!task->data[0] && IsPlayerStandingStill() == TRUE) { sub_808B864(); task->data[0] = 1; @@ -123,7 +123,7 @@ static void sub_80985BC(u8 taskId) struct Task *task = &gTasks[taskId]; u8 objectEventId = task->data[2]; - if (!task->data[0] && walkrun_is_standing_still() == TRUE) + if (!task->data[0] && IsPlayerStandingStill() == TRUE) { sub_808B864(); task->data[0] = 1; |