Skip to content

FRLG: Snorlax added to legendary reset #1143

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
pifopi merged 1 commit into from
Mar 28, 2026
+33 −9
Merged

FRLG: Snorlax added to legendary reset #1143

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
34 changes: 26 additions & 8 deletions SerialPrograms/Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,15 @@ std::unique_ptr<StatsTracker> LegendaryReset_Descriptor::make_stats() const{
}

LegendaryReset::LegendaryReset()
: WALK_UP(
"<b>Walk Up (Ho-Oh only):</b><br>Walk up to trigger encounter.",
: TARGET(
"<b>Target:</b><br>",
{
{Target::press_a, "press_a", "Press A: Articuno, Zapdos, Moltres, Mewtwo, Deoxys, Lugia, Electrode"},
{Target::walk_up, "walk_up", "Walk Up: Ho-Oh"},
{Target::snorlax, "snorlax", "Snorlax"},
},
LockMode::LOCK_WHILE_RUNNING,
false
Target::press_a
)
, TAKE_VIDEO("<b>Take Video:</b><br>Record a video when the shiny is found.", LockMode::UNLOCK_WHILE_RUNNING, true)
, GO_HOME_WHEN_DONE(true)
Expand All @@ -71,7 +76,7 @@ LegendaryReset::LegendaryReset()
})
{
PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
PA_ADD_OPTION(WALK_UP);
PA_ADD_OPTION(TARGET);
PA_ADD_OPTION(TAKE_VIDEO);
PA_ADD_OPTION(GO_HOME_WHEN_DONE);
PA_ADD_OPTION(NOTIFICATIONS);
Expand All @@ -91,14 +96,27 @@ void LegendaryReset::program(SingleSwitchProgramEnvironment& env, ProControllerC
*/

while (true){
if (WALK_UP){
switch (TARGET) {
case Target::press_a:
env.log("Target: Press A.");
//Talk to target
pbf_press_button(context, BUTTON_A, 320ms, 320ms);
break;
case Target::walk_up:
env.log("Target: Walk Up.");
//Step forward to start the encounter.
pbf_press_dpad(context, DPAD_UP, 320ms, 400ms);
break;
case Target::snorlax:
env.log("Target: Snorlax.");
//Use Pokeflute
pbf_mash_button(context, BUTTON_A, 3000ms);
//Wait a bit for the sound effect before B mash starts
pbf_wait(context, 3000ms);
context.wait_for_all_requests();
break;
}

//Talk to target
pbf_press_button(context, BUTTON_A, 320ms, 320ms);

//Mash B until black screen detected but not over (entered battle)
BlackScreenWatcher battle_entered(COLOR_RED);
int ret = run_until<ProControllerContext>(
Expand Down
8 changes: 7 additions & 1 deletion SerialPrograms/Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,13 @@ class LegendaryReset : public SingleSwitchProgramInstance{
private:
PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;

BooleanCheckBoxOption WALK_UP;
enum class Target{
press_a,
walk_up,
snorlax,
};
EnumDropdownOption<Target> TARGET;

BooleanCheckBoxOption TAKE_VIDEO;

GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
Expand Down
Loading