Improve stability of SwSh mass release.

Mysticial · Mysticial · commit 01905327b3ad · 2025-03-30T09:10:01.000-07:00
diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt
@@ -2119,7 +2119,7 @@ file(GLOB MAIN_SOURCES
     Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.h
     Source/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.cpp
     Source/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.h
-    Source/PokemonSwSh/Programs/ReleaseHelpers.h
+    Source/PokemonSwSh/Programs/PokemonSwSh_ReleaseHelpers.h
     Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp
     Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.h
     Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp
diff --git a/SerialPrograms/SerialPrograms.pro b/SerialPrograms/SerialPrograms.pro
@@ -2243,7 +2243,7 @@ HEADERS += \
     Source/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h \
     Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.h \
     Source/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.h \
-    Source/PokemonSwSh/Programs/ReleaseHelpers.h \
+    Source/PokemonSwSh/Programs/PokemonSwSh_ReleaseHelpers.h \
     Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.h \
     Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.h \
     Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.h \
diff --git a/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Settings.cpp b/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Settings.cpp
@@ -156,10 +156,10 @@ GameSettings::GameSettings()
         "180 s"
     )
     , m_box_timings("<font size=4><b>Box Timings:</b></font> (for egg programs)")
-    , BOX_SCROLL_DELAY0(
+    , BOX_SCROLL_DELAY1(
         "<b>Box Scroll Delay:</b><br>Delay to move the cursor.",
         LockMode::LOCK_WHILE_RUNNING,
-        "160 ms"
+        "200 ms"
     )
     , BOX_CHANGE_DELAY0(
         "<b>Box Change Delay:</b><br>Delay to change boxes.",
@@ -264,7 +264,7 @@ GameSettings::GameSettings()
     PA_ADD_OPTION(FULL_LOBBY_TIMER0);
 
     PA_ADD_STATIC(m_box_timings);
-    PA_ADD_OPTION(BOX_SCROLL_DELAY0);
+    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_DELAY0;
+    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
@@ -596,7 +596,7 @@ 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_DELAY0;
+    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;
 
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombinedShared.h b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombinedShared.h
@@ -90,7 +90,7 @@ 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_DELAY0;
+        Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY1;
 
         //  Move to column.
         party_to_column(context, column);
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp
@@ -54,7 +54,7 @@ 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_DELAY0;
+    Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY1;
 
     //  Move to column.
     party_to_column(context, column);
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h
@@ -78,7 +78,7 @@ 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_DELAY0;
+    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);
@@ -103,7 +103,7 @@ 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_DELAY0;
+    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);
@@ -116,7 +116,7 @@ static void box_to_menu(ProControllerContext& context){
 }
 
 static void party_to_column(ProControllerContext& context, uint8_t column){
-    Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY0;
+    Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY1;
 
     ssf_press_dpad_ptv(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
     column++;
@@ -131,7 +131,7 @@ static void party_to_column(ProControllerContext& context, uint8_t column){
     }
 }
 static void column_to_party(ProControllerContext& context, uint8_t column){
-    Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY0;
+    Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY1;
 
     column++;
     if (column <= 3){
@@ -147,7 +147,7 @@ static void column_to_party(ProControllerContext& context, uint8_t column){
 }
 
 static void pickup_column(ProControllerContext& context, char party){
-    Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY0;
+    Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY1;
 
     ssf_press_button_ptv(context, BUTTON_A, 160ms, EGG_BUTTON_HOLD_DELAY);
     if (party){
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.cpp
@@ -8,7 +8,7 @@
 #include "Pokemon/Pokemon_Strings.h"
 //#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
 #include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/ReleaseHelpers.h"
+#include "PokemonSwSh/Programs/PokemonSwSh_ReleaseHelpers.h"
 #include "PokemonSwSh_EggCombinedShared.h"
 #include "PokemonSwSh_EggSuperCombined2.h"
 
@@ -113,12 +113,7 @@ void EggSuperCombined2::program(SingleSwitchProgramEnvironment& env, ProControll
     ssf_press_button(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0, 160ms);
     ssf_press_button1(context, BUTTON_A, 200);
     ssf_press_button1(context, BUTTON_R, 250);
-    release_boxes(
-        context,
-        BOXES_TO_RELEASE,
-        GameSettings::instance().BOX_SCROLL_DELAY0,
-        GameSettings::instance().BOX_CHANGE_DELAY0
-    );
+    release_boxes(context, BOXES_TO_RELEASE);
 
     //  Skip Boxes
     for (uint8_t c = 0; c <= BOXES_TO_SKIP; c++){
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp
@@ -9,9 +9,8 @@
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h"
 #include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/ReleaseHelpers.h"
+#include "PokemonSwSh/Programs/PokemonSwSh_ReleaseHelpers.h"
 #include "PokemonSwSh_GodEggItemDupe.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.cpp
@@ -8,7 +8,7 @@
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonSwSh/PokemonSwSh_Settings.h"
 #include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/ReleaseHelpers.h"
+#include "PokemonSwSh/Programs/PokemonSwSh_ReleaseHelpers.h"
 #include "PokemonSwSh_MassRelease.h"
 
 namespace PokemonAutomation{
@@ -57,12 +57,7 @@ void MassRelease::program(SingleSwitchProgramEnvironment& env, ProControllerCont
         pbf_press_button(context, BUTTON_LCLICK, 5, 5);
     }
 
-    release_boxes(
-        context,
-        BOXES_TO_RELEASE,
-        GameSettings::instance().BOX_SCROLL_DELAY0,
-        GameSettings::instance().BOX_CHANGE_DELAY0
-    );
+    release_boxes(context, BOXES_TO_RELEASE);
     pbf_press_button(context, BUTTON_HOME, 80ms, GameSettings::instance().HOME_TO_GAME_DELAY0);
 }
 
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp
@@ -78,11 +78,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_DELAY0);
+        ssf_press_dpad(context, DPAD_DOWN, GameSettings::instance().BOX_SCROLL_DELAY1);
         slot -= 6;
     }
     while (slot > 0){
-        ssf_press_dpad(context, DPAD_RIGHT, GameSettings::instance().BOX_SCROLL_DELAY0);
+        ssf_press_dpad(context, DPAD_RIGHT, GameSettings::instance().BOX_SCROLL_DELAY1);
         slot--;
     }
 
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp
@@ -129,11 +129,11 @@ void TradeBot::trade_slot(
 
     //  Move to slot
     while (slot >= 6){
-        ssf_press_dpad(context, DPAD_DOWN, GameSettings::instance().BOX_SCROLL_DELAY0);
+        ssf_press_dpad(context, DPAD_DOWN, GameSettings::instance().BOX_SCROLL_DELAY1);
         slot -= 6;
     }
     while (slot > 0){
-        ssf_press_dpad(context, DPAD_RIGHT, GameSettings::instance().BOX_SCROLL_DELAY0);
+        ssf_press_dpad(context, DPAD_RIGHT, GameSettings::instance().BOX_SCROLL_DELAY1);
         slot--;
     }
 
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp
@@ -142,7 +142,7 @@ void StatsReset::program(SingleSwitchProgramEnvironment& env, ProControllerConte
         pbf_mash_button(context, BUTTON_B, 1000ms);
 
         ssf_press_button(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0, 160ms);
-        ssf_press_dpad(context, DPAD_RIGHT, GameSettings::instance().BOX_SCROLL_DELAY0, 160ms);
+        ssf_press_dpad(context, DPAD_RIGHT, GameSettings::instance().BOX_SCROLL_DELAY1, 160ms);
         ssf_press_button(context, BUTTON_A, GameSettings::instance().MENU_TO_POKEMON_DELAY0, 160ms);
         ssf_press_button(context, BUTTON_R, GameSettings::instance().POKEMON_TO_BOX_DELAY0, 160ms);
         context.wait_for_all_requests();
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp
@@ -44,7 +44,7 @@ void navigate_to_menu_app(
     const int target_row = (int)target_app_index / 5;
     const int target_col = (int)target_app_index % 5;
     
-    const Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY0;
+    const Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY1;
 
     const DpadPosition dir = (cur_col < target_col ? DPAD_RIGHT : DPAD_LEFT);
     const int steps = std::abs(cur_col - target_col);
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_ReleaseHelpers.h b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_ReleaseHelpers.h
@@ -1,70 +1,70 @@
-/*  Mass Release Helpers
- *
- *  From: https://github.com/PokemonAutomation/
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ReleaseHelpers_H
-#define PokemonAutomation_PokemonSwSh_ReleaseHelpers_H
-
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-// Release one pokemon in box
-static void release(ProControllerContext& context){
-    ssf_press_button(context, BUTTON_A, 60, 10);
-    ssf_press_dpad_ptv(context, DPAD_UP, 120ms);
-    ssf_press_dpad_ptv(context, DPAD_UP, 120ms);
-    ssf_press_button(context, BUTTON_A, 125, 10);
-    ssf_press_dpad_ptv(context, DPAD_DOWN, 120ms);
-//    ssf_press_button(context, BUTTON_A, 150);
-//    ssf_press_button(context, BUTTON_A, 40);
-    ssf_mash_AZs(context, 180);
-}
-static void release_box(ProControllerContext& context, Milliseconds box_scroll_delay){
-    for (uint8_t row = 0; row < 5; row++){
-        if (row != 0){
-            ssf_press_dpad_ptv(context, DPAD_DOWN, box_scroll_delay);
-            ssf_press_dpad_ptv(context, DPAD_RIGHT, box_scroll_delay);
-            ssf_press_dpad_ptv(context, DPAD_RIGHT, box_scroll_delay);
-        }
-        for (uint8_t col = 0; col < 6; col++){
-            if (col != 0){
-                ssf_press_dpad_ptv(context, DPAD_RIGHT, box_scroll_delay);
-            }
-            release(context);
-        }
-    }
-}
-static void release_boxes(
-    ProControllerContext& context,
-    uint8_t boxes,
-    Milliseconds box_scroll_delay,
-    Milliseconds box_change_delay
-){
-    if (boxes == 0){
-        return;
-    }
-    release_box(context, box_scroll_delay);
-    for (uint8_t box = 1; box < boxes; box++){
-        ssf_press_dpad_ptv(context, DPAD_DOWN, box_scroll_delay);
-        ssf_press_dpad_ptv(context, DPAD_DOWN, box_scroll_delay);
-        ssf_press_dpad_ptv(context, DPAD_DOWN, box_scroll_delay);
-        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, box_change_delay);
-        release_box(context, box_scroll_delay);
-    }
-}
-
-
-
-}
-}
-}
-#endif
-
+/*  Mass Release Helpers
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_ReleaseHelpers_H
+#define PokemonAutomation_PokemonSwSh_ReleaseHelpers_H
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "PokemonSwSh/PokemonSwSh_Settings.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+// Release one pokemon in box
+static void release(ProControllerContext& context){
+    ssf_press_button(context, BUTTON_A, 600ms, 80ms);
+    ssf_press_dpad_ptv(context, DPAD_UP, 160ms, 80ms);
+    ssf_press_dpad_ptv(context, DPAD_UP, 160ms, 80ms);
+    ssf_press_button(context, BUTTON_A, 1000ms, 80ms);
+    ssf_press_dpad_ptv(context, DPAD_DOWN, 120ms, 80ms);
+//    ssf_press_button(context, BUTTON_A, 150);
+//    ssf_press_button(context, BUTTON_A, 40);
+    ssf_mash_AZs(context, 230);
+}
+static void release_box(ProControllerContext& context){
+    Milliseconds box_scroll_delay = GameSettings::instance().BOX_SCROLL_DELAY1;
+
+    for (uint8_t row = 0; row < 5; row++){
+        if (row != 0){
+            ssf_press_dpad_ptv(context, DPAD_DOWN, box_scroll_delay);
+            ssf_press_dpad_ptv(context, DPAD_RIGHT, box_scroll_delay);
+            ssf_press_dpad_ptv(context, DPAD_RIGHT, box_scroll_delay);
+        }
+        for (uint8_t col = 0; col < 6; col++){
+            if (col != 0){
+                ssf_press_dpad_ptv(context, DPAD_RIGHT, box_scroll_delay);
+            }
+            release(context);
+        }
+    }
+}
+static void release_boxes(ProControllerContext& context, uint8_t boxes){
+    if (boxes == 0){
+        return;
+    }
+    release_box(context);
+
+    Milliseconds box_scroll_delay = GameSettings::instance().BOX_SCROLL_DELAY1;
+    Milliseconds box_change_delay = GameSettings::instance().BOX_CHANGE_DELAY0;
+    for (uint8_t box = 1; box < boxes; box++){
+        ssf_press_dpad_ptv(context, DPAD_DOWN, box_scroll_delay);
+        ssf_press_dpad_ptv(context, DPAD_DOWN, box_scroll_delay);
+        ssf_press_dpad_ptv(context, DPAD_DOWN, box_scroll_delay);
+        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, box_change_delay);
+        release_box(context);
+    }
+}
+
+
+
+}
+}
+}
+#endif
+
