use start menu arrow detection

Author: theastrogoth

SerialPrograms/Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.cpp

@@ -164,6 +164,39 @@ bool AdvanceBattleDialogDetector::detect(const ImageViewRGB32& screen){
     return false;
 }
 
+BattleLearnDialogDetector::BattleLearnDialogDetector(Color color)
+    : m_menu_top_box(0.805, 0.445, 0.149, 0.006)
+    , m_menu_right_box(0.962, 0.445, 0.006, 0.200) // right side, Yes/No selection
+    , m_dialog_top_box(0.036, 0.763, 0.459, 0.014)
+    , m_dialog_right_box(0.941, 0.763, 0.006, 0.179) //right side, closest to the menu
+{}
+void BattleLearnDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_box));
+}
+bool BattleLearnDialogDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    //Menu is white
+    ImageViewRGB32 menu_top_image = extract_box_reference(game_screen, m_menu_top_box);
+    ImageViewRGB32 menu_right_image = extract_box_reference(game_screen, m_menu_right_box);
+
+    //Background dialog is teal
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_dialog_top_box);
+    ImageViewRGB32 dialog_right_image = extract_box_reference(game_screen, m_dialog_right_box);
+
+    if (is_white(menu_top_image)
+        && is_white(menu_right_image)
+        && is_solid(dialog_top_image, { 0.176, 0.357, 0.467 }, 0.25, 20) //40, 81, 106 teal
+        && is_solid(dialog_right_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+    ){
+        return true;
+    }
+    return false;
+}
 
 
 

SerialPrograms/Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h

@@ -101,6 +101,28 @@ class AdvanceBattleDialogWatcher : public DetectorToFinder<AdvanceBattleDialogDe
 };
 
 
+// Similar to BattleMenuDetector, but looks for the white of the Yes/No box when learning a new move
+class BattleLearnDialogDetector : public StaticScreenDetector{
+public:
+    BattleLearnDialogDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_menu_top_box;
+    ImageFloatBox m_menu_right_box;
+    ImageFloatBox m_dialog_top_box;
+    ImageFloatBox m_dialog_right_box;
+};
+class BattleLearnDialogWatcher : public DetectorToFinder<BattleLearnDialogDetector>{
+public:
+    BattleLearnDialogWatcher(Color color)
+        : DetectorToFinder("BattleLearnDialogDetector", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
 
 }
 }

SerialPrograms/Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp

@@ -127,41 +127,6 @@ bool SelectionDialogDetector::detect(const ImageViewRGB32& screen){
     return false;
 }
 
-
-BattleLearnDialogDetector::BattleLearnDialogDetector(Color color)
-    : m_menu_top_box(0.805, 0.445, 0.149, 0.006)
-    , m_menu_right_box(0.962, 0.445, 0.006, 0.200) // right side, Yes/No selection
-    , m_dialog_top_box(0.036, 0.763, 0.459, 0.014)
-    , m_dialog_right_box(0.941, 0.763, 0.006, 0.179) //right side, closest to the menu
-{}
-void BattleLearnDialogDetector::make_overlays(VideoOverlaySet& items) const{
-    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
-    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_top_box));
-    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_right_box));
-    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_box));
-    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_box));
-}
-bool BattleLearnDialogDetector::detect(const ImageViewRGB32& screen){
-    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
-
-    //Menu is white
-    ImageViewRGB32 menu_top_image = extract_box_reference(game_screen, m_menu_top_box);
-    ImageViewRGB32 menu_right_image = extract_box_reference(game_screen, m_menu_right_box);
-
-    //Background dialog is teal
-    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_dialog_top_box);
-    ImageViewRGB32 dialog_right_image = extract_box_reference(game_screen, m_dialog_right_box);
-
-    if (is_white(menu_top_image)
-        && is_white(menu_right_image)
-        && is_solid(dialog_top_image, { 0.176, 0.357, 0.467 }, 0.25, 20) //40, 81, 106 teal
-        && is_solid(dialog_right_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
-    ){
-        return true;
-    }
-    return false;
-}
-
 PartyMenuDetector::PartyMenuDetector(Color color)
     : m_dialog_top_box(0.028, 0.840, 0.705, 0.010)
     , m_page_background_box(0.028, 0.500, 0.010, 0.250)

SerialPrograms/Source/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h

@@ -128,29 +128,6 @@ class SelectionDialogWatcher : public DetectorToFinder<SelectionDialogDetector>{
 };
 
 
-// Similar to BattleMenuDetector, but looks for the white of the Yes/No box when learning a new move
-class BattleLearnDialogDetector : public StaticScreenDetector{
-public:
-    BattleLearnDialogDetector(Color color);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) override;
-
-private:
-    ImageFloatBox m_menu_top_box;
-    ImageFloatBox m_menu_right_box;
-    ImageFloatBox m_dialog_top_box;
-    ImageFloatBox m_dialog_right_box;
-};
-class BattleLearnDialogWatcher : public DetectorToFinder<BattleLearnDialogDetector>{
-public:
-    BattleLearnDialogWatcher(Color color)
-        : DetectorToFinder("BattleLearnDialogDetector", std::chrono::milliseconds(250), color)
-    {}
-};
-
-
-
 // The Party menu has a white box on the bottom
 // The background around the edges is dark teal/navy
 class PartyMenuDetector : public StaticScreenDetector{
@@ -191,6 +168,9 @@ class PartySelectionWatcher : public DetectorToFinder<PartySelectionDetector>{
     {}
 };
 
+
+
+
 }
 }
 }

SerialPrograms/Source/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.cpp

@@ -16,7 +16,10 @@
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h"
 #include "PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.h"
+#include "PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.h"
+#include "PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h"
 #include "PokemonFRLG/PokemonFRLG_Navigation.h"
 #include "PokemonFRLG_PickupFarmer.h"
 
@@ -172,7 +175,15 @@ void close_start_menu(SingleSwitchProgramEnvironment& env, ProControllerContext&
 void open_party_menu_from_overworld(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     PartyMenuWatcher party_open(COLOR_RED);
     open_start_menu(env, context);
-    int ret = run_until<ProControllerContext>(
+    int ret = move_cursor_to_position(env.console, context, SelectionArrowPositionStartMenu::POKEMON);
+    if (ret < 0){
+        OperationFailedException::fire(
+            ErrorReport::SEND_ERROR_REPORT,
+            "Failed to navigate to POKEMON on the Start menu.",
+            env.console
+        ); 
+    }
+    ret = run_until<ProControllerContext>(
         env.console, context,
         [](ProControllerContext& context) {
             for (int i = 0; i<2; i++){
@@ -191,16 +202,6 @@ void open_party_menu_from_overworld(SingleSwitchProgramEnvironment& env, ProCont
     }
 }
 
-void prepare_start_menu(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
-    env.log("Selecting 'Pokemon' on the Start Menu.");
-    open_start_menu(env, context);
-    // Should use arrow detection for this when it is available
-    // set the menu to "Pokemon" and exit
-    pbf_move_left_joystick(context, {0, -1}, 200ms, 300ms);
-    pbf_press_button(context, BUTTON_B, 200ms, 300ms);
-    close_start_menu(env, context);
-}
-
 void use_teleport(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     env.log("Using Teleport.");
     open_party_menu_from_overworld(env, context);
@@ -533,8 +534,6 @@ void PickupFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerCon
     bool spin_leftright = true;
     uint16_t moves_used = 0;
     uint16_t encounters_since_item_check = 0;
-
-    prepare_start_menu(env, context);
 
     while (!shiny_found){
         if (stats.encounters == 0 || failed_encounter || moves_used >= MOVE_PP){