Merge branch 'master' into audio-macros

macros/legacy.asm

@@ -176,6 +176,7 @@ loadmenuheader    EQUS "loadmenu"
 writebackup       EQUS "closewindow"
 interpretmenu     EQUS "_2dmenu"
 interpretmenu2    EQUS "verticalmenu"
+buttonsound       EQUS "promptbutton"
 battlecheck       EQUS "randomwildmon"
 loadtrainerdata   EQUS "loadtemptrainer"
 loadpokedata      EQUS "loadwildmon"
@@ -311,7 +312,9 @@ start_asm              EQUS "text_asm"
 deciram                EQUS "text_decimal"
 interpret_data         EQUS "text_pause"
 limited_interpret_data EQUS "text_dots"
-link_wait_button       EQUS "text_linkwaitbutton"
+text_waitbutton        EQUS "text_promptbutton"
+link_wait_button       EQUS "text_linkpromptbutton"
+text_linkwaitbutton    EQUS "text_linkpromptbutton"
 current_day            EQUS "text_today"
 text_jump              EQUS "text_far"
 

macros/scripts/events.asm

@@ -553,9 +553,9 @@ waitbutton: MACRO
 	db waitbutton_command
 ENDM
 
-	enum buttonsound_command ; $55
-buttonsound: MACRO
-	db buttonsound_command
+	enum promptbutton_command ; $55
+promptbutton: MACRO
+	db promptbutton_command
 ENDM
 
 	enum pokepic_command ; $56

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