more cleanup

Author: Gin

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp

@@ -417,8 +417,10 @@ double get_current_facing_angle(
 }
 
 
-void leave_zone_gate(ConsoleHandle& console, ProControllerContext& context){
+bool leave_zone_gate(ConsoleHandle& console, ProControllerContext& context){
     console.log("Leaving zone gate");
+
+    WallClock start_time = current_time();
     OverworldPartySelectionWatcher overworld_watcher(COLOR_WHITE, &console.overlay());
     pbf_mash_button(context, BUTTON_A, 1s);
     context.wait_for_all_requests();
@@ -429,8 +431,25 @@ void leave_zone_gate(ConsoleHandle& console, ProControllerContext& context){
     );
     pbf_wait(context, 100ms); // after leaving the gate, the game needs this long time to give back control
     context.wait_for_all_requests();
-    console.overlay().add_log("Left Gate");
-    console.log("Finished leaving zone gate");
+    WallClock end_time = current_time();
+
+    const auto duration = end_time - start_time;
+    const auto second_count = std::chrono::duration_cast<std::chrono::seconds>(duration).count();
+    // Due to day/night change may eating the mashing button A sequence, we may still be inside the zone!
+    // We need to check if we can fast travel 
+    if (duration < 16s){
+        console.log("Leaving zone function took " + std::to_string(second_count) + " sec. No day/night change");
+        console.overlay().add_log("Left Gate");
+
+        // The animation of leaving the gate does not take more than 15 sec.
+        // In this case, there is no day/night change. We are sure we are outside the wild zone
+        // (unless some angry Garchomp or Drilbur used Dig and escaped wild zone containment... We don't
+        // consider this case for now)
+        return true;
+    }
+
+    console.log("Leaving zone function took " + std::to_string(second_count) + " sec. Day/night change happened");
+    return false;
 }
 
 
@@ -442,7 +461,7 @@ int run_towards_wild_zone_gate(
 ){
     ButtonWatcher buttonA(COLOR_RED, ButtonType::ButtonA, button_A_box, &console.overlay());
     OverworldPartySelectionOverWatcher overworld_gone(COLOR_WHITE, &console.overlay(), std::chrono::milliseconds(400));
-    return run_until<ProControllerContext>(
+    const int ret = run_until<ProControllerContext>(
         console, context,
         [&run_time](ProControllerContext& context){
             // running back
@@ -451,6 +470,20 @@ int run_towards_wild_zone_gate(
         },
         {{buttonA, overworld_gone}}
     );
+    switch (ret){
+    case 0:
+        console.log("Detected button A. Reached gate.");
+        console.overlay().add_log("Reach Gate");
+        return 0;
+    case 1:
+        console.log("Day/night change happened while escaping");
+        console.overlay().add_log("Day/Night Change Detected");
+        wait_until_overworld(console, context);
+        return 1;
+    default:
+        console.log("Did not reach gate");
+        return ret;
+    }
 }
 
 }

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h

@@ -13,6 +13,7 @@
 namespace PokemonAutomation{
 
 template <typename Type> class ControllerContext;
+struct ImageFloatBox;
 
 namespace NintendoSwitch{
 
@@ -92,15 +93,16 @@ void wait_until_overworld(
 // - Pointing to the right is 90.0 degrees.
 double get_current_facing_angle(ConsoleHandle& console, ProControllerContext& context);
 
-// While at the gate in the zone, mash A to leave the zone.
-// If day/night change happens during this period, the function still returns after
-// day/night change finishes. You can sandwich the function with
-// `WallClock time = current_time();` to measure time spent in this function to know
-// if day/night change happens.
-void leave_zone_gate(ConsoleHandle& console, ProControllerContext& context);
+// While at the gate in the zone, mash A to leave the zone. If day/night changes while
+// leaving, it will wait until the change is done.
+// Return true if there is no day/night change.
+// Return false if day/night change happens. In this case, we don't know if the player
+// character is still inside the zone or not.
+bool leave_zone_gate(ConsoleHandle& console, ProControllerContext& context);
 
 // Run towards a wild zone until either button A is detected at specified box region,
-// or if day/night change happens
+// or day/night change happens. If day/night changes, it will wait until the transition
+// animation is done.
 // Return
 // -  0 if button A is detected
 // -  1 if day/night change happens

SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp

@@ -303,11 +303,8 @@ void leave_zone_and_reset_spawns(
     switch (ret){
     case 0: // Found button A. Reached the gate.
         break;
-    case 1:
-        env.log("Day/night change happened while escaping");
-        env.console.overlay().add_log("Day/Night Change Detected");
+    case 1: // Day/night change happened.
         {
-            wait_until_overworld(env.console, context);
             double current_facing_angle = get_current_facing_angle(env.console, context);
             double angle_between = std::fabs(starting_angle - current_facing_angle);
             if (angle_between > 180.0){
@@ -351,51 +348,28 @@ void leave_zone_and_reset_spawns(
     default:
         stats.errors++;
         env.update_stats();
-#if 0
-        OperationFailedException::fire(
-            ErrorReport::SEND_ERROR_REPORT,
-            "leave_zone_and_reset_spawns(): Cannot run back to entrance after being chased by wild pokemon.",
-            env.console
-        );
-#else
         throw UserSetupError(
             env.logger(),
             "Program stuck in the zone while escaping from wild pokemon. "
             "Pick a path that won't get you stuck by terrain or obstacles."
         );
-#endif
     }
     shiny_sound_handler.process_pending(context);
 
     // Found button A, so we are at the entrance.
     // Mash A to leave Zone.
-    env.log("Found button A. Leaving Zone");
-    env.console.overlay().add_log("Found Button A. Leaving Zone");
-    
-    WallClock start_time = current_time();
-    leave_zone_gate(env.console, context);
-    WallClock end_time = current_time();
-    shiny_sound_handler.process_pending(context);
 
     std::string extra_eror_msg = " This is after leaving zone.";
 
-    auto duration = end_time - start_time;
-    auto second_count = std::chrono::duration_cast<std::chrono::seconds>(duration).count();
     // Due to day/night change may eating the mashing button A sequence, we may still be inside the zone!
     // We need to check if we can fast travel 
-    if (duration < 16s){
-        env.log("Leaving zone function took " + std::to_string(second_count) + " sec. No day/night change");
-        // The animation of leaving the gate does not take more than 15 sec.
-        // In this case, there is no day/night change. We are sure we are outside the wild zone
-        // (unless some angry Garchomp or Drilbur used Dig and escaped wild zone containment... We don't
-        // consider this case for now)
+    if (leave_zone_gate(env.console, context)){
+        shiny_sound_handler.process_pending(context);
         // Do a fast travel outside the gate to reset spawns
         fast_travel_outside_zone(env, context, wild_zone, to_max_zoom_level_on_map, std::move(extra_eror_msg));
         return;
     }
 
-    env.log("Leaving zone function took " + std::to_string(second_count) + " sec. Day/night change happened");
-
     // there is a day/night change while leaving the zone. We don't know if we are still inside the zone.
     FastTravelState travel_status = open_map_and_fly_in_place(env.console, context, to_max_zoom_level_on_map);
     if (travel_status == FastTravelState::SUCCESS){
@@ -419,6 +393,7 @@ void leave_zone_and_reset_spawns(
     // Mash A to leave zone gate
     env.log("Mashing A again to leave zone");
     leave_zone_gate(env.console, context);
+    shiny_sound_handler.process_pending(context);
     // Do a fast travel outside the gate to reset spawns
     env.log("Finally, we should have left the zone");
     fast_travel_outside_zone(env, context, wild_zone, to_max_zoom_level_on_map, std::move(extra_eror_msg));