Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into audio-macros

Browse Source
This commit is contained in:
dannye
2020-01-06 22:07:33 -06:00
parent 99d16d616d 94ebdab6d3
commit e7be25948d
451 changed files with 10496 additions and 10448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
macros/legacy.asm
View File

@@ -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"