Check Tracker - Fixes Bazaar showing under wrong area on tracker betw…

…een adult/child
KiritoDv · Nov 13, 2022 · 8ca1dbe · 8ca1dbe
1 parent 77bdbf2
commit 8ca1dbe
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -744,6 +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
                          currentArea != lastArea && currentArea == rcArea);
                     break;
                 }
@@ -827,6 +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
                          currentArea != lastArea && currentArea == rcArea);
                     break;
                 }
@@ -875,7 +877,10 @@ void DrawLocations() {
         ImGui::EndChild();
         ImGui::EndTable();
 
-        if (sceneId != SCENE_KAKUSIANA && sceneId != SCENE_YOUSEI_IZUMI_TATE && sceneId != SCENE_YOUSEI_IZUMI_YOKO)
+        if (sceneId != SCENE_KAKUSIANA && 
+            sceneId != SCENE_YOUSEI_IZUMI_TATE && 
+            sceneId != SCENE_YOUSEI_IZUMI_YOKO &&
+            sceneId != SCENE_SHOP1)
             lastArea = currentArea;
     }
 }