From ae27d0ae94a63a94395666a736a6513cffe77118 Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Sun, 5 Mar 2017 18:45:32 -0500
Subject: [PATCH] Intellivision add Power/Reset

Also fix Aspect ratio
---
 .../Intellivision/Intellivision.IEmulator.cs  |  7 +++++
 .../Consoles/Intellivision/Intellivision.cs   | 30 +++++++++++++++++++
 .../Consoles/Intellivision/PSG.cs             |  2 +-
 .../Consoles/Intellivision/STIC.cs            |  3 ++
 4 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IEmulator.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IEmulator.cs
index 5edc4d840d..f76fb92bbd 100644
--- a/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IEmulator.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.IEmulator.cs
@@ -111,6 +111,13 @@ namespace BizHawk.Emulation.Cores.Intellivision
 
 			if (islag)
 				lagcount++;
+
+
+			if (Controller.IsPressed("Power"))
+				HardReset();
+
+			if (Controller.IsPressed("Reset"))
+				SoftReset();
 		}
 
 		private int _frame;
diff --git a/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs
index 5eecba55f0..88330d7013 100644
--- a/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Intellivision/Intellivision.cs
@@ -29,6 +29,8 @@ namespace BizHawk.Emulation.Cores.Intellivision
 			this.SyncSettings = (IntvSyncSettings)SyncSettings ?? new IntvSyncSettings();
 
 			ControllerDeck = new IntellivisionControllerDeck(this.SyncSettings.Port1, this.SyncSettings.Port2);
+			ControllerDefinition.BoolButtons.Add("Power");
+			ControllerDefinition.BoolButtons.Add("Reset");
 
 			_cart = new Intellicart();
 			if (_cart.Parse(_rom) == -1)
@@ -142,5 +144,33 @@ namespace BizHawk.Emulation.Cores.Intellivision
 			ushort port2 = ControllerDeck.ReadPort2(Controller);
 			_psg.Register[14] = (ushort)(0xFF - port2);
 		}
+
+		void HardReset()
+		{
+			_cpu.Reset();
+			_stic.Reset();
+			_psg.Reset();
+
+			Connect();
+
+			ScratchpadRam = new byte[240];
+			SystemRam = new ushort[352];
+
+			_cart = new Intellicart();
+			if (_cart.Parse(_rom) == -1)
+			{
+				_cart = new Cartridge();
+				_cart.Parse(_rom);
+			}
+		}
+
+		void SoftReset()
+		{
+			_cpu.Reset();
+			_stic.Reset();
+			_psg.Reset();
+
+			Connect();
+		}
 	}
 }
diff --git a/BizHawk.Emulation.Cores/Consoles/Intellivision/PSG.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/PSG.cs
index afc35bd9f4..cc1194388a 100644
--- a/BizHawk.Emulation.Cores/Consoles/Intellivision/PSG.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Intellivision/PSG.cs
@@ -18,7 +18,7 @@ namespace BizHawk.Emulation.Cores.Intellivision
 
 			for (int i=0;i<16;i++)
 			{
-				Register[i] = 0xFFFF;
+				Register[i] = 0x0000;
 			}
 			sync_psg_state();
 			DiscardSamples();
diff --git a/BizHawk.Emulation.Cores/Consoles/Intellivision/STIC.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/STIC.cs
index cf0e30b938..c00d7a2152 100644
--- a/BizHawk.Emulation.Cores/Consoles/Intellivision/STIC.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Intellivision/STIC.cs
@@ -88,8 +88,11 @@ namespace BizHawk.Emulation.Cores.Intellivision
 
 			for (int i=0;i<64;i++)
 			{
+				Register[i] = 0; 
 				write_reg(i, 0, false);
 			}
+
+			ColorSP = 0x0028;
 		}
 
 		public bool GetSr1()