Skip to content
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

Fix box for national dex #533

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix box for national dex #533

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
5 changes: 3 additions & 2 deletions SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,8 @@ bool operator==(const Pokemon& lhs, const Pokemon& rhs){
lhs.shiny == rhs.shiny &&
lhs.gmax == rhs.gmax &&
lhs.ball_slug == rhs.ball_slug &&
lhs.gender == rhs.gender;
lhs.gender == rhs.gender &&
lhs.ot_id == rhs.ot_id;
}

bool operator<(const std::optional<Pokemon>& lhs, const std::optional<Pokemon>& rhs){
Expand Down Expand Up @@ -456,7 +457,7 @@ void BoxSorting::program(SingleSwitchProgramEnvironment& env, SwitchControllerCo
BoxSorting_Descriptor::Stats& stats = env.current_stats< BoxSorting_Descriptor::Stats>();

ImageFloatBox select_check(0.495, 0.0045, 0.01, 0.005); // square color to check which mode is active
ImageFloatBox national_dex_number_box(0.448, 0.245, 0.042, 0.04); //pokemon national dex number pos
ImageFloatBox national_dex_number_box(0.448, 0.245, 0.049, 0.04); //pokemon national dex number pos
ImageFloatBox shiny_symbol_box(0.702, 0.09, 0.04, 0.06); // shiny symbol pos
ImageFloatBox gmax_symbol_box(0.463, 0.09, 0.04, 0.06); // gmax symbol pos
ImageFloatBox origin_symbol_box(0.623, 0.095, 0.033, 0.05); // origin symbol pos
Expand Down