diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-17 20:07:53 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-17 20:07:53 -0800 |
| commit | 88716f4c0e053a984eeb4bef92fefa42027dd22a (patch) | |
| tree | 326805fbcc882cd74cc43431e34b680b4971184c /src/battle/battle_3.c | |
| parent | b14cdde8bd4afda2b0b73bb72b3cffc6961a5790 (diff) | |
Use FLAG_ prefix for all flags
Diffstat (limited to 'src/battle/battle_3.c')
| -rw-r--r-- | src/battle/battle_3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c index 342395c34..f627e50f0 100644 --- a/src/battle/battle_3.c +++ b/src/battle/battle_3.c @@ -3137,15 +3137,15 @@ u8 IsPokeDisobedient(void) if (gBattleTypeFlags & BATTLE_TYPE_LINK || GetBankSide(gBankAttacker) == 1 || !IsOtherTrainer(gBattleMons[gBankAttacker].otId, gBattleMons[gBankAttacker].otName) - || FlagGet(BADGE08_GET)) + || FlagGet(FLAG_BADGE08_GET)) return 0; obedienceLevel = 10; - if (FlagGet(BADGE02_GET)) + if (FlagGet(FLAG_BADGE02_GET)) obedienceLevel = 30; - if (FlagGet(BADGE04_GET)) + if (FlagGet(FLAG_BADGE04_GET)) obedienceLevel = 50; - if (FlagGet(BADGE06_GET)) + if (FlagGet(FLAG_BADGE06_GET)) obedienceLevel = 70; if (gBattleMons[gBankAttacker].level <= obedienceLevel) |