summaryrefslogtreecommitdiff
path: root/engine/hp_bar.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-11 21:30:05 -0700
committerYamaArashi <shadow962@live.com>2016-06-12 00:52:13 -0700
commitfd2235e678c58cebd6255b5e658e704ee5138591 (patch)
tree6b7a3e2ae3030f4078ac4cbf9b59cd9529055fa2 /engine/hp_bar.asm
parenta51037eeeedb03e29d8675626018cf02750882fa (diff)
sync engine code with pokeyellow
Diffstat (limited to 'engine/hp_bar.asm')
-rwxr-xr-xengine/hp_bar.asm5
1 files changed, 3 insertions, 2 deletions
diff --git a/engine/hp_bar.asm b/engine/hp_bar.asm
index 3fa01208..221bd7a9 100755
--- a/engine/hp_bar.asm
+++ b/engine/hp_bar.asm
@@ -87,6 +87,7 @@ UpdateHPBar2:
call UpdateHPBar_CompareNewHPToOldHP
jr z, .animateHPBarDone
jr nc, .HPIncrease
+; HP decrease
dec bc ; subtract 1 HP
ld a, c
ld [wHPBarNewHP], a
@@ -95,7 +96,7 @@ UpdateHPBar2:
call UpdateHPBar_CalcOldNewHPBarPixels
ld a, e
sub d ; calc pixel difference
- jr .asm_fa7e
+ jr .ok
.HPIncrease
inc bc ; add 1 HP
ld a, c
@@ -105,7 +106,7 @@ UpdateHPBar2:
call UpdateHPBar_CalcOldNewHPBarPixels
ld a, d
sub e ; calc pixel difference
-.asm_fa7e
+.ok
call UpdateHPBar_PrintHPNumber
and a
jr z, .noPixelDifference