Fix battle control interfering with dialog

Author: Gin

SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_JacintheInfiniteFarmer.cpp

@@ -237,6 +237,10 @@ bool JacintheInfiniteFarmer::talk_to_jacinthe(SingleSwitchProgramEnvironment& en
         case 3:
             env.log("Detected black screen.");
             env.console.overlay().add_log("Transition to Battle");
+            // mash B for 10 sec to clear up any pre-battle transparency dialog
+            pbf_mash_button(context, BUTTON_B, 10s);
+            context.wait_for_all_requests();
+            env.console.overlay().add_log("Cleared Transparent Dialog");
             // battle starts
             return false;
 
@@ -265,7 +269,8 @@ void JacintheInfiniteFarmer::run_round(SingleSwitchProgramEnvironment& env, ProC
             env.console, context,
             [&](ProControllerContext& context){
                 while (current_time() - start < 30min){
-                    attempt_one_attack(env, context, MOVE_AI, USE_PLUS_MOVES);
+                    const bool allow_button_B_press = false;
+                    attempt_one_attack(env, context, MOVE_AI, USE_PLUS_MOVES, allow_button_B_press);
                 }
             },
             {

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp

@@ -21,7 +21,7 @@ namespace PokemonLZA{
 
 bool attempt_one_attack(
     SingleSwitchProgramEnvironment& env, ProControllerContext& context,
-    bool use_move_ai, bool use_plus_moves
+    bool use_move_ai, bool use_plus_moves, bool allow_button_B_press
 ){
     if (!use_move_ai){
         ssf_press_button(context, BUTTON_ZL, 160ms, 800ms, 200ms);
@@ -31,7 +31,9 @@ bool attempt_one_attack(
         }
         pbf_press_button(context, BUTTON_X, 80ms, 24ms);
         pbf_press_button(context, BUTTON_Y, 80ms, 24ms);
-        pbf_press_button(context, BUTTON_B, 80ms, 24ms);
+        if (allow_button_B_press){
+            pbf_press_button(context, BUTTON_B, 80ms, 24ms);
+        }
         return true;
     }
 
@@ -55,7 +57,11 @@ bool attempt_one_attack(
         command.stop_session_and_rethrow();
         context.wait_for(250ms);
         // No move effectiveness symbol found
-        pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+        if (allow_button_B_press){
+            // It could be the game is in a transparent pre-battle dialog,
+            // press B to clear it.
+            pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+        }
         return false;
     }
 

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h

@@ -21,13 +21,21 @@ namespace PokemonLZA{
 
 
 // Try to lock onto an opponent pokemon and launch an attack.
-// - use_move_ai: if True, select move based on type effectiveness. Otherwise, select the top,
-//   left then bottom move in quick succession to ensure at least one of the three moves are launched
-//   despite potential move cooldown.
+// - use_move_ai: if True, select move based on type effectiveness. Otherwise, select the top, left
+//   then bottom (if allow_button_B_press) move in quick succession to ensure at least one of the moves
+//   are launched despite potential move cooldown.
 // - use_plus_moves: if True, press + to launch plus moves.
+// - allow_button_B_press: if true, allow the AI mode to press B if it cannot detect move effectiveness
+//   symbols and allow the non-AI mode to use the bottom move. This lets the function clear any pre-battle
+//   transparent dialog window it encounters.
+//   If false, the AI mode will do nothing when move effectiveness symbols are not detected and the
+//   non-AI mode will never select the bottom move. This ensures the function won't interfere with
+//   detecting flat white dialog windows but it will be external code's responsibility to clear
+//   pre-battle transparent dialog windows.
 bool attempt_one_attack(
     SingleSwitchProgramEnvironment& env, ProControllerContext& context,
-    bool use_move_ai, bool use_plus_moves
+    bool use_move_ai, bool use_plus_moves,
+    bool allow_button_B_press = true
 );
 
 }