copy LA game entry to LZA to fix resets

lowered start game mash default

Author: kichithewolf

SerialPrograms/Source/PokemonLZA/PokemonLZA_Settings.cpp

@@ -28,10 +28,10 @@ GameSettings::GameSettings()
         LockMode::LOCK_WHILE_RUNNING,
         "40 s"
     )
-    , ENTER_GAME_MASH(
+    , ENTER_GAME_MASH0(
         "<b>Enter Game Mash:</b><br>Mash A for this long to enter the game.",
         LockMode::LOCK_WHILE_RUNNING,
-        "5000 ms"
+        "3000 ms"
     )
     , ENTER_GAME_WAIT(
         "<b>Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
@@ -46,7 +46,7 @@ GameSettings::GameSettings()
 
     PA_ADD_STATIC(m_start_game_timings);
     PA_ADD_OPTION(START_GAME_WAIT);
-    PA_ADD_OPTION(ENTER_GAME_MASH);
+    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,7 @@ class GameSettings : public BatchOption{
 
     SectionDividerOption m_start_game_timings;
     MillisecondsOption START_GAME_WAIT;
-    MillisecondsOption ENTER_GAME_MASH;
+    MillisecondsOption ENTER_GAME_MASH0;
     MillisecondsOption ENTER_GAME_WAIT;
 
     SectionDividerOption m_advanced_options;

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp

@@ -4,24 +4,95 @@
  *
  */
 
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
 #include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "PokemonLZA/PokemonLZA_Settings.h"
 #include "PokemonLZA_GameEntry.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonLZA{
 
+bool reset_game_to_gamemenu(
+    ConsoleHandle& console, ProControllerContext& context
+){
+    from_home_close_and_reopen_game(console, context, true);
+
+    // Now the game has opened:
+    return openedgame_to_gamemenu(console, context, GameSettings::instance().START_GAME_WAIT);
+}
+
+//  From the game menu screen (where "Press A" is displayed to enter the game),
+//  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
+){
+    stream.log("Mashing A to enter game...");
+    BlackScreenOverWatcher detector(COLOR_RED, {0.074, 0.044, 0.826, 0.278});
+    pbf_mash_button(context, BUTTON_A, mash_duration);
+    context.wait_for_all_requests();
+    stream.log("Waiting to enter game...");
+    int ret = wait_until(
+        stream, context,
+        std::chrono::milliseconds(enter_game_timeout),
+        {{detector}}
+    );
+    if (ret == 0){
+        stream.log("Entered game!");
+        return true;
+    }else{
+        stream.log("Timed out waiting to enter game.", COLOR_RED);
+        return false;
+    }
+}
+
+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
+){
+    bool ok = true;
+    ok &= reset_game_to_gamemenu(console, context);
+
+    if (backup_save){
+        console.log("Loading backup save!");
+        pbf_wait(context, 1000ms);
+        ssf_press_dpad(context, DPAD_UP, 0ms, 200ms);
+        ssf_press_button(context, BUTTON_B | BUTTON_X, 1000ms, 200ms);
+    }
+
+    ok &= gamemenu_to_ingame(
+        console, context,
+        enter_game_mash,
+        enter_game_timeout
+    );
+    if (!ok){
+        dump_image(console.logger(), env.program_info(), console.video(), "StartGame");
+    }
+    console.log("Entered game! Waiting out grace period.");
+    pbf_wait(context, post_wait_time);
+    context.wait_for_all_requests();
+    return ok;
+}
 bool reset_game_from_home(
     ProgramEnvironment& env,
     ConsoleHandle& console, ProControllerContext& context,
     bool backup_save,
     Milliseconds post_wait_time
 ){
-    return PokemonLA::reset_game_from_home(
+    return reset_game_from_home(
         env, console, context,
         backup_save,
-        GameSettings::instance().ENTER_GAME_MASH,
+        GameSettings::instance().ENTER_GAME_MASH0,
         GameSettings::instance().ENTER_GAME_WAIT,
         post_wait_time
     );

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_GameEntry.h

@@ -9,7 +9,6 @@
 
 #include "NintendoSwitch/Controllers/NintendoSwitch_ProController.h"
 #include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
-#include "PokemonLA/Programs/PokemonLA_GameEntry.h"
 
 namespace PokemonAutomation{
     class ProgramEnvironment;
@@ -22,11 +21,9 @@ using namespace std::chrono_literals;
 
 //  From Switch Home menu, reset game and wait until the game menu screen (where
 //  "Press A" is displayed to enter the game) is shown.
-inline bool reset_game_to_gamemenu(
+bool reset_game_to_gamemenu(
     ConsoleHandle& console, ProControllerContext& context
-){
-    return PokemonLA::reset_game_to_gamemenu(console, context);
-}
+);
 
 //  From Switch Home menu, start game and wait until the player character
 //  appears in game.
@@ -36,6 +33,14 @@ 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
+);
+bool reset_game_from_home(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    bool backup_save = false,
     Milliseconds post_wait_time = 1000ms
 );