From 5943b96cf6d5eda52df2ad689af0ac251e4e0841 Mon Sep 17 00:00:00 2001 From: Rangi <35663410+Rangi42@users.noreply.github.com> Date: Wed, 12 Nov 2025 15:44:07 -0500 Subject: Use features of RGBDS 1.0.0 (#537) --- home/text.asm | 84 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'home/text.asm') diff --git a/home/text.asm b/home/text.asm index 17fb7266..8ec872e0 100644 --- a/home/text.asm +++ b/home/text.asm @@ -3,7 +3,7 @@ TextBoxBorder:: ; top row push hl - ld a, "┌" + ld a, '┌' ld [hli], a inc a ; "─" call .PlaceChars @@ -17,11 +17,11 @@ TextBoxBorder:: ; middle rows .next push hl - ld a, "│" + ld a, '│' ld [hli], a - ld a, " " + ld a, ' ' call .PlaceChars - ld [hl], "│" + ld [hl], '│' pop hl ld de, SCREEN_WIDTH @@ -30,11 +30,11 @@ TextBoxBorder:: jr nz, .next ; bottom row - ld a, "└" + ld a, '└' ld [hli], a - ld a, "─" + ld a, '─' call .PlaceChars - ld [hl], "┘" + ld [hl], '┘' ret .PlaceChars:: @@ -51,7 +51,7 @@ PlaceString:: PlaceNextChar:: ld a, [de] - cp "@" + cp '@' jr nz, .NotTerminator ld b, h ld c, l @@ -59,7 +59,7 @@ PlaceNextChar:: ret .NotTerminator - cp "" + cp '' jr nz, .NotNext ld bc, 2 * SCREEN_WIDTH ldh a, [hUILayoutFlags] @@ -73,7 +73,7 @@ PlaceNextChar:: jp NextChar .NotNext - cp "" + cp '' jr nz, .NotLine pop hl hlcoord 1, 16 @@ -83,26 +83,26 @@ PlaceNextChar:: .NotLine ; Check against a dictionary - dict "", NullChar - dict "", _ContTextNoPause - dict "<_CONT>", _ContText - dict "", Paragraph - dict "", PageChar - dict "", PrintPlayerName - dict "", PrintRivalName - dict "#", PlacePOKe - dict "", PCChar - dict "", RocketChar - dict "", TMChar - dict "", TrainerChar - dict "", ContText - dict "<……>", SixDotsChar - dict "", DoneText - dict "", PromptText - dict "", PlacePKMN - dict "", PlaceDexEnd - dict "", PlaceMoveTargetsName - dict "", PlaceMoveUsersName + dict '', NullChar + dict '', _ContTextNoPause + dict '<_CONT>', _ContText + dict '', Paragraph + dict '', PageChar + dict '', PrintPlayerName + dict '', PrintRivalName + dict '#', PlacePOKe + dict '', PCChar + dict '', RocketChar + dict '', TMChar + dict '', TrainerChar + dict '', ContText + dict '<……>', SixDotsChar + dict '', DoneText + dict '', PromptText + dict '', PlacePKMN + dict '', PlaceDexEnd + dict '', PlaceMoveTargetsName + dict '', PlaceMoveUsersName ld [hli], a call PrintLetterDelay @@ -202,7 +202,7 @@ ContCharText:: text_end PlaceDexEnd:: - ld [hl], "." + ld [hl], '.' pop hl ret @@ -210,12 +210,12 @@ PromptText:: ld a, [wLinkState] cp LINK_STATE_BATTLING jp z, .ok - ld a, "▼" + ld a, '▼' ldcoord_a 18, 16 .ok call ProtectedDelay3 call ManualTextScroll - ld a, " " + ld a, ' ' ldcoord_a 18, 16 DoneText:: @@ -229,7 +229,7 @@ DoneText:: Paragraph:: push de - ld a, "▼" + ld a, '▼' ldcoord_a 18, 16 call ProtectedDelay3 call ManualTextScroll @@ -244,7 +244,7 @@ Paragraph:: PageChar:: push de - ld a, "▼" + ld a, '▼' ldcoord_a 18, 16 call ProtectedDelay3 call ManualTextScroll @@ -260,13 +260,13 @@ PageChar:: jp NextChar _ContText:: - ld a, "▼" + ld a, '▼' ldcoord_a 18, 16 call ProtectedDelay3 push de call ManualTextScroll pop de - ld a, " " + ld a, ' ' ldcoord_a 18, 16 _ContTextNoPause:: push de @@ -291,7 +291,7 @@ ScrollTextUpOneLine:: dec b jr nz, .copyText hlcoord 1, 16 - ld a, " " + ld a, ' ' ld b, SCREEN_WIDTH - 2 .clearText ld [hli], a @@ -436,12 +436,12 @@ TextCommand_PROMPT_BUTTON:: ld a, [wLinkState] cp LINK_STATE_BATTLING jp z, TextCommand_WAIT_BUTTON - ld a, "▼" + ld a, '▼' ldcoord_a 18, 16 ; place down arrow in lower right corner of dialogue text box push bc call ManualTextScroll ; blink arrow and wait for A or B to be pressed pop bc - ld a, " " + ld a, ' ' ldcoord_a 18, 16 ; overwrite down arrow with blank space pop hl jp NextTextCommand @@ -449,7 +449,7 @@ TextCommand_PROMPT_BUTTON:: TextCommand_SCROLL:: ; pushes text up two lines and sets the BC cursor to the border tile ; below the first character column of the text box. - ld a, " " + ld a, ' ' ldcoord_a 18, 16 ; place blank space in lower right corner of dialogue text box call ScrollTextUpOneLine call ScrollTextUpOneLine @@ -564,7 +564,7 @@ TextCommand_DOTS:: ld l, c .loop - ld a, "…" + ld a, '…' ld [hli], a push de call Joypad -- cgit v1.3.1-sl0p