From dff49adad8f6f0e38d10d1dcdb979ec7f77f230e Mon Sep 17 00:00:00 2001 From: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> Date: Sat, 11 Jan 2025 18:59:40 +0100 Subject: [PATCH] Post-merge fix --- soh/soh/Enhancements/boss-rush/BossRush.cpp | 2 +- soh/soh/SaveManager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/soh/soh/Enhancements/boss-rush/BossRush.cpp b/soh/soh/Enhancements/boss-rush/BossRush.cpp index d747a104ca..96220f0574 100644 --- a/soh/soh/Enhancements/boss-rush/BossRush.cpp +++ b/soh/soh/Enhancements/boss-rush/BossRush.cpp @@ -400,7 +400,7 @@ void BossRush_InitSave() { // Sets all rando flags to false // Boss Rush currently uses 2 randomizer flags (RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE & RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE) - for (s32 i = 0; i < ARRAY_COUNT(gSaveContext.randomizerInf); i++) { + for (s32 i = 0; i < ARRAY_COUNT(gSaveContext.ship.randomizerInf); i++) { gSaveContext.ship.randomizerInf[i] = 0; } diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp index a78ce8dc93..be5c88a5e8 100644 --- a/soh/soh/SaveManager.cpp +++ b/soh/soh/SaveManager.cpp @@ -822,7 +822,7 @@ void SaveManager::InitFileNormal() { gSaveContext.infTable[flag] = 0; } // Currently randomizer flags are accessible from all quests - for (int flag = 0; flag < ARRAY_COUNT(gSaveContext.randomizerInf); flag++) { + for (int flag = 0; flag < ARRAY_COUNT(gSaveContext.ship.randomizerInf); flag++) { gSaveContext.ship.randomizerInf[flag] = 0; } gSaveContext.worldMapAreaData = 0;