Fix BDSP EndBattleDetector.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -39,7 +39,7 @@ namespace PokemonAutomation{
 #endif
 
 #ifndef PA_VERSION_PATCH
-#define PA_VERSION_PATCH 1
+#define PA_VERSION_PATCH 2
 #endif
 
 const bool IS_BETA_VERSION = PA_IS_BETA;

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -334,10 +334,14 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     VideoOverlaySet overlays(overlay);
 
 
+//    OperationFailedException::fire(ErrorReport::SEND_ERROR_REPORT, "test", console);
+
+#if 0
     auto snapshot = feed.snapshot();
     YCommMenuDetector detector(true);
     detector.make_overlays(overlays);
     cout << detector.detect(snapshot) << endl;
+#endif
 
 #if 0
     SelectionArrowFinder arrow(overlay, {0.462377, 0.332039, 0.388222, 0.640777});

SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.h

@@ -45,7 +45,7 @@ class EndBattleWatcher : public BlackScreenOverWatcher{
         Color color = COLOR_RED
     )
         : BlackScreenOverWatcher(
-            color, box, 100, 10, std::chrono::milliseconds(1000)
+            color, box, 100, 10, std::chrono::milliseconds(500)
         )
     {}
 

SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp

@@ -139,13 +139,9 @@ bool DoublesLeveling::battle(SingleSwitchProgramEnvironment& env, ProControllerC
             pbf_mash_button(context, BUTTON_B, 2000ms);
             return false;
         default:
-            env.log("Timed out.", COLOR_RED);
             stats.add_error();
-            OperationFailedException::fire(
-                ErrorReport::SEND_ERROR_REPORT,
-                "Timed out after 2 minutes.",
-                env.console
-            );
+            env.log("Timed out after 2 minutes. Assume battle ended.", COLOR_RED);
+            return false;
         }
     }
 

SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.cpp

@@ -185,8 +185,8 @@ bool MoneyFarmerRoute210::battle(SingleSwitchProgramEnvironment& env, ProControl
                 {learn_move},
             }
         );
-        
-        
+
+
         switch (ret){
         case 0:
             env.log("Battle menu detected!", COLOR_BLUE);
@@ -255,11 +255,8 @@ bool MoneyFarmerRoute210::battle(SingleSwitchProgramEnvironment& env, ProControl
             return true;
         default:
             stats.m_errors++;
-            OperationFailedException::fire(
-                ErrorReport::SEND_ERROR_REPORT,
-                "Timed out after 2 minutes.",
-                env.console
-            );
+            env.log("Timed out after 2 minutes. Assume battle ended.", COLOR_RED);
+            return false;
         }
     }
 

SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.cpp

@@ -195,11 +195,8 @@ bool MoneyFarmerRoute212::battle(SingleSwitchProgramEnvironment& env, ProControl
 
         default:
             stats.m_errors++;
-            OperationFailedException::fire(
-                ErrorReport::SEND_ERROR_REPORT,
-                "Timed out after 30 seconds.",
-                env.console
-            );
+            env.log("Timed out after 30 seconds. Assume battle ended.", COLOR_RED);
+            return false;
         }
     }