Skip to content

Mat farm2 #1332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jw098 merged 1 commit into from
Jul 20, 2026
Merged

Mat farm2 #1332

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 7 additions & 23 deletions SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,19 +539,11 @@ void move_to_start_position_for_letsgo1(
// move toward clearing besides the pokecenter
pbf_move_left_joystick(context, {0, +1}, 2400ms, 80ms);

// look right, towards the start position. handle unexpected battles
// look right, towards the start position.
// don't throw error if caught in unexpected battle
// instead, allow the battle detector that wraps the parent function to trigger.
DirectionDetector direction;
do_action_and_run_from_battle(
info, stream, context,
[&](const ProgramInfo& info, VideoStream& stream,ProControllerContext& context){
try{
direction.change_direction(info, stream, context, 5.76);
}catch (OperationFailedException&){
context.wait_for(Seconds(5));
}
}
);

direction.change_direction(info, stream, context, 5.76, false);


// pbf_move_right_joystick(context, {+1, 0}, 1040ms, 80ms);
Expand Down Expand Up @@ -583,18 +575,10 @@ void move_to_start_position_for_letsgo1(
pbf_press_button(context, BUTTON_B, 400ms, 80ms);
pbf_press_button(context, BUTTON_B, 400ms, 80ms);

// look right. handle unexpected battles
// look right.
// don't throw error if caught in unexpected battle
// pbf_move_right_joystick(context, {+1, 0}, 160ms, 80ms);
do_action_and_run_from_battle(
info, stream, context,
[&](const ProgramInfo& info, VideoStream& stream,ProControllerContext& context){
try{
direction.change_direction(info, stream, context, 5.3);
}catch (OperationFailedException&){
context.wait_for(Seconds(5));
}
}
);
direction.change_direction(info, stream, context, 5.3, false);

// move forward slightly
pbf_move_left_joystick(context, {0, +1}, 400ms, 80ms);
Expand Down
Loading