From e251a69a29e8059733ae788bd4be5852b76cdac1 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Sat, 23 Feb 2019 02:08:30 -0800
Subject: [PATCH] GBA: Fix video timing when skipping BIOS (fixes #1318)

---
 CHANGES       | 1 +
 src/gba/gba.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 0401d71c0..58fe1e67d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,7 @@ Bugfixes:
  - GB, GBA Serialize: Fix loading two states in a row
  - GBA Video: Fix enabling layers in non-tile modes (fixes mgba.io/i/1317)
  - Qt: Fix quick load recent accidentally saving (fixes mgba.io/i/1309)
+ - GBA: Fix video timing when skipping BIOS (fixes mgba.io/i/1318)
 Misc:
  - GBA Video: Improve sprite cycle counting (fixes mgba.io/i/1274)
 
diff --git a/src/gba/gba.c b/src/gba/gba.c
index 9441105af..92e4e3183 100644
--- a/src/gba/gba.c
+++ b/src/gba/gba.c
@@ -232,7 +232,8 @@ void GBASkipBIOS(struct GBA* gba) {
 		} else {
 			cpu->gprs[ARM_PC] = BASE_WORKING_RAM;
 		}
-		gba->memory.io[REG_VCOUNT >> 1] = 0x7E;
+		gba->video.vcount = 0x7D;
+		gba->memory.io[REG_VCOUNT >> 1] = 0x7D;
 		gba->memory.io[REG_POSTFLG >> 1] = 1;
 		int currentCycles = 0;
 		ARM_WRITE_PC;