From d3e3fb32ab0831ae7583994721a1c1eb42d93261 Mon Sep 17 00:00:00 2001 From: Doctor Dink Date: Sun, 10 Aug 2025 19:16:54 -0400 Subject: [PATCH] Sirloin flag clears only on autosave load --- patches/autosaving.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/patches/autosaving.c b/patches/autosaving.c index 6c9fc35..292f53e 100644 --- a/patches/autosaving.c +++ b/patches/autosaving.c @@ -629,6 +629,9 @@ RECOMP_PATCH void Sram_OpenSave(FileSelectState* fileSelect, SramContext* sramCt } // @recomp Handle autosaves. else if (gSaveContext.save.isOwlSave == SAVE_TYPE_AUTOSAVE) { + // Clear Rock Sirloin from being held, due to MM hardcoding its behavior + gSaveContext.unk_1014 = 0; + gSaveContext.save.entrance = spawn_entrance_from_autosave_entrance(gSaveContext.save.entrance); // Skip the turtle cutscene that happens when entering Great Bay Temple. @@ -682,7 +685,6 @@ RECOMP_PATCH void Sram_OpenSave(FileSelectState* fileSelect, SramContext* sramCt fileNum = gSaveContext.fileNum; func_80147314(sramCtx, fileNum); } - gSaveContext.unk_1014 = 0; // Don't load with the Rock Sirloin in hand. // @recomp Initialize the autosave state tracking. autosave_init();