diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-21 23:20:13 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-21 23:20:13 -0500 |
| commit | d4e8c20f840996049f269ffcd22d7e3feb489696 (patch) | |
| tree | 48b8deab17118064ae33bf8924569c834416cb96 /asm/macros | |
| parent | d35cf06854be09a6bcf5ceb63cdb54cefd6d48a2 (diff) | |
| parent | f57340b729d741acae17213c9c748738fcc1dcb3 (diff) | |
Merge branch 'master' into link
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 041d3964d..6b9227442 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 |