More SV egg error tweaks.

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

SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.cpp

@@ -204,7 +204,7 @@ void EggHatcher::program(SingleSwitchProgramEnvironment& env, ProControllerConte
 
             hatch_one_box(env, context);
         }
-    } catch(OperationFailedException&){
+    } catch(Exception&){
         stats.m_errors++;
         env.update_stats();
         throw;

SerialPrograms/Source/PokemonSV/Programs/PokemonSV_MenuNavigation.cpp

@@ -165,12 +165,13 @@ void open_map_from_overworld(
             {overworld, battle}
         );
         context.wait_for(std::chrono::milliseconds(100));
+
         if (ret == 0){
             stream.log("Detected overworld.");
             pbf_press_button(context, BUTTON_Y, 20, 105); // open map
         }else if (ret == 1){
             throw_and_log<UnexpectedBattleException>(
-                stream.logger(), ErrorReport::SEND_ERROR_REPORT,
+                stream.logger(), ErrorReport::NO_ERROR_REPORT,
                 "open_map_from_overworld(): Unexpectedly detected battle.",
                 stream
             );              
@@ -206,6 +207,7 @@ void open_map_from_overworld(
             {overworld, advance_dialog, prompt_dialog, map, battle}
         );
         context.wait_for(std::chrono::milliseconds(100));
+
         switch (ret){
         case 0:
             stream.log("Detected overworld.");
@@ -236,7 +238,7 @@ void open_map_from_overworld(
         case 4:
             stream.log("Detected battle.");
             throw_and_log<UnexpectedBattleException>(
-                stream.logger(), ErrorReport::SEND_ERROR_REPORT,
+                stream.logger(), ErrorReport::NO_ERROR_REPORT,
                 "open_map_from_overworld(): Unexpectedly detected battle.",
                 stream
             );