From eef75f9664ebaa89229747725e2921c02398cce5 Mon Sep 17 00:00:00 2001
From: Anthony Stewart <anthony.l.stewart@outlook.com>
Date: Wed, 14 May 2025 19:31:05 -0500
Subject: [PATCH] ACPUE, recalculate only if save loaded. ACR, set age and
 times for the starting region.

---
 soh/soh/Enhancements/debugconsole.cpp            |  6 +++++-
 soh/soh/Enhancements/randomizer/3drando/fill.cpp | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp
index 2b1d70538..32fc8e72f 100644
--- a/soh/soh/Enhancements/debugconsole.cpp
+++ b/soh/soh/Enhancements/debugconsole.cpp
@@ -1470,7 +1470,11 @@ static bool AvailabeChecksProcessUndiscoveredExitsHandler(std::shared_ptr<Ship::
     logic->ACProcessUndiscoveredExits = enabled;
     INFO_MESSAGE("[SOH] Available Checks - Process Undiscovered Exits %s",
                  logic->ACProcessUndiscoveredExits ? "enabled" : "disabled");
-    CheckTracker::RecalculateAvailableChecks();
+
+    if (GameInteractor::IsSaveLoaded(true)) {
+        CheckTracker::RecalculateAvailableChecks();
+    }
+
     return 0;
 }
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index c71794a36..08e6d5823 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -534,10 +534,24 @@ std::vector<RandomizerCheck> ReachabilitySearch(const std::vector<RandomizerChec
                                                 RandomizerRegion startingRegion /* = RR_ROOT */) {
     auto ctx = Rando::Context::GetInstance();
     GetAccessibleLocationsStruct gals(0);
+    ResetLogic(ctx, gals, !calculatingAvailableChecks);
     if (startingRegion != RR_ROOT) {
         gals.regionPool.insert(gals.regionPool.begin(), startingRegion);
+
+        const auto& region = RegionTable(startingRegion);
+        if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD)) {
+            region->childDay = true;
+        } else {
+            region->adultDay = true;
+        }
+        if (region->timePass) {
+            if (ctx->GetOption(RSK_SELECTED_STARTING_AGE).Is(RO_AGE_CHILD)) {
+                region->childNight = true;
+            } else {
+                region->adultNight = true;
+            }
+        }
     }
-    ResetLogic(ctx, gals, !calculatingAvailableChecks);
     if (calculatingAvailableChecks) {
         logic->Reset(false);
         logic->CalculatingAvailableChecks = true;