diff --git a/asm/cable_club.s b/asm/cable_club.s
index 611b87eef..64d6088b1 100644
--- a/asm/cable_club.s
+++ b/asm/cable_club.s
@@ -1808,7 +1808,7 @@ _080B32E0:
 _080B32F8:
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r1, =gLinkType
 	ldr r2, =0x00002211
 	adds r0, r2, 0
@@ -1921,7 +1921,7 @@ _080B33E8:
 _080B3408:
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r0, =gLinkType
 	ldr r2, =0x00002211
 	adds r1, r2, 0
@@ -2399,7 +2399,7 @@ _080B382E:
 	bl ScriptContext2_Enable
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	bl sub_8009FAC
 	b _080B3864
 _080B3840:
@@ -2470,7 +2470,7 @@ _080B38C6:
 	bl ScriptContext2_Enable
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	bl Rfu_set_zero
 	b _080B38FC
 _080B38D8:
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index 86c78d2cf..db2ffac14 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -652,7 +652,7 @@ sub_811A7E4: @ 811A7E4
 _0811A804:
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	b _0811A840
 _0811A80E:
 	ldr r0, =gPaletteFade
diff --git a/asm/field_screen.s b/asm/field_screen.s
index 1792b9cc8..5e9452d71 100644
--- a/asm/field_screen.s
+++ b/asm/field_screen.s
@@ -1625,8 +1625,8 @@ _080ABCBC:
 	.pool
 	thumb_func_end sub_80ABC7C
 
-	thumb_func_start fade_screen
-fade_screen: @ 80ABCD0
+	thumb_func_start FadeScreen
+FadeScreen: @ 80ABCD0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -1762,7 +1762,7 @@ _080ABDE4:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end fade_screen
+	thumb_func_end FadeScreen
 
 	thumb_func_start sub_80ABDFC
 sub_80ABDFC: @ 80ABDFC
@@ -7537,8 +7537,8 @@ GetSav1Weather: @ 80AEDAC
 	.pool
 	thumb_func_end GetSav1Weather
 
-	thumb_func_start sub_80AEDBC
-sub_80AEDBC: @ 80AEDBC
+	thumb_func_start SetSav1WeatherFromCurrMapHeader
+SetSav1WeatherFromCurrMapHeader: @ 80AEDBC
 	push {r4,r5,lr}
 	ldr r4, =gSaveBlock1Ptr
 	ldr r0, [r4]
@@ -7559,7 +7559,7 @@ sub_80AEDBC: @ 80AEDBC
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80AEDBC
+	thumb_func_end SetSav1WeatherFromCurrMapHeader
 
 	thumb_func_start sub_80AEDF0
 sub_80AEDF0: @ 80AEDF0
@@ -7872,13 +7872,13 @@ _080AF06A:
 	bl palette_bg_faded_fill_black
 	movs r0, 0
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	b _080AF084
 _080AF078:
 	bl palette_bg_faded_fill_white
 	movs r0, 0x2
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 _080AF084:
 	pop {r4}
 	pop {r0}
@@ -7891,7 +7891,7 @@ sub_80AF08C: @ 80AF08C
 	bl palette_bg_faded_fill_white
 	movs r0, 0x2
 	movs r1, 0x8
-	bl fade_screen
+	bl FadeScreen
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80AF08C
@@ -7902,7 +7902,7 @@ pal_fill_black: @ 80AF0A0
 	bl palette_bg_faded_fill_black
 	movs r0, 0
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	pop {r0}
 	bx r0
 	thumb_func_end pal_fill_black
@@ -7928,12 +7928,12 @@ sub_80AF0B4: @ 80AF0B4
 _080AF0DA:
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	b _080AF0EC
 _080AF0E4:
 	movs r0, 0x3
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 _080AF0EC:
 	pop {r4}
 	pop {r0}
@@ -8761,7 +8761,7 @@ sub_80AF79C: @ 80AF79C
 	bl music_something
 	movs r0, 0x3
 	movs r1, 0x8
-	bl fade_screen
+	bl FadeScreen
 	bl play_some_sound
 	ldr r0, =gFieldCallback
 	ldr r1, =sub_80AF3B0
@@ -8990,7 +8990,7 @@ _080AF99A:
 	bl sub_8009FAC
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	bl music_something
 	movs r0, 0x9
 	bl PlaySE
diff --git a/asm/item_use.s b/asm/item_use.s
index 0d9f30ec3..8c9e854c7 100644
--- a/asm/item_use.s
+++ b/asm/item_use.s
@@ -1482,7 +1482,7 @@ _080FDBC8:
 	str r1, [r0]
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r0, =sub_80FDC00
 	str r0, [r5]
 _080FDBDA:
