Don't send error report if stunfisk-galar fails to disambiguate with stunfisk after using Terrain Pulse.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Tools/ConsoleHandle.h

@@ -12,17 +12,9 @@
 
 namespace PokemonAutomation{
 
-class CancellableScope;
-class AsyncDispatcher;
 class ThreadHandle;
 class BotBase;
-class VideoFeed;
-class VideoOverlay;
-class AudioFeed;
-class StreamHistorySession;
 class ThreadUtilizationStat;
-class VisualInferencePivot;
-class AudioInferencePivot;
 
 
 class ConsoleHandle : public VideoStream{

SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h

@@ -20,7 +20,7 @@ namespace PokemonAutomation{
 //    class BotBaseContext;
 namespace NintendoSwitch{
 
-//  Block the current thread until all the Switch commands sent to the micro controller are executed.
+//  Wait for this many ticks on the Switch.
 void pbf_wait                   (BotBaseContext& context, uint16_t ticks);
 //  Press a Switch controller button (excluding D-Pad). Hold the button for `hold_ticks`, then release it for `release_ticks`.
 //  The buttons are defined in Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h. Examples include BUTTON_A, BUTTON_ZL.
@@ -40,7 +40,7 @@ void pbf_press_dpad             (BotBaseContext& context, DpadPosition position,
 //  y = 128 : neutral
 //  y = 255 : down
 //  Example: move the joystick fully left: (x, y) = (0, 128)
-//           move the joystick upper-right: (x, y) = (255, 0
+//           move the joystick upper-right: (x, y) = (255, 0)
 void pbf_move_left_joystick     (BotBaseContext& context, uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks);
 //  Move right joystick towards a 2D direction. Hold the direction for `hold_ticks`, then release it for `release_ticks`.
 //  The direction is specified by (x, y):
@@ -51,7 +51,7 @@ void pbf_move_left_joystick     (BotBaseContext& context, uint8_t x, uint8_t y,
 //  y = 128 : neutral
 //  y = 255 : down
 //  Example: move the joystick fully left: (x, y) = (0, 128)
-//           move the joystick upper-right: (x, y) = (255, 0
+//           move the joystick upper-right: (x, y) = (255, 0)
 void pbf_move_right_joystick    (BotBaseContext& context, uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks);
 //  Mash a Switch controller button (excluding D-Pad) repeatedly for `ticks` ticks.
 //  The buttons are defined in Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h. Examples include BUTTON_A, BUTTON_ZL.

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -267,10 +267,10 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     using namespace OCR;
     using namespace NintendoSwitch;
     using namespace Pokemon;
-//    using namespace PokemonSwSh;
+    using namespace PokemonSwSh;
 //    using namespace PokemonBDSP;
 //    using namespace PokemonLA;
-    using namespace PokemonSV;
+//    using namespace PokemonSV;
 
     [[maybe_unused]] Logger& logger = env.logger();
     [[maybe_unused]] ConsoleHandle& console = env.consoles[0];
@@ -281,12 +281,15 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     VideoOverlaySet overlays(overlay);
 
 
-//    ImageRGB32 image("screenshot-20250113-214042699528.png");
-    ImageRGB32 image("raidecho1.jpg");
+    ImageRGB32 image("20250115-110356822901.png");
+//    ImageRGB32 image("raidecho1.jpg");
 //    auto image = feed.snapshot();
 
-    TeraCardReader reader;
-    cout << (int)reader.stars(logger, env.program_info(), image) << endl;
+    MaxLairInternal::BattleMenuReader reader(overlay, Language::English);
+    reader.read_opponent_in_summary(logger, image);
+
+//    TeraCardReader reader;
+//    cout << (int)reader.stars(logger, env.program_info(), image) << endl;
 
 
 

SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.cpp

@@ -282,9 +282,14 @@ std::set<std::string> BattleMenuReader::read_opponent_in_summary(Logger& logger,
         }
     }
 
+//    cout << get_type_slug(type0) << endl;
+//    cout << get_type_slug(type1) << endl;
+
     for (auto iter = slugs.begin(); iter != slugs.end();){
         const MaxLairMon& mon = get_maxlair_mon(*iter);
 //        cout << mon.species << endl;
+//        cout << get_type_slug(mon.type[0]) << endl;
+//        cout << get_type_slug(mon.type[1]) << endl;
         if ((type0 == mon.type[0] && type1 == mon.type[1]) || (type0 == mon.type[1] && type1 == mon.type[0])){
             ++iter;
         }else{
@@ -308,6 +313,7 @@ std::set<std::string> BattleMenuReader::read_opponent_in_summary(Logger& logger,
         "basculin-red-striped",
         "lycanroc-midday",
         "lycanroc-midnight",
+        "stunfisk-galar",   //  After using terrain pulse.
     };
     bool error = true;
     for (const std::string& slug : slugs){