ref: b3bd6823660a9d5e73b7293df9461bb9f08fa989
parent: 6cdcde8b498bf9c771042814d06ab19cf887c741
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Mon Jul 6 08:55:31 EDT 2020
text_linkpromptbutton -> text_waitbutton Removes support for text_waitbutton as a legacy alias for text_promptbutton.
--- a/docs/text_commands.md
+++ b/docs/text_commands.md
@@ -71,9 +71,9 @@
Print *n* `"…"`s, pausing for 10 frames after each; interrupt if A or B is pressed.
-## `$0D`: `text_linkpromptbutton`
+## `$0D`: `text_waitbutton`
-Wait for button press; show arrow.
+Wait for button press; don't show arrow.
## `$0E`: `sound_dex_fanfare_20_49`
--- a/home/text.asm
+++ b/home/text.asm
@@ -687,29 +687,29 @@
TextCommands::
; entries correspond to TX_* constants (see macros/scripts/text.asm)
- dw TextCommand_START ; TX_START
- dw TextCommand_RAM ; TX_RAM
- dw TextCommand_BCD ; TX_BCD
- dw TextCommand_MOVE ; TX_MOVE
- dw TextCommand_BOX ; TX_BOX
- dw TextCommand_LOW ; TX_LOW
- dw TextCommand_PROMPT_BUTTON ; TX_PROMPT_BUTTON
- dw TextCommand_SCROLL ; TX_SCROLL
- dw TextCommand_START_ASM ; TX_START_ASM
- dw TextCommand_NUM ; TX_NUM
- dw TextCommand_PAUSE ; TX_PAUSE
- dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_50_79
- dw TextCommand_DOTS ; TX_DOTS
- dw TextCommand_LINK_PROMPT_BUTTON ; TX_LINK_PROMPT_BUTTON
- dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_20_49
- dw TextCommand_SOUND ; TX_SOUND_ITEM
- dw TextCommand_SOUND ; TX_SOUND_CAUGHT_MON
- dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_80_109
- dw TextCommand_SOUND ; TX_SOUND_FANFARE
- dw TextCommand_SOUND ; TX_SOUND_SLOT_MACHINE_START
- dw TextCommand_STRINGBUFFER ; TX_STRINGBUFFER
- dw TextCommand_DAY ; TX_DAY
- dw TextCommand_FAR ; TX_FAR
+ dw TextCommand_START ; TX_START
+ dw TextCommand_RAM ; TX_RAM
+ dw TextCommand_BCD ; TX_BCD
+ dw TextCommand_MOVE ; TX_MOVE
+ dw TextCommand_BOX ; TX_BOX
+ dw TextCommand_LOW ; TX_LOW
+ dw TextCommand_PROMPT_BUTTON ; TX_PROMPT_BUTTON
+ dw TextCommand_SCROLL ; TX_SCROLL
+ dw TextCommand_START_ASM ; TX_START_ASM
+ dw TextCommand_NUM ; TX_NUM
+ dw TextCommand_PAUSE ; TX_PAUSE
+ dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_50_79
+ dw TextCommand_DOTS ; TX_DOTS
+ dw TextCommand_WAIT_BUTTON ; TX_WAIT_BUTTON
+ dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_20_49
+ dw TextCommand_SOUND ; TX_SOUND_ITEM
+ dw TextCommand_SOUND ; TX_SOUND_CAUGHT_MON
+ dw TextCommand_SOUND ; TX_SOUND_DEX_FANFARE_80_109
+ dw TextCommand_SOUND ; TX_SOUND_FANFARE
+ dw TextCommand_SOUND ; TX_SOUND_SLOT_MACHINE_START
+ dw TextCommand_STRINGBUFFER ; TX_STRINGBUFFER
+ dw TextCommand_DAY ; TX_DAY
+ dw TextCommand_FAR ; TX_FAR
TextCommand_START::
; write text until "@"
@@ -814,9 +814,9 @@
; wait for button press; show arrow
ld a, [wLinkMode]
cp LINK_COLOSSEUM
- jp z, TextCommand_LINK_PROMPT_BUTTON
+ jp z, TextCommand_WAIT_BUTTON
cp LINK_MOBILE
- jp z, TextCommand_LINK_PROMPT_BUTTON
+ jp z, TextCommand_WAIT_BUTTON
push hl
call LoadBlinkingCursor
@@ -970,8 +970,8 @@
pop hl
ret
-TextCommand_LINK_PROMPT_BUTTON::
-; wait for button press; display arrow
+TextCommand_WAIT_BUTTON::
+; wait for button press; don't show arrow
push hl
push bc
call PromptButton
--- a/macros/legacy.asm
+++ b/macros/legacy.asm
@@ -317,9 +317,9 @@
deciram EQUS "text_decimal"
interpret_data EQUS "text_pause"
limited_interpret_data EQUS "text_dots"
-text_waitbutton EQUS "text_promptbutton"
-link_wait_button EQUS "text_linkpromptbutton"
-text_linkwaitbutton EQUS "text_linkpromptbutton"
+link_wait_button EQUS "text_waitbutton"
+text_linkwaitbutton EQUS "text_waitbutton"
+text_linkpromptbutton EQUS "text_waitbutton"
current_day EQUS "text_today"
text_jump EQUS "text_far"
--- a/macros/scripts/text.asm
+++ b/macros/scripts/text.asm
@@ -84,9 +84,9 @@
db \1
ENDM
- enum TX_LINK_PROMPT_BUTTON ; $0d
-text_linkpromptbutton: MACRO
- db TX_LINK_PROMPT_BUTTON
+ enum TX_WAIT_BUTTON ; $0d
+text_waitbutton: MACRO
+ db TX_WAIT_BUTTON
ENDM
enum TX_SOUND_DEX_FANFARE_20_49 ; $0e