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

Forgot about Primal Reversion

Browse source
This commit is contained in:
Eduardo Quezada 2023-03-12 02:38:27 -03:00
parent 7ce68994ec
commit c46e70ca82
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/battle_util.c
View file

@ -10157,8 +10157,9 @@ bool32 CanBattlerFormChange(u8 battlerId, u16 method)
if (gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED) if (gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED)
return FALSE; return FALSE;
// Mega Evolved Pokémon should always revert to normal upon fainting or ending the battle. // Mega Evolved Pokémon should always revert to normal upon fainting or ending the battle.
if (IsBattlerMegaEvolved(battlerId) if (IsBattlerMegaEvolved(battlerId) && (method == FORM_CHANGE_FAINT || method == FORM_CHANGE_END_BATTLE))
&& (method == FORM_CHANGE_FAINT || method == FORM_CHANGE_END_BATTLE)) return TRUE;
else if (IsBattlerPrimalReverted(battlerId) && (method == FORM_CHANGE_END_BATTLE))
return TRUE; return TRUE;
return DoesSpeciesHaveFormChangeMethod(gBattleMons[battlerId].species, method); return DoesSpeciesHaveFormChangeMethod(gBattleMons[battlerId].species, method);
} }