diff options
| author | Pokeglitch <pokeglitchx@gmail.com> | 2018-06-04 14:31:05 -0400 |
|---|---|---|
| committer | Pokeglitch <pokeglitchx@gmail.com> | 2018-06-04 14:31:05 -0400 |
| commit | 728de42c0c8cca5873e0c4a18de500a56e7d6586 (patch) | |
| tree | 912e81cf3ac78d725fc06426c85a9daf90334af0 /home/copy2.asm | |
| parent | 1f01b4d3300dbb3a5b507910feda967e62c41ac7 (diff) | |
| parent | 17fb962a85448abcb714331c005a2c83b9db0c52 (diff) | |
Fixed conclifts
Diffstat (limited to 'home/copy2.asm')
| -rw-r--r-- | home/copy2.asm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/home/copy2.asm b/home/copy2.asm index 0a0ee54..5d3afe2 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -49,7 +49,7 @@ FarCopyDataDouble: ; d3e (0:d3e) call Bankswitch ret -CopyVideoData:: ; d68 (0:d68) +Request2bpp:: ; d68 (0:d68) ; Wait for the next VBlank, then copy c 2bpp ; tiles from b:de to hl, 8 tiles at a time. ; This takes c/8 frames. @@ -89,7 +89,7 @@ CopyVideoData:: ; d68 (0:d68) ld c, a jr .loop -CopyVideoDataDouble:: ; da6 (0:da6) +Request1bpp:: ; da6 (0:da6) ; Wait for the next VBlank, then copy c 1bpp ; tiles from b:de to hl, 8 tiles at a time. ; This takes c/8 frames. @@ -129,13 +129,14 @@ CopyVideoDataDouble:: ; da6 (0:da6) ld c, a jr .loop -CopyVideoDataOptimized:: ; de4 (0:de4) +Get2bpp:: ; de4 (0:de4) ; Copy c 2bpp tiles from b:de to hl in VRAM ; using VBlank service or direct copy in ; case LCD is off ldh a, [rLCDC] bit rLCDC_ENABLE, a - jp nz, CopyVideoData ; copy video data during vblank while screen is on + jp nz, Request2bpp ; copy video data during vblank while screen is on +Copy2bpp:: ; 0deb push hl ; convert to FarCopyData call ld h, d ld l, e @@ -152,13 +153,14 @@ CopyVideoDataOptimized:: ; de4 (0:de4) pop af jp FarCopyData -CopyVideoDataDoubleOptimized: ; dff (0:dff) +Get1bpp: ; dff (0:dff) ; Copy c 1bpp tiles from b:de to hl in VRAM ; using VBlank service or direct copy in ; case LCD is off ldh a, [rLCDC] bit rLCDC_ENABLE, a - jp nz, CopyVideoDataDouble + jp nz, Request1bpp +Copy1bpp:: ; 0e06 push de ld d, h ld e, l |