send_out_lead flag for handle_encounter

Author: kichithewolf

SerialPrograms/Source/PokemonRSE/PokemonRSE_Navigation.cpp

@@ -10,6 +10,7 @@
 #include "CommonTools/Async/InferenceRoutines.h"
 #include "CommonTools/VisualDetectors/BlackScreenDetector.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h"
 #include "PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.h"
 #include "PokemonRSE/PokemonRSE_Settings.h"
@@ -20,11 +21,11 @@ namespace NintendoSwitch{
 namespace PokemonRSE{
 
 
-void soft_reset(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+void soft_reset(const ProgramInfo& info, VideoStream& stream, SwitchControllerContext& context){
     // A + B + Select + Start
     pbf_press_button(context, BUTTON_B | BUTTON_Y | BUTTON_MINUS | BUTTON_PLUS, 10, 180);
 
-    pbf_mash_button(context, BUTTON_PLUS, GameSettings::instance().START_BUTTON_MASH0);
+    pbf_mash_button(context, BUTTON_PLUS, GameSettings::instance().START_BUTTON_MASH);
     context.wait_for_all_requests();
 
     pbf_press_button(context, BUTTON_A, 20, 40);
@@ -33,8 +34,8 @@ void soft_reset(const ProgramInfo& info, VideoStream& stream, ProControllerConte
     BlackScreenOverWatcher detector(COLOR_RED, {0.282, 0.064, 0.448, 0.871});
     int ret = wait_until(
         stream, context,
-        GameSettings::instance().ENTER_GAME_WAIT0,
-        {detector}
+        std::chrono::milliseconds(GameSettings::instance().ENTER_GAME_WAIT * (1000 / TICKS_PER_SECOND)),
+        {{detector}}
     );
     if (ret == 0){
         stream.log("Entered game!");
@@ -49,7 +50,7 @@ void soft_reset(const ProgramInfo& info, VideoStream& stream, ProControllerConte
     context.wait_for_all_requests();
 }
 
-void flee_battle(VideoStream& stream, ProControllerContext& context) {
+void flee_battle(VideoStream& stream, SwitchControllerContext& context) {
     stream.log("Navigate to Run.");
     pbf_press_dpad(context, DPAD_RIGHT, 20, 20);
     pbf_press_dpad(context, DPAD_DOWN, 20, 20);
@@ -89,7 +90,7 @@ void flee_battle(VideoStream& stream, ProControllerContext& context) {
     }
 }
 
-bool handle_encounter(VideoStream& stream, ProControllerContext& context) {
+bool handle_encounter(VideoStream& stream, SwitchControllerContext& context, bool send_out_lead) {
     float shiny_coefficient = 1.0;
     ShinySoundDetector shiny_detector(stream.logger(), [&](float error_coefficient) -> bool{
         shiny_coefficient = error_coefficient;
@@ -101,9 +102,9 @@ bool handle_encounter(VideoStream& stream, ProControllerContext& context) {
     pbf_mash_button(context, BUTTON_A, 540);
     context.wait_for_all_requests();
 
-    int res = run_until<ProControllerContext>(
+    int res = run_until<SwitchControllerContext>(
         stream, context,
-        [&](ProControllerContext& context) {
+        [&](SwitchControllerContext& context) {
             int ret = wait_until(
                 stream, context,
                 std::chrono::seconds(30),
@@ -130,27 +131,30 @@ bool handle_encounter(VideoStream& stream, ProControllerContext& context) {
     }
     stream.log("Shiny not found.");
 
-    //Send out lead, no shiny detection needed.
-    BattleMenuWatcher battle_menu(COLOR_RED);
-    stream.log("Sending out lead Pokemon.");
-    pbf_press_button(context, BUTTON_A, 40, 40);
+    if (send_out_lead) {
+        //Send out lead, no shiny detection needed.
+        BattleMenuWatcher battle_menu(COLOR_RED);
+        stream.log("Sending out lead Pokemon.");
+        pbf_press_button(context, BUTTON_A, 40, 40);
 
-    int ret = wait_until(
-        stream, context,
-        std::chrono::seconds(15),
-        {{battle_menu}}
-    );
-    if (ret == 0) {
-        stream.log("Battle menu detecteed!");
-    } else {
-        OperationFailedException::fire(
-            ErrorReport::SEND_ERROR_REPORT,
-            "handle_encounter(): Did not detect battle menu.",
-            stream
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(15),
+            { {battle_menu} }
         );
+        if (ret == 0) {
+            stream.log("Battle menu detecteed!");
+        }
+        else {
+            OperationFailedException::fire(
+                ErrorReport::SEND_ERROR_REPORT,
+                "handle_encounter(): Did not detect battle menu.",
+                stream
+            );
+        }
+        pbf_wait(context, 125);
+        context.wait_for_all_requests();
     }
-    pbf_wait(context, 125);
-    context.wait_for_all_requests();
 
     return false;
 }

SerialPrograms/Source/PokemonRSE/PokemonRSE_Navigation.h

@@ -11,7 +11,7 @@
 
 #include "CommonFramework/Tools/VideoStream.h"
 #include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "NintendoSwitch/Controllers/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_Controller.h"
 
 namespace PokemonAutomation{
     struct ProgramInfo;
@@ -20,14 +20,15 @@ namespace PokemonRSE{
 
 // Press A+B+Select+Start at the same time to soft reset, then re-enters the game.
 // For now this assumes no dry battery.
-void soft_reset(const ProgramInfo& info, VideoStream& stream, ProControllerContext &context);
+void soft_reset(const ProgramInfo& info, VideoStream& stream, SwitchControllerContext &context);
 
 // Run from battle. Cursor must start on the FIGHT button. Assumes fleeing will always work. (Smoke Ball)
-void flee_battle(VideoStream& stream, ProControllerContext& context);
+void flee_battle(VideoStream& stream, SwitchControllerContext& context);
 
 // After press A/walking up to enter a battle, run this handle the battle start and to check if opponent is shiny.
-// Use flee_battle or soft_reset after this, depending on game.
-bool handle_encounter(VideoStream& stream, ProControllerContext& context);
+// Set send_out_lead to true and then use flee_battle() after if game is Emerald.
+// For R/S, send_out_lead as false and then soft_reset() to save time.
+bool handle_encounter(VideoStream& stream, SwitchControllerContext& context, bool send_out_lead);
 
 
 }

SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.cpp

@@ -207,7 +207,7 @@ void ShinyHuntDeoxys::program(SingleSwitchProgramEnvironment& env, ProController
         //Start battle.
         pbf_press_button(context, BUTTON_A, 20, 40);
 
-        bool legendary_shiny = handle_encounter(env.console, context);
+        bool legendary_shiny = handle_encounter(env.console, context, true);
         if (legendary_shiny) {
             stats.shinies++;
             env.update_stats();