Check for Next Pokemon prompt when battling Nemona at Mesagoza gate

Author: jw098

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp

@@ -62,6 +62,7 @@ void run_battle_press_A(
 
         std::vector<PeriodicInferenceCallback> callbacks; 
         //  mandatory callbacks: Battle, Overworld, Advance Dialog, Swap menu, Move select
+        //  optional callbacks: ADVANCE_DIALOG, DIALOG_ARROW, NEXT_POKEMON
         std::vector<CallbackEnum> enum_all_callbacks{CallbackEnum::BATTLE, CallbackEnum::OVERWORLD, CallbackEnum::ADVANCE_DIALOG, CallbackEnum::SWAP_MENU, CallbackEnum::MOVE_SELECT}; // mandatory callbacks
         enum_all_callbacks.insert(enum_all_callbacks.end(), enum_optional_callbacks.begin(), enum_optional_callbacks.end()); // append the mandatory and optional callback vectors together
         for (const CallbackEnum& enum_callback : enum_all_callbacks){
@@ -78,10 +79,10 @@ void run_battle_press_A(
             case CallbackEnum::BATTLE:
                 callbacks.emplace_back(battle);
                 break;
-            case CallbackEnum::GRADIENT_ARROW:
+            case CallbackEnum::NEXT_POKEMON: // to detect the "next pokemon" prompt.
                 callbacks.emplace_back(next_pokemon);
                 break;
-            case CallbackEnum::SWAP_MENU:  
+            case CallbackEnum::SWAP_MENU:  // detecting Swap Menu implies your lead fainted.
                 callbacks.emplace_back(fainted);
                 break;                     
             case CallbackEnum::MOVE_SELECT:
@@ -159,7 +160,7 @@ void run_battle_press_A(
             stream.log("run_battle_press_A: Detected dialog arrow.");
             pbf_press_button(context, BUTTON_A, 20, 105);
             break;
-        case CallbackEnum::GRADIENT_ARROW:
+        case CallbackEnum::NEXT_POKEMON:
             stream.log("run_battle_press_A: Detected prompt for bringing in next pokemon. Keep current pokemon.");
             pbf_mash_button(context, BUTTON_B, 100);
             break;

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h

@@ -58,7 +58,7 @@ enum class CallbackEnum{
     BATTLE,
     TUTORIAL,
     BLACK_DIALOG_BOX,
-    GRADIENT_ARROW,
+    NEXT_POKEMON,
     SWAP_MENU,
     MOVE_SELECT,
 };
@@ -118,7 +118,7 @@ class AutoStory_Segment {
 };
 
 // spam A button to choose the first move
-// throw exception if wipeout.
+// throw exception if wipeout or if your lead faints.
 void run_battle_press_A(
     VideoStream& stream,
     ProControllerContext& context,

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp

@@ -93,7 +93,7 @@ void checkpoint_13(
 
         env.console.log("run_battle_press_A: Battle with Nemona at Mesagoza gate. Stop when detect dialog.");
         // story continues even if you lose
-        run_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        run_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {CallbackEnum::NEXT_POKEMON});
 
         env.console.log("clear_dialog: Talk with Nemona within Mesagoza. Stop when detect overworld.");
         clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, 
@@ -147,14 +147,14 @@ void checkpoint_14(
         clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
         // run battle until dialog
         env.console.log("run_battle_press_A: Battle with Team Star grunt 1. Stop when detect dialog.");
-        run_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {}, true);
+        run_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {}, true);  // enemy only has 1 Pokemon, so no need to detect "Next Pokemon" prompt
         // clear dialog until battle, with prompt, white button, tutorial, battle
         env.console.log("clear_dialog: Talk with Team Star and Nemona. Receive Tera orb. Stop when detect battle.");
         clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, 
             {CallbackEnum::PROMPT_DIALOG, CallbackEnum::WHITE_A_BUTTON, CallbackEnum::TUTORIAL, CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
         // run battle until dialog
         env.console.log("run_battle_press_A: Battle with Team Star grunt 2. Stop when detect dialog.");
-        run_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {}, true);
+        run_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {}, true); // enemy only has 1 Pokemon, so no need to detect "Next Pokemon" prompt
         // clear dialog until overworld
         clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});
 

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp

@@ -120,7 +120,7 @@ void checkpoint_28(
         clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW});
 
         // battle Katy
-        run_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {CallbackEnum::GRADIENT_ARROW}, true);
+        run_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {CallbackEnum::NEXT_POKEMON}, true);
         mash_button_till_overworld(env.console, context, BUTTON_A, 360);
 
         // leave gym building

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp

@@ -98,7 +98,7 @@ void checkpoint_37(
         walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20);
 
         clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW});
-        run_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {CallbackEnum::GRADIENT_ARROW});
+        run_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {CallbackEnum::NEXT_POKEMON});
         mash_button_till_overworld(env.console, context, BUTTON_A, 360);
 
 
@@ -170,7 +170,7 @@ void checkpoint_38(
         // talk to reception. Battle Kofu
         walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10);
         clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW});
-        run_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {CallbackEnum::GRADIENT_ARROW}, true);
+        run_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {CallbackEnum::NEXT_POKEMON}, true);
         mash_button_till_overworld(env.console, context, BUTTON_A, 360);
 
         break;

SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp

@@ -126,7 +126,7 @@ void checkpoint_43(
 
         // enter gym building. talk go Nemona and battle her.
         clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BLACK_DIALOG_BOX, CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW, CallbackEnum::BATTLE});        
-        run_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {CallbackEnum::GRADIENT_ARROW});
+        run_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {CallbackEnum::NEXT_POKEMON});
         mash_button_till_overworld(env.console, context, BUTTON_A);
 
 
@@ -536,7 +536,7 @@ void checkpoint_45(
         ); 
 
         clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
-        run_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {CallbackEnum::GRADIENT_ARROW});
+        run_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {CallbackEnum::NEXT_POKEMON});
         mash_button_till_overworld(env.console, context, BUTTON_A);
 
         break;