ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-19 18:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed form change when swapping items

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone 2021-09-29 21:30:54 -03:00
parent 9114f3d1dc
commit e6c81d2862
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pokemon.c
View File

@ -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:

2
src/pokemon_storage_system.c
View File

@ -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++;
}