working reset sequence, adjust alolantrade timings

Author: kichithewolf

SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.cpp

@@ -80,10 +80,10 @@ void close_game(VideoStream& stream, JoyconContext& context){
     // regardless of whether the game is initially open or closed.
 
                                                         // if game initially open.  |  if game initially closed
-    pbf_mash_button(context, BUTTON_X, 800ms);            // - Close game.            |  - does nothing
+    pbf_mash_button(context, BUTTON_X, 800ms);          // - Close game.            |  - does nothing
     pbf_move_joystick(context, 128, 255, 100ms, 10ms);  // - Does nothing.          |  - moves selector away from the closed game to avoid opening it.
     pbf_move_joystick(context, 128, 255, 100ms, 10ms);  // - Does nothing.          |  - Press Down a second time in case we drop one.
-    pbf_mash_button(context, BUTTON_A, 400ms);             // - Confirm close game.    |  - opens an app on the home screen (e.g. Online)
+    pbf_mash_button(context, BUTTON_A, 400ms);          // - Confirm close game.    |  - opens an app on the home screen (e.g. Online)
                                                         // - Does nothing.          |  - goes back to home screen.
     pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
     context.wait_for_all_requests();

SerialPrograms/Source/PokemonLGPE/PokemonLGPE_Settings.cpp

@@ -27,11 +27,6 @@ GameSettings::GameSettings()
         LockMode::LOCK_WHILE_RUNNING,
         "1000 ms"
     )
