From 8069653888cdb90b2c434a54bed0458a1ca92dba Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 26 May 2014 00:30:43 +0000
Subject: [PATCH] Atari 2600 - Fix AR mapper

---
 .../Consoles/Atari/2600/Mappers/mAR.cs        | 33 +------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mAR.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mAR.cs
index facbad54f6..868ba5924a 100644
--- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mAR.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/mAR.cs
@@ -191,7 +191,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 			if (!((addr & 0x0F00) > 0) && (!myWriteEnabled || !myWritePending))
 			{
 				myDataHoldRegister = (byte)addr;
-				addrThatChangedDataHoldRegister = addr;
 				myNumberOfDistinctAccesses = Core.DistinctAccessCount;
 				myWritePending = true;
 			}
@@ -206,12 +205,10 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 			{
 				if ((addr & 0x800) == 0)
 				{
-					var test1 = addr & 0x07FF;
-					myImage[(addr & 0x07FF) + myImage[0]] = myDataHoldRegister;
+					myImage[(addr & 0x07FF) + myImageOffsets[0]] = myDataHoldRegister;
 				}
 				else if (myImageOffsets[1] != (3 << 11)) // Don't poke Rom
 				{
-					var test2 = addr & 0x07FF;
 					myImage[(addr & 0x07FF) + myImageOffsets[1]] = myDataHoldRegister;
 				}
 
@@ -222,10 +219,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 
 			return myImage[(addr & 0x07FF) + myImageOffsets[((addr & 0x800) > 0) ? 1 : 0]];
 		}
-		
-		// Temp hacks
-		bool written = false;
-		ushort addrThatChangedDataHoldRegister;
 
 		public override byte ReadMemory(ushort addr)
 		{
@@ -432,34 +425,10 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 					base.WriteMemory(0xFE, myHeader[0]);
 					base.WriteMemory(0xFF, myHeader[1]);
 					base.WriteMemory(0x80, myHeader[2]);
-
-					
 				}
 			}
 		}
 
-		private void WriteToFile() // TODO: Delete me
-		{
-			// A hack for now, because this byte is different than in stella
-			if (myImage[6426] != 85) 
-			{
-				myImage[6425] = 85;
-			}
-
-			if (!written)
-			{
-				var sb = new StringBuilder();
-				for (int i = 0; i < myImage.Len; i++)
-				{
-					sb.Append(((int)(myImage[i])).ToString()).AppendLine();
-				}
-
-				File.WriteAllText("C:\\Repos\\bizlog.log", sb.ToString());
-
-				written = true;
-			}
-		}
-
 		private byte Checksum(byte[] s)
 		{
 			byte sum = 0;