From 565391c2133ed795ffb8a595db70b33b13f195b9 Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Tue, 17 Nov 2020 06:46:41 +0800
Subject: [PATCH] Directly apply NES 2.0 overrides when available

---
 src/ines.c | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/ines.c b/src/ines.c
index 892aea6..e946c91 100644
--- a/src/ines.c
+++ b/src/ines.c
@@ -323,28 +323,21 @@ static void CheckHInfo(void) {
 					iNESCart.region = moo[x].region;
 				}
 			}
-			switch (moo[x].mapper) {
-				/* TODO: Eventually, all items from overrides should be considered as ines 2.0 compatible */
-				case   1:
-				case   5:
-				case 176:
-				case 293:
-					if (moo[x].prgram >= 0) {
-						tofix |= 32;
-						iNESCart.iNES2 = 1;
-						iNESCart.PRGRamSize = (moo[x].prgram & 0x0F) ? (64 << ((moo[x].prgram >> 0) & 0xF)) : 0;
-						iNESCart.PRGRamSaveSize = (moo[x].prgram & 0xF0) ? (64 << ((moo[x].prgram >> 4) & 0xF)) : 0;
-					}
-					if (moo[x].chrram >= 0) {
-						tofix |= 32;
-						iNESCart.iNES2 = 1;
-						iNESCart.CHRRamSize = (moo[x].chrram & 0x0F) ? (64 << ((moo[x].chrram >> 0) & 0xF)) : 0;
-						iNESCart.CHRRamSaveSize = (moo[x].chrram & 0xF0) ? (64 << ((moo[x].chrram >> 4) & 0xF)) : 0;
-					}
-					break;
-				default:
-					break;
+
+			if (moo[x].prgram >= 0) {
+				tofix |= 32;
+				iNESCart.iNES2 = 1;
+				iNESCart.PRGRamSize = (moo[x].prgram & 0x0F) ? (64 << ((moo[x].prgram >> 0) & 0xF)) : 0;
+				iNESCart.PRGRamSaveSize = (moo[x].prgram & 0xF0) ? (64 << ((moo[x].prgram >> 4) & 0xF)) : 0;
 			}
+
+			if (moo[x].chrram >= 0) {
+				tofix |= 32;
+				iNESCart.iNES2 = 1;
+				iNESCart.CHRRamSize = (moo[x].chrram & 0x0F) ? (64 << ((moo[x].chrram >> 0) & 0xF)) : 0;
+				iNESCart.CHRRamSaveSize = (moo[x].chrram & 0xF0) ? (64 << ((moo[x].chrram >> 4) & 0xF)) : 0;
+			}
+
 			break;
 		}
 		x++;