Commit 96a47ed
authored
Autostory: Player/Camera movement based on YOLO. Arrive at Area Zero Station 1. (#816)
* add extra segments/checkpoints
* checkpoint 93: Entered Area Zero Gate. Flew down to Area Zero from the platform.
* minor update to checkpoint 93
* add functions that move player forward and move the camera, based on yolo object detection
* for routines that move the player/camera based on yolo, throw exception if caught in battle. adjust scale factors for move_camera_yolo
* add TEST_YOLO_BOX
* add bag detection for run_battle_press_A()
* clear YOLO overlays when caught in battle
* add move_forward_until_yolo_object_not_detected(). change color of overlays if it's the target object.
* add do_action_and_monitor_for_battles_early(), which uses NoMinimapWatcher
* add times_not_seen_threshold to move_forward_until_yolo_object_not_detected()
* partial checkpoint_94: arrive at rock-3
* add move_player_to_realign_via_yolo()
* adjust recovery routine after battle to use move_player_to_realign_via_yolo()
* add move_camera_until_yolo_object_detected()
* add do_action_until_dialog(). adjust move_player_forward() to include a recovery_action
* partial checkpoint_94: arrive at station-1 dialog
* add recovery action to move_camera_yolo()
* minor tweaks to station 1 navigation routine.
* adjust close_game_from_home()
* more changes to station 1 nav routine
* adjust target x values when recovering from battles within move_camera_yolo: X.
* when moving forward, don't pause to use Let's Go.
* more changes to station 1 nav routine
* complete checkpoint_94
* adjust recovery_action for move_camera_yolo: X. Don't move the player after a battle. just adjust the camera.
* more adjustments to checkpoint_94
* yolo-based camera/player movement routines: rename variables. throw exception if never detected yolo object. throw exception if exceed max rounds. reduce delays after joystick movement.
* more checkpoint_94 adjustments
* minor changes to close_game_from_home
* move_camera_yolo: increase max_attempts
* updated move_player_forward() and walk_forward_until_dialog()
* preliminary checkpoint 95: entering station 1
* more tidy up1 parent b542de9 commit 96a47ed
File tree
22 files changed
+2068
-31
lines changed- SerialPrograms
- Source
- NintendoSwitch/Programs
- PokemonSV/Programs
- AutoStory
22 files changed
+2068
-31
lines changedLines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
| 73 | + | |
73 | 74 | | |
74 | 75 | | |
75 | 76 | | |
| |||
104 | 105 | | |
105 | 106 | | |
106 | 107 | | |
| 108 | + | |
107 | 109 | | |
108 | 110 | | |
109 | 111 | | |
| |||
124 | 126 | | |
125 | 127 | | |
126 | 128 | | |
| 129 | + | |
127 | 130 | | |
128 | 131 | | |
129 | 132 | | |
| |||
Lines changed: 70 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
6 | 13 | | |
7 | 14 | | |
8 | 15 | | |
| |||
57 | 64 | | |
58 | 65 | | |
59 | 66 | | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
60 | 72 | | |
61 | 73 | | |
62 | 74 | | |
| |||
70 | 82 | | |
71 | 83 | | |
72 | 84 | | |
| 85 | + | |
73 | 86 | | |
74 | 87 | | |
75 | 88 | | |
| |||
112 | 125 | | |
113 | 126 | | |
114 | 127 | | |
115 | | - | |
116 | 128 | | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
117 | 137 | | |
118 | 138 | | |
119 | 139 | | |
| |||
276 | 296 | | |
277 | 297 | | |
278 | 298 | | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
279 | 308 | | |
280 | 309 | | |
281 | 310 | | |
| |||
658 | 687 | | |
659 | 688 | | |
660 | 689 | | |
| 690 | + | |
| 691 | + | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
| 705 | + | |
| 706 | + | |
| 707 | + | |
| 708 | + | |
661 | 709 | | |
662 | 710 | | |
663 | 711 | | |
664 | 712 | | |
665 | 713 | | |
| 714 | + | |
| 715 | + | |
| 716 | + | |
| 717 | + | |
666 | 718 | | |
667 | 719 | | |
668 | 720 | | |
| |||
1137 | 1189 | | |
1138 | 1190 | | |
1139 | 1191 | | |
| 1192 | + | |
| 1193 | + | |
| 1194 | + | |
| 1195 | + | |
| 1196 | + | |
| 1197 | + | |
| 1198 | + | |
| 1199 | + | |
| 1200 | + | |
| 1201 | + | |
| 1202 | + | |
| 1203 | + | |
1140 | 1204 | | |
1141 | 1205 | | |
1142 | 1206 | | |
| |||
1200 | 1264 | | |
1201 | 1265 | | |
1202 | 1266 | | |
| 1267 | + | |
| 1268 | + | |
| 1269 | + | |
| 1270 | + | |
| 1271 | + | |
1203 | 1272 | | |
1204 | 1273 | | |
1205 | 1274 | | |
| |||
Lines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
| |||
147 | 148 | | |
148 | 149 | | |
149 | 150 | | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
150 | 157 | | |
151 | 158 | | |
152 | 159 | | |
| |||
0 commit comments