-    , LOAD_REGION_TIMEOUT0(
-        "<b>Load Region Timeout:</b><br>Wait at most this long to enter a region before giving up.",
-        LockMode::LOCK_WHILE_RUNNING,
-        "30 s"
-    )
     , m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
     , START_GAME_MASH0(
         "<b>1. Start Game Mash:</b><br>Mash A for this long to start the game.",
@@ -41,15 +36,15 @@ GameSettings::GameSettings()
     , START_GAME_WAIT1(
         "<b>2. Start Game Wait:</b><br>Wait this long for the game to load.",
         LockMode::LOCK_WHILE_RUNNING,
-        "40 s"
+        "20 s"
     )
     , ENTER_GAME_MASH0(
         "<b>3. Enter Game Mash:</b><br>Mash A for this long to enter the game.",
         LockMode::LOCK_WHILE_RUNNING,
-        "5000 ms"
+        "5 s"
     )
     , ENTER_GAME_WAIT0(
-        "<b>4. Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
+        "<b>4. Enter Game Wait:</b><br>Wait this long for the opening animations to finish.",
         LockMode::LOCK_WHILE_RUNNING,
         "15 s"
     )
@@ -58,7 +53,6 @@ GameSettings::GameSettings()
 
     PA_ADD_STATIC(m_menu_navigation);
     PA_ADD_OPTION(GAME_TO_HOME_DELAY0);
-    PA_ADD_OPTION(LOAD_REGION_TIMEOUT0);
 
     PA_ADD_STATIC(m_start_game_timings);
     PA_ADD_OPTION(START_GAME_MASH0);

SerialPrograms/Source/PokemonLGPE/PokemonLGPE_Settings.h

@@ -26,7 +26,6 @@ class GameSettings : public BatchOption{
 
     SectionDividerOption m_menu_navigation;
     MillisecondsOption GAME_TO_HOME_DELAY0;
-    MillisecondsOption LOAD_REGION_TIMEOUT0;
 
     SectionDividerOption m_start_game_timings;
     MillisecondsOption START_GAME_MASH0;

SerialPrograms/Source/PokemonLGPE/Programs/PokemonLGPE_GameEntry.cpp

@@ -13,6 +13,7 @@
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h"
 #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_DetectHome.h"
 #include "PokemonLGPE/PokemonLGPE_Settings.h"
 #include "PokemonLGPE_GameEntry.h"
 
@@ -34,6 +35,13 @@ bool reset_game_to_gamemenu(
         ConsoleSettings::instance().START_GAME_REQUIRES_INTERNET ||
         tolerate_update_menu
     ){
+        //Handle Right Joycon attempting to update
+        //If no update, this will open the All Software menu
+        //The active game will be closed from there
+        //pbf_move_joystick(context, 0, 128, 100ms, 10ms);
+        //pbf_move_joystick(context, 0, 128, 100ms, 10ms);
+        //pbf_press_button(context, BUTTON_A, 100ms, 10ms);
+
         close_game(stream, context);
         start_game_from_home(
             stream,
@@ -55,17 +63,47 @@ bool gamemenu_to_ingame(
     VideoStream& stream, JoyconContext& context,
     Milliseconds mash_duration, Milliseconds enter_game_timeout
 ){
-    stream.log("Mashing A to enter game...");
-    BlackScreenOverWatcher detector(COLOR_RED, {0.2, 0.2, 0.6, 0.6});
+    //Includes choosing the controller.
+    //Controllers are disconnected? on selection screen so make sure to mash.
+    stream.log("Mashing A to enter game and select controller...");
     pbf_mash_button(context, BUTTON_A, mash_duration);
     context.wait_for_all_requests();
+
+    //White screen, Pikachu/Eevee running across the screen.
+    //Mash A at then end.
+    BlackScreenOverWatcher detector(COLOR_RED, {0.2, 0.2, 0.6, 0.6});
     stream.log("Waiting to enter game...");
-    int ret = wait_until(
+    int ret = run_until<JoyconContext>(
         stream, context,
-        std::chrono::milliseconds(enter_game_timeout * (1000 / TICKS_PER_SECOND)),
-        {{detector}}
+        [&enter_game_timeout](JoyconContext& context){
+            pbf_wait(context, enter_game_timeout);
+            pbf_press_button(context, BUTTON_A, 400ms, 10ms);
+            pbf_wait(context, 5000ms);
+        },
+        {detector}
     );
+    context.wait_for_all_requests();
     if (ret == 0){
+        stream.log("At continue screen.");
+    }else{
+        stream.log("Timed out waiting to enter game and select continue.", COLOR_RED);
+        return false;
+    }
+    pbf_wait(context, 1000ms);
+    context.wait_for_all_requests();
+
+    //Continue your adventure.
+    BlackScreenOverWatcher detector2(COLOR_YELLOW, {0.2, 0.2, 0.6, 0.6});
+    int ret2 = run_until<JoyconContext>(
+        stream, context,
+        [](JoyconContext& context){
+            pbf_press_button(context, BUTTON_A, 400ms, 10ms);
+            pbf_wait(context, 5000ms);
+        },
+        {detector2}
+    );
+    context.wait_for_all_requests();
+    if (ret2 == 0){
         stream.log("Entered game!");
         return true;
     }else{

SerialPrograms/Source/PokemonLGPE/Programs/PokemonLGPE_GameEntry.h

@@ -37,7 +37,7 @@ bool gamemenu_to_ingame(
 bool reset_game_from_home(
     ProgramEnvironment& env, VideoStream& stream, JoyconContext& context,
     bool tolerate_update_menu,
-    uint16_t post_wait_time = 125
+    Milliseconds post_wait_time = 125ms
 );
 
 

SerialPrograms/Source/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_AlolanTrade.cpp

@@ -16,6 +16,7 @@
 #include "Pokemon/Pokemon_Strings.h"
 #include "CommonTools/VisualDetectors/BlackScreenDetector.h"
 #include "PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.h"
+#include "PokemonLGPE/Programs/PokemonLGPE_GameEntry.h"
 #include "PokemonLGPE_AlolanTrade.h"
 
 namespace PokemonAutomation{
@@ -192,8 +193,8 @@ void AlolanTrade::program(SingleSwitchProgramEnvironment& env, CancellableScope&
         //Open menu, open party, open boxes
         env.log("Opening boxes.");
         pbf_press_button(context, BUTTON_X, 200ms, 500ms);
-        pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
-        pbf_press_button(context, BUTTON_Y, 200ms, 1500ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 1500ms);
+        pbf_press_button(context, BUTTON_Y, 200ms, 2000ms);
         context.wait_for_all_requests();
 
         //Sort by order caught
@@ -240,31 +241,22 @@ void AlolanTrade::program(SingleSwitchProgramEnvironment& env, CancellableScope&
             pbf_press_button(context, BUTTON_X, 0ms, 1000ms);
             context.wait_for_all_requests();
         }
-        /*
+        
         if (!shiny_found) {
             env.log("Out of Pokemon to trade and no shiny found. Resetting game.");
             send_program_status_notification(
                 env, NOTIFICATION_STATUS_UPDATE,
                 "Out of Pokemon to trade and no shiny found. Resetting game."
             );
 
-            //TODO: Need to make proper GameEntry eventually
-            //Thankfully, Joycon is upright after going to home.
-            //Go to home and close game
-            pbf_press_button(context, BUTTON_HOME, 200ms, 3000ms);
-            pbf_press_button(context, BUTTON_X, 200ms, 200ms);
-            pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
-
-            //TODO:
-            //joycon context->pro controller context?
-            start_game_from_home(env.console, context, true, 0, 0, std::chrono::milliseconds(2000));
+            //Reset game
+            pbf_press_button(context, BUTTON_HOME, 200ms, 2000ms);
+            reset_game_from_home(env, env.console, context, true, 3000ms);
+            context.wait_for_all_requests();
 
             stats.resets++;
             env.update_stats();
         }
-        */
-        //Break for now since resetting the game doesn't work.
-        //break;
     }
 
     if (GO_HOME_WHEN_DONE) {