diff options
| -rw-r--r-- | engine/vblank.asm | 16 | ||||
| -rw-r--r-- | main.asm | 11 |
2 files changed, 13 insertions, 14 deletions
diff --git a/engine/vblank.asm b/engine/vblank.asm index 36f1f7cbe..c07d45f6d 100644 --- a/engine/vblank.asm +++ b/engine/vblank.asm @@ -119,8 +119,8 @@ VBlank0: ; 2b1 call UpdateBGMap ; these have their own timing checks - call SafeLoadTiles - call SafeLoadTiles2 + call Serve2bppRequest + call Serve1bppRequest call SafeTileAnimation .doneframeaction @@ -230,7 +230,7 @@ VBlank1: ; 337 ; these have their own timing checks call UpdateBGMap - call LoadTiles + call Serve2bppRequest@VBlank ; update oam by dma transfer call hPushOAM ; @PushOAM: @@ -338,7 +338,7 @@ VBlank3: ; 396 jr c, .vblankoccurred ; else call UpdateBGMap - call LoadTiles + call Serve2bppRequest@VBlank ; update oam by dma transfer call hPushOAM @@ -410,7 +410,7 @@ VBlank4: ; 3df ld [$ff8a], a call UpdateBGMap - call SafeLoadTiles + call Serve2bppRequest ; update oam by dma transfer call hPushOAM @@ -465,7 +465,7 @@ VBlank5: ; 400 jr c, .vblankoccurred call UpdateBGMap - call SafeLoadTiles + call Serve2bppRequest .vblankoccurred ; tell other fns vblank happened @@ -521,8 +521,8 @@ VBlank6: ; 436 call UpdateCGBPals jr c, .vblankoccurred - call SafeLoadTiles - call SafeLoadTiles2 + call Serve2bppRequest + call Serve1bppRequest call DMATransfer .vblankoccurred @@ -422,7 +422,7 @@ endr ; 170a -SafeLoadTiles2: ; 170a +Serve1bppRequest: ; 170a ; Only call during the first fifth of VBlank ld a, [$cf6c] @@ -436,7 +436,6 @@ SafeLoadTiles2: ; 170a cp 146 ret nc -GetTiles2: ; 1717 ; Copy [$cf6c] 1bpp tiles from [$cf6d-e] to [$cf6f-70] ld [hSPBuffer], sp @@ -504,7 +503,7 @@ endr ; 1769 -SafeLoadTiles: ; 1769 +Serve2bppRequest: ; 1769 ; Only call during the first fifth of VBlank ld a, [$cf67] @@ -517,16 +516,16 @@ SafeLoadTiles: ; 1769 ret c cp 146 ret nc - jr GetTiles + jr _Serve2bppRequest -LoadTiles: ; 1778 +Serve2bppRequest@VBlank: ; 1778 ld a, [$cf67] and a ret z -GetTiles: ; 177d +_Serve2bppRequest: ; 177d ; Copy [$cf67] 2bpp tiles from [$cf68-9] to [$cf6a-b] ld [hSPBuffer], sp |