Skip to content

Commit

Permalink
Clean up getPKM calls
Browse files Browse the repository at this point in the history
  • Loading branch information
Epicpkmn11 committed May 28, 2022
1 parent f76a9fa commit 52765cc
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions arm9/source/menus/aMenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -474,12 +474,11 @@ int aMenu(int pkmX, int pkmY, std::vector<Label> &buttons, int buttonMode) {
u8 buffer[size];
fread(buffer, 1, sizeof(buffer), in);
if(topScreen)
Banks::bank->pkm(
*save->emptyPkm()->getPKM(gen, buffer), currentBankBox, pkmPos(pkmX, pkmY));
Banks::bank->pkm(*pksm::PKX::getPKM(gen, buffer), currentBankBox, pkmPos(pkmX, pkmY));
else if(inParty)
save->pkm(*save->transfer(*save->emptyPkm()->getPKM(gen, buffer)), pkmPos(pkmX, pkmY));
save->pkm(*save->transfer(*pksm::PKX::getPKM(gen, buffer)), pkmPos(pkmX, pkmY));
else
save->pkm(*save->transfer(*save->emptyPkm()->getPKM(gen, buffer)),
save->pkm(*save->transfer(*pksm::PKX::getPKM(gen, buffer)),
currentSaveBox,
pkmPos(pkmX, pkmY),
false);
Expand Down

0 comments on commit 52765cc

Please sign in to comment.