more cleanup

Author: Gin

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp

@@ -391,7 +391,7 @@ void wait_until_overworld(
 }
 
 
-double get_current_facing_angle(
+double get_facing_direction(
     ConsoleHandle& console,
     ProControllerContext& context
 ){
@@ -406,7 +406,7 @@ double get_current_facing_angle(
         console.overlay().add_log("No Minimap Arrow Found", COLOR_RED);
         OperationFailedException::fire(
             ErrorReport::SEND_ERROR_REPORT,
-            "get_current_facing_angle(): Direction arrow on minimap not detected within 1 second",
+            "get_facing_direction(): Direction arrow on minimap not detected within 1 second",
             console
         );
     }
@@ -416,6 +416,13 @@ double get_current_facing_angle(
     return angle;
 }
 
+double get_angle_between_facing_directions(double dir1, double dir2){
+    double angle = std::fabs(dir1 - dir2);
+    if (angle > 180.0){
+        angle = 360.0 - angle;
+    }
+    return angle;
+}
 
 bool leave_zone_gate(ConsoleHandle& console, ProControllerContext& context){
     console.log("Leaving zone gate");

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h

@@ -91,7 +91,10 @@ void wait_until_overworld(
 // Return a float of [0.0, 360.0), the angle of the arrow using the clock setting, i.e.
 // - Pointing upwards is 0.0 degree.
 // - Pointing to the right is 90.0 degrees.
-double get_current_facing_angle(ConsoleHandle& console, ProControllerContext& context);
+double get_facing_direction(ConsoleHandle& console, ProControllerContext& context);
+
+// Given two facing directions, find the angle between them. The angle range is [0, 180).
+double get_angle_between_facing_directions(double dir1, double dir2);
 
 // 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.

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

@@ -296,7 +296,7 @@ void leave_zone_and_reset_spawns(
     env.log("Escaping");
     env.console.overlay().add_log("Escaping Back to Entrance");
 
-    const double starting_angle = get_current_facing_angle(env.console, context);
+    const double starting_direction = get_facing_direction(env.console, context);
 
     const ImageFloatBox button_A_box{0.3, 0.2, 0.4, 0.7};
     int ret = run_towards_wild_zone_gate(env.console, context, button_A_box, 128, 255, walk_time_in_zone);
@@ -305,29 +305,26 @@ void leave_zone_and_reset_spawns(
         break;
     case 1: // Day/night change happened.
         {
-            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){
-                angle_between = 360.0 - angle_between;
-            }
-            env.log("Facing angle difference after day/night change: " + tostr_fixed(angle_between, 0) + " deg, from "
-                + tostr_fixed(starting_angle, 0) + " to " + tostr_fixed(current_facing_angle, 0) + " deg");
+            const double cur_direction = get_facing_direction(env.console, context);
+            const double direction_change = get_angle_between_facing_directions(starting_direction, cur_direction);
+            env.log("Facing direction difference after day/night change: " + tostr_fixed(direction_change, 0) + " deg, from "
+                + tostr_fixed(starting_direction, 0) + " to " + tostr_fixed(cur_direction, 0) + " deg");
 
             uint8_t joystick_y = 0;
-            if (angle_between > 150.0){
+            if (direction_change > 150.0){
                 // we are facing towards the gate
                 env.log("Running forward");
                 env.console.overlay().add_log("Running Forward");
                 joystick_y = 0;
-            }else if(angle_between < 30.0){
+            }else if(direction_change < 30.0){
                 // we are facing away from the gate
                 env.log("Running back");
                 env.console.overlay().add_log("Running Back");
                 joystick_y = 255;
             }else{
                 OperationFailedException::fire(
                     ErrorReport::SEND_ERROR_REPORT,
-                    "leave_zone_and_reset_spawns(): Facing direction after day/night change is wrong: " + tostr_fixed(angle_between, 0) + " deg",
+                    "leave_zone_and_reset_spawns(): Facing direction after day/night change is wrong: " + tostr_fixed(direction_change, 0) + " deg",
                     env.console
                 );
             }