diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-08-25 22:23:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-25 22:23:45 -0400 |
| commit | 3eacab563d0e1ab5557c2443556a7a5e58d14cad (patch) | |
| tree | 3d747166409fdc94f0fd1aa760693a7ee5bd2156 /engine/battle/sliding_intro.asm | |
| parent | 89681d231611938a791f4256e602c88c2f9aa3e1 (diff) | |
| parent | b2adcd6d6ff91efc764a6ecc65147be7b9cda9e8 (diff) | |
Merge pull request #555 from Rangi42/ldh
Use real labels for HRAM instead of constants, and the ldh instruction
Diffstat (limited to 'engine/battle/sliding_intro.asm')
| -rw-r--r-- | engine/battle/sliding_intro.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/battle/sliding_intro.asm b/engine/battle/sliding_intro.asm index 6b866c6d8..bda859cb4 100644 --- a/engine/battle/sliding_intro.asm +++ b/engine/battle/sliding_intro.asm @@ -1,22 +1,22 @@ BattleIntroSlidingPics: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, BANK(wLYOverrides) - ld [rSVBK], a + ldh [rSVBK], a call .subfunction1 - ld a, rSCX - $ff00 - ld [hLCDCPointer], a + ld a, LOW(rSCX) + ldh [hLCDCPointer], a call .subfunction2 xor a - ld [hLCDCPointer], a + ldh [hLCDCPointer], a pop af - ld [rSVBK], a + ldh [rSVBK], a ret .subfunction1 call .subfunction4 ld a, $90 - ld [hSCX], a + ldh [hSCX], a ld a, %11100100 call DmgToCgbBGPals lb de, %11100100, %11100100 @@ -31,11 +31,11 @@ BattleIntroSlidingPics: .loop1 push af .loop2 - ld a, [rLY] + ldh a, [rLY] cp $60 jr c, .loop2 ld a, d - ld [hSCX], a + ldh [hSCX], a call .subfunction5 inc e inc e |