From b53a89b88f6307f2654bae486302bb232a10a39a Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Thu, 11 Jan 2018 09:11:55 -0500
Subject: [PATCH] C64: raster interrupt fix

---
 .../Computers/Commodore64/MOS/Vic.Registers.cs    |  4 ++++
 .../Computers/Commodore64/MOS/Vic.cs              | 15 ++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Registers.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Registers.cs
index 007336c7f5..0e63f4c16f 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Registers.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.Registers.cs
@@ -207,7 +207,11 @@
 				case 0x19:
 					// interrupts are cleared by writing a 1
 					if ((val & 0x01) != 0)
+					{
 						_intRaster = false;
+						_rasterInterruptTriggered = false;
+					}
+						
 					if ((val & 0x02) != 0)
 						_intSpriteDataCollision = false;
 					if ((val & 0x04) != 0)
diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.cs
index 8bbc4d4d71..0d136ba9d8 100644
--- a/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.cs
+++ b/BizHawk.Emulation.Cores/Computers/Commodore64/MOS/Vic.cs
@@ -242,23 +242,16 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.MOS
 			// start of rasterline
 			if ((_cycle == RasterIrqLineXCycle && _rasterLine > 0) || (_cycle == RasterIrqLine0Cycle && _rasterLine == 0))
 			{
-				_rasterInterruptTriggered = false;
+				//_rasterInterruptTriggered = false;
 
 				if (_rasterLine == LastDmaLine)
 					_badlineEnable = false;
-			}
 
-			// rasterline IRQ compare
-			if (_rasterLine != _rasterInterruptLine)
-			{
-				_rasterInterruptTriggered = false;
-			}
-			else
-			{
-				if (!_rasterInterruptTriggered)
+				// IRQ compares are done here
+				if (_rasterLine == _rasterInterruptLine)
 				{
 					_rasterInterruptTriggered = true;
-
+					
 					// interrupt needs to be enabled to be set to true
 					if (_enableIntRaster)
 					{