From 999de5b3692617f68b34bc84821bbdd8db3604b4 Mon Sep 17 00:00:00 2001
From: Anthony Stewart <anthony.l.stewart@outlook.com>
Date: Sat, 22 Feb 2025 16:34:48 -0600
Subject: [PATCH] Skip CanBuy check when calculating accessible checks, it
 spoils that some items can't be bought with the current wallet.

---
 soh/soh/Enhancements/randomizer/3drando/fill.cpp    | 2 +-
 soh/soh/Enhancements/randomizer/location_access.cpp | 4 ++--
 soh/soh/Enhancements/randomizer/location_access.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
index 0f71adf89..548ab7f48 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -398,7 +398,7 @@ bool AddCheckToLogic(LocationAccess& locPair, GetAccessibleLocationsStruct& gals
   Rando::ItemLocation* location = ctx->GetItemLocation(loc);
   RandomizerGet locItem = location->GetPlacedRandomizerGet();
 
-  if (!location->IsAddedToPool() && locPair.ConditionsMet(parentRegion)) {
+  if (!location->IsAddedToPool() && locPair.ConditionsMet(parentRegion, gals.calculatingAccessibleChecks)) {
     location->AddToPool();
 
     if (gals.calculatingAccessibleChecks) {
diff --git a/soh/soh/Enhancements/randomizer/location_access.cpp b/soh/soh/Enhancements/randomizer/location_access.cpp
index a45e27cd0..eeb164bf1 100644
--- a/soh/soh/Enhancements/randomizer/location_access.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access.cpp
@@ -27,7 +27,7 @@ bool LocationAccess::CheckConditionAtAgeTime(bool& age, bool& time) const {
     return GetConditionsMet();
 }
 
-bool LocationAccess::ConditionsMet(Region* parentRegion) const {
+bool LocationAccess::ConditionsMet(Region* parentRegion, bool calculatingAccessibleChecks) const {
     //WARNING enterance validation can run this after resetting the access for sphere 0 validation
     //When refactoring ToD access, either fix the above or do not assume that we
     //have any access at all just because this is being run
@@ -42,7 +42,7 @@ bool LocationAccess::ConditionsMet(Region* parentRegion) const {
         conditionsMet = true;
     }
 
-    return conditionsMet && CanBuy();
+    return conditionsMet && (calculatingAccessibleChecks || CanBuy());
 }
 
 bool LocationAccess::CanBuy() const {
diff --git a/soh/soh/Enhancements/randomizer/location_access.h b/soh/soh/Enhancements/randomizer/location_access.h
index 986d08d6a..383bfd31f 100644
--- a/soh/soh/Enhancements/randomizer/location_access.h
+++ b/soh/soh/Enhancements/randomizer/location_access.h
@@ -75,7 +75,7 @@ class LocationAccess {
 
         bool CheckConditionAtAgeTime(bool& age, bool& time) const;
 
-        bool ConditionsMet(Region* parentRegion) const;
+        bool ConditionsMet(Region* parentRegion, bool calculatingAccessibleChecks) const;
 
         RandomizerCheck GetLocation() const {
             return location;