diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2019-01-24 21:30:19 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2019-01-24 21:30:19 +0100 |
| commit | ebfaf3f6bef77808389891c0983a74846257c708 (patch) | |
| tree | a57617e03f5aaeb3979cb20c24a31547f99ed70f /asm/macros | |
| parent | 23b396dd3fa539c79f000e7c33468ed916821cfc (diff) | |
| parent | dcf79a29ba637713fb9e12512840654b2d5d09ac (diff) | |
Merge branch 'master' into dump
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 ba851d70a..091c32a2a 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1626,11 +1626,11 @@ .endm .macro switch var:req - copyvar 0x8000, \var + copyvar VAR_0x8000, \var .endm .macro case condition:req, dest:req - compare 0x8000, \condition + compare VAR_0x8000, \condition goto_if_eq \dest .endm @@ -1650,13 +1650,13 @@ .endm .macro giveitem_std item:req, amount=1, function=0 - setorcopyvar 0x8000, \item - setorcopyvar 0x8001, \amount + setorcopyvar VAR_0x8000, \item + setorcopyvar VAR_0x8001, \amount callstd \function .endm .macro givedecoration_std decoration:req - setorcopyvar 0x8000, \decoration + setorcopyvar VAR_0x8000, \decoration callstd STD_OBTAIN_DECORATION .endm |