Check Tracker - Fixes scroll for Hyrule Market and Bazaar

KiritoDv · Nov 13, 2022 · bf17abd · bf17abd
1 parent 8ca1dbe
commit bf17abd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
@@ -901,6 +901,9 @@ std::map<SceneID, RandomizerCheckArea> 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
@@ -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;
     }