diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/legacy.asm | 7 | ||||
| -rw-r--r-- | macros/scripts/battle_anims.asm | 2 | ||||
| -rw-r--r-- | macros/scripts/events.asm | 12 |
3 files changed, 12 insertions, 9 deletions
diff --git a/macros/legacy.asm b/macros/legacy.asm index a8a89829a..245e24c6e 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -25,14 +25,17 @@ checkmaptriggers EQUS "checkmapscene" domaptrigger EQUS "setmapscene" checktriggers EQUS "checkscene" dotrigger EQUS "setscene" + faceperson EQUS "faceobject" moveperson EQUS "moveobject" writepersonxy EQUS "writeobjectxy" -spriteface EQUS "objectface" +spriteface EQUS "turnobject" +objectface EQUS "turnobject" RAM2MEM EQUS "vartomem" loadfont EQUS "opentext" -loadmenudata EQUS "loadmenuheader" +loadmenudata EQUS "loadmenu" +loadmenuheader EQUS "loadmenu" writebackup EQUS "closewindow" interpretmenu EQUS "_2dmenu" interpretmenu2 EQUS "verticalmenu" diff --git a/macros/scripts/battle_anims.asm b/macros/scripts/battle_anims.asm index 5c7aabed3..76300e78f 100644 --- a/macros/scripts/battle_anims.asm +++ b/macros/scripts/battle_anims.asm @@ -1,6 +1,6 @@ anim_wait: MACRO if \1 >= $d0 - flip out + fail "anim_wait argument must be less than $d0." endc db \1 ENDM diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 6f6d1992d..869dd7edf 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -516,9 +516,9 @@ yesorno: MACRO db yesorno_command ENDM - enum loadmenuheader_command ; $4f -loadmenuheader: MACRO - db loadmenuheader_command + enum loadmenu_command ; $4f +loadmenu: MACRO + db loadmenu_command dw \1 ; menu_header ENDM @@ -747,9 +747,9 @@ showemote: MACRO db \3 ; time ENDM - enum objectface_command ; $76 -objectface: MACRO - db objectface_command + enum turnobject_command ; $76 +turnobject: MACRO + db turnobject_command db \1 ; object id db \2 ; facing ENDM |