From e6c81d2862536d396bb69f5910f2d089384fc319 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Wed, 29 Sep 2021 21:30:54 -0300 Subject: [PATCH] Fixed form change when swapping items --- src/pokemon.c | 3 ++- src/pokemon_storage_system.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pokemon.c b/src/pokemon.c index 021eca1d19..0ac67f0cf2 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -8073,7 +8073,8 @@ u16 GetFormChangeTargetSpeciesBoxMon(struct BoxPokemon *mon, u16 method, u32 arg switch (method) { case FORM_ITEM_HOLD: - if (GetBoxMonData(mon, MON_DATA_HELD_ITEM, NULL) == formChanges[i].param1 && (ability == formChanges[i].param2 || formChanges[i].param2 == ABILITY_NONE)) + if ((GetBoxMonData(mon, MON_DATA_HELD_ITEM, NULL) == formChanges[i].param1 || formChanges[i].param1 == ITEM_NONE) + && (ability == formChanges[i].param2 || formChanges[i].param2 == ABILITY_NONE)) targetSpecies = formChanges[i].targetSpecies; break; case FORM_ITEM_USE: diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index da24f9b9a6..0626fcd0b0 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -8575,7 +8575,7 @@ static void MultiMove_RemoveMonsFromBox(void) u8 boxPosition = (IN_BOX_COLUMNS * i) + sMultiMove->minColumn; for (j = sMultiMove->minColumn; j < columnCount; j++) { - DestroyBoxMonIconAtPosition(boxPosition);//bookmark + DestroyBoxMonIconAtPosition(boxPosition); ZeroBoxMonAt(boxId, boxPosition); boxPosition++; }