From 2622a1a1633c6285cf873e1558425f0c43436a0f Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Sat, 21 Nov 2020 20:31:45 -0800
Subject: [PATCH] Revert "GB: Downgrade DMG-only ROMs from CGB mode even
 without boot ROM"

This reverts commit 2c9dd238cc3520af8af8584d366e89ed00f9fea4.
---
 CHANGES     | 1 -
 src/gb/gb.c | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1127cd2c5..81f3cacbe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,6 @@
 0.8.5: (Future)
 Emulation fixes:
  - ARM: Fix Addressing mode 1 shifter on rs == pc (fixes mgba.io/i/1926)
- - GB: Downgrade DMG-only ROMs from CGB mode even without boot ROM
  - GBA Memory: Mark Famicom Mini games 22 through 28 as non-mirroring
 Other fixes:
  - CMake: Fix build with downstream minizip that exports incompatible symbols
diff --git a/src/gb/gb.c b/src/gb/gb.c
index ca8053be7..461b574a6 100644
--- a/src/gb/gb.c
+++ b/src/gb/gb.c
@@ -481,11 +481,6 @@ void GBSkipBIOS(struct GB* gb) {
 	const struct GBCartridge* cart = (const struct GBCartridge*) &gb->memory.rom[0x100];
 	int nextDiv = 0;
 
-	if (gb->model >= GB_MODEL_CGB && !(cart->cgb & 0x80)) {
-		gb->model = GB_MODEL_DMG;
-		GBVideoDisableCGB(&gb->video);
-	}
-
 	switch (gb->model) {
 	case GB_MODEL_AUTODETECT: // Silence warnings
 		gb->model = GB_MODEL_DMG;