From dd9b1676898862f70c3352ed46a0f9097a50450c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 4 Sep 2015 20:33:38 -0400 Subject: Rewrite SetEvents and ResetEvents for unlimited number of events --- constants/event_macros.asm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/constants/event_macros.asm b/constants/event_macros.asm index cc7c03f5..90a6a59b 100755 --- a/constants/event_macros.asm +++ b/constants/event_macros.asm @@ -163,14 +163,13 @@ event_byte = ((\1) / 8) ;\1 = event index ;\2 = event index -;\3 = event index (optional) +;\3, \4, ... = additional (optional) event indices SetEvents: MACRO SetEvent \1 + rept (_NARG + -1) SetEventReuseHL \2 - - IF _NARG > 2 - SetEventReuseHL \3 - ENDC + shift + endr ENDM ;\1 = event index @@ -214,11 +213,10 @@ event_byte = ((\1) / 8) ;\3 = event index (optional) ResetEvents: MACRO ResetEvent \1 + rept (_NARG + -1) ResetEventReuseHL \2 - - IF _NARG > 2 - ResetEventReuseHL \3 - ENDC + shift + endr ENDM ;\1 = event index -- cgit v1.2.3