working audio starter detection

Author: kichithewolf

SerialPrograms/Source/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.cpp

@@ -59,7 +59,7 @@ bool BattleDialogDetector::detect(const ImageViewRGB32& screen) const{
 
 
 BattleMenuDetector::BattleMenuDetector(Color color)
-    : m_left_box(0.155, 0.727, 0.015, 0.168)
+    : m_left_box(0.439, 0.717, 0.021, 0.192)
     , m_right_box(0.821, 0.725, 0.030, 0.181)
 {}
 void BattleMenuDetector::make_overlays(VideoOverlaySet& items) const{

SerialPrograms/Source/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h

@@ -64,6 +64,7 @@ class BattleDialogWatcher : public DetectorToFinder<BattleDialogDetector>{
 
 
 // Battle menu is up when it is white on the right and teal on the left
+// For emerald the test is more flush to the left, so we target the right of the battle menu box
 class BattleMenuDetector : public StaticScreenDetector{
 public:
     BattleMenuDetector(Color color);

SerialPrograms/Source/PokemonRSE/PokemonRSE_Panels.cpp

@@ -33,11 +33,13 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
     //ret.emplace_back("---- General ----");
 
     ret.emplace_back("---- Shiny Hunting ----");
-    ret.emplace_back(make_single_switch_program<StarterReset_Descriptor, StarterReset>());
     ret.emplace_back(make_single_switch_program<AudioStarterReset_Descriptor, AudioStarterReset>());
 
 
     if (PreloadSettings::instance().DEVELOPER_MODE){
+        ret.emplace_back("---- Test ----");
+        ret.emplace_back(make_single_switch_program<StarterReset_Descriptor, StarterReset>());
+
         ret.emplace_back("---- Developer Tools ----");
         ret.emplace_back(make_single_switch_program<SoundListener_Descriptor, SoundListener>());
     }

SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.cpp

@@ -10,6 +10,7 @@
 #include "CommonFramework/Notifications/ProgramNotifications.h"
 #include "CommonFramework/Tools/VideoResolutionCheck.h"
 #include "CommonFramework/Tools/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h"
@@ -62,26 +63,14 @@ AudioStarterReset::AudioStarterReset()
         LockMode::LOCK_WHILE_RUNNING,
         Target::treecko
     )
-    , POOCH_WAIT(
-        "<b>Battle start wait:</b><br>Time for battle to start and for Poochyena to appear. Make sure to add extra time in case the Poochyena is shiny.",
-        LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "6 * TICKS_PER_SECOND"
-    )
-    , STARTER_WAIT(
-        "<b>Send out starter wait:</b><br>After pressing A to send out your selected starter, wait this long for the animation. Make sure to add extra time in case it is shiny.",
-        LockMode::LOCK_WHILE_RUNNING,
-        TICKS_PER_SECOND,
-        "6 * TICKS_PER_SECOND"
-    )
     , NOTIFICATION_SHINY_POOCH(
         "Shiny Poochyena",
-        false, false,
+        false, false, ImageAttachmentMode::JPG,
         {"Notifs"}
     )
     , NOTIFICATION_SHINY_STARTER(
         "Shiny Starter",
-        true, false,
+        true, true, ImageAttachmentMode::JPG,
         {"Notifs", "Showcase"}
     )
     , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
@@ -116,8 +105,9 @@ void AudioStarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseCont
 
     bool shiny_starter = false;
     while (!shiny_starter) {
-
+        float shiny_coefficient = 1.0;
         ShinySoundDetector pooch_detector(env.console, [&](float error_coefficient) -> bool{
+            shiny_coefficient = error_coefficient;
             return true;
         });
 
@@ -143,71 +133,84 @@ void AudioStarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseCont
         }
         pbf_mash_button(context, BUTTON_A, 540);
         context.wait_for_all_requests();
-        env.log("Starter selected. Checking for shiny Poochyena.");
 
+        env.log("Starter selected. Checking for shiny Poochyena.");
         AdvanceDialogWatcher pooch_appeared(COLOR_YELLOW);
+
         int res = run_until(
             env.console, context,
             [&](BotBaseContext& context) {
                 int ret = wait_until(
                     env.console, context,
                     std::chrono::seconds(20),
-                    {{pooch_detector}}
+                    {{pooch_appeared}}
                 );
-                pooch_detector.throw_if_no_sound();
-                if (ret == 0){
-                    env.log("Shiny Poochyena detected!");
-                    stats.poochyena++;
-                    send_program_status_notification(env, NOTIFICATION_SHINY_POOCH, "Shiny Poochyena found.");
-                }
-                else {
-                    env.log("Poochyena is not shiny.");
+                if (ret == 0) {
+                    env.log("Advance arrow detected.");
                 }
+                pbf_wait(context, 125);
+                context.wait_for_all_requests();
             },
-            {{pooch_appeared}}
+            {{pooch_detector}}
         );
-        if (res == 0) {
-            env.log("Advance arrow detected. Pressing A.");
-        } //res != if pooch is shiny
+        pooch_detector.throw_if_no_sound();
+        if (res == 0){
+            env.log("Shiny Poochyena detected!");
+            stats.poochyena++;
+            env.update_stats();
+            send_program_status_notification(env, NOTIFICATION_SHINY_POOCH, "Shiny Poochyena found.", env.console.video().snapshot(), false);
+        }
+        else {
+            env.log("Poochyena is not shiny.");
+        }
+        context.wait_for_all_requests();
 
+        float shiny_coefficient2 = 1.0;
         ShinySoundDetector starter_detector(env.console, [&](float error_coefficient) -> bool{
+            shiny_coefficient2 = error_coefficient;
             return true;
         });
 
-        //Press A to send out your selected starter
-        env.log("Sending out selected starter.");
-        pbf_press_button(context, BUTTON_A, 40, 40);
-
-        int ret2 = run_until(
+        BattleMenuWatcher battle_menu(COLOR_RED);
+        int res2 = run_until(
             env.console, context,
-            [&](BotBaseContext& context){
-                env.log("Wait for starter to come out.");
-                pbf_wait(context, STARTER_WAIT);
+            [&](BotBaseContext& context) {
+                env.log("Sending out selected starter.");
+                pbf_press_button(context, BUTTON_A, 40, 40);
+
+                int ret = wait_until(
+                    env.console, context,
+                    std::chrono::seconds(20),
+                    {{battle_menu}}
+                );
+                if (ret == 0) {
+                    env.log("Battle menu detecteed!");
+                }
+                pbf_wait(context, 125);
                 context.wait_for_all_requests();
             },
             {{starter_detector}}
         );
         starter_detector.throw_if_no_sound();
-        if (ret2 == 0){
+        context.wait_for_all_requests();
+        if (res2 == 0){
             env.log("Shiny starter detected!");
             stats.shinystarter++;
-
-            send_program_status_notification(env, NOTIFICATION_SHINY_STARTER, "Shiny starter found!");
-
+            env.update_stats();
+            send_program_status_notification(env, NOTIFICATION_SHINY_STARTER, "Shiny starter found!", env.console.video().snapshot(), true);
             shiny_starter = true;
-            break;
         }
         else {
             env.log("Starter is not shiny.");
+            env.log("Soft resetting.");
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "Soft resetting."
+            );
+            soft_reset(env.program_info(), env.console, context);
+            stats.resets++;
+            env.update_stats();
         }
-
-        env.log("Soft resetting.");
-        send_program_status_notification(
-            env, NOTIFICATION_STATUS_UPDATE,
-            "Soft resetting."
-        );
-        soft_reset(env.program_info(), env.console, context);
-        stats.resets++;
     }
 
     //if system set to nintendo switch, have go home when done option?

SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.h

@@ -36,9 +36,6 @@ class AudioStarterReset : public SingleSwitchProgramInstance{
     };
     EnumDropdownOption<Target> TARGET;
 
-    TimeExpressionOption<uint16_t> POOCH_WAIT;
-    TimeExpressionOption<uint16_t> STARTER_WAIT;
-
     EventNotificationOption NOTIFICATION_SHINY_POOCH;
     EventNotificationOption NOTIFICATION_SHINY_STARTER;
     EventNotificationOption NOTIFICATION_STATUS_UPDATE;