summaryrefslogtreecommitdiff
path: root/engine/menus/main_menu.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-05 19:58:21 -0400
committerGitHub <noreply@github.com>2020-07-05 19:58:21 -0400
commitc57c93d2b2fb06cadafefda37c0974ba1ec9e6c0 (patch)
tree531d6b30d5a606ae963024825ed6e614843000a6 /engine/menus/main_menu.asm
parent2718c36065e7eb201a149938bcdd51987c4e56b6 (diff)
parent5fe8aab3445cb76d8e1c4be954c0392f40798950 (diff)
Merge pull request #259 from Rangi42/master
Port pokecrystal's formatting of text commands and special characters
Diffstat (limited to 'engine/menus/main_menu.asm')
-rwxr-xr-xengine/menus/main_menu.asm18
1 files changed, 10 insertions, 8 deletions
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index fe82ec4a..43289ce8 100755
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -136,7 +136,7 @@ LinkMenu:
ld [wLetterPrintingDelayFlags], a
ld hl, wd72e
set 6, [hl]
- ld hl, TextTerminator_6b20
+ ld hl, LinkMenuEmptyText
call PrintText
call SaveScreenTilesToBuffer1
ld hl, WhereWouldYouLikeText
@@ -293,16 +293,16 @@ LinkMenu:
ret
WhereWouldYouLikeText:
- TX_FAR _WhereWouldYouLikeText
- db "@"
+ text_far _WhereWouldYouLikeText
+ text_end
PleaseWaitText:
- TX_FAR _PleaseWaitText
- db "@"
+ text_far _PleaseWaitText
+ text_end
LinkCanceledText:
- TX_FAR _LinkCanceledText
- db "@"
+ text_far _LinkCanceledText
+ text_end
StartNewGame:
ld hl, wd732
@@ -329,7 +329,9 @@ SpecialEnterMap::
jp EnterMap
ContinueText:
- db "CONTINUE", $4e
+ db "CONTINUE"
+ next ""
+ ; fallthrough
NewGameText:
db "NEW GAME"