Attempt to recover from errors.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -26,7 +26,7 @@ namespace PokemonAutomation{
 const bool IS_BETA_VERSION = true;
 const int PROGRAM_VERSION_MAJOR = 0;
 const int PROGRAM_VERSION_MINOR = 53;
-const int PROGRAM_VERSION_PATCH = 7;
+const int PROGRAM_VERSION_PATCH = 8;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_LegendaryReset.cpp

@@ -78,6 +78,8 @@ LegendaryReset::LegendaryReset()
         &NOTIFICATION_SHINY,
         &NOTIFICATION_STATUS_UPDATE,
         &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
     })
 {
     PA_ADD_OPTION(TARGET);
@@ -166,28 +168,47 @@ void LegendaryReset::program(SingleSwitchProgramEnvironment& env, CancellableSco
     Don't do it on the first Snorlax, otherwise have to sit through fuji tutorial
     */
 
+    size_t consecutive_failures = 0;
+
     while (true) {
-        bool encounter_battle = run_encounter(env, context);
-        if (encounter_battle) {
-            stats.shinies++;
-            env.update_stats();
-            send_program_notification(env, NOTIFICATION_SHINY, COLOR_YELLOW, "Shiny found!", {}, "", env.console.video().snapshot(), true);
-            break;
+        env.update_stats();
+
+        if (consecutive_failures >= 3){
+            OperationFailedException::fire(
+                ErrorReport::SEND_ERROR_REPORT,
+                "Failed 3 times in the row.",
+                env.console
+            );
         }
-        env.log("No shiny found. Resetting game.");
-        send_program_status_notification(
-            env, NOTIFICATION_STATUS_UPDATE,
-            "No shiny found. Resetting game."
-        );
-        context.wait_for_all_requests();
+
+        try{
+            bool encounter_battle = run_encounter(env, context);
+            if (encounter_battle) {
+                stats.shinies++;
+                env.update_stats();
+                send_program_notification(env, NOTIFICATION_SHINY, COLOR_YELLOW, "Shiny found!", {}, "", env.console.video().snapshot(), true);
+                break;
+            }
+
+            env.log("No shiny found. Resetting game.");
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "No shiny found. Resetting game."
+            );
+            context.wait_for_all_requests();
+        }catch (OperationFailedException& e){
+            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
+            consecutive_failures++;
+            continue;
+        }
+        consecutive_failures = 0;
 
         //Reset game
         pbf_press_button(context, BUTTON_HOME, 200ms, 2000ms);
         reset_game_from_home(env, env.console, context, 3000ms);
         context.wait_for_all_requests();
 
         stats.resets++;
-        env.update_stats();
     }
     //Shiny found, complete the battle
     WallClock start = current_time();