From c93915120f23a9545ff0743f506af3d58a1fabff Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 27 Feb 2020 11:45:08 -0500
Subject: Port many field_effect.c names from Emerald

---
 src/field_screen_effect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/field_screen_effect.c')

diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 0a3224cfa..39d7a2312 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -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:
-- 
cgit v1.2.3


From 62100376b71f54d6ca4b6f020c860e69368c2720 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Mon, 2 Mar 2020 00:19:11 -0500
Subject: Split/label some common event scripts

---
 src/field_screen_effect.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/field_screen_effect.c')

diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 0a3224cfa..3c9f2fc46 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);
@@ -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;
     }
-- 
cgit v1.2.3