Skip to content

Commit 1338422

Browse files
MysticialMysticial
committed
Remove another legacy ssf overload with implied hold duration.
1 parent 2556ae1 commit 1338422

File tree

8 files changed

+63
-70
lines changed

8 files changed

+63
-70
lines changed

‎SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,6 @@ void ssf_mash_AZs (ProControllerContext& context, Milliseconds duration);
9292
#define SSF_SCROLL_RIGHT DPAD_RIGHT
9393
#define SSF_SCROLL_DOWN DPAD_DOWN
9494
#define SSF_SCROLL_LEFT DPAD_LEFT
95-
void ssf_issue_scroll(
96-
ProControllerContext& context,
97-
DpadPosition direction,
98-
uint16_t delay, uint16_t hold = 5, uint8_t cool = 3
99-
);
10095
void ssf_issue_scroll(
10196
ProControllerContext& context,
10297
DpadPosition direction,

‎SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ void home_to_date_time_Switch1_wired_blind(
2525
){
2626
logger.log("home_to_date_time_Switch1_wired_blind()");
2727

28-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 4);
29-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 4);
30-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 4);
28+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 32ms);
29+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 32ms);
30+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 32ms);
3131

3232
// Down twice in case we drop one.
33-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 3);
34-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 4);
33+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
34+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 32ms);
3535

36-
ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0);
36+
ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0ms, 48ms, 24ms);
3737

3838
// Two A presses in case we drop the 1st one.
3939
ssf_press_button(context, BUTTON_A, 24ms, 40ms, 24ms);
@@ -49,7 +49,7 @@ void home_to_date_time_Switch1_wired_blind(
4949

5050
// Scroll left and press A to exit the sleep menu if we happened to
5151
// land there.
52-
ssf_issue_scroll(context, SSF_SCROLL_LEFT, 3);
52+
ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms);
5353
ssf_press_button(context, BUTTON_A, 24ms, 48ms, 24ms);
5454

5555
{
@@ -59,12 +59,12 @@ void home_to_date_time_Switch1_wired_blind(
5959
}while (--iterations);
6060
}
6161

62-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 3);
63-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 3);
64-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 10);
62+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
63+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
64+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 80ms, 40ms, 24ms);
6565
ssf_press_dpad(context, DPAD_DOWN, 45, 40);
66-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 3);
67-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 3);
66+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
67+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
6868

6969
if (!to_date_change){
7070
// Triple up this A press to make sure it gets through.
@@ -216,16 +216,16 @@ void home_to_date_time_Switch1_wired_feedback(
216216

217217
size_t max_attempts = 5;
218218
for (size_t i = 0; i < max_attempts; i++){
219-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 4);
220-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 4);
221-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 4);
219+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 32ms);
220+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 32ms);
221+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 32ms);
222222

223223
// Down twice in case we drop one.
224-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 3);
225-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 4);
224+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
225+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 32ms);
226226

227227
// if (i > 0){ // intentionally create a failure, for testing
228-
ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0);
228+
ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0ms, 40ms, 24ms);
229229
// }
230230

231231

@@ -274,13 +274,13 @@ void home_to_date_time_Switch1_wired_feedback(
274274
}while (--iterations);
275275
}
276276

277-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 3);
278-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 3);
279-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 10);
277+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
278+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
279+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 80ms, 40ms, 24ms);
280280
ssf_press_dpad(context, DPAD_DOWN, 45, 40);
281-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 3);
281+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
282282
// if (i > 1){ // intentionally create a failure, for testing
283-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 3);
283+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
284284
// }
285285

286286
// only one ButtonA press since the program can self-recover if the button is dropped.

‎SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,29 @@ namespace NintendoSwitch{
1616

1717
void neutral_date_skip_switch1_wired(ProControllerContext& context){
1818
ssf_press_button(context, BUTTON_A, 20, 10);
19-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
20-
ssf_issue_scroll(context, SSF_SCROLL_UP, 0);
19+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms);
20+
ssf_issue_scroll(context, SSF_SCROLL_UP, 0ms, 40ms, 24ms);
2121
ssf_press_button(context, BUTTON_A, 2);
22-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
23-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
22+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
23+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
2424
// ssf_press_button(context, BUTTON_A, 2);
25-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
26-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0);
25+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
26+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0ms, 48ms, 24ms);
2727
ssf_press_button(context, BUTTON_A, 20, 10);
2828
ssf_press_button(context, BUTTON_A, 20, 10);
2929
for (uint8_t c = 0; c < 6; c++){
30-
ssf_issue_scroll(context, SSF_SCROLL_LEFT, 3);
30+
ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
3131
}
32-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
33-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0);
32+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
33+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0ms, 48ms, 24ms);
3434
}
3535
void neutral_date_skip_switch1_wireless(ProControllerContext& context){
3636
Milliseconds tv = context->timing_variation();
3737
Milliseconds unit = 24ms + tv;
3838

3939
ssf_press_button(context, BUTTON_A, 20, 10);
4040
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
41-
ssf_issue_scroll(context, SSF_SCROLL_UP, 0);
41+
ssf_issue_scroll(context, SSF_SCROLL_UP, 0ms, 2*unit, unit);
4242
ssf_press_button(context, BUTTON_A, unit);
4343
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
4444
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
@@ -51,7 +51,7 @@ void neutral_date_skip_switch1_wireless(ProControllerContext& context){
5151
ssf_issue_scroll(context, SSF_SCROLL_LEFT, unit);
5252
}
5353
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
54-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0);
54+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0ms, 2*unit, unit);
5555
}
5656
void neutral_date_skip_switch1_sbb(ProControllerContext& context){
5757
ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);

