Skip to content

Commit c01c758

Browse files
committed
more tweaks to station 2 navigation
1 parent cf5d83f commit c01c758

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ void AutoStory_Checkpoint_97::run_checkpoint(SingleSwitchProgramEnvironment& env
9191

9292

9393
void checkpoint_96(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
94-
// checkpoint_reattempt_loop(env, context, notif_status_update, stats,
95-
// [&](size_t attempt_number){
94+
checkpoint_reattempt_loop(env, context, notif_status_update, stats,
95+
[&](size_t attempt_number){
9696

9797
YOLOv5Detector yolo_detector(RESOURCE_PATH() + "PokemonSV/YOLO/A0-station-2.onnx");
9898

@@ -112,7 +112,7 @@ void checkpoint_96(SingleSwitchProgramEnvironment& env, ProControllerContext& co
112112

113113
// move towards tree-2-1 until box: {0.721875, -0.005556, 0.087500, 0.366667}
114114
move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "tree-2-1",
115-
0.087500, 0.30,
115+
0.0900, 0.15,
116116
[&](){
117117
run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
118118
move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-2-1", 0.7);
@@ -169,7 +169,7 @@ void checkpoint_96(SingleSwitchProgramEnvironment& env, ProControllerContext& co
169169

170170
// move towards rock-2-2 until box: {0.385938, 0.175000, 0.223438, 0.355556}
171171
move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "rock-2-2",
172-
0.223438, 0.355556,
172+
0.223438, 0.30,
173173
[&](){
174174
run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
175175
move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-2-2", 0.5); // realign to target X
@@ -200,7 +200,7 @@ void checkpoint_96(SingleSwitchProgramEnvironment& env, ProControllerContext& co
200200
0.081250, 0.30,
201201
[&](){
202202
run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
203-
move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-2-2", 0.000); // realign to target X
203+
move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-2-2", 0.5); // realign to target X
204204
pbf_move_left_joystick(context, 128, 0, 10, 50); // move forward to align with camera
205205
}
206206
);
@@ -224,7 +224,7 @@ void checkpoint_96(SingleSwitchProgramEnvironment& env, ProControllerContext& co
224224

225225
// move forward until dirt-ramp not detected
226226
move_forward_until_yolo_object_not_detected(env, context, yolo_detector, "dirt-ramp",
227-
3,
227+
6,
228228
[&](){
229229
run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
230230
move_player_to_realign_via_yolo(env, context, yolo_detector, "dirt-ramp", 0.5);
@@ -323,7 +323,7 @@ void checkpoint_96(SingleSwitchProgramEnvironment& env, ProControllerContext& co
323323
#endif
324324

325325

326-
// });
326+
});
327327
}
328328

329329
void checkpoint_97(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){

0 commit comments

Comments
 (0)