diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-11-04 19:40:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-04 19:40:58 -0500 |
| commit | 9ebe549347aa16ae3f10d3261242bb1e7bbb6ca6 (patch) | |
| tree | 521a897c2da997534abd6f6adc1625968bc4603a /macros | |
| parent | c9563d5c5e8e3612ac40d70d6f6f5e03ba231f16 (diff) | |
| parent | d076159745e688bd58f1e512c4e0fcdd942161e9 (diff) | |
Merge pull request #654 from Rangi42/master
Miscellaneous cleanup issues
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/legacy.asm | 5 | ||||
| -rw-r--r-- | macros/scripts/events.asm | 6 | ||||
| -rw-r--r-- | macros/scripts/text.asm | 12 |
3 files changed, 13 insertions, 10 deletions
diff --git a/macros/legacy.asm b/macros/legacy.asm index ff20c5235..7192195fc 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -96,6 +96,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" @@ -231,7 +232,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" diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 07b6dcd3a..b7aa1a1fb 100644 --- a/macros/scripts/events.asm +++ b/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 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 |