From d269c10aa236248e183c1f0abbf6a0e27f563a52 Mon Sep 17 00:00:00 2001 From: aMannus Date: Tue, 4 Feb 2025 20:52:36 +0100 Subject: [PATCH] suggestion --- soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp | 2 +- soh/soh/Enhancements/randomizer/hook_handlers.cpp | 2 -- soh/soh/OTRGlobals.cpp | 4 ++++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp b/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp index b8b8f4731c4..076d6fb0229 100644 --- 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 index e323e810a6b..03eaafba22e 100644 --- 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([](int32_t fileNum) { - ShipInit::Init("IS_RANDO"); - randomizerQueuedChecks = std::queue(); randomizerQueuedCheck = RC_UNKNOWN_CHECK; randomizerQueuedItemEntry = GET_ITEM_NONE; diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index c19b186db40..fdc2f7631c1 100644 --- 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([](int32_t fileNum) { + ShipInit::Init("ON_SAVEFILE_LOAD"); + }); + InitMods(); ActorDB::AddBuiltInCustomActors(); // #region SOH [Randomizer] TODO: Remove these and refactor spoiler file handling for randomizer