From cc88bb201d5e2f62c3354886e8ece7de81e8406f Mon Sep 17 00:00:00 2001 From: Alexander Yee Date: Sun, 8 Nov 2026 13:25:50 -0800 Subject: [PATCH] Reduce enter game mash timing. --- .../PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp | 2 +- .../Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.cpp | 6 +++--- .../Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.h | 2 +- .../PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp index 2492ac1e1c..525dd717ca 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp @@ -162,7 +162,7 @@ void start_game_from_home( enter_game( context, backup_save, - GameSettings::instance().ENTER_GAME_MASH0, + GameSettings::instance().ENTER_GAME_MASH1, GameSettings::instance().ENTER_GAME_WAIT0 ); } diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.cpp index 530923816e..7b701b1271 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.cpp @@ -92,10 +92,10 @@ GameSettings::GameSettings() LockMode::LOCK_WHILE_RUNNING, "20000 ms" ) - , ENTER_GAME_MASH0( + , ENTER_GAME_MASH1( "Enter Game Mash:
Mash A for this long to enter the game.", LockMode::LOCK_WHILE_RUNNING, - "3000 ms" + "1000 ms" ) , ENTER_GAME_WAIT0( "Enter Game Wait:
Wait this long for the game to enter the overworld.", @@ -241,7 +241,7 @@ GameSettings::GameSettings() PA_ADD_STATIC(m_start_game_timings); PA_ADD_OPTION(START_GAME_WAIT0); - PA_ADD_OPTION(ENTER_GAME_MASH0); + PA_ADD_OPTION(ENTER_GAME_MASH1); PA_ADD_OPTION(ENTER_GAME_WAIT0); PA_ADD_STATIC(m_den_timings); diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.h index 39515ea1f5..78501fc066 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.h +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.h @@ -47,7 +47,7 @@ class GameSettings : public BatchOption{ SectionDividerOption m_start_game_timings; MillisecondsOption START_GAME_WAIT0; - MillisecondsOption ENTER_GAME_MASH0; + MillisecondsOption ENTER_GAME_MASH1; MillisecondsOption ENTER_GAME_WAIT0; SectionDividerOption m_den_timings; diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp index 6d255e92e5..26cb7707fd 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp @@ -60,7 +60,7 @@ void enter_loading_game( openedgame_to_gamemenu(stream, context, GameSettings::instance().START_GAME_WAIT0); stream.log("enter_loading_game(): Game Loaded. Entering game...", COLOR_PURPLE); - enter_game(context, backup_save, GameSettings::instance().ENTER_GAME_MASH0, 0ms); + enter_game(context, backup_save, GameSettings::instance().ENTER_GAME_MASH1, 0ms); context.wait_for_all_requests(); // Wait to enter game.