diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-27 23:40:52 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-28 14:57:16 +0800 |
| commit | 2bd15329e07a23d3515dc1c9c9e5d8f75d3be429 (patch) | |
| tree | 328cff8ee72211ef3566d2fcdb88d1fbc7c95387 /src/battle_util.c | |
| parent | b2343076db0cefc087f3941b6941dcba7b1e3364 (diff) | |
minor fixes
and remove unnecessary NONMATCHING
Diffstat (limited to 'src/battle_util.c')
| -rw-r--r-- | src/battle_util.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/battle_util.c b/src/battle_util.c index 5e86425a9..b8360758c 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -240,6 +240,7 @@ void sub_8017434(u8 battler) if (GetBattlerSide(battler) == B_SIDE_OPPONENT) { u8 flank = ((battler & BIT_FLANK) >> 1); + gSentPokesToOpponent[flank] = 0; for (i = 0; i < gBattlersCount; i += 2) if (!(gAbsentBattlerFlags & gBitTable[i])) @@ -283,7 +284,7 @@ u8 TrySetCantSelectMoveBattleScript(void) u8 holdEffect; u8 limitations = 0; u16 move = gBattleMons[gActiveBattler].moves[gBattleBufferB[gActiveBattler][2]]; - u16* choicedMove = &gBattleStruct->choicedMove[gActiveBattler]; + u16 *choicedMove = &gBattleStruct->choicedMove[gActiveBattler]; if (gDisableStructs[gActiveBattler].disabledMove == move && move != MOVE_NONE) { @@ -444,7 +445,7 @@ u8 DoFieldEndTurnEffects(void) SwapTurnOrder(i, j); } { - u8* var = &gBattleStruct->turnCountersTracker; + u8 *var = &gBattleStruct->turnCountersTracker; ++*var; gBattleStruct->turnSideTracker = 0; |