diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-28 20:03:24 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-28 20:03:24 -0400 |
| commit | 975e28c01e70c63587c8633ffc3c50b7d1759dec (patch) | |
| tree | 361d94f24acc207803afb8bff6ed7887dbbf391e /asm/macros | |
| parent | d160ca467920d97245c012b8dd0cb8be6d06620a (diff) | |
| parent | 5ea2f463d71d0bc2663e70a553557de0ccf40eef (diff) | |
Merge branch 'master' into easy_chat
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/event.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/macros/event.s b/asm/macros/event.s index ee9c42c97..b5fefb925 100644 --- a/asm/macros/event.s +++ b/asm/macros/event.s @@ -241,14 +241,14 @@ @ Calls a special function; that is, a piece of ASM code designed for use by scripts and listed in a table of pointers. .macro special function .byte 0x25 - .2byte \function + .2byte SPECIAL_\function .endm @ Calls a special function. That function's output (if any) will be written to the variable you specify. .macro specialval output, function .byte 0x26 .2byte \output - .2byte \function + .2byte SPECIAL_\function .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). |