More joystick migration.

Mysticial · Mysticial · commit deecbefb1b1e · 2025-12-21T14:29:57.000-08:00
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp
@@ -102,11 +102,6 @@ void pbf_wait(JoyconContext& context, Milliseconds duration){
 void pbf_press_button(JoyconContext& context, Button button, Milliseconds hold, Milliseconds release){
     ssf_press_button(context, button, hold + release, hold, 0ms);
 }
-#if 0
-void pbf_move_joystick(JoyconContext& context, uint8_t x, uint8_t y, Milliseconds hold, Milliseconds release){
-    ssf_press_joystick(context, x, y, hold + release, hold, 0ms);
-}
-#endif
 void pbf_move_joystick(JoyconContext& context, const JoystickPosition& position, Milliseconds hold, Milliseconds release){
     ssf_press_joystick(context, position, hold + release, hold, 0ms);
 }
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h
@@ -112,7 +112,6 @@ void pbf_controller_state(
 
 void pbf_wait           (JoyconContext& context, Milliseconds duration);
 void pbf_press_button   (JoyconContext& context, Button button, Milliseconds hold, Milliseconds release);
-//void pbf_move_joystick  (JoyconContext& context, uint8_t x, uint8_t y, Milliseconds hold, Milliseconds release);
 void pbf_move_joystick  (JoyconContext& context, const JoystickPosition& position, Milliseconds hold, Milliseconds release);
 void pbf_mash_button    (JoyconContext& context, Button button, Milliseconds duration);
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.cpp
@@ -190,8 +190,8 @@ std::string ProControllerState::to_cpp(Milliseconds hold, Milliseconds release)
             + std::to_string(left_joystick.x) + ", " + std::to_string(left_joystick.y) + "}, "
             + hold_str + ", " + release_str + ");\n";
     case 3:
-        return "pbf_move_right_joystick(context, "
-            + std::to_string(right_joystick.x) + ", " + std::to_string(right_joystick.y) + ", "
+        return "pbf_move_right_joystick(context, {"
+            + std::to_string(right_joystick.x) + ", " + std::to_string(right_joystick.y) + "}, "
             + hold_str + ", " + release_str + ");\n";
     }
     throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Impossible state.");
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp
@@ -12,12 +12,11 @@ namespace NintendoSwitch{
 namespace PokemonBDSP{
 
 void detach(ProControllerContext& context){
-    pbf_press_button(context, BUTTON_ZL, 20, 50);
-    pbf_move_right_joystick(context, 128, 255, 20, 10);
-    pbf_press_button(context, BUTTON_ZL, 20, 85);
-    pbf_press_button(context, BUTTON_ZL, 20, 85);
-//    pbf_move_right_joystick(context, 128, 255, 20, 0);
-    pbf_press_button(context, BUTTON_B, 20, 85);
+    pbf_press_button(context, BUTTON_ZL, 160ms, 400ms);
+    pbf_move_right_joystick(context, 128, 255, 160ms, 80ms);
+    pbf_press_button(context, BUTTON_ZL, 160ms, 680ms);
+    pbf_press_button(context, BUTTON_ZL, 160ms, 680ms);
+    pbf_press_button(context, BUTTON_B, 160ms, 680ms);
 }
 void detach_box(ProControllerContext& context, uint16_t box_scroll_delay){
     for (uint8_t row = 0; row < 5; row++){
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.cpp b/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.cpp
@@ -148,8 +148,6 @@ bool NuggetFarmerHighlands::run_iteration(
                 pbf_move_left_joystick(context, 64, 255, 50, 0);
                 pbf_press_button(context, BUTTON_B, 150, 250);
 
-//                pbf_move_right_joystick(context, 0, 128, 200, 125);
-
             },
             {
                 {dialog_detector},
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.cpp
@@ -183,50 +183,50 @@ void RamanasCombeeFinder::grouped_path(SingleSwitchProgramEnvironment& env, ProC
 
             env.console.log("Checking Tree 1");
             change_mount(env.console,context,MountState::BRAVIARY_ON);
-            pbf_move_left_joystick(context, 239, 0, 100, 20);
+            pbf_move_left_joystick(context, 239, 0, 800ms, 160ms);
             pbf_press_button(context, BUTTON_B, 2390, 0);
             pbf_press_button(context, BUTTON_Y, 380, 0);
-            pbf_move_right_joystick(context, 127, 255, 90, 20);
+            pbf_move_right_joystick(context, 127, 255, 720ms, 160ms);
             check_tree_no_stop(env, context);
 
             env.console.log("Checking Tree 2");
-            pbf_press_button(context, BUTTON_PLUS, 20, 200);
-            pbf_move_left_joystick(context, 242, 0, 100, 20);
+            pbf_press_button(context, BUTTON_PLUS, 20, 1600ms);
+            pbf_move_left_joystick(context, 242, 0, 800ms, 160ms);
             context.wait_for_all_requests();
             enable_shiny_sound(context);
             pbf_press_button(context, BUTTON_B, 420, 0);
             pbf_press_button(context, BUTTON_Y, 380, 0);
-            pbf_move_right_joystick(context, 127, 255, 90, 20);
+            pbf_move_right_joystick(context, 127, 255, 720ms, 160ms);
             check_tree_no_stop(env, context);
 
             env.console.log("Checking Tree 3");
-            pbf_press_button(context, BUTTON_PLUS, 20, 200);
-            pbf_move_left_joystick(context, 0, 60, 100, 20);
+            pbf_press_button(context, BUTTON_PLUS, 20, 1600ms);
+            pbf_move_left_joystick(context, 0, 60, 800ms, 160ms);
             context.wait_for_all_requests();
             enable_shiny_sound(context);
             pbf_press_button(context, BUTTON_B, 350, 0);
             pbf_press_button(context, BUTTON_Y, 380, 0);
-            pbf_move_right_joystick(context, 127, 255, 90, 20);
+            pbf_move_right_joystick(context, 127, 255, 720ms, 160ms);
             check_tree_no_stop(env, context);
 
             env.console.log("Checking Tree 4");
-            pbf_press_button(context, BUTTON_PLUS, 20, 200);
-            pbf_move_left_joystick(context, 50, 255, 100, 20);
+            pbf_press_button(context, BUTTON_PLUS, 20, 1600ms);
+            pbf_move_left_joystick(context, 50, 255, 800ms, 160ms);
             context.wait_for_all_requests();
             enable_shiny_sound(context);
             pbf_press_button(context, BUTTON_B, 375, 0);
             pbf_press_button(context, BUTTON_Y, 380, 0);
-            pbf_move_right_joystick(context, 127, 255, 90, 20);
+            pbf_move_right_joystick(context, 127, 255, 720ms, 160ms);
             check_tree_no_stop(env, context);
 
             env.console.log("Checking Tree 5");
-            pbf_press_button(context, BUTTON_PLUS, 20, 200);
-            pbf_move_left_joystick(context, 200, 0, 100, 20);
+            pbf_press_button(context, BUTTON_PLUS, 20, 1600ms);
+            pbf_move_left_joystick(context, 200, 0, 800ms, 160ms);
             context.wait_for_all_requests();
             enable_shiny_sound(context);
             pbf_press_button(context, BUTTON_B, 85, 0);
             pbf_press_button(context, BUTTON_Y, 380, 0);
-            pbf_move_right_joystick(context, 127, 255, 90, 20);
+            pbf_move_right_joystick(context, 127, 255, 720ms, 160ms);
         },
         {
             {battle_menu_detector},
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp
@@ -57,11 +57,11 @@ FlagNavigationAir::FlagNavigationAir(
         uint8_t turn = m_flag_x <= 0.5 ? 0 : 255;
         for (size_t c = 0; c < 2; c++){
             pbf_mash_button(context, BUTTON_ZL, 2 * TICKS_PER_SECOND);
-            pbf_move_right_joystick(context, turn, 128, 400, 0);
-            pbf_move_right_joystick(context, 128, 255, 120, 0);
-            pbf_move_right_joystick(context, turn, 128, 400, 0);
-            pbf_move_right_joystick(context, 128, 0, 200, 0);
-            pbf_move_right_joystick(context, turn, 128, 400, 0);
+            pbf_move_right_joystick(context, turn, 128, 3200ms, 0ms);
+            pbf_move_right_joystick(context, 128, 255, 960ms, 0ms);
+            pbf_move_right_joystick(context, turn, 128, 3200ms, 0ms);
+            pbf_move_right_joystick(context, 128, 0, 1600ms, 0ms);
+            pbf_move_right_joystick(context, turn, 128, 3200ms, 0ms);
         }
         context.wait_for_all_requests();
         m_find_flag_failed.store(true, std::memory_order_release);
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp
@@ -146,16 +146,6 @@ void ShinyHuntCustomPath::do_non_listen_action(
         }
         break;
     }
-#if 0
-    case PathAction::ROTATE_CAMERA:{
-        if (row.camera_turn_ticks > 0){
-            pbf_move_right_joystick(context, {+1, 0}, uint16_t(row.camera_turn_ticks), 0);
-        }else if (row.camera_turn_ticks < 0){
-            pbf_move_right_joystick(context, {-1, 0}, uint16_t(-row.camera_turn_ticks), 0);
-        }
-        break;
-    }
-#endif
     case PathAction::MOVE_FORWARD:{
         switch(row.parameters.move_speed){
         case PathSpeed::NORMAL_SPEED:
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp
@@ -74,7 +74,7 @@ SoundListener::SoundListener()
 
 void SoundListener::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     //  Connect the controller.
-    // pbf_move_right_joystick(context, 0, 255, 10, 0);
+    // pbf_move_right_joystick(context, 0, 255, 80ms, 0ms);
 
     // search_alpha_roar_from_audio_dump();
     // return;
diff --git a/SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp b/SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp
@@ -138,7 +138,7 @@ bool open_map(ConsoleHandle& console, ProControllerContext& context, bool zoom_t
                 map_detector.reset_state();
                 // move right joystick to zoom out the map
                 for(int i = 0; i < 3; i++){
-                    pbf_move_right_joystick(context, 128, 255, 100ms, 300ms);
+                    pbf_move_right_joystick(context, {0, -1}, 100ms, 300ms);
                 }
                 context.wait_for_all_requests();
                 console.log("Set to fully zoomed out");
diff --git a/SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.cpp b/SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.cpp
@@ -132,14 +132,14 @@ void run_back_until_found_bench(
         env.console, context,
         [](ProControllerContext& context){
             ssf_press_button(context, BUTTON_B, 0ms, 800ms, 0ms);
-            pbf_move_left_joystick(context, 128, 255, 800ms, 200ms);
+            pbf_move_left_joystick(context, {0, -1}, 800ms, 200ms);
             pbf_press_button(context, BUTTON_L, 160ms, 160ms);
 
             //  Can't just hold it down since sometimes it doesn't register.
             for (int c = 0; c < 10; c++){
-                pbf_move_right_joystick(context, 0, 128, 800ms, 200ms);
+                pbf_move_right_joystick(context, {-1, 0}, 800ms, 200ms);
                 pbf_press_button(context, BUTTON_L, 160ms, 0ms);
-                pbf_move_left_joystick(context, 128, 0, 840ms, 800ms);
+                pbf_move_left_joystick(context, {0, +1}, 840ms, 800ms);
             }
         },
         {buttonA}
diff --git a/SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.cpp b/SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.cpp
@@ -121,7 +121,7 @@ void ShinyHunt_OverworldReset::program(SingleSwitchProgramEnvironment& env, ProC
                 reset_game_from_home(env, env.console, context);
 
                 if (ROTATE_CAMERA){
-                    pbf_move_right_joystick(context, 255, 128, RESET_DELAY, 0ms);
+                    pbf_move_right_joystick(context, {+1, 0}, RESET_DELAY, 0ms);
                 }else{
                     pbf_wait(context, RESET_DELAY);
                 }
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp
@@ -139,8 +139,8 @@ void find_and_center_on_sky(
             if (state != OverworldState::FindingSky){
                 stream.log("Sky not detected. Attempting to find the sky...", COLOR_ORANGE);
                 session.dispatch([](ProControllerContext& context){
-                    pbf_move_right_joystick(context, 128, 0, 250, 0);
-                    pbf_move_right_joystick(context, 0, 0, 10 * TICKS_PER_SECOND, 0);
+                    pbf_move_right_joystick(context, 128, 0, 2000ms, 0ms);
+                    pbf_move_right_joystick(context, 0, 0, 10 * 1000ms, 0ms);
                 });
                 state = OverworldState::FindingSky;
             }
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.cpp
@@ -152,7 +152,7 @@ bool DirectionDetector::is_minimap_definitely_locked(VideoStream& stream, ProCon
     if (!pointing_north){
         return false;
     }
-    pbf_move_right_joystick(context, 0, 128, 100, 20);
+    pbf_move_right_joystick(context, {-1, 0}, 800ms, 160ms);
     context.wait_for_all_requests();
     double new_direction = get_current_direction(stream, stream.video().snapshot());
 
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.cpp
@@ -25,7 +25,7 @@ void OverworldTrigger::whistle(ProControllerContext& context, bool rotate){
     if (rotate){
         pbf_move_right_joystick(context, 192, 255, 50, 70);
     }
-    pbf_press_button(context, BUTTON_LCLICK, 5, 0);
+    pbf_press_button(context, BUTTON_LCLICK, 40ms, 0ms);
     pbf_mash_button(context, BUTTON_B, 120);
 
     context.wait_for_all_requests();
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp
@@ -371,7 +371,7 @@ void ShinyHuntAutonomousOverworld::program(SingleSwitchProgramEnvironment& env,
     }else{
         pbf_press_button(context, BUTTON_B, 5, 5);
     }
-    pbf_move_right_joystick(context, 128, 255, TICKS_PER_SECOND, 0);
+    pbf_move_right_joystick(context, {0, -1}, 1000ms, 0ms);
 
     WallDuration TIMEOUT = WATCHDOG_TIMER0;
     WallDuration PERIOD = std::chrono::hours(TIME_ROLLBACK_HOURS);
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp
@@ -61,8 +61,8 @@ bool connect_to_internet_with_inference(
 
     //  Connect to internet.
     context.wait_for(std::chrono::seconds(1));
-    pbf_press_dpad(context, DPAD_UP, 5, 0);
-    pbf_move_right_joystick(context, 128, 0, 5, 0);
+    pbf_press_dpad(context, DPAD_UP, 40ms, 0ms);
+    pbf_move_right_joystick(context, {0, +1}, 40ms, 0ms);
     pbf_mash_button(context, BUTTON_PLUS, TICKS_PER_SECOND);
     context.wait_for_all_requests();
 
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp
@@ -139,8 +139,8 @@ void RaidItemFarmerOHKO::program(MultiSwitchProgramEnvironment& env, Cancellable
                     enter_den(context, 0ms, false, false);
                 }else{
                     pbf_press_button(context, BUTTON_Y, 80ms, GameSettings::instance().OPEN_YCOMM_DELAY0);
-                    pbf_press_dpad(context, DPAD_UP, 5, 0);
-                    pbf_move_right_joystick(context, 128, 0, 5, 0);
+                    pbf_press_dpad(context, DPAD_UP, 40ms, 0ms);
+                    pbf_move_right_joystick(context, 128, 0, 40ms, 0ms);
                     pbf_press_button(context, BUTTON_X, 10, 10);
                 }
             }
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp
@@ -134,16 +134,16 @@ void CurryHunter::program(SingleSwitchProgramEnvironment& env, ProControllerCont
 
         //  Do circles with the joystick. Each circle has ten positions.
         for (uint16_t i = 0; i < 2350; i = i + 50){
-            pbf_move_right_joystick(context, 128, 255, 5, 0);
-            pbf_move_right_joystick(context, 202, 231, 5, 0);
-            pbf_move_right_joystick(context, 249, 167, 5, 0);
-            pbf_move_right_joystick(context, 249, 88, 5, 0);
-            pbf_move_right_joystick(context, 202, 24, 5, 0);
-            pbf_move_right_joystick(context, 128, 0, 5, 0);
-            pbf_move_right_joystick(context, 53, 24, 5, 0);
-            pbf_move_right_joystick(context, 6, 88, 5, 0);
-            pbf_move_right_joystick(context, 6, 167, 5, 0);
-            pbf_move_right_joystick(context, 53, 231, 5, 0);
+            pbf_move_right_joystick(context, 128, 255, 40ms, 0ms);
+            pbf_move_right_joystick(context, 202, 231, 40ms, 0ms);
+            pbf_move_right_joystick(context, 249, 167, 40ms, 0ms);
+            pbf_move_right_joystick(context, 249, 88, 40ms, 0ms);
+            pbf_move_right_joystick(context, 202, 24, 40ms, 0ms);
+            pbf_move_right_joystick(context, 128, 0, 40ms, 0ms);
+            pbf_move_right_joystick(context, 53, 24, 40ms, 0ms);
+            pbf_move_right_joystick(context, 6, 88, 40ms, 0ms);
+            pbf_move_right_joystick(context, 6, 167, 40ms, 0ms);
+            pbf_move_right_joystick(context, 53, 231, 40ms, 0ms);
         }
 
 
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp
@@ -45,7 +45,7 @@ void close_game_if_overworld(
     //  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.
     pbf_press_dpad(context, DPAD_UP, 5, 0);
-    pbf_move_right_joystick(context, 128, 0, 5, 0);
+    pbf_move_right_joystick(context, 128, 0, 40ms, 0ms);
     pbf_press_dpad(context, DPAD_RIGHT, 5, 0);
 
     //  Connect to internet.

Original file line number	Diff line number	Diff line change
`@@ -102,11 +102,6 @@ void pbf_wait(JoyconContext& context, Milliseconds duration){`
`102`	`102`	`void pbf_press_button(JoyconContext& context, Button button, Milliseconds hold, Milliseconds release){`
`103`	`103`	`ssf_press_button(context, button, hold + release, hold, 0ms);`
`104`	`104`	`}`
`105`		`-#if 0`
`106`		`-void pbf_move_joystick(JoyconContext& context, uint8_t x, uint8_t y, Milliseconds hold, Milliseconds release){`
`107`		`- ssf_press_joystick(context, x, y, hold + release, hold, 0ms);`
`108`		`-}`
`109`		`-#endif`
`110`	`105`	`void pbf_move_joystick(JoyconContext& context, const JoystickPosition& position, Milliseconds hold, Milliseconds release){`
`111`	`106`	`ssf_press_joystick(context, position, hold + release, hold, 0ms);`
`112`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,6 @@ bool NuggetFarmerHighlands::run_iteration(`
`148`	`148`	`pbf_move_left_joystick(context, 64, 255, 50, 0);`
`149`	`149`	`pbf_press_button(context, BUTTON_B, 150, 250);`
`150`	`150`
`151`		`-// pbf_move_right_joystick(context, 0, 128, 200, 125);`
`152`		`-`
`153`	`151`	`},`
`154`	`152`	`{`
`155`	`153`	`{dialog_detector},`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ bool open_map(ConsoleHandle& console, ProControllerContext& context, bool zoom_t`
`138`	`138`	`map_detector.reset_state();`
`139`	`139`	`// move right joystick to zoom out the map`
`140`	`140`	`for(int i = 0; i < 3; i++){`
`141`		`- pbf_move_right_joystick(context, 128, 255, 100ms, 300ms);`
	`141`	`+ pbf_move_right_joystick(context, {0, -1}, 100ms, 300ms);`
`142`	`142`	`}`
`143`	`143`	`context.wait_for_all_requests();`
`144`	`144`	`console.log("Set to fully zoomed out");`