diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp
index 09e43fda2..e749b06d4 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp
+++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp
@@ -5,6 +5,7 @@
  */
 
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"
 
 #include "CommonFramework/Exceptions/OperationFailedException.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
@@ -183,7 +184,7 @@ void checkpoint_33(
             128, 0, 20, 20, false);       
 
         clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG, CallbackEnum::TUTORIAL});
-        AdvanceDialogWatcher    dialog(COLOR_RED);
+        NoMinimapWatcher no_minimap(env.console.logger(), COLOR_RED, Milliseconds(250));
         int ret = run_until<ProControllerContext>(
             env.console, context,
             [&](ProControllerContext& context){
@@ -259,8 +260,10 @@ void checkpoint_33(
                 pbf_press_button(context, BUTTON_R, 20, 20);
                 pbf_wait(context, seconds_wait * TICKS_PER_SECOND);   
                 
+                pbf_wait(context, 20 * TICKS_PER_SECOND);
+
             },
-            {dialog}
+            {no_minimap}
         );
         context.wait_for(std::chrono::milliseconds(100));
         if (ret < 0){
diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp
index a2debed3f..f2fba0f03 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp
+++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp
@@ -6,6 +6,7 @@
 #include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
 #include "CommonTools/Async/InferenceRoutines.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"
 
 #include "CommonFramework/Exceptions/OperationFailedException.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
@@ -175,7 +176,7 @@ void checkpoint_48(
         );
         clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG, CallbackEnum::TUTORIAL});
 
-        AdvanceDialogWatcher    dialog(COLOR_RED);
+        NoMinimapWatcher no_minimap(env.console.logger(), COLOR_RED, Milliseconds(250));
         int ret = run_until<ProControllerContext>(
             env.console, context,
             [&](ProControllerContext& context){
@@ -271,9 +272,10 @@ void checkpoint_48(
                 pbf_press_button(context, BUTTON_R, 20, 20);
                 pbf_wait(context, seconds_wait * TICKS_PER_SECOND);                 
                   
+                pbf_wait(context, 20 * TICKS_PER_SECOND);
                 
             },
-            {dialog}
+            {no_minimap}
         );
         context.wait_for(std::chrono::milliseconds(100));
         if (ret < 0){
diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp
index 7e907d1fe..ff0145906 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp
+++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp
@@ -7,6 +7,7 @@
 #include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
 #include "PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"
 
 #include "CommonFramework/Exceptions/OperationFailedException.h"
 #include "CommonTools/Async/InferenceRoutines.h"
@@ -200,7 +201,7 @@ void checkpoint_59(
         );
         clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});
 
-        AdvanceDialogWatcher    dialog(COLOR_RED);
+        NoMinimapWatcher no_minimap(env.console.logger(), COLOR_RED, Milliseconds(250));
         int ret = run_until<ProControllerContext>(
             env.console, context,
             [&](ProControllerContext& context){
@@ -291,10 +292,10 @@ void checkpoint_59(
                 pbf_wait(context, seconds_wait * TICKS_PER_SECOND);
 
 
-                pbf_wait(context, 10 * TICKS_PER_SECOND);
+                pbf_wait(context, 20 * TICKS_PER_SECOND);
                 
             },
-            {dialog}
+            {no_minimap}
         );
         context.wait_for(std::chrono::milliseconds(100));
         if (ret < 0){
diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp
index 5bc78fac9..f0bd250b5 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp
+++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp
@@ -6,6 +6,7 @@
 #include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
 #include "PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"
 
 #include "CommonFramework/Exceptions/OperationFailedException.h"
 #include "CommonTools/Async/InferenceRoutines.h"
@@ -178,7 +179,7 @@ void checkpoint_69(SingleSwitchProgramEnvironment& env, ProControllerContext& co
         );
         clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});
 
-        AdvanceDialogWatcher    dialog(COLOR_RED);
+        NoMinimapWatcher no_minimap(env.console.logger(), COLOR_RED, Milliseconds(250));
         int ret = run_until<ProControllerContext>(
             env.console, context,
             [&](ProControllerContext& context){
@@ -284,7 +285,7 @@ void checkpoint_69(SingleSwitchProgramEnvironment& env, ProControllerContext& co
                 pbf_wait(context, 20 * TICKS_PER_SECOND);
                 
             },
-            {dialog}
+            {no_minimap}
         );
         context.wait_for(std::chrono::milliseconds(100));
         if (ret < 0){
diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp
index a47c63deb..0aa7955fa 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp
+++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp
@@ -7,6 +7,7 @@
 #include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
 #include "PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"
 
 #include "CommonFramework/Exceptions/OperationFailedException.h"
 #include "CommonTools/Async/InferenceRoutines.h"
@@ -352,7 +353,7 @@ void beat_team_star_fighting2(SingleSwitchProgramEnvironment& env, ProController
     clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});
 
 
-    AdvanceDialogWatcher    dialog(COLOR_RED);
+    NoMinimapWatcher no_minimap(env.console.logger(), COLOR_RED, Milliseconds(250));
     int ret = run_until<ProControllerContext>(
         env.console, context,
         [&](ProControllerContext& context){
@@ -511,7 +512,7 @@ void beat_team_star_fighting2(SingleSwitchProgramEnvironment& env, ProController
                 
             
         },
-        {dialog}
+        {no_minimap}
     );
     context.wait_for(std::chrono::milliseconds(100));
     if (ret < 0){