summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorballoondude2 <55861555+balloondude2@users.noreply.github.com>2025-05-05 16:51:47 -0600
committerGitHub <noreply@github.com>2025-05-05 17:51:47 -0500
commitb0ef053b25eaaa23b266f662befa97b76399f296 (patch)
tree910ce1ef159fb11af566e2ae93593d2839fd589a
parent667edb04d0f1425977f4a298aa0e37c3f99b4b87 (diff)
[Rando] Fix the two happy mask salesman checks (#1134)
* allow the two mask salesman checks to be awarded when generating from a file * clang format pls
-rw-r--r--mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp b/mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp
index 3d3c5ca87..77c9d5f2c 100644
--- a/mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp
+++ b/mm/2s2h/Rando/MiscBehavior/OnFileCreate.cpp
@@ -346,9 +346,6 @@ void Rando::MiscBehavior::OnFileCreate(s16 fileNum) {
std::to_string(RANDO_SAVE_OPTIONS[RO_LOGIC]));
}
- RANDO_SAVE_CHECKS[RC_STARTING_ITEM_DEKU_MASK].eligible = true;
- RANDO_SAVE_CHECKS[RC_STARTING_ITEM_SONG_OF_HEALING].eligible = true;
-
if (CVarGetInteger("gRando.GenerateSpoiler", 0)) {
nlohmann::json spoiler = Rando::Spoiler::GenerateFromSaveContext();
spoiler["inputSeed"] = inputSeed;
@@ -371,6 +368,10 @@ void Rando::MiscBehavior::OnFileCreate(s16 fileNum) {
Audio_PlaySfx(NA_SE_SY_ATTENTION_SOUND);
}
+
+ RANDO_SAVE_CHECKS[RC_STARTING_ITEM_DEKU_MASK].eligible = true;
+ RANDO_SAVE_CHECKS[RC_STARTING_ITEM_SONG_OF_HEALING].eligible = true;
+
} catch (const std::exception& e) {
SPDLOG_ERROR("Error with randomizer save creation: {}", e.what());
Audio_PlaySfx(NA_SE_SY_QUIZ_INCORRECT);