Merge pull request #368 from kichithewolf/main

stats: reset when out of balls, rename generic to gimmi
PokemonAutomation · Sep 22, 2023 · c877295 · c877295
2 parents 78a548d + b102d43
commit c877295
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp
@@ -70,11 +70,12 @@ StatsReset::StatsReset()
         "<b>Target:</b><br>The Pokemon you are resetting for.<br>"
         "Treasures of Ruin: Stand in front of the unsealed vaults of one of the Ruinous Quartet.<br>"
         "Loyal Three: Stand in front of Okidogi/Munkidori/Fezandipiti.<br>"
-        "Generic: You are standing in front of a Pokemon that requires an A press to initiate battle.<br>",
+        //"Generic: You are standing in front of a Pokemon that requires an A press to initiate battle.<br>",
+        "Gimmighoul: Stand in front of a Gimmighoul chest.<br>",
         {
             {Target::TreasuresOfRuin, "treasures-of-ruin", "Treasures of Ruin"},
             {Target::LoyalThree, "loyal-three", "Loyal Three"},
-            {Target::Generic, "generic", "Generic"},
+            {Target::Generic, "generic", "Gimmighoul"},
         },
         LockWhileRunning::LOCKED,
         Target::TreasuresOfRuin
@@ -165,6 +166,7 @@ bool StatsReset::run_battle(SingleSwitchProgramEnvironment& env, BotBaseContext&
     uint8_t switch_party_slot = 1;
 
     bool target_fainted = false;
+    bool out_of_balls = false;
 
     int ret = run_until(
         env.console, context,
@@ -195,10 +197,11 @@ bool StatsReset::run_battle(SingleSwitchProgramEnvironment& env, BotBaseContext&
                 BattleBallReader reader(env.console, LANGUAGE);
                 int quantity = move_to_ball(reader, env.console, context, BALL_SELECT.slug());
                 if (quantity == 0) {
-                    env.console.log("Unable to find appropriate ball, out of balls, or either Pokemon fainted.");
+                    out_of_balls = true;
+                    env.console.log("Unable to find appropriate ball/out of balls.");
                     send_program_status_notification(
                         env, NOTIFICATION_STATUS_UPDATE,
-                        "Unable to find appropriate ball, out of balls, or either Pokemon fainted."
+                        "Unable to find appropriate ball/out of balls."
                     );
                     break;
                 }
@@ -282,6 +285,11 @@ bool StatsReset::run_battle(SingleSwitchProgramEnvironment& env, BotBaseContext&
         target_fainted = true;
         break;
     default:
+        if (out_of_balls) {
+            target_fainted = true; //Resets game.
+            env.log("Ran out of selected Pokeball. Resetting.");
+            break;
+        }
         env.console.log("Invalid state in run_battle().");
         stats.errors++;
         env.update_stats();

diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsResetBloodmoon.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsResetBloodmoon.cpp
@@ -270,7 +270,7 @@ bool StatsResetBloodmoon::run_battle(SingleSwitchProgramEnvironment& env, BotBas
 
         stats.catches++;
         env.update_stats();
-        env.log("Ursaluna caught.", COLOR_RED);
+        env.log("Ursaluna caught.");
     }
     else {
         env.log("Battle against Ursaluna lost.", COLOR_RED);