Skip to content

Commit 3ddc558

Browse files
committed
update Autostory segment descriptions
1 parent cc890a1 commit 3ddc558

21 files changed

+34
-25
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,13 @@ AutoStory::AutoStory()
218218
LockMode::UNLOCK_WHILE_RUNNING,
219219
"10"
220220
)
221+
, SETUP_NOTE{
222+
"NOTE: Make sure you have selected the correct Start Point. "
223+
"Make sure your player character is in the exact correct start position for that Start Point, "
224+
"especially if your start point is NOT at the beginning of the Tutorial/Main Story. "
225+
"Read the Start Point's description to help with finding the correct start position."
226+
"For Start Points that are at Pokecenters, ensure that you fly there so that your character is in the exactly correct start position."
227+
}
221228
, MAINSTORY_NOTE{
222229
"Ensure you have a level 100 Gardevoir with the moves in the following order: Moonblast, Dazzling Gleam, Psychic, Mystical Fire.<br>"
223230
"Also, make sure you have two other strong pokemon (e.g. level 100 Talonflames)<br>"
@@ -436,6 +443,7 @@ AutoStory::AutoStory()
436443

437444

438445
PA_ADD_OPTION(LANGUAGE);
446+
PA_ADD_OPTION(SETUP_NOTE);
439447
PA_ADD_OPTION(STORY_SECTION);
440448
PA_ADD_OPTION(STARTPOINT_TUTORIAL);
441449
PA_ADD_OPTION(MAINSTORY_NOTE);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ class AutoStory : public SingleSwitchProgramInstance, public ConfigOption::Liste
7777
StringSelectOption STARTPOINT_MAINSTORY;
7878
StringSelectOption ENDPOINT_MAINSTORY;
7979

80+
StaticTextOption SETUP_NOTE;
8081
StaticTextOption MAINSTORY_NOTE;
8182

8283
StaticTextOption START_DESCRIPTION;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ std::string AutoStory_Segment_01::name() const{
3939

4040

4141
std::string AutoStory_Segment_01::start_text() const{
42-
return "Start: Finished cutscene.";
42+
return "Start: Finished cutscene. Stood up from chair. Walked to left side of room.";
4343
}
4444

4545
std::string AutoStory_Segment_01::end_text() const{
46-
return "End: Picked the starter.";
46+
return "End: Picked the starter. Changed move order.";
4747
}
4848

4949
void AutoStory_Segment_01::run_segment(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ std::string AutoStory_Segment_02::name() const{
3535
}
3636

3737
std::string AutoStory_Segment_02::start_text() const{
38-
return "Start: Picked the starter.";
38+
return "Start: Picked the starter. Changed move order.";
3939
}
4040

4141
std::string AutoStory_Segment_02::end_text() const{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ std::string AutoStory_Segment_03::start_text() const{
3838
}
3939

4040
std::string AutoStory_Segment_03::end_text() const{
41-
return "End: Finished catch tutorial. Walked to the cliff and heard mystery cry.";
41+
return "End: Finished catch tutorial. Walked to the cliff and heard mystery cry. Standing in front of Nemona near the cliff.";
4242
}
4343

4444
void AutoStory_Segment_03::run_segment(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void checkpoint_06(
4545
);
4646

4747
// start: Cleared catch tutorial.
48-
// end: Moved to cliff. Heard mystery cry.
48+
// end: Moved to cliff. Heard mystery cry. Standing in front of Nemona near the cliff.
4949
void checkpoint_07(
5050
SingleSwitchProgramEnvironment& env,
5151
ProControllerContext& context,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ std::string AutoStory_Segment_04::name() const{
3535
}
3636

3737
std::string AutoStory_Segment_04::start_text() const{
38-
return "Start: Finished catch tutorial. Walked to the cliff and heard mystery cry.";
38+
return "Start: Finished catch tutorial. Walked to the cliff and heard mystery cry. Standing in front of Nemona near the cliff.";
3939
}
4040

4141
std::string AutoStory_Segment_04::end_text() const{
42-
return "End: Saved the Legendary. Escaped from the Houndoom cave.";
42+
return "End: Saved the Legendary. Escaped from the Houndoom cave. Standing next to Koraidon/Miraidon just outside the cave exit.";
4343
}
4444

4545
void AutoStory_Segment_04::run_segment(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class AutoStory_Segment_04 : public AutoStory_Segment{
2727
};
2828

2929

30-
// start: Moved to cliff. Heard mystery cry.
31-
// end: Rescued Koraidon/Miraidon and escaped from the Houndoom Cave.
30+
// start: Moved to cliff. Heard mystery cry. Standing in front of Nemona near the cliff.
31+
// end: Rescued Koraidon/Miraidon and escaped from the Houndoom Cave. Standing next to Koraidon/Miraidon just outside the cave exit.
3232
void checkpoint_08(
3333
SingleSwitchProgramEnvironment& env,
3434
ProControllerContext& context,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ std::string AutoStory_Segment_05::name() const{
3434
}
3535

3636
std::string AutoStory_Segment_05::start_text() const{
37-
return "Start: Saved the Legendary. Escaped from the Houndoom cave.";
37+
return "Start: Saved the Legendary. Escaped from the Houndoom cave. Standing next to Koraidon/Miraidon just outside the cave exit.";
3838
}
3939

4040
std::string AutoStory_Segment_05::end_text() const{
41-
return "End: Battled Arven, received Legendary's Pokeball. Talked to Nemona at Lighthouse.";
41+
return "End: Battled Arven, received Legendary's Pokeball. Talked to Nemona at roof of Lighthouse.";
4242
}
4343

4444
void AutoStory_Segment_05::run_segment(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AutoStory_Segment_05 : public AutoStory_Segment{
2727
};
2828

2929

30-
// start: Rescued Koraidon/Miraidon and escaped from the Houndoom Cave.
30+
// start: Rescued Koraidon/Miraidon and escaped from the Houndoom Cave. Standing next to Koraidon/Miraidon just outside the cave exit.
3131
// end: Battled Arven and received Legendary's Pokeball.
3232
void checkpoint_09(
3333
SingleSwitchProgramEnvironment& env,
@@ -37,7 +37,7 @@ void checkpoint_09(
3737
);
3838

3939
// start: Battled Arven and received Legendary's Pokeball.
40-
// end: Talked to Nemona at the Lighthouse.
40+
// end: Talked to Nemona at roof of the Lighthouse.
4141
void checkpoint_10(
4242
SingleSwitchProgramEnvironment& env,
4343
ProControllerContext& context,

0 commit comments

Comments
 (0)