mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-19 01:44:20 +01:00
Forgot about Primal Reversion
This commit is contained in:
parent
7ce68994ec
commit
c46e70ca82
@ -10157,8 +10157,9 @@ bool32 CanBattlerFormChange(u8 battlerId, u16 method)
|
||||
if (gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED)
|
||||
return FALSE;
|
||||
// Mega Evolved Pokémon should always revert to normal upon fainting or ending the battle.
|
||||
if (IsBattlerMegaEvolved(battlerId)
|
||||
&& (method == FORM_CHANGE_FAINT || method == FORM_CHANGE_END_BATTLE))
|
||||
if (IsBattlerMegaEvolved(battlerId) && (method == FORM_CHANGE_FAINT || method == FORM_CHANGE_END_BATTLE))
|
||||
return TRUE;
|
||||
else if (IsBattlerPrimalReverted(battlerId) && (method == FORM_CHANGE_END_BATTLE))
|
||||
return TRUE;
|
||||
return DoesSpeciesHaveFormChangeMethod(gBattleMons[battlerId].species, method);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user