Start splitting Location List into ShipInit functions (HarbourMasters…

…#5011) * Move fairy checks to separate file * Moves pot locations to ShipInit function * Move Freestanding locations to a ShipInit function * Remove some extra newlines that were pasted in * Move fish locations to ShipInit function * Remove ON_BOOT, as it's not really necessary * Fix weird spacing
Sarge-117 · Feb 7, 2025 · 2400ad1 · 2400ad1
1 parent ca0617b
commit 2400ad1
Show file tree

Hide file tree

Showing 8 changed files with 1,083 additions and 1,066 deletions.
diff --git a/soh/soh/Enhancements/randomizer/ShuffleFairies.cpp b/soh/soh/Enhancements/randomizer/ShuffleFairies.cpp
diff --git a/soh/soh/Enhancements/randomizer/ShuffleFairies.h b/soh/soh/Enhancements/randomizer/ShuffleFairies.h
@@ -10,4 +10,4 @@ typedef struct FairyIdentity {
 } FairyIdentity;
 
 void ShuffleFairies_RegisterHooks();
-void ShuffleFairies_UnregisterHooks();
+void ShuffleFairies_UnregisterHooks();
diff --git a/soh/soh/Enhancements/randomizer/ShuffleFreestanding.cpp b/soh/soh/Enhancements/randomizer/ShuffleFreestanding.cpp
diff --git a/soh/soh/Enhancements/randomizer/ShufflePots.cpp b/soh/soh/Enhancements/randomizer/ShufflePots.cpp
diff --git a/soh/soh/Enhancements/randomizer/fishsanity.cpp b/soh/soh/Enhancements/randomizer/fishsanity.cpp
diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
diff --git a/soh/soh/Enhancements/randomizer/static_data.h b/soh/soh/Enhancements/randomizer/static_data.h
@@ -48,6 +48,11 @@ class StaticData {
       static std::vector<RandomizerCheck> GetOverworldFishLocations();
       static std::vector<RandomizerCheck> GetOverworldPotLocations();
       static std::vector<RandomizerCheck> GetOverworldFairyLocations();
+      static void RegisterFishLocations();
+      static void RegisterFairyLocations();
+      static void RegisterPotLocations();
+      static void RegisterFreestandingLocations();
+      static void InitHashMaps();
       static std::array<std::pair<RandomizerCheck, RandomizerCheck>, 17> randomizerFishingPondFish;
       static std::unordered_map<int8_t, RandomizerCheck> randomizerGrottoFishMap;
       static std::vector<RandomizerHint> oldVerHintOrder;

diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
@@ -393,7 +393,6 @@ OTRGlobals::OTRGlobals() {
     gRandoContext = Rando::Context::CreateInstance();
     Rando::Settings::GetInstance()->AssignContext(gRandoContext);
     Rando::StaticData::InitItemTable();//RANDOTODO make this not rely on context's logic so it can be initialised in InitStaticData
-    gRandoContext->AddExcludedOptions();
     Rando::Settings::GetInstance()->CreateOptions();
     gRandomizer = std::make_shared<Randomizer>();
 
@@ -1166,6 +1165,9 @@ extern "C" void InitOTR() {
 
     SohGui::SetupGuiElements();
     ShipInit::InitAll();
+
+    Rando::StaticData::InitHashMaps();
+    OTRGlobals::Instance->gRandoContext->AddExcludedOptions();
     AudioCollection::Instance = new AudioCollection();
     ActorDB::Instance = new ActorDB();
 #ifdef __APPLE__