mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-01-23 09:16:20 -08:00
rename graphics request handlers to Serve1bppRequest and Serve2bppRequest
these had some really dumb names
This commit is contained in:
parent
abce472354
commit
fc6bc8e311
@ -119,8 +119,8 @@ VBlank0: ; 2b1
|
|||||||
call UpdateBGMap
|
call UpdateBGMap
|
||||||
|
|
||||||
; these have their own timing checks
|
; these have their own timing checks
|
||||||
call SafeLoadTiles
|
call Serve2bppRequest
|
||||||
call SafeLoadTiles2
|
call Serve1bppRequest
|
||||||
call SafeTileAnimation
|
call SafeTileAnimation
|
||||||
|
|
||||||
.doneframeaction
|
.doneframeaction
|
||||||
@ -230,7 +230,7 @@ VBlank1: ; 337
|
|||||||
|
|
||||||
; these have their own timing checks
|
; these have their own timing checks
|
||||||
call UpdateBGMap
|
call UpdateBGMap
|
||||||
call LoadTiles
|
call Serve2bppRequest@VBlank
|
||||||
; update oam by dma transfer
|
; update oam by dma transfer
|
||||||
call hPushOAM
|
call hPushOAM
|
||||||
; @PushOAM:
|
; @PushOAM:
|
||||||
@ -338,7 +338,7 @@ VBlank3: ; 396
|
|||||||
jr c, .vblankoccurred
|
jr c, .vblankoccurred
|
||||||
; else
|
; else
|
||||||
call UpdateBGMap
|
call UpdateBGMap
|
||||||
call LoadTiles
|
call Serve2bppRequest@VBlank
|
||||||
|
|
||||||
; update oam by dma transfer
|
; update oam by dma transfer
|
||||||
call hPushOAM
|
call hPushOAM
|
||||||
@ -410,7 +410,7 @@ VBlank4: ; 3df
|
|||||||
ld [$ff8a], a
|
ld [$ff8a], a
|
||||||
|
|
||||||
call UpdateBGMap
|
call UpdateBGMap
|
||||||
call SafeLoadTiles
|
call Serve2bppRequest
|
||||||
|
|
||||||
; update oam by dma transfer
|
; update oam by dma transfer
|
||||||
call hPushOAM
|
call hPushOAM
|
||||||
@ -465,7 +465,7 @@ VBlank5: ; 400
|
|||||||
jr c, .vblankoccurred
|
jr c, .vblankoccurred
|
||||||
|
|
||||||
call UpdateBGMap
|
call UpdateBGMap
|
||||||
call SafeLoadTiles
|
call Serve2bppRequest
|
||||||
|
|
||||||
.vblankoccurred
|
.vblankoccurred
|
||||||
; tell other fns vblank happened
|
; tell other fns vblank happened
|
||||||
@ -521,8 +521,8 @@ VBlank6: ; 436
|
|||||||
call UpdateCGBPals
|
call UpdateCGBPals
|
||||||
jr c, .vblankoccurred
|
jr c, .vblankoccurred
|
||||||
|
|
||||||
call SafeLoadTiles
|
call Serve2bppRequest
|
||||||
call SafeLoadTiles2
|
call Serve1bppRequest
|
||||||
call DMATransfer
|
call DMATransfer
|
||||||
|
|
||||||
.vblankoccurred
|
.vblankoccurred
|
||||||
|
11
main.asm
11
main.asm
@ -422,7 +422,7 @@ endr
|
|||||||
; 170a
|
; 170a
|
||||||
|
|
||||||
|
|
||||||
SafeLoadTiles2: ; 170a
|
Serve1bppRequest: ; 170a
|
||||||
; Only call during the first fifth of VBlank
|
; Only call during the first fifth of VBlank
|
||||||
|
|
||||||
ld a, [$cf6c]
|
ld a, [$cf6c]
|
||||||
@ -436,7 +436,6 @@ SafeLoadTiles2: ; 170a
|
|||||||
cp 146
|
cp 146
|
||||||
ret nc
|
ret nc
|
||||||
|
|
||||||
GetTiles2: ; 1717
|
|
||||||
; Copy [$cf6c] 1bpp tiles from [$cf6d-e] to [$cf6f-70]
|
; Copy [$cf6c] 1bpp tiles from [$cf6d-e] to [$cf6f-70]
|
||||||
|
|
||||||
ld [hSPBuffer], sp
|
ld [hSPBuffer], sp
|
||||||
@ -504,7 +503,7 @@ endr
|
|||||||
; 1769
|
; 1769
|
||||||
|
|
||||||
|
|
||||||
SafeLoadTiles: ; 1769
|
Serve2bppRequest: ; 1769
|
||||||
; Only call during the first fifth of VBlank
|
; Only call during the first fifth of VBlank
|
||||||
|
|
||||||
ld a, [$cf67]
|
ld a, [$cf67]
|
||||||
@ -517,16 +516,16 @@ SafeLoadTiles: ; 1769
|
|||||||
ret c
|
ret c
|
||||||
cp 146
|
cp 146
|
||||||
ret nc
|
ret nc
|
||||||
jr GetTiles
|
jr _Serve2bppRequest
|
||||||
|
|
||||||
|
|
||||||
LoadTiles: ; 1778
|
Serve2bppRequest@VBlank: ; 1778
|
||||||
|
|
||||||
ld a, [$cf67]
|
ld a, [$cf67]
|
||||||
and a
|
and a
|
||||||
ret z
|
ret z
|
||||||
|
|
||||||
GetTiles: ; 177d
|
_Serve2bppRequest: ; 177d
|
||||||
; Copy [$cf67] 2bpp tiles from [$cf68-9] to [$cf6a-b]
|
; Copy [$cf67] 2bpp tiles from [$cf68-9] to [$cf6a-b]
|
||||||
|
|
||||||
ld [hSPBuffer], sp
|
ld [hSPBuffer], sp
|
||||||
|
Loading…
x
Reference in New Issue
Block a user