Skip to content

Commit a4648f8

Browse files
committed
Fix BDSP starter reset not taking videos.
1 parent 6d63eaa commit a4648f8

File tree

2 files changed

+5
-19
lines changed

2 files changed

+5
-19
lines changed

SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -226,18 +226,8 @@ void StarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
226226
true, true, {{{"starly"}, ShinyType::UNKNOWN_SHINY}}, result_wild.alpha,
227227
result_wild.get_best_screenshot()
228228
);
229-
}else{
230-
#if 0
231-
send_encounter_notification(
232-
env.console,
233-
NOTIFICATION_NONSHINY,
234-
NOTIFICATION_SHINY,
235-
env.program_info(),
236-
true, false, {{{"starly"}, ShinyType::NOT_SHINY}}, result_wild.alpha,
237-
result_wild.get_best_screenshot(),
238-
&stats
239-
);
240-
#endif
229+
pbf_wait(context, 5 * TICKS_PER_SECOND);
230+
pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 5 * TICKS_PER_SECOND);
241231
}
242232

243233
bool your_shiny = is_likely_shiny(result_own.shiny_type);
@@ -250,6 +240,8 @@ void StarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
250240
true, true, {{{starter}, ShinyType::UNKNOWN_SHINY}}, result_own.alpha,
251241
result_own.get_best_screenshot()
252242
);
243+
pbf_wait(context, 5 * TICKS_PER_SECOND);
244+
pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 5 * TICKS_PER_SECOND);
253245
break;
254246
}else{
255247
stats.add_non_shiny();
@@ -261,12 +253,6 @@ void StarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
261253
result_own.get_best_screenshot()
262254
);
263255
}
264-
265-
if ((wild_shiny || your_shiny) && VIDEO_ON_SHINY){
266-
pbf_wait(context, 5 * TICKS_PER_SECOND);
267-
pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 5 * TICKS_PER_SECOND);
268-
}
269-
270256
}
271257

272258
env.update_stats();

SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ uint8_t TeraCardReader::stars(
133133
ImageStats background_stats = image_stats(background);
134134
Color background_average = background_stats.average.round();
135135

136-
// Iterate through several difference distance filters and find how many
136+
// Iterate through multiple distance filters and find how many
137137
// possible stars are in each one. Then do a majority vote.
138138
const std::vector<double> DISTANCES{70, 80, 90, 100, 110, 120, 130};
139139

0 commit comments

Comments
 (0)