From 40bc42d390bd5ca1dc0c861106327c986a7de8d6 Mon Sep 17 00:00:00 2001 From: theAstrogoth Date: Thu, 13 Aug 2026 18:45:49 -0500 Subject: [PATCH] fix infinite loop on nonshiny target hit --- .../Programs/RngManipulation/PokemonFRLG_EggRng.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp b/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp index 2b61b8071d..75e23b0dbc 100644 --- a/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp +++ b/SerialPrograms/Source/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp @@ -834,7 +834,7 @@ void EggRng::program(SingleSwitchProgramEnvironment& env, ProControllerContext& if (hist.pickup.results.size() > 0){ env.log("Checking for nonshiny target hit..."); - if (have_hit_target(TARGET_HELD_SEED, HELD_ADVANCES, hist.pickup.results.back())){ + if (have_hit_target(TARGET_PICKUP_SEED, PICKUP_ADVANCES, hist.pickup.results.back())){ env.log("Target Hit!"); stats.nonshiny++; break; @@ -958,14 +958,10 @@ void EggRng::program(SingleSwitchProgramEnvironment& env, ProControllerContext& case EggProgramState::finished: default: - if (GO_HOME_WHEN_DONE){ - pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms); - } - send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH); + break; } } - // just in case if (GO_HOME_WHEN_DONE){ pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms); }