diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-19 20:01:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-19 20:01:57 -0700 |
| commit | a55b14d47def2735f7ec274ccf64b6e2d8805320 (patch) | |
| tree | b70298ac8785cbe3b5ec6a39da4453f20da34a69 /src/battle/battle_interface.c | |
| parent | f6ed2ff9c31d7912e2dc259ddc10e17f0ecbbd1f (diff) | |
| parent | 39710a12cbb854f2cc50ea2955c9f94b6b5e6024 (diff) | |
Merge pull request #597 from yenatch/type-mystery
physical/special type macros and move gBattleMoves to c
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; |