Skip to content

shuttle run: implement route for alpha pidgeot #888

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 1 commit into from
Dec 9, 2025
+39 −4
Merged

shuttle run: implement route for alpha pidgeot #888

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
2 changes: 1 addition & 1 deletion SerialPrograms/Source/PokemonLZA/PokemonLZA_Panels.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
ret.emplace_back(make_single_switch_program<ShinyHunt_WildZoneCafe_Descriptor, ShinyHunt_WildZoneCafe>());
ret.emplace_back(make_single_switch_program<ShinyHunt_FlySpotReset_Descriptor, ShinyHunt_FlySpotReset>());
if (IS_BETA_VERSION){
ret.emplace_back(make_single_switch_program<ShinyHunt_ShuttleRun_Descriptor, ShinyHunt_ShuttleRun>());
}
if (PreloadSettings::instance().DEVELOPER_MODE){
ret.emplace_back(make_single_switch_program<BeldumHunter_Descriptor, BeldumHunter>());
ret.emplace_back(make_single_switch_program<ShinyHunt_ShuttleRun_Descriptor, ShinyHunt_ShuttleRun>());
ret.emplace_back(make_single_switch_program<ShinyHunt_SewerHunter_Descriptor, ShinyHunt_SewerHunter>());
}

Expand Down
41 changes: 38 additions & 3 deletions SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShuttleRun.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
#include "Common/Cpp/PrettyPrint.h"
#include "CommonFramework/VideoPipeline/VideoOverlay.h"
#include "CommonTools/Async/InferenceRoutines.h"
// #include "CommonTools/VisualDetectors/BlackScreenDetector.h"
#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
// #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
#include "Pokemon/Pokemon_Strings.h"
#include "PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
#include "PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
Expand Down Expand Up @@ -87,7 +87,42 @@ namespace {


void route_alpha_pidgeot(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
//TODO
int ret = -1;
{
BlackScreenOverWatcher black_screen(COLOR_BLUE);
ret = run_until<ProControllerContext>(
env.console, context,
[](ProControllerContext& context){
ssf_press_button(context, BUTTON_B, 0ms, 500ms, 0ms);
pbf_move_left_joystick(context, 128, 0, 4000ms, 0ms);
pbf_move_left_joystick(context, 128, 255, 4500ms, 0ms);
pbf_wait(context, 500ms);
},
{black_screen}
);
}
if (ret == 0){
wait_until_overworld(env.console, context, 50s);
open_map(env.console, context, false);
pbf_move_left_joystick(context, 148, 108, 100ms, 200ms);
if (fly_from_map(env.console, context) == FastTravelState::NOT_AT_FLY_SPOT) {
OperationFailedException::fire(
ErrorReport::SEND_ERROR_REPORT,
"fly_from_map(): Unable to fast travel",
env.console);
}
wait_until_overworld(env.console, context);
ssf_press_button(context, BUTTON_B, 0ms, 500ms, 0ms);
pbf_move_left_joystick(context, 255, 128, 800ms, 0ms);
pbf_move_left_joystick(context, 128, 0, 4400ms, 0ms);
pbf_move_left_joystick(context, 0, 128, 300ms, 0ms);
pbf_press_button(context, BUTTON_A, 500ms, 2500ms); // elevator up
ssf_press_button(context, BUTTON_B, 0ms, 500ms, 0ms);
pbf_move_left_joystick(context, 128, 0, 900ms, 0ms);
pbf_move_left_joystick(context, 0, 128, 2000ms, 0ms);
pbf_move_left_joystick(context, 255, 128, 200ms, 200ms);
pbf_press_button(context, BUTTON_L, 100ms, 200ms);
}
}

void route_wild_zone_3_tower(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
Expand Down