diff options
| author | yenatch <yenatch@gmail.com> | 2014-09-23 15:02:03 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-09-23 15:02:03 -0700 |
| commit | a81487e9c6ee271f0ffeaacd681b929c0b4afaf0 (patch) | |
| tree | 411e4d684f723edb152ca1631a215c12f980c44c /engine/battle | |
| parent | 6866df277f7f7685ae087c9e54d537873a941575 (diff) | |
Rename hVBlank* constants to h*.
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/1c.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/animations.asm | 12 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/engine/battle/1c.asm b/engine/battle/1c.asm index 1c69c00f..bceeac2b 100755 --- a/engine/battle/1c.asm +++ b/engine/battle/1c.asm @@ -87,7 +87,7 @@ BattleTransition: ; 7096d (1c:496d) ld [H_AUTOBGTRANSFERENABLED], a call Delay3 xor a - ld [hVBlankWY], a + ld [hWY], a dec a ld [wUpdateSpritesEnabled], a call DelayFrame diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 58d4e60a..349d1d5d 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -1962,7 +1962,7 @@ AnimationWavyScreen: ; 79666 (1e:5666) xor a ld [H_AUTOBGTRANSFERENABLED], a ld a, $90 - ld [hVBlankWY], a + ld [hWY], a ld d, $80 ld e, $8f ld c, $ff @@ -1984,7 +1984,7 @@ AnimationWavyScreen: ; 79666 (1e:5666) dec c jr nz, .asm_7967f xor a - ld [hVBlankWY], a + ld [hWY], a call SaveScreenTilesToBuffer2 call ClearScreen ld a, $1 @@ -2744,11 +2744,11 @@ AnimationShakeEnemyHUD: ; 79d77 (1e:5d77) ld hl, vBGMap0 call Func_79e0d ld a, $90 - ld [hVBlankWY], a + ld [hWY], a ld hl, vBGMap0 + $320 call Func_79e0d ld a, $38 - ld [hVBlankWY], a + ld [hWY], a call Func_792fd ld hl, vBGMap0 call Func_79e0d @@ -2759,11 +2759,11 @@ AnimationShakeEnemyHUD: ; 79d77 (1e:5d77) call AnimationShowMonPic call ClearSprites ld a, $90 - ld [hVBlankWY], a + ld [hWY], a ld hl, vBGMap1 call Func_79e0d xor a - ld [hVBlankWY], a + ld [hWY], a call SaveScreenTilesToBuffer1 ld hl, vBGMap0 call Func_79e0d diff --git a/engine/battle/core.asm b/engine/battle/core.asm index c2616ff7..263fafa1 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -133,11 +133,11 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) jr nz, .copyRowLoop call EnableLCD ld a, $90 - ld [hVBlankWY], a + ld [hWY], a ld [rWY], a xor a ld [hTilesetType], a - ld [hVBlankSCY], a + ld [hSCY], a dec a ld [wUpdateSpritesEnabled], a call Delay3 @@ -146,7 +146,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) ld b, $70 ld c, $90 ld a, c - ld [hVBlankSCX], a + ld [hSCX], a call DelayFrame ld a, %11100100 ; inverted palette for silhouette effect ld [rBGP], a @@ -163,7 +163,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) call SetScrollXForSlidingPlayerBodyLeft ; end background scrolling on line $60 call SlidePlayerHeadLeft ld a, c - ld [hVBlankSCX], a + ld [hSCX], a dec c dec c jr nz, .slideSilhouettesLoop @@ -174,7 +174,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) hlCoord 1, 5 predef Func_3f0c6 xor a - ld [hVBlankWY], a + ld [hWY], a ld [rWY], a inc a ld [H_AUTOBGTRANSFERENABLED], a @@ -6283,7 +6283,7 @@ DoBattleTransitionAndInitBattleVariables: ; 3ec32 (f:6c32) call ClearScreen xor a ld [H_AUTOBGTRANSFERENABLED], a - ld [hVBlankWY], a + ld [hWY], a ld [rWY], a ld [hTilesetType], a ld hl, wd060 |