Autostory: Team Star (Fighting)

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

@@ -107,7 +107,7 @@ std::vector<std::unique_ptr<AutoStory_Segment>> make_autoStory_segment_list(){
     segment_list.emplace_back(std::make_unique<AutoStory_Segment_28>());
     segment_list.emplace_back(std::make_unique<AutoStory_Segment_29>());
     segment_list.emplace_back(std::make_unique<AutoStory_Segment_30>());
-    // segment_list.emplace_back(std::make_unique<AutoStory_Segment_31>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_31>());
     // segment_list.emplace_back(std::make_unique<AutoStory_Segment_32>());
     // segment_list.emplace_back(std::make_unique<AutoStory_Segment_33>());
     // segment_list.emplace_back(std::make_unique<AutoStory_Segment_34>());
@@ -724,6 +724,16 @@ void AutoStory::test_checkpoints(
     checkpoint_list.push_back([&](){checkpoint_78(env, context, notif_status_update, stats);});
     checkpoint_list.push_back([&](){checkpoint_79(env, context, notif_status_update, stats);});
     checkpoint_list.push_back([&](){checkpoint_80(env, context, notif_status_update, stats);});
+    checkpoint_list.push_back([&](){checkpoint_81(env, context, notif_status_update, stats);});
+    checkpoint_list.push_back([&](){checkpoint_82(env, context, notif_status_update, stats);});
+    checkpoint_list.push_back([&](){checkpoint_83(env, context, notif_status_update, stats);});
+    checkpoint_list.push_back([&](){checkpoint_84(env, context, notif_status_update, stats);});
+    checkpoint_list.push_back([&](){checkpoint_85(env, context, notif_status_update, stats);});
+    checkpoint_list.push_back([&](){checkpoint_86(env, context, notif_status_update, stats);});
+    checkpoint_list.push_back([&](){checkpoint_87(env, context, notif_status_update, stats);});
+    checkpoint_list.push_back([&](){checkpoint_88(env, context, notif_status_update, stats);});
+    checkpoint_list.push_back([&](){checkpoint_89(env, context, notif_status_update, stats);});
+    checkpoint_list.push_back([&](){checkpoint_90(env, context, notif_status_update, stats);});
 
 
     if (end == 0){

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h

@@ -326,15 +326,6 @@ void checkpoint_reattempt_loop_tutorial(
 
 
 
-// moves player from North Province Area One to Team Star Fighting base
-void move_from_north_province_area_one_to_fighting_base(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
-
-
-void beat_team_star_fighting1(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
-
-void beat_team_star_fighting2(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
-
-void move_from_fighting_base_to_north_province_area_two(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
 
 void move_from_west_province_area_one_north_to_alfornada(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
 

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.h

@@ -32,12 +32,12 @@ class AutoStory_Segment_30 : public AutoStory_Segment{
 // end: Battled Nemona. Spoke to Glaseado Gym receptionist
 void checkpoint_75(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
 
-// start: Spoke to Glaseado Gym receptionist. Beat Glaseado Gym Challenge
-// end: Beat Glaseado Gym (Ice).
+// start: Spoke to Glaseado Gym receptionist. 
+// end: Beat Glaseado Gym Challenge. Beat Glaseado Gym (Ice).
 void checkpoint_76(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
 
-// start: Spoke to Glaseado Gym receptionist. Beat Glaseado Gym Challenge
-// end: Beat Glaseado Gym (Ice). At North Province Area One Pokecenter
+// start: Beat Glaseado Gym Challenge. Beat Glaseado Gym (Ice). 
+// end: At North Province Area One Pokecenter
 void checkpoint_77(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
 
 

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.h

@@ -26,21 +26,34 @@ class AutoStory_Segment_31 : public AutoStory_Segment{
     ) const override;
 };
 
-// start: 
-// end: 
+// start: At North Province Area One Pokecenter.
+// end: At Team Star (Fighting) base. Spoke to Clavell.
 void checkpoint_78(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
 
-// start: 
-// end: 
+// start: At Team Star (Fighting) base. Spoke to Clavell.
+// end: Beat Team Star (Fighting) grunt. At gate of base.
 void checkpoint_79(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
 
 
-// start: 
-// end: 
+// start: Beat Team Star (Fighting) grunt. At gate of base.
+// end: Beat Team Star (Fighting)
 void checkpoint_80(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
 
+// start: Beat Team Star (Fighting)
+// end: At North Province Area Two Pokecenter
+void checkpoint_81(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
 
 
+// moves player from North Province Area One to Team Star Fighting base
+void move_from_north_province_area_one_to_fighting_base(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+
+void beat_team_star_fighting1(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+void beat_team_star_fighting2(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+void move_from_fighting_base_to_north_province_area_two(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
 
 }
 }

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

@@ -59,6 +59,33 @@ void AutoStory_Segment_32::run_segment(
 
 }
 
+void checkpoint_82(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
+}
+
+void checkpoint_83(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
+}
+
+void checkpoint_84(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
+}
+
+void checkpoint_85(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
+}
+
+void checkpoint_86(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
+}
+
+void checkpoint_87(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
+}
+
+void checkpoint_88(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
+}
+
+void checkpoint_89(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
+}
+
+void checkpoint_90(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
+}
+
 
 
 }

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.h

@@ -27,6 +27,44 @@ class AutoStory_Segment_32 : public AutoStory_Segment{
 };
 
 
+// start: 
+// end: 
+void checkpoint_82(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
+
+// start: 
+// end: 
+void checkpoint_83(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
+
+// start: 
+// end: 
+void checkpoint_84(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
+
+// start: 
+// end: 
+void checkpoint_85(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
+
+// start: 
+// end: 
+void checkpoint_86(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
+
+// start: 
+// end: 
+void checkpoint_87(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
+
+// start: 
+// end: 
+void checkpoint_88(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
+
+// start: 
+// end: 
+void checkpoint_89(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
+
+// start: 
+// end: 
+void checkpoint_90(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
+
+
+
 
 
 }