From 4ec14b3d431f61309e33ca58c7702678bd25ae7a Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 8 Dec 2018 22:05:11 +0100
Subject: [PATCH] Finish field screen

---
 include/field_fadetransition.h                |  12 --
 include/field_screen.h                        |  18 ---
 include/field_screen_effect.h                 |  38 +++++-
 ld_script.txt                                 |   4 +-
 src/decoration.c                              |   2 +-
 src/egg_hatch.c                               |   2 +-
 src/field_control_avatar.c                    |   3 +-
 src/field_effect.c                            |   2 +-
 ...fadetransition.c => field_screen_effect.c} | 119 +++++++++---------
 src/field_specials.c                          |   2 +-
 src/item_use.c                                |   2 +-
 src/learn_move.c                              |  34 ++---
 src/overworld.c                               |   7 +-
 src/player_pc.c                               |   3 +-
 src/pokemon_storage_system.c                  |   2 +-
 src/record_mixing.c                           |   2 +-
 src/rom_8011DC0.c                             |   2 +-
 src/scrcmd.c                                  |   1 -
 src/secret_base.c                             |   4 +-
 src/shop.c                                    |   2 +-
 20 files changed, 132 insertions(+), 129 deletions(-)
 delete mode 100644 include/field_fadetransition.h
 delete mode 100644 include/field_screen.h
 rename src/{field_fadetransition.c => field_screen_effect.c} (90%)

diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h
deleted file mode 100644
index 7c2d16a24a..0000000000
--- a/include/field_fadetransition.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef GUARD_FIELD_FADETRANSITION_H
-#define GUARD_FIELD_FADETRANSITION_H
-
-void sub_80AF734(void);
-void sp13E_warp_to_last_warp(void);
-void sub_80AF7D0(void);
-void sp13F_fall_to_last_warp(void);
-
-void sub_80AF848(void);
-void sub_80AF87C(void);
-
-#endif // GUARD_FIELD_FADETRANSITION_H
diff --git a/include/field_screen.h b/include/field_screen.h
deleted file mode 100644
index f8598bea6f..0000000000
--- a/include/field_screen.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef GUARD_FIELD_SCREEN_H
-#define GUARD_FIELD_SCREEN_H
-
-// Exported type declarations
-
-// Exported RAM declarations
-
-// Exported ROM declarations
-void pal_fill_black(void);
-void sub_80AF168(void);
-void sub_80AF2B4(u8 taskId);
-void sub_80AF128(void);
-void sub_80AF80C(u8);
-void sub_80AF828(void);
-void sub_80AF838(void);
-void sub_80B0268(void);
-
-#endif //GUARD_FIELD_SCREEN_H
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index ef81c2f9ed..f3ac2e8661 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -1,8 +1,44 @@
 #ifndef GUARD_FIELD_SCREEN_EFFECT_H
 #define GUARD_FIELD_SCREEN_EFFECT_H
 
+void pal_fill_for_maplights(void);
+void pal_fill_black(void);
+void WarpFadeScreen(void);
+void sub_80AF128(void);
+void sub_80AF168(void);
+void sub_80AF188(void);
+void sub_80AF214(void);
+void sub_80AF2B4(u8 taskId);
+void sub_80AF314(void);
+void mapldr_default(void);
+void sub_80AF3B0(void);
+void sub_80AF3C8(void);
+void sub_80AF3E8(void);
+void sub_80AF40C(void);
+void sub_80AF688(void);
+bool8 sub_80AF6A4(void);
+void sub_80AF6D4(void);
+void sub_80AF6F0(void);
+void sub_80AF734(void);
+void sp13E_warp_to_last_warp(void);
 void sub_80AF79C(void);
-void sub_80B009C(u8);
+void sub_80AF7D0(void);
+void sp13F_fall_to_last_warp(void);
+void sub_80AF80C(u8 metatileBehavior);
+void sub_80AF828(void);
+void sub_80AF838(void);
+void sub_80AF848(void);
+void sub_80AF87C(void);
+void sub_80AF8B8(void);
+void sub_80AF948(void);
+void sub_80AF9F8(void);
+void sub_80AFC60(void);
+void sub_80B009C(u8 flashLevel);
+void door_upload_tiles(void);
 void sub_80B0244(void);
