From 894630dbfd7319692c4e47802f49a4b89df22be9 Mon Sep 17 00:00:00 2001 From: mckinlee Date: Mon, 21 Jul 2025 14:27:25 -0400 Subject: Skip Intro Persistence Fix (#1202) * Add persistence for modified state in Skip Intro Sequence * persist tatl interrupts skip to save --- mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTatlInterrupts.cpp | 1 + mm/2s2h/Enhancements/Cutscenes/SkipIntroSequence.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTatlInterrupts.cpp b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTatlInterrupts.cpp index 074a5fb8e..296d52748 100644 --- a/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTatlInterrupts.cpp +++ b/mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTatlInterrupts.cpp @@ -19,6 +19,7 @@ void RegisterSkipTatlInterrupts() { if (gSaveContext.save.entrance == ENTRANCE(SOUTH_CLOCK_TOWN, 0) && gSaveContext.save.cutsceneIndex == 0 && !CHECK_WEEKEVENTREG(WEEKEVENTREG_59_04)) { Flags_SetWeekEventReg(WEEKEVENTREG_59_04); + Sram_SaveSpecialEnterClockTown(gPlayState); } }); diff --git a/mm/2s2h/Enhancements/Cutscenes/SkipIntroSequence.cpp b/mm/2s2h/Enhancements/Cutscenes/SkipIntroSequence.cpp index eaf069e05..767cc3a0d 100644 --- a/mm/2s2h/Enhancements/Cutscenes/SkipIntroSequence.cpp +++ b/mm/2s2h/Enhancements/Cutscenes/SkipIntroSequence.cpp @@ -60,6 +60,8 @@ void RegisterSkipIntroSequence() { SET_WEEKEVENTREG(WEEKEVENTREG_ENTERED_WEST_CLOCK_TOWN); SET_WEEKEVENTREG(WEEKEVENTREG_ENTERED_NORTH_CLOCK_TOWN); } + // Persist this modified state so moon crashes without saving keep it + Sram_SaveSpecialEnterClockTown(gPlayState); }); } -- cgit v1.2.3