Skip to content

Fix sword and shield sorter #540

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

Fix sword and shield sorter #540

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
16 changes: 0 additions & 16 deletions SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,22 +189,6 @@ void BoxReorderNationalDex::program(SingleSwitchProgramEnvironment& env, ProCont
dex_slug_order.emplace(dex_slugs[i], i);
}

// check if we have any pokemon name read failure.
for(size_t i = 0; i < current_order.size(); ++i){
const auto it = dex_slug_order.find(current_order[i]);
// If OCR gives a name that is not in the nation dex, throw an error:
if (it == dex_slug_order.end()){
const auto [box, row, col] = get_location(i);
std::stringstream os;
os << "Failed to read pokemon name at box " << box << " row " << row << " col " << col;
OperationFailedException::fire(
ErrorReport::SEND_ERROR_REPORT,
os.str(),
env.console
);
}
}

// Sort the read pokemon by the dex order.
std::vector<std::string> sorted_order = current_order;

Expand Down