Skip to content

Commit 16d3340

Browse files
committed
Improve reliability of PLA region navigation.
1 parent ca28232 commit 16d3340

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ void mash_A_to_enter_sub_area(
151151
void mash_A_to_change_region(
152152
ProgramEnvironment& env, VideoStream& stream, SwitchControllerContext& context
153153
){
154+
context.wait_for_all_requests();
155+
154156
#if 0
155157
stream.log("Waiting for loading screen...");
156158
BlackScreenOverWatcher black_screen0;
@@ -171,8 +173,8 @@ void mash_A_to_change_region(
171173
#endif
172174

173175
stream.log("Waiting for end of loading screen...");
174-
BlackScreenOverWatcher black_screen1a(COLOR_RED, {0.20, 0.02, 0.60, 0.05}, 150);
175-
BlackScreenOverWatcher black_screen1b(COLOR_RED, {0.20, 0.93, 0.60, 0.05}, 150);
176+
BlackScreenOverWatcher black_screen1a(COLOR_RED, {0.20, 0.02, 0.60, 0.05});
177+
BlackScreenOverWatcher black_screen1b(COLOR_RED, {0.20, 0.93, 0.60, 0.05});
176178
int ret = run_until<SwitchControllerContext>(
177179
stream, context,
178180
[](SwitchControllerContext& context){

0 commit comments

Comments
 (0)