+void sub_80B0268(void);
+void sub_80B0534(void);
+void sub_80B058C(void);
+void sub_80B05B4(void);
 
 #endif // GUARD_FIELD_SCREEN_EFFECT_H
diff --git a/ld_script.txt b/ld_script.txt
index b97a7fb042..ef41a20fc5 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -115,7 +115,7 @@ SECTIONS {
         src/title_screen.o(.text);
         src/field_weather.o(.text);
         src/field_weather_effect.o(.text);
-        src/field_fadetransition.o(.text);
+        src/field_screen_effect.o(.text);
         asm/field_screen.o(.text);
         src/battle_setup.o(.text);
         src/cable_club.o(.text);
@@ -450,7 +450,7 @@ SECTIONS {
         data/field_weather.o(.rodata);
         src/field_weather.o(.rodata);
 		src/field_weather_effect.o(.rodata);
-		src/field_fadetransition.o(.rodata);
+		src/field_screen_effect.o(.rodata);
         src/battle_setup.o(.rodata);
         src/cable_club.o(.rodata);
         src/trainer_see.o(.rodata);
diff --git a/src/decoration.c b/src/decoration.c
index eb85b4f5ca..4e3e0a2d39 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -16,7 +16,7 @@
 #include "field_weather.h"
 #include "field_player_avatar.h"
 #include "field_camera.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "event_object_movement.h"
 #include "list_menu.h"
 #include "menu_helpers.h"
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 28386528a0..a8238253e3 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -30,7 +30,7 @@
 #include "field_weather.h"
 #include "international_string_util.h"
 #include "naming_screen.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "battle.h" // to get rid of later
 
 struct EggHatchData
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index c52f5190f1..829d72c34a 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -8,10 +8,9 @@
 #include "event_scripts.h"
 #include "fieldmap.h"
 #include "field_control_avatar.h"
-#include "field_fadetransition.h"
 #include "field_player_avatar.h"
 #include "field_poison.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "field_specials.h"
 #include "fldeff_80F9BCC.h"
 #include "item_menu.h"
diff --git a/src/field_effect.c b/src/field_effect.c
index 6bfa4facf2..58f4f03df1 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -6,7 +6,7 @@
 #include "field_effect.h"
 #include "field_effect_helpers.h"
 #include "field_player_avatar.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "field_weather.h"
 #include "fieldmap.h"
 #include "fldeff_groundshake.h"
diff --git a/src/field_fadetransition.c b/src/field_screen_effect.c
similarity index 90%
rename from src/field_fadetransition.c
rename to src/field_screen_effect.c
index 2d8a6c3036..0de86d4f46 100644
--- a/src/field_fadetransition.c
+++ b/src/field_screen_effect.c
@@ -5,9 +5,9 @@
 #include "field_camera.h"
 #include "field_door.h"
 #include "field_effect.h"
-#include "field_fadetransition.h"
 #include "event_object_movement.h"
 #include "field_player_avatar.h"
+#include "field_screen_effect.h"
 #include "field_special_scene.h"
 #include "field_weather.h"
 // #include "fldeff_flash.h"
@@ -40,29 +40,31 @@ 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);
 
 extern const u16 gUnknown_82EC7CC[];
 
-void sub_8080B9C(u8);
-void task_map_chg_seq_0807E20C(u8);
-void task_map_chg_seq_0807E2CC(u8);
-void task0A_fade_n_map_maybe(u8);
-void sub_808115C(u8);
-void palette_bg_faded_fill_white(void);
-u8 GetMapPairFadeToType(u8, u8);
-u8 GetMapPairFadeFromType(u8, u8);
-void sub_808C0A8(u8);
-void sub_80AF438(u8);
-bool32 sub_80AF71C(void);
-void task0A_mpl_807E31C(u8 taskId);
-void sub_80AFA0C(u8 taskId);
-void sub_80AFA88(u8 taskId);
-void sub_80B6B68(void);
-void sub_80B6E4C(u8, u8);
-void sub_80B75D8(u8);
-void sub_80B7A74(u8);
-/*static*/ void task50_0807F0C8(u8);
+// This file's functions.
+static void sub_8080B9C(u8);
+static void task_map_chg_seq_0807E20C(u8);
+static void task_map_chg_seq_0807E2CC(u8);
+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 void task0A_mpl_807E31C(u8 taskId);
+static void sub_80AFA0C(u8 taskId);
+static void sub_80AFA88(u8 taskId);
+static void task50_0807F0C8(u8);
 
+// const
 const u16 sFlashLevelPixelRadii[] = { 200, 72, 64, 56, 48, 40, 32, 24, 0 };
 const s32 gMaxFlashLevel = 8;
 
@@ -73,12 +75,13 @@ const struct ScanlineEffectParams sFlashEffectParams =
     1
 };
 
