diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-04 22:21:39 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-04 22:21:39 -0500 |
| commit | 5b5fedfc78a9f2751d001a92c65be86e3ffefcc1 (patch) | |
| tree | e1357a59a3d98cf1e976f948f98d799f87a00bf3 /asm/macros/map.inc | |
| parent | ab06b56532026db85a9cba1c21c8b2235fcdf222 (diff) | |
| parent | f0e98a9204bf19981c0c9652bc9ed82ae95438e4 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into assert
Diffstat (limited to 'asm/macros/map.inc')
| -rw-r--r-- | asm/macros/map.inc | 12 |
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 |