diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp index 0c2ceaf191..2deb80c201 100644 --- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp @@ -70,19 +70,7 @@ void ssf_press_left_joystick( ){ context->issue_left_joystick(&context, delay, hold, cool, position); } -void ssf_press_right_joystick_old( - ProControllerContext& context, - uint8_t x, uint8_t y, - Milliseconds delay, Milliseconds hold, Milliseconds cool -){ - context->issue_right_joystick( - &context, delay, hold, cool, - { - JoystickTools::linear_u8_to_float(x), - -JoystickTools::linear_u8_to_float(y) - } - ); -} + void ssf_press_right_joystick( ProControllerContext& context, const JoystickPosition& position, diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h index e5a4d10f2e..384dd072e5 100644 --- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h +++ b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h @@ -55,11 +55,6 @@ void ssf_press_left_joystick( const JoystickPosition& position, Milliseconds delay, Milliseconds hold, Milliseconds cool = 0ms ); -void ssf_press_right_joystick_old( - ProControllerContext& context, - uint8_t x, uint8_t y, - Milliseconds delay, Milliseconds hold, Milliseconds cool = 0ms -); void ssf_press_right_joystick( ProControllerContext& context, const JoystickPosition& position, diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp index 2d5bc42afe..e31c1560d2 100644 --- a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp +++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp @@ -200,7 +200,7 @@ void home_to_date_time_Switch1_sbb_blind( ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN); ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN); ssf_issue_scroll(context, SSF_SCROLL_DOWN, 500ms, tv, tv); - ssf_press_right_joystick_old(context, 128, 224, 1000ms, 300ms, tv); + ssf_press_right_joystick(context, {0, -0.75}, 1000ms, 300ms, tv); // ssf_issue_scroll(context, SSF_SCROLL_DOWN, 1000ms, 250ms, tv); // Scroll down ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN); ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN); diff --git a/SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_InPlaceCatcher.cpp b/SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_InPlaceCatcher.cpp index f27c783a12..b6c1168bba 100644 --- a/SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_InPlaceCatcher.cpp +++ b/SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_InPlaceCatcher.cpp @@ -167,7 +167,7 @@ void InPlaceCatcher::run( [](ProControllerContext& context){ while (true){ for (int c = 0; c < 10; c++){ - ssf_press_right_joystick_old(context, 64, 128, 0ms, 1000ms, 0ms); + ssf_press_right_joystick(context, {-0.5, 0}, 0ms, 1000ms, 0ms); ssf_press_dpad(context, DpadPosition::DPAD_UP, 0ms, 160ms, 160ms); pbf_mash_button(context, BUTTON_ZL, 1000ms); pbf_press_button(context, BUTTON_ZL, 500ms, 0ms); diff --git a/SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.cpp b/SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.cpp index d48474ca8e..03bca14440 100644 --- a/SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.cpp +++ b/SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.cpp @@ -112,8 +112,8 @@ void MegaShardFarmer::program(SingleSwitchProgramEnvironment& env, ProController if (!SKIP_SHARDS){ // Break all the shards. - uint8_t x = stats.rounds % 2 == 0 ? 128 - 32 : 128 + 32; - ssf_press_right_joystick_old(context, x, 128, 0ms, 40000ms, 0ms); + double x = stats.rounds % 2 == 0 ? -0.25 : 0.25; + ssf_press_right_joystick(context, {x, 0}, 0ms, 40000ms, 0ms); for (int c = 0; c < 40; c++){ ssf_press_button(context, BUTTON_ZL, 240ms, 400ms, 80ms); pbf_press_button(context, BUTTON_B, 160ms, 520ms); diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h index 1f7966977c..1226eab5b1 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h +++ b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h @@ -48,7 +48,7 @@ static void fly_home(ProControllerContext& context, char from_overworld){ ssf_press_button(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0, 160ms); } ssf_press_button(context, BUTTON_A, 3200ms, 160ms); - ssf_press_right_joystick_old(context, 160, 96, 160ms, 160ms); + ssf_press_right_joystick(context, {0.25, 0.25}, 160ms, 160ms); pbf_mash_button(context, BUTTON_A, 3840ms); }