Skip to content

Commit 139d10a

Browse files
committed
Fix date spam for FW 20.
1 parent 785b065 commit 139d10a

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
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 = 53;
29-
const int PROGRAM_VERSION_PATCH = 1;
29+
const int PROGRAM_VERSION_PATCH = 2;
3030

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

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_Navigation.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ void home_to_date_time(ProControllerContext& context, bool to_date_change, bool
1919
case ControllerPerformanceClass::SerialPABotBase_Wired_125Hz:{
2020
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 4);
2121
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 4);
22+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 4);
2223

2324
// Down twice in case we drop one.
2425
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 3);
2526
ssf_issue_scroll(context, SSF_SCROLL_DOWN, 4);
2627

27-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0);
28+
ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0);
2829

2930
// Two A presses in case we drop the 1st one.
3031
ssf_press_button(context, BUTTON_A, 3);
@@ -70,14 +71,15 @@ void home_to_date_time(ProControllerContext& context, bool to_date_change, bool
7071
Milliseconds tv = context->timing_variation();
7172
Milliseconds unit = 24ms + tv;
7273

74+
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
7375
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
7476
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
7577

7678
// Down twice in case we drop one.
7779
ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
7880
ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
7981

80-
ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0ms, 2*unit, unit);
82+
ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0ms, 2*unit, unit);
8183

8284
// Press A multiple times to make sure one goes through.
8385
pbf_press_button(context, BUTTON_A, 2*unit, unit);
@@ -134,12 +136,13 @@ void home_to_date_time(ProControllerContext& context, bool to_date_change, bool
134136

135137
ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
136138
ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
139+
ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
137140

138141
// Down twice in case we drop one.
139142
ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
140143
// ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
141144

142-
ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
145+
ssf_issue_scroll_ptv(context, SSF_SCROLL_LEFT);
143146

144147
// Press A multiple times to make sure one goes through.
145148
ssf_mash1_button(context, BUTTON_A, 200ms);

0 commit comments

Comments
 (0)