Skip to content

frlg and rse min time for throw no sound #1153

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

Open
kichithewolf wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −4
Open

frlg and rse min time for throw no sound #1153

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
2 changes: 1 addition & 1 deletion SerialPrograms/Source/PokemonFRLG/PokemonFRLG_Navigation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ bool handle_encounter(ConsoleHandle& console, ProControllerContext& context, boo
},
{{shiny_detector}}
);
shiny_detector.throw_if_no_sound();
shiny_detector.throw_if_no_sound(std::chrono::milliseconds(1000));
if (res == 0){
console.log("Shiny detected!");
return true;
Expand Down
2 changes: 1 addition & 1 deletion SerialPrograms/Source/PokemonRSE/PokemonRSE_Navigation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ bool handle_encounter(ConsoleHandle& console, ProControllerContext& context, boo
},
{{shiny_detector}}
);
shiny_detector.throw_if_no_sound();
shiny_detector.throw_if_no_sound(std::chrono::milliseconds(1000));
if (res == 0){
console.log("Shiny detected!");
return true;
Expand Down
4 changes: 2 additions & 2 deletions SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ void AudioStarterReset::program(SingleSwitchProgramEnvironment& env, ProControll
},
{{pooch_detector}}
);
pooch_detector.throw_if_no_sound();
pooch_detector.throw_if_no_sound(std::chrono::milliseconds(1000));
if (res == 0){
env.log("Shiny Poochyena detected!");
stats.poochyena++;
Expand Down Expand Up @@ -277,7 +277,7 @@ void AudioStarterReset::program(SingleSwitchProgramEnvironment& env, ProControll
},
{{starter_detector}}
);
starter_detector.throw_if_no_sound();
starter_detector.throw_if_no_sound(std::chrono::milliseconds(1000));
context.wait_for_all_requests();
if (res2 == 0){
env.log("Shiny starter detected!");
Expand Down
Loading