diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-23 18:24:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-23 18:24:30 -0500 |
| commit | de2fe2cbbae599d9b336cb6762e3a03445cd5027 (patch) | |
| tree | d8cea366e68eca40bac0a6c0edf0c85a27eda520 /src/fldeff_berrytree.c | |
| parent | 294d223dd0218c64267b6b6851575150e36593fb (diff) | |
| parent | 22e6e3532900b2470d0134f1347981d77828b22c (diff) | |
Merge pull request #616 from huderlem/misc
Misc labeling
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 6b03e9952..fa4a7e76b 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 *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) - || FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerMapObj) + || FieldObjectClearAnimIfSpecialAnimFinished(playerMapObj)) { sub_8059D08(player_get_direction_lower_nybble()); - FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay16AnimId(player_get_direction_lower_nybble())); + FieldObjectSetSpecialAnim(playerMapObj, GetStepInPlaceDelay16AnimId(player_get_direction_lower_nybble())); gTasks[taskId].func = Task_WateringBerryTreeAnim_2; } } static void Task_WateringBerryTreeAnim_2(u8 taskId) { - struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; - if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject)) + struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + if (FieldObjectClearAnimIfSpecialAnimFinished(playerMapObj)) { s16 value = gTasks[taskId].data[1]++; if (value < 10) { - FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay16AnimId(player_get_direction_lower_nybble())); + FieldObjectSetSpecialAnim(playerMapObj, GetStepInPlaceDelay16AnimId(player_get_direction_lower_nybble())); } else { |