fix error messages

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

@@ -151,15 +151,15 @@ EggAutonomous::EggAutonomous()
     , m_battle_ai_description(
         "<b>Battle AI if Attacked:</b><br>"
         "Occasionally (especially on the Switch 2), you will get attacked by wild " + STRING_POKEMON + ". "
-        "If the following section is enabled, it attempt to recover by killing the wild " + STRING_POKEMON + ". "
+        "If the following section is enabled, it attempts to recover by killing the wild " + STRING_POKEMON + ". "
         "If disabled, the program will instead reset the game. "
         "This table applies to the egg hatching " + STRING_POKEMON + " (the Flame Body one)."
     )
     , BATTLE_AI(false, GroupOption::EnableMode::DEFAULT_ENABLED, 1)
     , HAS_CLONE_RIDE_POKEMON(
         "<b>Cloned Ride Legendary 2nd in Party:</b><br>"
         "Ride legendary cannot be cloned after patch 1.0.1. To preserve the existing clone while hatching eggs, "
-        "place it as second in party before starting the program.</b>"
+        "place it as second in party before starting the program. "
         "The program will skip the first row of the current box when storing and hatching eggs, so you will need "
         "to fill the first row with " + STRING_POKEMON + " before running this program.",
         LockMode::LOCK_WHILE_RUNNING,
@@ -845,7 +845,7 @@ bool EggAutonomous::handle_recoverable_error(
     env.log("Reset game to handle recoverable error");
     reset_game(env.program_info(), env.console, context);
 
-    if (e.message().find("collect_eggs_from_basket") != std::string::npos){
+    if (e.message().find("check_basket_to_collect_eggs") != std::string::npos){
         change_settings_egg_program(env, context, LANGUAGE);
     }
 

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

@@ -61,7 +61,7 @@ EggHatcher::EggHatcher()
     , START_LOCATION(
         "<b>Start location:</b><br>Where to start the hatcher program.<br>"
         "Zero Gate Flying Spot: Stand at Zero Gate flying spot. The flying spot is already unlocked.<br>"
-        "Anywhere safe, on ride: You are in a safe location with no wild encounters or NPCs. You are on your ride lengendary.<br>"
+        "Anywhere safe, on ride: You are in a safe location with no wild encounters or NPCs. You are on your ride legendary.<br>"
         "Anywhere safe, on foot: You are in a safe location with no wild encounters or NPCs. You stand on foot.<br>",
         {
             {StartLocation::ZeroGateFlyingSpot, "zero-gate", "Zero Gate Flying Spot"},
@@ -79,15 +79,15 @@ EggHatcher::EggHatcher()
     , m_battle_ai_description(
         "<b>Battle AI if Attacked:</b><br>"
         "Occasionally (especially on the Switch 2), you will get attacked by wild " + STRING_POKEMON + ". "
-        "If the following section is enabled, it attempt to recover by killing the wild " + STRING_POKEMON + ". "
+        "If the following section is enabled, it attempts to recover by killing the wild " + STRING_POKEMON + ". "
         "If disabled, the program will instead reset the game. "
         "This table applies to the egg hatching " + STRING_POKEMON + " (the Flame Body one)."
     )
     , BATTLE_AI(false, GroupOption::EnableMode::DEFAULT_ENABLED, 1)
     , HAS_CLONE_RIDE_POKEMON(
         "<b>Cloned Ride Legendary 2nd in Party:</b><br>"
         "Ride legendary cannot be cloned after patch 1.0.1. To preserve the existing clone while hatching eggs, "
-        "place it as second in party before starting the program.</b>"
+        "place it as second in party before starting the program. "
         "The program will skip the first row of eggs in the box as a result.",
         LockMode::LOCK_WHILE_RUNNING,
         false
@@ -119,7 +119,8 @@ void EggHatcher::hatch_one_box(SingleSwitchProgramEnvironment& env, ProControlle
             if (check_empty_slots_in_party(env.program_info(), env.console, context) != expected_empty_slots_in_party){
                 throw_and_log<FatalProgramException>(
                     env.console, ErrorReport::SEND_ERROR_REPORT,
-                    "Your party should have " + std::to_string(expected_empty_slots_in_party) + " " + STRING_POKEMON + ".",
+                    "Your party should have " + std::to_string(6 - expected_empty_slots_in_party) + " " + STRING_POKEMON +
+                    " and " + std::to_string(expected_empty_slots_in_party) + " empty slots.",
                     env.console
                 );
             }

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

@@ -108,7 +108,7 @@ void handle_egg_hatching(
     if (ret < 0){
         dump_image_and_throw_recoverable_exception(
             info, stream, "NoHatchingEnd",
-            "hatch_eggs_at_zero_gate(): No end of egg hatching detected after one minute."
+            "No end of egg hatching detected after one minute."
         );
     }
     stream.log("Finished hatching animation and dialog.");
@@ -175,7 +175,7 @@ bool do_egg_cycle_motion(
     default:
         dump_image_and_throw_recoverable_exception(
             env.program_info(), stream, "NoEggToHatch",
-            "hatch_eggs_at_zero_gate(): No more egg hatch after 10 minutes."
+            "No more egg hatch after 10 minutes."
         );
     }
 
@@ -552,7 +552,7 @@ void check_basket_to_collect_eggs(
             if (consecutive_nothing >= 10){
                 dump_image_and_throw_recoverable_exception(
                     info, stream, "BasketNotFound",
-                    "collect_eggs_from_basket(): Basket not found after 10 attempts.\n"
+                    "check_basket_to_collect_eggs(): Basket not found after 10 attempts.\n"
                     "Please make sure that the \"Camera Support\" option is set to \"On\"."
                 );
             }
@@ -643,7 +643,7 @@ uint8_t check_non_eggs_count_in_party(
     if (counts.second != expected_non_eggs_count_in_party){
         dump_image_and_throw_recoverable_exception(
             info, stream, "NonEggPokemonInParty",
-            "check_non_eggs_count_in_party: Found non-egg pokemon in party"
+            "check_non_eggs_count_in_party(): Found non-egg " + STRING_POKEMON + " in party"
         );
     }
     return counts.first;

SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h

@@ -125,7 +125,7 @@ std::pair<uint8_t, uint8_t> check_egg_party_column(
 
 // In box view, check whether there is the right amount of non-egg pokemon in the five slots in the party column, after party lead.
 // return how many eggs in the five slots.
-// Throw OperationFailedException if found unxepcted non-egg pokemon count in the slots.
+// Throw OperationFailedException if found unexpected non-egg pokemon count in the slots.
 // Note: make sure the current cursor does not float above the five slots, otherwise it may affect detection.
 uint8_t check_non_eggs_count_in_party(
     const ProgramInfo& info,

SerialPrograms/Source/PokemonSV/Programs/FormHunting/PokemonSV_ThreeSegmentDudunsparceFinder.cpp

@@ -85,7 +85,8 @@ void ThreeSegmentDudunsparceFinder::check_one_column(
     if (check_empty_slots_in_party(env.program_info(), env.console, context) != expected_empty_slots_in_party){
         throw_and_log<FatalProgramException>(
             env.console, ErrorReport::SEND_ERROR_REPORT,
-            "Your party should have " + std::to_string(expected_empty_slots_in_party) + " " + STRING_POKEMON + ".",
+            "Your party should have " + std::to_string(6 - expected_empty_slots_in_party) + " " + STRING_POKEMON +
+            " and " + std::to_string(expected_empty_slots_in_party) + " empty slots.",
             env.console
         );
     }