This commit is contained in:
PikalaxALT
2015-11-20 11:47:52 -05:00
parent b023056259
commit 812976cee6
81 changed files with 1765 additions and 1740 deletions

View File

@@ -312,13 +312,13 @@ VolumeOff:: ; 3ca3
ret
; 3ca8
Unused_FadeOutMusic:: ; 3ca8
Unused_RotatePalettesRightMusic:: ; 3ca8
ld a, 4
ld [MusicFade], a
ret
; 3cae
FadeInMusic:: ; 3cae
RotatePalettesLeftMusic:: ; 3cae
ld a, 4 | 1 << 7
ld [MusicFade], a
ret

View File

@@ -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

View File

@@ -2007,7 +2007,7 @@ FadeToMenu:: ; 2b29
xor a
ld [hBGMapMode], a
call LoadStandardMenuDataHeader
callba FadeOutPalettes
callba RotatePalettesRightPalettes
call ClearSprites
call DisableSpriteUpdates
ret
@@ -2036,7 +2036,7 @@ Function2b5c:: ; 2b5c
call GetSGBLayout
callba Function49409
call Function3200
callba FadeInPalettes
callba RotatePalettesLeftPalettes
call EnableSpriteUpdates
ret
; 2b74

View File

@@ -101,7 +101,7 @@ FixDays:: ; 5e8
; update dl
ld [hRTCDayLo], a ; DL
; flag for s0_ac60
; flag for sRTCStatusFlags
ld a, %01000000
jr .set
@@ -120,7 +120,7 @@ FixDays:: ; 5e8
; update dl
ld [hRTCDayLo], a ; DL
; flag for s0_ac60
; flag for sRTCStatusFlags
ld a, %00100000
.set
@@ -277,23 +277,23 @@ SetClock:: ; 691
; 6c4
Function6c4:: ; 6c4
; clear s0_ac60
ClearRTCStatus:: ; 6c4
; clear sRTCStatusFlags
xor a
push af
ld a, BANK(s0_ac60)
ld a, BANK(sRTCStatusFlags)
call GetSRAMBank
pop af
ld [s0_ac60], a
ld [sRTCStatusFlags], a
call CloseSRAM
ret
; 6d3
Function6d3:: ; 6d3
; append flags to s0_ac60
ld hl, s0_ac60
RecordRTCStatus:: ; 6d3
; append flags to sRTCStatusFlags
ld hl, sRTCStatusFlags
push af
ld a, BANK(s0_ac60)
ld a, BANK(sRTCStatusFlags)
call GetSRAMBank
pop af
or [hl]
@@ -302,11 +302,11 @@ Function6d3:: ; 6d3
ret
; 6e3
Function6e3:: ; 6e3
; check s0_ac60
ld a, BANK(s0_ac60)
CheckRTCStatus:: ; 6e3
; check sRTCStatusFlags
ld a, BANK(sRTCStatusFlags)
call GetSRAMBank
ld a, [s0_ac60]
ld a, [sRTCStatusFlags]
call CloseSRAM
ret
; 6ef