diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2018-01-01 20:25:07 +0100 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2018-01-01 20:25:07 +0100 |
| commit | a98ed77c836b348088772dc4ec138ff53a6598d5 (patch) | |
| tree | 7a22accc9378818a7b5b3ee7f11043ce9374dc91 /engine | |
| parent | 37369d1ae0890c63b494937ed6234e68f46359c5 (diff) | |
| parent | 355acfcaeb215e794e446e056fdca59647ea1327 (diff) | |
Merge 2d0ed11 and 355acfc from Roukaour/master
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/battle/anim_hp_bar.asm | 12 | ||||
| -rw-r--r-- | engine/color.asm | 4 | ||||
| -rwxr-xr-x | engine/debug.asm | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/engine/battle/anim_hp_bar.asm b/engine/battle/anim_hp_bar.asm index 78062b547..71276d27e 100755 --- a/engine/battle/anim_hp_bar.asm +++ b/engine/battle/anim_hp_bar.asm @@ -45,7 +45,7 @@ _AnimateHPBar: ; d627 and a jr nz, .player ld a, [wCurHPAnimMaxHP] - cp 6 * 8 + cp HP_BAR_LENGTH_PX jr nc, .player and a ret @@ -203,7 +203,7 @@ LongAnim_UpdateVariables: ; d6f5 ShortHPBarAnim_UpdateTiles: ; d730 call HPBarAnim_UpdateHPRemaining - ld d, $6 + ld d, HP_BAR_LENGTH ld a, [wWhichHPBar] and $1 ld b, a @@ -229,7 +229,7 @@ LongHPBarAnim_UpdateTiles: ; d749 ld d, a call ComputeHPBarPixels ld c, e - ld d, $6 + ld d, HP_BAR_LENGTH ld a, [wWhichHPBar] and $1 ld b, a @@ -377,7 +377,7 @@ ShortHPBar_CalcPixelFrame: ; d839 ld b, 0 ld hl, 0 ld a, [wCurHPBarPixels] - cp 6 * 8 + cp HP_BAR_LENGTH_PX jr nc, .return_max and a jr z, .return_zero @@ -388,7 +388,7 @@ ShortHPBar_CalcPixelFrame: ; d839 ; by 48, the loop runs one extra time. To fix, uncomment the line below. .loop ld a, l - sub 6 * 8 + sub HP_BAR_LENGTH_PX ld l, a ld a, h sbc $0 @@ -404,7 +404,7 @@ ShortHPBar_CalcPixelFrame: ; d839 add hl, bc pop bc ld a, l - sub 6 * 8 + sub HP_BAR_LENGTH_PX ld l, a ld a, h sbc $0 diff --git a/engine/color.asm b/engine/color.asm index 3ffd5d0f4..04b24fde9 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -908,7 +908,7 @@ InitCGBPals:: call ByteFill ld a, $0 ld [rVBK], a - ld a, $80 + ld a, 1 << rBGPI_AUTO_INCREMENT ld [rBGPI], a ld c, 4 * 8 .bgpals_loop @@ -918,7 +918,7 @@ InitCGBPals:: ld [rBGPD], a dec c jr nz, .bgpals_loop - ld a, $80 + ld a, 1 << rOBPI_AUTO_INCREMENT ld [rOBPI], a ld c, 4 * 8 .obpals_loop diff --git a/engine/debug.asm b/engine/debug.asm index 509205d1e..1e0d042e0 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -161,19 +161,19 @@ Function819a7: ; 819a7 ld de, wBGPals2 ld bc, 16 palettes call CopyBytes - ld a, $80 + ld a, 1 << rBGPI_AUTO_INCREMENT ld [rBGPI], a ld hl, Palette_819f4 - ld c, $40 + ld c, 8 palettes xor a .asm_819c8 ld [rBGPD], a dec c jr nz, .asm_819c8 - ld a, $80 + ld a, 1 << rOBPI_AUTO_INCREMENT ld [rOBPI], a ld hl, Palette_81a34 - ld c, $40 + ld c, 8 palettes .asm_819d6 ld a, [hli] ld [rOBPD], a |