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 @@ -131,7 +131,7 @@ void checkpoint_02(
env.console.log("Go to the kitchen, talk with mom");
env.console.overlay().add_log("Go to the kitchen, talk with mom", COLOR_WHITE);
pbf_move_left_joystick(context, {0, -1}, 2000ms, 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, 60000ms, 0, 128);

env.console.log("clear_dialog: Talk with Mom.");
clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 5, {});
Expand All @@ -140,7 +140,7 @@ void checkpoint_02(
env.console.log("Go to the front door, talk with Clavell");
env.console.overlay().add_log("Go to the front door, talk with Clavell", COLOR_WHITE);
pbf_move_left_joystick(context, 230, 200, 2000ms, 160ms);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60, 255, 128);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms, 255, 128);

env.console.log("clear_dialog: Talk with Clavell at front door.");
clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 5, {});
Expand All @@ -162,15 +162,15 @@ 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, 60000ms, 0, 128);

env.console.log("clear_dialog: Talk with Clavell at living room.");
clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 10, {});

context.wait_for_all_requests();
env.console.log("Go outside, receive Rotom Phone");
env.console.overlay().add_log("Go outside, receive Rotom Phone", COLOR_WHITE);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60, 245, 230);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms, 245, 230);

env.console.log("clear_dialog: Talk with Clavell outside. Receive Rotom phone. Stop when detect overworld.");
clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::WHITE_A_BUTTON});
Expand Down Expand Up @@ -201,7 +201,7 @@ void checkpoint_03(
pbf_move_left_joystick(context, {-1, 0}, 240ms, 400ms);

direction.change_direction(env.program_info(), env.console, context, 4.62);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms);

context.wait_for_all_requests();
env.console.log("Entered Nemona's house");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ void checkpoint_04(
direction.change_direction(env.program_info(), env.console, context, 4.55);
pbf_move_left_joystick(context, {0, +1}, 4800ms, 400ms);
direction.change_direction(env.program_info(), env.console, context, 5.27);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 20);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 20000ms);

context.wait_for_all_requests();
env.console.log("Starting battle...");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ void checkpoint_05(
direction.change_direction(env.program_info(), env.console, context, 1.92);
pbf_move_left_joystick(context, {0, +1}, 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);

walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms);
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
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ void checkpoint_08(
context.wait_for_all_requests();
clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 10, {});
env.console.log("Go to Legendary pokemon laying on the beach.");
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 30);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 30000ms);

env.console.log("clear_dialog: Offer Miraidon/Koraidon a sandwich.");
clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 10, {});
Expand Down 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, 60000ms, 128, 0);
}
);

Expand Down Expand Up @@ -190,7 +190,7 @@ void checkpoint_08(
);

env.console.log("overworld_navigation: Go to Houndoom.");
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, 60000ms, 128, 0);

mash_button_till_overworld(env.console, context, BUTTON_A);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ void checkpoint_13(
context.wait_for_all_requests();
realign_player(info, env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 0, 80, 50);
walk_forward_while_clear_front_path(info, env.console, context, 500);
walk_forward_until_dialog(info, env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 30);
walk_forward_until_dialog(info, env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 30000ms);
});

env.console.log("clear_dialog: Talk with Nemona at Mesagoza gate. Stop when detect battle.");
Expand Down Expand Up @@ -151,7 +151,7 @@ void checkpoint_14(
// realign going straight
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 128, 0, 100);
// walk forward until hit dialog at top of stairs
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms);
// clear dialog until battle. with prompt, battle
env.console.log("clear_dialog: Talk with Team Star at the top of the stairs. Stop when detect battle.");
clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
Expand Down Expand Up @@ -194,7 +194,7 @@ void checkpoint_15(
// realign going straight
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
// walk forward until hit dialog inside the school
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms);

env.console.log("clear_dialog: Talk with Nemona, Clavell, and Jacq inside the school. Stop when detect overworld.");
clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ void checkpoint_17(
context.wait_for_all_requests();

// walk backwards until dialog
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20, 128, 255);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms, 128, 255);
env.console.log("Talk with Cassiopeia.");
mash_button_till_overworld(env.console, context, BUTTON_A, 360);

