From d20976f7e628d3bd2171d3b4714bc960b6d1138f Mon Sep 17 00:00:00 2001
From: louist103 <35883445+louist103@users.noreply.github.com>
Date: Mon, 17 Mar 2025 11:06:03 -0400
Subject: Add option to de-select XMLs and fix credits (#1064)

* Add option to de-select XMLs

* Format

* Bump ZAPD

* Fix credits

* Format

* Final bump

* Actual final push.

* Actual final bump
---
 OTRExporter                                    |  2 +-
 ZAPDTR                                         |  2 +-
 mm/2s2h/Enhancements/Audio/AudioCollection.cpp | 21 ++++++++++++---------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/OTRExporter b/OTRExporter
index fd8cc8714..78e58b56b 160000
--- a/OTRExporter
+++ b/OTRExporter
@@ -1 +1 @@
-Subproject commit fd8cc87147680d8f1b4e41d37aee45c2b1996267
+Subproject commit 78e58b56b01758b072bfdf1d77c6b9a4913901eb
diff --git a/ZAPDTR b/ZAPDTR
index 4129f346f..44d24007c 160000
--- a/ZAPDTR
+++ b/ZAPDTR
@@ -1 +1 @@
-Subproject commit 4129f346f2ecd01e030fffab9574d7825c2b83d6
+Subproject commit 44d24007c02f71d898e190d522ae332527196b8d
diff --git a/mm/2s2h/Enhancements/Audio/AudioCollection.cpp b/mm/2s2h/Enhancements/Audio/AudioCollection.cpp
index 238a5071e..0856e3eb5 100644
--- a/mm/2s2h/Enhancements/Audio/AudioCollection.cpp
+++ b/mm/2s2h/Enhancements/Audio/AudioCollection.cpp
@@ -185,7 +185,9 @@ AudioCollection::AudioCollection() {
         SEQUENCE_MAP_ENTRY(NA_BGM_CREMIA_CARRIAGE, "Cremia Carriage", "NA_BGM_CREMIA_CARRIAGE", SEQ_BGM_WORLD, true,
                            true),
         SEQUENCE_MAP_ENTRY(NA_BGM_KEATON_QUIZ, "Keaton Quiz", "NA_BGM_KEATON_QUIZ", SEQ_BGM_WORLD, true, true),
-        SEQUENCE_MAP_ENTRY(NA_BGM_END_CREDITS, "Credits (First Half)", "NA_BGM_END_CREDITS", SEQ_BGM_WORLD, true, true),
+        // The credits cutscene uses the position in the sequence to advance. It should not be changed.
+        SEQUENCE_MAP_ENTRY(NA_BGM_END_CREDITS, "Credits (First Half)", "NA_BGM_END_CREDITS", SEQ_BGM_WORLD, false,
+                           false),
         SEQUENCE_MAP_ENTRY(NA_BGM_OPENING_LOOP, "Opening Loop", "NA_BGM_OPENING_LOOP", SEQ_BGM_WORLD, true, true),
         SEQUENCE_MAP_ENTRY(NA_BGM_TITLE_THEME, "Title Theme", "NA_BGM_TITLE_THEME", SEQ_BGM_WORLD, true, true),
         SEQUENCE_MAP_ENTRY(NA_BGM_DUNGEON_APPEAR, "Dungeon Appear", "NA_BGM_DUNGEON_APPEAR", SEQ_BGM_EVENT, true, true),
@@ -198,7 +200,7 @@ AudioCollection::AudioCollection() {
         SEQUENCE_MAP_ENTRY(NA_BGM_MOONS_DESTRUCTION, "Moon's Destruction", "NA_BGM_MOONS_DESTRUCTION", SEQ_BGM_EVENT,
                            true, true),
         SEQUENCE_MAP_ENTRY(NA_BGM_END_CREDITS_SECOND_HALF, "Credits (Second Half)", "NA_BGM_END_CREDITS_SECOND_HALF",
-                           SEQ_BGM_WORLD, true, true),
+                           SEQ_BGM_WORLD, false, false),
     };
 
     // Initialize counts for each type
@@ -366,11 +368,12 @@ size_t AudioCollection::CountSequencesByType(SeqType type) {
 }
 
 uint16_t AudioCollection::GetMaxOriginalSeqId() const {
-    uint16_t maxId = 0;
-    for (const auto& [seqId, seqInfo] : mSequenceMap) {
-        if (!(seqInfo.category & SEQ_BGM_CUSTOM) && seqId > maxId) {
-            maxId = seqId;
-        }
-    }
-    return maxId;
+    return 0x7F;
+    // uint16_t maxId = 0;
+    // for (const auto& [seqId, seqInfo] : mSequenceMap) {
+    //     if (!(seqInfo.category & SEQ_BGM_CUSTOM) && seqId > maxId) {
+    //         maxId = seqId;
+    //     }
+    // }
+    // return maxId;
 }
-- 
cgit v1.2.3