summaryrefslogtreecommitdiff
path: root/asm/macros/map.inc
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-12-27 09:33:58 -0600
committerGitHub <noreply@github.com>2017-12-27 09:33:58 -0600
commit86a36767dba19e84297047addf1d1d776e2efdec (patch)
treef2aaa9e93f8b8671491eda458963aee1027924c2 /asm/macros/map.inc
parente3078400bbdb3e8416806127290b9a2d68cfb3b8 (diff)
parentd34de50d34d18ee64c95232202751532534c2ed9 (diff)
Merge pull request #501 from huderlem/event_macros
New map event macros
Diffstat (limited to 'asm/macros/map.inc')
-rw-r--r--asm/macros/map.inc12
1 files changed, 12 insertions, 0 deletions
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