diff options
| author | Malkierian <malkierian@gmail.com> | 2025-10-20 10:51:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-20 10:51:33 -0700 |
| commit | 7004c1fc4f78fd95af604db9c14ee78f7fd0a9db (patch) | |
| tree | 3a1b906bef1db328093cceb3a86a99e7b7cbe125 | |
| parent | c806f23494362ca01715d2948e882f38791bdbee (diff) | |
Fix GS not being marked as collected when not shuffled. (#5861)
| -rw-r--r-- | soh/soh/Enhancements/randomizer/hook_handlers.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp index df950a35f..04ce7f1c8 100644 --- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp +++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp @@ -249,11 +249,15 @@ void RandomizerOnFlagSetHandler(int16_t flagType, int16_t flag) { return; if (flagType == FLAG_GS_TOKEN && - Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF)) + Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF)) { + Rando::Context::GetInstance()->GetItemLocation(rc)->SetCheckStatus(RCSHOW_COLLECTED); return; + } auto loc = Rando::Context::GetInstance()->GetItemLocation(rc); - if (loc == nullptr || loc->HasObtained() || loc->GetPlacedRandomizerGet() == RG_NONE) + if (loc == nullptr || loc->HasObtained() || loc->GetPlacedRandomizerGet() == RG_NONE) { + Rando::Context::GetInstance()->GetItemLocation(rc)->SetCheckStatus(RCSHOW_COLLECTED); return; + } SPDLOG_INFO("Queuing RC: {}", static_cast<uint32_t>(rc)); randomizerQueuedChecks.push(rc); |