diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
| commit | a1951cefc09035e11077a433b28ec8c66b3b03db (patch) | |
| tree | 4de98db5a6edb6d74192028d50893da2b764421f /engine/crystal_intro.asm | |
| parent | 79bd48f85c7dd1868264e290b12dad17a6e25b95 (diff) | |
Prefix wram labels with w, part 2.
Diffstat (limited to 'engine/crystal_intro.asm')
| -rwxr-xr-x | engine/crystal_intro.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index ea6828f14..d482c3cfa 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -796,7 +796,7 @@ IntroScene9: ; e4c04 (39:4c04) xor a ld [hLCDCPointer], a call ClearSprites - hlcoord 0, 0, AttrMap + hlcoord 0, 0, wAttrMap ; first 12 rows have palette 1 ld bc, 12 * SCREEN_WIDTH ld a, $1 @@ -1919,15 +1919,15 @@ Intro_RustleGrass: ; e546d (39:546d) ld hl, .RustlingGrassPointers add hl, de ld a, [hli] - ld [Requested2bppSource], a + ld [wRequested2bppSource], a ld a, [hli] - ld [Requested2bppSource + 1], a + ld [wRequested2bppSource + 1], a ld a, LOW(vTiles2 tile $09) - ld [Requested2bppDest], a + ld [wRequested2bppDest], a ld a, HIGH(vTiles2 tile $09) - ld [Requested2bppDest + 1], a + ld [wRequested2bppDest + 1], a ld a, 4 - ld [Requested2bppSize], a + ld [wRequested2bppSize], a ret ; e5496 (39:5496) @@ -2022,11 +2022,11 @@ Intro_DecompressRequest2bpp_64Tiles: ; e54fa (39:54fa) Intro_ResetLYOverrides: ; e5516 (39:5516) ld a, [rSVBK] push af - ld a, BANK(LYOverrides) + ld a, BANK(wLYOverrides) ld [rSVBK], a - ld hl, LYOverrides - ld bc, LYOverridesEnd - LYOverrides + ld hl, wLYOverrides + ld bc, wLYOverridesEnd - wLYOverrides xor a call ByteFill @@ -2039,7 +2039,7 @@ Intro_ResetLYOverrides: ; e5516 (39:5516) Intro_PerspectiveScrollBG: ; e552f (39:552f) ld a, [rSVBK] push af - ld a, BANK(LYOverrides) + ld a, BANK(wLYOverrides) ld [rSVBK], a ; Scroll the grass every frame. ; Scroll the trees every other frame and at half speed. @@ -2048,20 +2048,20 @@ Intro_PerspectiveScrollBG: ; e552f (39:552f) and $1 jr z, .skip ; trees in the back - ld hl, LYOverrides + ld hl, wLYOverrides ld a, [hl] inc a ld bc, $5f call ByteFill .skip ; grass in the front - ld hl, LYOverrides + $5f + ld hl, wLYOverrides + $5f ld a, [hl] inc a inc a ld bc, $31 call ByteFill - ld a, [LYOverrides + 0] + ld a, [wLYOverrides + 0] ld [hSCX], a pop af ld [rSVBK], a |