Increase stability of SwSh MassRelease. Minor refactor of box scrolling.

Mysticial · Mysticial · commit cd1a3ffc79fc · 2025-04-07T01:00:38.000-07:00
diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt
@@ -2093,6 +2093,7 @@ file(GLOB MAIN_SOURCES
     Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.h
     Source/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.cpp
     Source/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h
+    Source/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h
     Source/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp
     Source/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.h
     Source/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp
diff --git a/SerialPrograms/SerialPrograms.pro b/SerialPrograms/SerialPrograms.pro
@@ -2229,6 +2229,7 @@ HEADERS += \
     Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.h \
     Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.h \
     Source/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h \
+    Source/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h \
     Source/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.h \
     Source/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h \
     Source/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h \
diff --git a/SerialPrograms/Source/CommonFramework/Globals.cpp b/SerialPrograms/Source/CommonFramework/Globals.cpp
@@ -26,7 +26,7 @@ namespace PokemonAutomation{
 const bool IS_BETA_VERSION = true;
 const int PROGRAM_VERSION_MAJOR = 0;
 const int PROGRAM_VERSION_MINOR = 52;
-const int PROGRAM_VERSION_PATCH = 10;
+const int PROGRAM_VERSION_PATCH = 11;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h
@@ -121,8 +121,17 @@ void ssf_issue_scroll(
 inline void ssf_press_button_ptv(
     ProControllerContext& context,
     Button button,
-    Milliseconds delay = 24ms,
-    Milliseconds hold = 48ms,
+    Milliseconds delay = 24ms
+){
+    Milliseconds tv = context->timing_variation();
+    if (delay > 0ms) delay += tv;
+    ssf_press_button(context, button, delay);
+}
+inline void ssf_press_button_ptv(
+    ProControllerContext& context,
+    Button button,
+    Milliseconds delay,
+    Milliseconds hold,
     Milliseconds cool = 24ms
 ){
     Milliseconds tv = context->timing_variation();
@@ -134,8 +143,17 @@ inline void ssf_press_button_ptv(
 inline void ssf_press_dpad_ptv(
     ProControllerContext& context,
     DpadPosition position,
-    Milliseconds delay = 24ms,
-    Milliseconds hold = 48ms,
+    Milliseconds delay = 24ms
+){
+    Milliseconds tv = context->timing_variation();
+    if (delay > 0ms) delay += tv;
+    ssf_press_dpad(context, position, delay);
+}
+inline void ssf_press_dpad_ptv(
+    ProControllerContext& context,
+    DpadPosition position,
+    Milliseconds delay,
+    Milliseconds hold,
     Milliseconds cool = 24ms
 ){
     Milliseconds tv = context->timing_variation();
@@ -147,8 +165,17 @@ inline void ssf_press_dpad_ptv(
 inline void ssf_issue_scroll_ptv(
     ProControllerContext& context,
     DpadPosition direction,
-    Milliseconds delay = 24ms,
-    Milliseconds hold = 48ms,
+    Milliseconds delay = 24ms
+){
+    Milliseconds tv = context->timing_variation();
+    if (delay > 0ms) delay += tv;
+    ssf_issue_scroll(context, direction, delay);
+}
+inline void ssf_issue_scroll_ptv(
+    ProControllerContext& context,
+    DpadPosition direction,
+    Milliseconds delay,
+    Milliseconds hold,
     Milliseconds cool = 24ms
 ){
     Milliseconds tv = context->timing_variation();
diff --git a/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Settings.cpp b/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Settings.cpp
@@ -156,11 +156,11 @@ GameSettings::GameSettings()
         "180 s"
     )
     , m_box_timings("<font size=4><b>Box Timings:</b></font> (for egg programs)")
-    , BOX_SCROLL_DELAY1(
-        "<b>Box Scroll Delay:</b><br>Delay to move the cursor.",
-        LockMode::LOCK_WHILE_RUNNING,
-        "200 ms"
-    )
+//    , BOX_SCROLL_DELAY1(
+//        "<b>Box Scroll Delay:</b><br>Delay to move the cursor.",
+//        LockMode::LOCK_WHILE_RUNNING,
+//        "200 ms"
+//    )
     , BOX_CHANGE_DELAY0(
         "<b>Box Change Delay:</b><br>Delay to change boxes.",
         LockMode::LOCK_WHILE_RUNNING,
@@ -264,7 +264,7 @@ GameSettings::GameSettings()
     PA_ADD_OPTION(FULL_LOBBY_TIMER0);
 
     PA_ADD_STATIC(m_box_timings);
-    PA_ADD_OPTION(BOX_SCROLL_DELAY1);
+//    PA_ADD_OPTION(BOX_SCROLL_DELAY1);
     PA_ADD_OPTION(BOX_CHANGE_DELAY0);
     PA_ADD_OPTION(BOX_PICKUP_DROP_DELAY0);
     PA_ADD_OPTION(MENU_TO_POKEMON_DELAY0);
diff --git a/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Settings.h b/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Settings.h
@@ -63,7 +63,7 @@ class GameSettings : public BatchOption{
     MillisecondsOption FULL_LOBBY_TIMER0;
 
     SectionDividerOption m_box_timings;
-    MillisecondsOption BOX_SCROLL_DELAY1;
+//    MillisecondsOption BOX_SCROLL_DELAY1;
     MillisecondsOption BOX_CHANGE_DELAY0;
     MillisecondsOption BOX_PICKUP_DROP_DELAY0;
     MillisecondsOption MENU_TO_POKEMON_DELAY0;
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp
@@ -25,6 +25,7 @@
 #include "PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
 #include "PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
 #include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h"
 #include "PokemonSwSh_EggHelpers.h"
 #include "PokemonSwSh_EggAutonomous.h"
 #include "PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
@@ -606,7 +607,6 @@ bool EggAutonomous::process_hatched_pokemon(
 
     navigate_to_menu_app(env, env.console, context, POKEMON_APP_INDEX, NOTIFICATION_ERROR_RECOVERABLE);
 
-    const Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY1;
     const Milliseconds BOX_CHANGE_DELAY = GameSettings::instance().BOX_CHANGE_DELAY0;
     const Milliseconds BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY0;
 
@@ -615,8 +615,8 @@ bool EggAutonomous::process_hatched_pokemon(
     // From Pokemon App to storage box
     ssf_press_button(context, BUTTON_R, GameSettings::instance().POKEMON_TO_BOX_DELAY0, EGG_BUTTON_HOLD_DELAY);
     // Move left down to the first hatched pokemon in the party
-    ssf_press_dpad(context, DPAD_LEFT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_dpad(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+    box_scroll(context, DPAD_LEFT);
+    box_scroll(context, DPAD_DOWN);
 
     context.wait_for_all_requests();
     {
@@ -689,7 +689,7 @@ bool EggAutonomous::process_hatched_pokemon(
                 ssf_press_button_ptv(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
 
                 // Move it rightward, so that it stays on top of the box area
-                ssf_press_dpad_ptv(context, DPAD_RIGHT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+                box_scroll(context, DPAD_RIGHT);
                 // Press Button L to change to the box on the left
                 ssf_press_button_ptv(context, BUTTON_L, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
 
@@ -698,9 +698,9 @@ bool EggAutonomous::process_hatched_pokemon(
                 // in the box:
                 
                 // Move it three times upward, so that it stays on top of the "Box List" button
-                ssf_press_dpad_ptv(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-                ssf_press_dpad_ptv(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-                ssf_press_dpad_ptv(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+                box_scroll(context, DPAD_UP);
+                box_scroll(context, DPAD_UP);
+                box_scroll(context, DPAD_UP);
                 
                 // Press the button to go to box list view
                 ssf_press_button_ptv(context, BUTTON_A, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
@@ -711,11 +711,11 @@ bool EggAutonomous::process_hatched_pokemon(
                 // Press button R to change to the box on the right, the box with the next batch of eggs
                 ssf_press_button_ptv(context, BUTTON_R, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
                 // Move cursor left to point to the last slot in the party
-                ssf_press_dpad_ptv(context, DPAD_LEFT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+                box_scroll(context, DPAD_LEFT);
                 // Move cursor downward three times so that it goes to the original place (second slot in the party)
-                ssf_press_dpad_ptv(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-                ssf_press_dpad_ptv(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-                ssf_press_dpad_ptv(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+                box_scroll(context, DPAD_DOWN);
+                box_scroll(context, DPAD_DOWN);
+                box_scroll(context, DPAD_DOWN);
                 
                 if (m_num_pokemon_kept >= MAX_KEEPERS){
                     env.log("Max keepers reached. Stopping program...");
@@ -804,8 +804,8 @@ bool EggAutonomous::process_hatched_pokemon(
     // Get eggs to party:
 
     // Move cursor to the first slot in the box
-    ssf_press_dpad_ptv(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_dpad_ptv(context, DPAD_RIGHT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+    box_scroll(context, DPAD_UP);
+    box_scroll(context, DPAD_RIGHT);
 
     // Press Y twice to change selection method to group selection
     pbf_press_button(context, BUTTON_Y, EGG_BUTTON_HOLD_DELAY, 400ms);
@@ -815,14 +815,14 @@ bool EggAutonomous::process_hatched_pokemon(
     pbf_press_button(context, BUTTON_A, EGG_BUTTON_HOLD_DELAY, 400ms);
     // Move down to selection the entire column
     for (size_t c = 0; c < 4; c++){
-        ssf_press_dpad_ptv(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+        box_scroll(context, DPAD_DOWN);
     }
     // Press A to finish the selection
     ssf_press_button_ptv(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
     
     // Move cursor to the second slot in the party
-    ssf_press_dpad_ptv(context, DPAD_LEFT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_dpad_ptv(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+    box_scroll(context, DPAD_LEFT);
+    box_scroll(context, DPAD_DOWN);
 
     // Press A to finish dropping the egg column 
     ssf_press_button_ptv(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombinedShared.h b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombinedShared.h
@@ -13,6 +13,7 @@
 #include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
 #include "PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
 #include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h"
 #include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
 #include "PokemonSwSh_EggHelpers.h"
 
@@ -90,7 +91,6 @@ struct EggCombinedSession{
 
         Milliseconds BOX_CHANGE_DELAY = GameSettings::instance().BOX_CHANGE_DELAY0;
         Milliseconds BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY0;
-        Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY1;
 
         //  Move to column.
         party_to_column(context, column);
@@ -100,12 +100,12 @@ struct EggCombinedSession{
         //  Move to next column.
         column++;
         if (column < 6){
-            ssf_press_dpad(context, DPAD_RIGHT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+            box_scroll(context, DPAD_RIGHT);
         }else{
             column = 0;
             ssf_press_button(context, BUTTON_R, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
-            ssf_press_dpad(context, DPAD_RIGHT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-            ssf_press_dpad(context, DPAD_RIGHT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+            box_scroll(context, DPAD_RIGHT);
+            box_scroll(context, DPAD_RIGHT);
         }
 
         pickup_column(context, false);
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp
@@ -10,6 +10,7 @@
 //#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
 #include "PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
 #include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h"
 #include "PokemonSwSh_EggHelpers.h"
 #include "PokemonSwSh_EggHatcher.h"
 
@@ -54,21 +55,20 @@ uint8_t swap_party(ProControllerContext& context, uint8_t column){
     pickup_column(context, true);
 
     Milliseconds BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY0;
-    Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY1;
 
     //  Move to column.
     party_to_column(context, column);
-    ssf_press_button_ptv(context, BUTTON_A, BOX_PICKUP_DROP_DELAY);
+    ssf_press_button_ptv(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, 100ms);
 
     //  Move to next column.
     column++;
     if (column < 6){
-        ssf_press_dpad(context, DPAD_RIGHT, BOX_SCROLL_DELAY);
+        box_scroll(context, DPAD_RIGHT);
     }else{
         column = 0;
-        ssf_press_button_ptv(context, BUTTON_R, GameSettings::instance().BOX_CHANGE_DELAY0);
-        ssf_press_dpad_ptv(context, DPAD_RIGHT, BOX_SCROLL_DELAY);
-        ssf_press_dpad_ptv(context, DPAD_RIGHT, BOX_SCROLL_DELAY);
+        ssf_press_button_ptv(context, BUTTON_R, GameSettings::instance().BOX_CHANGE_DELAY0, 100ms);
+        box_scroll(context, DPAD_RIGHT);
+        box_scroll(context, DPAD_RIGHT);
     }
 
     pickup_column(context, false);
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h
@@ -10,6 +10,7 @@
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "PokemonSwSh/PokemonSwSh_Settings.h"
+#include "PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -78,15 +79,14 @@ static const Milliseconds EGG_BUTTON_HOLD_DELAY = 80ms;
 // - Move cursor to the second pokemon in the party, aka first hatched pokemon in the party
 // - Press button Y two times to change pokemon selection to group selection
 static void menu_to_box(ProControllerContext& context, bool from_map){
-    Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY1;
     if (from_map){
-        ssf_press_dpad_ptv(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-        ssf_press_dpad_ptv(context, DPAD_RIGHT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+        box_scroll(context, DPAD_UP);
+        box_scroll(context, DPAD_RIGHT);
     }
     ssf_press_button_ptv(context, BUTTON_A, GameSettings::instance().MENU_TO_POKEMON_DELAY0, EGG_BUTTON_HOLD_DELAY);
     ssf_press_button_ptv(context, BUTTON_R, GameSettings::instance().POKEMON_TO_BOX_DELAY0, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_dpad_ptv(context, DPAD_LEFT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_dpad_ptv(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+    box_scroll(context, DPAD_LEFT);
+    box_scroll(context, DPAD_DOWN);
     ssf_press_button_ptv(context, BUTTON_Y, 240ms, EGG_BUTTON_HOLD_DELAY);
     ssf_press_button_ptv(context, BUTTON_Y, 240ms, EGG_BUTTON_HOLD_DELAY);
 }
@@ -103,57 +103,49 @@ static void box_to_menu(ProControllerContext& context){
     //  In state (2):   The 1st B will drop the party pokemon. The 2nd B will
     //                  back out of the box.
 
-    Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY1;
-
     ssf_press_button_ptv(context, BUTTON_B, 160ms, EGG_BUTTON_HOLD_DELAY);
     ssf_press_button_ptv(context, BUTTON_B, GameSettings::instance().BOX_TO_POKEMON_DELAY0, EGG_BUTTON_HOLD_DELAY);
 
     //  Back out to menu.
     ssf_press_button_ptv(context, BUTTON_B, GameSettings::instance().POKEMON_TO_MENU_DELAY0, EGG_BUTTON_HOLD_DELAY);
 
-    ssf_press_dpad_ptv(context, DPAD_LEFT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_dpad_ptv(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+    box_scroll(context, DPAD_LEFT);
+    box_scroll(context, DPAD_DOWN);
 }
 
 static void party_to_column(ProControllerContext& context, uint8_t column){
-    Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY1;
-
-    ssf_press_dpad_ptv(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+    box_scroll(context, DPAD_UP);
     column++;
     if (column <= 3){
         for (uint8_t c = 0; c != column; c++){
-            ssf_press_dpad_ptv(context, DPAD_RIGHT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+            box_scroll(context, DPAD_RIGHT);
         }
     }else{
         for (uint8_t c = 7; c != column; c--){
-            ssf_press_dpad_ptv(context, DPAD_LEFT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+            box_scroll(context, DPAD_LEFT);
         }
     }
 }
 static void column_to_party(ProControllerContext& context, uint8_t column){
-    Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY1;
-
     column++;
     if (column <= 3){
         for (uint8_t c = column; c != 0; c--){
-            ssf_press_dpad_ptv(context, DPAD_LEFT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+            box_scroll(context, DPAD_LEFT);
         }
     }else{
         for (uint8_t c = column; c != 7; c++){
-            ssf_press_dpad_ptv(context, DPAD_RIGHT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+            box_scroll(context, DPAD_RIGHT);
         }
     }
-    ssf_press_dpad_ptv(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+    box_scroll(context, DPAD_DOWN);
 }
 
 static void pickup_column(ProControllerContext& context, char party){
-    Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY1;
-
     ssf_press_button_ptv(context, BUTTON_A, 160ms, EGG_BUTTON_HOLD_DELAY);
     if (party){
-        ssf_press_dpad_ptv(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+        box_scroll(context, DPAD_UP);
     }
-    ssf_press_dpad_ptv(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+    box_scroll(context, DPAD_UP);
     ssf_press_button_ptv(context, BUTTON_A, GameSettings::instance().BOX_PICKUP_DROP_DELAY0, EGG_BUTTON_HOLD_DELAY);
 }
 
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp
@@ -10,6 +10,7 @@
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonSwSh/PokemonSwSh_Settings.h"
 #include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h"
 #include "PokemonSwSh_SurpriseTrade.h"
 
 namespace PokemonAutomation{
@@ -78,11 +79,11 @@ void SurpriseTrade::trade_slot(ProControllerContext& context, uint8_t slot, bool
 
     //  Move to slot
     while (slot >= 6){
-        ssf_press_dpad(context, DPAD_DOWN, GameSettings::instance().BOX_SCROLL_DELAY1);
+        box_scroll(context, DPAD_DOWN);
         slot -= 6;
     }
     while (slot > 0){
-        ssf_press_dpad(context, DPAD_RIGHT, GameSettings::instance().BOX_SCROLL_DELAY1);
+        box_scroll(context, DPAD_RIGHT);
         slot--;
     }
 
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_ReleaseHelpers.h b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_ReleaseHelpers.h
