diff options
| author | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
| commit | b65c6e815643a1cbce8c7c3cd48fc9881bb56d01 (patch) | |
| tree | 151a1d0eda1b28d497f4ee8340141bd6f94c1fef /engine/hp_bar.asm | |
| parent | rename hJoyHeldLast -> hJoyLast (diff) | |
| parent | Rename some labels (diff) | |
| download | pokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.tar.gz pokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.tar.xz pokeyellow-b65c6e815643a1cbce8c7c3cd48fc9881bb56d01.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'engine/hp_bar.asm')
| -rwxr-xr-x | engine/hp_bar.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/hp_bar.asm b/engine/hp_bar.asm index 9ff9e3cf..333b0b90 100755 --- a/engine/hp_bar.asm +++ b/engine/hp_bar.asm @@ -203,7 +203,7 @@ UpdateHPBar_CalcHPDifference: ; fad7 (3:7ad7) UpdateHPBar_PrintHPNumber: ; faf5 (3:7af5) push af push de - ld a, [wListMenuID] ; wListMenuID + ld a, [wHPBarType] and a jr z, .asm_fb2d ld a, [wHPBarOldHP] @@ -211,7 +211,7 @@ UpdateHPBar_PrintHPNumber: ; faf5 (3:7af5) ld a, [wHPBarOldHP+1] ld [wcef0], a push hl - ld a, [$fff6] + ld a, [hFlags_0xFFF6] bit 0, a jr z, .asm_fb15 ld de, $9 |