Skip to content

Commit 2d7f1c3

Browse files
jw098fyex
jw098
authored and
fyex
committed
Segments 15 and 16 (PokemonAutomation#513)
1 parent e7d1034 commit 2d7f1c3

File tree

7 files changed

+669
-11
lines changed

7 files changed

+669
-11
lines changed

‎SerialPrograms/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1467,6 +1467,10 @@ file(GLOB MAIN_SOURCES
14671467
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.h
14681468
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp
14691469
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.h
1470+
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp
1471+
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.h
1472+
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp
1473+
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.h
14701474
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp
14711475
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h
14721476
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp

‎SerialPrograms/SerialPrograms.pro‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,8 @@ SOURCES += \
733733
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp \
734734
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp \
735735
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp \
736+
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp \
737+
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp \
736738
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp \
737739
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp \
738740
Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.cpp \
@@ -1842,6 +1844,8 @@ HEADERS += \
18421844
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.h \
18431845
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.h \
18441846
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.h \
1847+
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.h \
1848+
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.h \
18451849
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h \
18461850
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h \
18471851
Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.h \

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
#include "PokemonSV_AutoStory_Segment_12.h"
3636
#include "PokemonSV_AutoStory_Segment_13.h"
3737
#include "PokemonSV_AutoStory_Segment_14.h"
38-
// #include "PokemonSV_AutoStory_Segment_15.h"
39-
// #include "PokemonSV_AutoStory_Segment_16.h"
38+
#include "PokemonSV_AutoStory_Segment_15.h"
39+
#include "PokemonSV_AutoStory_Segment_16.h"
4040
// #include "PokemonSV_AutoStory_Segment_17.h"
4141
// #include "PokemonSV_AutoStory_Segment_18.h"
4242
// #include "PokemonSV_AutoStory_Segment_19.h"
@@ -79,8 +79,8 @@ std::vector<std::unique_ptr<AutoStory_Segment>> make_autoStory_segment_list(){
7979
segment_list.emplace_back(std::make_unique<AutoStory_Segment_12>());
8080
segment_list.emplace_back(std::make_unique<AutoStory_Segment_13>());
8181
segment_list.emplace_back(std::make_unique<AutoStory_Segment_14>());
82-
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_15>());
83-
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_16>());
82+
segment_list.emplace_back(std::make_unique<AutoStory_Segment_15>());
83+
segment_list.emplace_back(std::make_unique<AutoStory_Segment_16>());
8484
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_17>());
8585
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_18>());
8686
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_19>());
@@ -593,13 +593,13 @@ void AutoStory::test_checkpoints(
593593
checkpoint_list.push_back([&](){checkpoint_27(env, context, notif_status_update);});
594594
checkpoint_list.push_back([&](){checkpoint_28(env, context, notif_status_update);});
595595
checkpoint_list.push_back([&](){checkpoint_29(env, context, notif_status_update);});
596-
// checkpoint_list.push_back([&](){checkpoint_30(env, context, notif_status_update);});
597-
// checkpoint_list.push_back([&](){checkpoint_31(env, context, notif_status_update);});
598-
// checkpoint_list.push_back([&](){checkpoint_32(env, context, notif_status_update);});
599-
// checkpoint_list.push_back([&](){checkpoint_33(env, context, notif_status_update);});
600-
// checkpoint_list.push_back([&](){checkpoint_34(env, context, notif_status_update);});
601-
// checkpoint_list.push_back([&](){checkpoint_35(env, context, notif_status_update);});
602-
// checkpoint_list.push_back([&](){checkpoint_36(env, context, notif_status_update);});
596+
checkpoint_list.push_back([&](){checkpoint_30(env, context, notif_status_update);});
597+
checkpoint_list.push_back([&](){checkpoint_31(env, context, notif_status_update);});
598+
checkpoint_list.push_back([&](){checkpoint_32(env, context, notif_status_update);});
599+
checkpoint_list.push_back([&](){checkpoint_33(env, context, notif_status_update);});
600+
checkpoint_list.push_back([&](){checkpoint_34(env, context, notif_status_update);});
601+
checkpoint_list.push_back([&](){checkpoint_35(env, context, notif_status_update);});
602+
checkpoint_list.push_back([&](){checkpoint_36(env, context, notif_status_update);});
603603
// checkpoint_list.push_back([&](){checkpoint_37(env, context, notif_status_update);});
604604
// checkpoint_list.push_back([&](){checkpoint_38(env, context, notif_status_update);});
605605
// checkpoint_list.push_back([&](){checkpoint_39(env, context, notif_status_update);});

0 commit comments

Comments
 (0)