diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-14 21:58:40 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-15 07:49:00 -0500 |
| commit | 17c6698705f6ab0956be060fc4b81c0fb01988f5 (patch) | |
| tree | 231deb7f205edd6015fe0e127d8de76624c484b1 /include/macros/map.inc | |
| parent | be5a199f5b1cc13f39b7d4f7eaa80fb08929d9a3 (diff) | |
Port object_event macro from emerald
Diffstat (limited to 'include/macros/map.inc')
| -rw-r--r-- | include/macros/map.inc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/macros/map.inc b/include/macros/map.inc index 4d2708836..c931d3b0e 100644 --- a/include/macros/map.inc +++ b/include/macros/map.inc @@ -14,13 +14,15 @@ .4byte \address .endm - .macro object_event index, word1, byte2, byte3, byte4, byte5, byte6, byte7, byte8, byte9, byte10, byte11, byte12, byte13, byte14, script, word2, byte15, byte16 - .byte \index - .2byte \word1 - .byte \byte2, \byte3, \byte4, \byte5, \byte6, \byte7, \byte8, \byte9, \byte10, \byte11, \byte12, \byte13, \byte14 + .macro object_event index, gfx, replacement, x, y, elevation, movement_type, radius, trainer_type, sight_radius_tree_etc, script, event_flag + .byte \index, \gfx, \replacement, 0 + .2byte \x + .2byte \y + .byte \elevation, \movement_type, \radius, 0 + .2byte \trainer_type, \sight_radius_tree_etc .4byte \script - .2byte \word2 - .byte \byte15, \byte16 + .2byte \event_flag + .2byte 0 inc _num_npcs .endm |