diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
| commit | b22d3a821d8656d9fb88000ce02e5b885a59e1c3 (patch) | |
| tree | 7d4054b0df9f5746b3e31623868bf7d604ae7328 /src/field_tasks.c | |
| parent | 8626240b54d87449e5db70345840ccf20717d8c7 (diff) | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
Diffstat (limited to 'src/field_tasks.c')
| -rw-r--r-- | src/field_tasks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_tasks.c b/src/field_tasks.c index 4c7b93f20..0eb3045e0 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -1,4 +1,5 @@ #include "global.h" +#include "gflib.h" #include "bike.h" #include "event_data.h" #include "field_camera.h" @@ -9,7 +10,6 @@ #include "overworld.h" #include "quest_log.h" #include "script.h" -#include "sound.h" #include "task.h" #include "constants/field_tasks.h" #include "constants/flags.h" @@ -61,7 +61,7 @@ static void Task_RunTimeBasedEvents(u8 taskId) if (!ScriptContext2_IsEnabled()) { - if (gQuestLogState != 2 && gQuestLogState != 3) + if (!QL_IS_PLAYBACK_STATE) { UpdateAmbientCry(&data[1], &data[2]); } |