Skip to content

handle extra dialog in gift reset #569

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 2 commits into from
Apr 10, 2025
Merged

handle extra dialog in gift reset #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f692e4
handle extra dialog in gift reset
kichithewolf Apr 5, 2025
872aa4b
update wait time
kichithewolf Apr 7, 2025
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
13 changes: 12 additions & 1 deletion SerialPrograms/Source/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_GiftReset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@ std::unique_ptr<StatsTracker> GiftReset_Descriptor::make_stats() const{
}

GiftReset::GiftReset()
: GO_HOME_WHEN_DONE(false)
: EXTRA_DIALOG(
"<b>Persian/Arcanine:</b><br>Check this if the gift Pokemon is Persian or Arcanine.",
LockMode::UNLOCK_WHILE_RUNNING, false
)
, GO_HOME_WHEN_DONE(false)
, NOTIFICATION_SHINY(
"Shiny Found",
true, true, ImageAttachmentMode::JPG,
Expand All @@ -65,6 +69,7 @@ GiftReset::GiftReset()
&NOTIFICATION_PROGRAM_FINISH,
})
{
PA_ADD_OPTION(EXTRA_DIALOG);
PA_ADD_OPTION(GO_HOME_WHEN_DONE);
PA_ADD_OPTION(NOTIFICATIONS);
}
Expand Down Expand Up @@ -114,6 +119,12 @@ void GiftReset::program(SingleSwitchProgramEnvironment& env, CancellableScope& s
"Received gift Pokemon."
);

if (EXTRA_DIALOG){
env.log("Persian/Arcanine selected. Mashing B to exit dialog.");
pbf_mash_button(context, BUTTON_B, 4100ms);
context.wait_for_all_requests();
}

//Wait a bit.
pbf_wait(context, 2500ms);
context.wait_for_all_requests();
Expand Down
1 change: 1 addition & 0 deletions SerialPrograms/Source/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_GiftReset.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class GiftReset : public SingleSwitchProgramInstance{
virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;

private:
BooleanCheckBoxOption EXTRA_DIALOG;
GoHomeWhenDoneOption GO_HOME_WHEN_DONE;

EventNotificationOption NOTIFICATION_SHINY;
Expand Down