summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormckinlee <mckinlee@ymail.com>2025-07-21 14:27:25 -0400
committerGitHub <noreply@github.com>2025-07-21 14:27:25 -0400
commit894630dbfd7319692c4e47802f49a4b89df22be9 (patch)
treebaaa5360f4480d6b3ade8dabaea00720ff0bc9ed
parentcf204b86e577c69cd3c110c3de0a8cc750e566c6 (diff)
Skip Intro Persistence Fix (#1202)
* Add persistence for modified state in Skip Intro Sequence * persist tatl interrupts skip to save
-rw-r--r--mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTatlInterrupts.cpp1
-rw-r--r--mm/2s2h/Enhancements/Cutscenes/SkipIntroSequence.cpp2
2 files changed, 3 insertions, 0 deletions
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);
});
}