Skip to content

Commit 4a02836

Browse files
committed
Fix egg programs for SBB.
1 parent 95c196f commit 4a02836

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
namespace PokemonAutomation{
2222
namespace NintendoSwitch{
2323
namespace PokemonBDSP{
24+
2425
using namespace Pokemon;
2526

2627

@@ -33,7 +34,8 @@ EggAutonomous_Descriptor::EggAutonomous_Descriptor()
3334
"Automatically fetch+hatch eggs and keep all shinies.",
3435
FeedbackType::REQUIRED,
3536
AllowCommandsWhenRunning::DISABLE_COMMANDS,
36-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
37+
{ControllerFeature::NintendoSwitch_ProController},
38+
FasterIfTickPrecise::NOT_FASTER
3739
)
3840
{}
3941
std::unique_ptr<StatsTracker> EggAutonomous_Descriptor::make_stats() const{

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ void withdraw_1st_column_from_overworld(VideoStream& stream, ProControllerContex
136136

137137
void release(VideoStream& stream, ProControllerContext& context){
138138
pbf_press_button(context, BUTTON_ZL, 20, 50);
139-
pbf_move_right_joystick(context, 128, 0, 20, 10);
140-
pbf_move_right_joystick(context, 128, 0, 20, 10);
139+
pbf_move_right_joystick(context, 128, 0, 20, 30);
140+
pbf_move_right_joystick(context, 128, 0, 20, 30);
141141
pbf_press_button(context, BUTTON_ZL, 20, 105);
142-
pbf_move_right_joystick(context, 128, 255, 20, 10);
142+
pbf_move_right_joystick(context, 128, 255, 20, 30);
143143

144144
ShortDialogDetector detector;
145145
for (size_t c = 0; c < 3; c++){

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ EggFetcher_Descriptor::EggFetcher_Descriptor()
2626
"Automatically fetch eggs from the daycare man.",
2727
FeedbackType::NONE,
2828
AllowCommandsWhenRunning::DISABLE_COMMANDS,
29-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
29+
{ControllerFeature::NintendoSwitch_ProController},
30+
FasterIfTickPrecise::NOT_FASTER
3031
)
3132
{}
3233
struct EggFetcher_Descriptor::Stats : public StatsTracker{

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ EggHatcher_Descriptor::EggHatcher_Descriptor()
2929
"Hatch eggs from boxes.",
3030
FeedbackType::OPTIONAL_,
3131
AllowCommandsWhenRunning::DISABLE_COMMANDS,
32-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
32+
{ControllerFeature::NintendoSwitch_ProController},
33+
FasterIfTickPrecise::NOT_FASTER
3334
)
3435
{}
3536
struct EggHatcher_Descriptor::Stats : public StatsTracker{

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ void egg_spin_with_A(ProControllerContext& context, Milliseconds duration){
4444
void pickup_column(ProControllerContext& context){
4545
// const uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY_0;
4646
pbf_press_button(context, BUTTON_ZL, 20, 50);
47-
for (size_t c = 0; c < 10; c++){
48-
pbf_move_right_joystick(context, 128, 255, 5, 3);
47+
for (size_t c = 0; c < 30; c++){
48+
ssf_issue_scroll(context, DPAD_DOWN, 3);
4949
}
5050
pbf_press_button(context, BUTTON_ZL, 160ms, GameSettings::instance().BOX_PICKUP_DROP_DELAY0);
5151
}

0 commit comments

Comments
 (0)