Skip to content

Commit 7e13f1b

Browse files
committed
Fix date spam. Clear the 3 date-spam tera programs. Glitch programs require TickPrecise.
1 parent d794cd0 commit 7e13f1b

File tree

6 files changed

+40
-15
lines changed

6 files changed

+40
-15
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ LPFarmer_Descriptor::LPFarmer_Descriptor()
3131
"Farm LP by day skipping Tera raids.",
3232
FeedbackType::REQUIRED,
3333
AllowCommandsWhenRunning::DISABLE_COMMANDS,
34-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
34+
{ControllerFeature::NintendoSwitch_ProController},
35+
FasterIfTickPrecise::MUCH_FASTER
3536
)
3637
{}
3738
struct LPFarmer_Descriptor::Stats : public StatsTracker{

SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ CloneItems101_Descriptor::CloneItems101_Descriptor()
4040
"Clone items using the add-to-party glitch.",
4141
FeedbackType::REQUIRED,
4242
AllowCommandsWhenRunning::DISABLE_COMMANDS,
43-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
43+
{
44+
ControllerFeature::TickPrecise,
45+
ControllerFeature::NintendoSwitch_ProController,
46+
}
4447
)
4548
{}
4649
struct CloneItems101_Descriptor::Stats : public StatsTracker{

SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ RideCloner101_Descriptor::RideCloner101_Descriptor()
4848
"Clone your ride legendary (and its item) using the add-to-party glitch.",
4949
FeedbackType::REQUIRED,
5050
AllowCommandsWhenRunning::DISABLE_COMMANDS,
51-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
51+
{
52+
ControllerFeature::TickPrecise,
53+
ControllerFeature::NintendoSwitch_ProController,
54+
}
5255
)
5356
{}
5457
struct RideCloner101_Descriptor::Stats : public StatsTracker{

SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Navigation.cpp

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,32 @@ void set_time_to_12am_from_home(const ProgramInfo& info, VideoStream& stream, Pr
5555
void day_skip_from_overworld(VideoStream& stream, ProControllerContext& context){
5656
pbf_press_button(context, BUTTON_HOME, 80ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
5757
home_to_date_time(context, true, true);
58-
ssf_press_button(context, BUTTON_A, 20, 10);
59-
ssf_issue_scroll(context, DPAD_RIGHT, 0);
60-
ssf_press_button(context, BUTTON_A, 2);
61-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
62-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
63-
ssf_press_button(context, BUTTON_A, 0);
64-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
65-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
66-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0);
67-
ssf_press_button(context, BUTTON_A, 20, 10);
58+
59+
Milliseconds timing_variation = context->timing_variation();
60+
if (timing_variation == 0ms){
61+
ssf_press_button(context, BUTTON_A, 20, 10);
62+
ssf_issue_scroll(context, DPAD_RIGHT, 0);
63+
ssf_press_button(context, BUTTON_A, 2);
64+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
65+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
66+
ssf_press_button(context, BUTTON_A, 0);
67+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
68+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
69+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0);
70+
ssf_press_button(context, BUTTON_A, 20, 10);
71+
}else{
72+
ssf_press_button(context, BUTTON_A, 160ms + timing_variation, 80ms + timing_variation);
73+
ssf_issue_scroll(context, DPAD_RIGHT);
74+
ssf_press_button(context, BUTTON_A);
75+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT);
76+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT);
77+
ssf_press_button(context, BUTTON_A);
78+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT);
79+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT);
80+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT);
81+
ssf_press_button(context, BUTTON_A, 160ms + timing_variation, 80ms + timing_variation);
82+
}
83+
6884
pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
6985
resume_game_from_home(stream, context);
7086
}

SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ TeraRoller_Descriptor::TeraRoller_Descriptor()
4242
"Roll Tera raids to find shiny " + STRING_POKEMON + ".",
4343
FeedbackType::REQUIRED,
4444
AllowCommandsWhenRunning::DISABLE_COMMANDS,
45-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
45+
{ControllerFeature::NintendoSwitch_ProController},
46+
FasterIfTickPrecise::MUCH_FASTER
4647
)
4748
{}
4849
struct TeraRoller_Descriptor::Stats : public StatsTracker{

SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ TeraSelfFarmer_Descriptor::TeraSelfFarmer_Descriptor()
4444
"Farm items and " + STRING_POKEMON + " from Tera raids. Can also hunt for shiny and high reward raids.",
4545
FeedbackType::REQUIRED,
4646
AllowCommandsWhenRunning::DISABLE_COMMANDS,
47-
{SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
47+
{ControllerFeature::NintendoSwitch_ProController},
48+
FasterIfTickPrecise::MUCH_FASTER
4849
)
4950
{}
5051
struct TeraSelfFarmer_Descriptor::Stats : public StatsTracker{

0 commit comments

Comments
 (0)