diff options
| author | yenatch <yenatch@gmail.com> | 2018-04-18 23:17:30 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2018-04-18 23:17:30 -0400 |
| commit | 39710a12cbb854f2cc50ea2955c9f94b6b5e6024 (patch) | |
| tree | b70298ac8785cbe3b5ec6a39da4453f20da34a69 /src/battle/battle_4.c | |
| parent | 7596624c10b191e06794d530ee98ea39b568a5cf (diff) | |
remove duplicate battlemove flag constants
Diffstat (limited to 'src/battle/battle_4.c')
| -rw-r--r-- | src/battle/battle_4.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 5ea6e80b3..9dc9d62ec 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -307,7 +307,7 @@ extern u8 BattleScript_SelectingImprisionedMoveInPalace[]; #define BS2ScriptRead16(ptr) ((ptr)[0] + ((ptr)[1] << 8)) #define BS2ScriptReadPtr(ptr) ((void *)BS2ScriptRead32(ptr)) -#define TARGET_PROTECT_AFFECTED ((gProtectStructs[gBankTarget].protected && gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED)) +#define TARGET_PROTECT_AFFECTED ((gProtectStructs[gBankTarget].protected && gBattleMoves[gCurrentMove].flags & F_AFFECTED_BY_PROTECT)) //array entries for battle communication #define MOVE_EFFECT_BYTE 0x3 @@ -1142,7 +1142,7 @@ static void atk00_attackcanceler(void) gHitMarker |= HITMARKER_OBEYS; - if (gProtectStructs[gBankTarget].bounceMove && gBattleMoves[gCurrentMove].flags & FLAG_MAGICCOAT_AFFECTED) + if (gProtectStructs[gBankTarget].bounceMove && gBattleMoves[gCurrentMove].flags & F_AFFECTED_BY_MAGIC_COAT) { PressurePPLose(gBankAttacker, gBankTarget, MOVE_MAGIC_COAT); gProtectStructs[gBankTarget].bounceMove = 0; @@ -1153,7 +1153,7 @@ static void atk00_attackcanceler(void) for (i = 0; i < gBattlersCount; i++) { - if ((gProtectStructs[gBanksByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED) + if ((gProtectStructs[gBanksByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & F_AFFECTED_BY_SNATCH) { PressurePPLose(gBankAttacker, gBanksByTurnOrder[i], MOVE_SNATCH); gProtectStructs[gBanksByTurnOrder[i]].stealMove = 0; |