Skip to content

Commit d13cca2

Browse files
committed
autostory: minor changes
1 parent cb4d8b8 commit d13cca2

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ AutoStory::AutoStory()
474474
}
475475

476476
void AutoStory::on_config_value_changed(void* object){
477-
ConfigOptionState state = (STARTPOINT_TUTORIAL.index() <= 1)
477+
ConfigOptionState state = (STARTPOINT_TUTORIAL.index() <= 1 && STORY_SECTION == StorySection::TUTORIAL)
478478
? ConfigOptionState::ENABLED
479479
: ConfigOptionState::HIDDEN;
480480
STARTERCHOICE.set_visibility(state);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,7 @@ void checkpoint_reattempt_loop(
12371237
if (i > max_attempts){
12381238
OperationFailedException::fire(
12391239
ErrorReport::SEND_ERROR_REPORT,
1240-
"Autostory checkpoint failed 100 times.\n"
1240+
"Autostory checkpoint failed " + std::to_string(max_attempts) + " times.\n"
12411241
"Make sure you selected the correct Start Point, and your character is in the exactly correct starting position."
12421242
"Also, make sure you have set the correct Language.\n" + e.message(),
12431243
env.console
@@ -1278,7 +1278,7 @@ void checkpoint_reattempt_loop_tutorial(
12781278
if (i > max_attempts){
12791279
OperationFailedException::fire(
12801280
ErrorReport::SEND_ERROR_REPORT,
1281-
"Autostory checkpoint failed 100 times.\n"
1281+
"Autostory checkpoint failed " + std::to_string(max_attempts) + " times.\n"
12821282
"Make sure you selected the correct Start Point, and your character is in the exactly correct starting position."
12831283
"Also, make sure you have set the correct Language.\n" + e.message(),
12841284
env.console

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ void checkpoint_25(
150150
);
151151
mash_button_till_overworld(env.console, context, BUTTON_A);
152152

153+
context.wait_for_all_requests();
154+
153155
// section 2
154156
pbf_move_left_joystick(context, 128, 0, 1300, 100);
155157

0 commit comments

Comments
 (0)