Skip to content

Commit 77ef391

Browse files
committed
joystick
1 parent f28c3aa commit 77ef391

File tree

77 files changed

+454
-454
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+454
-454
lines changed

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ void EggAutonomousState::fetch_egg(){
334334
m_stream, m_context,
335335
[](ProControllerContext& context){
336336
pbf_move_left_joystick(context, {-1, -1}, 240ms, 0ms);
337-
pbf_move_left_joystick(context, 128, 0, 280ms, 0ms);
337+
pbf_move_left_joystick(context, {0, +1}, 280ms, 0ms);
338338
pbf_move_left_joystick(context, 255, 128, 480ms, 1000ms);
339339
},
340340
{{dialog}}

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void EggFetcher::program(SingleSwitchProgramEnvironment& env, ProControllerConte
9090

9191
// Move to man.
9292
pbf_move_left_joystick(context, {-1, -1}, 240ms, 0ms);
93-
pbf_move_left_joystick(context, 128, 0, 280ms, 0ms);
93+
pbf_move_left_joystick(context, {0, +1}, 280ms, 0ms);
9494
pbf_move_left_joystick(context, 255, 128, 480ms, 0ms);
9595

9696
// Fetch egg.

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace PokemonBDSP{
1818
void egg_spin(ProControllerContext& context, Milliseconds duration){
1919
for (Milliseconds c = 0ms; c < duration; c += 42*8ms){
2020
pbf_move_left_joystick(context, 0, 0, 40ms, 0ms);
21-
pbf_move_left_joystick(context, 128, 0, 40ms, 0ms);
21+
pbf_move_left_joystick(context, {0, +1}, 40ms, 0ms);
2222
pbf_move_left_joystick(context, 255, 0, 40ms, 0ms);
2323
pbf_move_left_joystick(context, 255, 128, 40ms, 0ms);
2424
pbf_move_left_joystick(context, 255, 255, 40ms, 0ms);
@@ -31,7 +31,7 @@ void egg_spin_with_A(ProControllerContext& context, Milliseconds duration){
3131
for (Milliseconds c = 0ms; c < duration; c += 42*8ms){
3232
ssf_press_button(context, BUTTON_ZL, 0ms, 80ms);
3333
pbf_move_left_joystick(context, 0, 0, 40ms, 0ms);
34-
pbf_move_left_joystick(context, 128, 0, 40ms, 0ms);
34+
pbf_move_left_joystick(context, {0, +1}, 40ms, 0ms);
3535
pbf_move_left_joystick(context, 255, 0, 40ms, 0ms);
3636
pbf_move_left_joystick(context, 255, 128, 40ms, 0ms);
3737
pbf_move_left_joystick(context, 255, 255, 40ms, 0ms);

SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ void MoneyFarmerRoute210::heal_at_center_and_return(
269269
pbf_move_left_joystick(context, 255, 128, 880ms, 0ms);
270270
pbf_move_left_joystick(context, {0, -1}, 1000ms, 0ms);
271271
pbf_move_left_joystick(context, 255, 128, 840ms, 0ms);
272-
pbf_move_left_joystick(context, 128, 0, 3000ms, 0ms);
272+
pbf_move_left_joystick(context, {0, +1}, 3000ms, 0ms);
273273
pbf_move_left_joystick(context, 255, 128, 2400ms, 0ms);
274274
pbf_move_left_joystick(context, {0, -1}, 3000ms, 0ms);
275275

SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ void LegendaryReset::program(SingleSwitchProgramEnvironment& env, ProControllerC
103103
size_t stop = WALK_UP ? 30 : 60;
104104
for (size_t c = 0; c < stop; c++){
105105
if (WALK_UP){
106-
pbf_move_left_joystick(context, 128, 0, 1000ms, 0ms);
106+
pbf_move_left_joystick(context, {0, +1}, 1000ms, 0ms);
107107
}
108108
pbf_mash_button(context, BUTTON_ZL, 125);
109109
}

SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ void ShinyHuntShaymin::program(SingleSwitchProgramEnvironment& env, ProControlle
177177
// Hop on bike, ride down to seabreak path
178178
// SHORTCUT.run(env.console, 0);
179179
pbf_move_left_joystick(context, {0, -1}, 2880ms, 0ms);
180-
pbf_move_left_joystick(context, 128, 0, 3200ms, 0ms);
180+
pbf_move_left_joystick(context, {0, +1}, 3200ms, 0ms);
181181
}
182182

183183
send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);

SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ void StarterReset::program(SingleSwitchProgramEnvironment& env, ProControllerCon
134134
reset = true;
135135

136136
// Enter the lake.
137-
pbf_move_left_joystick(context, 128, 0, 1000ms, 0ms);
137+
pbf_move_left_joystick(context, {0, +1}, 1000ms, 0ms);
138138

139139
// Mash B until we see the briefcase.
140140
ImageMatchWatcher detector(briefcase, {0.5, 0.1, 0.5, 0.7}, 100, true);

SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ std::vector<std::string> OutbreakFinder::run_iteration(
458458
inside_travel_map = false;
459459
pbf_press_button(context, BUTTON_B, 400ms, 400ms);
460460
// Leave the guard.
461-
pbf_move_left_joystick(context, 128, 0, 800ms, 400ms);
461+
pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms);
462462
// Checking MMO costs Aguav Berries.
463463
// To not waste them, save here so that we can reset to get berries back.
464464
save_game_from_overworld(env, env.console, context);

SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void SkipToFullMoon::program(SingleSwitchProgramEnvironment& env, ProControllerC
7474
// Close menu
7575
pbf_press_button(context, BUTTON_B, 160ms, 800ms);
7676
// Character turn around to face the tent
77-
pbf_move_left_joystick(context, 128, 0, 160ms, 800ms);
77+
pbf_move_left_joystick(context, {0, +1}, 160ms, 800ms);
7878
// Press A to show the "how long do you rest" dialogue
7979
pbf_press_button(context, BUTTON_A, 10, 100);
8080
// Press A to show the time menu

SerialPrograms/Source/PokemonLA/Programs/ML/PokemonLA_GeneratePokemonImageTrainingData.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ void GeneratePokemonImageTrainingData::select_starting_location(SingleSwitchProg
157157
pbf_move_left_joystick(context, {0, -1}, 1920ms, 240ms); // move backwards
158158
pbf_move_left_joystick(context, 255, 150, 960ms, 480ms); // move to right
159159
pbf_press_button(context, BUTTON_ZL, 30, 125); // rotate camera to point to where the character is facing
160-
pbf_move_left_joystick(context, 128, 0, 5600ms, 240ms); // move forward
160+
pbf_move_left_joystick(context, {0, +1}, 5600ms, 240ms); // move forward
161161
pbf_move_left_joystick(context, 255, 125, 240ms, 480ms); // move to right
162162
break;
163163
case StartingLocation::FIELDLANDS_FIELDLANDS:

0 commit comments

Comments
 (0)