Skip to content

Partial ticks migration for AutoStory. #919

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 4 commits into from
Dec 24, 2025
Merged

Partial ticks migration for AutoStory. #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
602c122
Partial ticks migration for AutoStory.
Mysticial Dec 22, 2025
9cb4312
Merge branch 'main' into autostory-ticks
Mysticial Dec 22, 2025
8d3fa35
Revert walk_forward_until_dialog() changes.
Mysticial Dec 22, 2025
c103488
minor
Mysticial Dec 22, 2025
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
12 changes: 6 additions & 6 deletions SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,8 +1207,8 @@ void realign_player_from_landmark(
}
uint8_t move_x1 = move_cursor_near_landmark.move_x;
uint8_t move_y1 = move_cursor_near_landmark.move_y;
uint16_t move_duration1 = move_cursor_near_landmark.move_duration;
pbf_move_left_joystick(context, move_x1, move_y1, move_duration1, 1 * TICKS_PER_SECOND);
Milliseconds move_duration1 = move_cursor_near_landmark.move_duration;
pbf_move_left_joystick(context, move_x1, move_y1, move_duration1, 1000ms);

// move cursor to pokecenter
double push_scale = 0.29 * adjustment_table[try_count];
Expand Down Expand Up @@ -1243,8 +1243,8 @@ void realign_player_from_landmark(
}
uint8_t move_x2 = move_cursor_to_target.move_x;
uint8_t move_y2 = move_cursor_to_target.move_y;
uint16_t move_duration2 = move_cursor_to_target.move_duration;
pbf_move_left_joystick(context, move_x2, move_y2, move_duration2, 1 * TICKS_PER_SECOND);
Milliseconds move_duration2 = move_cursor_to_target.move_duration;
pbf_move_left_joystick(context, move_x2, move_y2, move_duration2, 1000ms);

// place down marker
pbf_press_button(context, BUTTON_A, 160ms, 840ms);
Expand Down Expand Up @@ -1337,8 +1337,8 @@ void move_cursor_towards_flypoint_and_go_there(
}
uint8_t move_x1 = move_cursor_near_flypoint.move_x;
uint8_t move_y1 = move_cursor_near_flypoint.move_y;
uint16_t move_duration1 = move_cursor_near_flypoint.move_duration;
pbf_move_left_joystick(context, move_x1, move_y1, move_duration1, 1 * TICKS_PER_SECOND);
Milliseconds move_duration1 = move_cursor_near_flypoint.move_duration;
pbf_move_left_joystick(context, move_x1, move_y1, move_duration1, 1000ms);

double push_scale = 0.29 * adjustment_table[try_count];
if (!fly_to_visible_closest_flypoint_cur_zoom_level(info, stream, context, fly_point, push_scale)){
Expand Down
2 changes: 1 addition & 1 deletion SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ void checkpoint_02(
pbf_move_left_joystick(context, 0, 0, 3000ms, 160ms);
pbf_move_left_joystick(context, 0, 128, 3000ms, 160ms);
pbf_move_left_joystick(context, {0, -1}, 4000ms, 160ms);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60, 0, 128);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60, 0, 128);

env.console.log("clear_dialog: Talk with Clavell at living room.");
clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 10, {});
Expand Down
2 changes: 1 addition & 1 deletion SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ void checkpoint_05(
pbf_move_left_joystick(context, 128, 0, 7000ms, 400ms);
direction.change_direction(env.program_info(), env.console, context, 1.13);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20);

context.wait_for_all_requests();
env.console.log("Get mom's sandwich");
env.console.overlay().add_log("Get mom's sandwich", COLOR_WHITE);
Expand Down
2 changes: 1 addition & 1 deletion SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ void checkpoint_08(
realign_player(env.program_info(), stream, context, PlayerRealignMode::REALIGN_NO_MARKER, 150, 20, 20);
pbf_move_left_joystick(context, 128, 0, 1000, 50);
realign_player(env.program_info(), stream, context, PlayerRealignMode::REALIGN_NO_MARKER, 160, 20, 20);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60, 128, 0);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60, 128, 0);
}
);

