diff options
author | dannye <33dannye@gmail.com> | 2020-01-06 22:07:33 -0600 |
---|---|---|
committer | dannye <33dannye@gmail.com> | 2020-01-06 22:07:33 -0600 |
commit | e7be25948dfeef257697a7aa30706339f6ba014b (patch) | |
tree | 973d0ad95361a1dfd1c371be59a300be19532e47 /macros/legacy.asm | |
parent | 99d16d616d5f70754dd6aa567e478e587a733d8c (diff) | |
parent | 94ebdab6d350fd6ebfd43c5a84710ed14dade8ca (diff) |
Merge branch 'master' into audio-macros
Diffstat (limited to 'macros/legacy.asm')
-rw-r--r-- | macros/legacy.asm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/macros/legacy.asm b/macros/legacy.asm index 22a2fa191..6234b8343 100644 --- a/macros/legacy.asm +++ b/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" |