From b8f410c0bd789a3817c491f3127bf21f67360390 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Tue, 13 Apr 2021 18:49:59 -0700
Subject: [PATCH] GB: Fix skipping BIOS

---
 CHANGES     | 1 +
 src/gb/gb.c | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index f4e88a209..1333e91c0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 Emulation fixes:
  - Core: Fix first event scheduling after loading savestate
  - GB Serialize: Fix switching speed modes when loading a state (fixes mgba.io/i/2097)
+ - GB: Fix skipping BIOS
  - GBA Memory: Fix loading Thumb savestates when in ARM mode
  - GBA Video: Fix window start on modes 3-5 with mosaic (fixes mgba.io/i/1690)
  - GBA Video: Fix mode 3-5 overflow with mosaic (fixes mgba.io/i/1691)
diff --git a/src/gb/gb.c b/src/gb/gb.c
index c5b21b548..ad3f3bbcb 100644
--- a/src/gb/gb.c
+++ b/src/gb/gb.c
@@ -582,13 +582,13 @@ void GBSkipBIOS(struct GB* gb) {
 	mTimingDeschedule(&gb->timing, &gb->timer.event);
 	mTimingSchedule(&gb->timing, &gb->timer.event, gb->timer.nextDiv);
 
-	GBIOWrite(gb, GB_REG_LCDC, 0x91);
-	gb->memory.io[GB_REG_BANK] = 0x1;
-	GBVideoSkipBIOS(&gb->video);
-
 	if (gb->biosVf) {
 		GBUnmapBIOS(gb);
 	}
+
+	GBIOWrite(gb, GB_REG_LCDC, 0x91);
+	gb->memory.io[GB_REG_BANK] = 0x1;
+	GBVideoSkipBIOS(&gb->video);
 }
 
 void GBMapBIOS(struct GB* gb) {