Expand Down Expand Up @@ -277,7 +277,7 @@ void checkpoint_20(
env.console.log("Leave dorm for schoolyard.");
mash_button_till_overworld(env.console, context, BUTTON_A, 360);

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, 60000ms, 128, 0);

env.console.log("Talk to Nemona, Arven, Cassiopeia.");
clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 16,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ void checkpoint_24(
context.wait_for_all_requests();
handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, {-1, +1}, 800ms, 160ms);
Expand All @@ -145,7 +145,7 @@ void checkpoint_24(
// enter gym building. talk go Nemona
mash_button_till_overworld(env.console, context, BUTTON_A, 360);
// talk to receptionist
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms);
clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});

pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
Expand Down Expand Up @@ -184,7 +184,7 @@ void checkpoint_25(
// section 1.1. keep walking forward and talk to Olive roll NPC
do_action_and_monitor_for_battles(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms);
}
);
mash_button_till_overworld(env.console, context, BUTTON_A);
Expand All @@ -207,7 +207,7 @@ void checkpoint_25(

// section 5. battle first NPC
direction.change_direction(env.program_info(), env.console, context, 1.485);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10, 128, 20);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms, 128, 20);
clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
env.console.log("Battle Olive Roll NPC 1.");
run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
Expand All @@ -227,7 +227,7 @@ void checkpoint_25(

// section 9. battle second NPC
direction.change_direction(env.program_info(), env.console, context, 4.275);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10, 128, 20);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms, 128, 20);
clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
env.console.log("Battle Olive Roll NPC 2.");
run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
Expand Down Expand Up @@ -261,7 +261,7 @@ void checkpoint_26(
reset_game_from_home(env.program_info(), env.console, context);

// talk to Olive roll NPC
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10, 128, 20);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms, 128, 20);
mash_button_till_overworld(env.console, context, BUTTON_A);

// section 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void checkpoint_28(
wait_for_overworld(env.program_info(), env.console, context);

// talk to receptionist
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms);
clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW});

// battle Katy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ void checkpoint_35(
wait_for_overworld(env.program_info(), env.console, context, 30);

pbf_move_left_joystick(context, 128, 0, 120, 100);
direction.change_direction(env.program_info(), env.console, context, 5.11);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20);
direction.change_direction(env.program_info(), env.console, context, 5.11);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms);
mash_button_till_overworld(env.console, context, BUTTON_A);

});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void checkpoint_37(
128, 0, 30, 10, false);
// section 3. set marker to shop/Kofu
realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 0, 140, 27);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms);

clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW});
env.console.log("Battle Kofu's assistant.");
Expand Down Expand Up @@ -166,7 +166,7 @@ void checkpoint_38(

handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 18);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 18000ms);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, {+1, +1}, 800ms, 400ms);
Expand All @@ -177,7 +177,7 @@ void checkpoint_38(
mash_button_till_overworld(env.console, context, BUTTON_A, 360);

// talk to reception. Battle Kofu
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms);
clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW});
env.console.log("Battle Water Gym.");
run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ void checkpoint_43(

handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, {-1, +1}, 800ms, 400ms);
Expand Down Expand Up @@ -179,7 +179,7 @@ void checkpoint_44(

// talk to receptionist
env.console.log("Talk to Artazon gym receptionist.");
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms);
clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});

pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
Expand All @@ -190,7 +190,7 @@ void checkpoint_44(
// talk to Sunflora NPC
DirectionDetector direction;
direction.change_direction(env.program_info(), env.console, context, 4.91);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms);
clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});

// realign to wall
Expand Down Expand Up @@ -521,7 +521,7 @@ void checkpoint_45(

handle_when_stationary_in_overworld(env.program_info(), env.console, context,
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 20);
walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 20000ms);
},
[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
pbf_move_left_joystick(context, {-1, +1}, 800ms, 400ms);
Expand Down
Loading