diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 10:49:21 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-20 10:49:21 +0200 |
| commit | b65da491a97e77ed2aa122ab7342c7fb94d35606 (patch) | |
| tree | 02e7c17f29426d6bca7bae4d133e1462dc81c355 /asm/macros | |
| parent | 9ccc472b97b1a7f85703f813665cb4a30f7891b6 (diff) | |
| parent | ae5aa3c4dfd81fc25e5abeef1b915bb2da68b8d1 (diff) | |
merge with master, fix conflicts
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). |