diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-10-27 02:02:36 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-10-27 02:02:36 -0500 |
| commit | 49c88e63439a4ca08ca9fac7a85de51d4f56c8bd (patch) | |
| tree | 69504e13ad956a1596d7f5f188279f0c25ddad55 /asm/macros | |
| parent | 431e737453feb99c18349060cad53d551ba41dcf (diff) | |
| parent | 5ea2f463d71d0bc2663e70a553557de0ccf40eef (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald into dump_maps
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/event.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 50e4ac504..f0577f777 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -241,14 +241,14 @@ @ Calls a special function; that is, a function 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 specialvar 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). |