Skip to content

Commit 55a1d4c

Browse files
committed
Improve reliability of SV date spam.
1 parent 9e42ecb commit 55a1d4c

File tree

2 files changed

+23
-13
lines changed

2 files changed

+23
-13
lines changed

SerialPrograms/Source/CommonFramework/Globals.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace PokemonAutomation{
2626
const bool IS_BETA_VERSION = true;
2727
const int PROGRAM_VERSION_MAJOR = 0;
2828
const int PROGRAM_VERSION_MINOR = 52;
29-
const int PROGRAM_VERSION_PATCH = 6;
29+
const int PROGRAM_VERSION_PATCH = 8;
3030

3131
const std::string PROGRAM_VERSION_BASE =
3232
"v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Navigation.cpp

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,25 +59,35 @@ void day_skip_from_overworld(VideoStream& stream, ProControllerContext& context)
5959
Milliseconds tv = context->timing_variation();
6060
if (tv == 0ms){
6161
ssf_press_button(context, BUTTON_A, 20, 10);
62+
63+
// Left scroll in case we missed the date menu and landed in the
64+
// language change.
65+
ssf_issue_scroll(context, DPAD_LEFT, 0ms);
66+
67+
ssf_press_button(context, BUTTON_A, 24ms);
68+
ssf_issue_scroll(context, DPAD_RIGHT, 24ms);
69+
ssf_issue_scroll(context, DPAD_RIGHT, 24ms);
70+
ssf_press_button(context, BUTTON_A, 0ms);
71+
ssf_issue_scroll(context, DPAD_RIGHT, 24ms);
72+
ssf_issue_scroll(context, DPAD_RIGHT, 24ms);
73+
ssf_issue_scroll(context, DPAD_RIGHT, 24ms);
6274
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);
7075
ssf_press_button(context, BUTTON_A, 20, 10);
7176
}else{
7277
ssf_press_button_ptv(context, BUTTON_A, 160ms);
78+
79+
// Left scroll in case we missed the date menu and landed in the
80+
// language change.
81+
ssf_issue_scroll_ptv(context, DPAD_LEFT);
82+
7383
ssf_issue_scroll_ptv(context, DPAD_RIGHT);
7484
ssf_press_button_ptv(context, BUTTON_A);
75-
ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
76-
ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
85+
ssf_issue_scroll_ptv(context, DPAD_RIGHT);
86+
ssf_issue_scroll_ptv(context, DPAD_RIGHT);
7787
ssf_press_button_ptv(context, BUTTON_A);
78-
ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
79-
ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
80-
ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
88+
ssf_issue_scroll_ptv(context, DPAD_RIGHT);
89+
ssf_issue_scroll_ptv(context, DPAD_RIGHT);
90+
ssf_issue_scroll_ptv(context, DPAD_RIGHT);
8191
ssf_press_button_ptv(context, BUTTON_A, 160ms);
8292
}
8393

0 commit comments

Comments
 (0)