From ab8449fd2d396c238a8b067974c4e3c239beba20 Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Tue, 31 Jan 2017 15:51:35 -0500
Subject: [PATCH] A7800: Pick Palette correctly

Fixes #757
---
 .../Consoles/Atari/7800/Atari7800.cs                 | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs
index 8570c16ee4..4f8806bbb6 100644
--- a/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Atari/7800/Atari7800.cs
@@ -29,6 +29,10 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800
 				TIATables.NTSCPalette[i] |= unchecked((int)0xff000000);
 			for (int i = 0; i < TIATables.PALPalette.Length; i++)
 				TIATables.PALPalette[i] |= unchecked((int)0xff000000);
+			for (int i = 0; i < MariaTables.NTSCPalette.Length; i++)
+				MariaTables.NTSCPalette[i] |= unchecked((int)0xff000000);
+			for (int i = 0; i < MariaTables.PALPalette.Length; i++)
+				MariaTables.PALPalette[i] |= unchecked((int)0xff000000);
 		}
 
 		public Atari7800(CoreComm comm, GameInfo game, byte[] rom, string GameDBfn)
@@ -229,10 +233,14 @@ namespace BizHawk.Emulation.Cores.Atari.Atari7800
 					samplerate = newsamplerate;
 					dcfilter = new DCFilter(256);
 				}
-				if (g.MachineType == MachineType.A7800PAL || g.MachineType == MachineType.A2600PAL)
+				if (g.MachineType == MachineType.A2600PAL)
 					palette = TIATables.PALPalette;
-				else
+				else if (g.MachineType == MachineType.A7800PAL)
+					palette = MariaTables.PALPalette;
+				else if (g.MachineType == MachineType.A2600NTSC)
 					palette = TIATables.NTSCPalette;
+				else
+					palette = MariaTables.NTSCPalette;
 			}
 
 			uint samplerate;