Segments 15 and 16 (#513)

PokemonAutomation · Nov 22, 2024 · 7272ca2 · 7272ca2
1 parent bbebe19
commit 7272ca2
Show file tree

Hide file tree

Showing 7 changed files with 669 additions and 11 deletions.
diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt
@@ -1467,6 +1467,10 @@ file(GLOB MAIN_SOURCES
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.h
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.h
+    Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp
+    Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.h
+    Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp
+    Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.h
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp

diff --git a/SerialPrograms/SerialPrograms.pro b/SerialPrograms/SerialPrograms.pro
@@ -733,6 +733,8 @@ SOURCES += \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp \
+    Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp \
+    Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.cpp \
@@ -1840,6 +1842,8 @@ HEADERS += \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.h \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.h \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.h \
+    Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.h \
+    Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.h \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h \
     Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.h \

diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp
@@ -35,8 +35,8 @@
 #include "PokemonSV_AutoStory_Segment_12.h"
 #include "PokemonSV_AutoStory_Segment_13.h"
 #include "PokemonSV_AutoStory_Segment_14.h"
-// #include "PokemonSV_AutoStory_Segment_15.h"
-// #include "PokemonSV_AutoStory_Segment_16.h"
+#include "PokemonSV_AutoStory_Segment_15.h"
+#include "PokemonSV_AutoStory_Segment_16.h"
 // #include "PokemonSV_AutoStory_Segment_17.h"
 // #include "PokemonSV_AutoStory_Segment_18.h"
 // #include "PokemonSV_AutoStory_Segment_19.h"
@@ -79,8 +79,8 @@ std::vector<std::unique_ptr<AutoStory_Segment>> make_autoStory_segment_list(){
     segment_list.emplace_back(std::make_unique<AutoStory_Segment_12>());
     segment_list.emplace_back(std::make_unique<AutoStory_Segment_13>());
     segment_list.emplace_back(std::make_unique<AutoStory_Segment_14>());
-    // segment_list.emplace_back(std::make_unique<AutoStory_Segment_15>());
-    // segment_list.emplace_back(std::make_unique<AutoStory_Segment_16>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_15>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_16>());
     // segment_list.emplace_back(std::make_unique<AutoStory_Segment_17>());
     // segment_list.emplace_back(std::make_unique<AutoStory_Segment_18>());
     // segment_list.emplace_back(std::make_unique<AutoStory_Segment_19>());
@@ -593,13 +593,13 @@ void AutoStory::test_checkpoints(
     checkpoint_list.push_back([&](){checkpoint_27(env, context, notif_status_update);});
     checkpoint_list.push_back([&](){checkpoint_28(env, context, notif_status_update);});
     checkpoint_list.push_back([&](){checkpoint_29(env, context, notif_status_update);});
-    // checkpoint_list.push_back([&](){checkpoint_30(env, context, notif_status_update);});
-    // checkpoint_list.push_back([&](){checkpoint_31(env, context, notif_status_update);});
-    // checkpoint_list.push_back([&](){checkpoint_32(env, context, notif_status_update);});
-    // checkpoint_list.push_back([&](){checkpoint_33(env, context, notif_status_update);});
-    // checkpoint_list.push_back([&](){checkpoint_34(env, context, notif_status_update);});
-    // checkpoint_list.push_back([&](){checkpoint_35(env, context, notif_status_update);});
-    // checkpoint_list.push_back([&](){checkpoint_36(env, context, notif_status_update);});
+    checkpoint_list.push_back([&](){checkpoint_30(env, context, notif_status_update);});
+    checkpoint_list.push_back([&](){checkpoint_31(env, context, notif_status_update);});
+    checkpoint_list.push_back([&](){checkpoint_32(env, context, notif_status_update);});
+    checkpoint_list.push_back([&](){checkpoint_33(env, context, notif_status_update);});
+    checkpoint_list.push_back([&](){checkpoint_34(env, context, notif_status_update);});
+    checkpoint_list.push_back([&](){checkpoint_35(env, context, notif_status_update);});
+    checkpoint_list.push_back([&](){checkpoint_36(env, context, notif_status_update);});
     // checkpoint_list.push_back([&](){checkpoint_37(env, context, notif_status_update);});
     // checkpoint_list.push_back([&](){checkpoint_38(env, context, notif_status_update);});
     // checkpoint_list.push_back([&](){checkpoint_39(env, context, notif_status_update);});