From 5c0f6f9a0e110721374bedd13d1d64574d473da2 Mon Sep 17 00:00:00 2001 From: jw098 Date: Sat, 2 Aug 2025 12:01:49 -0700 Subject: [PATCH 1/4] Catch only OperationFailedException, instead of all Exceptions --- .../AutoStory/PokemonSV_AutoStory_Segment_01.cpp | 6 +++--- .../AutoStory/PokemonSV_AutoStory_Segment_02.cpp | 3 ++- .../AutoStory/PokemonSV_AutoStory_Segment_03.cpp | 7 ++++--- .../AutoStory/PokemonSV_AutoStory_Segment_04.cpp | 2 +- .../AutoStory/PokemonSV_AutoStory_Segment_05.cpp | 5 +++-- .../AutoStory/PokemonSV_AutoStory_Segment_06.cpp | 3 ++- .../AutoStory/PokemonSV_AutoStory_Segment_07.cpp | 3 ++- .../AutoStory/PokemonSV_AutoStory_Segment_08.cpp | 7 ++++--- .../AutoStory/PokemonSV_AutoStory_Segment_09.cpp | 11 ++++++----- .../AutoStory/PokemonSV_AutoStory_Segment_10.cpp | 6 +++--- .../AutoStory/PokemonSV_AutoStory_Segment_11.cpp | 4 ++-- .../AutoStory/PokemonSV_AutoStory_Segment_12.cpp | 2 +- .../AutoStory/PokemonSV_AutoStory_Segment_13.cpp | 4 ++-- .../AutoStory/PokemonSV_AutoStory_Segment_14.cpp | 4 ++-- .../AutoStory/PokemonSV_AutoStory_Segment_15.cpp | 6 +++--- .../AutoStory/PokemonSV_AutoStory_Segment_16.cpp | 5 +++-- .../AutoStory/PokemonSV_AutoStory_Segment_17.cpp | 5 +++-- .../AutoStory/PokemonSV_AutoStory_Segment_18.cpp | 4 ++-- .../AutoStory/PokemonSV_AutoStory_Segment_19.cpp | 5 +++-- .../AutoStory/PokemonSV_AutoStory_Segment_20.cpp | 6 +++--- .../AutoStory/PokemonSV_AutoStory_Segment_21.cpp | 3 ++- .../AutoStory/PokemonSV_AutoStory_Segment_22.cpp | 7 ++++--- .../AutoStory/PokemonSV_AutoStory_Segment_23.cpp | 1 + .../AutoStory/PokemonSV_AutoStory_Segment_24.cpp | 1 + 24 files changed, 62 insertions(+), 48 deletions(-) diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp index aa8cf395ae..442002acea 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp @@ -93,7 +93,7 @@ AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); break; - }catch(...){ + }catch(OperationFailedException&){ // (void)e; first_attempt = false; context.wait_for_all_requests(); @@ -185,7 +185,7 @@ void checkpoint_02( leave_phone_to_overworld(env.program_info(), env.console, context); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -278,7 +278,7 @@ void checkpoint_03( leave_box_system_to_overworld(env.program_info(), env.console, context); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp index 1c2b515b1a..a839950359 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonSV/Programs/PokemonSV_GameEntry.h" @@ -93,7 +94,7 @@ void checkpoint_04( env.console.log("Finished battle."); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp index 73becf4f43..2f4ead0505 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" @@ -84,7 +85,7 @@ void checkpoint_05( env.console.overlay().add_log("Get mom's sandwich", COLOR_WHITE); mash_button_till_overworld(env.console, context); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -134,7 +135,7 @@ void checkpoint_06( env.console.overlay().add_log("Finished catch tutorial", COLOR_WHITE); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -188,7 +189,7 @@ void checkpoint_07( env.console.overlay().add_log("Mystery cry", COLOR_WHITE); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp index a1d9345c37..134f04b2b5 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp @@ -193,7 +193,7 @@ void checkpoint_08( mash_button_till_overworld(env.console, context, BUTTON_A); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp index 575bdd013f..1db3697524 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" @@ -101,7 +102,7 @@ void checkpoint_09( env.console.overlay().add_log("Receive legendary ball", COLOR_WHITE); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -143,7 +144,7 @@ void checkpoint_10( mash_button_till_overworld(env.console, context, BUTTON_A); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp index 0500b7a65e..c0175048ef 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonSV/Inference/PokemonSV_TutorialDetector.h" @@ -109,7 +110,7 @@ void checkpoint_11( env.console.overlay().add_log("Reached Los Platos", COLOR_WHITE); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp index 74ff02c30f..3a245744eb 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" @@ -120,7 +121,7 @@ void checkpoint_12( env.console.log("Reached Mesagoza (South) Pokecenter."); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp index 44e2a39401..5bbf62c7d6 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonSV/Inference/PokemonSV_TutorialDetector.h" #include "PokemonSV/Programs/PokemonSV_GameEntry.h" @@ -100,7 +101,7 @@ void checkpoint_13( break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -158,7 +159,7 @@ void checkpoint_14( clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD}); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -201,7 +202,7 @@ void checkpoint_15( {CallbackEnum::PROMPT_DIALOG, CallbackEnum::OVERWORLD}); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp index 5ea17d0e09..e786363aa5 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonSV/Inference/PokemonSV_TutorialDetector.h" @@ -105,7 +106,7 @@ void checkpoint_16( break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -160,7 +161,7 @@ void checkpoint_17( break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -206,7 +207,7 @@ void checkpoint_18( {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG}); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -250,7 +251,7 @@ void checkpoint_19( break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -303,7 +304,7 @@ void checkpoint_20( mash_button_till_overworld(env.console, context, BUTTON_A, 360); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp index ef5d26d23b..f59d7c4e41 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp @@ -117,7 +117,7 @@ void checkpoint_21( fly_to_overlapping_flypoint(env.program_info(), env.console, context); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -184,7 +184,7 @@ void checkpoint_22( fly_to_overlapping_flypoint(env.program_info(), env.console, context); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -303,7 +303,7 @@ void checkpoint_23( fly_to_overlapping_flypoint(env.program_info(), env.console, context); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp index aadc8cd65d..8253f63f26 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp @@ -124,7 +124,7 @@ void checkpoint_24( break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -211,7 +211,7 @@ void checkpoint_25( enter_menu_from_overworld(env.program_info(), env.console, context, -1); break; - }catch(...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp index 94cda1507c..704e02cfa0 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp @@ -135,7 +135,7 @@ void checkpoint_28( fly_to_overlapping_flypoint(env.program_info(), env.console, context); break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp index af77ce98a7..55b9483102 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp @@ -192,7 +192,7 @@ void checkpoint_29( break; - }catch (...){ // try again if fall into water + }catch(OperationFailedException&){ // try again if fall into water pbf_mash_button(context, BUTTON_A, 250); // walk back to start position before bridge @@ -311,7 +311,7 @@ void checkpoint_29( break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp index 756a8fa92c..6398ccba9f 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp @@ -234,7 +234,7 @@ void checkpoint_30( break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -300,7 +300,7 @@ void checkpoint_31( fly_to_overlapping_flypoint(env.program_info(), env.console, context); break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp index f7fb3e8fbb..51ea7d1b7f 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp @@ -132,7 +132,7 @@ void checkpoint_32( break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -258,7 +258,7 @@ void checkpoint_33( break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -322,7 +322,7 @@ void checkpoint_34( fly_to_overlapping_flypoint(env.program_info(), env.console, context); break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp index c38e5a7806..38b2640500 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" @@ -99,7 +100,7 @@ void checkpoint_35( mash_button_till_overworld(env.console, context, BUTTON_A); break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -178,7 +179,7 @@ void checkpoint_36( fly_to_overlapping_flypoint(env.program_info(), env.console, context); break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp index 1d4574d920..885619aab9 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" @@ -102,7 +103,7 @@ void checkpoint_37( break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -173,7 +174,7 @@ void checkpoint_38( mash_button_till_overworld(env.console, context, BUTTON_A, 360); break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp index d406383e8e..565647ae81 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp @@ -229,7 +229,7 @@ void checkpoint_39( mash_button_till_overworld(env.console, context, BUTTON_A, 360); break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -353,7 +353,7 @@ void checkpoint_40( fly_to_overlapping_flypoint(env.program_info(), env.console, context); break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp index 3b1cf9f720..6152228dc1 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" @@ -245,7 +246,7 @@ void checkpoint_41( break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -356,7 +357,7 @@ void checkpoint_42( fly_to_overlapping_flypoint(env.program_info(), env.console, context); break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp index 420e872ab4..a64c75cbfe 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp @@ -131,7 +131,7 @@ void checkpoint_43( break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -477,7 +477,7 @@ void checkpoint_44( break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -540,7 +540,7 @@ void checkpoint_45( mash_button_till_overworld(env.console, context, BUTTON_A); break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp index daa7d080bc..0c76468549 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h" #include "PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h" @@ -110,7 +111,7 @@ void checkpoint_46( fly_to_overlapping_flypoint(env.program_info(), env.console, context); break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp index 693f1eb20e..3e4a7e8423 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "PokemonSV/Programs/PokemonSV_GameEntry.h" #include "PokemonSV/Programs/PokemonSV_SaveGame.h" @@ -82,7 +83,7 @@ void checkpoint_47( break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -120,7 +121,7 @@ void checkpoint_48( break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); @@ -158,7 +159,7 @@ void checkpoint_49( break; - }catch (...){ + }catch(OperationFailedException&){ context.wait_for_all_requests(); env.console.log("Resetting from checkpoint."); reset_game(env.program_info(), env.console, context); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp index 0850353eab..78e2472b63 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "PokemonSV/Programs/PokemonSV_GameEntry.h" #include "PokemonSV/Programs/PokemonSV_SaveGame.h" diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp index 93f7a96131..ea884f614f 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp @@ -4,6 +4,7 @@ * */ +#include "CommonFramework/Exceptions/OperationFailedException.h" #include "CommonFramework/VideoPipeline/VideoOverlay.h" #include "PokemonSV/Programs/PokemonSV_GameEntry.h" #include "PokemonSV/Programs/PokemonSV_SaveGame.h" From e22675c1d9d2e7726c9f1952b18cb4adc0293149 Mon Sep 17 00:00:00 2001 From: jw098 Date: Sat, 2 Aug 2025 12:19:49 -0700 Subject: [PATCH 2/4] Change Segment number format. Update Start/End Segment logging. --- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp | 6 +++--- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp | 6 +++--- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp | 6 +++--- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp | 6 +++--- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp | 6 +++--- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp | 6 +++--- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp | 6 +++--- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp | 6 +++--- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp | 6 +++--- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp | 6 +++--- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp | 6 +++--- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp | 6 +++--- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp | 6 +++--- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp | 4 ++-- 15 files changed, 43 insertions(+), 43 deletions(-) diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp index f59d7c4e41..1df9c5b453 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp @@ -30,7 +30,7 @@ namespace PokemonSV{ std::string AutoStory_Segment_10::name() const{ - return "10.1: Cortondo Gym - Go to Cortondo city"; + return "10: Cortondo Gym (Bug): Go to Cortondo city"; } std::string AutoStory_Segment_10::start_text() const{ @@ -49,14 +49,14 @@ void AutoStory_Segment_10::run_segment( AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); - env.console.log("Start Segment 10.1: Cortondo Gym - Go to Cortondo city", COLOR_ORANGE); + env.console.log("Start Segment " + name(), COLOR_ORANGE); checkpoint_21(env, context, options.notif_status_update); checkpoint_22(env, context, options.notif_status_update); checkpoint_23(env, context, options.notif_status_update); context.wait_for_all_requests(); - env.console.log("End Segment 10.1: Cortondo Gym - Go to Cortondo city", COLOR_GREEN); + env.console.log("End Segment " + name(), COLOR_GREEN); stats.m_segment++; env.update_stats(); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp index 8253f63f26..677550e743 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp @@ -37,7 +37,7 @@ namespace PokemonSV{ std::string AutoStory_Segment_11::name() const{ - return "10.2: Cortondo Gym - Gym challenge"; + return "11: Cortondo Gym (Bug): Gym challenge"; } std::string AutoStory_Segment_11::start_text() const{ @@ -56,7 +56,7 @@ void AutoStory_Segment_11::run_segment( AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); - env.console.log("Start Segment 10.2: Cortondo Gym - Gym challenge", COLOR_ORANGE); + env.console.log("Start Segment " + name(), COLOR_ORANGE); checkpoint_24(env, context, options.notif_status_update); checkpoint_25(env, context, options.notif_status_update); @@ -64,7 +64,7 @@ void AutoStory_Segment_11::run_segment( checkpoint_27(env, context, options.notif_status_update); context.wait_for_all_requests(); - env.console.log("End Segment 10.2: Cortondo Gym - Gym challenge", COLOR_GREEN); + env.console.log("End Segment " + name(), COLOR_GREEN); stats.m_segment++; env.update_stats(); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp index 704e02cfa0..e6eec3696f 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp @@ -32,7 +32,7 @@ namespace PokemonSV{ std::string AutoStory_Segment_12::name() const{ - return "10.3: Cortondo Gym - Gym battle"; + return "12: Cortondo Gym (Bug): Gym battle"; } std::string AutoStory_Segment_12::start_text() const{ @@ -52,12 +52,12 @@ void AutoStory_Segment_12::run_segment( AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); - env.console.log("Start Segment 10.3: Cortondo Gym - Gym battle", COLOR_ORANGE); + env.console.log("Start Segment " + name(), COLOR_ORANGE); checkpoint_28(env, context, options.notif_status_update); context.wait_for_all_requests(); - env.console.log("End Segment 10.3: Cortondo Gym - Gym battle", COLOR_GREEN); + env.console.log("End Segment " + name(), COLOR_GREEN); stats.m_segment++; env.update_stats(); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp index 55b9483102..4e04d71ff0 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp @@ -28,7 +28,7 @@ namespace PokemonSV{ std::string AutoStory_Segment_13::name() const{ - return "11.1: Bombirdier Titan: Go to West Province Area One Central Pokecenter"; + return "13: Bombirdier Titan: Go to West Province Area One Central Pokecenter"; } std::string AutoStory_Segment_13::start_text() const{ @@ -47,12 +47,12 @@ void AutoStory_Segment_13::run_segment( AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); - env.console.log("Start Segment 11.1: Bombirdier Titan: Go to West Province Area One Central Pokecenter", COLOR_ORANGE); + env.console.log("Start Segment " + name(), COLOR_ORANGE); checkpoint_29(env, context, options.notif_status_update); context.wait_for_all_requests(); - env.console.log("End Segment 11.1: Bombirdier Titan: Go to West Province Area One Central Pokecenter", COLOR_GREEN); + env.console.log("End Segment " + name(), COLOR_GREEN); stats.m_segment++; env.update_stats(); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp index 6398ccba9f..1745920ba4 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp @@ -29,7 +29,7 @@ namespace PokemonSV{ std::string AutoStory_Segment_14::name() const{ - return "11.2: Bombirdier Titan: Battle Bombirdier"; + return "14: Bombirdier Titan: Battle Bombirdier"; } std::string AutoStory_Segment_14::start_text() const{ @@ -48,13 +48,13 @@ void AutoStory_Segment_14::run_segment( AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); - env.console.log("Start Segment 11.2: Bombirdier Titan: Battle Bombirdier", COLOR_ORANGE); + env.console.log("Start Segment " + name(), COLOR_ORANGE); checkpoint_30(env, context, options.notif_status_update); checkpoint_31(env, context, options.notif_status_update); context.wait_for_all_requests(); - env.console.log("End Segment 11.2: Bombirdier Titan: Battle Bombirdier", COLOR_GREEN); + env.console.log("End Segment " + name(), COLOR_GREEN); stats.m_segment++; env.update_stats(); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp index 51ea7d1b7f..bc938a21b7 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp @@ -32,7 +32,7 @@ namespace PokemonSV{ std::string AutoStory_Segment_15::name() const{ - return "12: Team Star (Dark)"; + return "15: Team Star (Dark)"; } std::string AutoStory_Segment_15::start_text() const{ @@ -51,7 +51,7 @@ void AutoStory_Segment_15::run_segment( AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); - env.console.log("Start Segment 12: Team Star (Dark)", COLOR_ORANGE); + env.console.log("Start Segment " + name(), COLOR_ORANGE); checkpoint_32(env, context, options.notif_status_update); checkpoint_33(env, context, options.notif_status_update); @@ -59,7 +59,7 @@ void AutoStory_Segment_15::run_segment( context.wait_for_all_requests(); - env.console.log("End Segment 12: Team Star (Dark)", COLOR_GREEN); + env.console.log("End Segment " + name(), COLOR_GREEN); stats.m_segment++; env.update_stats(); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp index 38b2640500..0fdf22e0c4 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp @@ -29,7 +29,7 @@ namespace PokemonSV{ std::string AutoStory_Segment_16::name() const{ - return "13.1: Cascarrafa Gym (Water): Get Kofu's wallet"; + return "16: Cascarrafa Gym (Water): Get Kofu's wallet"; } std::string AutoStory_Segment_16::start_text() const{ @@ -48,13 +48,13 @@ void AutoStory_Segment_16::run_segment( AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); - env.console.log("Start Segment 13.1: Cascarrafa Gym (Water): Get Kofu's wallet", COLOR_ORANGE); + env.console.log("Start Segment " + name(), COLOR_ORANGE); checkpoint_35(env, context, options.notif_status_update); checkpoint_36(env, context, options.notif_status_update); context.wait_for_all_requests(); - env.console.log("End Segment 13.1: Cascarrafa Gym (Water): Get Kofu's wallet", COLOR_GREEN); + env.console.log("End Segment " + name(), COLOR_GREEN); stats.m_segment++; env.update_stats(); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp index 885619aab9..8821b3dbf1 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp @@ -29,7 +29,7 @@ namespace PokemonSV{ std::string AutoStory_Segment_17::name() const{ - return "13.2: Cascarrafa Gym (Water): Gym challenge and Gym battle"; + return "17: Cascarrafa Gym (Water): Gym challenge and Gym battle"; } std::string AutoStory_Segment_17::start_text() const{ @@ -48,13 +48,13 @@ void AutoStory_Segment_17::run_segment( AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); - env.console.log("Start Segment 13.2: Cascarrafa Gym (Water): Gym battle", COLOR_ORANGE); + env.console.log("Start Segment " + name(), COLOR_ORANGE); checkpoint_37(env, context, options.notif_status_update); checkpoint_38(env, context, options.notif_status_update); context.wait_for_all_requests(); - env.console.log("End Segment 13.2: Cascarrafa Gym (Water): Gym battle", COLOR_GREEN); + env.console.log("End Segment " + name(), COLOR_GREEN); stats.m_segment++; env.update_stats(); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp index 565647ae81..28fc11a995 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp @@ -30,7 +30,7 @@ namespace PokemonSV{ std::string AutoStory_Segment_18::name() const{ - return "14: Great Tusk/Iron Treads titan"; + return "18: Great Tusk/Iron Treads titan"; } std::string AutoStory_Segment_18::start_text() const{ @@ -49,13 +49,13 @@ void AutoStory_Segment_18::run_segment( AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); - env.console.log("Start Segment 14: Great Tusk/Iron Treads titan", COLOR_ORANGE); + env.console.log("Start Segment " + name(), COLOR_ORANGE); checkpoint_39(env, context, options.notif_status_update); checkpoint_40(env, context, options.notif_status_update); context.wait_for_all_requests(); - env.console.log("End Segment 14: Great Tusk/Iron Treads titan", COLOR_GREEN); + env.console.log("End Segment " + name(), COLOR_GREEN); stats.m_segment++; env.update_stats(); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp index 6152228dc1..39710da286 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp @@ -29,7 +29,7 @@ namespace PokemonSV{ std::string AutoStory_Segment_19::name() const{ - return "15.1: Klawf Titan: Battle Klawf"; + return "19: Klawf Titan: Battle Klawf"; } std::string AutoStory_Segment_19::start_text() const{ @@ -48,13 +48,13 @@ void AutoStory_Segment_19::run_segment( AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); - env.console.log("Start Segment 15.2: Klawf Titan: Battle Klawf", COLOR_ORANGE); + env.console.log("Start Segment " + name(), COLOR_ORANGE); checkpoint_41(env, context, options.notif_status_update); checkpoint_42(env, context, options.notif_status_update); context.wait_for_all_requests(); - env.console.log("End Segment 15.2: Klawf Titan: Battle Klawf", COLOR_GREEN); + env.console.log("End Segment " + name(), COLOR_GREEN); stats.m_segment++; env.update_stats(); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp index a64c75cbfe..d4f2be3009 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp @@ -31,7 +31,7 @@ namespace PokemonSV{ std::string AutoStory_Segment_20::name() const{ - return "16: Artazon Gym (Grass)"; + return "20: Artazon Gym (Grass)"; } std::string AutoStory_Segment_20::start_text() const{ @@ -50,14 +50,14 @@ void AutoStory_Segment_20::run_segment( AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); - env.console.log("Start Segment ", COLOR_ORANGE); + env.console.log("Start Segment " + name(), COLOR_ORANGE); checkpoint_43(env, context, options.notif_status_update); checkpoint_44(env, context, options.notif_status_update); checkpoint_45(env, context, options.notif_status_update); context.wait_for_all_requests(); - env.console.log("End Segment ", COLOR_GREEN); + env.console.log("End Segment " + name(), COLOR_GREEN); stats.m_segment++; env.update_stats(); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp index 0c76468549..94fb602dc7 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp @@ -29,7 +29,7 @@ namespace PokemonSV{ std::string AutoStory_Segment_21::name() const{ - return "17.1: Team Star (Fire): Go to East Province (Area One) Pokecenter"; + return "21: Team Star (Fire): Go to East Province (Area One) Pokecenter"; } std::string AutoStory_Segment_21::start_text() const{ @@ -48,12 +48,12 @@ void AutoStory_Segment_21::run_segment( AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); - env.console.log("Start Segment ", COLOR_ORANGE); + env.console.log("Start Segment " + name(), COLOR_ORANGE); checkpoint_46(env, context, options.notif_status_update); context.wait_for_all_requests(); - env.console.log("End Segment ", COLOR_GREEN); + env.console.log("End Segment " + name(), COLOR_GREEN); stats.m_segment++; env.update_stats(); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp index 3e4a7e8423..846bdd8ff8 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp @@ -26,7 +26,7 @@ namespace PokemonSV{ std::string AutoStory_Segment_22::name() const{ - return "17.1: Team Star (Fire): Beat Team Star"; + return "22: Team Star (Fire): Beat Team Star"; } std::string AutoStory_Segment_22::start_text() const{ @@ -45,12 +45,12 @@ void AutoStory_Segment_22::run_segment( AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); - env.console.log("Start Segment ", COLOR_ORANGE); + env.console.log("Start Segment " + name(), COLOR_ORANGE); // checkpoint_(env, context, options.notif_status_update); context.wait_for_all_requests(); - env.console.log("End Segment ", COLOR_GREEN); + env.console.log("End Segment " + name(), COLOR_GREEN); stats.m_segment++; env.update_stats(); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp index 78e2472b63..b98e94f882 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp @@ -44,12 +44,12 @@ void AutoStory_Segment_23::run_segment( AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); - env.console.log("Start Segment ", COLOR_ORANGE); + env.console.log("Start Segment " + name(), COLOR_ORANGE); // checkpoint_(env, context, options.notif_status_update); context.wait_for_all_requests(); - env.console.log("End Segment ", COLOR_GREEN); + env.console.log("End Segment " + name(), COLOR_GREEN); stats.m_segment++; env.update_stats(); diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp index ea884f614f..38d43e71be 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp @@ -44,12 +44,12 @@ void AutoStory_Segment_24::run_segment( AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); - env.console.log("Start Segment ", COLOR_ORANGE); + env.console.log("Start Segment " + name(), COLOR_ORANGE); // checkpoint_(env, context, options.notif_status_update); context.wait_for_all_requests(); - env.console.log("End Segment ", COLOR_GREEN); + env.console.log("End Segment " + name(), COLOR_GREEN); stats.m_segment++; env.update_stats(); From fe6666bcad0511e08374b0f452e6efef2cb8b55d Mon Sep 17 00:00:00 2001 From: jw098 Date: Sat, 2 Aug 2025 12:54:51 -0700 Subject: [PATCH 3/4] Increment segment number at the beginning of the segment, instead of at the end. --- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp | 4 +--- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp | 6 +++--- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp | 4 ++-- .../Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp | 4 ++-- 25 files changed, 50 insertions(+), 52 deletions(-) diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp index 3ffaf6e96d..f07edee59d 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp @@ -39,7 +39,7 @@ void AutoStory_Segment_00::run_segment( ProControllerContext& context, AutoStoryOptions options ) const{ - AutoStoryStats& stats = env.current_stats(); + // AutoStoryStats& stats = env.current_stats(); context.wait_for_all_requests(); env.console.log("Start Segment 00: Intro Cutscene", COLOR_ORANGE); @@ -48,8 +48,6 @@ void AutoStory_Segment_00::run_segment( context.wait_for_all_requests(); env.console.log("End Segment 00: Intro Cutscene", COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp index 442002acea..9616af0ffa 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp @@ -53,6 +53,8 @@ void AutoStory_Segment_01::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment 01: Pick Starter", COLOR_ORANGE); @@ -62,8 +64,6 @@ void AutoStory_Segment_01::run_segment( context.wait_for_all_requests(); env.console.log("End Segment 01: Pick Starter", COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp index a839950359..13317ee8e0 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp @@ -49,15 +49,15 @@ void AutoStory_Segment_02::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment 02: First Nemona Battle", COLOR_ORANGE); checkpoint_04(env, context, options.notif_status_update); context.wait_for_all_requests(); - env.console.log("End Segment 02: First Nemona Battle", COLOR_GREEN); - stats.m_segment++; - env.update_stats(); + env.console.log("End Segment 02: First Nemona Battle", COLOR_GREEN); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp index 2f4ead0505..5dd13458f8 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp @@ -44,6 +44,8 @@ std::string AutoStory_Segment_03::end_text() const{ void AutoStory_Segment_03::run_segment(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment 03: Catch Tutorial", COLOR_ORANGE); @@ -53,8 +55,6 @@ void AutoStory_Segment_03::run_segment(SingleSwitchProgramEnvironment& env, ProC context.wait_for_all_requests(); env.console.log("End Segment 03: Catch Tutorial", COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp index 134f04b2b5..32cde6a1ce 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp @@ -49,6 +49,8 @@ void AutoStory_Segment_04::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment 04: Rescue Legendary", COLOR_ORANGE); @@ -56,8 +58,6 @@ void AutoStory_Segment_04::run_segment( context.wait_for_all_requests(); env.console.log("End Segment 04: Rescue Legendary", COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp index 1db3697524..5b56380f66 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp @@ -48,6 +48,8 @@ void AutoStory_Segment_05::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment 05: First Arven Battle", COLOR_ORANGE); @@ -56,8 +58,6 @@ void AutoStory_Segment_05::run_segment( context.wait_for_all_requests(); env.console.log("End Segment 05: First Arven Battle", COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp index c0175048ef..0add7006eb 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp @@ -47,6 +47,8 @@ void AutoStory_Segment_06::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment 06: Go to Los Platos", COLOR_ORANGE); @@ -54,8 +56,6 @@ void AutoStory_Segment_06::run_segment( context.wait_for_all_requests(); env.console.log("End Segment 06: Go to Los Platos", COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp index 3a245744eb..cc6b2dc7bd 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp @@ -47,6 +47,8 @@ void AutoStory_Segment_07::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment 07: Go to Mesagoza South", COLOR_ORANGE); @@ -64,8 +66,6 @@ void AutoStory_Segment_07::run_segment( context.wait_for_all_requests(); env.console.log("End Segment 07: Go to Mesagoza South", COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp index 5bbf62c7d6..367f3be5c7 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp @@ -45,6 +45,8 @@ void AutoStory_Segment_08::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment 08: Beat Team Star and arrive at School", COLOR_ORANGE); @@ -55,8 +57,6 @@ void AutoStory_Segment_08::run_segment( context.wait_for_all_requests(); env.console.log("End Segment 08: Beat Team Star and arrive at School", COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp index e786363aa5..e7cf88c809 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp @@ -45,6 +45,8 @@ void AutoStory_Segment_09::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment 09: Complete tutorial", COLOR_ORANGE); @@ -56,8 +58,6 @@ void AutoStory_Segment_09::run_segment( context.wait_for_all_requests(); env.console.log("End Segment 09: Complete tutorial", COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp index 1df9c5b453..fc6d5cbbff 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp @@ -48,6 +48,8 @@ void AutoStory_Segment_10::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment " + name(), COLOR_ORANGE); @@ -57,8 +59,6 @@ void AutoStory_Segment_10::run_segment( context.wait_for_all_requests(); env.console.log("End Segment " + name(), COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp index 677550e743..f2b90716d1 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp @@ -55,6 +55,8 @@ void AutoStory_Segment_11::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment " + name(), COLOR_ORANGE); @@ -65,8 +67,6 @@ void AutoStory_Segment_11::run_segment( context.wait_for_all_requests(); env.console.log("End Segment " + name(), COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp index e6eec3696f..73de52c5a9 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp @@ -51,6 +51,8 @@ void AutoStory_Segment_12::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment " + name(), COLOR_ORANGE); @@ -58,8 +60,6 @@ void AutoStory_Segment_12::run_segment( context.wait_for_all_requests(); env.console.log("End Segment " + name(), COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp index 4e04d71ff0..38957b4660 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp @@ -46,6 +46,8 @@ void AutoStory_Segment_13::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment " + name(), COLOR_ORANGE); @@ -53,8 +55,6 @@ void AutoStory_Segment_13::run_segment( context.wait_for_all_requests(); env.console.log("End Segment " + name(), COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp index 1745920ba4..3d589395f6 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp @@ -47,6 +47,8 @@ void AutoStory_Segment_14::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment " + name(), COLOR_ORANGE); @@ -55,8 +57,6 @@ void AutoStory_Segment_14::run_segment( context.wait_for_all_requests(); env.console.log("End Segment " + name(), COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp index bc938a21b7..e500ddb242 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp @@ -50,6 +50,8 @@ void AutoStory_Segment_15::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment " + name(), COLOR_ORANGE); @@ -60,8 +62,6 @@ void AutoStory_Segment_15::run_segment( context.wait_for_all_requests(); env.console.log("End Segment " + name(), COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp index 0fdf22e0c4..2de8913d99 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp @@ -47,6 +47,8 @@ void AutoStory_Segment_16::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment " + name(), COLOR_ORANGE); @@ -55,8 +57,6 @@ void AutoStory_Segment_16::run_segment( context.wait_for_all_requests(); env.console.log("End Segment " + name(), COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp index 8821b3dbf1..7b0ff3c6d7 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp @@ -47,6 +47,8 @@ void AutoStory_Segment_17::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment " + name(), COLOR_ORANGE); @@ -55,8 +57,6 @@ void AutoStory_Segment_17::run_segment( context.wait_for_all_requests(); env.console.log("End Segment " + name(), COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp index 28fc11a995..fc09a3f283 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp @@ -48,6 +48,8 @@ void AutoStory_Segment_18::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment " + name(), COLOR_ORANGE); @@ -56,8 +58,6 @@ void AutoStory_Segment_18::run_segment( context.wait_for_all_requests(); env.console.log("End Segment " + name(), COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp index 39710da286..567526ca5e 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp @@ -47,6 +47,8 @@ void AutoStory_Segment_19::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment " + name(), COLOR_ORANGE); @@ -55,8 +57,6 @@ void AutoStory_Segment_19::run_segment( context.wait_for_all_requests(); env.console.log("End Segment " + name(), COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp index d4f2be3009..24654bb9da 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp @@ -49,6 +49,8 @@ void AutoStory_Segment_20::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment " + name(), COLOR_ORANGE); @@ -58,8 +60,6 @@ void AutoStory_Segment_20::run_segment( context.wait_for_all_requests(); env.console.log("End Segment " + name(), COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp index 94fb602dc7..372f866501 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp @@ -47,6 +47,8 @@ void AutoStory_Segment_21::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment " + name(), COLOR_ORANGE); @@ -54,8 +56,6 @@ void AutoStory_Segment_21::run_segment( context.wait_for_all_requests(); env.console.log("End Segment " + name(), COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp index 846bdd8ff8..571181cc28 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp @@ -44,6 +44,8 @@ void AutoStory_Segment_22::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment " + name(), COLOR_ORANGE); @@ -51,8 +53,6 @@ void AutoStory_Segment_22::run_segment( context.wait_for_all_requests(); env.console.log("End Segment " + name(), COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp index b98e94f882..df9981ec3d 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp @@ -43,6 +43,8 @@ void AutoStory_Segment_23::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment " + name(), COLOR_ORANGE); @@ -50,8 +52,6 @@ void AutoStory_Segment_23::run_segment( context.wait_for_all_requests(); env.console.log("End Segment " + name(), COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp index 38d43e71be..58e4f047eb 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp @@ -43,6 +43,8 @@ void AutoStory_Segment_24::run_segment( ) const{ AutoStoryStats& stats = env.current_stats(); + stats.m_segment++; + env.update_stats(); context.wait_for_all_requests(); env.console.log("Start Segment " + name(), COLOR_ORANGE); @@ -50,8 +52,6 @@ void AutoStory_Segment_24::run_segment( context.wait_for_all_requests(); env.console.log("End Segment " + name(), COLOR_GREEN); - stats.m_segment++; - env.update_stats(); } From 1b2da4060f7222ba7bcb6c6ece5c3de70808d4cb Mon Sep 17 00:00:00 2001 From: jw098 Date: Sat, 2 Aug 2025 13:04:45 -0700 Subject: [PATCH 4/4] Throw error if start segment is greater than end segment. --- .../PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp index 1cddcfabb2..807ff345db 100644 --- a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp +++ b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp @@ -711,6 +711,10 @@ void AutoStory::run_autostory(SingleSwitchProgramEnvironment& env, ProController NOTIFICATION_STATUS_UPDATE }; + if (get_start_segment_index() > get_end_segment_index()){ + throw UserSetupError(env.logger(), "The start segment cannot be later than the end segment."); + } + for (size_t segment_index = get_start_segment_index(); segment_index <= get_end_segment_index(); segment_index++){ ALL_AUTO_STORY_SEGMENT_LIST()[segment_index]->run_segment(env, context, options); }