Skip to content

Commit d089e46

Browse files
committed
Add save period defaults to SwSw datespam since ESP32 datespam isn't that reliable.
1 parent 0fd9cb4 commit d089e46

10 files changed

+29
-29
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@ BerryFarmer::BerryFarmer()
4040
LockMode::LOCK_WHILE_RUNNING,
4141
100000
4242
)
43-
, SAVE_ITERATIONS(
43+
, SAVE_ITERATIONS0(
4444
"<b>Save Every this Many Fetches:</b><br>(zero disables saving): ",
4545
LockMode::LOCK_WHILE_RUNNING,
46-
0
46+
100
4747
)
4848
, NOTIFICATIONS({
4949
&NOTIFICATION_PROGRAM_FINISH,
5050
})
5151
{
5252
PA_ADD_OPTION(START_LOCATION);
5353
PA_ADD_OPTION(SKIPS);
54-
PA_ADD_OPTION(SAVE_ITERATIONS);
54+
PA_ADD_OPTION(SAVE_ITERATIONS0);
5555
PA_ADD_OPTION(NOTIFICATIONS);
5656
}
5757

@@ -75,9 +75,9 @@ void BerryFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerCont
7575
pbf_mash_button(context, BUTTON_ZL, 385);
7676
pbf_mash_button(context, BUTTON_B, 600);
7777

78-
if (SAVE_ITERATIONS != 0){
78+
if (SAVE_ITERATIONS0 != 0){
7979
save_count++;
80-
if (save_count >= SAVE_ITERATIONS){
80+
if (save_count >= SAVE_ITERATIONS0){
8181
save_count = 0;
8282
pbf_mash_button(context, BUTTON_B, 2 * TICKS_PER_SECOND);
8383
pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class BerryFarmer : public SingleSwitchProgramInstance{
3434
StartInGripOrGameOption START_LOCATION;
3535

3636
SimpleIntegerOption<uint32_t> SKIPS;
37-
SimpleIntegerOption<uint16_t> SAVE_ITERATIONS;
37+
SimpleIntegerOption<uint16_t> SAVE_ITERATIONS0;
3838

3939
EventNotificationsOption NOTIFICATIONS;
4040
};

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ BerryFarmer2::BerryFarmer2()
7474
LockMode::UNLOCK_WHILE_RUNNING,
7575
100000
7676
)
77-
, SAVE_ITERATIONS(
77+
, SAVE_ITERATIONS0(
7878
"<b>Save Every this Many Fetches:</b><br>(zero disables saving): ",
7979
LockMode::UNLOCK_WHILE_RUNNING,
80-
0
80+
100
8181
)
8282
, ENCOUNTER_BOT_OPTIONS(false, true)
8383
, NOTIFICATIONS({
@@ -125,7 +125,7 @@ BerryFarmer2::BerryFarmer2()
125125
PA_ADD_OPTION(REQUIRES_AUDIO);
126126
PA_ADD_OPTION(START_LOCATION);
127127
PA_ADD_OPTION(FETCH_ATTEMPTS);
128-
PA_ADD_OPTION(SAVE_ITERATIONS);
128+
PA_ADD_OPTION(SAVE_ITERATIONS0);
129129

130130
PA_ADD_OPTION(LANGUAGE);
131131
PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
@@ -330,7 +330,7 @@ void BerryFarmer2::program(SingleSwitchProgramEnvironment& env, ProControllerCon
330330

331331
c += iteration_attempts;
332332

333-
uint16_t save_iterations = SAVE_ITERATIONS;
333+
uint16_t save_iterations = SAVE_ITERATIONS0;
334334
if (save_iterations != 0){
335335
save_count += iteration_attempts;
336336
if (save_count >= save_iterations){

SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class BerryFarmer2 : public SingleSwitchProgramInstance{
5656
StartInGripOrGameOption START_LOCATION;
5757

5858
SimpleIntegerOption<uint32_t> FETCH_ATTEMPTS;
59-
SimpleIntegerOption<uint16_t> SAVE_ITERATIONS;
59+
SimpleIntegerOption<uint16_t> SAVE_ITERATIONS0;
6060

6161
EncounterBotLanguage LANGUAGE;
6262
EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@ DailyHighlightFarmer::DailyHighlightFarmer()
4040
LockMode::LOCK_WHILE_RUNNING,
4141
100000
4242
)
43-
, SAVE_ITERATIONS(
43+
, SAVE_ITERATIONS0(
4444
"<b>Save Every this Many Fetches:</b><br>(zero disables saving): ",
4545
LockMode::LOCK_WHILE_RUNNING,
46-
0
46+
100
4747
)
4848
, NOTIFICATIONS({
4949
&NOTIFICATION_PROGRAM_FINISH,
5050
})
5151
{
5252
PA_ADD_OPTION(START_LOCATION);
5353
PA_ADD_OPTION(SKIPS);
54-
PA_ADD_OPTION(SAVE_ITERATIONS);
54+
PA_ADD_OPTION(SAVE_ITERATIONS0);
5555
PA_ADD_OPTION(NOTIFICATIONS);
5656
}
5757

@@ -76,9 +76,9 @@ void DailyHighlightFarmer::program(SingleSwitchProgramEnvironment& env, ProContr
7676
pbf_mash_button(context, BUTTON_ZL, 400);
7777
pbf_mash_button(context, BUTTON_B, 700);
7878

79-
if (SAVE_ITERATIONS != 0){
79+
if (SAVE_ITERATIONS0 != 0){
8080
save_count++;
81-
if (save_count >= SAVE_ITERATIONS){
81+
if (save_count >= SAVE_ITERATIONS0){
8282
save_count = 0;
8383
pbf_mash_button(context, BUTTON_B, 2000ms);
8484
pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class DailyHighlightFarmer : public SingleSwitchProgramInstance{
3434
StartInGripOrGameOption START_LOCATION;
3535

3636
SimpleIntegerOption<uint32_t> SKIPS;
37-
SimpleIntegerOption<uint16_t> SAVE_ITERATIONS;
37+
SimpleIntegerOption<uint16_t> SAVE_ITERATIONS0;
3838

3939
EventNotificationsOption NOTIFICATIONS;
4040
};

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@ StowOnSideFarmer::StowOnSideFarmer()
4040
LockMode::LOCK_WHILE_RUNNING,
4141
100000
4242
)
43-
, SAVE_ITERATIONS(
43+
, SAVE_ITERATIONS0(
4444
"<b>Save Every this Many Fetches:</b><br>(zero disables saving): ",
4545
LockMode::LOCK_WHILE_RUNNING,
46-
0, 0
46+
100
4747
)
4848
, NOTIFICATIONS({
4949
&NOTIFICATION_PROGRAM_FINISH,
5050
})
5151
{
5252
PA_ADD_OPTION(START_LOCATION);
5353
PA_ADD_OPTION(SKIPS);
54-
PA_ADD_OPTION(SAVE_ITERATIONS);
54+
PA_ADD_OPTION(SAVE_ITERATIONS0);
5555
PA_ADD_OPTION(NOTIFICATIONS);
5656
}
5757

@@ -74,9 +74,9 @@ void StowOnSideFarmer::program(SingleSwitchProgramEnvironment& env, ProControlle
7474
pbf_mash_button(context, BUTTON_ZL, 385);
7575
pbf_mash_button(context, BUTTON_B, 700);
7676

77-
if (SAVE_ITERATIONS != 0){
77+
if (SAVE_ITERATIONS0 != 0){
7878
save_count++;
79-
if (save_count >= SAVE_ITERATIONS){
79+
if (save_count >= SAVE_ITERATIONS0){
8080
save_count = 0;
8181
pbf_mash_button(context, BUTTON_B, 2000ms);
8282
pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class StowOnSideFarmer : public SingleSwitchProgramInstance{
3434
StartInGripOrGameOption START_LOCATION;
3535

3636
SimpleIntegerOption<uint32_t> SKIPS;
37-
SimpleIntegerOption<uint16_t> SAVE_ITERATIONS;
37+
SimpleIntegerOption<uint16_t> SAVE_ITERATIONS0;
3838

3939
EventNotificationsOption NOTIFICATIONS;
4040
};

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ WattFarmer::WattFarmer()
5353
LockMode::LOCK_WHILE_RUNNING,
5454
33334
5555
)
56-
, SAVE_ITERATIONS(
56+
, SAVE_ITERATIONS0(
5757
"<b>Save Every this Many Fetches:</b><br>(zero disables saving): ",
5858
LockMode::LOCK_WHILE_RUNNING,
59-
0, 0
59+
100
6060
)
6161
, NOTIFICATIONS({
6262
&NOTIFICATION_PROGRAM_FINISH,
@@ -66,7 +66,7 @@ WattFarmer::WattFarmer()
6666
PA_ADD_OPTION(START_LOCATION);
6767
PA_ADD_OPTION(EXIT_DEN_WAIT);
6868
PA_ADD_OPTION(SKIPS);
69-
PA_ADD_OPTION(SAVE_ITERATIONS);
69+
PA_ADD_OPTION(SAVE_ITERATIONS0);
7070
PA_ADD_OPTION(NOTIFICATIONS);
7171
}
7272

@@ -90,9 +90,9 @@ void WattFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerConte
9090
ssf_press_button_ptv(context, BUTTON_A, 40ms);
9191
pbf_mash_button(context, BUTTON_B, EXIT_DEN_WAIT);
9292

93-
if (SAVE_ITERATIONS != 0){
93+
if (SAVE_ITERATIONS0 != 0){
9494
save_count++;
95-
if (save_count >= SAVE_ITERATIONS){
95+
if (save_count >= SAVE_ITERATIONS0){
9696
save_count = 0;
9797
pbf_mash_button(context, BUTTON_B, 2 * TICKS_PER_SECOND);
9898
pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class WattFarmer : public SingleSwitchProgramInstance{
3838
MillisecondsOption EXIT_DEN_WAIT;
3939

4040
SimpleIntegerOption<uint32_t> SKIPS;
41-
SimpleIntegerOption<uint16_t> SAVE_ITERATIONS;
41+
SimpleIntegerOption<uint16_t> SAVE_ITERATIONS0;
4242

4343
EventNotificationsOption NOTIFICATIONS;
4444
};

0 commit comments

Comments
 (0)