1 files changed, 11 insertions, 25 deletions

diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 93017f125..b6dcf212c 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -10,7 +10,6 @@
 #include "field_screen_effect.h"
 #include "field_special_scene.h"
 #include "field_weather.h"
-// #include "fldeff_flash.h"
 #include "gpu_regs.h"
 #include "link.h"
 #include "link_rfu.h"
@@ -31,22 +30,9 @@
 #include "constants/event_object_movement_constants.h"
 #include "constants/songs.h"
 #include "constants/rgb.h"
-
-extern bool32 sub_81D6534(void);
-extern bool8 walkrun_is_standing_still(void);
-extern void ScriptUnfreezeEventObjects(void);
-extern void sub_80FB768(void);
-extern void sub_808D194(void);
-extern void sub_808D1C8(void);
-extern bool32 sub_808D1B4(void);
-extern bool32 sub_808D1E8(void);
-extern void sub_80B6B68(void);
-extern void sub_80B6E4C(u8, u8);
-extern void sub_80B75D8(u8);
-extern void sub_80B7A74(u8);
-extern void sub_808C0A8(u8);
-extern u8 GetMapPairFadeToType(u8, u8);
-extern u8 GetMapPairFadeFromType(u8, u8);
+#include "trainer_hill.h"
+#include "event_obj_lock.h"
+#include "fldeff.h"
 
 extern const u16 gUnknown_82EC7CC[];
 
@@ -255,7 +241,7 @@ void sub_80AF2B4(u8 taskId)
         break;
     case 2:
         sub_8009F18();
-        sub_8086C2C();
+        ResetAllMultiplayerState();
         ScriptContext2_Disable();
         DestroyTask(taskId);
         break;
@@ -503,7 +489,7 @@ void DoWarp(void)
     ScriptContext2_Enable();
     TryFadeOutOldMapMusic();
     WarpFadeScreen();
-    PlayRainSoundEffect();
+    PlayRainStoppingSoundEffect();
     PlaySE(SE_KAIDAN);
     gFieldCallback = mapldr_default;
     CreateTask(sub_80AFA0C, 10);
@@ -514,7 +500,7 @@ void DoDiveWarp(void)
     ScriptContext2_Enable();
     TryFadeOutOldMapMusic();
     WarpFadeScreen();
-    PlayRainSoundEffect();
+    PlayRainStoppingSoundEffect();
     gFieldCallback = mapldr_default;
     CreateTask(sub_80AFA0C, 10);
 }
@@ -524,7 +510,7 @@ void sub_80AF79C(void)
     ScriptContext2_Enable();
     TryFadeOutOldMapMusic();
     FadeScreen(FADE_TO_WHITE, 8);
-    PlayRainSoundEffect();
+    PlayRainStoppingSoundEffect();
     gFieldCallback = sub_80AF3B0;
     CreateTask(sub_80AFA0C, 10);
 }
@@ -621,7 +607,7 @@ void sub_80AF948(void)
     CreateTask(sub_80AF8E0, 10);
 }
 
-static void sub_80AF96C(u8 taskId)
+static void Task_ReturnToWorldFromLinkRoom(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
@@ -654,7 +640,7 @@ static void sub_80AF96C(u8 taskId)
 
 void sub_80AF9F8(void)
 {
-    CreateTask(sub_80AF96C, 10);
+    CreateTask(Task_ReturnToWorldFromLinkRoom, 10);
 }
 
 static void sub_80AFA0C(u8 taskId)
@@ -734,7 +720,7 @@ static void sub_80AFA88(u8 taskId)
     case 4:
         TryFadeOutOldMapMusic();
         WarpFadeScreen();
-        PlayRainSoundEffect();
+        PlayRainStoppingSoundEffect();
         task->data[0] = 0;
         task->func = sub_80AFA0C;
         break;
@@ -771,7 +757,7 @@ void sub_80AFC60(void)
     ScriptContext2_Enable();
     TryFadeOutOldMapMusic();
     WarpFadeScreen();
-    PlayRainSoundEffect();
+    PlayRainStoppingSoundEffect();
     PlaySE(SE_KAIDAN);
     gFieldCallback = sub_80AF3C8;
     CreateTask(task0A_fade_n_map_maybe, 10);