Expand Down
28 changes: 14 additions & 14 deletions SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ void checkpoint_22(
// section 1
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 128, 80},
{ZoomChange::KEEP_ZOOM, 255, 80, 37}
{ZoomChange::ZOOM_IN, 0, 128, 640ms},
{ZoomChange::KEEP_ZOOM, 255, 80, 296ms}
);
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
Expand All @@ -168,8 +168,8 @@ void checkpoint_22(
// section 2
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 128, 40},
{ZoomChange::KEEP_ZOOM, 255, 255, 27}
{ZoomChange::ZOOM_IN, 0, 128, 320ms},
{ZoomChange::KEEP_ZOOM, 255, 255, 216ms}
);
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
Expand All @@ -178,8 +178,8 @@ void checkpoint_22(
// section 3. set marker to pokecenter
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 128, 128, 0},
{ZoomChange::KEEP_ZOOM, 128, 128, 0}
{ZoomChange::ZOOM_IN, 128, 128, 0ms},
{ZoomChange::KEEP_ZOOM, 128, 128, 0ms}
);
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
Expand Down Expand Up @@ -225,8 +225,8 @@ void checkpoint_23(
// section 2
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 128, 80},
{ZoomChange::KEEP_ZOOM, 255, 95, 100}
{ZoomChange::ZOOM_IN, 0, 128, 640ms},
{ZoomChange::KEEP_ZOOM, 255, 95, 800ms}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
Expand All @@ -243,8 +243,8 @@ void checkpoint_23(
// section 3
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 128, 80},
{ZoomChange::KEEP_ZOOM, 255, 75, 65}
{ZoomChange::ZOOM_IN, 0, 128, 640ms},
{ZoomChange::KEEP_ZOOM, 255, 75, 520ms}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
Expand All @@ -261,8 +261,8 @@ void checkpoint_23(
// section 4
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 128, 50},
{ZoomChange::KEEP_ZOOM, 255, 180, 17}
{ZoomChange::ZOOM_IN, 0, 128, 400ms},
{ZoomChange::KEEP_ZOOM, 255, 180, 136ms}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
Expand All @@ -279,8 +279,8 @@ void checkpoint_23(
// section 5. set marker to pokecenter
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 128, 128, 0},
{ZoomChange::KEEP_ZOOM, 128, 128, 0}
{ZoomChange::ZOOM_IN, 128, 128, 0ms},
{ZoomChange::KEEP_ZOOM, 128, 128, 0ms}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
Expand Down
6 changes: 3 additions & 3 deletions SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ void checkpoint_24(
DirectionDetector direction;
if (attempt_number > 0 || ENABLE_TEST){
env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0});
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0});
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0ms});
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0ms});
}

do_action_and_monitor_for_battles(env.program_info(), env.console, context,
Expand Down Expand Up @@ -610,7 +610,7 @@ void checkpoint_27(
checkpoint_reattempt_loop(env, context, notif_status_update, stats,
[&](size_t attempt_number){
context.wait_for_all_requests();
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 255, 128, 40});
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 255, 128, 320ms});

});

Expand Down
4 changes: 2 additions & 2 deletions SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ void checkpoint_28(
DirectionDetector direction;
if (attempt_number > 0 || ENABLE_TEST){
env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0});
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0});
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0ms});
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0ms});
}

do_action_and_monitor_for_battles(env.program_info(), env.console, context,
Expand Down
56 changes: 28 additions & 28 deletions SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ void checkpoint_29(

if (attempt_number > 0 || ENABLE_TEST){
env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0});
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0});
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0ms});
move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, 0, 0ms});
}

// align for long stretch 1, part 1
Expand All @@ -102,8 +102,8 @@ void checkpoint_29(
// align for long stretch 1, part 2
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 128, 255, 40},
{ZoomChange::KEEP_ZOOM, 80, 0, 75}
{ZoomChange::ZOOM_IN, 128, 255, 320ms},
{ZoomChange::KEEP_ZOOM, 80, 0, 600ms}
);

handle_when_stationary_in_overworld(env.program_info(), env.console, context,
Expand All @@ -122,8 +122,8 @@ void checkpoint_29(

realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 128, 255, 60},
{ZoomChange::KEEP_ZOOM, 95, 0, 115}
{ZoomChange::ZOOM_IN, 128, 255, 480ms},
{ZoomChange::KEEP_ZOOM, 95, 0, 920ms}
);

handle_when_stationary_in_overworld(env.program_info(), env.console, context,
Expand All @@ -141,8 +141,8 @@ void checkpoint_29(
// align for long stretch 2
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 128, 255, 100},
{ZoomChange::KEEP_ZOOM, 0, 105, 65}
{ZoomChange::ZOOM_IN, 128, 255, 800ms},
{ZoomChange::KEEP_ZOOM, 0, 105, 520ms}
);

