Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,16 @@ void AutoStory::test_checkpoints(
checkpoint_list.push_back([&](){checkpoint_58(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_59(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_60(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_61(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_62(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_63(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_64(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_65(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_66(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_67(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_68(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_69(env, context, notif_status_update, stats);});
checkpoint_list.push_back([&](){checkpoint_70(env, context, notif_status_update, stats);});


for (int checkpoint = start; checkpoint <= end; checkpoint++){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ void clear_dialog(VideoStream& stream, ProControllerContext& context,

AdvanceDialogWatcher advance_dialog(COLOR_RED);
OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
PromptDialogWatcher prompt(COLOR_YELLOW);
PromptDialogWatcher prompt(COLOR_YELLOW, {0.50, 0.30, 0.40, 0.60});
WhiteButtonWatcher whitebutton(COLOR_GREEN, WhiteButton::ButtonA_DarkBackground, {0.725, 0.833, 0.024, 0.045}); // {0.650, 0.650, 0.140, 0.240}
DialogArrowWatcher dialog_arrow(COLOR_RED, stream.overlay(), {0.850, 0.820, 0.020, 0.050}, 0.8365, 0.846);
NormalBattleMenuWatcher battle(COLOR_ORANGE);
Expand Down Expand Up @@ -1153,218 +1153,6 @@ void checkpoint_reattempt_loop_tutorial(
}


void move_from_medali_to_glaseado_mountain(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
context.wait_for_all_requests();


// marker 1. x=0.399479, y=0.713889
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
{ZoomChange::KEEP_ZOOM, 0, 0, 0},
FlyPoint::POKECENTER,
{0.399479, 0.713889}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
128, 0, 20, 10, false);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, 0, 255, 40, 50);
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
}
);


// marker 2. x=0.410417, y=0.760185
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
{ZoomChange::KEEP_ZOOM, 255, 0, 30},
FlyPoint::POKECENTER,
{0.410417, 0.760185}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
128, 0, 30, 10, false);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, 0, 255, 40, 50);
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
}
);


// marker 3. : x=0.3875, y=0.712037
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
{ZoomChange::ZOOM_OUT, 0, 0, 0},
FlyPoint::POKECENTER,
{0.3875, 0.712037}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
128, 0, 40, 10, false);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, 0, 255, 40, 50);
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
}
);


// marker 4. cross creek x=0.502083, y=0.255556
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
{ZoomChange::ZOOM_OUT, 128, 0, 20},
FlyPoint::POKECENTER,
{0.502083, 0.255556}
);

get_on_ride(env.program_info(), env.console, context);

handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
128, 0, 20, 10, false);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, 128, 0, 500ms, 0ms);
pbf_controller_state(context, BUTTON_B, DPAD_NONE, 128, 0, 128, 128, 1000ms);
pbf_move_left_joystick(context, 128, 0, 500ms, 0ms);
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
}
);

get_off_ride(env.program_info(), env.console, context);



// marker 5. x=0.461458, y=0.297222
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
{ZoomChange::ZOOM_OUT, 0, 0, 0},
FlyPoint::POKECENTER,
{0.461458, 0.297222}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
128, 0, 30, 10, false);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, 255, 255, 40, 50);
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
}
);

// marker 6. x=0.451562, y=0.288889
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
{ZoomChange::KEEP_ZOOM, 128, 0, 50},
FlyPoint::POKECENTER,
{0.451562, 0.288889}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
128, 0, 40, 10, false);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, 0, 255, 40, 50);
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
}
);


// marker 7. : x=0.623958, y=0.35463
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 0, 50},
FlyPoint::POKECENTER,
{0.623958, 0.35463}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
128, 0, 30, 10, false);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, 0, 255, 40, 50);
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
}
);

// marker 8. x=0.544271, y=0.5
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 0, 0},
FlyPoint::POKECENTER,
{0.544271, 0.5}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
128, 0, 20, 10, false);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, 0, 255, 40, 50);
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
}
);

// marker 9. : x=0.417708, y=0.388889
place_marker_offset_from_flypoint(env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 0, 0},
FlyPoint::POKECENTER,
{0.417708, 0.388889}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
128, 0, 20, 10, false);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, 255, 255, 40, 50);
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
}
);


// marker 10. set marker to pokecenter
realign_player_from_landmark(
env.program_info(), env.console, context,
{ZoomChange::ZOOM_IN, 0, 0, 0},
{ZoomChange::KEEP_ZOOM, 0, 0, 0}
);
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
128, 0, 20, 10, false);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, 255, 255, 40, 50);
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
}
);

// marker 11. set marker past pokecenter
handle_unexpected_battles(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 20, 0, 40);
});
overworld_navigation(env.program_info(), env.console, context,
NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY,
128, 15, 12, 12, false); // can't wrap in handle_when_stationary_in_overworld(), since we expect to be stationary when walking into the pokecenter


fly_to_overlapping_flypoint(env.program_info(), env.console, context);

}


void move_from_glaseado_mountain_to_casseroya_watchtower3(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
context.wait_for_all_requests();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,6 @@ void checkpoint_reattempt_loop_tutorial(
);


// moves player from Medali West Pokecenter to Glaseado Mountain Pokecenter
void move_from_medali_to_glaseado_mountain(SingleSwitchProgramEnvironment& env, ProControllerContext& context);

// moves player from Glaseado Mountain Pokecenter to Casseroya Watchtower 3
void move_from_glaseado_mountain_to_casseroya_watchtower3(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ void checkpoint_59(
[&](ProControllerContext& context){

DirectionDetector direction;
uint16_t seconds_wait = 8; // todo: change back to 6-8
uint16_t seconds_wait = 8;

direction.change_direction(env.program_info(), env.console, context, 2.618972);
pbf_move_left_joystick(context, 128, 0, 100, 50);
Expand Down
Loading