From 2f6f92e5688934569b0b0658e3169776943d3cdd Mon Sep 17 00:00:00 2001 From: jw098 Date: Fri, 24 Jul 2026 23:27:11 -0700 Subject: [PATCH] fix SwSh Egg program --- .../Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp | 3 +++ .../Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp index 1878b25cba..3358148dac 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp +++ b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp @@ -239,6 +239,9 @@ void EggAutonomous::program(SingleSwitchProgramEnvironment& env, ProControllerCo change_view_to_judge(env.console, context, language); } + // go back to overworld + mash_B_until_y_comm_icon(env.console, context, "Cannot return to overworld."); + if (AUTO_SAVING == AutoSave::AfterStartAndKeep){ save_game(env.console, context); m_num_eggs_in_storage_when_game_saved = num_eggs_in_column_0; diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h index 756c339018..bb864d4c0f 100644 --- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h +++ b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h @@ -40,7 +40,7 @@ void navigate_to_menu_app( void menus_to_mainmenu(VideoStream& stream, ProControllerContext& context); void menus_to_boxsystem(VideoStream& stream, ProControllerContext& context); - +// saves the game. starting from the menu or overworld void save_game(VideoStream& stream, ProControllerContext& context); // Used to wait until Y-Comm icon shows up.