Skip to content

Autostory: fix team star segments #898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jw098 merged 1 commit into from
Dec 12, 2025
Merged

Autostory: fix team star segments #898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/

#include "CommonFramework/VideoPipeline/VideoFeed.h"
#include "PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"

#include "CommonFramework/Exceptions/OperationFailedException.h"
#include "CommonFramework/VideoPipeline/VideoOverlay.h"
Expand Down Expand Up @@ -183,7 +184,7 @@ void checkpoint_33(
128, 0, 20, 20, false);

clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG, CallbackEnum::TUTORIAL});
AdvanceDialogWatcher dialog(COLOR_RED);
NoMinimapWatcher no_minimap(env.console.logger(), COLOR_RED, Milliseconds(250));
int ret = run_until<ProControllerContext>(
env.console, context,
[&](ProControllerContext& context){
Expand Down Expand Up @@ -259,8 +260,10 @@ void checkpoint_33(
pbf_press_button(context, BUTTON_R, 20, 20);
pbf_wait(context, seconds_wait * TICKS_PER_SECOND);

pbf_wait(context, 20 * TICKS_PER_SECOND);

},
{dialog}
{no_minimap}
);
context.wait_for(std::chrono::milliseconds(100));
if (ret < 0){
Expand Down
6 changes: 4 additions & 2 deletions SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
#include "CommonTools/Async/InferenceRoutines.h"
#include "CommonFramework/VideoPipeline/VideoFeed.h"
#include "PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"

#include "CommonFramework/Exceptions/OperationFailedException.h"
#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
Expand Down Expand Up @@ -175,7 +176,7 @@ void checkpoint_48(
);
clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG, CallbackEnum::TUTORIAL});

AdvanceDialogWatcher dialog(COLOR_RED);
NoMinimapWatcher no_minimap(env.console.logger(), COLOR_RED, Milliseconds(250));
int ret = run_until<ProControllerContext>(
env.console, context,
[&](ProControllerContext& context){
Expand Down Expand Up @@ -271,9 +272,10 @@ void checkpoint_48(
pbf_press_button(context, BUTTON_R, 20, 20);
pbf_wait(context, seconds_wait * TICKS_PER_SECOND);

pbf_wait(context, 20 * TICKS_PER_SECOND);

},
{dialog}
{no_minimap}
);
context.wait_for(std::chrono::milliseconds(100));
if (ret < 0){
Expand Down
7 changes: 4 additions & 3 deletions SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
#include "PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
#include "CommonFramework/VideoPipeline/VideoFeed.h"
#include "PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"

#include "CommonFramework/Exceptions/OperationFailedException.h"
#include "CommonTools/Async/InferenceRoutines.h"
Expand Down Expand Up @@ -200,7 +201,7 @@ void checkpoint_59(
);
clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});

AdvanceDialogWatcher dialog(COLOR_RED);
NoMinimapWatcher no_minimap(env.console.logger(), COLOR_RED, Milliseconds(250));
int ret = run_until<ProControllerContext>(
env.console, context,
[&](ProControllerContext& context){
Expand Down Expand Up @@ -291,10 +292,10 @@ void checkpoint_59(
pbf_wait(context, seconds_wait * TICKS_PER_SECOND);


pbf_wait(context, 10 * TICKS_PER_SECOND);
pbf_wait(context, 20 * TICKS_PER_SECOND);

},
{dialog}
{no_minimap}
);
context.wait_for(std::chrono::milliseconds(100));
if (ret < 0){
Expand Down
5 changes: 3 additions & 2 deletions SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
#include "PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
#include "CommonFramework/VideoPipeline/VideoFeed.h"
#include "PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"

#include "CommonFramework/Exceptions/OperationFailedException.h"
#include "CommonTools/Async/InferenceRoutines.h"
Expand Down Expand Up @@ -178,7 +179,7 @@ void checkpoint_69(SingleSwitchProgramEnvironment& env, ProControllerContext& co
);
clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});

AdvanceDialogWatcher dialog(COLOR_RED);
NoMinimapWatcher no_minimap(env.console.logger(), COLOR_RED, Milliseconds(250));
int ret = run_until<ProControllerContext>(
env.console, context,
[&](ProControllerContext& context){
Expand Down Expand Up @@ -284,7 +285,7 @@ void checkpoint_69(SingleSwitchProgramEnvironment& env, ProControllerContext& co
pbf_wait(context, 20 * TICKS_PER_SECOND);

},
{dialog}
{no_minimap}
);
context.wait_for(std::chrono::milliseconds(100));
if (ret < 0){
Expand Down
5 changes: 3 additions & 2 deletions SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
#include "PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
#include "CommonFramework/VideoPipeline/VideoFeed.h"
#include "PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"

#include "CommonFramework/Exceptions/OperationFailedException.h"
#include "CommonTools/Async/InferenceRoutines.h"
Expand Down Expand Up @@ -352,7 +353,7 @@ void beat_team_star_fighting2(SingleSwitchProgramEnvironment& env, ProController
clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});


AdvanceDialogWatcher dialog(COLOR_RED);
NoMinimapWatcher no_minimap(env.console.logger(), COLOR_RED, Milliseconds(250));
int ret = run_until<ProControllerContext>(
env.console, context,
[&](ProControllerContext& context){
Expand Down Expand Up @@ -511,7 +512,7 @@ void beat_team_star_fighting2(SingleSwitchProgramEnvironment& env, ProController


},
{dialog}
{no_minimap}
);
context.wait_for(std::chrono::milliseconds(100));
if (ret < 0){
Expand Down
Loading