From 85a15786ff7278f52c74fd0faf4dfacea7aee8ed Mon Sep 17 00:00:00 2001
From: negativeExponent <negativeExponent@users.noreply.github.com>
Date: Fri, 7 Feb 2020 12:01:03 +0800
Subject: [PATCH] Unif: Pass iNES mapper number to cart struct  when available

---
 src/unif.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/unif.c b/src/unif.c
index 5163b4e..030d8d5 100644
--- a/src/unif.c
+++ b/src/unif.c
@@ -687,6 +687,7 @@ static int InitializeBoard(void) {
 				mirrortodo = 4;
 			MooMirroring();
 
+			UNIFCart.submapper = bmap[x].ines_mapper;
 			UNIFCart.submapper = submapper;
 			GameInfo->cspecial = cspecial;
 
@@ -770,16 +771,11 @@ int UNIFLoad(const char *name, FCEUFILE *fp) {
 		}
 	}
 
-	FCEU_printf(" PRG ROM:  %d KiB\n", UNIF_PRGROMSize / 1024);
-	if (VROM_size)
-		FCEU_printf(" CHR ROM:  %d KiB\n", UNIF_CHRROMSize / 1024);
-
 	md5_starts(&md5);
 	md5_update(&md5, ROM, UNIF_PRGROMSize);
 	if (VROM_size)
 		md5_update(&md5, VROM, UNIF_CHRROMSize);
 	md5_finish(&md5, UNIFCart.MD5);
-	FCEU_printf(" ROM MD5:  0x%s\n", md5_asciistr(UNIFCart.MD5));
 	memcpy(GameInfo->MD5, UNIFCart.MD5, sizeof(UNIFCart.MD5));
 
 	CheckHashInfo();
@@ -791,6 +787,14 @@ int UNIFLoad(const char *name, FCEUFILE *fp) {
 	if (!InitializeBoard())
 		goto aborto;
 
+	if (UNIFCart.mapper)
+		FCEU_printf(" [Unif] Mapper:    %d\n", UNIFCart.mapper);
+	FCEU_printf(" [Unif] SubMapper: %d\n", UNIFCart.submapper);
+	FCEU_printf(" [Unif] PRG ROM:   %d KiB\n", UNIF_PRGROMSize / 1024);
+	if (VROM_size)
+		FCEU_printf(" [Unif] CHR ROM:   %d KiB\n", UNIF_CHRROMSize / 1024);
+	FCEU_printf(" [Unif] ROM MD5:   0X%s\n", md5_asciistr(UNIFCart.MD5));
+
 	GameInterface = UNIFGI;
 	return 1;