diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-19 10:58:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-19 10:58:44 -0500 |
| commit | 89dc26755ad2818c10b37a34ed46f5c79dc571c8 (patch) | |
| tree | abd075a205c401b3a5406efb37378544e94c9190 /src/battle_controller_player.c | |
| parent | 83cba310335678aa8ecac24b58708b3c924b581a (diff) | |
| parent | 63f8834b6bc2d6413da606d7df88a304edc3c625 (diff) | |
Merge pull request #138 from jiangzhengwenjz/battle
battle (4th take)
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index f8d5958ba..16bf1ec87 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1003,7 +1003,6 @@ static void CompleteOnHealthbarDone(void) s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); @@ -2544,7 +2543,7 @@ static void PlayerHandleStatusIconUpdate(void) UpdateHealthboxAttribute(gHealthboxSpriteIds[gActiveBattler], &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], HEALTHBOX_STATUS_ICON); battlerId = gActiveBattler; - gBattleSpritesDataPtr->healthBoxesData[battlerId].statusAnimActive = 0; + gBattleSpritesDataPtr->healthBoxesData[battlerId].statusAnimActive = FALSE; gBattlerControllerFuncs[gActiveBattler] = CompleteOnFinishedStatusAnimation; } } |