more fixes

Author: kichithewolf

SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp

@@ -78,22 +78,22 @@ void BBQSoloFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerCo
     }
 
     //Fly to plaza
-    //open_map_from_overworld(env.program_info(), env.console, context);
-    //fly_to_overworld_from_map(env.program_info(), env.console, context);
+    open_map_from_overworld(env.program_info(), env.console, context);
+    fly_to_overworld_from_map(env.program_info(), env.console, context);
 
     std::vector<BBQuests> quest_list; //all quests
     std::vector<BBQuests> quests_to_do; //do-able quests
     uint8_t eggs_hatched = 0; //Track eggs
     uint64_t num_completed_quests = 0;
 
     //Test a specific quest
-    
-    BBQuests test_quest = BBQuests::catch_any;
+    /*
+    BBQuests test_quest = BBQuests::catch_water;
     bool questTest = process_and_do_quest(env, env.console, context, BBQ_OPTIONS, test_quest, eggs_hatched);
     if (questTest){
         env.log("Finished quest.");
     }
-    
+    */
 
     while (num_completed_quests < BBQ_OPTIONS.NUM_QUESTS){
         if (BBQ_OPTIONS.OUT_OF_EGGS == BBQOption::OOEggs::Stop && eggs_hatched >= BBQ_OPTIONS.NUM_EGGS){

SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp

@@ -400,11 +400,8 @@ void quest_catch_navi(
             pbf_press_button(context, BUTTON_L, 20, 50);
             pbf_move_left_joystick(context, 128, 0, 100, 50);
 
-            //Turn slightly for switch 1
-            if (console.state().console_type() == ConsoleType::Switch1) {
-                pbf_move_left_joystick(context, 0, 0, 20, 50);
-                pbf_press_button(context, BUTTON_L, 20, 50);
-            }
+            pbf_move_left_joystick(context, 0, 0, 20, 50);
+            pbf_press_button(context, BUTTON_L, 20, 50);
 
             break;
 
@@ -522,13 +519,22 @@ void quest_catch_navi(
             pbf_move_left_joystick(context, 255, 0, 10, 20);
             pbf_press_button(context, BUTTON_L, 20, 50);
 
-            pbf_move_left_joystick(context, 128, 0, 200, 20);
+            if (console.state().console_type() == ConsoleType::Switch1) {
+                pbf_move_left_joystick(context, 128, 0, 200, 20);
+            } else {
+                pbf_move_left_joystick(context, 128, 0, 170, 20);
+            }
+
             pbf_press_button(context, BUTTON_L, 20, 50);
 
             pbf_move_left_joystick(context, 0, 0, 10, 20);
             pbf_press_button(context, BUTTON_L, 20, 50);
 
-            pbf_move_left_joystick(context, 128, 0, 100, 20);
+            if (console.state().console_type() == ConsoleType::Switch1) {
+                pbf_move_left_joystick(context, 128, 0, 100, 20);
+            } else {
+                pbf_move_left_joystick(context, 128, 0, 120, 20);
+            }
             pbf_wait(context, 400);
             context.wait_for_all_requests();
 
@@ -558,7 +564,12 @@ void quest_catch_navi(
             pbf_move_left_joystick(context, 0, 128, 20, 50);
 
             pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 20, 105);
-            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 200, 590, 200);
+
+            if (console.state().console_type() == ConsoleType::Switch1) {
+                jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 200, 575, 200);
+            } else { //Switch 2
+                jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 200, 500, 200);
+            }
 
             pbf_press_button(context, BUTTON_PLUS, 20, 105);
             pbf_move_left_joystick(context, 0, 128, 20, 50);
@@ -574,7 +585,12 @@ void quest_catch_navi(
             pbf_move_left_joystick(context, 0, 128, 20, 50);
 
             pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 20, 105);
-            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 1000, 1800, 300);
+
+            if (console.state().console_type() == ConsoleType::Switch1) {
+                jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 1000, 1800, 300);
+            } else {
+                jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 1000, 1600, 300);
+            }
 
             pbf_press_button(context, BUTTON_PLUS, 20, 105);