aboutsummaryrefslogtreecommitdiffstats
path: root/engine/hp_bar.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-11 21:30:31 -0700
committerYamaArashi <shadow962@live.com>2016-06-11 21:33:57 -0700
commit4c5c98cb2a1bc747a0eb397cb75e48dc8a098494 (patch)
tree2872a6436075c0d6132671e98af44f0a1429e498 /engine/hp_bar.asm
parentMerge pull request #13 from YamaArashi/master (diff)
downloadpokeyellow-4c5c98cb2a1bc747a0eb397cb75e48dc8a098494.tar.gz
pokeyellow-4c5c98cb2a1bc747a0eb397cb75e48dc8a098494.tar.xz
pokeyellow-4c5c98cb2a1bc747a0eb397cb75e48dc8a098494.zip
sync engine code with 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 b4abf028..566a7b61 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_f90e
+ 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_f90e
+.ok
call UpdateHPBar_PrintHPNumber
and a
jr z, .noPixelDifference