Skip to content

Commit 19c7762

Browse files
authored
Merge pull request #516 from jw098/seg19
Segment 19
2 parents 5edf75a + 6b11581 commit 19c7762

File tree

5 files changed

+445
-12
lines changed

5 files changed

+445
-12
lines changed

SerialPrograms/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1482,6 +1482,8 @@ file(GLOB MAIN_SOURCES
14821482
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.h
14831483
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp
14841484
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.h
1485+
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp
1486+
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.h
14851487
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp
14861488
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h
14871489
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp

SerialPrograms/SerialPrograms.pro

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -739,6 +739,7 @@ SOURCES += \
739739
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp \
740740
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp \
741741
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp \
742+
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp \
742743
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp \
743744
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp \
744745
Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.cpp \
@@ -1855,6 +1856,7 @@ HEADERS += \
18551856
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.h \
18561857
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.h \
18571858
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.h \
1859+
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.h \
18581860
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h \
18591861
Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h \
18601862
Source/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.h \

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
#include "PokemonSV_AutoStory_Segment_14.h"
3838
#include "PokemonSV_AutoStory_Segment_15.h"
3939
#include "PokemonSV_AutoStory_Segment_16.h"
40-
// #include "PokemonSV_AutoStory_Segment_17.h"
41-
// #include "PokemonSV_AutoStory_Segment_18.h"
42-
// #include "PokemonSV_AutoStory_Segment_19.h"
40+
#include "PokemonSV_AutoStory_Segment_17.h"
41+
#include "PokemonSV_AutoStory_Segment_18.h"
42+
#include "PokemonSV_AutoStory_Segment_19.h"
4343
// #include "PokemonSV_AutoStory_Segment_20.h"
4444
// #include "PokemonSV_AutoStory_Segment_21.h"
4545
// #include "PokemonSV_AutoStory_Segment_22.h"
@@ -81,9 +81,9 @@ std::vector<std::unique_ptr<AutoStory_Segment>> make_autoStory_segment_list(){
8181
segment_list.emplace_back(std::make_unique<AutoStory_Segment_14>());
8282
segment_list.emplace_back(std::make_unique<AutoStory_Segment_15>());
8383
segment_list.emplace_back(std::make_unique<AutoStory_Segment_16>());
84-
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_17>());
85-
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_18>());
86-
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_19>());
84+
segment_list.emplace_back(std::make_unique<AutoStory_Segment_17>());
85+
segment_list.emplace_back(std::make_unique<AutoStory_Segment_18>());
86+
segment_list.emplace_back(std::make_unique<AutoStory_Segment_19>());
8787
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_20>());
8888
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_21>());
8989
// segment_list.emplace_back(std::make_unique<AutoStory_Segment_22>());
@@ -600,12 +600,12 @@ void AutoStory::test_checkpoints(
600600
checkpoint_list.push_back([&](){checkpoint_34(env, context, notif_status_update);});
601601
checkpoint_list.push_back([&](){checkpoint_35(env, context, notif_status_update);});
602602
checkpoint_list.push_back([&](){checkpoint_36(env, context, notif_status_update);});
603-
// checkpoint_list.push_back([&](){checkpoint_37(env, context, notif_status_update);});
604-
// checkpoint_list.push_back([&](){checkpoint_38(env, context, notif_status_update);});
605-
// checkpoint_list.push_back([&](){checkpoint_39(env, context, notif_status_update);});
606-
// checkpoint_list.push_back([&](){checkpoint_40(env, context, notif_status_update);});
607-
// checkpoint_list.push_back([&](){checkpoint_41(env, context, notif_status_update);});
608-
// checkpoint_list.push_back([&](){checkpoint_42(env, context, notif_status_update);});
603+
checkpoint_list.push_back([&](){checkpoint_37(env, context, notif_status_update);});
604+
checkpoint_list.push_back([&](){checkpoint_38(env, context, notif_status_update);});
605+
checkpoint_list.push_back([&](){checkpoint_39(env, context, notif_status_update);});
606+
checkpoint_list.push_back([&](){checkpoint_40(env, context, notif_status_update);});
607+
checkpoint_list.push_back([&](){checkpoint_41(env, context, notif_status_update);});
608+
checkpoint_list.push_back([&](){checkpoint_42(env, context, notif_status_update);});
609609
// checkpoint_list.push_back([&](){checkpoint_43(env, context, notif_status_update);});
610610
// checkpoint_list.push_back([&](){checkpoint_44(env, context, notif_status_update);});
611611
// checkpoint_list.push_back([&](){checkpoint_45(env, context, notif_status_update);});

0 commit comments

Comments
 (0)