Migrate Sword/Shield settings to TimeDurationOption. Add program end notifications for some programs that are missing it. Various fixes.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -114,6 +114,7 @@
 #include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h"
 #include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h"
 #include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h"
 
 
 #include <QPixmap>
@@ -133,6 +134,11 @@ using namespace PokemonAutomation::Kernels::Waterfill;
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
+uint16_t scroll_to(
+    SwitchControllerContext& context,
+    uint8_t start_digit, uint8_t end_digit, bool actually_scroll
+);
+
 
 namespace PokemonSwSh{
     std::vector<ImagePixelBox> find_selection_arrows(const ImageViewRGB32& image, size_t min_area);
@@ -272,11 +278,36 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     VideoOverlaySet overlays(overlay);
 
 
+    ssf_press_button(context, BUTTON_A, 0);
+    ssf_do_nothing(context, 4);
+    ssf_press_button(context, BUTTON_A, 0);
+    ssf_do_nothing(context, 4);
+    ssf_press_button(context, BUTTON_A, 0);
+    ssf_do_nothing(context, 4);
+    ssf_press_button(context, BUTTON_A, 0);
+    ssf_do_nothing(context, 4);
+
+
+
 
+//    enter_digits(context, 8, (const uint8_t*)"56685459");
+
+#if 0
+    for (int c = 0; c < 10; c++){
+        scroll_to(context, 1, 9, true);
+        scroll_to(context, 9, 1, true);
+    }
+//    pbf_wait(context, 100);
+#endif
+
+
+#if 0
     ImageRGB32 image("20250131-170450792229.png");
 
     PokemonSwSh::BattleBallReader reader(console, Language::Korean);
     reader.read_ball(image);
+#endif
+
 
 
 #if 0

SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp

@@ -21,10 +21,10 @@ namespace PokemonSwSh{
 
 void connect_to_internet(
     SwitchControllerContext& context,
-    uint16_t open_ycomm_delay,
-    uint16_t connect_to_internet_delay
+    Milliseconds open_ycomm_delay,
+    Milliseconds connect_to_internet_delay
 ){
-    ssf_press_button(context, BUTTON_Y, open_ycomm_delay, 10);
+    ssf_press_button(context, BUTTON_Y, open_ycomm_delay, 80ms);
 
     //  Move the cursor as far away from Link Trade and Surprise Trade as possible.
     //  This is added safety in case connect to internet takes too long.
@@ -75,16 +75,16 @@ void home_to_add_friends(
 void accept_FRs(
     VideoStream& stream, SwitchControllerContext& context,
     uint8_t slot, bool fix_cursor,
-    uint16_t game_to_home_delay_safe,
-    uint16_t auto_fr_duration,
+    Milliseconds game_to_home_delay_safe,
+    Milliseconds auto_fr_duration,
     bool tolerate_system_update_window_slow
 ){
     if (slot > 7){
         slot = 7;
     }
 
     //  Go to Switch Home menu.
-    pbf_press_button(context, BUTTON_HOME, 10, game_to_home_delay_safe);
+    pbf_press_button(context, BUTTON_HOME, 80ms, game_to_home_delay_safe);
 
     home_to_add_friends(context, slot, 0, fix_cursor);
 
@@ -101,7 +101,8 @@ void accept_FRs(
         settings_to_enter_game_den_lobby(
             context,
             tolerate_system_update_window_slow, false,
-            GameSettings::instance().ENTER_SWITCH_POKEMON, GameSettings::instance().EXIT_SWITCH_POKEMON
+            GameSettings::instance().ENTER_SWITCH_POKEMON0,
+            GameSettings::instance().EXIT_SWITCH_POKEMON0
         );
     }
     pbf_wait(context, 300);

SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h

@@ -17,8 +17,8 @@ namespace PokemonSwSh{
 
 void connect_to_internet(
     SwitchControllerContext& context,
-    uint16_t open_ycomm_delay,
-    uint16_t connect_to_internet_delay
+    Milliseconds open_ycomm_delay,
+    Milliseconds connect_to_internet_delay
 );
 void home_to_add_friends(
     SwitchControllerContext& context,
@@ -29,8 +29,8 @@ void home_to_add_friends(
 void accept_FRs(
     VideoStream& stream, SwitchControllerContext& context,
     uint8_t slot, bool fix_cursor,
-    uint16_t game_to_home_delay_safe,
-    uint16_t auto_fr_duration,
+    Milliseconds game_to_home_delay_safe,
+    Milliseconds auto_fr_duration,
     bool tolerate_system_update_window_slow
 );
 

SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp

@@ -20,26 +20,26 @@ namespace PokemonSwSh{
 
 
 void resume_game_no_interact_old(SwitchControllerContext& context, bool tolerate_update_menu){
-    uint16_t HOME_TO_GAME_DELAY = GameSettings::instance().HOME_TO_GAME_DELAY;
+    Milliseconds HOME_TO_GAME_DELAY = GameSettings::instance().HOME_TO_GAME_DELAY0;
     if (tolerate_update_menu){
-        pbf_press_button(context, BUTTON_HOME, 10, HOME_TO_GAME_DELAY);
+        pbf_press_button(context, BUTTON_HOME, 80ms, HOME_TO_GAME_DELAY);
         pbf_press_dpad(context, DPAD_DOWN, 10, 10);
         pbf_press_dpad(context, DPAD_UP, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, HOME_TO_GAME_DELAY);
+        pbf_press_button(context, BUTTON_A, 80ms, HOME_TO_GAME_DELAY);
     }else{
-        pbf_press_button(context, BUTTON_HOME, 10, HOME_TO_GAME_DELAY);
+        pbf_press_button(context, BUTTON_HOME, 80ms, HOME_TO_GAME_DELAY);
     }
 }
 void resume_game_back_out_old(SwitchControllerContext& context, bool tolerate_update_menu, uint16_t mash_B_time){
-    uint16_t HOME_TO_GAME_DELAY = GameSettings::instance().HOME_TO_GAME_DELAY;
+    Milliseconds HOME_TO_GAME_DELAY = GameSettings::instance().HOME_TO_GAME_DELAY0;
     if (tolerate_update_menu){
-        pbf_press_button(context, BUTTON_HOME, 10, HOME_TO_GAME_DELAY);
+        pbf_press_button(context, BUTTON_HOME, 80ms, HOME_TO_GAME_DELAY);
         pbf_press_dpad(context, DPAD_DOWN, 10, 10);
         pbf_press_dpad(context, DPAD_UP, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, HOME_TO_GAME_DELAY);
+        pbf_press_button(context, BUTTON_A, 80ms, HOME_TO_GAME_DELAY);
         pbf_mash_button(context, BUTTON_B, mash_B_time);
     }else{
-        pbf_press_button(context, BUTTON_HOME, 10, HOME_TO_GAME_DELAY);
+        pbf_press_button(context, BUTTON_HOME, 80ms, HOME_TO_GAME_DELAY);
     }
 }
 void resume_game_front_of_den_nowatts(SwitchControllerContext& context, bool tolerate_update_menu){
@@ -96,8 +96,8 @@ void settings_to_enter_game(SwitchControllerContext& context, bool fast){
 void settings_to_enter_game_den_lobby(
     SwitchControllerContext& context,
     bool tolerate_update_menu, bool fast,
-    uint16_t enter_switch_pokemon_delay,
-    uint16_t exit_switch_pokemon_delay
+    Milliseconds enter_switch_pokemon_delay,
+    Milliseconds exit_switch_pokemon_delay
 ){
     settings_to_enter_game(context, fast);
     pbf_wait(context, 90);
@@ -108,7 +108,7 @@ void settings_to_enter_game_den_lobby(
         ssf_press_dpad(context, DPAD_DOWN, 10);
         ssf_press_dpad(context, DPAD_UP, 10);
         //  lobby-switch        update-start
-        ssf_press_button(context, BUTTON_A, enter_switch_pokemon_delay, 10);
+        ssf_press_button(context, BUTTON_A, enter_switch_pokemon_delay, 80ms);
         //  lobby-select        lobby-switch
         ssf_press_dpad(context, DPAD_LEFT, 10);
         //  lobby-select        lobby-switch

SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h

@@ -22,8 +22,8 @@ void settings_to_enter_game             (SwitchControllerContext& device, bool f
 void settings_to_enter_game_den_lobby(
     SwitchControllerContext& device,
     bool tolerate_update_menu, bool fast,
-    uint16_t enter_switch_pokemon_delay,
-    uint16_t exit_switch_pokemon_delay
+    Milliseconds enter_switch_pokemon_delay,
+    Milliseconds exit_switch_pokemon_delay
 );
 void enter_game(
     SwitchControllerContext& device,

SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp

@@ -4,24 +4,22 @@
  * 
  */
 
-#include <sstream>
 #include "ClientSource/Libraries/MessageConverter.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "PokemonSwSh_Commands_Misc.h"
-//#include "PokemonSwSh_Messages_Misc.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
-void IoA_backout(SwitchControllerContext& context, uint16_t pokemon_to_menu_delay){
+void IoA_backout(SwitchControllerContext& context, Milliseconds pokemon_to_menu_delay){
     //  Back out to menu.
     //  Prepend each B press by a DOWN press so that the B gets
     //  swallowed while in the summary.
     ssf_press_dpad(context, DPAD_DOWN, 5, 15);
     ssf_press_button(context, BUTTON_B, 60, 10);
     ssf_press_dpad(context, DPAD_DOWN, 5, 15);
-    ssf_press_button(context, BUTTON_B, pokemon_to_menu_delay, 10);
+    ssf_press_button(context, BUTTON_B, pokemon_to_menu_delay, 80ms);
 }
 
 

SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h

@@ -13,8 +13,7 @@ namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
-//void mash_A         (SwitchControllerContext& context, uint16_t ticks);
-void IoA_backout    (SwitchControllerContext& context, uint16_t pokemon_to_menu_delay);
+void IoA_backout    (SwitchControllerContext& context, Milliseconds pokemon_to_menu_delay);
 
 
 

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

@@ -83,15 +83,15 @@ AdventureResult run_adventure(
             case StateMachineAction::STOP_PROGRAM:
                 env.log("End of adventure. Stop program requested...", COLOR_PURPLE);
                 if (runtime.go_home_when_done){
-                    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
+                    pbf_press_button(context, BUTTON_HOME, 80ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
                 }
                 stop.store(true, std::memory_order_release);
                 return;
             case StateMachineAction::RESET_RECOVER:
                 env.log("Error detected. Attempting to correct by resetting...", COLOR_RED);
                 runtime.session_stats.add_error();
                 error.store(true, std::memory_order_release);
-                pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
+                pbf_press_button(context, BUTTON_HOME, 80ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
                 reset_game_from_home_with_inference(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
                 return;
             }
@@ -147,7 +147,7 @@ void loop_adventures(
         if (TOUCH_DATE_INTERVAL.ok_to_touch_now()){
             env.run_in_parallel(scope, [&](ConsoleHandle& console, SwitchControllerContext& context){
                 env.log("Touching date to prevent rollover.");
-                pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
+                pbf_press_button(context, BUTTON_HOME, 80ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
                 touch_date_from_home(context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
                 resume_game_back_out(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 5 * TICKS_PER_SECOND);
             });
@@ -176,7 +176,7 @@ void loop_adventures(
             }
             env.log("Failed to start adventure. Resetting all Switches...", COLOR_RED);
             env.run_in_parallel(scope, [&](ConsoleHandle& console, SwitchControllerContext& context){
-                pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
+                pbf_press_button(context, BUTTON_HOME, 80ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
                 reset_game_from_home_with_inference(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
             });
             continue;

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

@@ -170,7 +170,7 @@ StateMachineAction run_caught_screen(
             if (state == StateMachineAction::RESET_RECOVER){
                 throw_and_log<FatalProgramException>(
                     stream.logger(),
-                    ErrorReport::SEND_ERROR_REPORT,
+                    ErrorReport::NO_ERROR_REPORT,
                     "Unable to take " + Pokemon::STRING_POKEMON + ". Did you forget to disable nicknames?",
                     stream
                );
@@ -181,7 +181,7 @@ StateMachineAction run_caught_screen(
     case CaughtScreenAction::RESET:
         stream.log("Resetting game...", COLOR_BLUE);
         synchronize_caught_screen(console_index, stream, context, state_tracker);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
+        pbf_press_button(context, BUTTON_HOME, 80ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
         reset_game_from_home_with_inference(
             stream, context,
             ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST