Merge branch 'main' of https://github.com/PokemonAutomation/Arduino-Source

Author: Mysticial

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

@@ -51,6 +51,12 @@
 #include "PokemonSV_AutoStory_Segment_27.h"
 #include "PokemonSV_AutoStory_Segment_28.h"
 #include "PokemonSV_AutoStory_Segment_29.h"
+#include "PokemonSV_AutoStory_Segment_30.h"
+#include "PokemonSV_AutoStory_Segment_31.h"
+#include "PokemonSV_AutoStory_Segment_32.h"
+#include "PokemonSV_AutoStory_Segment_33.h"
+#include "PokemonSV_AutoStory_Segment_34.h"
+#include "PokemonSV_AutoStory_Segment_35.h"
 #include "PokemonSV_AutoStory.h"
 
 #include <iostream>
@@ -98,8 +104,14 @@ std::vector<std::unique_ptr<AutoStory_Segment>> make_autoStory_segment_list(){
     segment_list.emplace_back(std::make_unique<AutoStory_Segment_25>());
     segment_list.emplace_back(std::make_unique<AutoStory_Segment_26>());
     segment_list.emplace_back(std::make_unique<AutoStory_Segment_27>());
-    // segment_list.emplace_back(std::make_unique<AutoStory_Segment_28>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_28>());
     // segment_list.emplace_back(std::make_unique<AutoStory_Segment_29>());
+    // segment_list.emplace_back(std::make_unique<AutoStory_Segment_30>());
+    // segment_list.emplace_back(std::make_unique<AutoStory_Segment_31>());
+    // segment_list.emplace_back(std::make_unique<AutoStory_Segment_32>());
+    // segment_list.emplace_back(std::make_unique<AutoStory_Segment_33>());
+    // segment_list.emplace_back(std::make_unique<AutoStory_Segment_34>());
+    // segment_list.emplace_back(std::make_unique<AutoStory_Segment_35>());
 
     return segment_list;
 };
