diff options
| -rw-r--r-- | macros/scripts/events.asm | 6 | ||||
| -rw-r--r-- | scripts/MtMoonB2F.asm | 3 |
2 files changed, 6 insertions, 3 deletions
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. diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm index d17d13fe..d7d4a35b 100644 --- a/scripts/MtMoonB2F.asm +++ b/scripts/MtMoonB2F.asm @@ -184,8 +184,7 @@ MtMoonB2FSuperNerdText: text_asm CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD jr z, .beat_super_nerd - ; CheckEitherEventSetReuseA EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL - and (1 << (EVENT_GOT_DOME_FOSSIL % 8)) | (1 << (EVENT_GOT_HELIX_FOSSIL % 8)) + CheckEitherEventSet EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL, 1 jr nz, .got_a_fossil ld hl, MtMoonB2fSuperNerdEachTakeOneText call PrintText |