Skip Woodfall Clear cutscene on repeats (#1377)

* Skip Woodfall Clear cutscene on repeats

* Forgot a flag

1 files changed, 6 insertions, 0 deletions

diff --git a/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipGiantsChamber.cpp b/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipGiantsChamber.cpp
index 2d9481f0e..19b8c72a4 100644
--- a/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipGiantsChamber.cpp
+++ b/mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipGiantsChamber.cpp
@@ -146,6 +146,12 @@ void RegisterSkipGiantsChamber() {
                 GameInteractor::Instance->events.erase(it);
                 handleGiantsCheck((SceneId)transition.transitionType);
             }
+        } else if (gSaveContext.save.entrance == ENTRANCE(WOODFALL, 0) && gSaveContext.save.cutsceneIndex == 0xFFF0) {
+            // Odolwa's Lair repeat warps go straight to the Woodfall clear cutscene. Skip that too.
+            SET_WEEKEVENTREG(WEEKEVENTREG_CLEARED_WOODFALL_TEMPLE);
+            SET_WEEKEVENTREG(WEEKEVENTREG_ENTERED_WOODFALL_TEMPLE_PRISON);
+            gSaveContext.save.entrance = ENTRANCE(WOODFALL_TEMPLE, 1);
+            gSaveContext.save.cutsceneIndex = 0;
         }
     });