From 5a0257480a8964c1f1538367044fdd857fe2339b Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Mon, 29 Mar 2021 21:10:44 -0700
Subject: [PATCH] GBA: Fix FireRed revision misdetecting as a ROM hack

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

diff --git a/CHANGES b/CHANGES
index 9f9a5ab7f..dd731128c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 Emulation fixes:
  - Core: Fix first event scheduling after loading savestate
  - GBA Memory: Fix loading Thumb savestates when in ARM mode
+Other fixes:
+ - GBA: Fix FireRed revision misdetecting as a ROM hack
 
 0.9.0: (2021-03-28)
 Features:
diff --git a/src/gba/overrides.c b/src/gba/overrides.c
index 1f76fd03b..fe0733ab0 100644
--- a/src/gba/overrides.c
+++ b/src/gba/overrides.c
@@ -375,7 +375,8 @@ void GBAOverrideApplyDefaults(struct GBA* gba, const struct Configuration* overr
 	if (cart) {
 		memcpy(override.id, &cart->id, sizeof(override.id));
 
-		if (!strncmp("pokemon red version", &((const char*) gba->memory.rom)[0x108], 20) && gba->romCrc32 != 0xDD88761C) {
+		if (!strncmp("pokemon red version", &((const char*) gba->memory.rom)[0x108], 20) &&
+		    gba->romCrc32 != 0xDD88761C && gba->romCrc32 != 0x84EE4776) {
 			// Enable FLASH1M and RTC on Pokémon FireRed ROM hacks
 			override.savetype = SAVEDATA_FLASH1M;
 			override.hardware = HW_RTC;