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

Update battle_main.c

Browse Source
This commit is contained in:
SonikkuA-DatH 2021-12-03 18:07:35 -08:00 committed by GitHub
parent a32ac0d290
commit 76136c4858
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_main.c
View File

@ -4412,6 +4412,10 @@ s8 GetMovePriority(u32 battlerId, u16 move)
break; break;
} }
} }
if (gProtectStructs[battlerId].quash == 1)
{
priority = -8;
}
return priority; return priority;
} }
@ -4636,6 +4640,7 @@ static void TurnValuesCleanUp(bool8 var0)
gProtectStructs[gActiveBattler].spikyShielded = FALSE; gProtectStructs[gActiveBattler].spikyShielded = FALSE;
gProtectStructs[gActiveBattler].kingsShielded = FALSE; gProtectStructs[gActiveBattler].kingsShielded = FALSE;
gProtectStructs[gActiveBattler].banefulBunkered = FALSE; gProtectStructs[gActiveBattler].banefulBunkered = FALSE;
gProtectStructs[gBattlerTarget].quash = FALSE;
} }
else else
{ {