Skip to content

Commit 4f5382c

Browse files
committed
Improve reliability of sbb2 for SwSh datespam programs.
1 parent 2e90005 commit 4f5382c

File tree

5 files changed

+25
-5
lines changed

5 files changed

+25
-5
lines changed

SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@ void BerryFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerCont
6969
env.log("Fetch Attempts: " + tostr_u_commas(c));
7070

7171
home_roll_date_enter_game_autorollback(env.console, context, year);
72-
pbf_mash_button(context, BUTTON_B, 90);
72+
if (context->performance_class() == ControllerPerformanceClass::SysbotBase){
73+
pbf_wait(context, 90);
74+
}else{
75+
pbf_mash_button(context, BUTTON_B, 90);
76+
}
7377

7478
pbf_press_button(context, BUTTON_A, 10, 10);
7579
pbf_mash_button(context, BUTTON_ZL, 385);

SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,11 @@ void DailyHighlightFarmer::program(SingleSwitchProgramEnvironment& env, ProContr
6868
for (uint32_t c = 0; c < SKIPS; c++){
6969
env.log("Fetch Attempts: " + tostr_u_commas(c));
7070
home_roll_date_enter_game_autorollback(env.console, context, year);
71-
pbf_mash_button(context, BUTTON_B, 90);
71+
if (context->performance_class() == ControllerPerformanceClass::SysbotBase){
72+
pbf_wait(context, 90);
73+
}else{
74+
pbf_mash_button(context, BUTTON_B, 90);
75+
}
7276

7377
pbf_press_button(context, BUTTON_A, 10, 110);
7478
pbf_press_button(context, BUTTON_ZL, 10, 40);

SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,11 @@ void LotoFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerConte
6868
for (uint32_t c = 0; c < SKIPS; c++){
6969
env.log("Fetch Attempts: " + tostr_u_commas(c));
7070
home_roll_date_enter_game_autorollback(env.console, context, year);
71-
pbf_mash_button(context, BUTTON_B, 90);
71+
if (context->performance_class() == ControllerPerformanceClass::SysbotBase){
72+
pbf_wait(context, 90);
73+
}else{
74+
pbf_mash_button(context, BUTTON_B, 90);
75+
}
7276

7377
pbf_press_button(context, BUTTON_A, 10, 90);
7478
pbf_press_button(context, BUTTON_B, 10, 70);

SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,11 @@ void StowOnSideFarmer::program(SingleSwitchProgramEnvironment& env, ProControlle
6868
for (uint32_t c = 0; c < SKIPS; c++){
6969
env.log("Fetch Attempts: " + tostr_u_commas(c));
7070
home_roll_date_enter_game_autorollback(env.console, context, year);
71-
pbf_mash_button(context, BUTTON_B, 90);
71+
if (context->performance_class() == ControllerPerformanceClass::SysbotBase){
72+
pbf_wait(context, 90);
73+
}else{
74+
pbf_mash_button(context, BUTTON_B, 90);
75+
}
7276

7377
ssf_press_button_ptv(context, BUTTON_A, 160ms);
7478
pbf_mash_button(context, BUTTON_ZL, 385);

SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,11 @@ void WattFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerConte
8585
env.log("Fetch Attempts: " + tostr_u_commas(c));
8686

8787
home_roll_date_enter_game_autorollback(env.console, context, year);
88-
pbf_mash_button(context, BUTTON_B, 90);
88+
if (context->performance_class() == ControllerPerformanceClass::SysbotBase){
89+
pbf_wait(context, 90);
90+
}else{
91+
pbf_mash_button(context, BUTTON_B, 90);
92+
}
8993

9094
ssf_press_button_ptv(context, BUTTON_A, 40ms);
9195
pbf_mash_button(context, BUTTON_B, EXIT_DEN_WAIT);

0 commit comments

Comments
 (0)