summaryrefslogtreecommitdiff
path: root/asm/macros
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-07-18 21:47:00 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-07-18 21:47:19 -0400
commitc564ff9afb0a155cec1b2105ef82db99ace91b36 (patch)
treee895cb8ad1224986ab8ac01f62e6a6a573411b41 /asm/macros
parent67ced1d77ec0d36cc2b6ebcbfc58ba28b357ddbb (diff)
Script macro special now takes, as its argument, the name of the function.
Diffstat (limited to 'asm/macros')
-rw-r--r--asm/macros/event.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index e3caa0c4f..cd2927c66 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -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).