From 96a85d444270f652e72f05c9206c08418f6be971 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Wed, 29 Apr 2020 17:21:26 -0500
Subject: [PATCH] Z80 Interrupts - remove unnecessary public property

---
 BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs     | 9 ++-------
 BizHawk.Emulation.Cores/Consoles/Coleco/TMS9918A.cs | 4 ++--
 BizHawk.sln.DotSettings                             | 1 +
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs b/BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs
index 92fe223e6d..a5a2b26c81 100644
--- a/BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs
+++ b/BizHawk.Emulation.Cores/CPUs/Z80A/Interrupts.cs
@@ -22,15 +22,10 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
 		public bool NonMaskableInterrupt
 		{
 			get => nonMaskableInterrupt;
-			set { if (value && !nonMaskableInterrupt) NonMaskableInterruptPending = true; nonMaskableInterrupt = value; }
+			set { if (value && !nonMaskableInterrupt) nonMaskableInterruptPending = true; nonMaskableInterrupt = value; }
 		}
 
 		private bool nonMaskableInterruptPending;
-		public bool NonMaskableInterruptPending
-		{
-			get => nonMaskableInterruptPending;
-			set => nonMaskableInterruptPending = value;
-		}
 
 		private int interruptMode;
 		public int InterruptMode
@@ -144,7 +139,7 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
 			IFF1 = false;
 			IFF2 = false;
 			NonMaskableInterrupt = false;
-			NonMaskableInterruptPending = false;
+			nonMaskableInterruptPending = false;
 			FlagI = false;
 			InterruptMode = 1;
 		}
diff --git a/BizHawk.Emulation.Cores/Consoles/Coleco/TMS9918A.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/TMS9918A.cs
index b58a04aaa0..fe9a56d56a 100644
--- a/BizHawk.Emulation.Cores/Consoles/Coleco/TMS9918A.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Coleco/TMS9918A.cs
@@ -80,7 +80,7 @@ namespace BizHawk.Emulation.Cores.ColecoVision
 			VdpAddress &= 0x3FFF;
 		}
 
-		void WriteRegister(int reg, byte data)
+		private void WriteRegister(int reg, byte data)
 		{
 			if (reg >= 8) return;
 
@@ -106,7 +106,7 @@ namespace BizHawk.Emulation.Cores.ColecoVision
 				case 5: // Sprite Attribute Table Base Address
 					TmsSpriteAttributeBase = (Registers[5] << 7) & 0x3F80;
 					break;
-				case 6: // Sprite Pattern Generator Base Adderss 
+				case 6: // Sprite Pattern Generator Base Address
 					SpritePatternGeneratorBase = (Registers[6] << 11) & 0x3800;
 					break;
 			}
diff --git a/BizHawk.sln.DotSettings b/BizHawk.sln.DotSettings
index 41c1b010f7..903737f6e3 100644
--- a/BizHawk.sln.DotSettings
+++ b/BizHawk.sln.DotSettings
@@ -396,6 +396,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mainform/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=mainmemory/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=mame/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Maskable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Matroska/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Medna/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=mednadisc/@EntryIndexedValue">True</s:Boolean>