Skip to content

Commit 7a73134

Browse files
committed
Fix SwSh egg autonomous when missing daycare lady.
1 parent cd1a3ff commit 7a73134

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ void EggAutonomous::save_game(SingleSwitchProgramEnvironment& env, ProController
455455
pbf_press_button(context, BUTTON_X, 80ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
456456
pbf_press_button(context, BUTTON_R, 80ms, 2000ms);
457457
pbf_mash_button(context, BUTTON_A, 500ms);
458-
wait_for_y_comm_icon(env, context, "Cannot detect end of saving game.");
458+
mash_B_until_y_comm_icon(env, context, "Cannot detect end of saving game.");
459459
}
460460

461461
void EggAutonomous::call_flying_taxi(
@@ -474,7 +474,7 @@ void EggAutonomous::call_flying_taxi(
474474
navigate_to_menu_app(env, env.console, context, TOWN_MAP_APP_INDEX, NOTIFICATION_ERROR_RECOVERABLE);
475475

476476
fly_home(context, false);
477-
wait_for_y_comm_icon(env, context, "Cannot detect end of flying taxi animation.");
477+
mash_B_until_y_comm_icon(env, context, "Cannot detect end of flying taxi animation.");
478478
}
479479

480480
void EggAutonomous::wait_for_egg_hatched(
@@ -858,7 +858,7 @@ bool EggAutonomous::process_hatched_pokemon(
858858
return false;
859859
}
860860

861-
void EggAutonomous::wait_for_y_comm_icon(
861+
void EggAutonomous::mash_B_until_y_comm_icon(
862862
SingleSwitchProgramEnvironment& env,
863863
ProControllerContext& context,
864864
const std::string& error_msg
@@ -869,7 +869,7 @@ void EggAutonomous::wait_for_y_comm_icon(
869869
int ret = run_until<ProControllerContext>(
870870
env.console, context,
871871
[](ProControllerContext& context){
872-
pbf_wait(context, 10s);
872+
pbf_mash_button(context, BUTTON_B, 1000ms);
873873
},
874874
{y_comm_detector}
875875
);

SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class EggAutonomous : public SingleSwitchProgramInstance{
9595

9696
// Used to wait until Y-Comm icon shows up.
9797
// Throw error if it does not find it after 10 sec.
98-
void wait_for_y_comm_icon(
98+
void mash_B_until_y_comm_icon(
9999
SingleSwitchProgramEnvironment& env,
100100
ProControllerContext& context,
101101
const std::string& error_msg

0 commit comments

Comments
 (0)