Migrate more AutoStory to new joystick API.

Mysticial · Mysticial · commit f35740673263 · 2025-12-21T03:35:09.000-08:00
diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp
@@ -216,15 +216,15 @@ void checkpoint_56(
 
             // charge at orthworm
             pbf_move_left_joystick(context, 128, 0, 408ms, 0ms);
-            pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, 128, 0, 128, 128, 102ms);
+            pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, {0, +1}, {0, 0}, 102ms);
             pbf_move_left_joystick(context, 128, 0, 1970ms, 0ms);
-            pbf_controller_state(context, BUTTON_NONE, DPAD_NONE, 128, 0, 0, 128, 432ms);
+            pbf_controller_state(context, BUTTON_NONE, DPAD_NONE, {0, +1}, {-1, 0}, 432ms);
             pbf_move_left_joystick(context, 128, 0, 1993ms, 0ms);
-            pbf_controller_state(context, BUTTON_NONE, DPAD_NONE, 128, 0, 0, 128, 301ms);
+            pbf_controller_state(context, BUTTON_NONE, DPAD_NONE, {0, +1}, {-1, 0}, 301ms);
             pbf_move_left_joystick(context, 128, 0, 307ms, 0ms);
-            pbf_controller_state(context, BUTTON_NONE, DPAD_NONE, 128, 0, 0, 128, 194ms);
+            pbf_controller_state(context, BUTTON_NONE, DPAD_NONE, {0, +1}, {-1, 0}, 194ms);
             pbf_move_left_joystick(context, 128, 0, 886ms, 0ms);
-            pbf_controller_state(context, BUTTON_NONE, DPAD_NONE, 128, 0, 0, 128, 626ms);
+            pbf_controller_state(context, BUTTON_NONE, DPAD_NONE, {0, +1}, {-1, 0}, 626ms);
             pbf_move_left_joystick(context, 128, 0, 2651ms, 0ms);
         });
 
diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp
@@ -402,7 +402,7 @@ void move_from_porto_marinada_to_medali(SingleSwitchProgramEnvironment& env, Pro
         }, 
         [&](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_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1000ms);
             pbf_move_left_joystick(context, 128, 0, 500ms, 0ms);
             realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
         }
@@ -445,7 +445,7 @@ void move_from_porto_marinada_to_medali(SingleSwitchProgramEnvironment& env, Pro
         }, 
         [&](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_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1000ms);
             pbf_move_left_joystick(context, 128, 0, 500ms, 0ms);
             realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
         }
diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.cpp
@@ -339,7 +339,7 @@ void move_from_medali_to_glaseado_mountain(SingleSwitchProgramEnvironment& env,
         }, 
         [&](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_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1000ms);
             pbf_move_left_joystick(context, 128, 0, 500ms, 0ms);
             realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
         }
diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp
@@ -449,7 +449,7 @@ void move_from_glaseado_mountain_to_montenevera(SingleSwitchProgramEnvironment&
         }, 
         [&](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_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1000ms);
             pbf_move_left_joystick(context, 128, 0, 500ms, 0ms);
             realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
         }
diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.cpp
@@ -276,7 +276,7 @@ void move_from_montenevera_to_glaseado_gym(SingleSwitchProgramEnvironment& env,
         }, 
         [&](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_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1000ms);
             pbf_move_left_joystick(context, 128, 0, 500ms, 0ms);
             realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
         }
diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.cpp
@@ -392,7 +392,7 @@ void move_from_west_province_area_one_north_to_alfornada(SingleSwitchProgramEnvi
 
         // climb the wall
         pbf_press_button(context, BUTTON_B, 528ms, 0ms);
-        pbf_controller_state(context, BUTTON_B, DPAD_NONE, 128, 0, 128, 128, 51ms);
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 51ms);
         pbf_move_left_joystick(context, 128, 0, 5002ms, 0ms);
         pbf_wait(context, 1551ms);
         pbf_move_left_joystick(context, 0, 128, 2167ms, 0ms);
diff --git a/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.cpp b/SerialPrograms/Source/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.cpp
@@ -146,9 +146,9 @@ void checkpoint_86(SingleSwitchProgramEnvironment& env, ProControllerContext& co
         direction.change_direction(env.program_info(), env.console, context, 1.484555);
 
         pbf_move_left_joystick(context, 128, 0, 1506ms, 0ms);
-        pbf_controller_state(context, BUTTON_B, DPAD_NONE, 128, 0, 128, 128, 703ms);
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 703ms);
         pbf_move_left_joystick(context, 128, 0, 233ms, 0ms);
-        pbf_controller_state(context, BUTTON_B, DPAD_NONE, 128, 0, 128, 128, 5098ms);
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 5098ms);
         pbf_move_left_joystick(context, 128, 0, 1000ms, 0ms);
 
         wait_for_overworld(env.program_info(), env.console, context);

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ void move_from_medali_to_glaseado_mountain(SingleSwitchProgramEnvironment& env,`
`339`	`339`	`},`
`340`	`340`	`[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){`
`341`	`341`	`pbf_move_left_joystick(context, 128, 0, 500ms, 0ms);`
`342`		`- pbf_controller_state(context, BUTTON_B, DPAD_NONE, 128, 0, 128, 128, 1000ms);`
	`342`	`+ pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1000ms);`
`343`	`343`	`pbf_move_left_joystick(context, 128, 0, 500ms, 0ms);`
`344`	`344`	`realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);`
`345`	`345`	`}`
Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ void move_from_glaseado_mountain_to_montenevera(SingleSwitchProgramEnvironment&`
`449`	`449`	`},`
`450`	`450`	`[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){`
`451`	`451`	`pbf_move_left_joystick(context, 128, 0, 500ms, 0ms);`
`452`		`- pbf_controller_state(context, BUTTON_B, DPAD_NONE, 128, 0, 128, 128, 1000ms);`
	`452`	`+ pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1000ms);`
`453`	`453`	`pbf_move_left_joystick(context, 128, 0, 500ms, 0ms);`
`454`	`454`	`realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);`
`455`	`455`	`}`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ void move_from_montenevera_to_glaseado_gym(SingleSwitchProgramEnvironment& env,`
`276`	`276`	`},`
`277`	`277`	`[&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){`
`278`	`278`	`pbf_move_left_joystick(context, 128, 0, 500ms, 0ms);`
`279`		`- pbf_controller_state(context, BUTTON_B, DPAD_NONE, 128, 0, 128, 128, 1000ms);`
	`279`	`+ pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1000ms);`
`280`	`280`	`pbf_move_left_joystick(context, 128, 0, 500ms, 0ms);`
`281`	`281`	`realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);`
`282`	`282`	`}`