From efec158ba77f5eee9792d3436cb46efa26722467 Mon Sep 17 00:00:00 2001 From: earthoul Date: Sat, 12 Jul 2025 13:51:18 +0900 Subject: [PATCH] Use text constants where appicable Hold off doing this on 'f6' on bank02 L4585 and 'a2' on duel L2096, though these two look like texts too --- src/home/duel.asm | 8 ++++---- src/home/menus.asm | 2 +- src/home/serial.asm | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/home/duel.asm b/src/home/duel.asm index 477144c..e00469c 100644 --- a/src/home/duel.asm +++ b/src/home/duel.asm @@ -1469,7 +1469,7 @@ HandleConfusionDamageToSelf: pop hl push hl call LoadTxRam3 - ld hl, $50 ; DamageToSelfDueToConfusionText + ld hl, DamageToSelfDueToConfusionText call DrawWideTextBox_PrintText ld a, ATK_ANIM_CONFUSION_HIT ld [wLoadedAttackAnimation], a @@ -1916,7 +1916,7 @@ PrintKnockedOut: ld h, [hl] ld l, a call LoadTxRam2 - ld hl, $84 ; WasKnockedOutText + ld hl, WasKnockedOutText call DrawWideTextBox_PrintText ld a, 40 .wait_frames @@ -2060,7 +2060,7 @@ Func_19e1:: cp $1 jr z, .no_effect_from_status call Func_19fd - ld hl, $1a1 ; WasUnsuccessfulText + ld hl, WasUnsuccessfulText call DrawWideTextBox_PrintText scf ret @@ -2215,5 +2215,5 @@ CopyOpponentName:: jr z, .print_player2 jr CopyPlayerName.loop .print_player2 - ld hl, $0097 ; Player2Text + ld hl, Player2Text jp CopyText diff --git a/src/home/menus.asm b/src/home/menus.asm index 75e1f95..60a78c8 100644 --- a/src/home/menus.asm +++ b/src/home/menus.asm @@ -1048,7 +1048,7 @@ HandleYesOrNoMenu:: ; prints "YES NO" at de PrintYesOrNoItems:: call AdjustCoordinatesForBGScroll - ld hl, $30 ; YesOrNoText + ld hl, YesOrNoText call InitTextPrinting_ProcessTextFromID ret diff --git a/src/home/serial.asm b/src/home/serial.asm index ea7006a..a3726c8 100644 --- a/src/home/serial.asm +++ b/src/home/serial.asm @@ -498,7 +498,7 @@ DuelTransmissionError:: ld l, a ld h, 0 call LoadTxRam3 - ld hl, $0057 ; TransmissionErrorTryAgainText + ld hl, TransmissionErrorTryAgainText call DrawWideTextBox_WaitForInput ld a, -1 ld [wDuelResult], a