‎SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.cpp‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,37 @@ namespace NintendoSwitch{
1515

1616

1717
void roll_date_backward_N_Switch1_wired(ProControllerContext& context, uint8_t skips, bool fast){
18-
uint8_t scroll_delay = fast ? 3 : 4;
19-
uint8_t up_delay = 3;
18+
Milliseconds delay = 24ms;
2019
ssf_press_button(context, BUTTON_A, 160ms, 80ms);
2120
for (uint8_t c = 0; c < skips - 1; c++){
22-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, up_delay);
21+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, delay);
2322
}
2423
#if 0
2524
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0);
26-
// ssf_press_button(context, BUTTON_A, up_delay);
25+
// ssf_press_button(context, BUTTON_A, delay);
2726
#else
28-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, up_delay);
29-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
27+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, delay);
28+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
3029
#endif
31-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
30+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
3231
for (uint8_t c = 0; c < skips - 1; c++){
33-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, up_delay);
32+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, delay);
3433
}
3534
#if 0
3635
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0);
3736
ssf_press_button(context, BUTTON_A, up_delay);
3837
#else
39-
ssf_issue_scroll(context, SSF_SCROLL_DOWN, up_delay);
40-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
38+
ssf_issue_scroll(context, SSF_SCROLL_DOWN, delay);
39+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
4140
#endif
42-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
43-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
41+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
42+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
4443

4544
#if 0
4645
// ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0);
4746
#else
48-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
49-
ssf_issue_scroll(context, SSF_SCROLL_LEFT, scroll_delay);
47+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
48+
ssf_issue_scroll(context, SSF_SCROLL_LEFT, delay);
5049
ssf_press_button(context, BUTTON_A);
5150
#endif
5251

‎SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.cpp‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,19 @@ namespace NintendoSwitch{
1414

1515

1616
void roll_date_forward_1_Switch1_wired(ProControllerContext& context, bool fast){
17-
uint8_t scroll_delay = fast ? 3 : 4;
18-
uint8_t up_delay = fast ? 2 : 3;
17+
Milliseconds delay = 24ms;
1918

2019
ssf_press_button(context, BUTTON_A, 20, 10);
21-
ssf_issue_scroll(context, SSF_SCROLL_UP, 0);
22-
ssf_press_button(context, BUTTON_A, up_delay);
23-
// ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
24-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
25-
ssf_issue_scroll(context, SSF_SCROLL_UP, up_delay);
26-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
20+
ssf_issue_scroll(context, SSF_SCROLL_UP, 0ms, 2*delay, delay);
21+
ssf_press_button(context, BUTTON_A, delay);
22+
// ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
23+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
24+
ssf_issue_scroll(context, SSF_SCROLL_UP, delay);
25+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
2726
ssf_press_button(context, BUTTON_A, 0);
28-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
29-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
30-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0);
27+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
28+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
29+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0ms, 2*delay, delay);
3130
ssf_press_button(context, BUTTON_A, 20, 10);
3231
}
3332
void roll_date_forward_1_Switch1_wireless(ProControllerContext& context){

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ 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);
4747
for (size_t c = 0; c < 30; c++){
48-
ssf_issue_scroll(context, DPAD_DOWN, 3);
48+
ssf_issue_scroll(context, DPAD_DOWN, 24ms);
4949
}
5050
pbf_press_button(context, BUTTON_ZL, 160ms, GameSettings::instance().BOX_PICKUP_DROP_DELAY0);
5151
}

‎SerialPrograms/Source/PokemonSV/Programs/PokemonSV_MenuNavigation.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void day_skip_from_overworld(ConsoleHandle& console, ProControllerContext& conte
5959

6060
// Left scroll in case we missed the date menu and landed in the
6161
// language change.
62-
ssf_issue_scroll(context, DPAD_LEFT, 0ms);
62+
ssf_issue_scroll(context, DPAD_LEFT, 0ms, 48ms, 24ms);
6363

6464
ssf_press_button(context, BUTTON_A, 24ms);
6565
ssf_issue_scroll(context, DPAD_RIGHT, 24ms);
@@ -68,7 +68,7 @@ void day_skip_from_overworld(ConsoleHandle& console, ProControllerContext& conte
6868
ssf_issue_scroll(context, DPAD_RIGHT, 24ms);
6969
ssf_issue_scroll(context, DPAD_RIGHT, 24ms);
7070
ssf_issue_scroll(context, DPAD_RIGHT, 24ms);
71-
ssf_issue_scroll(context, DPAD_RIGHT, 0);
71+
ssf_issue_scroll(context, DPAD_RIGHT, 0ms, 48ms, 24ms);
7272
ssf_press_button(context, BUTTON_A, 20, 10);
7373
}else{
7474
ssf_press_button_ptv(context, BUTTON_A, 160ms);

‎SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ void connect_to_internet(
3232

3333
// Move the cursor as far away from Link Trade and Surprise Trade as possible.
3434
// This is added safety in case connect to internet takes too long.
35-
ssf_issue_scroll(context, SSF_SCROLL_UP, 5);
36-
ssf_issue_scroll(context, SSF_SCROLL_UP, 5);
37-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 5);
35+
ssf_issue_scroll(context, SSF_SCROLL_UP, 40ms, 40ms, 40ms);
36+
ssf_issue_scroll(context, SSF_SCROLL_UP, 40ms, 40ms, 40ms);
37+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 40ms, 40ms, 40ms);
3838

3939
// Connect to internet.
4040
ssf_press_button(context, BUTTON_PLUS, 3);

0 commit comments

Comments
 (0)