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

changed gastro acid check to properly use GetBattlerAbility

Browse Source
This commit is contained in:
AgustinGDLV 2023-05-16 16:37:18 -07:00
parent 785b100693
commit b269cc6906
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/battle_util.c
View File

@ -10161,8 +10161,7 @@ u16 GetBattleFormChangeTargetSpecies(u8 battlerId, u16 method)
// Check if there is a required ability and if the battler's ability does not match it // Check if there is a required ability and if the battler's ability does not match it
// or is suppressed. If so, revert to the no weather form. // or is suppressed. If so, revert to the no weather form.
if (formChanges[i].param2 if (formChanges[i].param2
&& (gBattleMons[battlerId].ability != formChanges[i].param2 && GetBattlerAbility(battlerId) != formChanges[i].param2
|| (gStatuses3[gBattlerTarget] & STATUS3_GASTRO_ACID))
&& formChanges[i].param1 == B_WEATHER_NONE) && formChanges[i].param1 == B_WEATHER_NONE)
{ {
targetSpecies = formChanges[i].targetSpecies; targetSpecies = formChanges[i].targetSpecies;