diff options
| author | surskitty <surskitty@gmail.com> | 2018-02-03 22:18:56 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2018-02-03 22:18:56 -0500 |
| commit | e668b6cf3a7760303edd181baa69901a94a7d653 (patch) | |
| tree | b9de2e272aceb5ca4d24830a64ee4fd87e9fb40e /engine/battle/sliding_intro.asm | |
| parent | 2edf131b056c6d2b1ec9eb48b97fba31b0f953c7 (diff) | |
| parent | b35eb72290b964b98844afbe741bb7ede34b9ef3 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/battle/sliding_intro.asm')
| -rwxr-xr-x | engine/battle/sliding_intro.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/sliding_intro.asm b/engine/battle/sliding_intro.asm index 418454283..667f18191 100755 --- a/engine/battle/sliding_intro.asm +++ b/engine/battle/sliding_intro.asm @@ -1,7 +1,7 @@ BattleIntroSlidingPics: ; 4e980 ld a, [rSVBK] push af - ld a, BANK(LYOverrides) + ld a, BANK(wLYOverrides) ld [rSVBK], a call .subfunction1 ld a, rSCX - $ff00 @@ -60,7 +60,7 @@ BattleIntroSlidingPics: ; 4e980 ; 4e9d6 .subfunction3 ; 4e9d6 - ld hl, Sprite01XCoord + ld hl, wVirtualOAMSprite00XCoord ld c, $12 ; 18 ld de, SPRITEOAMSTRUCT_LENGTH .loop3 @@ -73,7 +73,7 @@ BattleIntroSlidingPics: ; 4e980 ; 4e9e5 .subfunction4 ; 4e9e5 - ld hl, LYOverrides + ld hl, wLYOverrides ld a, $90 ld bc, SCREEN_HEIGHT_PX call ByteFill @@ -81,7 +81,7 @@ BattleIntroSlidingPics: ; 4e980 ; 4e9f1 .subfunction5 ; 4e9f1 - ld hl, LYOverrides + ld hl, wLYOverrides ld a, d ld c, $3e ; 62 .loop4 |