diff options
| author | scnorton <scnorton@biociphers.org> | 2017-12-18 15:00:57 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-12-18 15:00:57 -0500 |
| commit | 89c0d40ee6c7fa2ad9f7f44e3a51ea50264e9280 (patch) | |
| tree | f5387471637b5e9e62fa5b6a0614a935b2921118 /src/battle/battle_3.c | |
| parent | 408f3cf295e76b61f2c1a442c80d1036bbaa9d28 (diff) | |
| parent | 3c5f725de49371aced1788a21f5e53df5b498b5f (diff) | |
Merge branch 'master' into decompile_data
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) |