From fd882987e0b3136dbf1b8ffa116ce61a7158ce71 Mon Sep 17 00:00:00 2001
From: Roberto Fresca <robbie@robertofresca.com>
Date: Fri, 6 Sep 2019 05:02:15 +0200
Subject: [PATCH] Cherry Bonus III (alt): Simplified the decryption routine.

---
 src/mame/drivers/goldstar.cpp | 83 +++++++++++++----------------------
 1 file changed, 31 insertions(+), 52 deletions(-)

diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp
index df0959cc7e3..07b0169c748 100644
--- a/src/mame/drivers/goldstar.cpp
+++ b/src/mame/drivers/goldstar.cpp
@@ -17391,6 +17391,7 @@ void cmaster_state::init_po33()
 	/* oki6295 at 0x20 */
 }
 
+
 void cmaster_state::init_match133()
 {
 	uint8_t *ROM = memregion("maincpu")->base();
@@ -17413,41 +17414,46 @@ void cmaster_state::init_match133()
 	m_maincpu->space(AS_IO).install_read_handler(0x1a, 0x1a, read8_delegate(FUNC(cmaster_state::fixedvale4_r), this));
 }
 
+
 void cb3_state::init_cherrys()
 {
 	uint8_t *ROM = memregion("maincpu")->base();
-	unsigned char rawData[256] = {
-		0xCC, 0xCD, 0xCE, 0xCF, 0xC8, 0xC9, 0xCA, 0xCB, 0xC4, 0xC5, 0xC6, 0xC7,
-		0xC0, 0xC1, 0xC2, 0xC3, 0xDC, 0xDD, 0xDE, 0xDF, 0xD8, 0xD9, 0xDA, 0xDB,
-		0xD4, 0xD5, 0xD6, 0xD7, 0xD0, 0xD1, 0xD2, 0xD3, 0xEC, 0xED, 0xEE, 0xEF,
-		0xE8, 0xE9, 0xEA, 0xEB, 0xE4, 0xE5, 0xE6, 0xE7, 0xE0, 0xE1, 0xE2, 0xE3,
-		0xFC, 0xFD, 0xFE, 0xFF, 0xF8, 0xF9, 0xFA, 0xFB, 0xF4, 0xF5, 0xF6, 0xF7,
-		0xF0, 0xF1, 0xF2, 0xF3, 0x8C, 0x8D, 0x8E, 0x8F, 0x88, 0x89, 0x8A, 0x8B,
-		0x84, 0x85, 0x86, 0x87, 0x80, 0x81, 0x82, 0x83, 0x9C, 0x9D, 0x9E, 0x9F,
-		0x98, 0x99, 0x9A, 0x9B, 0x94, 0x95, 0x96, 0x97, 0x90, 0x91, 0x92, 0x93,
-		0xAC, 0xAD, 0xAE, 0xAF, 0xA8, 0xA9, 0xAA, 0xAB, 0xA4, 0xA5, 0xA6, 0xA7,
-		0xA0, 0xA1, 0xA2, 0xA3, 0xBC, 0xBD, 0xBE, 0xBF, 0xB8, 0xB9, 0xBA, 0xBB,
-		0xB4, 0xB5, 0xB6, 0xB7, 0xB0, 0xB1, 0xB2, 0xB3, 0x4C, 0x4D, 0x4E, 0x4F,
-		0x48, 0x49, 0x4A, 0x4B, 0x44, 0x45, 0x46, 0x47, 0x40, 0x41, 0x42, 0x43,
-		0x5C, 0x5D, 0x5E, 0x5F, 0x58, 0x59, 0x5A, 0x5B, 0x54, 0x55, 0x56, 0x57,
-		0x50, 0x51, 0x52, 0x53, 0x6C, 0x6D, 0x6E, 0x6F, 0x68, 0x69, 0x6A, 0x6B,
-		0x64, 0x65, 0x66, 0x67, 0x60, 0x61, 0x62, 0x63, 0x7C, 0x7D, 0x7E, 0x7F,
-		0x78, 0x79, 0x7A, 0x7B, 0x74, 0x75, 0x76, 0x77, 0x70, 0x71, 0x72, 0x73,
-		0x0C, 0x0D, 0x0E, 0x0F, 0x08, 0x09, 0x0A, 0x0B, 0x04, 0x05, 0x06, 0x07,
-		0x00, 0x01, 0x02, 0x03, 0x1C, 0x1D, 0x1E, 0x1F, 0x18, 0x19, 0x1A, 0x1B,
-		0x14, 0x15, 0x16, 0x17, 0x10, 0x11, 0x12, 0x13, 0x2C, 0x2D, 0x2E, 0x2F,
-		0x28, 0x29, 0x2A, 0x2B, 0x24, 0x25, 0x26, 0x27, 0x20, 0x21, 0x22, 0x23,
-		0x3C, 0x3D, 0x3E, 0x3F, 0x38, 0x39, 0x3A, 0x3B, 0x34, 0x35, 0x36, 0x37,
-		0x30, 0x31, 0x32, 0x33
-	};
+	for (int i = 0; i < 0x10000; i++)
+	{
+		ROM[i] ^= (i & 0xff) ^ 0xcc;
+	}
+}
+
+
+void cb3_state::init_cb3e()
+{
+/*  program bitswap */
+	uint8_t *ROM = memregion("maincpu")->base();
+	do_blockswaps(ROM);
 
 	for (int i = 0; i < 0x10000; i++)
 	{
-		ROM[i] = ROM[i] ^ rawData[i & 0xff];
+		uint8_t dat = ROM[i];
+		dat =  bitswap<8>(dat, 5, 6, 3, 4, 7, 2, 1, 0);
+		ROM[i] = dat;
 	}
 
+/*  bank 1 graphics */
+	uint8_t *src = memregion("gfx1")->base();
+	for (int i = 0; i < 0x20000; i++)
+	{
+		src[i] = bitswap<8>(src[i], 4, 3, 2, 5, 1, 6, 0, 7);      // OK
+	}
+
+/*  bank 2 graphics */
+	uint8_t *src2 = memregion("gfx2")->base();
+	for (int i = 0; i < 0x8000; i++)
+	{
+		src2[i] = bitswap<8>(src2[i], 3, 4, 2, 5, 1, 6, 0, 7);    // OK
+	}
 }
 
+
 /* todo: remove these patches! */
 void unkch_state::init_unkch1()
 {
@@ -17509,33 +17515,6 @@ void goldstar_state::init_super9()
 
 }
 
-void cb3_state::init_cb3e()
-{
-/*  program bitswap */
-	uint8_t *ROM = memregion("maincpu")->base();
-	do_blockswaps(ROM);
-
-	for (int i = 0; i < 0x10000; i++)
-	{
-		uint8_t dat = ROM[i];
-		dat =  bitswap<8>(dat, 5, 6, 3, 4, 7, 2, 1, 0);
-		ROM[i] = dat;
-	}
-
-/*  bank 1 graphics */
-	uint8_t *src = memregion("gfx1")->base();
-	for (int i = 0; i < 0x20000; i++)
-	{
-		src[i] = bitswap<8>(src[i], 4, 3, 2, 5, 1, 6, 0, 7);      // OK
-	}
-
-/*  bank 2 graphics */
-	uint8_t *src2 = memregion("gfx2")->base();
-	for (int i = 0; i < 0x8000; i++)
-	{
-		src2[i] = bitswap<8>(src2[i], 3, 4, 2, 5, 1, 6, 0, 7);    // OK
-	}
-}
 
 void goldstar_state::init_wcherry()
 {