diff options
| author | Eblo <7004497+Eblo@users.noreply.github.com> | 2025-10-18 19:54:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-18 19:54:59 -0400 |
| commit | 5ef25f993fd15bd08e529651a2d55f75db392ea4 (patch) | |
| tree | 3869ab93675a64e46c06b459a19ecc9bc760d355 | |
| parent | 16bc8ea0dd4a28d3206af3bb1e00a5ce2902fa56 (diff) | |
Do not force sequence player when using telescope (#1288)
| -rw-r--r-- | mm/2s2h/Enhancements/Fixes/BgmReplay.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mm/2s2h/Enhancements/Fixes/BgmReplay.cpp b/mm/2s2h/Enhancements/Fixes/BgmReplay.cpp index 22a0ecf7c..255e71ce7 100644 --- a/mm/2s2h/Enhancements/Fixes/BgmReplay.cpp +++ b/mm/2s2h/Enhancements/Fixes/BgmReplay.cpp @@ -5,6 +5,7 @@ extern "C" { #include "variables.h" #include "functions.h" +extern u8 sStartSeqDisabled; } #define CVAR_NAME_FASTER_SCENE_TRANSITIONS "gEnhancements.Timesavers.FasterSceneTransitions" @@ -29,6 +30,11 @@ extern "C" { void RegisterFixBgmReplay() { COND_VB_SHOULD(VB_PLAY_SCENE_SEQUENCE, CVAR_FASTER_SCENE_TRANSITIONS || CVAR_PAUSE_SAVE || CVAR_DEBUG_MODE, { + // The Astral Observatory telescope and moon crash set this flag. No need to meddle further. + if (sStartSeqDisabled) { + return; + } + u16 sRequestedSceneSeqId = *va_arg(args, u16*); u16 sPrevMainBgmSeqId = *va_arg(args, u16*); u16 seqId = *va_arg(args, u16*); |