Skip to content

Commit 94fb8e1

Browse files
authored
Flying trial farmer (#544)
* fix flying trial farmer for esp32 * minor tweak to FlyingTrialFarmer
1 parent 2d17f02 commit 94fb8e1

File tree

1 file changed

+22
-9
lines changed

1 file changed

+22
-9
lines changed

SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_FlyingTrialFarmer.cpp

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -216,15 +216,28 @@ void FlyingTrialFarmer::program(SingleSwitchProgramEnvironment& env, ProControll
216216
pbf_wait(context, 9 * TICKS_PER_SECOND);
217217
break;
218218
case FlightPath::BACK_ENTRY_SOFT_TURN:
219-
pbf_wait(context, 3 * TICKS_PER_SECOND);
220-
pbf_move_left_joystick(context, 180, get_final_y_axis(-108), 1 * TICKS_PER_SECOND, 0);
221-
pbf_wait(context, 2 * TICKS_PER_SECOND);
222-
pbf_move_left_joystick(context, 40, get_final_y_axis( -78), 240, 0);
223-
pbf_wait(context, 1 * TICKS_PER_SECOND);
224-
pbf_move_left_joystick(context, 110, get_final_y_axis( -78), 2 * TICKS_PER_SECOND, 0);
225-
pbf_wait(context, 14 * TICKS_PER_SECOND);
226-
pbf_move_left_joystick(context, 205, get_final_y_axis( 37), 160, 0);
227-
pbf_wait(context, 9 * TICKS_PER_SECOND);
219+
if (env.console.controller().controller_type() == ControllerType::NintendoSwitch_WirelessProController){
220+
pbf_wait(context, Milliseconds(3000));
221+
pbf_move_left_joystick(context, 180, get_final_y_axis(-108), Milliseconds(1005), Milliseconds(0));
222+
pbf_wait(context, Milliseconds(1995));
223+
pbf_move_left_joystick(context, 40, get_final_y_axis( -78), Milliseconds(1605), Milliseconds(0));
224+
pbf_wait(context, Milliseconds(1005));
225+
pbf_move_left_joystick(context, 110, get_final_y_axis( -78), Milliseconds(1995), Milliseconds(0));
226+
pbf_wait(context, Milliseconds(14040));
227+
pbf_move_left_joystick(context, 205, get_final_y_axis( 30), Milliseconds(735), Milliseconds(0));
228+
pbf_wait(context, Milliseconds(9000));
229+
}else{
230+
pbf_wait(context, 3 * TICKS_PER_SECOND);
231+
pbf_move_left_joystick(context, 180, get_final_y_axis(-108), 1 * TICKS_PER_SECOND, 0);
232+
pbf_wait(context, 2 * TICKS_PER_SECOND);
233+
pbf_move_left_joystick(context, 40, get_final_y_axis( -78), 240, 0);
234+
pbf_wait(context, 1 * TICKS_PER_SECOND);
235+
pbf_move_left_joystick(context, 110, get_final_y_axis( -78), 2 * TICKS_PER_SECOND, 0);
236+
pbf_wait(context, 14 * TICKS_PER_SECOND);
237+
pbf_move_left_joystick(context, 205, get_final_y_axis( 37), 160, 0);
238+
pbf_wait(context, 9 * TICKS_PER_SECOND);
239+
}
240+
228241
break;
229242
case FlightPath::BACK_ENTRY_HARD_TURN:
230243
pbf_wait(context, 3 * TICKS_PER_SECOND);

0 commit comments

Comments
 (0)