#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions

6 files changed, 41 insertions, 52 deletions

diff --git a/engine/menus/delete_save.asm b/engine/menus/delete_save.asm
index 85b25e54b..97b27ac2d 100644
--- a/engine/menus/delete_save.asm
+++ b/engine/menus/delete_save.asm
@@ -6,7 +6,7 @@ _DeleteSaveData:
 	call LoadFontsExtra
 	ld de, MUSIC_MAIN_MENU
 	call PlayMusic
-	ld hl, .Text_ClearAllSaveData
+	ld hl, .ClearAllSaveDataText
 	call PrintText
 	ld hl, .NoYesMenuHeader
 	call CopyMenuHeader
@@ -18,9 +18,8 @@ _DeleteSaveData:
 	farcall EmptyAllSRAMBanks
 	ret
 
-.Text_ClearAllSaveData:
-	; Clear all save data?
-	text_far UnknownText_0x1c564a
+.ClearAllSaveDataText:
+	text_far _ClearAllSaveDataText
 	text_end
 
 .NoYesMenuHeader:
diff --git a/engine/menus/init_gender.asm b/engine/menus/init_gender.asm
index 4c1f3a8f9..c5cc95bf3 100644
--- a/engine/menus/init_gender.asm
+++ b/engine/menus/init_gender.asm
@@ -27,7 +27,7 @@ InitGender:
 	call LoadGenderScreenLightBlueTile
 	call WaitBGMap2
 	call SetPalettes
-	ld hl, TextJump_AreYouABoyOrAreYouAGirl
+	ld hl, AreYouABoyOrAreYouAGirlText
 	call PrintText
 	ld hl, .MenuHeader
 	call LoadMenuHeader
@@ -53,9 +53,8 @@ InitGender:
 	db "Boy@"
 	db "Girl@"
 
-TextJump_AreYouABoyOrAreYouAGirl:
-	; Are you a boy? Or are you a girl?
-	text_far Text_AreYouABoyOrAreYouAGirl
+AreYouABoyOrAreYouAGirlText:
+	text_far _AreYouABoyOrAreYouAGirlText
 	text_end
 
 InitGenderScreen:
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index 281000352..9274694da 100644
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -280,9 +280,8 @@ MainMenu_PrintCurrentTimeAndDay:
 .TimeNotSet:
 	db "TIME NOT SET@"
 
-.UnusedText:
-	; Clock time unknown
-	text_far UnknownText_0x1c5182
+.MainMenuTimeUnknownText:
+	text_far _MainMenuTimeUnknownText
 	text_end
 
 .PlaceCurrentDay:
diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm
index f9f395329..544f4ade8 100644
--- a/engine/menus/menu.asm
+++ b/engine/menus/menu.asm
@@ -725,14 +725,14 @@ Unreferenced_Function24423:
 	ret
 
 Error_Cant_ExitMenu:
-	ld hl, .Text_NoWindowsAvailableForPopping
+	ld hl, .WindowPoppingErrorText
 	call PrintText
 	call WaitBGMap
-.InfiniteLoop:
-	jr .InfiniteLoop
+.infinite_loop
+	jr .infinite_loop
 
-.Text_NoWindowsAvailableForPopping:
-	text_far UnknownText_0x1c46b7
+.WindowPoppingErrorText:
+	text_far _WindowPoppingErrorText
 	text_end
 
 _InitVerticalMenuCursor::
diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index e7dcb026a..7116e817a 100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -4,7 +4,7 @@ SaveMenu:
 	call SpeechTextbox
 	call UpdateSprites
 	farcall SaveMenu_CopyTilemapAtOnce
-	ld hl, Text_WouldYouLikeToSaveTheGame
+	ld hl, WouldYouLikeToSaveTheGameText
 	call SaveTheGame_yesorno
 	jr nz, .refused
 	call AskOverwriteSaveFile
@@ -38,7 +38,7 @@ SaveAfterLinkTrade:
 
 ChangeBoxSaveGame:
 	push de
-	ld hl, Text_SaveOnBoxSwitch
+	ld hl, ChangeBoxSaveText
 	call MenuTextbox
 	call YesNoBox
 	call ExitMenu
@@ -115,7 +115,7 @@ MoveMonWOMail_InsertMon_SaveGame:
 	ret
 
 StartMoveMonWOMail_SaveGame:
-	ld hl, Text_SaveOnMoveMonWOMail
+	ld hl, MoveMonWOMailSaveText
 	call MenuTextbox
 	call YesNoBox
 	call ExitMenu
@@ -173,13 +173,13 @@ AskOverwriteSaveFile:
 	jr z, .erase
 	call CompareLoadedAndSavedPlayerID
 	jr z, .yoursavefile
