Merge pull request #577 from pifopi/v0.52bis

V0.52bis

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -121,6 +121,7 @@
 #include "NintendoSwitch/Programs/NintendoSwitch_NumberCodeEntry.h"
 #include "PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMenuDetector.h"
 #include "PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h"
+#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h"
 
 
 #include <QPixmap>
@@ -317,6 +318,15 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
 //    std::terminate();
 
+    ImageRGB32 image("20250420-043111395281.png");
+
+    OcrFailureWatchdog watchdog(logger);
+
+    PokemonSwSh::MaxLairInternal::PokemonSwapMenuReader reader(logger, overlay, Language::Korean, watchdog);
+
+    double hp[4];
+    reader.read_hp(image, hp);
+
 
 #if 0
     ImageRGB32 image("20250404-154507236508.png");
@@ -385,17 +395,17 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 #endif
 
 
-    numberpad_enter_code(logger, context, "708538991006", false);
+//    numberpad_enter_code(logger, context, "708538991006", false);
 
 
 
 #if 0
     for (size_t i = 0; i < 100; i++){
-        for (size_t c = 0; c < 7; c++){
-            ssf_issue_scroll(context, DPAD_RIGHT, 40ms);
+        for (size_t c = 0; c < 4; c++){
+            ssf_issue_scroll(context, DPAD_RIGHT, 17ms);
         }
-        for (size_t c = 0; c < 7; c++){
-            ssf_issue_scroll(context, DPAD_LEFT, 40ms);
+        for (size_t c = 0; c < 4; c++){
+            ssf_issue_scroll(context, DPAD_LEFT, 17ms);
         }
     }
 #endif

SerialPrograms/Source/Pokemon/Inference/Pokemon_ReadHpBar.cpp

@@ -35,7 +35,7 @@ double read_hp_bar_internal(const ImageViewRGB32& image){
         max_color = std::max(max_color, stats.average.g);
         max_color = std::max(max_color, stats.average.b);
 //        cout << "max_color: " << max_color << ", stddev: " << stats.stddev.sum() << endl;
-        if (max_color > 128 && stats.stddev.sum() < 70){
+        if (max_color > 128 && stats.stddev.sum() < 120){
             break;
         }
         bar *= 0.5;
@@ -83,8 +83,10 @@ double read_hp_bar(const ImageViewRGB32& image){
 
 double read_hp_bar(Logger& logger, const ImageViewRGB32& image){
     double hp = read_hp_bar(image);
+
 //    static int c = 0;
 //    image.save("test-" + std::to_string(c++) + ".png");
+
     if (hp <= 0){
         logger.log("HP Read: ?", COLOR_RED);
     }else{

SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp

@@ -57,7 +57,7 @@ bool BattlePokemonSwitchDetector::process_frame(const ImageViewRGB32& frame, Wal
     }
 
     const ImageStats white_3 = image_stats(extract_box_reference(frame, m_white_bg_3));
-    if(is_white(white_3, 500, 10) == false){
+    if(is_white(white_3, 500, 15) == false){
         // std::cout << "no white_3" << std::endl;
         m_detected.store(false, std::memory_order_release);
         return false;

SerialPrograms/Source/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_AlolanTrade.cpp

@@ -184,6 +184,10 @@ void AlolanTrade::program(SingleSwitchProgramEnvironment& env, CancellableScope&
         //Pokedex - Bag - Party - Communicate - Save (these all have a colored line under when selected + an arrow to indicate)
         //(Press Y for options)
 
+        //Make sure any extra dialog is closed
+        pbf_mash_button(context, BUTTON_B, 3000ms);
+        context.wait_for_all_requests();
+
         //Wait a bit.
         pbf_wait(context, 2500ms);
         context.wait_for_all_requests();