Skip to content

Update Home number OCR to use multifilter method #1341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mysticial merged 1 commit into from
Jul 25, 2026
Merged

Update Home number OCR to use multifilter method #1341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxNavigation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "CommonFramework/ImageTools/ImageBoxes.h"
#include "CommonFramework/ImageTools/ImageStats.h"
#include "CommonFramework/Notifications/ProgramInfo.h"
#include "CommonFramework/Tools/GlobalThreadPools.h"
#include "CommonTools/Images/ImageFilter.h"
#include "CommonTools/OCR/OCR_Routines.h"
#include "CommonTools/OCR/OCR_StringNormalization.h"
Expand Down Expand Up @@ -262,7 +263,20 @@ void read_summary_screen(

VideoSnapshot screen = env.console.video().snapshot();

const int dex_number = OCR::read_number_waterfill(env.console, extract_box_reference(screen, national_dex_number_box), 0xff808080, 0xffffffff);
const std::vector<std::pair<uint32_t, uint32_t>> white_number_filters = {
{0xff808080, 0xffffffff},
{0xff909090, 0xffffffff},
};

const int dex_number = OCR::read_number_waterfill_multifilter(
env.console,
GlobalThreadPools::computation_normal(),
extract_box_reference(screen, national_dex_number_box),
white_number_filters,
true,
true,
20
);
if (dex_number <= 0 || dex_number > static_cast<int>(NATIONAL_DEX_SLUGS().size())) {
OperationFailedException::fire(
ErrorReport::SEND_ERROR_REPORT,
Expand Down Expand Up @@ -295,7 +309,12 @@ void read_summary_screen(
env.console.log("Gender: " + gender_to_string(gender), COLOR_GREEN);
cur_pokemon_info.gender = gender;

const int ot_id = OCR::read_number_waterfill(env.console, extract_box_reference(screen, ot_id_box), 0xff808080, 0xffffffff);
const int ot_id = OCR::read_number_waterfill_multifilter(
env.console,
GlobalThreadPools::computation_normal(),
extract_box_reference(screen, ot_id_box),
white_number_filters
);
if (ot_id < 0 || ot_id > 999'999) {
dump_image(env.console, ProgramInfo(), "ReadSummary_OT", screen);
}
Expand Down
Loading