[ClaimMysteryGift] throw exception when fails to reach Mystery Gift screen after several attempts. adjust which Autostory segments to run.

Author: jw098

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp

@@ -55,16 +55,6 @@ void AutoStory_Segment_07::run_segment(
 
     checkpoint_12(env, context, options.notif_status_update, stats);
 
-    // // Mystery Gift, delete later
-    // enter_menu_from_overworld(env.program_info(), env.console, context, 2);
-    // pbf_press_button(context, BUTTON_A, 20, 4 * TICKS_PER_SECOND);
-    // pbf_press_dpad(context, DPAD_UP, 20, 105);
-    // pbf_press_button(context, BUTTON_A, 20, 4 * TICKS_PER_SECOND);
-    // pbf_press_dpad(context, DPAD_DOWN, 20, 105);
-    // pbf_press_button(context, BUTTON_A, 20, 4 * TICKS_PER_SECOND);
-    // pbf_press_button(context, BUTTON_A, 20, 10 * TICKS_PER_SECOND);
-    // clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 10);
-
     context.wait_for_all_requests();
     env.console.log("End Segment 07: Go to Mesagoza South", COLOR_GREEN);
 

SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.cpp

@@ -205,6 +205,12 @@ void ClaimMysteryGift::claim_mystery_gift(SingleSwitchProgramEnvironment& env, P
         enter_mystery_gift_code(env, context);
         return;
     }
+
+    OperationFailedException::fire(
+        ErrorReport::SEND_ERROR_REPORT,
+        "claim_mystery_gift(): Failed to reach Mystery Gift screen after several attempts.",
+        env.console
+    );    
 }
 
 void ClaimMysteryGift::run_autostory_until_pokeportal_unlocked(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
@@ -214,7 +220,7 @@ void ClaimMysteryGift::run_autostory_until_pokeportal_unlocked(SingleSwitchProgr
         NOTIFICATION_STATUS_UPDATE
     };    
     AutoStoryStats stats;  // unused
-    for (size_t segment_index = 0; segment_index <= 7; segment_index++){
+    for (size_t segment_index = 0; segment_index <= 6; segment_index++){
         ALL_AUTO_STORY_SEGMENT_LIST()[segment_index]->run_segment(env, context, options, stats);
     }
 }
@@ -235,7 +241,7 @@ void ClaimMysteryGift::program(SingleSwitchProgramEnvironment& env, ProControlle
     }else{
 
         run_autostory_until_pokeportal_unlocked(env, context);
-
+        env.console.log("Done Autostory portion. Pokeportal should now be unlocked.");
         claim_mystery_gift(env, context, 2);
     }