diff options
| author | Martin Griffin <martinrgriffin@gmail.com> | 2019-12-27 14:50:07 +0000 |
|---|---|---|
| committer | Martin Griffin <martinrgriffin@gmail.com> | 2019-12-27 16:31:07 +0000 |
| commit | 8fb5ce57900a607348d7d6d01ce9f699867d0c2b (patch) | |
| tree | 8e729050f6f175f7ae8824b015219774e6a53ab9 /src/field_fadetransition.c | |
| parent | 4d7a5b165f96dd1788364523eb160041157d3004 (diff) | |
Decompile field_screen_effect
Diffstat (limited to 'src/field_fadetransition.c')
| -rw-r--r-- | src/field_fadetransition.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index 6627aaf48..e2da82de2 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -330,7 +330,7 @@ static void sub_807DFBC(u8 taskId) case 5: sub_807DCB0(0); FreezeObjectEvents(); - sub_807F114(); + DoOutwardBarnDoorWipe(); sub_807DBAC(); task->data[0] = 6; break; @@ -362,7 +362,7 @@ static void sub_807DFBC(u8 taskId) } break; case 9: - if (sub_807E418() && walkrun_is_standing_still() && !FieldIsDoorAnimationRunning() && !FuncIsActiveTask(sub_807F204)) + if (sub_807E418() && walkrun_is_standing_still() && !FieldIsDoorAnimationRunning() && !FuncIsActiveTask(Task_BarnDoorWipe)) { ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]); task->data[0] = 4; @@ -627,7 +627,7 @@ static void sub_807E5EC(u8 taskId) task->data[0]++; break; case 1: - if (!sub_807E40C() && sub_8055FC4()) + if (!sub_807E40C() && BGMusicStopped()) task->data[0]++; break; case 2: @@ -660,7 +660,7 @@ static void sub_807E678(u8 taskId) data[0]++; break; case 1: - if (!sub_807E40C() && sub_8055FC4()) + if (!sub_807E40C() && BGMusicStopped()) { sub_800AAC0(); data[0]++; @@ -693,7 +693,7 @@ static void sub_807E718(u8 taskId) task->data[0]++; break; case 1: - if (!sub_807E40C() && sub_8055FC4()) + if (!sub_807E40C() && BGMusicStopped()) task->data[0]++; break; case 2: @@ -724,7 +724,7 @@ static void sub_807E784(u8 taskId) } break; case 2: - if (!sub_807E40C() && sub_8055FC4()) + if (!sub_807E40C() && BGMusicStopped()) task->data[0]++; break; case 3: @@ -828,7 +828,7 @@ static void sub_807E980(u8 taskId) break; case 3: sub_807EAC4(data[2], data[3], &data[4], &data[5], &data[6]); - if (!sub_807E40C() && sub_8055FC4()) + if (!sub_807E40C() && BGMusicStopped()) data[0]++; break; default: |