Skip to content

Commit 1774514

Browse files
kichithewolfkichithewolf
committed
fixes for legendary hunt emerald
1 parent 38964ff commit 1774514

File tree

4 files changed

+33
-34
lines changed

4 files changed

+33
-34
lines changed

‎SerialPrograms/Source/PokemonRSE/PokemonRSE_Navigation.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void soft_reset(const ProgramInfo& info, VideoStream& stream, ProControllerConte
3535
int ret = wait_until(
3636
stream, context,
3737
GameSettings::instance().ENTER_GAME_WAIT0,
38-
{{detector}}
38+
{detector}
3939
);
4040
if (ret == 0){
4141
stream.log("Entered game!");

‎SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryHunt-Emerald.cpp‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ LegendaryHuntEmerald::LegendaryHuntEmerald()
7878
PA_ADD_OPTION(NOTIFICATIONS);
7979
}
8080

81-
void LegendaryHuntEmerald::reset_regi(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context) {
81+
void LegendaryHuntEmerald::reset_regi(SingleSwitchProgramEnvironment& env, ProControllerContext& context) {
8282
//turn around, walk down 4/until black screen over
8383
BlackScreenOverWatcher exit_area(COLOR_RED, {0.282, 0.064, 0.448, 0.871});
8484
BlackScreenOverWatcher enter_area(COLOR_RED, {0.282, 0.064, 0.448, 0.871});
85-
int ret = run_until<SwitchControllerContext>(
85+
int ret = run_until<ProControllerContext>(
8686
env.console, context,
87-
[](SwitchControllerContext& context){
87+
[](ProControllerContext& context){
8888
ssf_press_button(context, BUTTON_B, 0, 120);
8989
pbf_press_dpad(context, DPAD_DOWN, 120, 20);
9090
pbf_wait(context, 300);
@@ -107,9 +107,9 @@ void LegendaryHuntEmerald::reset_regi(SingleSwitchProgramEnvironment& env, Switc
107107
context.wait_for_all_requests();
108108

109109
//turn around, up one/black screen over
110-
int ret2 = run_until<SwitchControllerContext>(
110+
int ret2 = run_until<ProControllerContext>(
111111
env.console, context,
112-
[](SwitchControllerContext& context){
112+
[](ProControllerContext& context){
113113
pbf_press_dpad(context, DPAD_UP, 120, 20);
114114
pbf_wait(context, 300);
115115
},
@@ -135,7 +135,7 @@ void LegendaryHuntEmerald::reset_regi(SingleSwitchProgramEnvironment& env, Switc
135135
context.wait_for_all_requests();
136136
}
137137

138-
void LegendaryHuntEmerald::reset_groudon(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context) {
138+
void LegendaryHuntEmerald::reset_groudon(SingleSwitchProgramEnvironment& env, ProControllerContext& context) {
139139
//Turn left. Take 10 steps.
140140
ssf_press_button(context, BUTTON_B, 0, 180);
141141
pbf_press_dpad(context, DPAD_LEFT, 180, 20);
@@ -159,9 +159,9 @@ void LegendaryHuntEmerald::reset_groudon(SingleSwitchProgramEnvironment& env, Sw
159159

160160
//Turn down. Exit. Black screen over.
161161
BlackScreenOverWatcher exit_area(COLOR_RED, {0.282, 0.064, 0.448, 0.871});
162-
int ret = run_until<SwitchControllerContext>(
162+
int ret = run_until<ProControllerContext>(
163163
env.console, context,
164-
[](SwitchControllerContext& context){
164+
[](ProControllerContext& context){
165165
ssf_press_button(context, BUTTON_B, 0, 90);
166166
pbf_press_dpad(context, DPAD_DOWN, 90, 20);
167167
pbf_wait(context, 300);
@@ -183,9 +183,9 @@ void LegendaryHuntEmerald::reset_groudon(SingleSwitchProgramEnvironment& env, Sw
183183

184184
//Reverse above steps.
185185
BlackScreenOverWatcher enter_area(COLOR_RED, {0.282, 0.064, 0.448, 0.871});
186-
int ret2 = run_until<SwitchControllerContext>(
186+
int ret2 = run_until<ProControllerContext>(
187187
env.console, context,
188-
[](SwitchControllerContext& context){
188+
[](ProControllerContext& context){
189189
ssf_press_button(context, BUTTON_B, 0, 90);
190190
pbf_press_dpad(context, DPAD_UP, 90, 20);
191191
pbf_wait(context, 300);
@@ -222,7 +222,7 @@ void LegendaryHuntEmerald::reset_groudon(SingleSwitchProgramEnvironment& env, Sw
222222
context.wait_for_all_requests();
223223
}
224224

225-
void LegendaryHuntEmerald::reset_kyogre(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context) {
225+
void LegendaryHuntEmerald::reset_kyogre(SingleSwitchProgramEnvironment& env, ProControllerContext& context) {
226226
//Turn down. Take 1 step.
227227
ssf_press_button(context, BUTTON_B, 0, 20);
228228
pbf_press_dpad(context, DPAD_DOWN, 20, 20);
@@ -249,9 +249,9 @@ void LegendaryHuntEmerald::reset_kyogre(SingleSwitchProgramEnvironment& env, Swi
249249

250250
//Turn down. Exit. Black screen over.
251251
BlackScreenOverWatcher exit_area(COLOR_RED, {0.282, 0.064, 0.448, 0.871});
252-
int ret = run_until<SwitchControllerContext>(
252+
int ret = run_until<ProControllerContext>(
253253
env.console, context,
254-
[](SwitchControllerContext& context){
254+
[](ProControllerContext& context){
255255
ssf_press_button(context, BUTTON_B, 0, 90);
256256
pbf_press_dpad(context, DPAD_DOWN, 90, 20);
257257
pbf_wait(context, 300);
@@ -272,9 +272,9 @@ void LegendaryHuntEmerald::reset_kyogre(SingleSwitchProgramEnvironment& env, Swi
272272
}
273273

274274
BlackScreenOverWatcher enter_area(COLOR_RED, {0.282, 0.064, 0.448, 0.871});
275-
int ret2 = run_until<SwitchControllerContext>(
275+
int ret2 = run_until<ProControllerContext>(
276276
env.console, context,
277-
[](SwitchControllerContext& context){
277+
[](ProControllerContext& context){
278278
ssf_press_button(context, BUTTON_B, 0, 90);
279279
pbf_press_dpad(context, DPAD_UP, 90, 20);
280280
pbf_wait(context, 300);
@@ -315,16 +315,16 @@ void LegendaryHuntEmerald::reset_kyogre(SingleSwitchProgramEnvironment& env, Swi
315315
context.wait_for_all_requests();
316316
}
317317

318-
void LegendaryHuntEmerald::reset_hooh(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context) {
318+
void LegendaryHuntEmerald::reset_hooh(SingleSwitchProgramEnvironment& env, ProControllerContext& context) {
319319
BlackScreenOverWatcher exit_area(COLOR_RED, {0.282, 0.064, 0.448, 0.871});
320320
//Turn around, 10 steps down
321321
ssf_press_button(context, BUTTON_B, 0, 180);
322322
pbf_press_dpad(context, DPAD_DOWN, 180, 20);
323323

324324
//Turn right, take 1 step. Wait for black screen over.
325-
int ret = run_until<SwitchControllerContext>(
325+
int ret = run_until<ProControllerContext>(
326326
env.console, context,
327-
[](SwitchControllerContext& context){
327+
[](ProControllerContext& context){
328328
ssf_press_button(context, BUTTON_B, 0, 30);
329329
pbf_press_dpad(context, DPAD_RIGHT, 30, 20);
330330
pbf_wait(context, 300);
@@ -346,9 +346,9 @@ void LegendaryHuntEmerald::reset_hooh(SingleSwitchProgramEnvironment& env, Switc
346346

347347
BlackScreenOverWatcher enter_area(COLOR_RED, {0.282, 0.064, 0.448, 0.871});
348348
//turn left, take one step. now turn back right and take a step. wait for black screen over.
349-
int ret2 = run_until<SwitchControllerContext>(
349+
int ret2 = run_until<ProControllerContext>(
350350
env.console, context,
351-
[](SwitchControllerContext& context){
351+
[](ProControllerContext& context){
352352
ssf_press_button(context, BUTTON_B, 0, 40);
353353
pbf_press_dpad(context, DPAD_LEFT, 40, 20);
354354

@@ -382,16 +382,16 @@ void LegendaryHuntEmerald::reset_hooh(SingleSwitchProgramEnvironment& env, Switc
382382
context.wait_for_all_requests();
383383
}
384384

385-
void LegendaryHuntEmerald::reset_lugia(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context) {
385+
void LegendaryHuntEmerald::reset_lugia(SingleSwitchProgramEnvironment& env, ProControllerContext& context) {
386386
BlackScreenOverWatcher exit_area(COLOR_RED, {0.282, 0.064, 0.448, 0.871});
387387
//Turn around, 5 steps down
388388
ssf_press_button(context, BUTTON_B, 0, 90);
389389
pbf_press_dpad(context, DPAD_DOWN, 90, 20);
390390

391391
//Turn right, 3 steps right. Wait for black screen over.
392-
int ret = run_until<SwitchControllerContext>(
392+
int ret = run_until<ProControllerContext>(
393393
env.console, context,
394-
[](SwitchControllerContext& context){
394+
[](ProControllerContext& context){
395395
ssf_press_button(context, BUTTON_B, 0, 90);
396396
pbf_press_dpad(context, DPAD_RIGHT, 90, 20);
397397
pbf_wait(context, 300);
@@ -413,9 +413,9 @@ void LegendaryHuntEmerald::reset_lugia(SingleSwitchProgramEnvironment& env, Swit
413413

414414
BlackScreenOverWatcher enter_area(COLOR_RED, {0.282, 0.064, 0.448, 0.871});
415415
//turn up, take one step. then turn back down and take a step. wait for black screen over.
416-
int ret2 = run_until<SwitchControllerContext>(
416+
int ret2 = run_until<ProControllerContext>(
417417
env.console, context,
418-
[](SwitchControllerContext& context){
418+
[](ProControllerContext& context){
419419
ssf_press_button(context, BUTTON_B, 0, 40);
420420
pbf_press_dpad(context, DPAD_UP, 40, 20);
421421

@@ -448,7 +448,7 @@ void LegendaryHuntEmerald::reset_lugia(SingleSwitchProgramEnvironment& env, Swit
448448
context.wait_for_all_requests();
449449
}
450450

451-
void LegendaryHuntEmerald::program(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context){
451+
void LegendaryHuntEmerald::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
452452
LegendaryHuntEmerald_Descriptor::Stats& stats = env.current_stats<LegendaryHuntEmerald_Descriptor::Stats>();
453453

454454
/*

‎SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryHunt-Emerald.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class LegendaryHuntEmerald_Descriptor : public SingleSwitchProgramDescriptor{
2626
class LegendaryHuntEmerald : public SingleSwitchProgramInstance{
2727
public:
2828
LegendaryHuntEmerald();
29-
virtual void program(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context) override;
29+
virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
3030

3131
private:
3232
enum class Target{
@@ -42,11 +42,11 @@ class LegendaryHuntEmerald : public SingleSwitchProgramInstance{
4242
EventNotificationOption NOTIFICATION_STATUS_UPDATE;
4343
EventNotificationsOption NOTIFICATIONS;
4444

45-
void reset_regi(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context);
46-
void reset_groudon(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context);
47-
void reset_kyogre(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context);
48-
void reset_hooh(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context);
49-
void reset_lugia(SingleSwitchProgramEnvironment& env, SwitchControllerContext& context);
45+
void reset_regi(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
46+
void reset_groudon(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
47+
void reset_kyogre(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
48+
void reset_hooh(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
49+
void reset_lugia(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
5050
};
5151

5252
}

‎SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#ifndef PokemonAutomation_PokemonRSE_ShinyHuntDeoxys_H
88
#define PokemonAutomation_PokemonRSE_ShinyHuntDeoxys_H
99

10-
#include "Common/Cpp/Options/SimpleIntegerOption.h"
1110
#include "Common/Cpp/Options/TimeDurationOption.h"
1211
#include "CommonFramework/Notifications/EventNotificationsTable.h"
1312
#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"

0 commit comments

Comments
 (0)