-void palette_bg_faded_fill_white(void)
+// code
+static void palette_bg_faded_fill_white(void)
 {
     CpuFastFill16(RGB_WHITE, gPlttBufferFaded, PLTT_SIZE);
 }
 
-void palette_bg_faded_fill_black(void)
+static void palette_bg_faded_fill_black(void)
 {
     CpuFastFill16(RGB_BLACK, gPlttBufferFaded, PLTT_SIZE);
 }
@@ -98,7 +101,7 @@ void pal_fill_for_maplights(void)
     }
 }
 
-void sub_80AF08C(void)
+static void sub_80AF08C(void)
 {
     palette_bg_faded_fill_white();
     FadeScreen(FADE_FROM_WHITE, 8);
@@ -123,12 +126,12 @@ void WarpFadeScreen(void)
     }
 }
 
-void sub_80AF0F4(u8 arg)
+static void sub_80AF0F4(u8 arg)
 {
     sub_808C0A8(!arg);
 }
 
-void task0A_nop_for_a_while(u8 taskId)
+static void task0A_nop_for_a_while(u8 taskId)
 {
     if (sub_80AF71C() == TRUE)
         DestroyTask(taskId);
@@ -142,7 +145,7 @@ void sub_80AF128(void)
     CreateTask(task0A_nop_for_a_while, 10);
 }
 
-void task0A_asap_script_env_2_enable_and_set_ctx_running(u8 taskID)
+static void task0A_asap_script_env_2_enable_and_set_ctx_running(u8 taskID)
 {
     if (sub_80AF71C() == TRUE)
     {
@@ -166,7 +169,7 @@ void sub_80AF188(void)
     CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10);
 }
 
-void task_mpl_807DD60(u8 taskId)
+static void task_mpl_807DD60(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
@@ -201,7 +204,7 @@ void sub_80AF214(void)
     CreateTask(task_mpl_807DD60, 10);
 }
 
-void sub_80AF234(u8 taskId)
+static void sub_80AF234(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
@@ -267,7 +270,7 @@ void sub_80AF314(void)
     CreateTask(sub_80AF234, 10);
 }
 
-void sub_80AF334(void)
+static void sub_80AF334(void)
 {
     s16 x, y;
     u8 behavior;
@@ -328,7 +331,7 @@ void sub_80AF40C(void)
     sub_8085540(0xE);
 }
 
-void sub_80AF438(u8 taskId)
+static void sub_80AF438(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
     s16 *x = &task->data[2];
@@ -377,7 +380,7 @@ void sub_80AF438(u8 taskId)
     }
 }
 
-void task_map_chg_seq_0807E20C(u8 taskId)
+static void task_map_chg_seq_0807E20C(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
     s16 *x = &task->data[2];
@@ -415,7 +418,7 @@ void task_map_chg_seq_0807E20C(u8 taskId)
     }
 }
 
