From 2105560e2159cf5200b5712e3ab7770dce2a2d01 Mon Sep 17 00:00:00 2001 From: kichithewolf Date: Mon, 10 Mar 2025 21:39:10 -0400 Subject: [PATCH] extra home press after date skip for bbq farmer --- .../PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.h | 1 + .../Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp | 1 + .../PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.h | 1 + .../PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp | 3 +++ 4 files changed, 6 insertions(+) diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.h b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.h index c12f99be89..b26fad6a4f 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.h +++ b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.h @@ -9,6 +9,7 @@ #include "CommonFramework/Notifications/EventNotificationsTable.h" #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h" +#include "NintendoSwitch/NintendoSwitch_Settings.h" #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h" #include "PokemonSV/Options/PokemonSV_BBQOption.h" diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp index 0895927784..6cc709d279 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp @@ -915,6 +915,7 @@ void quest_catch( pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1); home_to_date_time(context, true, true); PokemonSwSh::roll_date_forward_1(context, true); + pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0); resume_game_from_home(stream, context); //Heal up and then reset position again. diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.h b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.h index 18898846a9..f01368e702 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.h +++ b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.h @@ -8,6 +8,7 @@ #define PokemonAutomation_PokemonSV_BlueberryCatchPhoto_H #include "NintendoSwitch/Controllers/NintendoSwitch_ProController.h" +#include "NintendoSwitch/NintendoSwitch_Settings.h" #include "PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.h" #include "PokemonSV/Options/PokemonSV_BBQOption.h" diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp index 006f63a9e3..d451485049 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp @@ -585,6 +585,7 @@ void quest_tera_self_defeat( pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1); home_to_date_time(context, true, true); PokemonSwSh::roll_date_forward_1(context, true); + pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0); resume_game_from_home(stream, context); //Heal up and then reset position again. @@ -720,6 +721,7 @@ void quest_sneak_up( pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1); home_to_date_time(context, true, true); PokemonSwSh::roll_date_forward_1(context, true); + pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0); resume_game_from_home(stream, context); context.wait_for_all_requests(); } @@ -793,6 +795,7 @@ void quest_wild_tera( pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1); home_to_date_time(context, true, true); PokemonSwSh::roll_date_forward_1(context, true); + pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0); resume_game_from_home(stream, context); //Heal up and then reset position again.