From fe01038cd1c04e5d64934d3dec3e93e251fadee6 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Tue, 16 Jun 2020 00:23:37 -0400
Subject: BlackOutBGMap -> FillBGMap0WithBlack (after pokecrystal's
 HDMATransfer_FillBGMap0WithBlack)

---
 home/vblank.asm |  2 +-
 home/video.asm  | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/home/vblank.asm b/home/vblank.asm
index c1c4bbfe..d150abf4 100644
--- a/home/vblank.asm
+++ b/home/vblank.asm
@@ -98,7 +98,7 @@ VBlank0::
 	call Serve2bppRequest
 	call Serve1bppRequest
 	call AnimateTileset
-	call BlackOutBGMap
+	call FillBGMap0WithBlack
 
 .done
 
diff --git a/home/video.asm b/home/video.asm
index ebb085f7..71c69b91 100644
--- a/home/video.asm
+++ b/home/video.asm
@@ -392,20 +392,23 @@ AnimateTileset::
 	set 1, [hl]
 	ret
 
-BlackOutBGMap::
+FillBGMap0WithBlack::
 	nop
-	ldh a, [hBlackOutBGMapThird]
-	and a
+	ldh a, [hFillBGMap0WithBlackThird]
+	and a ; 0
 	ret z
 
-	dec a
+	dec a ; 1
 	jr z, .one
-	dec a
+	dec a ; 2
 	jr z, .two
+	; 3
+
+BG_THIRD_HEIGHT EQU (BG_MAP_HEIGHT - SCREEN_HEIGHT) / 2
 
 ; Black out the 18 BG Map rows right of the screen area
 	ld a, 2
-	ldh [hBlackOutBGMapThird], a
+	ldh [hFillBGMap0WithBlackThird], a
 	ld hl, hBGMapAddress
 	ld a, [hli]
 	ld h, [hl]
@@ -432,16 +435,16 @@ endr
 .one
 ; Black out the bottom 7 BG Map rows below the screen area
 	xor a
-	ld de, BG_MAP_WIDTH * (SCREEN_HEIGHT + 7)
+	ld de, BG_MAP_WIDTH * (SCREEN_HEIGHT + BG_THIRD_HEIGHT)
 
 .go
-	ldh [hBlackOutBGMapThird], a
+	ldh [hFillBGMap0WithBlackThird], a
 	ld hl, hBGMapAddress
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
 	add hl, de
-	ld b, 7 * 2
+	ld b, BG_THIRD_HEIGHT * 2
 	ld a, "■"
 .loop2
 rept BG_MAP_WIDTH / 2
-- 
cgit v1.2.3