diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-21 15:52:57 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-21 15:52:57 -0400 |
| commit | bf79edbd8b5b398921d4094abfe44d16c4a182a1 (patch) | |
| tree | 5ad51360de30eda07c4e1df0bed5e74076bceadb /src/battle/battle_interface.c | |
| parent | 1a63f6607e187a58973cff05eb150fd66f77b9b9 (diff) | |
| parent | 18f6c5c9d460c019453227abe033d84f1feb6310 (diff) | |
Merge branch 'master' into watanabe
Diffstat (limited to 'src/battle/battle_interface.c')
| -rw-r--r-- | src/battle/battle_interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |