diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-25 20:05:37 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-25 20:05:37 -0500 |
| commit | f964d04a873769c0aa1d27a7dd032170f55853fd (patch) | |
| tree | ddc0ac1a1081b3b81fd3b7a041943e9571bb8e2e /macros/scripts | |
| parent | be28a0ff4eb4ba04dcbd0fc025b3a68af535a0a1 (diff) | |
* loadmenuheader -> loadmenu (ead103d)
* objectface -> turnobject (c834bda)
Diffstat (limited to 'macros/scripts')
| -rw-r--r-- | macros/scripts/battle_anims.asm | 2 | ||||
| -rw-r--r-- | macros/scripts/events.asm | 12 |
2 files changed, 7 insertions, 7 deletions
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 |