Fixes for suns song usage in time shuffle (#1488)

1 files changed, 10 insertions, 0 deletions

diff --git a/mm/2s2h/Rando/Menu.cpp b/mm/2s2h/Rando/Menu.cpp
index e25d052ad..b0b63dc35 100644
--- a/mm/2s2h/Rando/Menu.cpp
+++ b/mm/2s2h/Rando/Menu.cpp
@@ -196,6 +196,16 @@ void RefreshMetrics() {
     for (auto& item : startingItems) {
         setOfItemsInPool.insert(item);
     }
+    // Handle weird edge case with Random shuffle time option missing one time because it's computed given
+    if (randoSaveInfo.randoSaveOptions[RO_CLOCK_SHUFFLE] &&
+        randoSaveInfo.randoSaveOptions[RO_CLOCK_SHUFFLE_PROGRESSIVE] == RO_CLOCK_SHUFFLE_RANDOM) {
+        setOfItemsInPool.insert(RI_TIME_DAY_1);
+        setOfItemsInPool.insert(RI_TIME_NIGHT_1);
+        setOfItemsInPool.insert(RI_TIME_DAY_2);
+        setOfItemsInPool.insert(RI_TIME_NIGHT_2);
+        setOfItemsInPool.insert(RI_TIME_DAY_3);
+        setOfItemsInPool.insert(RI_TIME_NIGHT_3);
+    }
     ableToBalance = checksInPool >= (itemsInPool - junkInPool);
 }