ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-12 08:42:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1418 from BuffelSaft/rage_powder_fix_1

Browse Source 
Fix powder immunity for self-targeting moves
This commit is contained in:
ExpoSeed 2021-04-07 16:06:57 -05:00 committed by GitHub
commit 45405e95b0
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_util.c
View File

@ -3175,7 +3175,7 @@ u8 AtkCanceller_UnableToUseMove(void)
gBattleStruct->atkCancellerTracker++; gBattleStruct->atkCancellerTracker++;
break; break;
case CANCELLER_POWDER_MOVE: case CANCELLER_POWDER_MOVE:
if (gBattleMoves[gCurrentMove].flags & FLAG_POWDER) if ((gBattleMoves[gCurrentMove].flags & FLAG_POWDER) && (gBattlerAttacker != gBattlerTarget))
{ {
if ((B_POWDER_GRASS >= GEN_6 && IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_GRASS)) if ((B_POWDER_GRASS >= GEN_6 && IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_GRASS))
|| GetBattlerAbility(gBattlerTarget) == ABILITY_OVERCOAT) || GetBattlerAbility(gBattlerTarget) == ABILITY_OVERCOAT)