Document overworld whiteout funcs

asm/field_control_avatar.s

@@ -1822,11 +1822,11 @@ _0806D6EC:
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0806D704
-	ldr r0, _0806D700 @ =gUnknown_81A8DFD
+	ldr r0, _0806D700 @ =EventScript_PoisonWhiteOut
 	bl ScriptContext1_SetupScript
 	b _0806D730
 	.align 2, 0
-_0806D700: .4byte gUnknown_81A8DFD
+_0806D700: .4byte EventScript_PoisonWhiteOut
 _0806D704:
 	bl ShouldEggHatch
 	lsls r0, 24

asm/field_screen_effect.s

@@ -985,25 +985,25 @@ _0807F5B6:
 	bne _0807F5E4
 	adds r0, r6, 0
 	bl DestroyTask
-	ldr r0, _0807F5CC @ =gUnknown_81A8D97
+	ldr r0, _0807F5CC @ =EventScript_AfterWhiteOutHeal
 	bl ScriptContext1_SetupScript
 	b _0807F5E4
 	.align 2, 0
-_0807F5CC: .4byte gUnknown_81A8D97
+_0807F5CC: .4byte EventScript_AfterWhiteOutHeal
 _0807F5D0:
 	bl sub_807E418
 	cmp r0, 0x1
 	bne _0807F5E4
 	adds r0, r6, 0
 	bl DestroyTask
-	ldr r0, _0807F5EC @ =gUnknown_81A8DD8
+	ldr r0, _0807F5EC @ =EventScript_MomHeal
 	bl ScriptContext1_SetupScript
 _0807F5E4:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0807F5EC: .4byte gUnknown_81A8DD8
+_0807F5EC: .4byte EventScript_MomHeal
 	thumb_func_end sub_807F45C
 
 	thumb_func_start sub_807F5F0

asm/overworld.s

@@ -15,7 +15,7 @@ sub_8054BC8: @ 8054BC8
 	movs r0, 0xA4
 	lsls r0, 2
 	adds r4, r0
-	bl sub_8054C04
+	bl ComputeWhiteOutMoneyLoss
 	adds r1, r0, 0
 	adds r0, r4, 0
 	bl RemoveMoney
@@ -31,17 +31,17 @@ _08054BFC: .4byte gUnknown_81A654B
 _08054C00: .4byte gSaveBlock1Ptr
 	thumb_func_end sub_8054BC8
 
-	thumb_func_start sub_8054C04
+	thumb_func_start ComputeWhiteOutMoneyLoss
-sub_8054C04: @ 8054C04
+ComputeWhiteOutMoneyLoss: @ 8054C04
 	push {r4,lr}
-	bl sub_8054C70
+	bl CountBadgesForOverworldWhiteOutLossCalculation
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
 	bl GetPlayerPartyHighestLevel
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r1, _08054C40 @ =gUnknown_826D294
+	ldr r1, _08054C40 @ =sWhiteOutMoneyLossMultipliers
 	adds r4, r1
 	ldrb r1, [r4]
 	lsls r1, 2
@@ -62,14 +62,14 @@ _08054C38:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08054C40: .4byte gUnknown_826D294
+_08054C40: .4byte sWhiteOutMoneyLossMultipliers
 _08054C44: .4byte gSaveBlock1Ptr
-	thumb_func_end sub_8054C04
+	thumb_func_end ComputeWhiteOutMoneyLoss
 
-	thumb_func_start sub_8054C48
+	thumb_func_start Special_OverworldWhiteOutGetMoneyLoss
-sub_8054C48: @ 8054C48
+Special_OverworldWhiteOutGetMoneyLoss: @ 8054C48
 	push {r4,r5,lr}
-	bl sub_8054C04
+	bl ComputeWhiteOutMoneyLoss
 	adds r4, r0, 0
 	ldr r5, _08054C6C @ =gStringVar1
 	bl CountDigits
@@ -85,14 +85,14 @@ sub_8054C48: @ 8054C48
 	bx r0
 	.align 2, 0
 _08054C6C: .4byte gStringVar1
-	thumb_func_end sub_8054C48
+	thumb_func_end Special_OverworldWhiteOutGetMoneyLoss
 
-	thumb_func_start sub_8054C70
+	thumb_func_start CountBadgesForOverworldWhiteOutLossCalculation
-sub_8054C70: @ 8054C70
+CountBadgesForOverworldWhiteOutLossCalculation: @ 8054C70
 	push {r4-r6,lr}
 	movs r6, 0
 	movs r5, 0
-	ldr r4, _08054C9C @ =gUnknown_826D29E
+	ldr r4, _08054C9C @ =sWhiteOutMoneyLossBadgeFlagIDs
 _08054C78:
 	ldrh r0, [r4]
 	bl FlagGet
