Skip to content

Commit 59d73f2

Browse files
MysticialMysticial
committed
Fix FCE on Switch 2.
1 parent 5763090 commit 59d73f2

File tree

6 files changed

+38
-38
lines changed

6 files changed

+38
-38
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 = 54;
29-
const int PROGRAM_VERSION_PATCH = 27;
29+
const int PROGRAM_VERSION_PATCH = 28;
3030

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

‎SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ ConsoleSettings::ConsoleSettings()
116116
LockMode::UNLOCK_WHILE_RUNNING,
117117
false
118118
)
119-
, SWITCH1_DIGIT_ENTRY(false)
120-
, SWITCH1_KEYBOARD_ENTRY(false)
121-
, SWITCH2_DIGIT_ENTRY(true)
122-
, SWITCH2_KEYBOARD_ENTRY(true)
119+
, SWITCH1_DIGIT_ENTRY0(false)
120+
, SWITCH1_KEYBOARD_ENTRY0(false)
121+
, SWITCH2_DIGIT_ENTRY0(true)
122+
, SWITCH2_KEYBOARD_ENTRY0(true)
123123
, KEYBOARD_SECTION("<font size=4><b>Keyboard to Controller Mappings:</b></font>")
124124
{
125125
PA_ADD_OPTION(CONTROLLER_SETTINGS);
@@ -133,10 +133,10 @@ ConsoleSettings::ConsoleSettings()
133133
PA_ADD_OPTION(ENABLE_SBB3_LOGGING);
134134
PA_ADD_OPTION(TIMING_OPTIONS);
135135
if (PreloadSettings::instance().DEVELOPER_MODE){
136-
PA_ADD_OPTION(SWITCH1_DIGIT_ENTRY);
137-
PA_ADD_OPTION(SWITCH1_KEYBOARD_ENTRY);
138-
PA_ADD_OPTION(SWITCH2_DIGIT_ENTRY);
139-
PA_ADD_OPTION(SWITCH2_KEYBOARD_ENTRY);
136+
PA_ADD_OPTION(SWITCH1_DIGIT_ENTRY0);
137+
PA_ADD_OPTION(SWITCH1_KEYBOARD_ENTRY0);
138+
PA_ADD_OPTION(SWITCH2_DIGIT_ENTRY0);
139+
PA_ADD_OPTION(SWITCH2_KEYBOARD_ENTRY0);
140140
}
141141
PA_ADD_STATIC(KEYBOARD_SECTION);
142142
PA_ADD_OPTION(KEYBOARD_MAPPINGS);

‎SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ class ConsoleSettings : public BatchOption{
5454

5555
TimingOptions TIMING_OPTIONS;
5656

57-
DigitEntryTimingsOption SWITCH1_DIGIT_ENTRY;
58-
KeyboardEntryTimingsOption SWITCH1_KEYBOARD_ENTRY;
59-
DigitEntryTimingsOption SWITCH2_DIGIT_ENTRY;
60-
KeyboardEntryTimingsOption SWITCH2_KEYBOARD_ENTRY;
57+
DigitEntryTimingsOption SWITCH1_DIGIT_ENTRY0;
58+
KeyboardEntryTimingsOption SWITCH1_KEYBOARD_ENTRY0;
59+
DigitEntryTimingsOption SWITCH2_DIGIT_ENTRY0;
60+
KeyboardEntryTimingsOption SWITCH2_KEYBOARD_ENTRY0;
6161

6262
SectionDividerOption KEYBOARD_SECTION;
6363
KeyboardMappingOption KEYBOARD_MAPPINGS;

‎SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,20 @@ DigitEntryTimingsOption::DigitEntryTimingsOption(bool switch2)
6565
"<font color=\"red\">Controller timing variation will be added to this number.</font>",
6666
LockMode::UNLOCK_WHILE_RUNNING,
6767
switch2
68-
? "48ms"
69-
: PreloadSettings::instance().DEVELOPER_MODE ? "24 ms" : "40ms"
68+
? PreloadSettings::instance().DEVELOPER_MODE ? "48 ms" : "64 ms"
69+
: PreloadSettings::instance().DEVELOPER_MODE ? "24 ms" : "40 ms"
7070
)
7171
, HOLD(
7272
"<b>Hold:</b><br>Duration to hold each button press down.<br>"
7373
"<font color=\"red\">Controller timing variation will be added to this number.</font>",
7474
LockMode::UNLOCK_WHILE_RUNNING,
75-
PreloadSettings::instance().DEVELOPER_MODE ? "48 ms" : "80ms"
75+
"48 ms"
7676
)
7777
, COOLDOWN(
7878
"<b>Hold:</b><br>Do not reuse a button until this long after it is reused.<br>"
7979
"<font color=\"red\">Controller timing variation will be added to this number.</font>",
8080
LockMode::UNLOCK_WHILE_RUNNING,
81-
PreloadSettings::instance().DEVELOPER_MODE ? "24 ms" : "40ms"
81+
"24 ms"
8282
)
8383
{
8484
PA_ADD_OPTION(REORDERING);
@@ -100,27 +100,27 @@ KeyboardEntryTimingsOption::KeyboardEntryTimingsOption(bool switch2)
100100
, REORDERING(
101101
"<b>Character Reordering:</b><br>Allow characters to be entered out of order.",
102102
LockMode::UNLOCK_WHILE_RUNNING,
103-
PreloadSettings::instance().DEVELOPER_MODE
103+
true
104104
)
105105
, TIME_UNIT(
106106
"<b>Time Unit:</b><br>Timesteps should increment in multiples of this unit.<br>"
107107
"<font color=\"red\">Controller timing variation will be added to this number.</font>",
108108
LockMode::UNLOCK_WHILE_RUNNING,
109109
switch2
110-
? "48ms"
111-
: PreloadSettings::instance().DEVELOPER_MODE ? "24 ms" : "40ms"
110+
? PreloadSettings::instance().DEVELOPER_MODE ? "48 ms" : "64 ms"
111+
: PreloadSettings::instance().DEVELOPER_MODE ? "24 ms" : "40 ms"
112112
)
113113
, HOLD(
114114
"<b>Hold:</b><br>Duration to hold each button press down.<br>"
115115
"<font color=\"red\">Controller timing variation will be added to this number.</font>",
116116
LockMode::UNLOCK_WHILE_RUNNING,
117-
PreloadSettings::instance().DEVELOPER_MODE ? "48 ms" : "80ms"
117+
"48 ms"
118118
)
119119
, COOLDOWN(
120120
"<b>Hold:</b><br>Do not reuse a button until this long after it is reused.<br>"
121121
"<font color=\"red\">Controller timing variation will be added to this number.</font>",
122122
LockMode::UNLOCK_WHILE_RUNNING,
123-
PreloadSettings::instance().DEVELOPER_MODE ? "24 ms" : "40ms"
123+
"24 ms"
124124
)
125125
{
126126
PA_ADD_OPTION(REORDERING);

‎SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -305,15 +305,15 @@ void keyboard_enter_code(
305305
Milliseconds cool;
306306
bool reordering;
307307
if (switch2){
308-
unit = ConsoleSettings::instance().SWITCH2_KEYBOARD_ENTRY.TIME_UNIT;
309-
hold = ConsoleSettings::instance().SWITCH2_KEYBOARD_ENTRY.HOLD;
310-
cool = ConsoleSettings::instance().SWITCH2_KEYBOARD_ENTRY.COOLDOWN;
311-
reordering = ConsoleSettings::instance().SWITCH2_KEYBOARD_ENTRY.REORDERING;
308+
unit = ConsoleSettings::instance().SWITCH2_KEYBOARD_ENTRY0.TIME_UNIT;
309+
hold = ConsoleSettings::instance().SWITCH2_KEYBOARD_ENTRY0.HOLD;
310+
cool = ConsoleSettings::instance().SWITCH2_KEYBOARD_ENTRY0.COOLDOWN;
311+
reordering = ConsoleSettings::instance().SWITCH2_KEYBOARD_ENTRY0.REORDERING;
312312
}else{
313-
unit = ConsoleSettings::instance().SWITCH1_KEYBOARD_ENTRY.TIME_UNIT;
314-
hold = ConsoleSettings::instance().SWITCH1_KEYBOARD_ENTRY.HOLD;
315-
cool = ConsoleSettings::instance().SWITCH1_KEYBOARD_ENTRY.COOLDOWN;
316-
reordering = ConsoleSettings::instance().SWITCH1_KEYBOARD_ENTRY.REORDERING;
313+
unit = ConsoleSettings::instance().SWITCH1_KEYBOARD_ENTRY0.TIME_UNIT;
314+
hold = ConsoleSettings::instance().SWITCH1_KEYBOARD_ENTRY0.HOLD;
315+
cool = ConsoleSettings::instance().SWITCH1_KEYBOARD_ENTRY0.COOLDOWN;
316+
reordering = ConsoleSettings::instance().SWITCH1_KEYBOARD_ENTRY0.REORDERING;
317317
}
318318

319319
Milliseconds tv = context->timing_variation();

‎SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,15 @@ void numberpad_enter_code(
213213
Milliseconds cool;
214214
bool reordering;
215215
if (switch2){
216-
unit = ConsoleSettings::instance().SWITCH2_DIGIT_ENTRY.TIME_UNIT;
217-
hold = ConsoleSettings::instance().SWITCH2_DIGIT_ENTRY.HOLD;
218-
cool = ConsoleSettings::instance().SWITCH2_DIGIT_ENTRY.COOLDOWN;
219-
reordering = ConsoleSettings::instance().SWITCH2_DIGIT_ENTRY.REORDERING;
216+
unit = ConsoleSettings::instance().SWITCH2_DIGIT_ENTRY0.TIME_UNIT;
217+
hold = ConsoleSettings::instance().SWITCH2_DIGIT_ENTRY0.HOLD;
218+
cool = ConsoleSettings::instance().SWITCH2_DIGIT_ENTRY0.COOLDOWN;
219+
reordering = ConsoleSettings::instance().SWITCH2_DIGIT_ENTRY0.REORDERING;
220220
}else{
221-
unit = ConsoleSettings::instance().SWITCH1_DIGIT_ENTRY.TIME_UNIT;
222-
hold = ConsoleSettings::instance().SWITCH1_DIGIT_ENTRY.HOLD;
223-
cool = ConsoleSettings::instance().SWITCH1_DIGIT_ENTRY.COOLDOWN;
224-
reordering = ConsoleSettings::instance().SWITCH1_DIGIT_ENTRY.REORDERING;
221+
unit = ConsoleSettings::instance().SWITCH1_DIGIT_ENTRY0.TIME_UNIT;
222+
hold = ConsoleSettings::instance().SWITCH1_DIGIT_ENTRY0.HOLD;
223+
cool = ConsoleSettings::instance().SWITCH1_DIGIT_ENTRY0.COOLDOWN;
224+
reordering = ConsoleSettings::instance().SWITCH1_DIGIT_ENTRY0.REORDERING;
225225
}
226226

227227
Milliseconds tv = context->timing_variation();

0 commit comments

Comments
 (0)