Don't over-mash into the game.

Author: Mysticial

SerialPrograms/Source/PokemonLZA/PokemonLZA_Settings.cpp

@@ -28,11 +28,6 @@ GameSettings::GameSettings()
         LockMode::LOCK_WHILE_RUNNING,
         "40 s"
     )
-    , ENTER_GAME_MASH0(
-        "<b>Enter Game Mash:</b><br>Mash A for this long to enter the game.",
-        LockMode::LOCK_WHILE_RUNNING,
-        "3000 ms"
-    )
     , ENTER_GAME_WAIT(
         "<b>Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
         LockMode::LOCK_WHILE_RUNNING,
@@ -46,7 +41,6 @@ GameSettings::GameSettings()
 
     PA_ADD_STATIC(m_start_game_timings);
     PA_ADD_OPTION(START_GAME_WAIT);
-    PA_ADD_OPTION(ENTER_GAME_MASH0);
     PA_ADD_OPTION(ENTER_GAME_WAIT);
 
     PA_ADD_STATIC(m_advanced_options);

SerialPrograms/Source/PokemonLZA/PokemonLZA_Settings.h

@@ -26,7 +26,6 @@ class GameSettings : public BatchOption{
 
     SectionDividerOption m_start_game_timings;
     MillisecondsOption START_GAME_WAIT;
-    MillisecondsOption ENTER_GAME_MASH0;
     MillisecondsOption ENTER_GAME_WAIT;
 
     SectionDividerOption m_advanced_options;

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp

@@ -32,11 +32,11 @@ bool reset_game_to_gamemenu(
 //  mash A to enter the game and wait until the black screen is gone.
 bool gamemenu_to_ingame(
     VideoStream& stream, ProControllerContext& context,
-    Milliseconds mash_duration, Milliseconds enter_game_timeout
+    Milliseconds enter_game_timeout
 ){
     stream.log("Mashing A to enter game...");
     BlackScreenOverWatcher detector(COLOR_RED, {0.1, 0.04, 0.8, 0.3});
-    pbf_mash_button(context, BUTTON_A, mash_duration);
+    pbf_mash_button(context, BUTTON_A, 500ms);
     context.wait_for_all_requests();
     stream.log("Waiting to enter game...");
     int ret = wait_until(
@@ -57,7 +57,6 @@ bool reset_game_from_home(
     ProgramEnvironment& env,
     ConsoleHandle& console, ProControllerContext& context,
     bool backup_save,
-    Milliseconds enter_game_mash,
     Milliseconds enter_game_timeout,
     Milliseconds post_wait_time
 ){
@@ -75,7 +74,6 @@ bool reset_game_from_home(
 
     ok &= gamemenu_to_ingame(
         console, context,
-        enter_game_mash,
         enter_game_timeout
     );
     if (!ok){
@@ -95,7 +93,6 @@ bool reset_game_from_home(
     return reset_game_from_home(
         env, console, context,
         backup_save,
-        GameSettings::instance().ENTER_GAME_MASH0,
         GameSettings::instance().ENTER_GAME_WAIT,
         post_wait_time
     );