diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
| commit | 99e4de062ae43aa978ad4f1a8cd70bc739c64c9d (patch) | |
| tree | 1164d31577e6ebddc1cb313d40bb69ce0d426170 /src/field_screen_effect.c | |
| parent | 339c2914affc3c62ac9a5725aa1a0c7ccc3161ca (diff) | |
| parent | 6af8c04d8fa6aaeaeb6c8b919e7770a65b9a883d (diff) | |
Merge branch 'master' into event_object_movement
Diffstat (limited to 'src/field_screen_effect.c')
| -rw-r--r-- | src/field_screen_effect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 0a3224cfa..85739ad24 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -212,7 +212,7 @@ void WriteFlashScanlineEffectBuffer(u8 flashLevel) } } -void sub_807F0B0(void) +void Script_FadeOutMapMusic(void) { Overworld_FadeOutMapMusic(); CreateTask(Task_EnableScriptAfterMusicFade, 80); @@ -430,7 +430,7 @@ static void sub_807F45C(u8 taskId) CopyWindowToVram(windowId, 1); RemoveWindow(windowId); palette_bg_faded_fill_black(); - sub_807DC00(); + FadeInFromBlack(); ++gTasks[taskId].data[0]; break; case 3: @@ -444,7 +444,7 @@ static void sub_807F45C(u8 taskId) if (sub_807E418() == TRUE) { DestroyTask(taskId); - ScriptContext1_SetupScript(EventScript_MomHeal); + ScriptContext1_SetupScript(EventScript_AfterWhiteOutMomHeal); } break; } |