diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-14 11:56:41 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-14 11:56:41 -0500 |
| commit | 04d158cfcd0f26b4dc4a00e23464a5fde201aa8e (patch) | |
| tree | 5722c829dbad65bbbeb573084291ba0621b89df5 /include/macros | |
| parent | d23c1af73e98f3bd91b4551bf624638a33bbe236 (diff) | |
| parent | 103b63bd1a0a8a00733834de1f5094507e070de9 (diff) | |
Merge branch 'master' of github.com:pret/pokeruby into modern_gcc
Diffstat (limited to 'include/macros')
| -rw-r--r-- | include/macros/event.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/macros/event.inc b/include/macros/event.inc index 8b2d587c9..7250ec5ca 100644 --- a/include/macros/event.inc +++ b/include/macros/event.inc @@ -1449,11 +1449,11 @@ .endm .macro switch var - copyvar VAR_SPECIAL_0, \var + copyvar VAR_0x8000, \var .endm .macro case condition, dest - compare_var_to_value VAR_SPECIAL_0, \condition + compare_var_to_value VAR_0x8000, \condition goto_if_eq \dest .endm @@ -1469,12 +1469,12 @@ NO = 0 .macro giveitem_std item, amount=1, function=0 - setorcopyvar VAR_SPECIAL_0, \item - setorcopyvar VAR_SPECIAL_1, \amount + setorcopyvar VAR_0x8000, \item + setorcopyvar VAR_0x8001, \amount callstd \function .endm .macro givedecoration_std decoration - setorcopyvar VAR_SPECIAL_0, \decoration + setorcopyvar VAR_0x8000, \decoration callstd 7 .endm |