diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2018-01-21 20:38:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-21 20:38:34 -0500 |
| commit | 097da4e0112275a25b99160f5bc409a51f3a13d7 (patch) | |
| tree | bf94ff010c6a0efcba7cdf3cb958805cabc191a6 /asm/macros | |
| parent | 19864d3cd93e57880da1430489c365907fb0a7a3 (diff) | |
| parent | f57340b729d741acae17213c9c748738fcc1dcb3 (diff) | |
Merge branch 'master' into libc
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/event.inc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index d7b4bca37..f2d14b945 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -262,6 +262,13 @@ .2byte \output .2byte SPECIAL_\function .endm + + @ temporary solution + .macro specialvar_ output, functionId + .byte 0x26 + .2byte \output + .2byte \functionId + .endm @ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock state, the script will remain blocked indefinitely (essentially a hang). .macro waitstate |