Skip to content

Commit 532812e

Browse files
MysticialMysticial
committed
migration
1 parent 016e673 commit 532812e

26 files changed

+162
-162
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void egg_spin(ProControllerContext& context, Milliseconds duration){
2424
pbf_move_left_joystick(context, 255, 255, 40ms, 0ms);
2525
pbf_move_left_joystick(context, 128, 255, 40ms, 0ms);
2626
pbf_move_left_joystick(context, {-1, -1}, 48ms, 0ms);
27-
pbf_move_left_joystick(context, 0, 128, 48ms, 0ms);
27+
pbf_move_left_joystick(context, {-1, 0}, 48ms, 0ms);
2828
}
2929
}
3030
void egg_spin_with_A(ProControllerContext& context, Milliseconds duration){
@@ -37,7 +37,7 @@ void egg_spin_with_A(ProControllerContext& context, Milliseconds duration){
3737
pbf_move_left_joystick(context, 255, 255, 40ms, 0ms);
3838
pbf_move_left_joystick(context, 128, 255, 40ms, 0ms);
3939
pbf_move_left_joystick(context, {-1, -1}, 48ms, 0ms);
40-
pbf_move_left_joystick(context, 0, 128, 48ms, 0ms);
40+
pbf_move_left_joystick(context, {-1, 0}, 48ms, 0ms);
4141
}
4242
}
4343

‎SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void AmitySquarePickUpFarmer::program(SingleSwitchProgramEnvironment& env, ProCo
9696
// Move right
9797
pbf_move_left_joystick(context, 255, 128, ONE_WAY_MOVING_TIME0, 0ms);
9898
// Move left
99-
pbf_move_left_joystick(context, 0, 128, ONE_WAY_MOVING_TIME0, 0ms);
99+
pbf_move_left_joystick(context, {-1, 0}, ONE_WAY_MOVING_TIME0, 0ms);
100100
}
101101

102102
// Wait for your pokemon to catch up to you

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ void MoneyFarmerRoute210::program(SingleSwitchProgramEnvironment& env, ProContro
366366
if (HEALING_METHOD == HealMethod::GlobalRoom){
367367
heal_by_global_room(env.console, context);
368368
}
369-
pbf_move_left_joystick(context, 255, 128, 140, 0);
369+
pbf_move_left_joystick(context, 255, 128, 1120ms, 0ms);
370370
}
371371

