pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

rename some LCD functions

Browse Source
This commit is contained in:
yenatch 2013-08-27 20:46:15 -04:00
parent 12ab33b37e
commit 25dcc71c4c
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
main.asm
View File

@ -38,7 +38,7 @@ SECTION "vblank",ROM0[$40] ; vblank interrupt
jp VBlank jp VBlank
SECTION "lcd",ROM0[$48] ; lcd interrupt SECTION "lcd",ROM0[$48] ; lcd interrupt
jp Function552 jp LCD
SECTION "timer",ROM0[$50] ; timer interrupt SECTION "timer",ROM0[$50] ; timer interrupt
jp Function3e93 jp Function3e93
@ -138,13 +138,13 @@ Function4a3: ; 4a3
and a and a
jr z, .asm_4af jr z, .asm_4af
ld hl, IncGradGBPalTable_00 ld hl, IncGradGBPalTable_00
ld b, $4 ld b, 4
jr Function4c7 jr FadeOut
.asm_4af .asm_4af
ld hl, IncGradGBPalTable_08 ld hl, IncGradGBPalTable_08
ld b, $4 ld b, 4
jr Function4c7 jr FadeOut
; 4b6 ; 4b6
Function4b6: ; 4b6 Function4b6: ; 4b6
@ -152,16 +152,15 @@ Function4b6: ; 4b6
and a and a
jr z, .asm_4c2 jr z, .asm_4c2
ld hl, IncGradGBPalTable_05 ld hl, IncGradGBPalTable_05
ld b, $3 ld b, 3
jr Function4c7 jr FadeOut
.asm_4c2 .asm_4c2
ld hl, IncGradGBPalTable_13 ld hl, IncGradGBPalTable_13
ld b, $3 ld b, 3
; 4c7 ; 4c7
Function4c7: ; 4c7 FadeOut: ; 4c7
.asm_4c7
push de push de
ld a, [hli] ld a, [hli]
call DmgToCgbBGPals call DmgToCgbBGPals
@ -174,7 +173,7 @@ Function4c7: ; 4c7
call DelayFrames call DelayFrames
pop de pop de
dec b dec b
jr nz, .asm_4c7 jr nz, FadeOut
ret ret
; 4dd ; 4dd
@ -183,13 +182,13 @@ Function4dd: ; 4dd
and a and a
jr z, .asm_4e9 jr z, .asm_4e9
ld hl, IncGradGBPalTable_04 - 1 ld hl, IncGradGBPalTable_04 - 1
ld b, $4 ld b, 4
jr Function501 jr FadeIn
.asm_4e9 .asm_4e9
ld hl, IncGradGBPalTable_12 - 1 ld hl, IncGradGBPalTable_12 - 1
ld b, $4 ld b, 4
jr Function501 jr FadeIn
; 4f0 ; 4f0
Function4f0: ; 4f0 Function4f0: ; 4f0
@ -197,16 +196,16 @@ Function4f0: ; 4f0
and a and a
jr z, .asm_4fc jr z, .asm_4fc
ld hl, IncGradGBPalTable_07 - 1 ld hl, IncGradGBPalTable_07 - 1
ld b, $3 ld b, 3
jr Function501 jr FadeIn
.asm_4fc .asm_4fc
ld hl, IncGradGBPalTable_15 - 1 ld hl, IncGradGBPalTable_15 - 1
ld b, $3 ld b, 3
; fallthrough ; fallthrough
; 501 ; 501
Function501: ; 501 FadeIn: ; 501
push de push de
ld a, [hld] ld a, [hld]
ld d, a ld d, a
@ -219,7 +218,7 @@ Function501: ; 501
call DelayFrames call DelayFrames
pop de pop de
dec b dec b
jr nz, Function501 jr nz, FadeIn
ret ret
; 517 ; 517
@ -247,7 +246,7 @@ IncGradGBPalTable_15: db %00000000, %00000000, %00000000
Function547: ; 547 Function547: ; 547
ld a, [hLCDStatCustom] ld a, [hLCDStatCustom]
cp $43 cp rSCX & $ff
ret nz ret nz
ld c, a ld c, a
ld a, [$d100] ld a, [$d100]
@ -255,15 +254,17 @@ Function547: ; 547
ret ret
; 552 ; 552
Function552: ; 552 LCD: ; 552
push af push af
ld a, [hLCDStatCustom] ld a, [hLCDStatCustom]
and a and a
jr z, .asm_566 jr z, .done
; At this point it's assumed we're in WRAM bank 5!
push bc push bc
ld a, [rLY] ld a, [rLY]
ld c, a ld c, a
ld b, $d1 ld b, $d100 >> 8
ld a, [bc] ld a, [bc]
ld b, a ld b, a
ld a, [hLCDStatCustom] ld a, [hLCDStatCustom]
@ -272,7 +273,7 @@ Function552: ; 552
ld [$ff00+c], a ld [$ff00+c], a
pop bc pop bc
.asm_566 .done
pop af pop af
reti reti
; 568 ; 568