mirror of
https://github.com/Zelda64Recomp/Zelda64Recomp.git
synced 2025-10-30 08:03:03 +00:00
Sirloin flag clears only on autosave load
This commit is contained in:
parent
3b8fca7dca
commit
d3e3fb32ab
1 changed files with 3 additions and 1 deletions
|
|
@ -629,6 +629,9 @@ RECOMP_PATCH void Sram_OpenSave(FileSelectState* fileSelect, SramContext* sramCt
|
||||||
}
|
}
|
||||||
// @recomp Handle autosaves.
|
// @recomp Handle autosaves.
|
||||||
else if (gSaveContext.save.isOwlSave == SAVE_TYPE_AUTOSAVE) {
|
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);
|
gSaveContext.save.entrance = spawn_entrance_from_autosave_entrance(gSaveContext.save.entrance);
|
||||||
|
|
||||||
// Skip the turtle cutscene that happens when entering Great Bay Temple.
|
// 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;
|
fileNum = gSaveContext.fileNum;
|
||||||
func_80147314(sramCtx, fileNum);
|
func_80147314(sramCtx, fileNum);
|
||||||
}
|
}
|
||||||
gSaveContext.unk_1014 = 0; // Don't load with the Rock Sirloin in hand.
|
|
||||||
|
|
||||||
// @recomp Initialize the autosave state tracking.
|
// @recomp Initialize the autosave state tracking.
|
||||||
autosave_init();
|
autosave_init();
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue