Skip to content

Improve reverse handling #542

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
pifopi merged 1 commit into from
Feb 19, 2025
Merged

Improve reverse handling #542

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
49 changes: 13 additions & 36 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 @@ -193,69 +193,46 @@ bool operator<(const std::optional<Pokemon>& lhs, const std::optional<Pokemon>&
}

for (const BoxSortingSelection preference : *lhs->preferences){
bool ret = true;
switch(preference.sort_type){
// NOTE edit when adding new struct members
case BoxSortingSortType::NationalDexNo:
if (lhs->national_dex_number != rhs->national_dex_number){
if (preference.reverse){
return lhs->national_dex_number > rhs->national_dex_number;
}else{
return lhs->national_dex_number < rhs->national_dex_number;
}
ret = lhs->national_dex_number < rhs->national_dex_number;
}
break;
case BoxSortingSortType::Shiny:
if (lhs->shiny != rhs->shiny){
if (preference.reverse){
return rhs->shiny;
}else{
return lhs->shiny;
}
ret = lhs->shiny;
}
break;
case BoxSortingSortType::Gigantamax:
if (lhs->gmax != rhs->gmax){
if (preference.reverse){
return rhs->gmax;
}else{
return lhs->gmax;
}
ret = lhs->gmax;
}
break;
case BoxSortingSortType::Ball_Slug:
if (lhs->ball_slug < rhs->ball_slug){
if (preference.reverse){
return false;
}else{
return true;
}
ret = true;
}
if (lhs->ball_slug > rhs->ball_slug){
if (preference.reverse){
return true;
}else{
return false;
}
ret = false;
}
break;
case BoxSortingSortType::Gender:
if (lhs->gender < rhs->gender){
if (preference.reverse){
return false;
}else{
return true;
}
ret = true;
}
if (lhs->gender > rhs->gender){
if (preference.reverse){
return true;
}
else{
return false;
}
ret = false;
}
break;
}
if (preference.reverse){
return !ret;
}else{
return ret;
}
}

return lhs->national_dex_number < rhs->national_dex_number;
Expand Down