From 47d43f2fa1b0a35b02a1186fb94e5bd227c92219 Mon Sep 17 00:00:00 2001 From: Jeff Padgham Date: Sat, 6 Apr 2024 10:05:04 -0700 Subject: Mayor Dotour (ovl_en_dt) OK and documented (#1607) * EnDt deecomp first pass, two nonmatching * Some cleanup, got the big boy matching * Some light cleanup, documenting blinking behaviour * Fixed last non-matching with some permuter silliness * Decompilation complete * Mayor documentation, first pass * Updating some unknown vars in baisen * Added an enum for mayor's cutscene state * Formatting pass for mayor * Cleaning up unk var in mayor meeting method * Some cleanup and changes based on PR feedback * Another cleanup and fix pass based on PR feedback * Updated mayor event flags according to their usage * All the parentheses * Another round of PR feedback cleanup * Having another crack at naming/cleanup based on PR feedback * Renaming animation symbols * Fixing broken references in other actors from anim rename --------- Co-authored-by: GinNoOokami --- src/code/z_sram_NES.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/code') diff --git a/src/code/z_sram_NES.c b/src/code/z_sram_NES.c index af75b9a1d..6966bd356 100644 --- a/src/code/z_sram_NES.c +++ b/src/code/z_sram_NES.c @@ -152,7 +152,7 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_59_04) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_59_08) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SWAMP_SHOOTING_GALLERY_QUIVER_UPGRADE) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_TOWN_SHOOTING_GALLERY_QUIVER_UPGRADE), - /* 60 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_60_10), + /* 60 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MAYOR_REWARD), /* 61 */ 0, /* 62 */ 0, /* 63 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_63_20), -- cgit v1.2.3