summaryrefslogtreecommitdiff
path: root/macros/scripts/text.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-01-06 22:07:33 -0600
committerdannye <33dannye@gmail.com>2020-01-06 22:07:33 -0600
commite7be25948dfeef257697a7aa30706339f6ba014b (patch)
tree973d0ad95361a1dfd1c371be59a300be19532e47 /macros/scripts/text.asm
parent99d16d616d5f70754dd6aa567e478e587a733d8c (diff)
parent94ebdab6d350fd6ebfd43c5a84710ed14dade8ca (diff)
Merge branch 'master' into audio-macros
Diffstat (limited to 'macros/scripts/text.asm')
-rw-r--r--macros/scripts/text.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm
index dcdf0b278..bb1701f8e 100644
--- a/macros/scripts/text.asm
+++ b/macros/scripts/text.asm
@@ -46,9 +46,9 @@ text_low: MACRO
db TX_LOW
ENDM
- enum TX_WAIT_BUTTON ; $06
-text_waitbutton: MACRO
- db TX_WAIT_BUTTON
+ enum TX_PROMPT_BUTTON ; $06
+text_promptbutton: MACRO
+ db TX_PROMPT_BUTTON
ENDM
enum TX_SCROLL ; $07
@@ -84,9 +84,9 @@ text_dots: MACRO
db \1
ENDM
- enum TX_LINK_WAIT_BUTTON ; $0d
-text_linkwaitbutton: MACRO
- db TX_LINK_WAIT_BUTTON
+ enum TX_LINK_PROMPT_BUTTON ; $0d
+text_linkpromptbutton: MACRO
+ db TX_LINK_PROMPT_BUTTON
ENDM
enum TX_SOUND_DEX_FANFARE_20_49 ; $0e