diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-21 22:29:35 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-21 22:29:35 -0600 |
| commit | 663ecd00145da49fda7d2509d629d737ea633cd8 (patch) | |
| tree | a4cfc7323151501d5603f1cd34e68a73f328434e /asm/macros/event.inc | |
| parent | a78b0636f50c012c3618d55a9b83f834319de6e0 (diff) | |
| parent | f57340b729d741acae17213c9c748738fcc1dcb3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_refactor
Diffstat (limited to 'asm/macros/event.inc')
| -rw-r--r-- | asm/macros/event.inc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index d7b4bca37..f2d14b945 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -262,6 +262,13 @@ .2byte \output .2byte SPECIAL_\function .endm + + @ temporary solution + .macro specialvar_ output, functionId + .byte 0x26 + .2byte \output + .2byte \functionId + .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). .macro waitstate |