fix white dialog detection

Author: kichithewolf

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

@@ -39,9 +39,9 @@ bool WhiteDialogDetector::detect(const ImageViewRGB32& screen){
     ImageViewRGB32 right_image = extract_box_reference(screen, m_right_box);
     ImageViewRGB32 top_image = extract_box_reference(screen, m_top_box);
     ImageViewRGB32 bottom_image = extract_box_reference(screen, m_bottom_box);
-    if (is_solid(right_image, { 0.333333, 0.333333, 0.333333 })
-        && is_solid(top_image, { 0.333333, 0.333333, 0.333333 })
-        && is_solid(bottom_image, { 0.333333, 0.333333, 0.333333 })
+    if (is_white(right_image)
+        && is_white(top_image)
+        && is_white(bottom_image)
         ){
         return true;
     }
@@ -81,9 +81,9 @@ bool AdvanceWhiteDialogDetector::detect(const ImageViewRGB32& screen){
     ImageViewRGB32 top_image = extract_box_reference(screen, m_top_box);
     ImageViewRGB32 bottom_image = extract_box_reference(screen, m_bottom_box);
 
-    if (is_solid(right_image, { 0.333333, 0.333333, 0.333333 })
-        && is_solid(top_image, { 0.333333, 0.333333, 0.333333 })
-        && is_solid(bottom_image, { 0.333333, 0.333333, 0.333333 })
+    if (is_white(right_image)
+        && is_white(top_image)
+        && is_white(bottom_image)
         && (stats.average.r > stats.average.b + 180)
         && (stats.average.r > stats.average.g + 180)
         )
@@ -110,10 +110,10 @@ bool SelectionDialogDetector::detect(const ImageViewRGB32& screen){
     ImageViewRGB32 top_image = extract_box_reference(screen, m_top_box);
     ImageViewRGB32 bottom_image = extract_box_reference(screen, m_bottom_box);
     ImageViewRGB32 selection_image = extract_box_reference(screen, m_selection_box);
-    if (is_solid(right_image, { 0.333333, 0.333333, 0.333333 })
-        && is_solid(top_image, { 0.333333, 0.333333, 0.333333 })
-        && is_solid(bottom_image, { 0.333333, 0.333333, 0.333333 })
-        && is_solid(selection_image, { 0.333333, 0.333333, 0.333333 })
+    if (is_white(right_image)
+        && is_white(top_image)
+        && is_white(bottom_image)
+        && is_white(selection_image)
         ){
         return true;
     }

SerialPrograms/Source/Tests/PokemonFRLG_Tests.cpp

@@ -43,4 +43,12 @@ int test_pokemonFRLG_ShinySymbolDetector(const ImageViewRGB32& image, bool targe
     return 0;
 }
 
+int test_pokemonFRLG_SelectionDialogDetector(const ImageViewRGB32& image, bool target){
+    auto overlay = DummyVideoOverlay();
+    SelectionDialogDetector detector(COLOR_RED);
+    bool result = detector.detect(image);
+    TEST_RESULT_EQUAL(result, target);
+    return 0;
+}
+
 }

SerialPrograms/Source/Tests/PokemonFRLG_Tests.h

@@ -21,6 +21,8 @@ int test_pokemonFRLG_AdvanceWhiteDialogDetector(const ImageViewRGB32& image, boo
 
 int test_pokemonFRLG_ShinySymbolDetector(const ImageViewRGB32& image, bool target);
 
+int test_pokemonFRLG_SelectionDialogDetector(const ImageViewRGB32& image, bool target);
+
 }
 
 #endif

SerialPrograms/Source/Tests/TestMap.cpp

@@ -311,6 +311,7 @@ const std::map<std::string, TestFunction> TEST_MAP = {
     {"PokemonLZA_DonutBerriesReader", test_pokemonLZA_DonutBerriesReader},
     {"PokemonFRLG_AdvanceWhiteDialogDetector", std::bind(image_bool_detector_helper, test_pokemonFRLG_AdvanceWhiteDialogDetector, _1)},
     {"PokemonFRLG_ShinySymbolDetector", std::bind(image_bool_detector_helper, test_pokemonFRLG_ShinySymbolDetector, _1)},
+    {"PokemonFRLG_SelectionDialogDetector", std::bind(image_bool_detector_helper, test_pokemonFRLG_SelectionDialogDetector, _1)},
 };
 
 TestFunction find_test_function(const std::string& test_space, const std::string& test_name){