diff --git a/asm/link.s b/asm/link.s
index 1ad160340..76c6521cf 100644
--- a/asm/link.s
+++ b/asm/link.s
@@ -21684,7 +21684,7 @@ _080148CC:
 	bne _080149B2
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	movs r0, 0x2
 	strh r0, [r7]
 	b _080149B2
diff --git a/asm/overworld.s b/asm/overworld.s
index 2858fb6d3..3e041d25f 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -1383,7 +1383,7 @@ _080850C8:
 	adds r1, r5, 0
 	bl TryUpdateRandomTrainerRematches
 	bl DoTimeBasedEvents
-	bl sub_80AEDBC
+	bl SetSav1WeatherFromCurrMapHeader
 	bl sub_8085B2C
 	bl update_sav1_flash_used_on_map
 	bl Overworld_ClearSavedMusic
@@ -1483,7 +1483,7 @@ _080851A2:
 	beq _080851EE
 	bl DoTimeBasedEvents
 _080851EE:
-	bl sub_80AEDBC
+	bl SetSav1WeatherFromCurrMapHeader
 	bl sub_8085B2C
 	cmp r5, 0
 	beq _08085200
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 429b629ea..0dc03a1e2 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -17171,7 +17171,7 @@ sub_81B9404: @ 81B9404
 	bl ScriptContext2_Enable
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r0, =sub_81B9424
 	movs r1, 0xA
 	bl CreateTask
@@ -17247,7 +17247,7 @@ sub_81B94B0: @ 81B94B0
 	bl ScriptContext2_Enable
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r0, =sub_81B94D0
 	movs r1, 0xA
 	bl CreateTask
@@ -17297,7 +17297,7 @@ sub_81B951C: @ 81B951C
 	bl ScriptContext2_Enable
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r0, =sub_81B953C
 	movs r1, 0xA
 	bl CreateTask
@@ -17418,7 +17418,7 @@ sub_81B9620: @ 81B9620
 	bl ScriptContext2_Enable
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r0, =sub_81B9640
 	movs r1, 0xA
 	bl CreateTask
diff --git a/asm/player_pc.s b/asm/player_pc.s
index 3f08d3f5c..5d9314f80 100644
--- a/asm/player_pc.s
+++ b/asm/player_pc.s
@@ -552,7 +552,7 @@ sub_816B2C8: @ 816B2C8
 	str r0, [r1]
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	pop {r0}
 	bx r0
 	.pool
@@ -1221,7 +1221,7 @@ sub_816B878: @ 816B878
 	lsrs r4, 24
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r1, =gTasks
 	lsls r0, r4, 2
 	adds r0, r4
@@ -1494,7 +1494,7 @@ sub_816BABC: @ 816BABC
 _0816BAD4:
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r0, =gTasks
 	lsls r1, r4, 2
 	adds r1, r4
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index c105c7781..8fc10ba29 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -406,7 +406,7 @@ _080C7428:
 _080C745C:
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	movs r0, 0x4
 	strh r0, [r5, 0x8]
 	b _080C756A
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index 2817b55b1..a04939c12 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -2049,7 +2049,7 @@ sub_81C4F24: @ 81C4F24
 	bl ScriptContext2_Enable
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r0, =sub_81C4F44
 	movs r1, 0xA
 	bl CreateTask
diff --git a/asm/pokenav.s b/asm/pokenav.s
index 896d9aae0..52fe65d65 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -44,7 +44,7 @@ sub_81C72A4: @ 81C72A4
 	bl SetMainCallback2
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	pop {r0}
 	bx r0
 	.pool
diff --git a/asm/shop.s b/asm/shop.s
index eacef5837..70429c7cf 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -188,7 +188,7 @@ HandleShopMenuBuy: @ 80DFBD0
 	str r0, [r1]
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -216,7 +216,7 @@ HandleShopMenuSell: @ 80DFC0C
 	str r0, [r1]
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	pop {r4}
 	pop {r0}
 	bx r0
diff --git a/asm/start_menu.s b/asm/start_menu.s
index 518b46f76..93bef1ef2 100644
--- a/asm/start_menu.s
+++ b/asm/start_menu.s
@@ -449,7 +449,7 @@ _0809FB34:
 	beq _0809FBA0
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	b _0809FBA0
 	.pool
 _0809FB98:
diff --git a/include/field_weather.h b/include/field_weather.h
index 0bdebf747..5d1aa5ac2 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -139,7 +139,7 @@ enum
     FADE_TO_WHITE,
 };
 
-void FadeScreen(u8, u8);
+void FadeScreen(u8, s8);
 // ...
 void UpdateSpritePaletteWithWeather(u8 tag);
 void ApplyWeatherGammaShiftToPal(u8);
