From 6b160fac1c6819a3ae411ab1a8fcec56dac8fcff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= Date: Wed, 21 Jan 2026 16:33:35 +0000 Subject: [PATCH] Entrance/Location: remove Getuint32_t method (#6186) --- soh/soh/Enhancements/randomizer/entrance.cpp | 4 ---- soh/soh/Enhancements/randomizer/entrance.h | 1 - soh/soh/Enhancements/randomizer/location.cpp | 4 ---- soh/soh/Enhancements/randomizer/location.h | 1 - soh/soh/Enhancements/randomizer/location_access.cpp | 4 ++-- 5 files changed, 2 insertions(+), 12 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/entrance.cpp b/soh/soh/Enhancements/randomizer/entrance.cpp index 7d13537e7..73cbca89d 100644 --- a/soh/soh/Enhancements/randomizer/entrance.cpp +++ b/soh/soh/Enhancements/randomizer/entrance.cpp @@ -78,10 +78,6 @@ bool Entrance::ConditionsMet(bool allAgeTimes) const { return conditionsMet && (!allAgeTimes || conditionsMet == 4); } -uint32_t Entrance::Getuint32_t() const { - return connectedRegion; -} - // set the logic to be a specific age and time of day and see if the condition still holds bool Entrance::CheckConditionAtAgeTime(bool& age, bool& time, bool passAnyway) const { diff --git a/soh/soh/Enhancements/randomizer/entrance.h b/soh/soh/Enhancements/randomizer/entrance.h index e6060bd0b..bfb4f6109 100644 --- a/soh/soh/Enhancements/randomizer/entrance.h +++ b/soh/soh/Enhancements/randomizer/entrance.h @@ -50,7 +50,6 @@ class Entrance { std::string GetName() const; void printAgeTimeAccess(); bool ConditionsMet(bool allAgeTimes = false) const; - uint32_t Getuint32_t() const; bool CheckConditionAtAgeTime(bool& age, bool& time, bool passAnyway = false) const; RandomizerRegion GetConnectedRegionKey() const; RandomizerRegion GetOriginalConnectedRegionKey() const; diff --git a/soh/soh/Enhancements/randomizer/location.cpp b/soh/soh/Enhancements/randomizer/location.cpp index 250af2cfb..e129a6b26 100644 --- a/soh/soh/Enhancements/randomizer/location.cpp +++ b/soh/soh/Enhancements/randomizer/location.cpp @@ -72,10 +72,6 @@ bool Rando::Location::IsVanillaCompletion() const { return isVanillaCompletion; } -uint32_t Rando::Location::Getuint32_t() const { - return hintKey; -} - const HintText& Rando::Location::GetHint() const { return StaticData::hintTextTable[hintKey]; } diff --git a/soh/soh/Enhancements/randomizer/location.h b/soh/soh/Enhancements/randomizer/location.h index 955601220..24b192cc3 100644 --- a/soh/soh/Enhancements/randomizer/location.h +++ b/soh/soh/Enhancements/randomizer/location.h @@ -121,7 +121,6 @@ class Location { bool IsOverworld() const; bool IsShop() const; bool IsVanillaCompletion() const; - uint32_t Getuint32_t() const; const HintText& GetHint() const; RandomizerGet GetVanillaItem() const; int16_t GetVanillaPrice() const; diff --git a/soh/soh/Enhancements/randomizer/location_access.cpp b/soh/soh/Enhancements/randomizer/location_access.cpp index 696f5ebb7..068bde45b 100644 --- a/soh/soh/Enhancements/randomizer/location_access.cpp +++ b/soh/soh/Enhancements/randomizer/location_access.cpp @@ -481,7 +481,7 @@ void Region::RemoveExit(Rando::Entrance* exitToRemove) { void Region::SetAsPrimary(RandomizerRegion exitToBePrimary) { for (auto& exit : exits) { - if (exit.Getuint32_t() == exitToBePrimary) { + if (exit.GetConnectedRegionKey() == exitToBePrimary) { exit.SetAsPrimary(); return; } @@ -490,7 +490,7 @@ void Region::SetAsPrimary(RandomizerRegion exitToBePrimary) { Rando::Entrance* Region::GetExit(RandomizerRegion exitToReturn) { for (auto& exit : exits) { - if (exit.Getuint32_t() == exitToReturn) { + if (exit.GetConnectedRegionKey() == exitToReturn) { return &exit; } }