Skip to content

Commit a84dbf5

Browse files
committed
Fix the SV egg programs for SBB.
1 parent 6d0a03d commit a84dbf5

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_ProController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ProController_SysbotBase : public ProControllerWithScheduler{
2323
public:
2424
using ContextType = ProControllerContext;
2525

26-
static constexpr size_t QUEUE_SIZE = 8;
26+
static constexpr size_t QUEUE_SIZE = 32;
2727
static constexpr std::chrono::microseconds EARLY_WAKE_SPIN = std::chrono::microseconds(2000);
2828

2929

SerialPrograms/Source/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "CommonFramework/Notifications/ProgramInfo.h"
1717
#include "CommonTools/Async/InferenceRoutines.h"
1818
#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
19+
#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
1920
//#include "Pokemon/Pokemon_Strings.h"
2021
#include "PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
2122
#include "PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h"
@@ -200,7 +201,8 @@ void hold_one_column(const ProgramInfo& info, VideoStream& stream, ProController
200201
// Select rest of the pary
201202
// Press down multiple times to make sure we select full party in case the game drops some presses
202203
for(int i = 0; i < 15; i++){
203-
pbf_press_dpad(context, DPAD_DOWN, 5, 3);
204+
ssf_press_dpad(context, DPAD_DOWN, 4, 5, 3);
205+
ssf_press_left_joystick(context, 128, 255, 4, 5, 3);
204206
}
205207
// Hold rest of the party
206208
pbf_wait(context, 60);

SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ EggAutonomous_Descriptor::EggAutonomous_Descriptor()
4444
"Automatically get meal power, fetch eggs from a picnic and hatch them.",
4545
FeedbackType::REQUIRED,
4646
AllowCommandsWhenRunning::DISABLE_COMMANDS,
47-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
47+
{ControllerFeature::NintendoSwitch_ProController},
48+
FasterIfTickPrecise::NOT_FASTER
4849
)
4950
{}
5051
struct EggAutonomous_Descriptor::Stats : public StatsTracker{

SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ EggFetcher_Descriptor::EggFetcher_Descriptor()
3030
"Automatically fetch eggs from a picnic.",
3131
FeedbackType::REQUIRED,
3232
AllowCommandsWhenRunning::DISABLE_COMMANDS,
33-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
33+
{ControllerFeature::NintendoSwitch_ProController},
34+
FasterIfTickPrecise::NOT_FASTER
3435
)
3536
{}
3637
struct EggFetcher_Descriptor::Stats : public StatsTracker{

SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ EggHatcher_Descriptor::EggHatcher_Descriptor()
3232
"Automatically hatch eggs from boxes.",
3333
FeedbackType::REQUIRED,
3434
AllowCommandsWhenRunning::DISABLE_COMMANDS,
35-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
35+
{ControllerFeature::NintendoSwitch_ProController},
36+
FasterIfTickPrecise::NOT_FASTER
3637
)
3738
{}
3839
struct EggHatcher_Descriptor::Stats : public StatsTracker{

0 commit comments

Comments
 (0)