dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into battle

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-24 01:42:52 +08:00
parent 9a53686a4e 6e36c22920
commit 1dc0b25c1e
1127 changed files with 79056 additions and 34785 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_main.c
+2 -2
View File
@@ -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)