From e8832a265523d52149849f74298202aa89aed856 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 9 Sep 2022 14:56:12 -0300 Subject: [PATCH] Updated FORM_ITEM_HOLD check in GetFormChangeTargetSpeciesBoxMon --- src/pokemon.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pokemon.c b/src/pokemon.c index 63b3dae9d..4dcec70b0 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -8283,9 +8283,7 @@ u16 GetFormChangeTargetSpeciesBoxMon(struct BoxPokemon *boxMon, u16 method, u32 { case FORM_ITEM_HOLD: if ((heldItem == formChanges[i].param1 || formChanges[i].param1 == ITEM_NONE) - || ability == formChanges[i].param2) - targetSpecies = formChanges[i].targetSpecies; - if ((heldItem == formChanges[i].param1 || formChanges[i].param1 == ITEM_NONE) && ability == formChanges[i].param2) + && (ability == formChanges[i].param2 || formChanges[i].param2 == ABILITY_NONE)) targetSpecies = formChanges[i].targetSpecies; break; case FORM_ITEM_USE: