From bf17abdf03f780c7888a396fb29668a330983114 Mon Sep 17 00:00:00 2001 From: sonoftunk Date: Sun, 13 Nov 2022 11:02:40 -0500 Subject: [PATCH] Check Tracker - Fixes scroll for Hyrule Market and Bazaar --- soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp | 3 +++ soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp index 89d49583097..cb8477234f3 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp @@ -901,6 +901,9 @@ std::map RandomizerCheckObjects::GetAllRCAreaBySce for (auto& [randomizerCheck, rcObject] : rcObjects) { rcAreaBySceneID[rcObject.sceneId] = rcObject.rcArea; } + //Add checkless Hyrule Market areas to the area return + for (int id = (int)SCENE_ENTRA; id <= (int)SCENE_MARKET_RUINS; id++) + rcAreaBySceneID[(SceneID)id] = RCAREA_MARKET; } return rcAreaBySceneID; } diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp index d081dc36d9d..1b82a8a6fe9 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp @@ -744,7 +744,7 @@ void DrawLocations() { doAreaScroll = (currentArea != RCAREA_INVALID && sceneId != SCENE_KAKUSIANA && // Don't move for grottos sceneId != SCENE_YOUSEI_IZUMI_TATE && sceneId != SCENE_YOUSEI_IZUMI_YOKO && // Don't move for fairy fountains - sceneId != SCENE_SHOP1 && // Don't move for Bazaar, as it moves between Kak and Market + sceneId != SCENE_SHOP1 && sceneId != SCENE_SYATEKIJYOU && // Don't move for Bazaar/Gallery, as it moves between Kak and Market currentArea != lastArea && currentArea == rcArea); break; } @@ -828,7 +828,7 @@ void DrawLocations() { doAreaScroll = (currentArea != RCAREA_INVALID && sceneId != SCENE_KAKUSIANA && // Don't move for kakusiana/grottos sceneId != SCENE_YOUSEI_IZUMI_TATE && sceneId != SCENE_YOUSEI_IZUMI_YOKO && // Don't move for fairy fountains - sceneId != SCENE_SHOP1 && //Don't move for Bazaar, as it moves between Kak and Market + sceneId != SCENE_SHOP1 && sceneId != SCENE_SYATEKIJYOU && // Don't move for Bazaar/Gallery, as it moves between Kak and Market currentArea != lastArea && currentArea == rcArea); break; } @@ -880,6 +880,7 @@ void DrawLocations() { if (sceneId != SCENE_KAKUSIANA && sceneId != SCENE_YOUSEI_IZUMI_TATE && sceneId != SCENE_YOUSEI_IZUMI_YOKO && + sceneId != SCENE_SYATEKIJYOU && sceneId != SCENE_SHOP1) lastArea = currentArea; }