diff options
author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-26 16:31:02 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-26 16:31:02 -0400 |
commit | 553cb9bc82e751da5fa940d797aaf474d998f8a4 (patch) | |
tree | c3a35971e9c5bbd274d61728f2cf4882eb65e40c /macros/legacy.asm | |
parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
parent | 35821ec58c244be1f5cb670e07873e8a875c10a5 (diff) |
Merge pull request #754 from Rangi42/master
Use def_* macros for automatic map event counts
Diffstat (limited to 'macros/legacy.asm')
-rw-r--r-- | macros/legacy.asm | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/macros/legacy.asm b/macros/legacy.asm index 6ff29fc5f..a561b3fca 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -223,18 +223,12 @@ signpost: MACRO ENDM person_event: MACRO -; object_event \3, \2, \1, \4, \5, \6, \7, \8, \9, \10, \11, \12, \13 - db \1, \2 + 4, \3 + 4, \4 - dn \6, \5 - db \7, \8 - shift - dn \8, \9 - shift - db \9 - shift - dw \9 - shift - dw \9 +_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 ENDM PERSONTYPE_SCRIPT EQUS "OBJECTTYPE_SCRIPT" |