more labels and fix build

1 files changed, 27 insertions, 32 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 3ea5cee24..171581dd9 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -918,13 +918,8 @@ Std_5:
 @ 819F805
 	return
 
-BattleTower_Lobby_EventScript_19F806:: @ 819F806
-FallarborTown_ContestLobby_EventScript_19F806:: @ 819F806
-LilycoveCity_ContestLobby_EventScript_19F806:: @ 819F806
-MossdeepCity_GameCorner_1F_EventScript_19F806:: @ 819F806
-OldaleTown_PokemonCenter_2F_EventScript_19F806:: @ 819F806
-SecretBase_RedCave1_EventScript_19F806:: @ 819F806
-	special InitSaveDialog
+S_DoSaveDialog:: @ 819F806
+	special ScrSpecial_DoSaveDialog
 	waitstate
 	return
 
@@ -1437,16 +1432,16 @@ SootopolisCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
 VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
 	lock
 	faceplayer
-	msgbox OldaleTown_PokemonCenter_1F_Text_1A0A7D, 5
+	msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO
 	compare RESULT, 1
-	jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FD7C
+	jumpeq do_heal_party
 	compare RESULT, 0
-	jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDC7
+	jumpeq dont_heal_party
 	end
 
-OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
+do_heal_party:: @ 819FD7C
 	inccounter GAME_STAT_USED_POKECENTER
-	message OldaleTown_PokemonCenter_1F_Text_1A1245
+	message gText_NurseJoy_OkayIllTakeYourPokemon
 	waittext
 	move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F
 	waitmove 0
@@ -1461,16 +1456,16 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
 	end
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0
-	message OldaleTown_PokemonCenter_1F_Text_1A0B14
+	message gText_NurseJoy_ThankYouForWaiting
 	waittext
 	move 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4
 	waitmove 0
-	message OldaleTown_PokemonCenter_1F_Text_1A0AFA
+	message gText_NurseJoy_WeHopeToSeeYouAgain
 	waittext
 	return
 
-OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7
-	message OldaleTown_PokemonCenter_1F_Text_1A0AFA
+dont_heal_party:: @ 819FDC7
+	message gText_NurseJoy_WeHopeToSeeYouAgain
 	waittext
 	return
 
@@ -1483,7 +1478,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE
 	end
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA
-	message OldaleTown_PokemonCenter_1F_Text_1A1275
+	message gText_NurseJoy_Pokerus
 	waittext
 	setflag 273
 	return
@@ -2985,17 +2980,17 @@ UnknownString_81A0A54: @ 81A0A54
 UnknownString_81A0A66: @ 81A0A66
 	.string "Accessed LANETTE’s PC.$"
 
-OldaleTown_PokemonCenter_1F_Text_1A0A7D:: @ 81A0A7D
+gText_NurseJoy_Welcome:: @ 81A0A7D
 	.string "Hello, and welcome to the POKéMON\n"
 	.string "CENTER.\p"
 	.string "We restore your tired POKéMON to\n"
 	.string "full health.\p"
 	.string "Would you like to rest your POKéMON?$"
 
-OldaleTown_PokemonCenter_1F_Text_1A0AFA:: @ 81A0AFA
+gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA
 	.string "We hope to see you again!$"
 
-OldaleTown_PokemonCenter_1F_Text_1A0B14:: @ 81A0B14
+gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14
 	.string "Thank you for waiting.\p"
 	.string "We’ve restored your POKéMON to\n"
 	.string "full health.$"
@@ -3209,11 +3204,11 @@ SlateportCity_Text_1A116E:: @ 81A116E
 	.string "We’ll accept you as a member and sell\n"
 	.string "you good stuff in secrecy.$"
 
-OldaleTown_PokemonCenter_1F_Text_1A1245:: @ 81A1245
+gText_NurseJoy_OkayIllTakeYourPokemon:: @ 81A1245
 	.string "Okay, I’ll take your POKéMON for a\n"
 	.string "few seconds.$"
 
-OldaleTown_PokemonCenter_1F_Text_1A1275:: @ 81A1275
+gText_NurseJoy_Pokerus:: @ 81A1275
 	.string "Your POKéMON may be infected with\n"
 	.string "POKéRUS.\p"
 	.string "Little is known about the POKéRUS\n"
@@ -3949,7 +3944,7 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
 	jumpeq SecretBase_RedCave1_EventScript_1A308F
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A308F
 	hidebox 0, 0, 15, 10
@@ -3984,7 +3979,7 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
 	jumpeq SecretBase_RedCave1_EventScript_1A310B
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A310B
 	hidebox 0, 0, 15, 10
@@ -4019,7 +4014,7 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
 	jumpeq SecretBase_RedCave1_EventScript_1A3187
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A3187
 	hidebox 0, 0, 15, 10
@@ -4054,7 +4049,7 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
 	jumpeq SecretBase_RedCave1_EventScript_1A3203
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A3203
 	hidebox 0, 0, 15, 10
@@ -4089,7 +4084,7 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
 	jumpeq SecretBase_RedCave1_EventScript_1A327F
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A327F
 	hidebox 0, 0, 15, 10
@@ -4124,7 +4119,7 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
 	jumpeq SecretBase_RedCave1_EventScript_1A32FB
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A32FB
 	hidebox 0, 0, 15, 10
@@ -4159,7 +4154,7 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
 	jumpeq SecretBase_RedCave1_EventScript_1A3377
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A3377
 	hidebox 0, 0, 15, 10
@@ -4194,7 +4189,7 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
 	jumpeq SecretBase_RedCave1_EventScript_1A33F3
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A33F3
 	hidebox 0, 0, 15, 10
@@ -4229,7 +4224,7 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
 	jumpeq SecretBase_RedCave1_EventScript_1A346F
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A346F
 	hidebox 0, 0, 15, 10
@@ -4264,7 +4259,7 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
 	jumpeq SecretBase_RedCave1_EventScript_1A34EB
 	setvar RESULT, 1
 	special sub_80BCE4C
-	call SecretBase_RedCave1_EventScript_19F806
+	call S_DoSaveDialog
 	compare RESULT, 0
 	jumpeq SecretBase_RedCave1_EventScript_1A34EB
 	hidebox 0, 0, 15, 10