From efd40d0b89193ea9de6430879bf772585d6a3e06 Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Mon, 12 Dec 2022 21:14:16 -0500 Subject: [PATCH] fix: show always shuffled scrubs on check tracker (#2161) Co-authored-by: briaguya --- .../Enhancements/randomizer/randomizer_check_tracker.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp index 42ebf673b..d3790ccc1 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp @@ -478,7 +478,12 @@ bool IsVisibleInCheckTracker(RandomizerCheckObject rcObj) { rcObj.vOrMQ == RCVORMQ_VANILLA && !OTRGlobals::Instance->gRandomizer->masterQuestDungeons.contains(rcObj.sceneId) ) && (rcObj.rcType != RCTYPE_SHOP || showShops) && - (rcObj.rcType != RCTYPE_SCRUB || showScrubs) && + (rcObj.rcType != RCTYPE_SCRUB || + showScrubs || + rcObj.rc == RC_LW_DEKU_SCRUB_NEAR_BRIDGE || // The 3 scrubs that are always randomized + rcObj.rc == RC_HF_DEKU_SCRUB_GROTTO || + rcObj.rc == RC_LW_DEKU_SCRUB_GROTTO_FRONT + ) && (rcObj.rcType != RCTYPE_MERCHANT || showMerchants) && (rcObj.rcType != RCTYPE_SKULL_TOKEN || (showOverworldTokens && RandomizerCheckObjects::AreaIsOverworld(rcObj.rcArea)) ||