Retry the game resets on LGPE.

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 = 56;
-const int PROGRAM_VERSION_PATCH = 3;
+const int PROGRAM_VERSION_PATCH = 4;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/PokemonLGPE/Programs/PokemonLGPE_GameEntry.cpp

@@ -126,6 +126,25 @@ bool reset_game_from_home(
 }
 
 
+void reset_game_from_game(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, JoyconContext& context,
+    std::atomic<uint64_t>* errors,
+    Milliseconds post_wait_time
+){
+    while (true){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 2000ms);
+        if (reset_game_from_home(env, console, context, 3000ms)){
+            break;
+        }
+        env.log("Resetting...", COLOR_RED);
+        if (errors){
+            (*errors)++;
+            env.update_stats();
+        }
+    }
+
+}
 
 
 

SerialPrograms/Source/PokemonLGPE/Programs/PokemonLGPE_GameEntry.h

@@ -40,6 +40,13 @@ bool reset_game_from_home(
     Milliseconds post_wait_time = std::chrono::milliseconds(125)
 );
 
+void reset_game_from_game(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, JoyconContext& context,
+    std::atomic<uint64_t>* errors,
+    Milliseconds post_wait_time = std::chrono::milliseconds(125)
+);
+
 
 
 

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

@@ -281,11 +281,8 @@ void AlolanTrade::program(SingleSwitchProgramEnvironment& env, CancellableScope&
                 "Out of Pokemon to trade and no shiny found. Resetting game."
             );
 
-            //Reset game
-            pbf_press_button(context, BUTTON_HOME, 200ms, 2000ms);
-            reset_game_from_home(env, env.console, context, 3000ms);
-            context.wait_for_all_requests();
 
+            reset_game_from_game(env, env.console, context, &stats.errors, 3000ms);
             stats.resets++;
             env.update_stats();
         }

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

@@ -288,11 +288,7 @@ void FossilRevival::program(SingleSwitchProgramEnvironment& env, CancellableScop
                 "Out of Pokemon to check and no shiny found. Resetting game."
             );
 
-            //Reset game
-            pbf_press_button(context, BUTTON_HOME, 200ms, 2000ms);
-            reset_game_from_home(env, env.console, context, 3000ms);
-            context.wait_for_all_requests();
-
+            reset_game_from_game(env, env.console, context, &stats.errors, 3000ms);
             stats.resets++;
             env.update_stats();
         }

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

@@ -183,11 +183,7 @@ void GiftReset::program(SingleSwitchProgramEnvironment& env, CancellableScope& s
                 "Not shiny. Resetting game."
             );
 
-            //Reset game
-            pbf_press_button(context, BUTTON_HOME, 200ms, 2000ms);
-            reset_game_from_home(env, env.console, context, 3000ms);
-            context.wait_for_all_requests();
-
+            reset_game_from_game(env, env.console, context, &stats.errors, 3000ms);
             stats.resets++;
             env.update_stats();
         }

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

@@ -202,11 +202,7 @@ void LegendaryReset::program(SingleSwitchProgramEnvironment& env, CancellableSco
             consecutive_failures++;
         }
 
-        //Reset game
-        pbf_press_button(context, BUTTON_HOME, 200ms, 2000ms);
-        reset_game_from_home(env, env.console, context, 3000ms);
-        context.wait_for_all_requests();
-
+        reset_game_from_game(env, env.console, context, &stats.errors, 3000ms);
         stats.resets++;
     }
     //Shiny found, complete the battle