diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-09-28 17:13:59 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-09-28 17:13:59 -0400 |
| commit | 0cac170dfd3bfa9c2386b0b230655ace9dea7f11 (patch) | |
| tree | 482835fe4eb9347f9f365b683cd188ed88d7f1b7 /src/field/field_tasks.c | |
| parent | eb1da945b499641e0e1eb0283a05a001df0bfd32 (diff) | |
| parent | c1c2015f7046676b043641c0d1f9d9e29bc73647 (diff) | |
merge
Diffstat (limited to 'src/field/field_tasks.c')
| -rw-r--r-- | src/field/field_tasks.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/field/field_tasks.c b/src/field/field_tasks.c index caf2ce6b9..2be54f923 100644 --- a/src/field/field_tasks.c +++ b/src/field/field_tasks.c @@ -10,7 +10,7 @@ #include "item.h" #include "items.h" #include "event_data.h" -#include "rom4.h" +#include "overworld.h" #include "clock.h" #include "script.h" #include "field_special_scene.h" @@ -48,21 +48,25 @@ void Task_RunPerStepCallback(u8 taskId) gUnknown_08376364[idx](taskId); } -static void RunTimeBasedEvents(s16 *taskData) +#define tState data[0] +#define tAmbientCryState data[1] +#define tAmbientCryDelay data[2] + +static void RunTimeBasedEvents(s16 *data) { - switch (*taskData) + switch (tState) { case 0: if (gMain.vblankCounter1 & 0x1000) { DoTimeBasedEvents(); - (*taskData)++; + tState++; } break; case 1: if (!(gMain.vblankCounter1 & 0x1000)) { - (*taskData)--; + tState--; } break; } @@ -70,14 +74,19 @@ static void RunTimeBasedEvents(s16 *taskData) void Task_RunTimeBasedEvents(u8 taskId) { - s16 *taskData = gTasks[taskId].data; + s16 *data = gTasks[taskId].data; + if (!ScriptContext2_IsEnabled()) { - RunTimeBasedEvents(taskData); - sub_80540D0(taskData + 1, taskData + 2); + RunTimeBasedEvents(data); + UpdateAmbientCry(&tAmbientCryState, &tAmbientCryDelay); } } +#undef tState +#undef tAmbientCryState +#undef tAmbientCryDelay + void Task_MuddySlope(u8); void SetUpFieldTasks(void) |