diff options
| author | garak <garakmon@gmail.com> | 2018-10-19 16:05:14 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-10-19 16:05:14 -0400 |
| commit | 38fcc46abb36df72512f4b532d1379dab1c13af6 (patch) | |
| tree | df44258d7b5a65d2a75a146c7c01b6c683b023f9 /src/battle_tv.c | |
| parent | 901f3ff55715ec6bdeda5c711e7e73b4c38ab55a (diff) | |
| parent | 95d8815721321f08714b97c59a97de3a59f1e0c7 (diff) | |
Merge remote-tracking branch 'upstream/master' into pan-constants
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) |