-void task_map_chg_seq_0807E2CC(u8 taskId)
+static void task_map_chg_seq_0807E2CC(u8 taskId)
 {
     switch (gTasks[taskId].data[0])
     {
@@ -435,7 +438,7 @@ void task_map_chg_seq_0807E2CC(u8 taskId)
     }
 }
 
-void sub_80AF660(u8 taskId)
+static void sub_80AF660(u8 taskId)
 {
     if (sub_80AF71C() == TRUE)
     {
@@ -451,13 +454,13 @@ void sub_80AF688(void)
     ScriptContext2_Enable();
 }
 
-bool32 sub_80AF6A4(void)
+bool8 sub_80AF6A4(void)
 {
     sub_809FA18();
     return FALSE;
 }
 
-void task_mpl_807E3C8(u8 taskId)
+static void task_mpl_807E3C8(u8 taskId)
 {
     if (sub_80AF71C() == 1)
     {
@@ -482,12 +485,12 @@ void sub_80AF6F0(void)
     CreateTask(task_mpl_807E3C8, 10);
 }
 
-bool32 PaletteFadeActive(void)
+static bool32 PaletteFadeActive(void)
 {
     return gPaletteFade.active;
 }
 
-bool32 sub_80AF71C(void)
+static bool32 sub_80AF71C(void)
 {
     if (IsWeatherNotFadingIn() == TRUE)
         return TRUE;
@@ -587,7 +590,7 @@ void sub_80AF8B8(void)
     gFieldCallback = sub_80FB768;
 }
 
-void sub_80AF8E0(u8 taskId)
+static void sub_80AF8E0(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
@@ -618,7 +621,7 @@ void sub_80AF948(void)
     CreateTask(sub_80AF8E0, 10);
 }
 
-void sub_80AF96C(u8 taskId)
+static void sub_80AF96C(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
@@ -654,7 +657,7 @@ void sub_80AF9F8(void)
     CreateTask(sub_80AF96C, 10);
 }
 
-void sub_80AFA0C(u8 taskId)
+static void sub_80AFA0C(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
@@ -685,7 +688,7 @@ void sub_80AFA0C(u8 taskId)
     }
 }
 
-void sub_80AFA88(u8 taskId)
+static void sub_80AFA88(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
     s16 *x = &task->data[2];
@@ -738,7 +741,7 @@ void sub_80AFA88(u8 taskId)
     }
 }
 
-void task0A_fade_n_map_maybe(u8 taskId)
+static void task0A_fade_n_map_maybe(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
@@ -774,7 +777,7 @@ void sub_80AFC60(void)
     CreateTask(task0A_fade_n_map_maybe, 10);
 }
 
-/*static*/ void SetFlashScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right)
+static void SetFlashScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right)
 {
     if (y <= 160)
     {
@@ -790,7 +793,7 @@ void sub_80AFC60(void)
     }
 }
 
-/*static*/ void SetFlashScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius)
+static void SetFlashScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius)
 {
     s32 r = radius;
     s32 v2 = radius;
@@ -811,7 +814,7 @@ void sub_80AFC60(void)
     }
 }
 
-/*static*/ void SetFlash2ScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right)
+static void SetFlash2ScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right)
 {
     if (y <= 160)
     {
@@ -827,7 +830,7 @@ void sub_80AFC60(void)
     }
 }
 
-/*static*/ void SetFlash2ScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius)
+static void SetFlash2ScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius)
 {
     s32 r = radius;
     s32 v2 = radius;
@@ -855,7 +858,7 @@ void sub_80AFC60(void)
 #define tFlashRadiusDelta    data[5]
 #define tClearScanlineEffect data[6]
 
-/*static*/ void UpdateFlashLevelEffect(u8 taskId)
+static void UpdateFlashLevelEffect(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
@@ -889,7 +892,7 @@ void sub_80AFC60(void)
     }
 }
 
-/*static*/ void UpdateFlash2LevelEffect(u8 taskId)
+static void UpdateFlash2LevelEffect(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
@@ -923,7 +926,7 @@ void sub_80AFC60(void)
     }
 }
 
