Merge branch 'master' into pokenav-decomp-again

1 files changed, 13 insertions, 13 deletions

diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index b6dcf212c..5769f44af 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -44,7 +44,7 @@ static void task0A_fade_n_map_maybe(u8);
 static void sub_808115C(u8);
 static void palette_bg_faded_fill_white(void);
 static void sub_80AF438(u8);
-static bool32 sub_80AF71C(void);
+static bool32 WaitForWeatherFadeIn(void);
 static void task0A_mpl_807E31C(u8 taskId);
 static void sub_80AFA0C(u8 taskId);
 static void sub_80AFA88(u8 taskId);
@@ -119,7 +119,7 @@ static void sub_80AF0F4(u8 arg)
 
 static void task0A_nop_for_a_while(u8 taskId)
 {
-    if (sub_80AF71C() == TRUE)
+    if (WaitForWeatherFadeIn() == TRUE)
         DestroyTask(taskId);
 }
 
@@ -133,14 +133,14 @@ void sub_80AF128(void)
 
 static void task0A_asap_script_env_2_enable_and_set_ctx_running(u8 taskID)
 {
-    if (sub_80AF71C() == TRUE)
+    if (WaitForWeatherFadeIn() == TRUE)
     {
         DestroyTask(taskID);
         EnableBothScriptContexts();
     }
 }
 
-void sub_80AF168(void)
+void FieldCallback_ReturnToEventScript2(void)
 {
     ScriptContext2_Enable();
     Overworld_PlaySpecialMapMusic();
@@ -173,7 +173,7 @@ static void task_mpl_807DD60(u8 taskId)
         }
         break;
     case 2:
-        if (sub_80AF71C() == TRUE)
+        if (WaitForWeatherFadeIn() == TRUE)
         {
             ScriptContext2_Disable();
             DestroyTask(taskId);
@@ -213,7 +213,7 @@ static void sub_80AF234(u8 taskId)
         }
         break;
     case 2:
-        if (sub_80AF71C() == TRUE)
+        if (WaitForWeatherFadeIn() == TRUE)
         {
             sub_8009F18();
             ScriptContext2_Disable();
@@ -333,7 +333,7 @@ static void sub_80AF438(u8 taskId)
         task->data[0] = 1;
         break;
     case 1:
-        if (sub_80AF71C())
+        if (WaitForWeatherFadeIn())
         {
             u8 eventObjId;
             sub_80AF0F4(1);
@@ -381,7 +381,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
         task->data[0] = 1;
         break;
     case 1:
-        if (sub_80AF71C())
+        if (WaitForWeatherFadeIn())
         {
             u8 eventObjId;
             sub_80AF0F4(1);
@@ -414,7 +414,7 @@ static void task_map_chg_seq_0807E2CC(u8 taskId)
         gTasks[taskId].data[0]++;
         break;
     case 1:
-        if (sub_80AF71C())
+        if (WaitForWeatherFadeIn())
         {
             UnfreezeEventObjects();
             ScriptContext2_Disable();
@@ -426,7 +426,7 @@ static void task_map_chg_seq_0807E2CC(u8 taskId)
 
 static void sub_80AF660(u8 taskId)
 {
-    if (sub_80AF71C() == TRUE)
+    if (WaitForWeatherFadeIn() == TRUE)
     {
         DestroyTask(taskId);
         CreateTask(sub_809FA34, 80);
@@ -448,7 +448,7 @@ bool8 sub_80AF6A4(void)
 
 static void task_mpl_807E3C8(u8 taskId)
 {
-    if (sub_80AF71C() == 1)
+    if (WaitForWeatherFadeIn() == 1)
     {
         ScriptContext2_Disable();
         DestroyTask(taskId);
@@ -476,7 +476,7 @@ static bool32 PaletteFadeActive(void)
     return gPaletteFade.active;
 }
 
-static bool32 sub_80AF71C(void)
+static bool32 WaitForWeatherFadeIn(void)
 {
     if (IsWeatherNotFadingIn() == TRUE)
         return TRUE;
@@ -1007,7 +1007,7 @@ static void task0A_mpl_807E31C(u8 taskId)
         gTasks[taskId].data[0]++;
         break;
     case 1:
-        if (sub_80AF71C() && sub_808D1B4() != TRUE)
+        if (WaitForWeatherFadeIn() && sub_808D1B4() != TRUE)
         {
             UnfreezeEventObjects();
             ScriptContext2_Disable();