Skip to content

Commit

Permalink
move checking ball menu open to its own function
Browse files Browse the repository at this point in the history
  • Loading branch information
@kichithewolf
kichithewolf committed Sep 26, 2023
1 parent 29a939b commit 4d3aae2
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 58 deletions.
97 changes: 39 additions & 58 deletions SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,40 @@ void StatsReset::enter_battle(SingleSwitchProgramEnvironment& env, BotBaseContex
}
}

void StatsReset::open_ball_menu(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
StatsReset_Descriptor::Stats& stats = env.current_stats<StatsReset_Descriptor::Stats>();

BattleBallReader reader(env.console, LANGUAGE);
std::string ball_reader = "";
WallClock start = current_time();

env.log("Opening ball menu...");
while (ball_reader == "") {
if (current_time() - start > std::chrono::minutes(2)) {
env.log("Timed out trying to read ball after 2 minutes.", COLOR_RED);
stats.errors++;
env.update_stats();
send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
throw OperationFailedException(
ErrorReport::SEND_ERROR_REPORT, env.console,
"Timed out trying to read ball after 2 minutes.",
true
);
}

//Mash B to exit anything else
pbf_mash_button(context, BUTTON_B, 125);
context.wait_for_all_requests();

//Press X to open Ball menu
pbf_press_button(context, BUTTON_X, 20, 100);
context.wait_for_all_requests();

VideoSnapshot screen = env.console.video().snapshot();
ball_reader = reader.read_ball(screen);
}
}

//Returns target_fainted. If overworld is detected then the target fainted.
//Otherwise if AdvanceDialog is detected the Pokemon was caught or the player lost.
bool StatsReset::run_battle(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
Expand Down Expand Up @@ -206,37 +240,10 @@ bool StatsReset::run_battle(SingleSwitchProgramEnvironment& env, BotBaseContext&
env.log("Quick Ball option checked. Throwing Quick Ball.");

BattleBallReader reader(env.console, LANGUAGE);
std::string ball_reader = "";
WallClock start = current_time();

env.log("Opening ball menu...");
while (ball_reader == "") {
if (current_time() - start > std::chrono::minutes(2)) {
env.log("Timed out trying to read ball after 2 minutes.", COLOR_RED);
stats.errors++;
env.update_stats();
send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
throw OperationFailedException(
ErrorReport::SEND_ERROR_REPORT, env.console,
"Timed out trying to read ball after 2 minutes.",
true
);
}
open_ball_menu(env, context);

//Mash B to exit anything else
pbf_mash_button(context, BUTTON_B, 125);
context.wait_for_all_requests();

//Press X to open Ball menu
pbf_press_button(context, BUTTON_X, 20, 100);
context.wait_for_all_requests();

VideoSnapshot screen = env.console.video().snapshot();
ball_reader = reader.read_ball(screen);
}

env.log("Selecting ball.");
int quantity = move_to_ball(reader, env.console, context, BALL_SELECT.slug());
env.log("Selecting Quick Ball.");
int quantity = move_to_ball(reader, env.console, context, "quick-ball");
if (quantity == 0) {
//Stop so user can check they have quick balls.
env.console.log("Unable to find Quick Ball on turn 1.");
Expand All @@ -255,6 +262,7 @@ bool StatsReset::run_battle(SingleSwitchProgramEnvironment& env, BotBaseContext&
}

//Throw ball
env.log("Throwing Quick Ball.");
pbf_mash_button(context, BUTTON_A, 150);
context.wait_for_all_requests();

Expand Down Expand Up @@ -343,34 +351,7 @@ bool StatsReset::run_battle(SingleSwitchProgramEnvironment& env, BotBaseContext&
}
else {
BattleBallReader reader(env.console, LANGUAGE);
std::string ball_reader = "";
WallClock start = current_time();

env.log("Opening ball menu...");
while (ball_reader == "") {
if (current_time() - start > std::chrono::minutes(2)) {
env.log("Timed out trying to read ball after 2 minutes.", COLOR_RED);
stats.errors++;
env.update_stats();
send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
throw OperationFailedException(
ErrorReport::SEND_ERROR_REPORT, env.console,
"Timed out trying to read ball after 2 minutes.",
true
);
}

//Mash B to exit anything else
pbf_mash_button(context, BUTTON_B, 125);
context.wait_for_all_requests();

//Press X to open Ball menu
pbf_press_button(context, BUTTON_X, 20, 100);
context.wait_for_all_requests();

VideoSnapshot screen = env.console.video().snapshot();
ball_reader = reader.read_ball(screen);
}
open_ball_menu(env, context);

env.log("Selecting ball.");
int quantity = move_to_ball(reader, env.console, context, BALL_SELECT.slug());
Expand Down
1 change: 1 addition & 0 deletions SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsReset.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class StatsReset : public SingleSwitchProgramInstance {
EventNotificationsOption NOTIFICATIONS;

void enter_battle(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
void open_ball_menu(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
bool run_battle(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
bool check_stats(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
};
Expand Down

0 comments on commit 4d3aae2

Please sign in to comment.