Skip to content

Commit adaa185

Browse files
committed
More TICKS_PER_SECOND.
1 parent 307489f commit adaa185

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ void area_zero_platform_run_path0(
312312

313313
// Move forward and kill everything in your path.
314314
stream.log("Moving towards sky and killing everything...");
315-
uint16_t duration = 325;
315+
Milliseconds duration = 2600ms;
316316
use_lets_go_to_clear_in_front(stream, context, tracker, true, [&](ProControllerContext& context){
317317
find_and_center_on_sky(env, stream, context);
318318
pbf_move_right_joystick(context, 128, 255, 70, 0);
@@ -321,7 +321,7 @@ void area_zero_platform_run_path0(
321321
switch (iteration_count % 4){
322322
case 0:
323323
x = 96;
324-
duration = 250;
324+
duration = 2000ms;
325325
break;
326326
case 1:
327327
x = 112;
@@ -335,10 +335,10 @@ void area_zero_platform_run_path0(
335335
}
336336

337337
ssf_press_button(context, BUTTON_L, 0ms, 160ms);
338-
pbf_move_left_joystick(context, x, 0, duration, 0);
338+
pbf_move_left_joystick(context, x, 0, duration, 0ms);
339339
});
340340
use_lets_go_to_clear_in_front(stream, context, tracker, true, [&](ProControllerContext& context){
341-
pbf_move_left_joystick(context, 128, 255, duration, 4 * TICKS_PER_SECOND);
341+
pbf_move_left_joystick(context, 128, 255, duration, 4000ms);
342342
});
343343
}
344344
void area_zero_platform_run_path1(
@@ -369,7 +369,7 @@ void area_zero_platform_run_path1(
369369

370370
// Clear the wall.
371371
stream.log("Clear the wall...");
372-
uint16_t duration = 325;
372+
Milliseconds duration = 2600ms;
373373
use_lets_go_to_clear_in_front(stream, context, tracker, true, [&](ProControllerContext& context){
374374
pbf_move_left_joystick(context, 255, 128, 125, 0);
375375
pbf_press_button(context, BUTTON_L, 20, 50);
@@ -385,7 +385,7 @@ void area_zero_platform_run_path1(
385385
switch (iteration_count % 4){
386386
case 0:
387387
x = 96;
388-
duration = 250;
388+
duration = 2000ms;
389389
break;
390390
case 1:
391391
x = 112;
@@ -398,15 +398,15 @@ void area_zero_platform_run_path1(
398398
break;
399399
}
400400

401-
pbf_move_left_joystick(context, x, 0, duration, 0);
401+
pbf_move_left_joystick(context, x, 0, duration, 0ms);
402402
});
403403

404404
stream.log("Run backwards and wait...");
405405
use_lets_go_to_clear_in_front(stream, context, tracker, true, [&](ProControllerContext& context){
406406
// pbf_move_left_joystick(context, 64, 0, 125, 0);
407407
// pbf_press_button(context, BUTTON_L, 20, 105);
408-
pbf_move_left_joystick(context, 128, 255, duration, 4 * TICKS_PER_SECOND);
409-
// pbf_controller_state(context, 0, DPAD_NONE, 255, 255, 120, 128, 3 * TICKS_PER_SECOND);
408+
pbf_move_left_joystick(context, 128, 255, duration, 4000ms);
409+
// pbf_controller_state(context, 0, DPAD_NONE, 255, 255, 120, 128, 3000ms);
410410
});
411411
}
412412

@@ -529,20 +529,20 @@ void area_zero_platform_run_path2(
529529
stream.log("Move forward, fire, and retreat.");
530530
switch (iteration_count % 3){
531531
case 0:
532-
pbf_move_left_joystick(context, 108, 0, 300, 0);
532+
pbf_move_left_joystick(context, {-0.15625, +1}, 2400ms, 0ms);
533533
break;
534534
case 1:
535-
pbf_move_left_joystick(context, 128, 0, 300, 0);
535+
pbf_move_left_joystick(context, {0, +1}, 2400ms, 0ms);
536536
break;
537537
case 2:
538-
pbf_move_left_joystick(context, 144, 0, 300, 0);
538+
pbf_move_left_joystick(context, {+0.15625, +1}, 2400ms, 0ms);
539539
break;
540540
}
541541
});
542542

543543
use_lets_go_to_clear_in_front(stream, context, tracker, true, [&](ProControllerContext& context){
544-
pbf_move_left_joystick(context, 128, 255, 4000ms, 0ms);
545-
pbf_move_left_joystick(context, 128, 0, 60, 4 * TICKS_PER_SECOND);
544+
pbf_move_left_joystick(context, {0, -1}, 4000ms, 0ms);
545+
pbf_move_left_joystick(context, {0, +1}, 480ms, 4000ms);
546546
});
547547
}
548548

0 commit comments

Comments
 (0)