diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2019-01-22 21:59:32 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2019-01-22 21:59:32 +0100 |
| commit | 524db6068e40db9221fa1ef8214009c2f1ace3c8 (patch) | |
| tree | 845639b20a44976fc89bbd89899b4ba055c022ca /asm | |
| parent | b6e5b4ee1ae8b2bac2cbf143b7bc7cd65afd08ab (diff) | |
| parent | 900f294011ea0eb06c48c28b4b4aea51e5cf32b7 (diff) | |
Merge branch 'master' into trainer_card
Diffstat (limited to 'asm')
| -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 |