Merge remote-tracking branch 'upstream/master' into battle-1

1 files changed, 0 insertions, 56 deletions

diff --git a/src/field/fldeff_berrytree.c b/src/field/fldeff_berrytree.c
deleted file mode 100644
index 0763c0314..000000000
--- a/src/field/fldeff_berrytree.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "global.h"
-#include "field_map_obj.h"
-#include "field_player_avatar.h"
-#include "script.h"
-
-static void Task_WateringBerryTreeAnim_0(u8);
-static void Task_WateringBerryTreeAnim_1(u8);
-static void Task_WateringBerryTreeAnim_2(u8);
-static void Task_WateringBerryTreeAnim_3(u8);
-
-static void Task_WateringBerryTreeAnim_0(u8 taskId)
-{
-    gTasks[taskId].func = Task_WateringBerryTreeAnim_1;
-}
-
-static void Task_WateringBerryTreeAnim_1(u8 taskId)
-{
-    struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject)
-        || FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
-    {
-        sub_8059D08(player_get_direction_lower_nybble());
-        FieldObjectSetSpecialAnim(mapObject, 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))
-    {
-        s16 value = gTasks[taskId].data[1]++;
-        
-        if (value < 10)
-        {
-            FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay16AnimId(player_get_direction_lower_nybble()));
-        }
-        else
-        {
-            gTasks[taskId].func = Task_WateringBerryTreeAnim_3;
-        }
-    }
-}
-
-static void Task_WateringBerryTreeAnim_3(u8 taskId)
-{
-    SetPlayerAvatarTransitionFlags(sub_80597D0());
-    DestroyTask(taskId);
-    EnableBothScriptContexts();
-}
-
-void DoWateringBerryTreeAnim(void)
-{
-    CreateTask(Task_WateringBerryTreeAnim_0, 80);
-}