handle_when_stationary_in_overworld(env.program_info(), env.console, context,
Expand All @@ -160,8 +160,8 @@ void checkpoint_29(
// align for long stretch 3, part 1
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 255, 128, 65},
{ZoomChange::KEEP_ZOOM, 0, 50, 87}
{ZoomChange::ZOOM_IN, 255, 128, 520ms},
{ZoomChange::KEEP_ZOOM, 0, 50, 696ms}
);


Expand All @@ -180,8 +180,8 @@ void checkpoint_29(
// align for long stretch 3, part 2
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 255, 160, 65},
{ZoomChange::KEEP_ZOOM, 20, 0, 110}
{ZoomChange::ZOOM_IN, 255, 160, 520ms},
{ZoomChange::KEEP_ZOOM, 20, 0, 880ms}
);


Expand All @@ -200,8 +200,8 @@ void checkpoint_29(
// align for long stretch 3, part 3
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 60, 110},
{ZoomChange::KEEP_ZOOM, 255, 128, 115}
{ZoomChange::ZOOM_IN, 0, 60, 880ms},
{ZoomChange::KEEP_ZOOM, 255, 128, 920ms}
);


Expand All @@ -226,7 +226,7 @@ void checkpoint_29(

//align for long stretch 3, part 4. just prior to bridge. {0.339062, 0.612037}
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
{ZoomChange::KEEP_ZOOM, 0, 0, 0},
{ZoomChange::KEEP_ZOOM, 0, 0, 0ms},
FlyPoint::POKECENTER,
{0.339062, 0.612037}
);
Expand All @@ -253,7 +253,7 @@ void checkpoint_29(

// align to cross bridge {0.385937, 0.615741}
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
{ZoomChange::KEEP_ZOOM, 0, 0, 0},
{ZoomChange::KEEP_ZOOM, 0, 0, 0ms},
FlyPoint::POKECENTER,
{0.385937, 0.615741}
);
Expand Down Expand Up @@ -290,7 +290,7 @@ void checkpoint_29(
// walk back to start position before bridge
// {0.310937, 0.580556} {0.310937, 0.589815} {0.310937, 0.584259}
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
{ZoomChange::KEEP_ZOOM, 0, 0, 0},
{ZoomChange::KEEP_ZOOM, 0, 0, 0ms},
FlyPoint::POKECENTER,
{0.310937, 0.584259}
);
Expand All @@ -309,7 +309,7 @@ void checkpoint_29(

// align to cross bridge {0.385937, 0.615741}
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
{ZoomChange::KEEP_ZOOM, 0, 0, 0},
{ZoomChange::KEEP_ZOOM, 0, 0, 0ms},
FlyPoint::POKECENTER,
{0.385937, 0.615741}
);
Expand All @@ -330,8 +330,8 @@ void checkpoint_29(
// align for post-bridge section 1
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 150, 60},
{ZoomChange::KEEP_ZOOM, 255, 60, 50} // {ZoomChange::KEEP_ZOOM, 255, 60, 50}
{ZoomChange::ZOOM_IN, 0, 150, 480ms},
{ZoomChange::KEEP_ZOOM, 255, 60, 400ms} // {ZoomChange::KEEP_ZOOM, 255, 60, 50}
);


Expand All @@ -351,8 +351,8 @@ void checkpoint_29(
// align for post-bridge section 2
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 150, 60},
{ZoomChange::KEEP_ZOOM, 255, 105, 50}
{ZoomChange::ZOOM_IN, 0, 150, 480ms},
{ZoomChange::KEEP_ZOOM, 255, 105, 400ms}
);


Expand All @@ -371,8 +371,8 @@ void checkpoint_29(
// align for post-bridge section 3. move up towards tree
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 128, 50},
{ZoomChange::KEEP_ZOOM, 255, 90, 35}
{ZoomChange::ZOOM_IN, 0, 128, 400ms},
{ZoomChange::KEEP_ZOOM, 255, 90, 280ms}
);


Expand All @@ -391,8 +391,8 @@ void checkpoint_29(
// align for post-bridge section 4
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 128, 50},
{ZoomChange::KEEP_ZOOM, 255, 55, 25}
{ZoomChange::ZOOM_IN, 0, 128, 400ms},
{ZoomChange::KEEP_ZOOM, 255, 55, 200ms}
);


Expand All @@ -413,8 +413,8 @@ void checkpoint_29(
// align for post-bridge section 5. set marker to pokecenter.
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 128, 50},
{ZoomChange::KEEP_ZOOM, 128, 128, 0}
{ZoomChange::ZOOM_IN, 0, 128, 400ms},
{ZoomChange::KEEP_ZOOM, 128, 128, 0ms}
);


Expand Down
Loading