suggestion

aMannus · Feb 4, 2025 · d269c10 · d269c10
1 parent 1744f1f
commit d269c10
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp b/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp
@@ -151,4 +151,4 @@ void RegisterLockOverworldDoors() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterLockOverworldDoors, { "IS_RANDO" });
+static RegisterShipInitFunc initFunc(RegisterLockOverworldDoors, { "ON_SAVEFILE_LOAD" });
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -2372,8 +2372,6 @@ void RandomizerRegisterHooks() {
     static uint32_t shuffleFreestandingOnVanillaBehaviorHook = 0;
 
     GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>([](int32_t fileNum) {
-        ShipInit::Init("IS_RANDO");
-
         randomizerQueuedChecks = std::queue<RandomizerCheck>();
         randomizerQueuedCheck = RC_UNKNOWN_CHECK;
         randomizerQueuedItemEntry = GET_ITEM_NONE;

diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
@@ -1169,6 +1169,10 @@ extern "C" void InitOTR() {
     VanillaItemTable_Init();
     DebugConsole_Init();
 
+    GameInteractor::Instance->RegisterGameHook<GameInteractor::OnLoadGame>([](int32_t fileNum) {
+        ShipInit::Init("ON_SAVEFILE_LOAD"); 
+    });
+
     InitMods();
     ActorDB::AddBuiltInCustomActors();
     // #region SOH [Randomizer] TODO: Remove these and refactor spoiler file handling for randomizer
-Original file line number
+Diff line change
@@ Expand Up / @@ -151,4 +151,4 @@ void RegisterLockOverworldDoors() { @@
         });
     }
-    static RegisterShipInitFunc initFunc(RegisterLockOverworldDoors, { "IS_RANDO" });
+    static RegisterShipInitFunc initFunc(RegisterLockOverworldDoors, { "ON_SAVEFILE_LOAD" });