diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-12-24 14:12:14 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-24 14:12:14 -0600 |
commit | b827bd9a5a44e17fa9fced591465fc64a619a134 (patch) | |
tree | 473525953b1ac35be06b26cd2e6926fb7b0278cb /asm/macros | |
parent | 30c77aa4ca5502b07a9ccdf2012a7da265e8bffa (diff) | |
parent | 2c4d972f7c5a79ca94dca599b6e7b9e2c769cf70 (diff) |
Merge pull request #500 from huderlem/vars
Use constants for vars
Diffstat (limited to 'asm/macros')
-rw-r--r-- | asm/macros/event.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 738c2418e..5176beff3 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1366,11 +1366,11 @@ .endm .macro switch var - copyvar 0x8000, \var + copyvar VAR_SPECIAL_0, \var .endm .macro case condition, dest - compare_var_to_value 0x8000, \condition + compare_var_to_value VAR_SPECIAL_0, \condition goto_if_eq \dest .endm @@ -1386,12 +1386,12 @@ NO = 0 .macro giveitem_std item, amount=1, function=0 - setorcopyvar 0x8000, \item - setorcopyvar 0x8001, \amount + setorcopyvar VAR_SPECIAL_0, \item + setorcopyvar VAR_SPECIAL_1, \amount callstd \function .endm .macro givedecoration_std decoration - setorcopyvar 0x8000, \decoration + setorcopyvar VAR_SPECIAL_0, \decoration callstd 7 .endm |