diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/legacy.asm | 7 | ||||
| -rw-r--r-- | macros/scripts/maps.asm | 19 |
2 files changed, 8 insertions, 18 deletions
diff --git a/macros/legacy.asm b/macros/legacy.asm index 01df8e87e..68566c75e 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -224,12 +224,7 @@ signpost: MACRO ENDM person_event: MACRO -_s = \1 -_y = \2 -_x = \3 -_m = \4 - shift 4 - object_event _x, _y, _s, _m, \1, \2, \3, \4, \5, \6, \7, \8, \9 + object_event \3, \2, \1, \4, \5, \6, \7, \8, \9, \<10>, \<11>, \<12>, \<13> ENDM PERSONTYPE_SCRIPT EQUS "OBJECTTYPE_SCRIPT" diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm index fc6d201b6..0e952c764 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -102,21 +102,16 @@ object_event: MACRO ; * if h1 == -1, h2 is treated as a time-of-day value: ; a combo of MORN, DAY, and/or NITE, or -1 to always appear ;\9: color: a PAL_NPC_* constant, or 0 for sprite default -;\10: function: a OBJECTTYPE_* constant -;\11: sight range: applies to OBJECTTYPE_TRAINER -;\12: script pointer -;\13: event flag: an EVENT_* constant, or -1 to always appear +;\<10>: function: a OBJECTTYPE_* constant +;\<11>: sight range: applies to OBJECTTYPE_TRAINER +;\<12>: script pointer +;\<13>: event flag: an EVENT_* constant, or -1 to always appear db \3, \2 + 4, \1 + 4, \4 dn \6, \5 db \7, \8 - shift - dn \8, \9 - shift - db \9 - shift - dw \9 - shift - dw \9 + dn \9, \<10> + db \<11> + dw \<12>, \<13> ; the dummy PlayerObjectTemplate object_event has no def_object_events if DEF(_NUM_OBJECT_EVENTS) {_NUM_OBJECT_EVENTS} = {_NUM_OBJECT_EVENTS} + 1 |