Skip to content

Commit cc9d878

Browse files
committed
Clear out ESP and Scatterbug.
1 parent a84dbf5 commit cc9d878

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_ESPTraining.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ ESPTraining_Descriptor::ESPTraining_Descriptor()
3131
"Clear the ESP Training to farm EV berries.",
3232
FeedbackType::REQUIRED,
3333
AllowCommandsWhenRunning::DISABLE_COMMANDS,
34-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
34+
{ControllerFeature::NintendoSwitch_ProController},
35+
FasterIfTickPrecise::NOT_FASTER
3536
)
3637
{}
3738
struct ESPTraining_Descriptor::Stats : public StatsTracker{

SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ ShinyHuntAreaZeroPlatform_Descriptor::ShinyHuntAreaZeroPlatform_Descriptor()
4848
"Shiny hunt the isolated platform at the bottom of Area Zero.",
4949
FeedbackType::VIDEO_AUDIO,
5050
AllowCommandsWhenRunning::DISABLE_COMMANDS,
51-
{ControllerFeature::NintendoSwitch_ProController}
51+
{ControllerFeature::NintendoSwitch_ProController},
52+
FasterIfTickPrecise::NOT_FASTER
5253
)
5354
{}
5455
struct ShinyHuntAreaZeroPlatform_Descriptor::Stats : public LetsGoEncounterBotStats{

SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ ShinyHuntScatterbug_Descriptor::ShinyHuntScatterbug_Descriptor()
4747
"Shiny hunt Scatterbug.",
4848
FeedbackType::VIDEO_AUDIO,
4949
AllowCommandsWhenRunning::DISABLE_COMMANDS,
50-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
50+
{ControllerFeature::NintendoSwitch_ProController},
51+
FasterIfTickPrecise::NOT_FASTER
5152
)
5253
{}
5354
struct ShinyHuntScatterbug_Descriptor::Stats : public LetsGoEncounterBotStats{
@@ -130,17 +131,19 @@ ShinyHuntScatterbug::ShinyHuntScatterbug()
130131
&NOTIFICATION_ERROR_FATAL,
131132
})
132133
{
133-
if (PreloadSettings::instance().DEVELOPER_MODE){
134-
PA_ADD_OPTION(SAVE_DEBUG_VIDEO);
135-
PA_ADD_OPTION(DEBUG_WARP_TO_POKECENTER);
136-
PA_ADD_OPTION(SKIP_SANDWICH);
137-
}
138134
PA_ADD_OPTION(SAVE_GAME_AT_START);
139135
PA_ADD_OPTION(LANGUAGE);
140136
PA_ADD_OPTION(SANDWICH_OPTIONS);
141137
PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
142138
PA_ADD_OPTION(GO_HOME_WHEN_DONE);
143139
PA_ADD_OPTION(AUTO_HEAL_PERCENT);
140+
141+
if (PreloadSettings::instance().DEVELOPER_MODE){
142+
PA_ADD_OPTION(SAVE_DEBUG_VIDEO);
143+
PA_ADD_OPTION(DEBUG_WARP_TO_POKECENTER);
144+
PA_ADD_OPTION(SKIP_SANDWICH);
145+
}
146+
144147
PA_ADD_OPTION(NOTIFICATIONS);
145148
}
146149

0 commit comments

Comments
 (0)