Skip to content

Commit 57ee5ab

Browse files
committed
Fixes. Enable full item printer. Remove mappings.
1 parent 60a1c0a commit 57ee5ab

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,6 @@ std::vector<std::unique_ptr<EditableTableRow>> JoyconKeyboardMappingTable::make_
361361
ret.emplace_back(make_mapping("-", Qt::Key::Key_Minus, JoyconDeltas{.buttons = BUTTON_MINUS}));
362362
ret.emplace_back(make_mapping("-", Qt::Key::Key_Underscore,JoyconDeltas{.buttons = BUTTON_MINUS}));
363363

364-
ret.emplace_back(make_mapping("Capture", Qt::Key::Key_Home, JoyconDeltas{.buttons = BUTTON_CAPTURE}));
365-
ret.emplace_back(make_mapping("Capture", Qt::Key::Key_Escape, JoyconDeltas{.buttons = BUTTON_CAPTURE}));
366364
ret.emplace_back(make_mapping("Capture", Qt::Key::Key_Insert, JoyconDeltas{.buttons = BUTTON_CAPTURE}));
367365

368366
ret.emplace_back(make_mapping("SL", Qt::Key::Key_F1, JoyconDeltas{.buttons = BUTTON_LEFT_SL}));
@@ -409,7 +407,6 @@ std::vector<std::unique_ptr<EditableTableRow>> JoyconKeyboardMappingTable::make_
409407

410408
ret.emplace_back(make_mapping("Home", Qt::Key::Key_Home, JoyconDeltas{.buttons = BUTTON_HOME}));
411409
ret.emplace_back(make_mapping("Home", Qt::Key::Key_Escape, JoyconDeltas{.buttons = BUTTON_HOME}));
412-
ret.emplace_back(make_mapping("Home", Qt::Key::Key_Insert, JoyconDeltas{.buttons = BUTTON_HOME}));
413410

414411
ret.emplace_back(make_mapping("SL", Qt::Key::Key_F1, JoyconDeltas{.buttons = BUTTON_RIGHT_SL}));
415412
ret.emplace_back(make_mapping("SR", Qt::Key::Key_F3, JoyconDeltas{.buttons = BUTTON_RIGHT_SR}));

SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,8 @@ ItemPrinterRNG::ItemPrinterRNG()
200200
{
201201
PA_ADD_OPTION(LANGUAGE);
202202

203-
if (PreloadSettings::instance().DEVELOPER_MODE){
204-
PA_ADD_OPTION(MODE);
205-
PA_ADD_OPTION(DESIRED_ITEM_TABLE);
206-
}
203+
PA_ADD_OPTION(MODE);
204+
PA_ADD_OPTION(DESIRED_ITEM_TABLE);
207205
PA_ADD_OPTION(NUM_ITEM_PRINTER_ROUNDS);
208206
PA_ADD_OPTION(DATE_SEED_TABLE);
209207
PA_ADD_OPTION(OVERLAPPING_BONUS_WARNING);

SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ StateMachineAction throw_balls(
348348
}
349349

350350
BattleBallReader reader(stream, language);
351-
pbf_press_button(context, BUTTON_A, 1000ms, 1000ms);
351+
pbf_press_button(context, BUTTON_A, 50, 75);
352352
context.wait_for_all_requests();
353353

354354
int16_t balls = move_to_ball(reader, stream, context, ball);

0 commit comments

Comments
 (0)