-/*static*/ void sub_80AFF90(u8 taskId)
+static void sub_80AFF90(u8 taskId)
 {
     if (!FuncIsActiveTask(UpdateFlashLevelEffect))
     {
@@ -932,13 +935,13 @@ void sub_80AFC60(void)
     }
 }
 
-/*static*/ void sub_80AFFB8(void)
+static void sub_80AFFB8(void)
 {
     if (!FuncIsActiveTask(sub_80AFF90))
         CreateTask(sub_80AFF90, 80);
 }
 
-/*static*/ u8 sub_80AFFDC(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta)
+static u8 sub_80AFFDC(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta)
 {
     u8 taskId = CreateTask(UpdateFlashLevelEffect, 80);
     s16 *data = gTasks[taskId].data;
@@ -957,7 +960,7 @@ void sub_80AFC60(void)
     return taskId;
 }
 
-/*static*/ u8 sub_80B003C(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta)
+static u8 sub_80B003C(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta)
 {
     u8 taskId = CreateTask(UpdateFlash2LevelEffect, 80);
     s16 *data = gTasks[taskId].data;
@@ -1007,7 +1010,7 @@ void door_upload_tiles(void)
     CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480);
 }
 
-void task0A_mpl_807E31C(u8 taskId)
+static void task0A_mpl_807E31C(u8 taskId)
 {
     switch (gTasks[taskId].data[0])
     {
@@ -1028,7 +1031,7 @@ void task0A_mpl_807E31C(u8 taskId)
     }
 }
 
-void sub_80B01BC(u8 taskId)
+static void sub_80B01BC(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
@@ -1074,7 +1077,7 @@ void sub_80B0268(void)
     CreateTask(sub_80B01BC, 10);
 }
 
-/*static*/ void sub_80B028C(u8 a1)
+static void sub_80B028C(u8 a1)
 {
     int i;
     u16 color[1];
@@ -1090,7 +1093,7 @@ void sub_80B0268(void)
     }
 }
 
-/*static*/ bool8 sub_80B02C8(u16 a1)
+static bool8 sub_80B02C8(u16 a1)
 {
     u8 lo = REG_BLDALPHA & 0xFF;
     u8 hi = REG_BLDALPHA >> 8;
@@ -1118,7 +1121,7 @@ void sub_80B0268(void)
         return FALSE;
 }
 
-/*static*/ void sub_80B0318(u8 taskId)
+static void sub_80B0318(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
@@ -1248,7 +1251,7 @@ void sub_80B05B4(void)
     CreateTask(task50_0807F0C8, 80);
 }
 
