From 992bdfe53740858eae7e40f1380b05fe4cd75d9d Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Fri, 10 Jul 2015 15:50:13 -0400 Subject: More home.asm fixes. Change CopyVideoData/Double to CopyVideoData/DoubleAlternate and CopyVideoData/DoubleLCDEnabled to CopyVideoData. Also an address fix. --- home/copy.asm | 8 ++++---- home/copy2.asm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'home') diff --git a/home/copy.asm b/home/copy.asm index 074c1556..e14d859c 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -33,10 +33,10 @@ CopyData:: ; 00b1 (0:00b1) jr nz, .copybytes ret -CopyVideoData:: ; 00c8 (0:00c8) +CopyVideoDataAlternate:: ; 00c8 (0:00c8) ld a, [rLCDC] bit 7,a ; LCD enabled? - jp nz, CopyVideoDataLCDEnabled ; if yes, then copy video data + jp nz, CopyVideoData ; if yes, then copy video data push hl ld h,d ld l,e @@ -53,10 +53,10 @@ CopyVideoData:: ; 00c8 (0:00c8) pop af jp FarCopyData -CopyVideoDataDouble:: ; 00e3 (0:00e3) +CopyVideoDataDoubleAlternate:: ; 00e3 (0:00e3) ld a, [rLCDC] bit 7,a ; LCD enabled? - jp nz, CopyVideoDataDoubleLCDEnabled ; if yes, then copy video data + jp nz, CopyVideoDataDouble ; if yes, then copy video data push de ld d,h ld e,l diff --git a/home/copy2.asm b/home/copy2.asm index a9673439..6001557c 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -34,7 +34,7 @@ FarCopyDataDouble:: ; 15d4 (0:15d4) call BankswitchCommon ret -CopyVideoDataLCDEnabled:: ; 15fe (0:15fe) +CopyVideoData:: ; 15fe (0:15fe) ; 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. @@ -83,7 +83,7 @@ CopyVideoDataLCDEnabled:: ; 15fe (0:15fe) ld c, a jr .loop -CopyVideoDataDoubleLCDEnabled:: ; 1636 (0:1636) +CopyVideoDataDouble:: ; 1636 (0:1636) ; 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. -- cgit v1.3.1-sl0p