diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-21 00:14:40 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-21 00:14:40 -0500 |
| commit | 7034f59c14fd6fad2634e9b35b405e2b33f75646 (patch) | |
| tree | 6c329c06e691eb8c702ff8b5982b1cb767e954de /src/fldeff_misc.c | |
| parent | 98b81722e73bbc97145c7b2b20e160084dbd3587 (diff) | |
Rename EventObj to ObjEvent
Diffstat (limited to 'src/fldeff_misc.c')
| -rw-r--r-- | src/fldeff_misc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index 8bb10685e..a1f8d14fa 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -1229,27 +1229,27 @@ static void Task_WateringBerryTreeAnim_0(u8 taskId) static void Task_WateringBerryTreeAnim_1(u8 taskId) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (!ObjectEventIsMovementOverridden(playerEventObj) - || ObjectEventClearHeldMovementIfFinished(playerEventObj)) + if (!ObjectEventIsMovementOverridden(playerObjEvent) + || ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { sub_808C228(GetPlayerFacingDirection()); - ObjectEventSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerObjEvent, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); gTasks[taskId].func = Task_WateringBerryTreeAnim_2; } } static void Task_WateringBerryTreeAnim_2(u8 taskId) { - struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (ObjectEventClearHeldMovementIfFinished(playerEventObj)) + if (ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { s16 value = gTasks[taskId].data[1]++; if (value < 10) - ObjectEventSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerObjEvent, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); else gTasks[taskId].func = Task_WateringBerryTreeAnim_3; |