Document overworld whiteout funcs

7 files changed, 36 insertions, 18 deletions

diff --git a/data/data.s b/data/data.s
index e3dbe1f82..361e2d103 100644
--- a/data/data.s
+++ b/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
-	.incbin "baserom.gba", 0x26D294, 0xA
-
-gUnknown_826D29E:: @ 826D29E
-	.incbin "baserom.gba", 0x26D29E, 0x12
+sWhiteOutMoneyLossMultipliers:: @ 826D294
+	.byte  2
+	.byte  4
+	.byte  6
+	.byte  9
+	.byte 12
+	.byte 16
+	.byte 20
+	.byte 25
+	.byte 30
+
+	.align 1
+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
 
diff --git a/data/event_scripts.s b/data/event_scripts.s
index d47e1a681..b311df6c2 100644
--- a/data/event_scripts.s
+++ b/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
diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc
index 7fb067cdf..900dd06aa 100644
--- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc
+++ b/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
diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc
index 37ed59374..755c01a91 100644
--- a/data/maps/SSAnne_1F_Room6/scripts.inc
+++ b/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
diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
index 94fcdf92d..dcf37028d 100644
--- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
+++ b/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
diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc
index 7f3535f60..3a69c169a 100644
--- a/data/maps/SilphCo_9F/scripts.inc
+++ b/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
diff --git a/data/specials.inc b/data/specials.inc
index 3eeac52a0..005648174 100644
--- a/data/specials.inc
+++ b/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