gba black borders

Author: kichithewolf

SerialPrograms/CMakeLists.txt

@@ -387,6 +387,8 @@ file(GLOB MAIN_SOURCES
     Source/CommonFramework/Inference/AudioTemplateCache.h
     Source/CommonFramework/Inference/BlackBorderDetector.cpp
     Source/CommonFramework/Inference/BlackBorderDetector.h
+    Source/CommonFramework/Inference/BlackBorderGBADetector.cpp
+    Source/CommonFramework/Inference/BlackBorderGBADetector.h
     Source/CommonFramework/Inference/BlackScreenDetector.cpp
     Source/CommonFramework/Inference/BlackScreenDetector.h
     Source/CommonFramework/Inference/DetectionDebouncer.h

SerialPrograms/Source/CommonFramework/Inference/BlackBorderGBADetector.cpp

@@ -0,0 +1,75 @@
+/*  Black Border Detector
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTools/SolidColorTest.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "BlackBorderGBADetector.h"
+
+#include <iostream>
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+
+
+BlackBorderGBADetector::BlackBorderGBADetector()
+    : m_top(0.126, 0.055, 0.748, 0.006)
+    , m_bottom(0.124, 0.940, 0.751, 0.004)
+    , m_left(0.126, 0.055, 0.002, 0.888)
+    , m_right(0.871, 0.055, 0.003, 0.888)
+//    , m_body(0.100, 0.100, 0.800, 0.800)
+{}
+
+void BlackBorderGBADetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_top);
+    items.add(COLOR_RED, m_bottom);
+    items.add(COLOR_RED, m_left);
+    items.add(COLOR_RED, m_right);
+//        items.add(COLOR_RED, m_body);
+}
+bool BlackBorderGBADetector::detect(const ImageViewRGB32& screen) const{
+    const double MAX_SUM = 50;
+    const double MAX_STDDEV = 20;
+
+    ImageStats top = image_stats(extract_box_reference(screen, m_top));
+//    cout << "top = " << top.average << top.stddev << endl;
+//    extract_box(screen, m_top).save("top.png");
+    if (!is_black(top, MAX_SUM, MAX_STDDEV)){
+        return false;
+    }
+    ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
+//    cout << "bottom = " << bottom.average << bottom.stddev << endl;
+    if (!is_black(bottom, MAX_SUM, MAX_STDDEV)){
+        return false;
+    }
+    ImageStats left = image_stats(extract_box_reference(screen, m_left));
+//    cout << "left = " << left.average << left.stddev << endl;
+    if (!is_black(left, MAX_SUM, MAX_STDDEV)){
+        return false;
+    }
+    ImageStats right = image_stats(extract_box_reference(screen, m_right));
+//    cout << "right = " << right.average << right.stddev << endl;
+    if (!is_black(right, MAX_SUM, MAX_STDDEV)){
+        return false;
+    }
+//    ImageStats body = image_stats(extract_box_reference(screen, m_body));
+//    cout << "body = " << body.average << body.stddev << endl;
+//    if (is_black(right, 30, 30)){
+//        return false;
+//    }
+
+
+//    for (int c = 0; c < screen.width(); c++){
+//        QRgb pixel = screen.pixel(c, 0);
+//        cout << "(" << qRed(pixel) << "," << qGreen(pixel) << "," << qBlue(pixel) << ")";
+//    }
+
+    return true;
+}
+
+
+}

SerialPrograms/Source/CommonFramework/Inference/BlackBorderGBADetector.h

@@ -0,0 +1,34 @@
+/*  Black Screen Detector
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#ifndef PokemonAutomation_CommonFramework_BlackBorderGBADetector_H
+#define PokemonAutomation_CommonFramework_BlackBorderGBADetector_H
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Inference/VisualDetector.h"
+
+namespace PokemonAutomation{
+
+
+class BlackBorderGBADetector : public StaticScreenDetector{
+public:
+    BlackBorderGBADetector();
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) const override;
+
+private:
+    ImageFloatBox m_top;
+    ImageFloatBox m_bottom;
+    ImageFloatBox m_left;
+    ImageFloatBox m_right;
+//    ImageFloatBox m_body;
+};
+
+
+
+}
+#endif

SerialPrograms/Source/CommonFramework/Tools/BlackBorderCheck.cpp

@@ -10,6 +10,7 @@
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
 #include "CommonFramework/Tools/ConsoleHandle.h"
 #include "CommonFramework/Inference/BlackBorderDetector.h"
+#include "CommonFramework/Inference/BlackBorderGBADetector.h"
 #include "BlackBorderCheck.h"
 
 namespace PokemonAutomation{
@@ -23,18 +24,29 @@ void start_program_video_check(ConsoleHandle& console, FeedbackType feedback){
     VideoSnapshot screen = console.video().snapshot();
 
     if (!screen){
-        if (feedback == FeedbackType::REQUIRED || feedback == FeedbackType::VIDEO_AUDIO){
+        if (feedback == FeedbackType::REQUIRED || feedback == FeedbackType::VIDEO_AUDIO || feedback == FeedbackType::VIDEO_AUDIO_GBA){
             throw UserSetupError(console, "This program requires video feedback. Please make sure the video is working.");
         }
         return;
     }
 
-    BlackBorderDetector detector;
-    VideoOverlaySet set(console);
-    detector.make_overlays(set);
+    if (feedback != FeedbackType::VIDEO_AUDIO_GBA) { //GB, GBC in fullscreen will reach the top and bottom of the screen
+        BlackBorderDetector detector;
+        VideoOverlaySet set(console);
+        detector.make_overlays(set);
 
-    if (detector.detect(screen)){
-        throw UserSetupError(console, "Black border detected! Please set your screen size to 100% in the TV Settings on your Nintendo Switch.");
+        if (detector.detect(screen)) {
+            throw UserSetupError(console, "Black border detected! Please set your screen size to 100% in the TV Settings on your Nintendo Switch.");
+        }
+    }
+    else {
+        BlackBorderGBADetector detector;
+        VideoOverlaySet set(console);
+        detector.make_overlays(set);
+
+        if (detector.detect(screen)) {
+            throw UserSetupError(console, "Black border detected! Please set your screen size to 100% in the TV Settings on your Nintendo Switch.");
+        }
     }
 }
 void start_program_video_check(FixedLimitVector<ConsoleHandle>& consoles, FeedbackType feedback){

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.cpp

@@ -22,13 +22,13 @@ Color pick_color(FeedbackType feedback, PABotBaseLevel size){
     case PABotBaseLevel::PABOTBASE_12KB:
         if (feedback == FeedbackType::REQUIRED){
             return COLOR_DARKGREEN;
-        }else if (feedback == FeedbackType::VIDEO_AUDIO){
+        }else if (feedback == FeedbackType::VIDEO_AUDIO || feedback == FeedbackType::VIDEO_AUDIO_GBA){
             return COLOR_GREEN2;
         }else{
             return COLOR_BLUE;
         }
     case PABotBaseLevel::PABOTBASE_31KB:
-        return (feedback == FeedbackType::REQUIRED || feedback == FeedbackType::VIDEO_AUDIO) ? COLOR_PURPLE : COLOR_RED;
+        return (feedback == FeedbackType::REQUIRED || feedback == FeedbackType::VIDEO_AUDIO || feedback == FeedbackType::VIDEO_AUDIO_GBA) ? COLOR_PURPLE : COLOR_RED;
     }
     return Color();
 }

SerialPrograms/Source/PokemonRSE/PokemonRSE_Navigation.cpp

@@ -9,6 +9,7 @@
 #include "CommonFramework/Exceptions/OperationFailedException.h"
 #include "CommonFramework/Exceptions/UnexpectedBattleException.h"
 #include "CommonFramework/InferenceInfra/InferenceRoutines.h"
+#include "CommonFramework/Inference/BlackScreenDetector.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
@@ -30,7 +31,17 @@ void soft_reset(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext&
 	pbf_press_button(context, BUTTON_A, 20, 40);
 
 	//Wait for game to load in
-	pbf_wait(context, GameSettings::instance().ENTER_GAME_WAIT);
+	BlackScreenOverWatcher detector(COLOR_RED, {0.282, 0.064, 0.448, 0.871});
+    int ret = wait_until(
+        console, context,
+        std::chrono::milliseconds(GameSettings::instance().ENTER_GAME_WAIT * (1000 / TICKS_PER_SECOND)),
+        {{detector}}
+    );
+    if (ret == 0){
+        console.log("Entered game!");
+    }else{
+        console.log("Timed out waiting to enter game.", COLOR_RED);
+    }
 	context.wait_for_all_requests();
 }
 

SerialPrograms/Source/PokemonRSE/PokemonRSE_Navigation.h

@@ -19,7 +19,7 @@ namespace NintendoSwitch{
 namespace PokemonRSE{
 
 // Press A+B+Select+Start at the same time to soft reset, then re-enters the game.
-// This assumes no dry battery. Adding detection for that is a TODO.
+// This assumes no dry battery.
 void soft_reset(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
 
 

SerialPrograms/Source/PokemonRSE/PokemonRSE_Settings.cpp

@@ -33,7 +33,7 @@ GameSettings::GameSettings()
         "<b>1. Start Button Mash:</b><br>Mash Start for this long after a soft reset to get to the main menu.",
         LockMode::LOCK_WHILE_RUNNING,
         TICKS_PER_SECOND,
-        "4 * TICKS_PER_SECOND"
+        "5 * TICKS_PER_SECOND"
     )
     , ENTER_GAME_WAIT(
         "<b>2. Enter Game Wait:</b><br>Wait this long for the game to load.",

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

@@ -86,7 +86,7 @@ AudioStarterReset::AudioStarterReset()
 }
 
 void AudioStarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    //assert_16_9_720p_min(env.logger(), env.console);
+    assert_16_9_720p_min(env.logger(), env.console);
     AudioStarterReset_Descriptor::Stats& stats = env.current_stats<AudioStarterReset_Descriptor::Stats>();
 
     /*
@@ -96,7 +96,6 @@ void AudioStarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseCont
     * 
     * Setup: Stand in front of the Professor's bag and save the game.
     * 
-    * 
     * Required to fight, so have to do the SR method instead of run away
     * Soft reset programs are only for Ruby/Sapphire, as Emerald has the 0 seed issue.
     * 
@@ -207,9 +206,9 @@ void AudioStarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseCont
                 env, NOTIFICATION_STATUS_UPDATE,
                 "Soft resetting."
             );
-            soft_reset(env.program_info(), env.console, context);
             stats.resets++;
             env.update_stats();
+            soft_reset(env.program_info(), env.console, context);
         }
     }