Resolve issue #575: Rename text commands

8 files changed, 23 insertions, 21 deletions

diff --git a/engine/menus/delete_save.asm b/engine/menus/delete_save.asm
index a0b2a13e6..85b25e54b 100644
--- a/engine/menus/delete_save.asm
+++ b/engine/menus/delete_save.asm
@@ -21,7 +21,7 @@ _DeleteSaveData:
 .Text_ClearAllSaveData:
 	; Clear all save data?
 	text_far UnknownText_0x1c564a
-	db "@"
+	text_end
 
 .NoYesMenuHeader:
 	db 0 ; flags
diff --git a/engine/menus/init_gender.asm b/engine/menus/init_gender.asm
index 69f62c627..4c1f3a8f9 100644
--- a/engine/menus/init_gender.asm
+++ b/engine/menus/init_gender.asm
@@ -56,7 +56,7 @@ InitGender:
 TextJump_AreYouABoyOrAreYouAGirl:
 	; Are you a boy? Or are you a girl?
 	text_far Text_AreYouABoyOrAreYouAGirl
-	db "@"
+	text_end
 
 InitGenderScreen:
 	ld a, $10
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index 1d76ff89a..f6be52c52 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -704,11 +704,11 @@ OakSpeech:
 
 OakText1:
 	text_far _OakText1
-	db "@"
+	text_end
 
 OakText2:
 	text_far _OakText2
-	start_asm
+	text_asm
 	ld a, WOOPER
 	call PlayMonCry
 	call WaitSFX
@@ -717,23 +717,23 @@ OakText2:
 
 OakText3:
 	text_far _OakText3
-	db "@"
+	text_end
 
 OakText4:
 	text_far _OakText4
-	db "@"
+	text_end
 
 OakText5:
 	text_far _OakText5
-	db "@"
+	text_end
 
 OakText6:
 	text_far _OakText6
-	db "@"
+	text_end
 
 OakText7:
 	text_far _OakText7
-	db "@"
+	text_end
 
 NamePlayer:
 	farcall MovePlayerPicRight
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index face2ba72..1de34f40f 100644
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -283,7 +283,7 @@ MainMenu_PrintCurrentTimeAndDay:
 .UnusedText:
 	; Clock time unknown
 	text_far UnknownText_0x1c5182
-	db "@"
+	text_end
 
 .PlaceCurrentDay:
 	push de
diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm
index b0644db8a..f9f395329 100644
--- a/engine/menus/menu.asm
+++ b/engine/menus/menu.asm
@@ -733,7 +733,7 @@ Error_Cant_ExitMenu:
 
 .Text_NoWindowsAvailableForPopping:
 	text_far UnknownText_0x1c46b7
-	db "@"
+	text_end
 
 _InitVerticalMenuCursor::
 	ld a, [wMenuDataFlags]
diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index 70dc03a6d..a5ddfae47 100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -1098,39 +1098,39 @@ Checksum:
 Text_WouldYouLikeToSaveTheGame:
 	; Would you like to save the game?
 	text_far UnknownText_0x1c454b
-	db "@"
+	text_end
 
 Text_SavingDontTurnOffThePower:
 	; SAVING… DON'T TURN OFF THE POWER.
 	text_far UnknownText_0x1c456d
-	db "@"
+	text_end
 
 Text_PlayerSavedTheGame:
 	; saved the game.
 	text_far UnknownText_0x1c4590
-	db "@"
+	text_end
 
 Text_AlreadyASaveFile:
 	; There is already a save file. Is it OK to overwrite?
 	text_far UnknownText_0x1c45a3
-	db "@"
+	text_end
 
 Text_AnotherSaveFile:
 	; There is another save file. Is it OK to overwrite?
 	text_far UnknownText_0x1c45d9
-	db "@"
+	text_end
 
 Text_SaveFileCorrupted:
 	; The save file is corrupted!
 	text_far UnknownText_0x1c460d
-	db "@"
+	text_end
 
 Text_SaveOnBoxSwitch:
 	; When you change a #MON BOX, data will be saved. OK?
 	text_far UnknownText_0x1c462a
-	db "@"
+	text_end
 
 Text_SaveOnMoveMonWOMail:
 	; Each time you move a #MON, data will be saved. OK?
 	text_far UnknownText_0x1c465f
-	db "@"
+	text_end
diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm
index 70fd60e9b..49144f0b6 100644
--- a/engine/menus/start_menu.asm
+++ b/engine/menus/start_menu.asm
@@ -426,7 +426,7 @@ StartMenu_Quit:
 
 .EndTheContestText:
 	text_far UnknownText_0x1c1a6c
-	db "@"
+	text_end
 
 StartMenu_Save:
 ; Save the game.
diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm
index 1d959ebce..1509722ed 100644
--- a/engine/menus/trainer_card.asm
+++ b/engine/menus/trainer_card.asm
@@ -294,7 +294,9 @@ TrainerCard_Page1_PrintDexCaught_GameTime:
 
 .Dex_PlayTime:
 	db   "#DEX"
-	next "PLAY TIME@@"
+	next "PLAY TIME@"
+
+	db "@" ; unused
 
 .Badges:
 	db "  BADGES▶@"