From ff76bba5074abefce1d479cd422a71ad3c297536 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 16 Dec 2024 10:29:59 -0500 Subject: Use "gray", not "grey" This matches the in-game text, e.g. Pewter is "A Stone Gray City" --- macros/data.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'macros') diff --git a/macros/data.asm b/macros/data.asm index 2e4a7ce2..c3c9cb8d 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -15,7 +15,7 @@ ENDM ; used in data/pokemon/base_stats/*.asm MACRO tmhm -; initialize bytes to 0 + ; initialize bytes to 0 FOR n, (NUM_TM_HM + 7) / 8 DEF _tm{d:n} = 0 ENDR -- cgit v1.3.1-sl0p 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 +++++- scripts/MtMoonB2F.asm | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'macros') 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 -- cgit v1.3.1-sl0p