From 4327bee485510b424cbf28e450d90ff50e6fe78b Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 24 Jan 2018 23:34:17 -0500 Subject: merge field files into evobjmv.c. --- src/field/fldeff_berrytree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/field/fldeff_berrytree.c') diff --git a/src/field/fldeff_berrytree.c b/src/field/fldeff_berrytree.c index 0763c0314..43e29d7f0 100644 --- a/src/field/fldeff_berrytree.c +++ b/src/field/fldeff_berrytree.c @@ -1,5 +1,5 @@ #include "global.h" -#include "field_map_obj.h" +#include "evobjmv.h" #include "field_player_avatar.h" #include "script.h" -- cgit v1.2.3 From e74b0c6e51796d2c8c7fab6ef22f75d15a6c8786 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 17 Feb 2018 22:14:41 -0500 Subject: take your stupid fucking politically correct names since you dont care about authenticity --- src/field/fldeff_berrytree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/field/fldeff_berrytree.c') diff --git a/src/field/fldeff_berrytree.c b/src/field/fldeff_berrytree.c index 43e29d7f0..6b03e9952 100644 --- a/src/field/fldeff_berrytree.c +++ b/src/field/fldeff_berrytree.c @@ -1,5 +1,5 @@ #include "global.h" -#include "evobjmv.h" +#include "event_object_movement.h" #include "field_player_avatar.h" #include "script.h" -- cgit v1.2.3 From daa05c1b7c5e079ad8554e88a290e07b333bd2db Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 18 Feb 2018 19:59:51 -0600 Subject: remove subdirectories --- src/field/fldeff_berrytree.c | 56 -------------------------------------------- 1 file changed, 56 deletions(-) delete mode 100644 src/field/fldeff_berrytree.c (limited to 'src/field/fldeff_berrytree.c') diff --git a/src/field/fldeff_berrytree.c b/src/field/fldeff_berrytree.c deleted file mode 100644 index 6b03e9952..000000000 --- a/src/field/fldeff_berrytree.c +++ /dev/null @@ -1,56 +0,0 @@ -#include "global.h" -#include "event_object_movement.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); -} -- cgit v1.2.3