2 files changed, 23 insertions, 23 deletions
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index a7000460b..27e617128 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -1,8 +1,8 @@
 Route117_EventScript_291C18:: @ 8291C18
 	lock
 	faceplayer
-	special sp0B5_daycare
-	specialvar VAR_RESULT, sp0B6_daycare
+	special GetDaycareMonNicknames
+	specialvar VAR_RESULT, GetDaycareState
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route117_EventScript_291C4D
 	compare_var_to_value VAR_RESULT, 2
@@ -21,8 +21,8 @@ Route117_EventScript_291C4D:: @ 8291C4D
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route117_EventScript_291C83
 	msgbox Route117_Text_292149, 4
-	clearflag FLAG_0x086
-	special sub_8070728
+	clearflag FLAG_PENDING_DAYCARE_EGG
+	special RejectEggFromDayCare
 	release
 	end
 
@@ -40,8 +40,8 @@ Route117_EventScript_291C9D:: @ 8291C9D
 	waitfanfare
 	waitbuttonpress
 	msgbox Route117_Text_2921CF, 4
-	special sp0B8_daycare
-	clearflag FLAG_0x086
+	special GiveEggFromDaycare
+	clearflag FLAG_PENDING_DAYCARE_EGG
 	release
 	end
 
@@ -56,7 +56,7 @@ Route117_EventScript_291CC8:: @ 8291CC8
 	return
 
 Route117_EventScript_291CD1:: @ 8291CD1
-	special sp0B5_daycare
+	special GetDaycareMonNicknames
 	msgbox Route117_Text_292114, 4
 	setvar VAR_0x8004, 0
 	call Route117_EventScript_291CB7
@@ -64,9 +64,9 @@ Route117_EventScript_291CD1:: @ 8291CD1
 	end
 
 Route117_EventScript_291CE8:: @ 8291CE8
-	special sp0B5_daycare
+	special GetDaycareMonNicknames
 	msgbox Route117_Text_292299, 4
-	special sp0B9_daycare_relationship_comment
+	special SetDaycareCompatibilityString
 	special sub_8138AC0
 	waitmessage
 	waitbuttonpress
@@ -80,7 +80,7 @@ Route117_EventScript_291CE8:: @ 8291CE8
 Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11
 	lock
 	faceplayer
-	specialvar VAR_RESULT, sp0B6_daycare
+	specialvar VAR_RESULT, GetDaycareState
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route117_PokemonDayCare_EventScript_291E0B
 	compare_var_to_value VAR_RESULT, 2
@@ -103,21 +103,21 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56
 	goto_eq Route117_PokemonDayCare_EventScript_291E01
 	msgbox Route117_PokemonDayCare_Text_292349, 4
 	fadescreen 1
-	special sub_8071330
+	special ChooseSendDaycareMon
 	waitstate
 	compare_var_to_value VAR_0x8004, 255
 	goto_eq Route117_PokemonDayCare_EventScript_291DCA
 	specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
 	compare_var_to_value VAR_RESULT, 0
 	goto_eq Route117_PokemonDayCare_EventScript_291DF7
-	specialvar VAR_0x8005, sub_8070C58
+	specialvar VAR_0x8005, GetSelectedMonNickAndSpecies
 	waitse
 	playmoncry VAR_0x8005, 0
 	msgbox Route117_PokemonDayCare_Text_292370, 4
 	waitmoncry
-	special daycare_send_selected_pokemon
+	special StoreSelectedPokemonInDaycare
 	incrementgamestat 47
-	specialvar VAR_RESULT, sp0B6_daycare
+	specialvar VAR_RESULT, GetDaycareState
 	compare_var_to_value VAR_RESULT, 2
 	goto_eq Route117_PokemonDayCare_EventScript_291DD4
 	release
@@ -160,7 +160,7 @@ Route117_PokemonDayCare_EventScript_291E15:: @ 8291E15
 	return
 
 Route117_PokemonDayCare_EventScript_291E1E:: @ 8291E1E
-	specialvar VAR_RESULT, sub_806FF30
+	specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare
 	compare_var_to_value VAR_RESULT, 0
 	call_if 5, Route117_PokemonDayCare_EventScript_291E15
 	return
@@ -182,11 +182,11 @@ Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D
 	specialvar VAR_RESULT, CalculatePlayerPartyCount
 	compare_var_to_value VAR_RESULT, 6
 	goto_eq Route117_PokemonDayCare_EventScript_291F3D
-	specialvar VAR_RESULT, sp0B6_daycare
+	specialvar VAR_RESULT, GetDaycareState
 	setvar VAR_0x8004, 0
 	compare_var_to_value VAR_RESULT, 2
 	goto_eq Route117_PokemonDayCare_EventScript_291EAC
-	special sub_80712C0
+	special ShowDaycareLevelMenu
 	waitstate
 	copyvar VAR_0x8004, VAR_RESULT
 	compare_var_to_value VAR_RESULT, 2
@@ -195,7 +195,7 @@ Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D
 	end
 
 Route117_PokemonDayCare_EventScript_291EAC:: @ 8291EAC
-	special sub_806FED8
+	special GetDaycareCost
 	msgbox Route117_PokemonDayCare_Text_292549, 5
 	compare_var_to_value VAR_RESULT, 1
 	goto_eq Route117_PokemonDayCare_EventScript_291EC8
@@ -213,7 +213,7 @@ Route117_PokemonDayCare_EventScript_291EC8:: @ 8291EC8
 Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2
 	applymovement 1, Route117_PokemonDayCare_Movement_291F47
 	waitmovement 0
-	specialvar VAR_RESULT, sub_806FDC4
+	specialvar VAR_RESULT, TakePokemonFromDaycare
 	special SubtractMoneyFromVar0x8005
 	playse SE_REGI
 	msgbox Route117_PokemonDayCare_Text_292575, 4
@@ -221,7 +221,7 @@ Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2
 	playmoncry VAR_RESULT, 0
 	msgbox Route117_PokemonDayCare_Text_292593, 4
 	waitmoncry
-	specialvar VAR_RESULT, sp0B6_daycare
+	specialvar VAR_RESULT, GetDaycareState
 	compare_var_to_value VAR_RESULT, 2
 	goto_eq Route117_PokemonDayCare_EventScript_291F24
 	goto Route117_PokemonDayCare_EventScript_291DCA
@@ -278,12 +278,12 @@ Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C
 	end
 
 Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95
-	special sub_80712C0
+	special ShowDaycareLevelMenu
 	waitstate
 	compare_var_to_value VAR_RESULT, 2
 	goto_eq Route117_PokemonDayCare_EventScript_291DCA
 	copyvar VAR_0x8004, VAR_RESULT
-	specialvar VAR_RESULT, sub_806FDC4
+	specialvar VAR_RESULT, TakePokemonFromDaycare
 	msgbox Route117_PokemonDayCare_Text_292575, 4
 	msgbox Route117_PokemonDayCare_Text_292476, 4
 	release
diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc
index 23551d372..01463516b 100644
--- a/data/scripts/maps/Route117.inc
+++ b/data/scripts/maps/Route117.inc
@@ -7,7 +7,7 @@ Route117_MapScript1_1F3983: @ 81F3983
 	end
 
 Route117_EventScript_1F3989:: @ 81F3989
-	checkflag FLAG_0x086
+	checkflag FLAG_PENDING_DAYCARE_EGG
 	goto_if 0, Route117_EventScript_1F3999
 	setobjectxyperm 3, 47, 6