diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-10-21 20:20:52 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-10-21 20:20:52 -0500 |
| commit | b8f23aa20d40e20c4d3e050ef3011cca22998646 (patch) | |
| tree | 247db40f1d5334167fd897edc7667d9b17f2523a /asm/macros | |
| parent | 667914075bb1680cba3866eef247abedc7a461ce (diff) | |
| parent | afd42c8e145c77fbf07799a54aec405766eed45c (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
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). |