Fix implementation of skipping black border check for GBA.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp

@@ -97,7 +97,8 @@ void MultiSwitchProgramSession::run_program_instance(MultiSwitchProgramEnvironme
         );
         m_option.instance().start_program_border_check(
             scope,
-            env.consoles[c], c
+            env.consoles[c], c,
+            m_option.descriptor().feedback()
         );
     }
 

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp

@@ -60,12 +60,17 @@ void SingleSwitchProgramSession::run_program_instance(SingleSwitchProgramEnviron
     }
 
     //  Startup Checks
-    m_option.instance().start_program_controller_check(scope, m_system.controller_session());
-    m_option.instance().start_program_feedback_check(scope, env.console, m_option.descriptor().feedback());
-    if (m_option.descriptor().category() != Pokemon::STRING_POKEMON + " RSE"
-        && m_option.descriptor().category() != Pokemon::STRING_POKEMON + " FRLG"){
-        m_option.instance().start_program_border_check(scope, env.console);
-    }
+    m_option.instance().start_program_controller_check(
+        scope, m_system.controller_session()
+    );
+    m_option.instance().start_program_feedback_check(
+        scope, env.console,
+        m_option.descriptor().feedback()
+    );
+    m_option.instance().start_program_border_check(
+        scope, env.console,
+        m_option.descriptor().feedback()
+    );
 
     m_scope.store(&scope, std::memory_order_release);
 

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp

@@ -144,9 +144,17 @@ void MultiSwitchProgramInstance::start_program_feedback_check(
 }
 void MultiSwitchProgramInstance::start_program_border_check(
     CancellableScope& scope,
-    VideoStream& stream, size_t console_index
+    VideoStream& stream, size_t console_index,
+    FeedbackType feedback_type
 ){
-    StartProgramChecks::check_border(stream);
+    switch (feedback_type){
+    case FeedbackType::NONE:
+    case FeedbackType::OPTIONAL_:
+        return;
+    case FeedbackType::REQUIRED:
+    case FeedbackType::VIDEO_AUDIO:
+        StartProgramChecks::check_border(stream);
+    }
 }
 
 

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h

@@ -147,7 +147,8 @@ class MultiSwitchProgramInstance{
     );
     virtual void start_program_border_check(
         CancellableScope& scope,
-        VideoStream& stream, size_t console_index
+        VideoStream& stream, size_t console_index,
+        FeedbackType feedback_type
     );
 
 

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp

@@ -89,9 +89,17 @@ void SingleSwitchProgramInstance::start_program_feedback_check(
 }
 void SingleSwitchProgramInstance::start_program_border_check(
     CancellableScope& scope,
-    VideoStream& stream
+    VideoStream& stream,
+    FeedbackType feedback_type
 ){
-    StartProgramChecks::check_border(stream);
+    switch (feedback_type){
+    case FeedbackType::NONE:
+    case FeedbackType::OPTIONAL_:
+        return;
+    case FeedbackType::REQUIRED:
+    case FeedbackType::VIDEO_AUDIO:
+        StartProgramChecks::check_border(stream);
+    }
 }
 
 

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h

@@ -130,7 +130,8 @@ class SingleSwitchProgramInstance{
     );
     virtual void start_program_border_check(
         CancellableScope& scope,
-        VideoStream& stream
+        VideoStream& stream,
+        FeedbackType feedback_type
     );
 
 

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

@@ -26,6 +26,12 @@ class AudioStarterReset : public SingleSwitchProgramInstance{
     AudioStarterReset();
     virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
+    virtual void start_program_border_check(
+        CancellableScope& scope,
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
 private:
     enum class Target{
         treecko,

SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryHunt-Emerald.h

@@ -28,6 +28,12 @@ class LegendaryHuntEmerald : public SingleSwitchProgramInstance{
     LegendaryHuntEmerald();
     virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
+    virtual void start_program_border_check(
+        CancellableScope& scope,
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
 private:
     enum class Target{
         regis,

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

@@ -27,6 +27,12 @@ class ShinyHuntDeoxys : public SingleSwitchProgramInstance{
     ShinyHuntDeoxys();
     virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
+    virtual void start_program_border_check(
+        CancellableScope& scope,
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
 private:
     enum class StartPos{
         boat,

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

@@ -7,7 +7,7 @@
 #ifndef PokemonAutomation_PokemonRSE_StarterReset_H
 #define PokemonAutomation_PokemonRSE_StarterReset_H
 
-#include "Common/Cpp/Options/TimeDurationOption.h"
+//#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
@@ -27,6 +27,12 @@ class StarterReset : public SingleSwitchProgramInstance{
     StarterReset();
     virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
 
+    virtual void start_program_border_check(
+        CancellableScope& scope,
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
 private:
     enum class Target{
         treecko,