SV egg auto: another update to path to egg basket. go back to working with both camera support off/on.

Author: jw098

SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp

@@ -351,7 +351,7 @@ void collect_eggs_after_sandwich(
     //  Recall your ride to reduce obstacles.
     pbf_press_button(context, BUTTON_PLUS, 20, 105);
 
-#if 1
+#if 0
     // this sequence will purposefully fail if Camera support is off. 
     // If we fail to reach the egg basket, we can then check that Camera support is on.
 
@@ -375,26 +375,38 @@ void collect_eggs_after_sandwich(
     pbf_move_left_joystick(context, 128, 255, 10, 40);  
 #endif
 
-#if 0
+#if 1
+    // this sequence will work with both Camera Support being Off and On
+
+    //  Move forward to table
+    pbf_move_left_joystick(context, 128, 0, 320ms, 480ms);
+
     //  Move left
     pbf_move_left_joystick(context, 0, 128, 80ms, 480ms);
-    pbf_press_button(context, BUTTON_L, 120ms, 120ms);
+    pbf_press_button(context, BUTTON_L, 120ms, 480ms);
     pbf_move_left_joystick(context, 128, 0, 320ms, 480ms);
 
     //  Move forward to pass table
     pbf_move_left_joystick(context, 255, 128, 80ms, 480ms);
-    pbf_press_button(context, BUTTON_L, 120ms, 120ms);
-    pbf_move_left_joystick(context, 128, 0, 640ms, 320ms);
+    pbf_press_button(context, BUTTON_L, 120ms, 480ms);
+    pbf_move_left_joystick(context, 128, 0, 640ms, 480ms);
 
     //  Move right
     pbf_move_left_joystick(context, 255, 128, 80ms, 480ms);
-    pbf_press_button(context, BUTTON_L, 120ms, 120ms);
-    pbf_move_left_joystick(context, 128, 0, 320ms, 320ms);
+    pbf_press_button(context, BUTTON_L, 120ms, 480ms);
+    pbf_move_left_joystick(context, 128, 0, 320ms, 480ms);
 
-    //  Move back to face basket
-    pbf_move_left_joystick(context, 255, 128, 80ms, 320ms);
-    pbf_press_button(context, BUTTON_L, 120ms, 120ms);
-    pbf_move_left_joystick(context, 128, 0, 160ms, 320ms);
+    //  Turn right to face basket
+    pbf_move_left_joystick(context, 255, 128, 80ms, 480ms);
+    pbf_press_button(context, BUTTON_L, 120ms, 480ms);
+
+    //  Move closer to the basket, up to the table
+    pbf_move_left_joystick(context, 128, 0, 800ms, 480ms);
+
+    //  back away from the table, then face forwards towards the basket again
+    pbf_move_left_joystick(context, 128, 255, 200ms, 480ms);
+    pbf_move_left_joystick(context, 128, 0, 80ms, 480ms);
+    pbf_press_button(context, BUTTON_L, 120ms, 480ms);   
 #endif
 
 #if 0