Black out screen when switching area maps

Rangi42 · Jun 2, 2017 · 2963854 · 2963854
1 parent 18fb288
commit 2963854
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/engine/pokedex.asm b/engine/pokedex.asm
@@ -413,7 +413,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2
 	call Pokedex_BlackOutBG
 	xor a
 	ld [hSCX], a
-	call DelayFrame
+	;call DelayFrame
 	ld a, $7
 	ld [hWX], a
 	ld a, $90
@@ -2301,6 +2301,11 @@ Pokedex_FillBox: ; 413fe (10:53fe)
 
 Pokedex_BlackOutBG: ; 41401 (10:5401)
 ; Make BG palettes black so that the BG becomes all black.
+	call _Pokedex_JustBlackOutBG
+	call DelayFrame
+	ret
+
+_Pokedex_JustBlackOutBG:
 	ld a, [rSVBK]
 	push af
 	ld a, $5
@@ -2315,7 +2320,6 @@ Pokedex_BlackOutBG: ; 41401 (10:5401)
 	call DmgToCgbBGPals
 	ld a, $ff
 	call DmgToCgbObjPal0
-	call DelayFrame
 	ret
 
 Pokedex_GetSGBLayout: ; 41423

diff --git a/engine/pokegear.asm b/engine/pokegear.asm
@@ -2500,12 +2500,6 @@ _Area: ; 91d11
 .set_region
 	ld [wd003], a
 	call .UpdateGFX
-
-	ld b, SCGB_POKEGEAR_PALS
-	call GetSGBLayout
-	call SetPalettes
-	xor a
-	ld [hBGMapMode], a
 	call .GetAndPlaceNest
 .loop
 	call JoyTextDelay
@@ -2581,6 +2575,7 @@ _Area: ; 91d11
 
 .UpdateGFX:
 	call ClearSprites
+	farcall _Pokedex_JustBlackOutBG
 	ld a, [wd003]
 	cp KANTO_REGION
 	jr z, .KantoGFX
@@ -2593,6 +2588,11 @@ _Area: ; 91d11
 .FinishGFX
 	hlbgcoord 0, 0
 	call TownMapBGUpdate
+	ld b, SCGB_POKEGEAR_PALS
+	call GetSGBLayout
+	call SetPalettes
+	xor a
+	ld [hBGMapMode], a
 	ret
 
 .KantoGFX: