Skip to content

tweak Virizion hyperspace route #995

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
Gin890 merged 2 commits into from
Jan 3, 2026
Merged

tweak Virizion hyperspace route #995

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28aef1c
adjust virizion timings on switch1
theastrogoth Jan 3, 2026
88a8379
mash A when jumping the gap
theastrogoth Jan 3, 2026
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 ...rams/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "ML/Inference/ML_YOLOv5Detector.h"
#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
#include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h"
#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
#include "Pokemon/Pokemon_Strings.h"
#include "PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
Expand Down Expand Up @@ -331,7 +332,8 @@ void hunt_virizion_rooftop(
SingleSwitchProgramEnvironment& env,
ProControllerContext& context,
ShinyHunt_HyperspaceLegendary_Descriptor::Stats& stats,
SimpleIntegerOption<uint16_t>& MIN_CALORIE_TO_CATCH)
SimpleIntegerOption<uint16_t>& MIN_CALORIE_TO_CATCH,
bool& use_switch1_timings)
{
auto climb_ladder = [&](Milliseconds hold){
pbf_move_left_joystick(context, {0.0, 1.0}, hold, 0ms);
Expand All @@ -346,7 +348,14 @@ void hunt_virizion_rooftop(
pbf_move_left_joystick(context, {left_joystick_x, left_joystick_y}, 500ms, 0ms);
};
auto run_changing_direction = [&](Milliseconds hold, double right_joystick_x){
pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0.0, 1.0}, {right_joystick_x, 0.0}, hold);
ssf_press_button(context, BUTTON_B, 0ms, hold, 0ms);
ssf_press_left_joystick(context, {0, +1}, 0ms, hold, 0ms);
ssf_press_right_joystick(context, {right_joystick_x, 0}, 0ms, hold, 0ms);
ssf_mash1_button(context, BUTTON_A, hold);
};
auto rotom_glide = [&](Milliseconds hold){
ssf_press_left_joystick(context, {0, +1}, 0ms, hold, 0ms);
ssf_mash1_button(context, BUTTON_A, hold);
};

// Starting facing the ladder
Expand All @@ -356,8 +365,8 @@ void hunt_virizion_rooftop(
pbf_press_button(context, BUTTON_A, 100ms, 500ms); // hop on ladder
climb_ladder(2800ms);
run_forward(2500ms);
run_backward(3000ms);
pbf_wait(context, 1s); // wait for drop to lower level
run_backward(use_switch1_timings ? 3050ms : 3000ms);
pbf_wait(context, use_switch1_timings ? 1100ms : 1s); // wait for drop to lower level
run_backward(2000ms);
run_forward(2500ms);
context.wait_for_all_requests();
Expand All @@ -382,10 +391,10 @@ void hunt_virizion_rooftop(
env.log("Move to check Virizion");
env.add_overlay_log("To Check Virizion");

run_forward(2600ms);
pbf_wait(context, 1s); // wait for drop to lower level
run_forward(use_switch1_timings ? 2700ms : 2600ms);
pbf_wait(context, use_switch1_timings ? 1100ms : 1s); // wait for drop to lower level
run_changing_direction(3000ms, -0.15);
pbf_controller_state(context, BUTTON_A, DPAD_NONE, {0.0, 1.0}, {0.0, 0.0}, 2500ms);
rotom_glide(use_switch1_timings ? 2600ms : 2500ms);
run_forward(5s);
context.wait_for_all_requests();
}
Expand Down Expand Up @@ -413,12 +422,21 @@ void ShinyHunt_HyperspaceLegendary::program(SingleSwitchProgramEnvironment& env,
return true;
});

// check whether this is Switch 1 or 2.
ConsoleType console_type = env.console.state().console_type();
if (console_type == ConsoleType::Unknown){
env.add_overlay_log("Detecting console type");
env.console.log("Unknown Switch type. Try to detect.");
console_type = detect_console_type_from_in_game(env.console, context);
}
bool use_switch1_timings = is_switch1(console_type);

while (true){
const int ret = run_until<ProControllerContext>(
env.console, context,
[&](ProControllerContext& context){
if (LEGENDARY == Legendary::VIRIZION){
hunt_virizion_rooftop(env, context, stats, MIN_CALORIE_TO_CATCH);
hunt_virizion_rooftop(env, context, stats, MIN_CALORIE_TO_CATCH, use_switch1_timings);
} else if (LEGENDARY == Legendary::TERRAKION){
hunt_terrakion(env, context, stats, MIN_CALORIE_TO_CATCH);
} else {
Expand Down