diff options
| author | yenatch <yenatch@gmail.com> | 2018-04-18 21:56:21 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2018-04-18 21:56:21 -0400 |
| commit | e266629c4af115bdd0b664a6fee160ecc4ff8416 (patch) | |
| tree | 3444fc8c23acc0e24fdb20b9626b442bcf815251 /src | |
| parent | ff339287bfd16b39fad498c7866f2b5a29e38063 (diff) | |
use >= for hp percentages
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle/battle_4.c | 6 | ||||
| -rw-r--r-- | src/battle/battle_interface.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c index 4a7c3e867..bd72e70f3 100644 --- a/src/battle/battle_4.c +++ b/src/battle/battle_4.c @@ -10981,11 +10981,11 @@ static void atk73_hpthresholds(void) if (result == 0) result = 1; - if (result > 69 || !gBattleMons[opposing_bank].hp) + if (result >= 70 || !gBattleMons[opposing_bank].hp) gBattleStruct->hpScale = 0; - else if (result > 39) + else if (result >= 40) gBattleStruct->hpScale = 1; - else if (result > 9) + else if (result >= 10) gBattleStruct->hpScale = 2; else gBattleStruct->hpScale = 3; diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c index b7c0dce4e..ec882bcce 100644 --- a/src/battle/battle_interface.c +++ b/src/battle/battle_interface.c @@ -3410,9 +3410,9 @@ u8 GetHPBarLevel(s16 hp, s16 maxhp) else { u8 fraction = GetScaledHPFraction(hp, maxhp, 48); - if (fraction > 24) + if (fraction >= 25) result = 3; - else if (fraction > 9) + else if (fraction >= 10) result = 2; else if (fraction > 0) result = 1; |