Skip to content

Bbq switch2 fixes #641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mysticial merged 2 commits into from
Jul 4, 2025
Merged

Bbq switch2 fixes #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77d11cf
pyroar turn for switch 1 only
kichithewolf Jun 29, 2025
791faa4
change dark catch/photo target, disabled flying-type
kichithewolf Jul 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -179,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);
Expand Down Expand Up @@ -224,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);
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -504,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);
Expand Down Expand Up @@ -577,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);
Expand Down
2 changes: 1 addition & 1 deletion SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const std::set<BBQuests> gold_quests = {

//Quests that are not currently supported. Gold quests currently excluded as this is singleplayer only right now.
const std::set<BBQuests> not_possible_quests = {
BBQuests::UnableToDetect, BBQuests::pickup_10
BBQuests::UnableToDetect, BBQuests::pickup_10, BBQuests::photo_flying, BBQuests::catch_flying
};


Expand Down