diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/copy.asm | 32 | ||||
| -rw-r--r-- | engine/vblank.asm | 34 |
2 files changed, 33 insertions, 33 deletions
diff --git a/engine/copy.asm b/engine/copy.asm index c5ba92c65..ad25c96e6 100644 --- a/engine/copy.asm +++ b/engine/copy.asm @@ -248,13 +248,13 @@ Request2bpp: ; eba .asm_edc ld a, e - ld [$cf68], a + ld [Requested2bppSource], a ld a, d - ld [$cf69], a + ld [Requested2bppSource + 1], a ld a, l - ld [$cf6a], a + ld [Requested2bppDest], a ld a, h - ld [$cf6b], a + ld [Requested2bppDest + 1], a .asm_eec ld a, c @@ -262,10 +262,10 @@ Request2bpp: ; eba cp [hl] jr nc, .asm_f08 - ld [$cf67], a + ld [Requested2bpp], a .wait call DelayFrame - ld a, [$cf67] + ld a, [Requested2bpp] and a jr nz, .wait @@ -281,10 +281,10 @@ Request2bpp: ; eba .asm_f08 ld a, [$ffd3] - ld [$cf67], a + ld [Requested2bpp], a .asm_f0d call DelayFrame - ld a, [$cf67] + ld a, [Requested2bpp] and a jr nz, .asm_f0d ld a, c @@ -322,23 +322,23 @@ Request1bpp: ; f1e .asm_f40 ld a, e - ld [$cf6d], a + ld [Requested1bppSource], a ld a, d - ld [$cf6e], a + ld [Requested1bppSource + 1], a ld a, l - ld [$cf6f], a + ld [Requested1bppDest], a ld a, h - ld [$cf70], a + ld [Requested1bppDest + 1], a .asm_f50 ld a, c ld hl, $ffd3 cp [hl] jr nc, .asm_f6c - ld [$cf6c], a + ld [Requested1bpp], a .wait call DelayFrame - ld a, [$cf6c] + ld a, [Requested1bpp] and a jr nz, .wait @@ -354,10 +354,10 @@ Request1bpp: ; f1e .asm_f6c ld a, [$ffd3] - ld [$cf6c], a + ld [Requested1bpp], a .asm_f71 call DelayFrame - ld a, [$cf6c] + ld a, [Requested1bpp] and a jr nz, .asm_f71 ld a, c diff --git a/engine/vblank.asm b/engine/vblank.asm index 44b3195f8..71114964e 100644 --- a/engine/vblank.asm +++ b/engine/vblank.asm @@ -119,9 +119,9 @@ VBlank0: ; 2b1 call UpdateBGMap ; these have their own timing checks - call SafeLoadTiles - call SafeLoadTiles2 - call SafeTileAnimation + call Serve2bppRequest + call Serve1bppRequest + call AnimateTileset .doneframeaction ; oam update off? @@ -131,8 +131,8 @@ VBlank0: ; 2b1 ; update oam by dma transfer call hPushOAM -; 403f: -; ld a, $c4 +; @PushOAM: +; ld a, Sprites >> 8 ; ld [rDMA], a ; ld a, $28 ; .loop @@ -230,11 +230,11 @@ VBlank1: ; 337 ; these have their own timing checks call UpdateBGMap - call LoadTiles + call Serve2bppRequest@VBlank ; update oam by dma transfer call hPushOAM -; 403f: -; ld a, $c4 +; @PushOAM: +; ld a, Sprites >> 8 ; ld [rDMA], a ; ld a, $28 ; .loop @@ -338,12 +338,12 @@ VBlank3: ; 396 jr c, .vblankoccurred ; else call UpdateBGMap - call LoadTiles + call Serve2bppRequest@VBlank ; update oam by dma transfer call hPushOAM -; 403f: -; ld a, $c4 ; Sprites / $100 +; @PushOAM: +; ld a, Sprites >> 8 ; ld [rDMA], a ; ld a, $28 ; .loop @@ -410,12 +410,12 @@ VBlank4: ; 3df ld [$ff8a], a call UpdateBGMap - call SafeLoadTiles + call Serve2bppRequest ; update oam by dma transfer call hPushOAM -; 403f: -; ld a, $c4 +; @PushOAM: +; ld a, Sprites >> 8 ; ld [rDMA], a ; ld a, $28 ; .loop @@ -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 |