From 77d11cf026fdc26575147fcf285e1373ff945199 Mon Sep 17 00:00:00 2001 From: kichithewolf Date: Sat, 28 Jun 2025 20:56:12 -0400 Subject: [PATCH 1/2] pyroar turn for switch 1 only --- .../Farming/PokemonSV_BlueberryCatchPhoto.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp index 8aea2e01b6..e82d337a76 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp @@ -126,7 +126,11 @@ CameraAngle quest_photo_navi( pbf_press_button(context, BUTTON_L, 20, 50); pbf_move_left_joystick(context, 128, 0, 100, 50); - pbf_move_left_joystick(context, 0, 0, 20, 50); + + //Turn slightly for switch 1 + if (console.state().console_type() == ConsoleType::Switch1) { + pbf_move_left_joystick(context, 0, 0, 20, 50); + } break; case BBQuests::photo_bug: case BBQuests::photo_rock: @@ -400,8 +404,11 @@ void quest_catch_navi( pbf_press_button(context, BUTTON_L, 20, 50); pbf_move_left_joystick(context, 128, 0, 100, 50); - pbf_move_left_joystick(context, 0, 0, 20, 50); - pbf_press_button(context, BUTTON_L, 20, 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); + } break; From 791faa4e028ff084b03584cc36df96a4ac5e9a9d Mon Sep 17 00:00:00 2001 From: kichithewolf Date: Wed, 2 Jul 2025 16:34:44 -0400 Subject: [PATCH 2/2] change dark catch/photo target, disabled flying-type --- .../Farming/PokemonSV_BlueberryCatchPhoto.cpp | 16 ++++++++-------- .../Programs/Farming/PokemonSV_BlueberryQuests.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp index e82d337a76..ba414d09f2 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp @@ -183,8 +183,8 @@ CameraAngle quest_photo_navi( pbf_press_button(context, BUTTON_L, 20, 50); break; - case BBQuests::photo_flying: case BBQuests::photo_dark: - console.log("Photo: Dark/Flying"); + case BBQuests::photo_flying: + console.log("Photo: Flying"); //Vullaby/Mandibuzz central_to_savanna_plaza(info, console, context); @@ -228,8 +228,8 @@ CameraAngle quest_photo_navi( context.wait_for_all_requests(); break; - case BBQuests::photo_poison: - console.log("Photo: Poison"); + case BBQuests::photo_poison: case BBQuests::photo_dark: + console.log("Photo: Poison/Dark"); //Muk-A - area a bit laggy but consistently so central_to_coastal_plaza(info, console, context); @@ -511,8 +511,8 @@ void quest_catch_navi( jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 1000, 1650, 500); break; - case BBQuests::catch_dark: case BBQuests::catch_flying: - console.log("Catch: Dark/Flying"); + case BBQuests::catch_flying: + console.log("Catch: Flying"); //Vullaby/Mandibuzz central_to_savanna_plaza(info, console, context); @@ -584,8 +584,8 @@ void quest_catch_navi( pbf_move_left_joystick(context, 128, 0, 50, 50); break; - case BBQuests::catch_poison: - console.log("Catch: Poison"); + case BBQuests::catch_poison: case BBQuests::catch_dark: + console.log("Catch: Poison/Dark"); //Muk-A - area a bit laggy but consistently so central_to_coastal_plaza(info, console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.h b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.h index 48d187b6b6..32344f4f9e 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.h +++ b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.h @@ -49,7 +49,7 @@ const std::set gold_quests = { //Quests that are not currently supported. Gold quests currently excluded as this is singleplayer only right now. const std::set not_possible_quests = { - BBQuests::UnableToDetect, BBQuests::pickup_10 + BBQuests::UnableToDetect, BBQuests::pickup_10, BBQuests::photo_flying, BBQuests::catch_flying };