diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-24 01:42:52 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-24 01:42:52 +0800 |
| commit | 1dc0b25c1e58e422883e16ce7fb4f6bea1e9a0bb (patch) | |
| tree | 867d72df6ebe9b2d1f3ff72503879640322ec224 /src/battle_main.c | |
| parent | 9a53686a4eb595c288758486af5fea9b7805283f (diff) | |
| parent | 6e36c229200e083ca005cbc448e99210d111f3b2 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 2966866c3..f8d3623a9 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3382,7 +3382,7 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) } // badge boost if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) - && FlagGet(FLAG_0x822) + && FlagGet(FLAG_BADGE03_GET) && GetBattlerSide(battler1) == B_SIDE_PLAYER) speedBattler1 = (speedBattler1 * 110) / 100; if (holdEffect == HOLD_EFFECT_MACHO_BRACE) @@ -3407,7 +3407,7 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) } // badge boost if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) - && FlagGet(FLAG_0x822) + && FlagGet(FLAG_BADGE03_GET) && GetBattlerSide(battler2) == B_SIDE_PLAYER) speedBattler2 = (speedBattler2 * 110) / 100; if (holdEffect == HOLD_EFFECT_MACHO_BRACE) |