diff options
| author | Deokishisu <edsaletto@gmail.com> | 2018-10-14 14:19:23 -0400 |
|---|---|---|
| committer | Deokishisu <edsaletto@gmail.com> | 2018-10-14 14:19:23 -0400 |
| commit | c89b14f5ef16609779f9bd85cf4e4efa090caad7 (patch) | |
| tree | 850ae8e4df1d421e39f54ab8d0a0da9d9ffb7e18 /src/battle_tv.c | |
| parent | e129f4864fa342fdca46399f216ee0c0c46c26b4 (diff) | |
| parent | 43316ffae83d49be09969e291779cc9e448b83a1 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly
Diffstat (limited to 'src/battle_tv.c')
| -rw-r--r-- | src/battle_tv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_tv.c b/src/battle_tv.c index 6f9ee414e..535046fd1 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -659,7 +659,7 @@ void BattleTv_SetDataBasedOnMove(u16 move, u16 weatherFlags, struct DisableStruc tvPtr->side[atkSide].usedMoveSlot = moveSlot; AddMovePoints(0, moveSlot, gBattleMoves[move].effect, 0); AddPointsBasedOnWeather(weatherFlags, move, moveSlot); - if (disableStructPtr->chargeTimer1 != 0) + if (disableStructPtr->chargeTimer != 0) AddMovePoints(7, move, moveSlot, 0); if (move == MOVE_WISH) |