Skip to content

SwSh highlight rng: improve stability when interacting with the trader #1295

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
Mysticial merged 1 commit into from
Jun 21, 2026
Merged

SwSh highlight rng: improve stability when interacting with the trader #1295

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
20 changes: 11 additions & 9 deletions SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_DailyHighlightRNG.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "Pokemon/Pokemon_Strings.h"
#include "PokemonSwSh/PokemonSwSh_Settings.h"
#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
#include "PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h"
#include "PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
#include "PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
#include "PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h"
Expand Down Expand Up @@ -179,12 +180,17 @@ void DailyHighlightRNG::move_to_trader(SingleSwitchProgramEnvironment& env, ProC
void DailyHighlightRNG::interact_with_trader(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
VideoOverlaySet boxes(env.console);
SelectionArrowFinder arrow_detector(env.console, ImageFloatBox(0.5, 0.58, 0.2, 0.08));
arrow_detector.make_overlays(boxes);
YCommIconWatcher y_comm_icon_detector;
DialogTriangleWatcher triangle_detector(COLOR_DARKGREEN);
size_t tries = 0;

while (true){
if (tries >= 5){
context.wait_for_all_requests();
int ret = wait_until(env.console, context, 1000ms, { y_comm_icon_detector, triangle_detector, arrow_detector });
if (ret == 2) {
return;
}
if (tries >= 10){
DailyHighlightRNG_Descriptor::Stats& stats = env.current_stats<DailyHighlightRNG_Descriptor::Stats>();
stats.errors++;
OperationFailedException::fire(
Expand All @@ -193,15 +199,11 @@ void DailyHighlightRNG::interact_with_trader(SingleSwitchProgramEnvironment& env
env.console
);
}
context.wait_for_all_requests();
int ret = wait_until(env.console, context, 500ms, { y_comm_icon_detector, arrow_detector });
if (ret == -1 || ret == 0){
tries++;
tries++;
if (ret == 0 || ret == 1){
pbf_press_button(context, BUTTON_A, 80ms, 80ms);
}
else if (ret == 1){
return;
}
// ret == -1: probably an inbetween screen; no a press
}
}

Expand Down
Loading