diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 01:15:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 01:15:36 -0500 |
| commit | e5df61e362beaaab9ae4344f4f160397df9c54cc (patch) | |
| tree | 8bb86e5e523406b21daa08aff9bce080184fe31e /src/event_obj_lock.c | |
| parent | 017fa294b5c88ddd7513cb4976b5c29cad0b94a5 (diff) | |
| parent | 8b1595ebc36a623240fa8dd509864f5400eed1f9 (diff) | |
Merge branch 'master' into doc-dome
Diffstat (limited to 'src/event_obj_lock.c')
| -rw-r--r-- | src/event_obj_lock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/event_obj_lock.c b/src/event_obj_lock.c index c64a2ab22..817276694 100644 --- a/src/event_obj_lock.c +++ b/src/event_obj_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 eventObjectId = task->data[2]; - if (!task->data[0] && walkrun_is_standing_still() == TRUE) + if (!task->data[0] && IsPlayerStandingStill() == TRUE) { sub_808B864(); task->data[0] = 1; |