diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-28 22:14:47 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-28 22:14:47 -0500 |
| commit | 9d2ee97519aa8ee3c5e5c0d11f49f5a77e4f870e (patch) | |
| tree | 763431b9969206b11c5c42c7154c19ad5d21f421 /asm/macros | |
| parent | 857b166086756ccc92e58981493513a7f00920ff (diff) | |
| parent | 86a36767dba19e84297047addf1d1d776e2efdec (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/event.inc | 10 | ||||
| -rw-r--r-- | asm/macros/map.inc | 12 |
2 files changed, 17 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 diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 9c68e8414..db37d9346 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -40,6 +40,10 @@ inc _num_traps .endm + .macro coord_weather_event x, y, height, weather + coord_event \x, \y, \height, 0, \weather, 0, 0, 0x0 + .endm + .macro bg_event x, y, byte, kind, word, arg6, arg7, arg8 .2byte \x, \y .byte \byte, \kind @@ -53,6 +57,14 @@ inc _num_signs .endm + .macro bg_hidden_item_event x, y, height, item, flag + bg_event \x, \y, \height, 7, 0, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0 + .endm + + .macro bg_secret_base_event x, y, height, secret_base_id + bg_event \x, \y, \height, 8, 0, \secret_base_id, 0, 0 + .endm + .macro map_events npcs, warps, traps, signs .byte _num_npcs, _num_warps, _num_traps, _num_signs .4byte \npcs, \warps, \traps, \signs |