Clear BGMap before clear level screen to avoid glitch due to SCX=4 [bugfix to f6320585bf] (#35)

engine/games/slot_machine.asm

@@ -107,10 +107,7 @@ _SlotMachine:
 	call PlayMusic
 	call DelayFrame
 	call DisableLCD
-	hlbgcoord 0, 0
-	ld bc, vBGMap1 - vBGMap0
-	ld a, " "
-	call ByteFill
+	call ClearBGMap0or2
 	ld b, CGB_SLOT_MACHINE
 	call GetCGBLayout
 	callfar ClearSpriteAnims

engine/menus/cleared_level_screen.asm

@@ -4,13 +4,16 @@ ClearedLevelScreen:
 	ldh [hSCY], a
 	ld a, -$4
 	ldh [hSCX], a
+	call DisableLCD
 	call ClearTilemap
+	call ClearBGMap0or2
 	call LoadFrame
 	call LoadStandardFont
 	call ClearMenuAndWindowData
 	ld b, CGB_DIPLOMA
 	call GetCGBLayout
 	call SetPalettes
+	call EnableLCD
 	ld hl, .LevelCleared1Text
 	bccoord 3, 1
 	call PrintHLTextAtBC
@@ -54,4 +57,4 @@ AddLevelCoinsToBalance:
 	ld [bc], a
 	pop bc
 	farcall GiveCoins
-	ret
+	ret

engine/menus/game_menu.asm

@@ -14,11 +14,12 @@ GameMenu:
 GameMenu_KeepMusic:
 	xor a
 	ldh [hMapAnims], a
-	ldh [hSCX], a
-	ldh [hSCY], a
 	call ClearTilemap
 	call LoadFrame
 	call LoadStandardFont
+	xor a
+	ldh [hSCX], a
+	ldh [hSCY], a
 	call ClearMenuAndWindowData
 	ld b, CGB_DIPLOMA
 	call GetCGBLayout

engine/movie/init_hof_credits.asm

@@ -5,10 +5,7 @@ InitDisplayForHallOfFame:
 	call DisableLCD
 	call LoadStandardFont
 	call LoadFontsBattleExtra
-	hlbgcoord 0, 0
-	ld bc, vBGMap1 - vBGMap0
-	ld a, " "
-	call ByteFill
+	call ClearBGMap0or2
 	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	xor a
@@ -34,10 +31,7 @@ InitDisplayForRedCredits:
 	call DisableLCD
 	call LoadStandardFont
 	call LoadFontsBattleExtra
-	hlbgcoord 0, 0
-	ld bc, vBGMap1 - vBGMap0
-	ld a, " "
-	call ByteFill
+	call ClearBGMap0or2
 	hlcoord 0, 0, wAttrmap
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	xor a

engine/overworld/warp_connection.asm

@@ -239,17 +239,13 @@ LoadMapTimeOfDay:
 	ldh [rVBK], a
 
 	xor a
-	ld bc, vBGMap1 - vBGMap0
-	hlbgcoord 0, 0
-	call ByteFill
+	call FillBGMap0or2
 
 	pop af
 	ldh [rVBK], a
 
 	ld a, "■"
-	ld bc, vBGMap1 - vBGMap0
-	hlbgcoord 0, 0
-	call ByteFill
+	call FillBGMap0or2
 	ret
 
 .PushAttrmap:

home/tilemap.asm

@@ -1,3 +1,10 @@
+ClearBGMap0or2::
+	ld a, " "
+FillBGMap0or2::
+	hlbgcoord 0, 0
+	ld bc, vBGMap1 - vBGMap0
+	jp ByteFill
+
 ClearBGPalettes::
 	call ClearPalettes
 WaitBGMap::