-	ld hl, Text_AnotherSaveFile
+	ld hl, AnotherSaveFileText
 	call SaveTheGame_yesorno
 	jr nz, .refused
 	jr .erase
 
 .yoursavefile
-	ld hl, Text_AlreadyASaveFile
+	ld hl, AlreadyASaveFileText
 	call SaveTheGame_yesorno
 	jr nz, .refused
 	jr .ok
@@ -196,7 +196,7 @@ AskOverwriteSaveFile:
 	ret
 
 SaveTheGame_yesorno:
-	ld b, BANK(Text_WouldYouLikeToSaveTheGame)
+	ld b, BANK(WouldYouLikeToSaveTheGameText)
 	call MapTextbox
 	call LoadMenuTextbox
 	lb bc, 0, 7
@@ -239,7 +239,7 @@ SavedTheGame:
 	ld a, TEXT_DELAY_MED
 	ld [wOptions], a
 	; <PLAYER> saved the game!
-	ld hl, Text_PlayerSavedTheGame
+	ld hl, SavedTheGameText
 	call PrintText
 	; restore the original text speed setting
 	pop af
@@ -336,7 +336,7 @@ SavingDontTurnOffThePower:
 	ld a, TEXT_DELAY_MED
 	ld [wOptions], a
 	; SAVING... DON'T TURN OFF THE POWER.
-	ld hl, Text_SavingDontTurnOffThePower
+	ld hl, SavingDontTurnOffThePowerText
 	call PrintText
 	; Restore the text speed setting
 	pop af
@@ -619,7 +619,7 @@ TryLoadSaveFile:
 	push af
 	set NO_TEXT_SCROLL, a
 	ld [wOptions], a
-	ld hl, Text_SaveFileCorrupted
+	ld hl, SaveFileCorruptedText
 	call PrintText
 	pop af
 	ld [wOptions], a
@@ -1095,42 +1095,34 @@ Checksum:
 	jr nz, .loop
 	ret
 
-Text_WouldYouLikeToSaveTheGame:
-	; Would you like to save the game?
-	text_far UnknownText_0x1c454b
+WouldYouLikeToSaveTheGameText:
+	text_far _WouldYouLikeToSaveTheGameText
 	text_end
 
-Text_SavingDontTurnOffThePower:
-	; SAVING… DON'T TURN OFF THE POWER.
-	text_far UnknownText_0x1c456d
+SavingDontTurnOffThePowerText:
+	text_far _SavingDontTurnOffThePowerText
 	text_end
 
-Text_PlayerSavedTheGame:
-	; saved the game.
-	text_far UnknownText_0x1c4590
+SavedTheGameText:
+	text_far _SavedTheGameText
 	text_end
 
-Text_AlreadyASaveFile:
-	; There is already a save file. Is it OK to overwrite?
-	text_far UnknownText_0x1c45a3
+AlreadyASaveFileText:
+	text_far _AlreadyASaveFileText
 	text_end
 
-Text_AnotherSaveFile:
-	; There is another save file. Is it OK to overwrite?
-	text_far UnknownText_0x1c45d9
+AnotherSaveFileText:
+	text_far _AnotherSaveFileText
 	text_end
 
-Text_SaveFileCorrupted:
-	; The save file is corrupted!
-	text_far UnknownText_0x1c460d
+SaveFileCorruptedText:
+	text_far _SaveFileCorruptedText
 	text_end
 
-Text_SaveOnBoxSwitch:
-	; When you change a #MON BOX, data will be saved. OK?
-	text_far UnknownText_0x1c462a
+ChangeBoxSaveText:
+	text_far _ChangeBoxSaveText
 	text_end
 
-Text_SaveOnMoveMonWOMail:
-	; Each time you move a #MON, data will be saved. OK?
-	text_far UnknownText_0x1c465f
+MoveMonWOMailSaveText:
+	text_far _MoveMonWOMailSaveText
 	text_end
diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm
index ab7b98ea2..69b1f73bf 100644
--- a/engine/menus/start_menu.asm
+++ b/engine/menus/start_menu.asm
@@ -411,7 +411,7 @@ StartMenu_Exit:
 StartMenu_Quit:
 ; Retire from the bug catching contest.
 
-	ld hl, .EndTheContestText
+	ld hl, .StartMenuContestEndText
 	call StartMenuYesNo
 	jr c, .DontEndContest
 	ld a, BANK(BugCatchingContestReturnToGateScript)
@@ -424,8 +424,8 @@ StartMenu_Quit:
 	ld a, 0
 	ret
 
-.EndTheContestText:
-	text_far UnknownText_0x1c1a6c
+.StartMenuContestEndText:
+	text_far _StartMenuContestEndText
 	text_end
 
 StartMenu_Save: