HarbourMasters · serprex · Jan 2, 2026 · Mar 22, 2025 · Mar 22, 2025 · Mar 23, 2025
diff --git a/soh/soh/Enhancements/ExtraModes/MirroredWorld.cpp b/soh/soh/Enhancements/ExtraModes/MirroredWorld.cpp
@@ -1,7 +1,7 @@
 #include "soh/Enhancements/cosmetics/authenticGfxPatches.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/Enhancements/randomizer/3drando/random.hpp"
-#include "soh/Enhancements/randomizer/context.h"
+#include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/ShipInit.hpp"

diff --git a/soh/soh/Enhancements/Presets/Presets.cpp b/soh/soh/Enhancements/Presets/Presets.cpp
@@ -11,7 +11,6 @@
 #include "soh/SohGui/MenuTypes.h"
 #include "soh/SohGui/SohMenu.h"
 #include "soh/SohGui/SohGui.hpp"
-#include "soh/Enhancements/randomizer/randomizer_settings_window.h"
 #include "soh/Enhancements/randomizer/randomizer_check_tracker.h"
 #include "soh/Enhancements/randomizer/randomizer_entrance_tracker.h"
 #include "soh/Enhancements/randomizer/randomizer_item_tracker.h"
@@ -20,7 +19,6 @@ namespace fs = std::filesystem;
 
 namespace SohGui {
 extern std::shared_ptr<SohMenu> mSohMenu;
-extern std::shared_ptr<RandomizerSettingsWindow> mRandomizerSettingsWindow;
 } // namespace SohGui
 
 struct PresetInfo {
@@ -124,7 +122,7 @@ void applyPreset(std::string presetName, std::vector<PresetSection> includeSecti
                 }
             }
             if (i == PRESET_SECTION_RANDOMIZER) {
-                SohGui::mRandomizerSettingsWindow->SetNeedsUpdate();
+                Rando::Settings::GetInstance()->UpdateAllOptions();
             }
         }
     }

diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
@@ -1,5 +1,5 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/randomizer/context.h"
+#include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/SkipBlueWarp.cpp
@@ -1,6 +1,6 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/Enhancements/randomizer/context.h"
+#include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

diff --git a/soh/soh/Enhancements/enemyrandomizer.cpp b/soh/soh/Enhancements/enemyrandomizer.cpp
@@ -2,7 +2,7 @@
 #include "functions.h"
 #include "macros.h"
 #include "soh/Enhancements/randomizer/3drando/random.hpp"
-#include "soh/Enhancements/randomizer/context.h"
+#include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/Enhancements/enhancementTypes.h"
 #include "variables.h"
 #include "soh/OTRGlobals.h"

diff --git a/soh/soh/Enhancements/item-tables/ItemTableTypes.h b/soh/soh/Enhancements/item-tables/ItemTableTypes.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #ifdef __cplusplus
 #include <stdint.h>
 #endif

diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.cpp b/soh/soh/Enhancements/randomizer/3drando/fill.cpp
@@ -1,7 +1,7 @@
 #include "fill.hpp"
 
 #include "../dungeon.h"
-#include "../context.h"
+#include "../SeedContext.h"
 #include "item_pool.hpp"
 #include "random.hpp"
 #include "spoiler_log.hpp"

diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.hpp b/soh/soh/Enhancements/randomizer/3drando/fill.hpp
@@ -74,3 +74,5 @@ void GeneratePlaythrough();
 bool CheckBeatable(RandomizerGet ignore = RG_NONE);
 
 void ValidateEntrances(bool checkOtherEntranceAccess);
+
+void ValidateEntrances(bool checkPoeCollectorAccess, bool checkOtherEntranceAccess);
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -1,7 +1,7 @@
 #include "custom_messages.hpp"
 
 #include "../randomizerTypes.h"
-#include "../context.h"
+#include "../SeedContext.h"
 #include "../static_data.h"
 
 using namespace CustomMessages;

diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -3,7 +3,7 @@
 #include "../dungeon.h"
 #include "fill.hpp"
 #include "../static_data.h"
-#include "../context.h"
+#include "../SeedContext.h"
 #include "pool_functions.hpp"
 #include "random.hpp"
 #include "spoiler_log.hpp"

diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp
@@ -1,11 +1,12 @@
 #pragma once
+
 #include <string>
 #include <set>
-#include "../context.h"
+#include "../SeedContext.h"
 
 namespace Playthrough {
 int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
                      std::set<RandomizerTrick> enabledTricks);
 int Playthrough_Repeat(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
                        int count = 1);
-} // namespace Playthrough
+} // namespace Playthrough
diff --git a/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp b/soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
@@ -3,7 +3,7 @@
 #include "../item_location.h"
 #include "../location_access.h"
 #include "rando_main.hpp"
-#include "../context.h"
+#include "../SeedContext.h"
 #include <libultraship/bridge.h>
 #include <ship/Context.h>
 #include <libultraship/libultra/types.h>

diff --git a/soh/soh/Enhancements/randomizer/3drando/rando_main.hpp b/soh/soh/Enhancements/randomizer/3drando/rando_main.hpp
@@ -1,8 +1,9 @@
 #pragma once
+
 #include "soh/Enhancements/randomizer/item.h"
 
 #include <set>
 namespace RandoMain {
 void GenerateRando(std::set<RandomizerCheck> excludedLocations, std::set<RandomizerTrick> enabledTricks,
                    std::string seedInput);
-}
+}
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.hpp b/soh/soh/Enhancements/randomizer/3drando/shops.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../context.h"
+#include "../SeedContext.h"
 
 #include <vector>
 #include <array>

diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -160,7 +160,7 @@ std::string RemoveLineBreaks(std::string s) {
 static void WriteExcludedLocations() {
     auto ctx = Rando::Context::GetInstance();
 
-    for (size_t i = 1; i < Rando::Settings::GetInstance()->GetExcludeLocationsOptions().size(); i++) {
+    for (size_t i = 0; i < Rando::Settings::GetInstance()->GetExcludeLocationsOptions().size() - 1; i++) {
         for (const auto& location : Rando::Settings::GetInstance()->GetExcludeLocationsOptions()[i]) {
             if (ctx->GetLocationOption(static_cast<RandomizerCheck>(location->GetKey())).Get() == RO_LOCATION_INCLUDE) {
                 continue;

diff --git a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
@@ -1,7 +1,7 @@
 #include "starting_inventory.hpp"
 
 #include "../dungeon.h"
-#include "../context.h"
+#include "../SeedContext.h"
 #include "../logic.h"
 #include "pool_functions.hpp"
 #include "soh/Enhancements/randomizer/static_data.h"

diff --git a/soh/soh/Enhancements/randomizer/context.cpp → ...h/Enhancements/randomizer/SeedContext.cpp b/soh/soh/Enhancements/randomizer/context.cpp → ...h/Enhancements/randomizer/SeedContext.cpp
@@ -1,4 +1,4 @@
-#include "context.h"
+#include "SeedContext.h"
 #include "static_data.h"
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/item-tables/ItemTableManager.h"
@@ -620,4 +620,4 @@ uint32_t Context::GetSeed() const {
 void Context::SetSeed(const uint32_t seed) {
     mFinalSeed = seed;
 }
-} // namespace Rando
+} // namespace Rando
diff --git a/soh/soh/Enhancements/randomizer/context.h → ...soh/Enhancements/randomizer/SeedContext.h b/soh/soh/Enhancements/randomizer/context.h → ...soh/Enhancements/randomizer/SeedContext.h
diff --git a/soh/soh/Enhancements/randomizer/dungeon.cpp b/soh/soh/Enhancements/randomizer/dungeon.cpp
@@ -2,7 +2,7 @@
 
 #include "3drando/pool_functions.hpp"
 #include "static_data.h"
-#include "context.h"
+#include "SeedContext.h"
 
 namespace Rando {
 DungeonInfo::DungeonInfo(std::string name_, const RandomizerHintTextKey hintKey_, const RandomizerGet map_,

diff --git a/soh/soh/Enhancements/randomizer/entrance.h b/soh/soh/Enhancements/randomizer/entrance.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #ifdef __cplusplus
 
 #include "randomizerTypes.h"
@@ -157,4 +158,4 @@ extern "C" {
 EntranceOverride* Randomizer_GetEntranceOverrides();
 #ifdef __cplusplus
 }
-#endif
+#endif
diff --git a/soh/soh/Enhancements/randomizer/hint.cpp b/soh/soh/Enhancements/randomizer/hint.cpp
@@ -1,7 +1,7 @@
 #include "hint.h"
 #include "map"
 #include "string"
-#include "context.h"
+#include "SeedContext.h"
 #include <spdlog/spdlog.h>
 #include "static_data.h"
 

diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
@@ -1,7 +1,7 @@
 #include "item.h"
 #include "item_location.h"
 
-#include "context.h"
+#include "SeedContext.h"
 #include "logic.h"
 #include "3drando/item_pool.hpp"
 #include "z64item.h"

diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -1,5 +1,5 @@
 #include "static_data.h"
-#include "context.h"
+#include "SeedContext.h"
 #include "logic.h"
 #include "z64object.h"
 #include "soh/Enhancements/custom-message/CustomMessageTypes.h"

diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -1,5 +1,5 @@
 #include "item_location.h"
-#include "context.h"
+#include "SeedContext.h"
 #include "logic.h"
 
 namespace Rando {

diff --git a/soh/soh/Enhancements/randomizer/location_access.cpp b/soh/soh/Enhancements/randomizer/location_access.cpp
@@ -2,7 +2,7 @@
 
 #include "soh/Enhancements/randomizer/dungeon.h"
 #include "soh/Enhancements/randomizer/static_data.h"
-#include "soh/Enhancements/randomizer/context.h"
+#include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/Enhancements/randomizer/3drando/item_pool.hpp"
 #include "soh/Enhancements/randomizer/3drando/spoiler_log.hpp"
 #include "soh/Enhancements/randomizer/trial.h"

diff --git a/soh/soh/Enhancements/randomizer/location_access.h b/soh/soh/Enhancements/randomizer/location_access.h
@@ -6,7 +6,7 @@
 #include <set>
 
 #include "soh/Enhancements/randomizer/randomizerTypes.h"
-#include "soh/Enhancements/randomizer/context.h"
+#include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/Enhancements/randomizer/logic.h"
 
 #define TIME_PASSES true

diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -1,6 +1,6 @@
 #include "static_data.h"
 #include "z64save.h"
-#include "context.h"
+#include "SeedContext.h"
 #include "dungeon.h"
 
 std::array<Rando::Location, RC_MAX> Rando::StaticData::locationTable;

diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -7,7 +7,7 @@
 
 #include "soh/OTRGlobals.h"
 #include "dungeon.h"
-#include "context.h"
+#include "SeedContext.h"
 #include "macros.h"
 #include "variables.h"
 #include <spdlog/spdlog.h>

diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "randomizerTypes.h"
-#include "context.h"
+#include "SeedContext.h"
 #include <cstdint>
 
 namespace Rando {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -74,3 +74,5 @@ void GeneratePlaythrough();
		bool CheckBeatable(RandomizerGet ignore = RG_NONE);

		void ValidateEntrances(bool checkOtherEntranceAccess);

		void ValidateEntrances(bool checkPoeCollectorAccess, bool checkOtherEntranceAccess);