Skip to content

Commit 116c9d0

Browse files
committed
static electrode on lgpe reset
1 parent 881ce19 commit 116c9d0

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

SerialPrograms/Source/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_LegendaryReset.cpp

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ LegendaryReset::LegendaryReset()
5858
{
5959
{Target::mewtwo, "mewtwo", "Mewtwo, Articuno, Zapdos, Moltres"},
6060
{Target::snorlax, "snorlax", "Snorlax"},
61+
{Target::electrode, "electrode", "Electrode"},
6162
//{Target::snorlax2, "snorlax2", "Snorlax (w/Fuji)"},
6263
},
6364
LockMode::LOCK_WHILE_RUNNING,
@@ -87,18 +88,22 @@ bool LegendaryReset::run_encounter(SingleSwitchProgramEnvironment& env, JoyconCo
8788
shiny_coefficient = error_coefficient;
8889
return true;
8990
});
90-
BattleArrowWatcher battle_started(COLOR_YELLOW, {0.546, 0.863, 0.045, 0.068});
91+
BattleArrowWatcher battle_started(COLOR_RED, {0.546, 0.863, 0.045, 0.068});
9192

9293
env.log("Starting battle.");
9394
switch (TARGET) {
9495
case Target::mewtwo:
95-
pbf_mash_button(context, BUTTON_A, 3000ms); //untested
96-
pbf_press_button(context, BUTTON_PLUS, 500ms, 500ms); //also untested
96+
pbf_mash_button(context, BUTTON_A, 3000ms);
97+
pbf_press_button(context, BUTTON_PLUS, 500ms, 500ms);
9798
break;
9899
case Target::snorlax:
99100
pbf_mash_button(context, BUTTON_A, 5000ms);
100101
pbf_mash_button(context, BUTTON_B, 10000ms);
101102
break;
103+
case Target::electrode:
104+
pbf_press_button(context, BUTTON_A, 200ms, 200ms);
105+
pbf_mash_button(context, BUTTON_B, 5000ms);
106+
break;
102107
}
103108
context.wait_for_all_requests();
104109

@@ -219,6 +224,10 @@ void LegendaryReset::program(SingleSwitchProgramEnvironment& env, CancellableSco
219224
switch (res){
220225
case 0:
221226
env.log("Catching menu detected.");
227+
send_program_status_notification(
228+
env, NOTIFICATION_STATUS_UPDATE,
229+
"Catching menu detected."
230+
);
222231
break;
223232
default:
224233
OperationFailedException::fire(

SerialPrograms/Source/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_LegendaryReset.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class LegendaryReset : public SingleSwitchProgramInstance{
3535
enum class Target{
3636
mewtwo,
3737
snorlax,
38+
electrode,
3839
//snorlax2,
3940
};
4041
EnumDropdownOption<Target> TARGET;

0 commit comments

Comments
 (0)