More home.asm fixes.

Change CopyVideoData/Double to CopyVideoData/DoubleAlternate and
CopyVideoData/DoubleLCDEnabled to CopyVideoData.
Also an address fix.

3 files changed, 11 insertions, 11 deletions

diff --git a/home.asm b/home.asm
index 98160097..79dec0c6 100644
--- a/home.asm
+++ b/home.asm
@@ -971,7 +971,7 @@ InterlaceMergeSpriteBuffers:: ; 14c7 (0:14c7)
 	ld c, (2*SPRITEBUFFERSIZE)/16 ; $31, number of 16 byte chunks to be copied
 	ld a, [H_LOADEDROMBANK]
 	ld b, a
-	call CopyVideoDataLCDEnabled
+	call CopyVideoData
 	jp PrepareRTCDataAndDisableSRAM
 
 Func_1510:: ; 1510 (0:1510)
@@ -3443,7 +3443,7 @@ LoadFontTilePatterns:: ; 3683 (0:3683)
 	ld de, FontGraphics
 	ld hl, vFont
 	ld bc, BANK(FontGraphics) << 8 | $80
-	jp CopyVideoDataDoubleLCDEnabled ; if LCD is on, transfer during V-blank
+	jp CopyVideoDataDouble ; if LCD is on, transfer during V-blank
 
 LoadTextBoxTilePatterns:: ; 36a3 (0:36a3)
 	ld a, [rLCDC]
@@ -3459,7 +3459,7 @@ LoadTextBoxTilePatterns:: ; 36a3 (0:36a3)
 	ld de, TextBoxGraphics
 	ld hl, vChars2 + $600
 	ld bc, BANK(TextBoxGraphics) << 8 | $20
-	jp CopyVideoDataLCDEnabled ; if LCD is on, transfer during V-blank
+	jp CopyVideoData ; if LCD is on, transfer during V-blank
 
 LoadHpBarAndStatusTilePatterns:: ; 36c3 (0:36c3)
 	ld a, [rLCDC]
@@ -3475,7 +3475,7 @@ LoadHpBarAndStatusTilePatterns:: ; 36c3 (0:36c3)
 	ld de, HpBarAndStatusGraphics
 	ld hl, vChars2 + $620
 	ld bc, BANK(HpBarAndStatusGraphics) << 8 | $1e
-	jp CopyVideoDataLCDEnabled ; if LCD is on, transfer during V-blank
+	jp CopyVideoData ; if LCD is on, transfer during V-blank
 
 UncompressSpriteFromDE:: ; 36e3 (0:36e3)
 ; Decompress pic at a:de.
@@ -4934,7 +4934,7 @@ SwitchSRAMBankAndLatchClockData:: ; 3e99 (0:3e99)
 	ld [$4000],a
 	ret
 	
-PrepareRTCDataAndDisableSRAM:: ; 3eac (0:3eac)
+PrepareRTCDataAndDisableSRAM:: ; 3ea9 (0:3ea9)
 	push af
 	ld a,$0
 	ld [$6000],a
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.