@@ -112,8 +112,8 @@ _08054C8A:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_08054C9C: .4byte gUnknown_826D29E
+_08054C9C: .4byte sWhiteOutMoneyLossBadgeFlagIDs
-	thumb_func_end sub_8054C70
+	thumb_func_end CountBadgesForOverworldWhiteOutLossCalculation
 
 	thumb_func_start sub_8054CA0
 sub_8054CA0: @ 8054CA0

asm/wild_encounter.s

@@ -966,8 +966,8 @@ _08082E48:
 	bx r1
 	thumb_func_end sub_8082CBC
 
-	thumb_func_start sub_8082E54
+	thumb_func_start Special_RockSmashEncounter
-sub_8082E54: @ 8082E54
+Special_RockSmashEncounter: @ 8082E54
 	push {r4,lr}
 	bl sub_8082934
 	lsls r0, 16
@@ -1018,7 +1018,7 @@ _08082EB6:
 	bx r0
 	.align 2, 0
 _08082EBC: .4byte gSpecialVar_Result
-	thumb_func_end sub_8082E54
+	thumb_func_end Special_RockSmashEncounter
 
 	thumb_func_start SweetScentWildEncounter
 SweetScentWildEncounter: @ 8082EC0

data/data.s

@@ -1,6 +1,7 @@
 #include "constants/region_map.h"
 #include "constants/trainer_classes.h"
 #include "constants/songs.h"
+#include "constants/flags.h"
 #include "constants/region_map.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
@@ -396,12 +397,29 @@ gUnknown_826D1E4:: @ 826D1E4
 gUnknown_826D250:: @ 826D250
 	.incbin "baserom.gba", 0x26D250, 0x44
 
-gUnknown_826D294:: @ 826D294
+sWhiteOutMoneyLossMultipliers:: @ 826D294
-	.incbin "baserom.gba", 0x26D294, 0xA
+	.byte  2
+	.byte  4
+	.byte  6
+	.byte  9
+	.byte 12
+	.byte 16
+	.byte 20
+	.byte 25
+	.byte 30
 
-gUnknown_826D29E:: @ 826D29E
+	.align 1
-	.incbin "baserom.gba", 0x26D29E, 0x12
+sWhiteOutMoneyLossBadgeFlagIDs:: @ 826D29E
+	.2byte FLAG_BADGE01_GET
+    .2byte FLAG_BADGE02_GET
+    .2byte FLAG_BADGE03_GET
+    .2byte FLAG_BADGE04_GET
+    .2byte FLAG_BADGE05_GET
+    .2byte FLAG_BADGE06_GET
+    .2byte FLAG_BADGE07_GET
+    .2byte FLAG_BADGE08_GET
 
+	.align 2
 gUnknown_826D2B0:: @ 826D2B0
 	.incbin "baserom.gba", 0x26D2B0, 0x28
 

data/event_scripts.s

@@ -2154,7 +2154,7 @@ EventScript_1A6C21:: @ 81A6C21
 	waitfanfare
 	return
 
-EventScript_1A6C26:: @ 81A6C26
+EventScript_FadeOut_Heal_FadeIn:: @ 81A6C26
 	fadescreen 1
 	playfanfare MUS_ME_ASA
 	waitfanfare
@@ -4045,7 +4045,7 @@ EventScript_DigUpItemBagIsFull::
 	releaseall
 	end
 
-gUnknown_81A8D97:: @ 81A8D97
+EventScript_AfterWhiteOutHeal:: @ 81A8D97
 	lockall
 	textcolor 1
 	msgbox Text_1A5E89
@@ -4068,19 +4068,19 @@ EventScript_1A8DCF:: @ 81A8DCF
 	msgbox Text_1A5F9B
 	return
 
-gUnknown_81A8DD8:: @ 81A8DD8
+EventScript_MomHeal:: @ 81A8DD8
 	lockall
 	textcolor 1
 	applymovement 1, Movement_1A75ED
 	waitmovement 0
 	msgbox Text_1A5FDF
-	call EventScript_1A6C26
+	call EventScript_FadeOut_Heal_FadeIn
 	msgbox Text_1A6046
 	fadedefaultbgm
 	releaseall
 	end
 
-gUnknown_81A8DFD:: @ 81A8DFD
+EventScript_PoisonWhiteOut:: @ 81A8DFD
 	lockall
 	textcolor 3
 	special ExecuteWhiteOut
@@ -4104,7 +4104,7 @@ EventScript_1A8E2E:: @ 81A8E2E
 	end
 
 EventScript_1A8E3C:: @ 81A8E3C