-/*static*/ void task50_0807F0C8(u8 taskId)
+static void task50_0807F0C8(u8 taskId)
 {
     if (BGMusicStopped() == TRUE)
     {
diff --git a/src/field_specials.c b/src/field_specials.c
index 4da751b271..0842555b9e 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -12,7 +12,7 @@
 #include "field_effect.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "field_specials.h"
 #include "field_weather.h"
 #include "international_string_util.h"
diff --git a/src/item_use.c b/src/item_use.c
index 4ab9f6e23f..8399a1861f 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -10,7 +10,7 @@
 #include "fieldmap.h"
 #include "event_object_movement.h"
 #include "field_player_avatar.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "field_weather.h"
 #include "item.h"
 #include "item_menu.h"
diff --git a/src/learn_move.c b/src/learn_move.c
index 7717a5193c..38e081a38c 100644
--- a/src/learn_move.c
+++ b/src/learn_move.c
@@ -5,7 +5,7 @@
 #include "contest_effect.h"
 #include "data2.h"
 #include "event_data.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "gpu_regs.h"
 #include "learn_move.h"
 #include "list_menu.h"
@@ -52,7 +52,7 @@ static EWRAM_DATA struct {
 const u16 gUnknown_085CE9F8[] = INCBIN_U16("graphics/interface/ui_learn_move.gbapal");
 const u8 gUnknown_085CEA18[] = INCBIN_U8("graphics/interface/ui_learn_move.4bpp");
 
-const struct OamData gUnknown_085CEB98 = 
+const struct OamData gUnknown_085CEB98 =
 {
     .y = 0,
     .affineMode = 0,
@@ -69,7 +69,7 @@ const struct OamData gUnknown_085CEB98 =
     .affineParam = 0,
 };
 
-const struct OamData gUnknown_085CEBA0 = 
+const struct OamData gUnknown_085CEBA0 =
 {
     .y = 0,
     .affineMode = 0,
@@ -86,7 +86,7 @@ const struct OamData gUnknown_085CEBA0 =
     .affineParam = 0,
 };
 
-const struct OamData gUnknown_085CEBA8 = 
+const struct OamData gUnknown_085CEBA8 =
 {
     .y = 0,
     .affineMode = 0,
@@ -103,20 +103,20 @@ const struct OamData gUnknown_085CEBA8 =
     .affineParam = 0,
 };
 
-const struct SpriteSheet gUnknown_085CEBB0 = 
+const struct SpriteSheet gUnknown_085CEBB0 =
 {
     .data = gUnknown_085CEA18,
     .size = 0x180,
     .tag = 5525
 };
 
-const struct SpritePalette gUnknown_085CEBB8 = 
+const struct SpritePalette gUnknown_085CEBB8 =
 {
     .data = gUnknown_085CE9F8,
     .tag = 5526
 };
 
-const struct ScrollArrowsTemplate gUnknown_085CEBC0 = 
+const struct ScrollArrowsTemplate gUnknown_085CEBC0 =
 {
     .firstArrowType = 0,
     .firstX = 27,
@@ -131,7 +131,7 @@ const struct ScrollArrowsTemplate gUnknown_085CEBC0 =
     .palNum = 0,
 };
 
-const struct ScrollArrowsTemplate gUnknown_085CEBD0 = 
+const struct ScrollArrowsTemplate gUnknown_085CEBD0 =
 {
     .firstArrowType = 2,
     .firstX = 192,
@@ -146,31 +146,31 @@ const struct ScrollArrowsTemplate gUnknown_085CEBD0 =
     .palNum = 0,
 };
 
-const union AnimCmd gUnknown_085CEBE0[] = 
+const union AnimCmd gUnknown_085CEBE0[] =
 {
     ANIMCMD_FRAME(8, 5, FALSE, FALSE),
     ANIMCMD_END
 };
 
-const union AnimCmd gUnknown_085CEBE8[] = 
+const union AnimCmd gUnknown_085CEBE8[] =
 {
     ANIMCMD_FRAME(9, 5, FALSE, FALSE),
     ANIMCMD_END
 };
 
-const union AnimCmd gUnknown_085CEBF0[] = 
+const union AnimCmd gUnknown_085CEBF0[] =
 {
     ANIMCMD_FRAME(10, 5, FALSE, FALSE),
     ANIMCMD_END
 };
 
-const union AnimCmd gUnknown_085CEBF8[] = 
+const union AnimCmd gUnknown_085CEBF8[] =
 {
     ANIMCMD_FRAME(11, 5, FALSE, FALSE),
     ANIMCMD_END
 };
 
-const union AnimCmd *const gUnknown_085CEC00[] = 
+const union AnimCmd *const gUnknown_085CEC00[] =
 {
     gUnknown_085CEBE0,
     gUnknown_085CEBE8,
@@ -178,7 +178,7 @@ const union AnimCmd *const gUnknown_085CEC00[] =
     gUnknown_085CEBF8,
 };
 
-const struct SpriteTemplate gUnknown_085CEC10 = 
+const struct SpriteTemplate gUnknown_085CEC10 =
 {
     .tileTag = 5525,
     .paletteTag = 5526,
@@ -707,7 +707,7 @@ static void CreateHearts(void)
     sLearnMoveStruct->scrollArrowTaskId2 = -1;
     sLearnMoveStruct->scrollArrowTaskId1 = -1;
     AddScrollArrows();
-    
+
     for (i = 0; i < 8; i++)
     {
         sLearnMoveStruct->spriteIds[i] = CreateSprite(&gUnknown_085CEC10, (i - (i / 4) * 4) * 8 + 104, (i / 4) * 8 + 36, 0);
@@ -791,7 +791,7 @@ void ShowHideHearts(s32 item)
     else
     {
         numHearts = (u8)(gContestEffects[gContestMoves[item].effect].appeal / 10);
-        
+
         if (numHearts == 0xFF)
         {
             numHearts = 0;
@@ -811,7 +811,7 @@ void ShowHideHearts(s32 item)
         }
 
         numHearts = (u8)(gContestEffects[gContestMoves[item].effect].jam / 10);
-        
+
         if (numHearts == 0xFF)
         {
             numHearts = 0;
diff --git a/src/overworld.c b/src/overworld.c
index a60ac9a541..8d86754870 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -4,18 +4,17 @@
 #include "battle_setup.h"
 #include "berry.h"
 #include "bg.h"
-// #include "cable_club.h"
+#include "cable_club.h"
 #include "clock.h"
 #include "event_data.h"
 #include "field_camera.h"
 #include "field_control_avatar.h"
 #include "field_effect.h"
-#include "field_fadetransition.h"
 #include "event_object_movement.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
 #include "field_screen_effect.h"
-// #include "field_special_scene.h"
+#include "field_special_scene.h"
 #include "field_specials.h"
 #include "field_tasks.h"
 #include "field_weather.h"
@@ -38,7 +37,7 @@
 #include "play_time.h"
 #include "random.h"
 #include "roamer.h"
-// #include "rotating_gate.h"
+#include "rotating_gate.h"
 #include "safari_zone.h"
 #include "save.h"
 #include "save_location.h"
diff --git a/src/player_pc.c b/src/player_pc.c
index 59ba363506..864c13acd1 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -3,9 +3,8 @@
 #include "bg.h"
 #include "decoration.h"
 #include "event_scripts.h"
-#include "field_fadetransition.h"
 #include "event_object_movement.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "field_weather.h"
 #include "international_string_util.h"
 #include "item.h"
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 465b97da26..ad56b16780 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "bg.h"
 #include "event_data.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "field_weather.h"
 #include "gpu_regs.h"
 #include "international_string_util.h"
diff --git a/src/record_mixing.c b/src/record_mixing.c
index df4a1a720c..a497f9cd8a 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -22,7 +22,7 @@
 #include "constants/songs.h"
 #include "menu.h"
 #include "overworld.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "fldeff_80F9BCC.h"
 #include "script.h"
 #include "event_data.h"
diff --git a/src/rom_8011DC0.c b/src/rom_8011DC0.c
index a197598de9..af4e031dc0 100644
--- a/src/rom_8011DC0.c
+++ b/src/rom_8011DC0.c
@@ -32,7 +32,7 @@
 #include "decompress.h"
 #include "start_menu.h"
 #include "data2.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 
 extern void HealPlayerParty(void);
 
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 3103873371..579f804e2b 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -13,7 +13,6 @@
 #include "event_data.h"
 #include "field_door.h"
 #include "field_effect.h"
-#include "field_fadetransition.h"
 #include "event_object_movement.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
diff --git a/src/secret_base.c b/src/secret_base.c
index 8436d85203..84d70061e9 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1,5 +1,3 @@
-
-// Includes
 #include "global.h"
 #include "constants/bg_event_constants.h"
 #include "constants/decorations.h"
@@ -19,7 +17,7 @@
 #include "fieldmap.h"
 #include "field_camera.h"
 #include "field_player_avatar.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "field_weather.h"
 #include "event_object_movement.h"
 #include "field_effect.h"
diff --git a/src/shop.c b/src/shop.c
index a0eddee014..9b78878bd6 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -6,7 +6,7 @@
 #include "decoration_inventory.h"
 #include "event_object_movement.h"
 #include "field_player_avatar.h"
-#include "field_screen.h"
+#include "field_screen_effect.h"
 #include "field_weather.h"
 #include "fieldmap.h"
 #include "gpu_regs.h"