diff --git a/src/decoration.c b/src/decoration.c
index a9777c86f..68a455285 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -529,7 +529,7 @@ void SecretBasePC_PutAway(u8 taskId)
     {
         sub_8126A58(0);
         sub_8197434(0, 0);
-        fade_screen(1, 0);
+        FadeScreen(1, 0);
         gTasks[taskId].data[2] = 0;
         gTasks[taskId].func = sub_8129ABC;
     }
@@ -1247,7 +1247,7 @@ void sub_8127F68(u8 taskId)
     {
         if (sub_8127F38() == TRUE)
         {
-            fade_screen(1, 0);
+            FadeScreen(1, 0);
             gTasks[taskId].data[2] = 0;
             gTasks[taskId].func = sub_8128060;
         }
@@ -1661,7 +1661,7 @@ void sub_8128BA0(u8 taskId)
 
 void sub_8128BBC(u8 taskId)
 {
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
     gTasks[taskId].data[2] = 0;
     gTasks[taskId].func = c1_overworld_prev_quest;
 }
@@ -2635,7 +2635,7 @@ void sub_812A1A0(u8 taskId)
 
 void sub_812A1C0(u8 taskId)
 {
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
     gTasks[taskId].data[2] = 0;
     gTasks[taskId].func = sub_81298EC;
 }
@@ -2654,7 +2654,7 @@ void sub_812A210(u8 taskId)
 
 void sub_812A22C(u8 taskId)
 {
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
     gTasks[taskId].data[2] = 0;
     gTasks[taskId].func = sub_812A25C;
 }
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 435886638..e8f22e903 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -61,7 +61,7 @@ extern u8 sav1_map_get_name(void);
 extern s8 ProcessMenuInputNoWrap_(void);
 extern void TVShowConvertInternationalString(u8* str1, u8* str2, u8);
 extern void sub_806A068(u16, u8);
-extern void fade_screen(u8, u8);
+extern void FadeScreen(u8, u8);
 extern void overworld_free_bg_tilemaps(void);
 extern void sub_80AF168(void);
 extern void AllocateMonSpritesGfx(void);
@@ -465,7 +465,7 @@ void EggHatch(void)
 {
     ScriptContext2_Enable();
     CreateTask(Task_EggHatch, 10);
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
 }
 
 static void Task_EggHatch(u8 taskID)
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 0557cd95e..1768f0d4c 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -638,7 +638,7 @@ static bool8 IsPaletteNotActive(void)
 
 bool8 ScrCmd_fadescreen(struct ScriptContext *ctx)
 {
-    fade_screen(ScriptReadByte(ctx), 0);
+    FadeScreen(ScriptReadByte(ctx), 0);
     SetupNativeScript(ctx, IsPaletteNotActive);
     return TRUE;
 }
@@ -648,7 +648,7 @@ bool8 ScrCmd_fadescreenspeed(struct ScriptContext *ctx)
     u8 mode = ScriptReadByte(ctx);
     u8 speed = ScriptReadByte(ctx);
 
-    fade_screen(mode, speed);
+    FadeScreen(mode, speed);
     SetupNativeScript(ctx, IsPaletteNotActive);
     return TRUE;
 }
@@ -662,12 +662,12 @@ bool8 ScrCmd_fadescreenswapbuffers(struct ScriptContext *ctx)
         case 1:
         default:
             CpuCopy32(gPlttBufferUnfaded, gPaletteDecompressionBuffer, PLTT_DECOMP_BUFFER_SIZE);
-            fade_screen(mode, 0);
+            FadeScreen(mode, 0);
             break;
         case 0:
         case 2:
             CpuCopy32(gPaletteDecompressionBuffer, gPlttBufferUnfaded, PLTT_DECOMP_BUFFER_SIZE);
-            fade_screen(mode, 0);
+            FadeScreen(mode, 0);
             break;
     }
 
@@ -726,7 +726,7 @@ bool8 ScrCmd_setweather(struct ScriptContext *ctx)
 
 bool8 ScrCmd_resetweather(struct ScriptContext *ctx)
 {
-    sub_80AEDBC();
+    SetSav1WeatherFromCurrMapHeader();
     return FALSE;
 }
 
diff --git a/src/secret_base.c b/src/secret_base.c
index bf6bec1f8..61c2511b7 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -394,7 +394,7 @@ void sub_80E8FD0(u8 taskId)
 void sub_80E9068(void)
 {
     CreateTask(sub_80E8FD0, 0);
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
     saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
 }
 
@@ -451,7 +451,7 @@ void sub_80E916C(u8 taskId)
 void sub_80E91F8(void)
 {
     CreateTask(sub_80E916C, 0);
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
 }
 
 bool8 CurrentMapIsSecretBase(void)
@@ -651,7 +651,7 @@ void sub_80E96A4(u8 taskId)
 void sub_80E9728(void)
 {
     CreateTask(sub_80E96A4, 0);
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
 }
 
 void sub_80E9744(void)