Skip to content

Commit 0c1e2db

Browse files
committed
FlySpotReset: add route for hunting alpha Patrat
1 parent 7e52906 commit 0c1e2db

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed

SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.cpp

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ ShinyHunt_FlySpotReset::ShinyHunt_FlySpotReset()
6666
{Route::NO_MOVEMENT, "no_movement", "No Movement"},
6767
{Route::WILD_ZONE_19, "wild_zone_19", "Wild Zone 19"},
6868
{Route::ALPHA_PIDGEY, "alpha_pidgey", "Alpha Pidgey (Wild Zone 1)"},
69+
{Route::ALPHA_PATRAT, "alpha_patrat", "Alpha Patrat (Cafe Cyclone)"},
6970
{Route::ALPHA_PIKACHU, "alpha_pikachu", "Alpha Pikachu (Wild Zone 6)"},
7071
// {Route::CUSTOMISED_MACRO, "customised_macro", "Customised Macro"},
7172
},
@@ -178,6 +179,38 @@ void route_alpha_pidgey(
178179
wait_until_overworld(env.console, context);
179180
}
180181

182+
void route_alpha_patrat(
183+
SingleSwitchProgramEnvironment& env,
184+
ProControllerContext& context,
185+
ShinyHunt_FlySpotReset_Descriptor::Stats& stats,
186+
bool to_zoom_to_max){
187+
{
188+
BlackScreenOverWatcher black_screen(COLOR_BLUE);
189+
int ret = run_until<ProControllerContext>(
190+
env.console, context,
191+
[](ProControllerContext& context){
192+
ssf_press_button(context, BUTTON_B, 0ms, 500ms, 0ms);
193+
pbf_move_left_joystick(context, 0, 128, 2000ms, 0ms);
194+
pbf_move_left_joystick(context, 96, 0, 3500ms, 0ms);
195+
},
196+
{black_screen}
197+
);
198+
if (ret == 0){
199+
wait_until_overworld(env.console, context, 50s);
200+
}
201+
}
202+
open_map(env.console, context, to_zoom_to_max);
203+
pbf_move_left_joystick(context, 128, 255, 50ms, 100ms);
204+
if (fly_from_map(env.console, context) != FastTravelState::SUCCESS){
205+
OperationFailedException::fire(
206+
ErrorReport::SEND_ERROR_REPORT,
207+
"fly_from_map(): Unable to fast travel",
208+
env.console);
209+
}
210+
wait_until_overworld(env.console, context, 50s);
211+
}
212+
213+
181214
void route_alpha_pikachu(
182215
SingleSwitchProgramEnvironment& env,
183216
ProControllerContext& context,
@@ -269,6 +302,9 @@ void ShinyHunt_FlySpotReset::program(SingleSwitchProgramEnvironment& env, ProCon
269302
case Route::ALPHA_PIDGEY:
270303
route = route_alpha_pidgey;
271304
break;
305+
case Route::ALPHA_PATRAT:
306+
route = route_alpha_patrat;
307+
break;
272308
case Route::ALPHA_PIKACHU:
273309
route = route_alpha_pikachu;
274310
break;

SerialPrograms/Source/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class ShinyHunt_FlySpotReset : public SingleSwitchProgramInstance{
3838
NO_MOVEMENT,
3939
WILD_ZONE_19,
4040
ALPHA_PIDGEY,
41+
ALPHA_PATRAT,
4142
ALPHA_PIKACHU,
4243
CUSTOMISED_MACRO = 255,
4344
};

0 commit comments

Comments
 (0)