diff options
| -rw-r--r-- | asm/macros/map.inc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 41844b5cd..5367ad712 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -44,13 +44,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, gfx, replacement, filler1, x, y, elevation, movement_type, radius, filler2, trainer_type, sight_radius_tree_etc, script, event_flag, filler3, filler4 + .byte \index, \gfx, \replacement, \filler1 + .2byte \x + .2byte \y + .byte \elevation, \movement_type, \radius, \filler2 + .2byte \trainer_type, \sight_radius_tree_etc .4byte \script - .2byte \word2 - .byte \byte15, \byte16 + .2byte \event_flag + .byte \filler3, \filler4 inc _num_npcs .endm |