@@ -702,8 +714,18 @@ void AutoStory::test_checkpoints(
     checkpoint_list.push_back([&](){checkpoint_68(env, context, notif_status_update, stats);});
     checkpoint_list.push_back([&](){checkpoint_69(env, context, notif_status_update, stats);});
     checkpoint_list.push_back([&](){checkpoint_70(env, context, notif_status_update, stats);});
+    checkpoint_list.push_back([&](){checkpoint_71(env, context, notif_status_update, stats);});
+    checkpoint_list.push_back([&](){checkpoint_72(env, context, notif_status_update, stats);});
+    checkpoint_list.push_back([&](){checkpoint_73(env, context, notif_status_update, stats);});
+    checkpoint_list.push_back([&](){checkpoint_74(env, context, notif_status_update, stats);});
+    checkpoint_list.push_back([&](){checkpoint_75(env, context, notif_status_update, stats);});
+    checkpoint_list.push_back([&](){checkpoint_76(env, context, notif_status_update, stats);});
 
-
+    
+    if (end == 0){
+        end = start;
+    }
+    stream.log("test_checkpoints: start: " + std::to_string(start) + ", end:" + std::to_string(end));
     for (int checkpoint = start; checkpoint <= end; checkpoint++){
         if (checkpoint == 0){
             stream.log("checkpoint_0");

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

@@ -1202,148 +1202,6 @@ void checkpoint_reattempt_loop_tutorial(
 
 
 
-void move_from_glaseado_mountain_to_montenevera(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
-    context.wait_for_all_requests();
-
-
-    // marker 1         {0.745313, 0.637037}
-    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
-        {ZoomChange::KEEP_ZOOM, 0, 0, 0}, 
-        FlyPoint::POKECENTER, 
-        {0.745313, 0.637037}
-    );
-    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
-        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
-            overworld_navigation(env.program_info(), env.console, context, 
-                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
-                128, 0, 30, 10, false);
-        }, 
-        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
-            pbf_move_left_joystick(context, 0, 255, 40, 50);
-            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
-        }
-    );
-    
-    // marker 2       x=0.225521, y=0.380556. {0.229687, 0.37037}
-    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
-        {ZoomChange::KEEP_ZOOM, 255, 0, 50}, 
-        FlyPoint::POKECENTER, 
-        {0.229687, 0.37037}
-    );
-    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
-        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
-            overworld_navigation(env.program_info(), env.console, context, 
-                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
-                128, 0, 60, 10, false);
-        }, 
-        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
-            pbf_move_left_joystick(context, 0, 255, 40, 50);
-            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
-        }
-    );
-
-    // marker 3       x=0.396354, y=0.69537.  x=0.396875, y=0.725926
-    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
-        {ZoomChange::KEEP_ZOOM, 255, 200, 50}, 
-        FlyPoint::POKECENTER, 
-        {0.396875, 0.725926}
-    );
-    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
-        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
-            overworld_navigation(env.program_info(), env.console, context, 
-                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
-                128, 0, 50, 10, false);
-        }, 
-        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
-            pbf_move_left_joystick(context, 255, 255, 40, 50);
-            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
-        }
-    );
-
-    // marker 4       (0.409896, 0.65)
-    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
-        {ZoomChange::KEEP_ZOOM, 0, 0, 0}, 
-        FlyPoint::POKECENTER, 
-        {0.409896, 0.65}
-    );
-    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
-        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
-            overworld_navigation(env.program_info(), env.console, context, 
-                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
-                128, 0, 20, 10, false);
-        }, 
-        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
-            pbf_move_left_joystick(context, 255, 255, 40, 50);
-            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
-        }
-    );
-
-    
-    // marker 5        {0.509896, 0.639815}
-    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
-        {ZoomChange::KEEP_ZOOM, 0, 0, 0}, 
-        FlyPoint::POKECENTER, 
-        {0.509896, 0.639815}
-    );
-    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
-        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
-            overworld_navigation(env.program_info(), env.console, context, 
-                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
-                128, 0, 30, 10, false);
-        }, 
-        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
-            pbf_move_left_joystick(context, 255, 255, 40, 50);
-            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
-        }
-    );
-
-    // marker 6         {0.508333, 0.566667}   {0.521875, 0.483333}
-    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
-        {ZoomChange::ZOOM_IN, 128, 255, 20}, 
-        FlyPoint::POKECENTER, 
-        {0.508333, 0.566667}
-    );
-    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
-        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
-            overworld_navigation(env.program_info(), env.console, context, 
-                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
-                128, 0, 30, 10, false);
-        }, 
-        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
-            pbf_move_left_joystick(context, 255, 255, 40, 50);
-            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
-        }
-    );
-
-    // marker 7         {0.508333, 0.566667}   {0.521875, 0.483333}  {0.529687, 0.483333}
-    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
-        {ZoomChange::ZOOM_IN, 0, 0, 0}, 
-        FlyPoint::POKECENTER, 
-        {0.529687, 0.483333}
-    );
-
-    get_on_ride(env.program_info(), env.console, context);
-
-    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
-        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
-            overworld_navigation(env.program_info(), env.console, context, 
-                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
-                128, 0, 30, 10, false);
-        }, 
-        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
-            pbf_move_left_joystick(context, 128, 0, 500ms, 0ms);
-            pbf_controller_state(context, BUTTON_B, DPAD_NONE, 128, 0, 128, 128, 1000ms);
-            pbf_move_left_joystick(context, 128, 0, 500ms, 0ms);
-            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
-        }
-    );
-
-
-    fly_to_overlapping_flypoint(env.program_info(), env.console, context); 
-
-
-}
-
 
 void move_from_montenevera_to_glaseado_gym(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     DirectionDetector direction;

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

@@ -322,8 +322,6 @@ void checkpoint_reattempt_loop_tutorial(
 
 
 
-// moves player from Glaseado Mountain Pokecenter to Montenevera Pokecenter
-void move_from_glaseado_mountain_to_montenevera(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
 
 // moves player from Montenevera Pokecenter to Glaseado Gym Pokecenter
 void move_from_montenevera_to_glaseado_gym(SingleSwitchProgramEnvironment& env, ProControllerContext& context);

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

@@ -102,14 +102,6 @@ void checkpoint_67(SingleSwitchProgramEnvironment& env, ProControllerContext& co
     }); 
 }
 
-void checkpoint_68(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
-}
-
-void checkpoint_69(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
-}
-
-void checkpoint_70(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
-}
 
 
 

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

@@ -42,17 +42,6 @@ void checkpoint_66(SingleSwitchProgramEnvironment& env, ProControllerContext& co
 // end: At North Province Area Three Pokecenter
 void checkpoint_67(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
 
-// start: 
-// end: 
-void checkpoint_68(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
-
-// start: 
-// end: 
-void checkpoint_69(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
-
-// start: 
-// end: 
-void checkpoint_70(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);