372372
while (true){
@@ -375,11 +375,11 @@ void MoneyFarmerRoute210::program(SingleSwitchProgramEnvironment& env, ProContro
375375
send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
376376

377377
if (need_to_charge){
378-
pbf_move_left_joystick(context, 255, 128, 140, 0);
378+
pbf_move_left_joystick(context, 255, 128, 1120ms, 0ms);
379379
pbf_press_dpad(context, DPAD_UP, 85, 0);
380380
for (size_t c = 0; c < 7; c++){
381-
pbf_move_left_joystick(context, 0, 128, 140, 0);
382-
pbf_move_left_joystick(context, 255, 128, 140, 0);
381+
pbf_move_left_joystick(context, {-1, 0}, 1120ms, 0ms);
382+
pbf_move_left_joystick(context, 255, 128, 1120ms, 0ms);
383383
}
384384
pbf_press_dpad(context, DPAD_DOWN, 75, 0);
385385
}

‎SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ bool MoneyFarmerRoute212::heal_after_battle_and_return(
281281

282282
void MoneyFarmerRoute212::charge_vs_seeker(ProControllerContext& context){
283283
for (size_t c = 0; c < 5; c++){
284-
pbf_move_left_joystick(context, 0, 128, 180, 0);
285-
pbf_move_left_joystick(context, 255, 128, 180, 0);
284+
pbf_move_left_joystick(context, {-1, 0}, 1440ms, 0ms);
285+
pbf_move_left_joystick(context, 255, 128, 1440ms, 0ms);
286286
}
287287
}
288288

@@ -335,7 +335,7 @@ void MoneyFarmerRoute212::program(SingleSwitchProgramEnvironment& env, ProContro
335335
}
336336

337337
// Move to woman.
338-
pbf_move_left_joystick(context, 0, 128, 52, 0);
338+
pbf_move_left_joystick(context, {-1, 0}, 416ms, 0ms);
339339

340340
context.wait_for_all_requests();
341341
stats.m_searches++;
@@ -392,7 +392,7 @@ void MoneyFarmerRoute212::program(SingleSwitchProgramEnvironment& env, ProContro
392392
env.update_stats();
393393

394394
if (woman){
395-
// pbf_move_left_joystick(context, 0, 128, 52, 0);
395+
// pbf_move_left_joystick(context, {-1, 0}, 416ms, 0ms);
396396
pbf_move_left_joystick(context, 128, 255, 80ms, 0ms);
397397

398398
// Battle woman.
@@ -416,10 +416,10 @@ void MoneyFarmerRoute212::program(SingleSwitchProgramEnvironment& env, ProContro
416416
#endif
417417

418418
// if (woman){
419-
pbf_move_left_joystick(context, 0, 128, 52, 0);
419+
pbf_move_left_joystick(context, {-1, 0}, 416ms, 0ms);
420420
pbf_move_left_joystick(context, 128, 255, 80ms, 0ms);
421421
// }else{
422-
// pbf_move_left_joystick(context, 0, 128, 105, 0);
422+
// pbf_move_left_joystick(context, {-1, 0}, 840ms, 0ms);
423423
// pbf_move_left_joystick(context, 128, 255, 80ms, 0ms);
424424
// }
425425

‎SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ void goto_professor(Logger& logger, ProControllerContext& context, Camp camp){
3838
pbf_move_left_joystick(context, 255, 64, 160, 0);
3939
return;
4040
case Camp::MIRELANDS_BOGBOUND:
41-
pbf_move_left_joystick(context, 255, 64, 140, 0);
41+
pbf_move_left_joystick(context, 255, 64, 1120ms, 0ms);
4242
return;
4343
case Camp::COASTLANDS_BEACHSIDE:
4444
pbf_move_left_joystick(context, 255, 96, 1000ms, 0ms);

‎SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ void CrobatFinder::run_iteration(SingleSwitchProgramEnvironment& env, ProControl
148148

149149
// FORWARD PORTION OF CAVE UNTIL LEDGE
150150
pbf_press_button(context, BUTTON_B, 2200ms, 640ms); // wyrdeer sprint
151-
pbf_move_left_joystick(context, 0, 128, 10, 20); // turn left
151+
pbf_move_left_joystick(context, {-1, 0}, 80ms, 160ms); // turn left
152152
pbf_press_button(context, BUTTON_ZL, 20, 50); // align camera
153153

154154
// ASCEND THE LEDGE WITH BRAVIARY

‎SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ void GalladeFinder::run_iteration(SingleSwitchProgramEnvironment& env, ProContro
143143
destination_time = current_time();
144144
shiny_action.store(&SHINY_DETECTED_DESTINATION, std::memory_order_release);
145145

146-
pbf_move_left_joystick(context, 0, 128, 2000ms, 0ms); // left
146+
pbf_move_left_joystick(context, {-1, 0}, 2000ms, 0ms); // left
147147

148148
// then forward left
149149
pbf_move_left_joystick(context, 0, 0, 1100ms, 0ms);

‎SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ bool TrainerBattleState::attempt_one_attack(
135135
void TrainerBattleState::run_lock_recovery(ConsoleHandle& console, ProControllerContext& context){
136136
console.log("Failed to lock on. Rotating camera...", COLOR_RED);
137137

138-
ssf_press_right_joystick(context, 0, 128, 0ms, 1000ms, 0ms);
138+
ssf_press_right_joystick(context, {-1, 0}, 0ms, 1000ms, 0ms);
139139
pbf_mash_button(context, BUTTON_ZL, 1000ms);
140140
context.wait_for_all_requests();
141141
}

‎SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_SewerHunter.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ void run_forward_backward_to_wall(
125125
void route_klefki(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
126126
ssf_press_button(context, BUTTON_B, 0ms, 500ms, 0ms);
127127
pbf_move_left_joystick(context, 128, 0, 4900ms, 0ms);
128-
pbf_move_left_joystick(context, 0, 128, 1000ms, 0ms);
128+
pbf_move_left_joystick(context, {-1, 0}, 1000ms, 0ms);
129129
pbf_press_button(context, BUTTON_L, 100ms, 500ms);
130130
fly_back_to_sewers_entrance(env.console, context);
131131
}

‎SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,11 @@ void ShinyHunt_BenchSit::program(SingleSwitchProgramEnvironment& env, ProControl
211211
}else if (WALK_DIRECTION.current_value() == 1){ // left
212212
env.console.overlay().add_log("Move Left");
213213
ssf_press_button(context, BUTTON_B, 0ms, duration, 0ms);
214-
pbf_move_left_joystick(context, 0, 128, duration, 0ms);
214+
pbf_move_left_joystick(context, {-1, 0}, duration, 0ms);
215215
pbf_press_button(context, BUTTON_L, 100ms, 400ms);
216216
ssf_press_button(context, BUTTON_B, 0ms, duration, 0ms);
217217
pbf_move_left_joystick(context, 128, 255, duration, 0ms);
218-
pbf_move_left_joystick(context, 0, 128, 100ms, 0ms);
218+
pbf_move_left_joystick(context, {-1, 0}, 100ms, 0ms);
219219
}else if (WALK_DIRECTION.current_value() == 2){ // right
220220
env.console.overlay().add_log("Move Right");
221221
ssf_press_button(context, BUTTON_B, 0ms, duration, 0ms);

0 commit comments

Comments
 (0)