diff options
Diffstat (limited to 'home/fade.asm')
| -rw-r--r-- | home/fade.asm | 61 |
1 files changed, 32 insertions, 29 deletions
diff --git a/home/fade.asm b/home/fade.asm index 2559a0eb7..579a4125a 100644 --- a/home/fade.asm +++ b/home/fade.asm @@ -8,10 +8,10 @@ Function48c:: ; 48c ld a, l sub b ld l, a - jr nc, .asm_499 + jr nc, .okay dec h -.asm_499 +.okay ld a, [hli] ld [rBGP], a ld a, [hli] @@ -22,34 +22,34 @@ Function48c:: ; 48c ; 4a3 -Function4a3:: ; 4a3 +RotateFourPalettesRight:: ; 4a3 ld a, [hCGB] and a - jr z, .asm_4af + jr z, .dmg ld hl, IncGradGBPalTable_00 ld b, 4 - jr FadeOut + jr RotatePalettesRight -.asm_4af +.dmg ld hl, IncGradGBPalTable_08 ld b, 4 - jr FadeOut + jr RotatePalettesRight ; 4b6 -FadeToWhite:: ; 4b6 +RotateThreePalettesRight:: ; 4b6 ld a, [hCGB] and a - jr z, .asm_4c2 + jr z, .dmg ld hl, IncGradGBPalTable_05 ld b, 3 - jr FadeOut + jr RotatePalettesRight -.asm_4c2 +.dmg ld hl, IncGradGBPalTable_13 ld b, 3 -; 4c7 - -FadeOut:: ; 4c7 +RotatePalettesRight:: ; 4c7 +; Rotate palettes to the right and fill with loaded colors from the left +; If we're already at the leftmost color, fill with the leftmost color push de ld a, [hli] call DmgToCgbBGPals @@ -62,39 +62,38 @@ FadeOut:: ; 4c7 call DelayFrames pop de dec b - jr nz, FadeOut + jr nz, RotatePalettesRight ret ; 4dd -Function4dd:: ; 4dd +RotateFourPalettesLeft:: ; 4dd ld a, [hCGB] and a - jr z, .asm_4e9 + jr z, .dmg ld hl, IncGradGBPalTable_04 - 1 ld b, 4 - jr FadeIn + jr RotatePalettesLeft -.asm_4e9 +.dmg ld hl, IncGradGBPalTable_12 - 1 ld b, 4 - jr FadeIn + jr RotatePalettesLeft ; 4f0 -Function4f0:: ; 4f0 +RotateThreePalettesLeft:: ; 4f0 ld a, [hCGB] and a - jr z, .asm_4fc + jr z, .dmg ld hl, IncGradGBPalTable_07 - 1 ld b, 3 - jr FadeIn + jr RotatePalettesLeft -.asm_4fc +.dmg ld hl, IncGradGBPalTable_15 - 1 ld b, 3 - ; fallthrough -; 501 - -FadeIn:: ; 501 +RotatePalettesLeft:: ; 501 +; Rotate palettes to the left and fill with loaded colors from the right +; If we're already at the rightmost color, fill with the rightmost color push de ld a, [hld] ld d, a @@ -107,7 +106,7 @@ FadeIn:: ; 501 call DelayFrames pop de dec b - jr nz, FadeIn + jr nz, RotatePalettesLeft ret ; 517 @@ -117,17 +116,21 @@ IncGradGBPalTable_00:: db %11111111, %11111111, %11111111 IncGradGBPalTable_01:: db %11111110, %11111110, %11111110 IncGradGBPalTable_02:: db %11111001, %11111001, %11111001 IncGradGBPalTable_03:: db %11100100, %11100100, %11100100 + IncGradGBPalTable_04:: db %11100100, %11100100, %11100100 IncGradGBPalTable_05:: db %10010000, %10010000, %10010000 IncGradGBPalTable_06:: db %01000000, %01000000, %01000000 + IncGradGBPalTable_07:: db %00000000, %00000000, %00000000 ; bgp obp1 obp2 IncGradGBPalTable_08:: db %11111111, %11111111, %11111111 IncGradGBPalTable_09:: db %11111110, %11111110, %11111000 IncGradGBPalTable_10:: db %11111001, %11100100, %11100100 IncGradGBPalTable_11:: db %11100100, %11010000, %11100000 + IncGradGBPalTable_12:: db %11100100, %11010000, %11100000 IncGradGBPalTable_13:: db %10010000, %10000000, %10010000 IncGradGBPalTable_14:: db %01000000, %01000000, %01000000 + IncGradGBPalTable_15:: db %00000000, %00000000, %00000000 ; 547 |