aboutsummaryrefslogtreecommitdiffstats
path: root/engine/hp_bar.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-07-18 01:32:24 -0500
committerdannye <corrnondacqb@yahoo.com>2016-07-18 01:32:24 -0500
commit7c01509b6b69b4dc33f5d739589d50f26ffd65b0 (patch)
tree89b4000a56c9e3d942666639c83416100f360f88 /engine/hp_bar.asm
parentClean up text commands (diff)
parentUse pattern variables in the makefile. (diff)
downloadpokeyellow-7c01509b6b69b4dc33f5d739589d50f26ffd65b0.tar.gz
pokeyellow-7c01509b6b69b4dc33f5d739589d50f26ffd65b0.tar.xz
pokeyellow-7c01509b6b69b4dc33f5d739589d50f26ffd65b0.zip
Merge branch 'master' of https://github.com/pret/pokered
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