From f92ebdcfbd1e6e96618e13a21c9c0d3db01bc5d1 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 16 Dec 2024 10:44:44 -0500 Subject: Let CheckEitherEventSet reuse A like CheckBothEventsSet --- macros/scripts/events.asm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'macros/scripts') diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index fdbedb6f..b07a38f3 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -411,9 +411,13 @@ ENDM ; returns the complement of whether either event is set in Z flag ;\1 = event index 1 ;\2 = event index 2 +;\3 = try to reuse a (optional) MACRO CheckEitherEventSet IF ((\1) / 8) == ((\2) / 8) - ld a, [wEventFlags + ((\1) / 8)] + IF (_NARG < 3) || (((\1) / 8) != event_byte) + DEF event_byte = ((\1) / 8) + ld a, [wEventFlags + ((\1) / 8)] + ENDC and (1 << ((\1) % 8)) | (1 << ((\2) % 8)) ELSE ; This case doesn't happen in the original ROM. -- cgit v1.3.1-sl0p