From a236477c5b834013bd5b06ec2e6c62376efabbf3 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Wed, 2 Mar 2011 04:11:46 +0000
Subject: [PATCH] [NES] rename NTARAM to CIRAM, and change output to 256x240
 instead of 256x256

---
 BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs | 18 +++++++++---------
 .../Consoles/Nintendo/NES/PPU.run.cs           |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
index 14fee746f2..86e5d2b399 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
@@ -132,7 +132,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 				}
 				else
 				{
-					NES.NTARAM[ApplyMirroring(addr)] = value;
+					NES.CIRAM[ApplyMirroring(addr)] = value;
 				}
 			}
 
@@ -146,7 +146,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 				}
 				else
 				{
-					return NES.NTARAM[ApplyMirroring(addr)];
+					return NES.CIRAM[ApplyMirroring(addr)];
 				}
 			}
 
@@ -158,7 +158,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 		INESBoard board;
 		public PPU ppu;
 		byte[] ram;
-		protected byte[] NTARAM;
+		protected byte[] CIRAM;
 		int cpu_accumulate;
 
 		//user configuration 
@@ -272,9 +272,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 
 			public int[] GetVideoBuffer()
 			{
-				int[] pixels = new int[256 * 256];
+				int[] pixels = new int[256 * 240];
 				int i = 0;
-				for (int y = 0; y < 256; y++)
+				for (int y = 0; y < 240; y++)
 					for (int x = 0; x < 256; x++)
 					{
 						int pixel = emu.ppu.xbuf[i];
@@ -290,7 +290,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 				return pixels;
 			}
 			public int BufferWidth { get { return 256; } }
-			public int BufferHeight { get { return 256; } }
+			public int BufferHeight { get { return 240; } }
 			public int BackgroundColor { get { return 0; } }
 		}
 		public IVideoProvider VideoProvider { get { return new MyVideoProvider(this); } }
@@ -401,7 +401,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 			cpu.WriteMemory = WriteMemory;
 			ppu = new PPU(this);
 			ram = new byte[0x800];
-			NTARAM = new byte[0x800];
+			CIRAM = new byte[0x800];
 			ports = new IPortDevice[2];
 			ports[0] = new JoypadPortDevice(this);
 			ports[1] = new NullPortDevice();
@@ -728,7 +728,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 				Util.WriteByteBuffer(bw, System.Text.Encoding.ASCII.GetBytes(sw.ToString()));
 			}
 			Util.WriteByteBuffer(bw, ram);
-			Util.WriteByteBuffer(bw, NTARAM);
+			Util.WriteByteBuffer(bw, CIRAM);
 			bw.Write(cpu_accumulate);
 			board.SaveStateBinary(bw);
 			ppu.SaveStateBinary(bw);
@@ -740,7 +740,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 			using (var sr = new StringReader(System.Text.Encoding.ASCII.GetString(Util.ReadByteBuffer(br, false))))
 				cpu.LoadStateText(sr);
 			ram = Util.ReadByteBuffer(br, false);
-			NTARAM = Util.ReadByteBuffer(br, false);
+			CIRAM = Util.ReadByteBuffer(br, false);
 			cpu_accumulate = br.ReadInt32();
 			board.LoadStateBinary(br);
 			ppu.LoadStateBinary(br);
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.run.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.run.cs
index e35895fcae..87bd387ca3 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.run.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.run.cs
@@ -21,7 +21,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 				public byte pt_0, pt_1;
 			};
 
-			public short[] xbuf = new short[256*256];
+			public short[] xbuf = new short[256*240];
 
 			void Read_bgdata(ref BGDataRecord bgdata) {
 				int addr = ppur.get_ntread();