From 5c4795d5bc19edd872adf7b17d0c6264eecd6459 Mon Sep 17 00:00:00 2001
From: SatoMew <SatoMew@users.noreply.github.com>
Date: Sun, 26 Feb 2023 16:14:21 +0000
Subject: [PATCH] Complete and improve debug name labels (#408)

---
 engine/debug/debug_menu.asm            | 10 ++++++----
 engine/menus/main_menu.asm             |  1 +
 engine/movie/oak_speech/oak_speech.asm | 10 ++++++----
 engine/movie/title.asm                 | 23 ++++++++++++++---------
 home/init.asm                          |  2 +-
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm
index f2297129..907acb8a 100644
--- a/engine/debug/debug_menu.asm
+++ b/engine/debug/debug_menu.asm
@@ -2,12 +2,14 @@ DebugMenu:
 IF DEF(_DEBUG)
 	call ClearScreen
 
-	ld hl, DebugPlayerName
+	; These debug names are used for TestBattle.
+	; StartNewGameDebug uses the debug names from PrepareOakSpeech.
+	ld hl, DebugBattlePlayerName
 	ld de, wPlayerName
 	ld bc, NAME_LENGTH
 	call CopyData
 
-	ld hl, DebugRivalName
+	ld hl, DebugBattleRivalName
 	ld de, wRivalName
 	ld bc, NAME_LENGTH
 	call CopyData
@@ -57,10 +59,10 @@ IF DEF(_DEBUG)
 	set 1, [hl]
 	jp StartNewGameDebug
 
-DebugPlayerName:
+DebugBattlePlayerName:
 	db "Tom@"
 
-DebugRivalName:
+DebugBattleRivalName:
 	db "Juerry@"
 
 DebugMenuOptions:
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index d94c65eb..024def28 100644
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -309,6 +309,7 @@ LinkCanceledText:
 StartNewGame:
 	ld hl, wd732
 	res 1, [hl]
+	; fallthrough
 StartNewGameDebug:
 	call OakSpeech
 	ld c, 20
diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm
index 93cdfaab..3a08372d 100644
--- a/engine/movie/oak_speech/oak_speech.asm
+++ b/engine/movie/oak_speech/oak_speech.asm
@@ -1,4 +1,4 @@
-SetDefaultNames:
+PrepareOakSpeech:
 	ld a, [wLetterPrintingDelayFlags]
 	push af
 	ld a, [wOptions]
@@ -22,11 +22,13 @@ SetDefaultNames:
 	ld a, [wOptionsInitialized]
 	and a
 	call z, InitOptions
-	ld hl, NintenText
+	; These debug names are used for StartNewGameDebug.
+	; TestBattle uses the debug names from DebugMenu.
+	ld hl, DebugNewGamePlayerName
 	ld de, wPlayerName
 	ld bc, NAME_LENGTH
 	call CopyData
-	ld hl, SonyText
+	ld hl, DebugNewGameRivalName
 	ld de, wRivalName
 	ld bc, NAME_LENGTH
 	jp CopyData
@@ -40,7 +42,7 @@ OakSpeech:
 	call PlayMusic
 	call ClearScreen
 	call LoadTextBoxTilePatterns
-	call SetDefaultNames
+	call PrepareOakSpeech
 	predef InitPlayerData2
 	ld hl, wNumBoxItems
 	ld a, POTION
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index 1ee0cc25..ad5f6ebf 100644
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -1,15 +1,17 @@
-; copy text of fixed length NAME_LENGTH (like player name, rival name, mon names, ...)
-CopyFixedLengthText:
+CopyDebugName:
 	ld bc, NAME_LENGTH
 	jp CopyData
 
-SetDefaultNamesBeforeTitlescreen::
-	ld hl, NintenText
+PrepareTitleScreen::
+	; These debug names are already copied later in PrepareOakSpeech.
+	; Removing the unused copies below has no apparent impact.
+	; CopyDebugName can also be safely deleted afterwards.
+	ld hl, DebugNewGamePlayerName
 	ld de, wPlayerName
-	call CopyFixedLengthText
-	ld hl, SonyText
+	call CopyDebugName
+	ld hl, DebugNewGameRivalName
 	ld de, wRivalName
-	call CopyFixedLengthText
+	call CopyDebugName
 	xor a
 	ldh [hWY], a
 	ld [wLetterPrintingDelayFlags], a
@@ -405,5 +407,8 @@ IF DEF(_BLUE)
 	db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Blue Version"
 ENDC
 
-NintenText: db "NINTEN@"
-SonyText:   db "SONY@"
+DebugNewGamePlayerName:
+	db "NINTEN@"
+
+DebugNewGameRivalName:
+	db "SONY@"
diff --git a/home/init.asm b/home/init.asm
index 81e75586..db21efbc 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -116,7 +116,7 @@ DEF rLCDC_DEFAULT EQU %11100011
 	ld a, rLCDC_DEFAULT
 	ldh [rLCDC], a
 
-	jp SetDefaultNamesBeforeTitlescreen
+	jp PrepareTitleScreen
 
 ClearVram::
 	ld hl, VRAM_Begin