diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp index 956efc9d0e..dc347a45b5 100644 --- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp @@ -13,58 +13,58 @@ namespace NintendoSwitch{ void eggfetcher_loop(ProControllerContext& context){ - ssf_press_left_joystick_old(context, STICK_MAX, STICK_MAX, 400ms, 400ms); - ssf_press_left_joystick_old(context, STICK_MAX, 160, 0, 510); + ssf_press_left_joystick(context, {+1, -1}, 400ms, 400ms); + ssf_press_left_joystick(context, {+1, -0.252}, 0ms, 4080ms); ssf_press_button(context, BUTTON_A, 1360ms); ssf_press_button(context, BUTTON_A, 1360ms); ssf_press_button(context, BUTTON_A, 1360ms); - ssf_press_left_joystick_old(context, STICK_MIN, STICK_CENTER, 50, 390); + ssf_press_left_joystick(context, {-1, 0}, 400ms, 3120ms); ssf_mash1_button(context, BUTTON_B, 720ms); ssf_do_nothing(context, 2400ms); - ssf_press_left_joystick_old(context, 192, STICK_MIN, 120, 120); - ssf_press_left_joystick_old(context, STICK_MAX, STICK_MIN, 120, 120); + ssf_press_left_joystick(context, {+0.5, +1}, 960ms, 960ms); + ssf_press_left_joystick(context, {+1, +1}, 960ms, 960ms); } void move_while_mashing_B(ProControllerContext& context, Milliseconds duration){ // Hold the joystick to the right for the entire duration. - ssf_press_left_joystick_old(context, STICK_MAX, STICK_CENTER, 0ms, duration); + ssf_press_left_joystick(context, {+1, 0}, 0ms, duration); // While the above is running, spam B. ssf_mash1_button(context, BUTTON_B, duration); } void spin_and_mash_A(ProControllerContext& context, Milliseconds duration){ for (Milliseconds c = 0ms; c < duration; c += 1280ms){ - ssf_press_left_joystick_old(context, STICK_CENTER, STICK_MAX, 0ms, 320ms); + ssf_press_left_joystick(context, {0, -1}, 0ms, 320ms); ssf_press_button(context, BUTTON_A, 160ms); ssf_press_button(context, BUTTON_A, 160ms); - ssf_press_left_joystick_old(context, STICK_MAX, STICK_CENTER, 0ms, 320ms); + ssf_press_left_joystick(context, {+1, 0}, 0ms, 320ms); ssf_press_button(context, BUTTON_A, 160ms); ssf_press_button(context, BUTTON_A, 160ms); - ssf_press_left_joystick_old(context, STICK_CENTER, STICK_MIN, 0ms, 320ms); + ssf_press_left_joystick(context, {0, +1}, 0ms, 320ms); ssf_press_button(context, BUTTON_A, 160ms); ssf_press_button(context, BUTTON_A, 160ms); - ssf_press_left_joystick_old(context, STICK_MIN, STICK_CENTER, 0ms, 320ms); + ssf_press_left_joystick(context, {-1, 0}, 0ms, 320ms); ssf_press_button(context, BUTTON_A, 160ms); ssf_press_button(context, BUTTON_A, 160ms); } } void travel_to_spin_location(ProControllerContext& context){ - ssf_press_left_joystick_old(context, STICK_MAX, 144, 100, 250); + ssf_press_left_joystick(context, {+1, -0.126}, 800ms, 2000ms); ssf_press_button(context, BUTTON_A, 800ms); ssf_press_button(context, BUTTON_A, 400ms); - ssf_press_left_joystick_old(context, STICK_MAX, STICK_MAX, 400ms, 400ms); + ssf_press_left_joystick(context, {+1, -1}, 400ms, 400ms); } void travel_back_to_lady(ProControllerContext& context){ - ssf_press_left_joystick_old(context, STICK_CENTER, STICK_MAX, 240ms, 240ms); - ssf_press_left_joystick_old(context, STICK_MAX, 144, 260, 260); - ssf_press_left_joystick_old(context, STICK_MIN, STICK_CENTER, 50, 400); + ssf_press_left_joystick(context, {0, -1}, 240ms, 240ms); + ssf_press_left_joystick(context, {+1, -0.126}, 2080ms, 2080ms); + ssf_press_left_joystick(context, {-1, 0}, 400ms, 3200ms); ssf_mash1_button(context, BUTTON_B, 800ms); ssf_do_nothing(context, 2400ms); - ssf_press_left_joystick_old(context, 192, STICK_MIN, 120, 120); - ssf_press_left_joystick_old(context, STICK_MAX, STICK_MIN, 120, 120); + ssf_press_left_joystick(context, {+0.5, +1}, 960ms, 960ms); + ssf_press_left_joystick(context, {+1, +1}, 960ms, 960ms); } diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp index a677171ea6..f59f4d4c6b 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp @@ -45,22 +45,22 @@ EventBeamFinder::EventBeamFinder() void EventBeamFinder::goto_near_den(ProControllerContext& context) const{ - ssf_press_left_joystick_old(context, STICK_CENTER, STICK_MIN, 375, 375); + ssf_press_left_joystick(context, {0, +1}, 3000ms, 3000ms); pbf_wait(context, 400ms); ssf_press_button(context, BUTTON_PLUS, 800ms); - ssf_press_left_joystick_old(context, STICK_MAX, STICK_CENTER, 100, 5); + ssf_press_left_joystick(context, {+1, 0}, 800ms, 40ms); ssf_press_button(context, BUTTON_L, 800ms); ssf_press_button(context, BUTTON_PLUS, 800ms); - ssf_press_left_joystick_old(context, STICK_CENTER, STICK_MIN, 370, 370); + ssf_press_left_joystick(context, {0, +1}, 2960ms, 2960ms); } void EventBeamFinder::goto_far_den(ProControllerContext& context) const{ - ssf_press_left_joystick_old(context, STICK_CENTER, STICK_MIN, 992, 992); + ssf_press_left_joystick(context, {0, +1}, 7936ms, 7936ms); pbf_wait(context, 400ms); ssf_press_button(context, BUTTON_PLUS, 800ms); - ssf_press_left_joystick_old(context, STICK_MIN, STICK_CENTER, 100, 5); + ssf_press_left_joystick(context, {-1, 0}, 800ms, 40ms); ssf_press_button(context, BUTTON_L, 800ms); ssf_press_button(context, BUTTON_PLUS, 800ms); - ssf_press_left_joystick_old(context, STICK_CENTER, STICK_MIN, 300, 300); + ssf_press_left_joystick(context, {0, +1}, 2400ms, 2400ms); } void EventBeamFinder::drop_wishing_piece(ProControllerContext& context) const{ ssf_press_button(context, BUTTON_A, 1600ms, 80ms); diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h index 1f7966977c..0a0b1570f9 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h +++ b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h @@ -58,8 +58,8 @@ static void fly_home_goto_lady(ProControllerContext& context, char from_overworl // Go to lady. // If you change this, you MUST update "GO_TO_LADY_DURATION". - ssf_press_left_joystick_old(context, STICK_MIN, STICK_CENTER, 160ms, 80ms); - ssf_press_left_joystick_old(context, STICK_CENTER, STICK_MIN, 90, 45); + ssf_press_left_joystick(context, {-1, 0}, 160ms, 80ms); + ssf_press_left_joystick(context, {0, +1}, 720ms, 360ms); } // Assume the selected app in the menu is Twon Map.