Skip to content

Commit 4ecd710

Browse files
committed
Improve reliability of Shaymin hunt.
1 parent f0eb83d commit 4ecd710

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

SerialPrograms/Source/CommonFramework/Globals.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace PokemonAutomation{
2626
const bool IS_BETA_VERSION = true;
2727
const int PROGRAM_VERSION_MAJOR = 0;
2828
const int PROGRAM_VERSION_MINOR = 54;
29-
const int PROGRAM_VERSION_PATCH = 2;
29+
const int PROGRAM_VERSION_PATCH = 3;
3030

3131
const std::string PROGRAM_VERSION_BASE =
3232
"v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "CommonFramework/Notifications/ProgramNotifications.h"
88
#include "CommonTools/Async/InferenceRoutines.h"
99
#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
10+
#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
1011
#include "PokemonSwSh/ShinyHuntTracker.h"
1112
#include "PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h"
1213
#include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h"
@@ -80,8 +81,9 @@ bool ShinyHuntShaymin::start_encounter(SingleSwitchProgramEnvironment& env, ProC
8081
env.console, context,
8182
[&](ProControllerContext& context){
8283
while (true){
83-
for (size_t c = 0; c < 5; c++){
84-
pbf_press_button(context, BUTTON_ZL, 20, 105);
84+
ssf_press_dpad(context, DPAD_UP, 0ms, 10s, 0ms);
85+
for (size_t c = 0; c < 10; c++){
86+
pbf_press_button(context, BUTTON_ZL, 200ms, 800ms);
8587
}
8688
// pbf_mash_button(context, BUTTON_ZL, 5 * TICKS_PER_SECOND);
8789
}
@@ -107,8 +109,9 @@ bool ShinyHuntShaymin::start_encounter(SingleSwitchProgramEnvironment& env, ProC
107109
env.console, context,
108110
[&](ProControllerContext& context){
109111
while (true){
110-
for (size_t c = 0; c < 5; c++){
111-
pbf_press_button(context, BUTTON_ZL, 20, 105);
112+
ssf_press_dpad(context, DPAD_UP, 0ms, 10s, 0ms);
113+
for (size_t c = 0; c < 10; c++){
114+
pbf_press_button(context, BUTTON_ZL, 200ms, 800ms);
112115
}
113116
// pbf_mash_button(context, BUTTON_ZL, 5 * TICKS_PER_SECOND);
114117
}

0 commit comments

Comments
 (0)