roll date forward/backward, resume game from home

kichithewolf · kichithewolf · commit 42ec6a83eae5 · 2025-03-17T11:39:00.000-04:00
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp
@@ -312,7 +312,44 @@ bool openedgame_to_gamemenu(
 
 
 
+void resume_game_from_home(
+    VideoStream& stream, JoyconContext& context,
+    bool skip_home_press
+){
+    if (!skip_home_press){
+        pbf_press_button(context, BUTTON_HOME, 20ms, 10ms);
+    }
+    context.wait_for_all_requests();
 
+    while (true){
+        {
+            UpdateMenuWatcher update_detector;
+            int ret = wait_until(
+                stream, context,
+                std::chrono::milliseconds(1000),
+                { update_detector }
+            );
+            if (ret == 0){
+                stream.log("Detected update window.", COLOR_RED);
+
+                pbf_move_joystick(context, 128, 0, 10ms, 0ms);
+                pbf_press_button(context, BUTTON_A, 10ms, 500ms);
+                context.wait_for_all_requests();
+                continue;
+            }
+        }
+
+        //  In case we failed to enter the game.
+        HomeWatcher home_detector;
+        if (home_detector.detect(stream.video().snapshot())){
+            stream.log("Failed to re-enter game. Trying again...", COLOR_RED);
+            pbf_press_button(context, BUTTON_HOME, 20ms, 10ms);
+            continue;
+        }else{
+            break;
+        }
+    }
+}
 void move_to_user(JoyconContext& context, uint8_t user_slot){
     if (user_slot != 0){
         //  Move to correct user.
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.h
@@ -35,7 +35,10 @@ bool openedgame_to_gamemenu(
 );
 
 
-
+void resume_game_from_home(
+    VideoStream& stream, JoyconContext& context,
+    bool skip_home_press = false
+);
 void start_game_from_home_with_inference(
     VideoStream& stream, JoyconContext& context,
     uint8_t game_slot,
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_Navigation.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_Navigation.cpp
@@ -167,7 +167,7 @@ void home_to_date_time(ProControllerContext& context, bool to_date_change, bool
 
 void home_to_date_time(JoyconContext& context, bool to_date_change){
     Milliseconds tv = context->timing_variation();
-    Milliseconds unit = 50ms + tv;
+    Milliseconds unit = 32ms + tv;
 
     //From ControllerPerformanceClass::SerialPABotBase_Wireless_ESP32
     //as Joycon will only have that controller type
diff --git a/SerialPrograms/Source/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp b/SerialPrograms/Source/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp
@@ -16,75 +16,48 @@ namespace NintendoSwitch{
 namespace PokemonLGPE{
 
 void roll_date_forward_1(JoyconContext& context){
-    /*
-    uint8_t scroll_delay = fast ? 3 : 4;
-    uint8_t up_delay = fast ? 2 : 3;
-
-    pbf_press_button(context, BUTTON_A, 20, 10);
-    ssf_issue_scroll(context, SSF_SCROLL_UP, 0);
-    pbf_press_button(context, BUTTON_A, up_delay);
-    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
-    ssf_issue_scroll(context, SSF_SCROLL_UP, up_delay);
-    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
-    pbf_press_button(context, BUTTON_A, 0);
-    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
-    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
-    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0);
-    pbf_press_button(context, BUTTON_A, 20, 10);
-    */
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 34ms + tv;
+
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+    pbf_move_joystick(context, 128, 0, 2*unit, unit);
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+
+    pbf_move_joystick(context, 255, 128, 2*unit, unit);
+    pbf_move_joystick(context, 128, 0, 2*unit, unit);
+    pbf_move_joystick(context, 255, 128, 2*unit, unit);
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+    pbf_move_joystick(context, 255, 128, 2*unit, unit);
+    pbf_move_joystick(context, 255, 128, 2*unit, unit);
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
 }
-void roll_date_backward_N(JoyconContext& context, uint8_t skips){
-    /*
-    //  If (fast == true) this will run faster, but slightly less reliably.
 
+void roll_date_backward_N(JoyconContext& context, uint8_t skips){
     if (skips == 0){
         return;
     }
 
     Milliseconds tv = context->timing_variation();
-    uint8_t scroll_delay = fast ? 3 : 4;
-    uint8_t up_delay = 3;
+    Milliseconds unit = 32ms + tv;
+
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
 
-    pbf_press_button(context, BUTTON_A, 20, 10);
     for (uint8_t c = 0; c < skips - 1; c++){
-        ssf_issue_scroll(context, SSF_SCROLL_DOWN, up_delay);
+        pbf_move_joystick(context, 128, 255, 2*unit, unit);
     }
-    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0);
-    pbf_press_button(context, BUTTON_A, up_delay);
-    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
+
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+    pbf_move_joystick(context, 255, 128, 2*unit, unit);
+
     for (uint8_t c = 0; c < skips - 1; c++){
-        ssf_issue_scroll(context, SSF_SCROLL_DOWN, up_delay);
-    }
-    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0);
-    pbf_press_button(context, BUTTON_A, up_delay);
-    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
-    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, scroll_delay);
-    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0);
-    pbf_press_button(context, BUTTON_A, 20, 10);
-    */
-}
-void rollback_hours_from_home(
-    JoyconContext& context,
-    uint8_t hours,
-    Milliseconds settings_to_home_delay
-){
-    /*
-    home_to_date_time(context, true, false);
-    ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);
-
-    ssf_press_button_ptv(context, BUTTON_A, 0ms);
-    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
-    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
-    for (uint8_t c = 0; c < hours; c++){
-        ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+        pbf_move_joystick(context, 128, 255, 2*unit, unit);
     }
-    ssf_press_button_ptv(context, BUTTON_A, 0ms);
-    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
-    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
 
-    pbf_press_button(context, BUTTON_A, 160ms, 80ms);
-    ssf_press_button(context, BUTTON_HOME, settings_to_home_delay, 80ms);
-    */
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+    pbf_move_joystick(context, 255, 128, 2*unit, unit);
+    pbf_move_joystick(context, 255, 128, 2*unit, unit);
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
 }
 
 
diff --git a/SerialPrograms/Source/PokemonLGPE/Commands/PokemonLGPE_DateSpam.h b/SerialPrograms/Source/PokemonLGPE/Commands/PokemonLGPE_DateSpam.h
@@ -12,20 +12,10 @@
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
-
-
-constexpr uint8_t MAX_YEAR = 60;
-
-
 namespace PokemonLGPE{
 
-void roll_date_forward_1                    (JoyconContext& context, bool fast);
-void roll_date_backward_N                   (JoyconContext& context, uint8_t skips, bool fast);
-void rollback_hours_from_home(
-    JoyconContext& context,
-    uint8_t hours,
-    Milliseconds settings_to_home_delay
-);
+void roll_date_forward_1                    (JoyconContext& context);
+void roll_date_backward_N                   (JoyconContext& context, uint8_t skips);
 
 }
 
diff --git a/SerialPrograms/Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemRespawnFarmer.cpp b/SerialPrograms/Source/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemRespawnFarmer.cpp
@@ -14,10 +14,13 @@
 #include "NintendoSwitch/Controllers/NintendoSwitch_Joycon.h"
 #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "NintendoSwitch/Programs/NintendoSwitch_Navigation.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "PokemonLGPE/Commands/PokemonLGPE_DateSpam.h"
 #include "PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.h"
 #include "PokemonLGPE/Programs/PokemonLGPE_GameEntry.h"
+#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
 #include "PokemonLGPE_DailyItemRespawnFarmer.h"
 
 namespace PokemonAutomation{
@@ -96,7 +99,7 @@ DailyItemRespawnFarmer::DailyItemRespawnFarmer()
 void DailyItemRespawnFarmer::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
     JoyconContext context(scope, env.console.controller<JoyconController>());
     assert_16_9_720p_min(env.logger(), env.console);
-    //DailyItemRespawnFarmer_Descriptor::Stats& stats = env.current_stats<DailyItemRespawnFarmer_Descriptor::Stats>();
+    DailyItemRespawnFarmer_Descriptor::Stats& stats = env.current_stats<DailyItemRespawnFarmer_Descriptor::Stats>();
 
     /* Stand in front of the fossil spawn near Mewtwo.
     *  Use a repel to keep wild encounters away.
@@ -106,9 +109,6 @@ void DailyItemRespawnFarmer::program(SingleSwitchProgramEnvironment& env, Cancel
     *  Should work for other hidden daily items, game corner, mt moon moonstones, etc.
     */
 
-    home_to_date_time(context, true);
-
-    /*
     for (uint32_t count = 0; count < ATTEMPTS; count++) {
         //Pick up item
         pbf_mash_button(context, BUTTON_A, 3000ms);
@@ -184,8 +184,8 @@ void DailyItemRespawnFarmer::program(SingleSwitchProgramEnvironment& env, Cancel
     if (FIX_TIME_WHEN_DONE){
         pbf_press_button(context, BUTTON_HOME, 80ms, 1000ms);
         home_to_date_time(context, false);
-        pbf_press_button(context, BUTTON_A, 20, 105);
-        pbf_press_button(context, BUTTON_A, 20, 105);
+        pbf_press_button(context, BUTTON_A, 20ms, 10ms);
+        pbf_press_button(context, BUTTON_A, 20ms, 10ms);
         pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
         resume_game_from_home(env.console, context);
     }
@@ -194,7 +194,6 @@ void DailyItemRespawnFarmer::program(SingleSwitchProgramEnvironment& env, Cancel
         pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
     }
     send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-    */
 }
 
 
