diff options
Diffstat (limited to 'src/fldeff_berrytree.c')
| -rw-r--r-- | src/fldeff_berrytree.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/fldeff_berrytree.c b/src/fldeff_berrytree.c index 7b7a454b3..8ff418ee6 100644 --- a/src/fldeff_berrytree.c +++ b/src/fldeff_berrytree.c @@ -15,26 +15,26 @@ static void Task_WateringBerryTreeAnim_0(u8 taskId) static void Task_WateringBerryTreeAnim_1(u8 taskId) { - struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (!FieldObjectIsMovementOverridden(playerMapObj) - || FieldObjectClearHeldMovementIfFinished(playerMapObj)) + struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + if (!EventObjectIsMovementOverridden(playerEventObj) + || EventObjectClearHeldMovementIfFinished(playerEventObj)) { sub_8059D08(GetPlayerFacingDirection()); - FieldObjectSetHeldMovement(playerMapObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); + EventObjectSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); gTasks[taskId].func = Task_WateringBerryTreeAnim_2; } } static void Task_WateringBerryTreeAnim_2(u8 taskId) { - struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (FieldObjectClearHeldMovementIfFinished(playerMapObj)) + struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + if (EventObjectClearHeldMovementIfFinished(playerEventObj)) { s16 value = gTasks[taskId].data[1]++; if (value < 10) { - FieldObjectSetHeldMovement(playerMapObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); + EventObjectSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); } else { |