add credits skip enhancement

HarbourMasters · Dec 29, 2024 · bc4bfbd · bc4bfbd
1 parent 28e31cf
commit bc4bfbd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/src/overlays/ovl_ending/fox_end1.c b/src/overlays/ovl_ending/fox_end1.c
@@ -1150,6 +1150,10 @@ void Ending_Draw(void) {
 }
 
 void Ending_8018ABE8(void) {
+    if (CVarGetInteger("gSkipCredits", 0)) {
+        return;
+    }
+
     if (gControllerPress[3].button & Z_TRIG) {
         D_ending_80198584 ^= 1;
     }
@@ -1357,6 +1361,10 @@ void Ending_8018B174(Vec3f* actorPos, Vec3f* actorRot, f32* actorScale) {
     Vec3f sp1C = *actorRot;
     scale = *actorScale;
 
+    if (CVarGetInteger("gSkipCredits", 0)) {
+        return;
+    }
+
     if (gControllerHold[2].button & Z_TRIG) {
         if (gControllerHold[2].button & R_CBUTTONS) {
             var_fa1 += 100.0f;

diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c
@@ -1084,6 +1084,13 @@ void Ending_801924EC(u32 arg0) {
 void Ending_801926D4(void) {
     gControllerLock = 10000;
 
+    if (CVarGetInteger("gSkipCredits", 0)) {
+        gControllerLock = 0;
+        if (gControllerPress[0].button & START_BUTTON) {
+            Ending_80191234(D_ending_801934B4[93].unk_0C, &D_ending_801934B4[93]);
+        }
+    }
+
     Matrix_Push(&gGfxMatrix);
 
     Ending_801924EC(D_ending_80192E70);

diff --git a/src/port/ui/ImguiUI.cpp b/src/port/ui/ImguiUI.cpp
@@ -449,6 +449,15 @@ void DrawEnhancementsMenu() {
 
             ImGui::EndMenu();
         }
+
+        if (UIWidgets::BeginMenu("Cutscenes")) {
+            UIWidgets::CVarCheckbox("Skip Credits", "gSkipCredits", {
+                .tooltip = "Allows skipping credits by pressing the START button",
+                .defaultValue = true
+            });
+
+            ImGui::EndMenu();
+        }
 
         if (UIWidgets::BeginMenu("Fixes")) {
             UIWidgets::CVarCheckbox("Macbeth: Level ending cutscene camera fix", "gMaCameraFix", {