Skip to content

Commit 95c196f

Browse files
committed
Clear more BDSP programs for SBB.
1 parent 9592820 commit 95c196f

File tree

6 files changed

+18
-8
lines changed

6 files changed

+18
-8
lines changed

SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ AmitySquarePickUpFarmer_Descriptor::AmitySquarePickUpFarmer_Descriptor()
2525
"Automatically fetch berries and stickers from the walking pokemon in Amity Square.",
2626
FeedbackType::NONE,
2727
AllowCommandsWhenRunning::DISABLE_COMMANDS,
28-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
28+
{ControllerFeature::NintendoSwitch_ProController},
29+
FasterIfTickPrecise::NOT_FASTER
2930
)
3031
{}
3132
struct AmitySquarePickUpFarmer_Descriptor::Stats : public StatsTracker{

SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ GiftBerryReset_Descriptor::GiftBerryReset_Descriptor()
5858
"Reset the game in front of the NPC that gives rare berries in Pastoria City until a desired berry is received.",
5959
FeedbackType::REQUIRED,
6060
AllowCommandsWhenRunning::DISABLE_COMMANDS,
61-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
61+
{ControllerFeature::NintendoSwitch_ProController},
62+
FasterIfTickPrecise::NOT_FASTER
6263
)
6364
{}
6465
struct GiftBerryReset_Descriptor::Stats : public StatsTracker{
@@ -181,7 +182,11 @@ void GiftBerryReset::program(SingleSwitchProgramEnvironment& env, ProControllerC
181182
}
182183

183184
env.update_stats();
184-
send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
185+
send_program_finished_notification(
186+
env, NOTIFICATION_PROGRAM_FINISH,
187+
"Match found!",
188+
env.console.video().snapshot()
189+
);
185190
GO_HOME_WHEN_DONE.run_end_of_program(context);
186191
}
187192

SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ PoffinCooker_Descriptor::PoffinCooker_Descriptor()
2727
"Cook Poffins.",
2828
FeedbackType::REQUIRED,
2929
AllowCommandsWhenRunning::DISABLE_COMMANDS,
30-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
30+
{ControllerFeature::NintendoSwitch_ProController},
31+
FasterIfTickPrecise::MUCH_FASTER
3132
)
3233
{}
3334
struct PoffinCooker_Descriptor::Stats : public StatsTracker{

SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ AutonomousBallThrower_Descriptor::AutonomousBallThrower_Descriptor()
2828
"Repeatedly throw a ball and reset until you catch the pokemon.",
2929
FeedbackType::REQUIRED,
3030
AllowCommandsWhenRunning::DISABLE_COMMANDS,
31-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
31+
{ControllerFeature::NintendoSwitch_ProController},
32+
FasterIfTickPrecise::NOT_FASTER
3233
)
3334
{}
3435
struct AutonomousBallThrower_Descriptor::Stats : public StatsTracker{

SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ ShinyHuntFishing_Descriptor::ShinyHuntFishing_Descriptor()
2929
"Shiny hunt fishing " + STRING_POKEMON + ".",
3030
FeedbackType::REQUIRED,
3131
AllowCommandsWhenRunning::DISABLE_COMMANDS,
32-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
32+
{ControllerFeature::NintendoSwitch_ProController},
33+
FasterIfTickPrecise::NOT_FASTER
3334
)
3435
{}
3536
struct ShinyHuntFishing_Descriptor::Stats : public PokemonSwSh::ShinyHuntTracker{

SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ ShinyHuntShaymin_Descriptor::ShinyHuntShaymin_Descriptor()
2727
"Shiny hunt Shaymin using the runaway method.",
2828
FeedbackType::REQUIRED,
2929
AllowCommandsWhenRunning::DISABLE_COMMANDS,
30-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
30+
{ControllerFeature::NintendoSwitch_ProController},
31+
FasterIfTickPrecise::NOT_FASTER
3132
)
3233
{}
3334
std::unique_ptr<StatsTracker> ShinyHuntShaymin_Descriptor::make_stats() const{
@@ -178,7 +179,7 @@ void ShinyHuntShaymin::program(SingleSwitchProgramEnvironment& env, ProControlle
178179
// Hop on bike, ride down to seabreak path
179180
// SHORTCUT.run(env.console, 0);
180181
pbf_move_left_joystick(context, 128, 255, 360, 0);
181-
pbf_move_left_joystick(context, 128, 0, 370, 0);
182+
pbf_move_left_joystick(context, 128, 0, 400, 0);
182183
}
183184

184185
send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);

0 commit comments

Comments
 (0)