Skip to content

Commit 618e07b

Browse files
committed
legendaryreset fixes
1 parent bfa5836 commit 618e07b

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

SerialPrograms/Source/PokemonLGPE/PokemonLGPE_Panels.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
3838
ret.emplace_back(make_single_switch_program<AlolanTrade_Descriptor, AlolanTrade>());
3939
ret.emplace_back(make_single_switch_program<FossilRevival_Descriptor, FossilRevival>());
4040
ret.emplace_back(make_single_switch_program<GiftReset_Descriptor, GiftReset>());
41-
ret.emplace_back(make_single_switch_program<LegendaryReset_Descriptor, LegendaryReset>());
41+
if (IS_BETA_VERSION || PreloadSettings::instance().DEVELOPER_MODE) {
42+
ret.emplace_back(make_single_switch_program<LegendaryReset_Descriptor, LegendaryReset>());
43+
}
4244

4345
if (PreloadSettings::instance().DEVELOPER_MODE){
4446
ret.emplace_back("---- Developer Tools ----");

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,12 @@ bool LegendaryReset::run_battle(SingleSwitchProgramEnvironment& env, JoyconConte
9292
env.log("Starting battle.");
9393
switch (TARGET) {
9494
case Target::mewtwo:
95-
pbf_mash_button(context, BUTTON_A, 5000ms); //untested
95+
pbf_mash_button(context, BUTTON_A, 3000ms); //untested
96+
pbf_press_button(context, BUTTON_PLUS, 500ms, 500ms); //also untested
9697
break;
9798
case Target::snorlax:
98-
pbf_mash_button(context, BUTTON_A, 15000ms);
99-
break;
100-
case Target::snorlax2:
101-
pbf_mash_button(context, BUTTON_A, 25000ms); //can't test, not really worth it
99+
pbf_mash_button(context, BUTTON_A, 5000ms);
100+
pbf_mash_button(context, BUTTON_B, 10000ms);
102101
break;
103102
}
104103
context.wait_for_all_requests();

SerialPrograms/Source/PokemonLGPE/Programs/TestPrograms/PokemonLGPE_SoundListener.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void SoundListener::program(SingleSwitchProgramEnvironment& env, CancellableScop
7979
default:
8080
throw InternalProgramError(
8181
&env.logger(), PA_CURRENT_FUNCTION,
82-
"Not such sound detector as sound type " + std::to_string((size_t)type)
82+
"No such sound detector as sound type " + std::to_string((size_t)type)
8383
);
8484
return;
8585
}

0 commit comments

Comments
 (0)