From 47c2ce5a38ed3476e6285118942565769eedddda Mon Sep 17 00:00:00 2001
From: Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com>
Date: Mon, 12 Dec 2022 23:13:42 +0400
Subject: [PATCH] Mapper 268, support for ROMs with 1 MiB CHR-ROM

---
 src/boards/coolboy.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/boards/coolboy.cpp b/src/boards/coolboy.cpp
index 80000474..6cf3a5e4 100644
--- a/src/boards/coolboy.cpp
+++ b/src/boards/coolboy.cpp
@@ -29,7 +29,7 @@
  * |||| ||||
  * |||| |+++-- PRG offset (PRG A19, A18, A17)
  * |||| +----- Alternate CHR A17
- * ||++------- PRG offset (PRG A24, A23)
+ * ||++------- PRG offset (PRG A24, A23), CHR offset (CHR A19, A18)
  * |+--------- PRG mask (PRG A17 from 0: MMC3; 1: offset)
  * +---------- CHR mask (CHR A17 from 0: MMC3; 1: alternate)
  *
@@ -134,6 +134,7 @@ static void AA6023CW(uint32 A, uint8 V) {
 			(V & 0x80 & mask) | ((((EXPREGS[0] & 0b00001000) << 4) & ~mask)) // 7th bit
 			| ((EXPREGS[2] & 0x0F) << 3) // 6-3 bits
 			| ((A >> 10) & 7) // 2-0 bits
+			| ((EXPREGS[0] & 0b00110000) << 4) // There are some ROMs with 1 MiB CHR-ROM
 		);
 	}
 	else {
@@ -148,7 +149,10 @@ static void AA6023CW(uint32 A, uint8 V) {
 		}
 		// Simple MMC3 mode
 		// Highest bit goes from MMC3 registers when EXPREGS[0]&0x80==0 or from EXPREGS[0]&0x08 otherwise
-		setchr1(A, (V & mask) | (((EXPREGS[0] & 0x08) << 4) & ~mask));
+		setchr1(A, 
+			(V & mask)
+			| (((EXPREGS[0] & 0x08) << 4) & ~mask)
+			| ((EXPREGS[0] & 0b00110000) << 4)); // There are some ROMs with 1 MiB CHR-ROM
 	}
 }
 
@@ -223,7 +227,7 @@ static void AA6023PW(uint32 A, uint8 V) {
 	}
 
 	if (!(CREGS[3] & 0x10)) {
-		// Regular MMC3 mode but can be extended to 2MByte
+		// Regular MMC3 mode but can be extended to 2MiB
 		setprg8r(chip, A, (((base << 4) & ~mask)) | (V & mask));
 	}
 	else {