atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD

Browse source 
There was never a reason not to.
This commit is contained in:
LOuroboros 2022-09-06 18:37:16 -03:00
parent f1c153e469
commit a7a1ab9aeb
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/data/pokemon/form_change_tables.h
View file

@ -1,8 +1,8 @@
/*
FORM_ITEM_HOLD:
Form change activates when the item is given to or taken from the selected Pokémon.
Alternatively, form change activates when the item is used on the selected Pokémon
that has a particular ability.
Form change activates when the specified item is given to or taken from the selected Pokémon.
Alternatively, form change activates when the specified item is is given to or taken from
the selected Pokémon that has a particular ability.
param1 = item to hold
param2 = ability to check for, optional

2
src/pokemon.c
View file

@ -8285,6 +8285,8 @@ u16 GetFormChangeTargetSpeciesBoxMon(struct BoxPokemon *boxMon, u16 method, u32
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)
targetSpecies = formChanges[i].targetSpecies;
break;
case FORM_ITEM_USE:
if (arg == formChanges[i].param1)