Skip to content

Commit f8b3f9e

Browse files
jw098jw098
committed
cleanup
1 parent 4c9f506 commit f8b3f9e

File tree

4 files changed

+58
-49
lines changed

4 files changed

+58
-49
lines changed

‎SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ void AutoStory_Segment_39::run_segment(
5252
context.wait_for_all_requests();
5353
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5454

55-
// AutoStory_Checkpoint_10().run_checkpoint(env, context, options, stats);
55+
AutoStory_Checkpoint_102().run_checkpoint(env, context, options, stats);
56+
AutoStory_Checkpoint_103().run_checkpoint(env, context, options, stats);
5657

5758
context.wait_for_all_requests();
5859
env.console.log("End Segment " + name(), COLOR_GREEN);
@@ -73,19 +74,6 @@ void AutoStory_Checkpoint_103::run_checkpoint(SingleSwitchProgramEnvironment& en
7374
checkpoint_103(env, context, options.notif_status_update, stats);
7475
}
7576

76-
// std::string AutoStory_Checkpoint_104::name() const{ return "0104 - " + AutoStory_Segment_3().name(); }
77-
// std::string AutoStory_Checkpoint_104::start_text() const{ return "";}
78-
// std::string AutoStory_Checkpoint_104::end_text() const{ return "";}
79-
// void AutoStory_Checkpoint_104::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
80-
// checkpoint_104(env, context, options.notif_status_update, stats);
81-
// }
82-
83-
// std::string AutoStory_Checkpoint_105::name() const{ return "0105 - " + AutoStory_Segment_3().name(); }
84-
// std::string AutoStory_Checkpoint_105::start_text() const{ return "";}
85-
// std::string AutoStory_Checkpoint_105::end_text() const{ return "";}
86-
// void AutoStory_Checkpoint_105::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
87-
// checkpoint_105(env, context, options.notif_status_update, stats);
88-
// }
8977

9078
void checkpoint_102(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
9179
checkpoint_reattempt_loop(env, context, notif_status_update, stats,
@@ -312,11 +300,6 @@ void checkpoint_103(SingleSwitchProgramEnvironment& env, ProControllerContext& c
312300
});
313301
}
314302

315-
void checkpoint_104(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
316-
}
317-
318-
void checkpoint_105(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
319-
}
320303

321304

322305

‎SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.h‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,6 @@ class AutoStory_Checkpoint_103 : public AutoStory_Checkpoint{
4242
virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
4343
};
4444

45-
// class AutoStory_Checkpoint_104 : public AutoStory_Checkpoint{
46-
// public:
47-
// virtual std::string name() const override;
48-
// virtual std::string start_text() const override;
49-
// virtual std::string end_text() const override;
50-
// virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
51-
// };
52-
53-
// class AutoStory_Checkpoint_105 : public AutoStory_Checkpoint{
54-
// public:
55-
// virtual std::string name() const override;
56-
// virtual std::string start_text() const override;
57-
// virtual std::string end_text() const override;
58-
// virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
59-
// };
60-
6145

6246

6347
// start: Inside Area Zero Station 4. Deactivated the locks.
@@ -68,16 +52,6 @@ void checkpoint_102(SingleSwitchProgramEnvironment& env, ProControllerContext& c
6852
// end: Entered Zero Lab. Spoke to AI Professor.
6953
void checkpoint_103(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
7054

71-
// start: Entered Zero Lab. Spoke to AI Professor.
72-
// end: Battled the AI Professor. Completed the game.
73-
void checkpoint_104(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
74-
75-
// start:
76-
// end:
77-
void checkpoint_105(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
78-
79-
80-
8155

8256

8357
}

‎SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.cpp‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ namespace PokemonSV{
2828

2929

3030
std::string AutoStory_Segment_40::name() const{
31-
return "";
31+
return "40: Finish Main Story";
3232
}
3333

3434
std::string AutoStory_Segment_40::start_text() const{
35-
return "Start: ";
35+
return "Start: Entered Zero Lab. Spoke to AI Professor.";
3636
}
3737

3838
std::string AutoStory_Segment_40::end_text() const{
39-
return "End: ";
39+
return "End: Battled the AI Professor. Completed the game.";
4040
}
4141

4242
void AutoStory_Segment_40::run_segment(
@@ -52,13 +52,38 @@ void AutoStory_Segment_40::run_segment(
5252
context.wait_for_all_requests();
5353
env.console.log("Start Segment " + name(), COLOR_ORANGE);
5454

55-
// AutoStory_Checkpoint_9().run_checkpoint(env, context, options, stats);
55+
AutoStory_Checkpoint_104().run_checkpoint(env, context, options, stats);
5656

5757
context.wait_for_all_requests();
5858
env.console.log("End Segment " + name(), COLOR_GREEN);
5959

6060
}
6161

62+
std::string AutoStory_Checkpoint_104::name() const{ return "104 - " + AutoStory_Segment_40().name(); }
63+
std::string AutoStory_Checkpoint_104::start_text() const{ return "Entered Zero Lab. Spoke to AI Professor.";}
64+
std::string AutoStory_Checkpoint_104::end_text() const{ return "Battled the AI Professor. Completed the game.";}
65+
void AutoStory_Checkpoint_104::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
66+
checkpoint_104(env, context, options.notif_status_update, stats);
67+
}
68+
69+
// std::string AutoStory_Checkpoint_105::name() const{ return "105 - " + AutoStory_Segment_40().name(); }
70+
// std::string AutoStory_Checkpoint_105::start_text() const{ return "";}
71+
// std::string AutoStory_Checkpoint_105::end_text() const{ return "";}
72+
// void AutoStory_Checkpoint_105::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
73+
// checkpoint_105(env, context, options.notif_status_update, stats);
74+
// }
75+
76+
void checkpoint_104(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
77+
// checkpoint_reattempt_loop(env, context, notif_status_update, stats,
78+
// [&](size_t attempt_number){
79+
80+
81+
// });
82+
}
83+
84+
void checkpoint_105(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
85+
}
86+
6287

6388

6489
}

‎SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.h‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,33 @@ class AutoStory_Segment_40 : public AutoStory_Segment{
2727
};
2828

2929

30+
class AutoStory_Checkpoint_104 : public AutoStory_Checkpoint{
31+
public:
32+
virtual std::string name() const override;
33+
virtual std::string start_text() const override;
34+
virtual std::string end_text() const override;
35+
virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
36+
};
37+
38+
// class AutoStory_Checkpoint_105 : public AutoStory_Checkpoint{
39+
// public:
40+
// virtual std::string name() const override;
41+
// virtual std::string start_text() const override;
42+
// virtual std::string end_text() const override;
43+
// virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
44+
// };
45+
46+
47+
// start: Entered Zero Lab. Spoke to AI Professor.
48+
// end: Battled the AI Professor. Completed the game.
49+
void checkpoint_104(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
50+
51+
// start:
52+
// end:
53+
void checkpoint_105(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
54+
55+
56+
3057

3158

3259
}

0 commit comments

Comments
 (0)