From fb164fb740709c99d7b2232630fadf011a1d4d6e Mon Sep 17 00:00:00 2001
From: Lo Def <lodef.mode@gmail.com>
Date: Sat, 24 Apr 2021 23:46:46 -0400
Subject: [PATCH] (MovieCart) Avoid unnecessary shuffling of color data during
 encoding and decoding, as new kernel does not require it.

---
 src/emucore/CartMVC.cxx | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/emucore/CartMVC.cxx b/src/emucore/CartMVC.cxx
index 392233a47..ca72ac77e 100644
--- a/src/emucore/CartMVC.cxx
+++ b/src/emucore/CartMVC.cxx
@@ -666,7 +666,7 @@ class MovieCart
       writeROM(addr_title_loop + 0, 0x18);
     }
 
-    void writeColor(uInt16 address, uInt8 val);
+    void writeColor(uInt16 address);
     void writeAudioData(uInt16 address, uInt8 val) {
       writeROM(address, myVolumeScale[val]);
     }
@@ -691,9 +691,6 @@ class MovieCart
     // data
     uInt8 myROM[1024];
 
-    // full line of color
-    uInt8 myColor[10];
-
     // title screen state
     int        myTitleCycles{0};
     TitleState myTitleState{TitleState::Display};
@@ -778,8 +775,10 @@ bool MovieCart::init(const string& path)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void MovieCart::writeColor(uInt16 address, uInt8 v)
+void MovieCart::writeColor(uInt16 address)
 {
+  uint8_t v = myStream.readColor();
+
   v = (v & 0xf0) | shiftBright[(v & 0x0f) + myBright];
 
   if(myForceColor)
@@ -996,11 +995,11 @@ void MovieCart::fill_addr_right_line()
   writeGraph(addr_set_gdata8 + 1);
   writeGraph(addr_set_gdata9 + 1);
 
-  writeColor(addr_set_gcol5 + 1, myColor[8]); // col 1/9
-  writeColor(addr_set_gcol6 + 1, myColor[9]); // col 3/9
-  writeColor(addr_set_gcol7 + 1, myColor[1]); // col 5/9
-  writeColor(addr_set_gcol8 + 1, myColor[2]); // col 7/9
-  writeColor(addr_set_gcol9 + 1, myColor[0]); // col 9/9
+  writeColor(addr_set_gcol5 + 1);
+  writeColor(addr_set_gcol6 + 1);
+  writeColor(addr_set_gcol7 + 1);
+  writeColor(addr_set_gcol8 + 1);
+  writeColor(addr_set_gcol9 + 1);
 
 }
 
@@ -1015,14 +1014,11 @@ void MovieCart::fill_addr_left_line(bool again)
   writeGraph(addr_set_gdata3 + 1);
   writeGraph(addr_set_gdata4 + 1);
 
-  for(int i = 0; i < 10; ++i)
-    myColor[i] = myStream.readColor();
-
-  writeColor(addr_set_gcol0 + 1, myColor[3]); // col 0/9
-  writeColor(addr_set_gcol1 + 1, myColor[4]); // col 2/9
-  writeColor(addr_set_gcol2 + 1, myColor[6]);  // col 4/9
-  writeColor(addr_set_gcol3 + 1, myColor[7]);  // col 6/9
-  writeColor(addr_set_gcol4 + 1, myColor[5]); // col 8/9
+  writeColor(addr_set_gcol0 + 1);
+  writeColor(addr_set_gcol1 + 1);
+  writeColor(addr_set_gcol2 + 1);
+  writeColor(addr_set_gcol3 + 1);
+  writeColor(addr_set_gcol4 + 1);
 
   // addr_pick_line_end
   //    jmp right_line