diff options
Diffstat (limited to 'engine/credits.asm')
| -rw-r--r-- | engine/credits.asm | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/engine/credits.asm b/engine/credits.asm index ac5064a41..1aaecf64a 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -13,7 +13,7 @@ Credits:: ; 109847 ld a, [rSVBK] push af - ld a, BANK(wPals) + ld a, BANK(wGBCPalettes) ld [rSVBK], a call ClearBGPalettes @@ -63,7 +63,7 @@ Credits:: ; 109847 xor a ld [wCreditsLYOverride], a - ld hl, LYOverrides + ld hl, wLYOverrides ld bc, $100 xor a call ByteFill @@ -81,9 +81,9 @@ Credits:: ; 109847 ld [hInMenu], a xor a ld [hBGMapMode], a - ld [CreditsPos], a - ld [CreditsUnusedCD21], a - ld [CreditsTimer], a + ld [wCreditsPos], a + ld [wCreditsUnusedCD21], a + ld [wCreditsTimer], a .execution_loop call Credits_HandleBButton @@ -122,7 +122,7 @@ Credits_HandleBButton: ; 109908 ld a, [wJumptableIndex] bit 6, a ret z - ld hl, CreditsPos + ld hl, wCreditsPos ld a, [hli] cp $d jr nc, .okay @@ -130,7 +130,7 @@ Credits_HandleBButton: ; 109908 and a ret z .okay - ld hl, CreditsTimer + ld hl, wCreditsTimer ld a, [hl] and a ret z @@ -187,20 +187,20 @@ Credits_PrepBGMapUpdate: ; 10995e (42:595e) Credits_UpdateGFXRequestPath: ; 109964 (42:5964) call Credits_LoadBorderGFX ld a, l - ld [Requested2bppSource], a + ld [wRequested2bppSource], a ld a, h - ld [Requested2bppSource + 1], a + ld [wRequested2bppSource + 1], a ld a, LOW(vTiles2) - ld [Requested2bppDest], a + ld [wRequested2bppDest], a ld a, HIGH(vTiles2) - ld [Requested2bppDest + 1], a + ld [wRequested2bppDest + 1], a jr Credits_RequestGFX Credits_RequestGFX: ; 10997b (42:597b) xor a ld [hBGMapMode], a ld a, $8 - ld [Requested2bpp], a + ld [wRequested2bpp], a jp Credits_Next Credits_LYOverride: ; 109986 (42:5986) @@ -211,9 +211,9 @@ Credits_LYOverride: ; 109986 (42:5986) dec a dec a ld [wCreditsLYOverride], a - ld hl, LYOverrides + $1f + ld hl, wLYOverrides + $1f call .Fill - ld hl, LYOverrides + $87 + ld hl, wLYOverrides + $87 call .Fill jp Credits_Next @@ -233,7 +233,7 @@ ParseCredits: ; 1099aa jp nz, .done ; Wait until the timer has run out to parse the next command. - ld hl, CreditsTimer + ld hl, wCreditsTimer ld a, [hl] and a jr z, .parse @@ -349,13 +349,13 @@ ParseCredits: ; 1099aa .wait2 ; Wait for some amount of ticks. call .get - ld [CreditsTimer], a + ld [wCreditsTimer], a jr .done .wait ; Wait for some amount of ticks, and do something else. call .get - ld [CreditsTimer], a + ld [wCreditsTimer], a xor a ld [hBGMapThird], a @@ -370,29 +370,29 @@ ParseCredits: ; 1099aa ld hl, wJumptableIndex set 7, [hl] ld a, 32 - ld [MusicFade], a + ld [wMusicFade], a ld a, LOW(MUSIC_POST_CREDITS) - ld [MusicFadeID], a + ld [wMusicFadeID], a ld a, HIGH(MUSIC_POST_CREDITS) - ld [MusicFadeID + 1], a + ld [wMusicFadeID + 1], a ret .get -; Get byte CreditsPos from CreditsScript +; Get byte wCreditsPos from CreditsScript push hl push de - ld a, [CreditsPos] + ld a, [wCreditsPos] ld e, a - ld a, [CreditsPos+1] + ld a, [wCreditsPos+1] ld d, a ld hl, CreditsScript add hl, de inc de ld a, e - ld [CreditsPos], a + ld [wCreditsPos], a ld a, d - ld [CreditsPos+1], a + ld [wCreditsPos+1], a ld a, [hl] pop de pop hl @@ -424,22 +424,22 @@ ConstructCreditsTilemap: ; 109a95 (42:5a95) ld a, $20 call DrawCreditsBorder - hlcoord 0, 0, AttrMap + hlcoord 0, 0, wAttrMap ld bc, 4 * SCREEN_WIDTH xor a call ByteFill - hlcoord 0, 4, AttrMap + hlcoord 0, 4, wAttrMap ld bc, SCREEN_WIDTH ld a, $1 call ByteFill - hlcoord 0, 5, AttrMap + hlcoord 0, 5, wAttrMap ld bc, 12 * SCREEN_WIDTH ld a, $2 call ByteFill - hlcoord 0, 17, AttrMap + hlcoord 0, 17, wAttrMap ld bc, SCREEN_WIDTH ld a, $1 call ByteFill |