summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-09-07 09:39:47 -0500
committerdannye <corrnondacqb@yahoo.com>2015-09-07 09:39:47 -0500
commit4cfc1fc2f749f4f458c95721c6dc4a8bb2d0099b (patch)
treea93ec3c40d6f5efa7b22866f3fc333a86082705f
parent8026d4758565c1ae427a9995c840d8b8dbc8352b (diff)
parentcbc85b4d220b31c28266a227ff8789818631c4e9 (diff)
Merge branch 'master' of https://github.com/iimarckus/pokered
-rwxr-xr-xconstants/event_macros.asm16
1 files 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