diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-01 16:54:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-01 16:54:45 -0500 |
| commit | f27f79488a460f0a89670f3611e1e9e175baf5d6 (patch) | |
| tree | 92134b1da650d7894a2fde59e0048f75d36c7dbf /engine/battle | |
| parent | 8c3905c4cdb4f24810473da51d52cc3e16062173 (diff) | |
| parent | e5fa3f9a11fb6936709cd0c36e945bd6e018cb37 (diff) | |
Merge pull request #455 from xCrystal/master
Use more palette(s) constants, rename BG/OBP wram addresses, and rBGPI+rOBPI auto-increment constants (from Rangi)
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/anim_hp_bar.asm | 12 | ||||
| -rw-r--r-- | engine/battle/battle_transition.asm | 18 |
2 files changed, 15 insertions, 15 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/battle/battle_transition.asm b/engine/battle/battle_transition.asm index f2fef5553..85ba44072 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -26,7 +26,7 @@ Predef_StartBattle: ; 8c20f ld a, $5 ld [rSVBK], a - ld hl, UnknBGPals + ld hl, wBGPals1 ld bc, 8 palettes xor a call ByteFill @@ -651,11 +651,11 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc) ld [rSVBK], a call .copypals push hl - ld de, UnknBGPals palette PAL_BG_TEXT + ld de, wBGPals1 palette PAL_BG_TEXT ld bc, 1 palettes call CopyBytes pop hl - ld de, BGPals palette PAL_BG_TEXT + ld de, wBGPals2 palette PAL_BG_TEXT ld bc, 1 palettes call CopyBytes pop af @@ -670,17 +670,17 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc) ret .copypals ; 8c677 (23:4677) - ld de, UnknBGPals palette PAL_BG_TEXT + ld de, wBGPals1 palette PAL_BG_TEXT call .copy - ld de, BGPals palette PAL_BG_TEXT + ld de, wBGPals2 palette PAL_BG_TEXT call .copy - ld de, UnknOBPals palette PAL_OW_TREE + ld de, wOBPals1 palette PAL_OW_TREE call .copy - ld de, OBPals palette PAL_OW_TREE + ld de, wOBPals2 palette PAL_OW_TREE call .copy - ld de, UnknOBPals palette PAL_OW_ROCK + ld de, wOBPals1 palette PAL_OW_ROCK call .copy - ld de, OBPals palette PAL_OW_ROCK + ld de, wOBPals2 palette PAL_OW_ROCK .copy ; 8c698 (23:4698) push hl |