add movement to LA ranch lady

Author: Gin

SerialPrograms/Source/PokemonLA/Programs/ML/PokemonLA_GeneratePokemonImageTrainingData.cpp

@@ -30,7 +30,7 @@ const TravelLocation& to_travel_location(StartingLocation location){
 
     switch(location){
     case StartingLocation::JUBILIFE_VILLAGE:
-        break;
+        return locations.Village_FrontGate;
     case StartingLocation::FIELDLANDS_FIELDLANDS:
         return locations.Fieldlands_Fieldlands;
     case StartingLocation::FIELDLANDS_HEIGHTS:
@@ -147,12 +147,18 @@ void GeneratePokemonImageTrainingData::select_starting_location(SingleSwitchProg
     StartingLocation location = STARTING_LOCATION;
     const TravelLocation& travel_loc = to_travel_location(location);
     // fast travel to the target camp to reset player character position
-    goto_any_camp_from_overworld(env, env.console, context, travel_loc);
+    fast_travel_from_overworld(env, env.console, context, travel_loc);
 
     // move to the npc to open box system
     switch(location){
     case StartingLocation::JUBILIFE_VILLAGE:
         env.log("Starting at Jubilife Village");
+        // at gate, face towards the gate
+        pbf_move_left_joystick(context, 128, 255, 240, 30); // move backwards
+        pbf_move_left_joystick(context, 255, 150, 120, 60); // move to right
+        pbf_press_button(context, BUTTON_ZL, 30, 125); // rotate camera to point to where the character is facing
+        pbf_move_left_joystick(context, 128, 0, 700, 30); // move forward
+        pbf_move_left_joystick(context, 255, 125, 30, 60); // move to right
         break;
     case StartingLocation::FIELDLANDS_FIELDLANDS:
         env.log("Starting at Fieldlands - Fieldlands Camp");

SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp

@@ -472,7 +472,7 @@ void goto_camp_from_overworld(
     context.wait_for(GameSettings::instance().POST_WARP_DELAY0);
 }
 
-void goto_any_camp_from_overworld(
+void fast_travel_from_overworld(
     ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
     const TravelLocation& location
 ){
@@ -531,7 +531,7 @@ void goto_any_camp_from_overworld(
                 {{detector}}
             );
             if (ret >= 0){
-                stream.log("Flying back to camp...");
+                stream.log("Fast traveling...");
                 pbf_wait(context, 50);
                 if (location.warp_slot != 0){
                     for (size_t c = 0; c < location.warp_slot; c++){

SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.h

@@ -51,7 +51,7 @@ void goto_camp_from_overworld(
 
 // From overworld, open map, press X to open the fast travel popup menu and go to the specified
 // travel location.
-void goto_any_camp_from_overworld(
+void fast_travel_from_overworld(
     ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
     const TravelLocation& location
 );

SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp

@@ -306,7 +306,7 @@ void AutoMultiSpawn::program(SingleSwitchProgramEnvironment& env, ProControllerC
         env.log("The path is: " + os.str());
     }
 
-    goto_any_camp_from_overworld(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
+    fast_travel_from_overworld(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
     change_time_of_day_at_tent(env.console, context, path_times[0], Camp::MIRELANDS_MIRELANDS);
 
     for(size_t iStep = 0; iStep < path_despawns.size(); iStep++){
@@ -358,7 +358,7 @@ void AutoMultiSpawn::advance_one_path_step(
         pbf_press_button(context, BUTTON_X, 20, 230);
     }
 
-    goto_any_camp_from_overworld(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
+    fast_travel_from_overworld(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
 
     // We try at most three battles to remove pokemon
     size_t already_removed_pokemon = 0;
@@ -427,7 +427,7 @@ size_t AutoMultiSpawn::try_one_battle_to_remove_pokemon(
         env.log("Cannot focus on any pokemon. Retry.");
         // TODO: escape routine may scare wild pokemon. A better way is to reset and load from the backup save?
         // or load from a previous save?
-        goto_any_camp_from_overworld(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
+        fast_travel_from_overworld(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
         // TODO: May need to reset time of day here
     }
 
@@ -563,7 +563,7 @@ size_t AutoMultiSpawn::try_one_battle_to_remove_pokemon(
         }
     }
 
-    goto_any_camp_from_overworld(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
+    fast_travel_from_overworld(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
     return num_removed_pokemon;
 }
 

SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp

@@ -285,7 +285,7 @@ void BurmyFinder::go_to_height_camp(SingleSwitchProgramEnvironment& env, ProCont
     int ret = run_until<ProControllerContext>(
         env.console, context,
         [&](ProControllerContext& context){
-            goto_any_camp_from_overworld(env, env.console, context, TravelLocations::instance().Fieldlands_Heights);
+            fast_travel_from_overworld(env, env.console, context, TravelLocations::instance().Fieldlands_Heights);
         },
         {
             {battle_menu_detector},
@@ -302,7 +302,7 @@ void BurmyFinder::go_to_height_camp(SingleSwitchProgramEnvironment& env, ProCont
         // Finish battle
         handle_battle(env, context);
         // Go back to camp
-        goto_any_camp_from_overworld(env, env.console, context, TravelLocations::instance().Fieldlands_Heights);
+        fast_travel_from_overworld(env, env.console, context, TravelLocations::instance().Fieldlands_Heights);
     }
 }