-	special sub_8054C48
+	special Special_OverworldWhiteOutGetMoneyLoss
 	msgbox Text_1A6197
 	goto EventScript_1A8E4D
 	end
@@ -10396,7 +10396,7 @@ EventScript_1BE06F:: @ 81BE06F
 	applymovement VAR_LAST_TALKED, Movement_1BE08F
 	waitmovement 0
 	removeobject VAR_LAST_TALKED
-	special sub_8082E54
+	special Special_RockSmashEncounter
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_1BE08D
 	waitstate

data/maps/PalletTown_PlayersHouse_1F/scripts.inc

@@ -28,7 +28,7 @@ EventScript_168C41:: @ 8168C41
 EventScript_168C4A:: @ 8168C4A
 	msgbox gUnknown_818D3D1
 	closemessage
-	call EventScript_1A6C26
+	call EventScript_FadeOut_Heal_FadeIn
 	msgbox gUnknown_818D3F8
 	release
 	end

data/maps/SSAnne_1F_Room6/scripts.inc

@@ -8,7 +8,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_160E18
 	closemessage
-	call EventScript_1A6C26
+	call EventScript_FadeOut_Heal_FadeIn
 	msgbox gUnknown_8174490
 	release
 	end

data/maps/SevenIsland_SevaultCanyon_House/scripts.inc

@@ -28,7 +28,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183
 	waitmovement 0
 	fadedefaultbgm
 	delay 30
-	call EventScript_1A6C26
+	call EventScript_FadeOut_Heal_FadeIn
 	msgbox gUnknown_81A4DF5
 	setflag FLAG_TEMP_2
 	release

data/maps/SilphCo_9F/scripts.inc

@@ -20,7 +20,7 @@ SilphCo_9F_EventScript_161D09:: @ 8161D09
 	goto_if ge, EventScript_161D2E
 	msgbox gUnknown_8176B54
 	closemessage
-	call EventScript_1A6C26
+	call EventScript_FadeOut_Heal_FadeIn
 	msgbox gUnknown_8176B81
 	release
 	end

data/specials.inc

@@ -180,7 +180,7 @@ gSpecials:: @ 815FD60
 	def_special sub_8113510
 	def_special sub_81130A8
 	def_special sub_8113530
-	def_special sub_8082E54
+	def_special Special_RockSmashEncounter
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special nullsub_75
@@ -382,7 +382,7 @@ gSpecials:: @ 815FD60
 	def_special sub_810C3A4
 	def_special SetFlavorTextFlagFromSpecialVars
 	def_special UpdatePickStateFromSpecialVar8005
-	def_special sub_8054C48
+	def_special Special_OverworldWhiteOutGetMoneyLoss
 	def_special PutMonInRoute5Daycare
 	def_special GetCostToWithdrawRoute5DaycareMon
 	def_special IsThereMonInRoute5Daycare

include/overworld.h

@@ -104,7 +104,7 @@ void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y);
 void ResetInitialPlayerAvatarState(void);
 void sub_8055D40(u16 mapDataId);
 void CleanupOverworldWindowsAndTilemaps(void);
-u32 sub_8054C04(void);
+u32 ComputeWhiteOutMoneyLoss(void);
 
 extern u8 gDisableMapMusicChangeOnMapLoad;
 extern u8 gUnknown_2036E28;

src/battle_script_commands.c

@@ -5229,7 +5229,7 @@ static void atk5D_getmoneyreward(void)
     }
     else
     {
-        moneyReward = sub_8054C04();
+        moneyReward = ComputeWhiteOutMoneyLoss();
     }
     PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff1, 5, moneyReward);
     if (moneyReward)
@@ -5411,7 +5411,7 @@ static void atk5D_getmoneyreward(void)
         bl AddMoney\n\
         b _08025A00\n\
     _080259FA:\n\
-        bl sub_8054C04\n\
+        bl ComputeWhiteOutMoneyLoss\n\
         adds r4, r0, 0\n\
     _08025A00:\n\
         ldr r1, _08025A40 @ =gBattleTextBuff1\n\

src/quest_log.c

@@ -2706,10 +2706,10 @@ static void sub_8113414(struct LinkBattleRecords * a0, u8 a1, u8 a2)
                 StringCopy(gStringVar1, gSaveBlock1Ptr->rivalName);
                 break;
             case 1:
-                StringCopy(gStringVar1, gUnknown_84178D0);
+                StringCopy(gStringVar1, gUnknown_84178D0); // LT. SURGE
                 break;
             case 2:
-                StringCopy(gStringVar1, gUnknown_84178DA);
+                StringCopy(gStringVar1, gUnknown_84178DA); // KOGA
                 break;
             default:
                 StringCopy(gStringVar1, gSaveBlock1Ptr->rivalName);