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

Merge pull request #1587 from BuffelSaft/shields-down

Browse Source 
Fix Shields Down
This commit is contained in:
Eduardo Quezada D'Ottone 2021-10-02 00:12:29 -03:00 committed by GitHub
commit b322a42fea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_script_commands.c
View File

@ -7285,7 +7285,7 @@ u32 IsLeafGuardProtected(u32 battler)
bool32 IsShieldsDownProtected(u32 battler) bool32 IsShieldsDownProtected(u32 battler)
{ {
return (gBattleMons[battler].ability == ABILITY_SHIELDS_DOWN return (gBattleMons[battler].ability == ABILITY_SHIELDS_DOWN
&& gBattleMons[battler].species == SPECIES_MINIOR); && GetFormIdFromFormSpeciesId(gBattleMons[battler].species) < GetFormIdFromFormSpeciesId(SPECIES_MINIOR_CORE_RED)); // Minior is not in core form
} }
u32 IsAbilityStatusProtected(u32 battler) u32 IsAbilityStatusProtected(u32 battler)