diff options
Diffstat (limited to 'asm/macros/map.inc')
| -rw-r--r-- | asm/macros/map.inc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 9c68e8414..075993fd3 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -14,13 +14,15 @@ .4byte \address .endm - .macro object_event byte1, word1, byte2, byte3, byte4, byte5, byte6, byte7, byte8, byte9, byte10, byte11, byte12, byte13, byte14, script, word2, byte15, byte16 - .byte \byte1 - .2byte \word1 - .byte \byte2, \byte3, \byte4, \byte5, \byte6, \byte7, \byte8, \byte9, \byte10, \byte11, \byte12, \byte13, \byte14 + .macro object_event index:req, gfx:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req + .byte \index + .2byte \gfx + .byte 0 + .2byte \x, \y + .byte \elevation, \movement_type, ((\y_radius << 4) | \x_radius), 0 + .2byte \trainer_type, \sight_radius_tree_etc .4byte \script - .2byte \word2 - .byte \byte15, \byte16 + .2byte \event_flag, 0 inc _num_npcs .endm @@ -53,6 +55,10 @@ inc _num_signs .endm + .macro bg_hidden_item_event x, y, height, item, flag, unknown + bg_event \x, \y, \height, 7, 0, \item, \flag, \unknown + .endm + .macro map_events npcs, warps, traps, signs .byte _num_npcs, _num_warps, _num_traps, _num_signs .4byte \npcs, \warps, \traps, \signs |