Rename Client.Core to BizHawk.Client.Common, and change all namespaces, reorganize some files, remove the LuaHawk project as it was a bad idea, change namespace in the PCE_Debugger project

BizHawk.Client.Common/BizHawk.Client.Common.csproj

@@ -47,12 +47,12 @@
     <Compile Include="Config.cs" />
     <Compile Include="ConfigService.cs" />
     <Compile Include="Global.cs" />
-    <Compile Include="InputValidate.cs" />
+    <Compile Include="helpers\InputValidate.cs" />
     <Compile Include="KeyTurbo.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RecentFiles.cs" />
-    <Compile Include="StringHelpers.cs" />
-    <Compile Include="Watch.cs" />
+    <Compile Include="helpers\StringHelpers.cs" />
+    <Compile Include="tools\Watch.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BizHawk.Emulation\BizHawk.Emulation.csproj">

BizHawk.Client.Common/ConfigService.cs

@@ -0,0 +1,61 @@
+using System;
+using System.IO;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace BizHawk.Client.Common
+{
+	public static class ConfigService
+	{
+		public static T Load<T>(string filepath, T currentConfig) where T : new()
+		{
+			T config = new T();
+
+			try
+			{
+				var file = new FileInfo(filepath);
+				if (file.Exists)
+					using (var reader = file.OpenText())
+					{
+						var s = new JsonSerializer {SuppressMissingMemberException = true, SuppressDuplicateMemberException = true};
+						var r = new JsonReader(reader);
+						config = (T)s.Deserialize(r, typeof(T));
+					}
+			}
+			catch (Exception e) { /*TODO MessageBox.Show(e.ToString(), "Config Error"); */ }
+			if (config == null) return new T();
+
+			//patch up arrays in the config with the minimum number of things
+			foreach(var fi in typeof(T).GetFields(BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public))
+				if (fi.FieldType.IsArray)
+				{
+					Array aold = fi.GetValue(currentConfig) as Array;
+					Array anew = fi.GetValue(config) as Array;
+					if (aold.Length == anew.Length) continue;
+
+					//create an array of the right size
+					Array acreate = Array.CreateInstance(fi.FieldType.GetElementType(), Math.Max(aold.Length,anew.Length));
+					
+					//copy the old values in, (presumably the defaults), and then copy the new ones on top
+					Array.Copy(aold, acreate, Math.Min(aold.Length,acreate.Length));
+					Array.Copy(anew, acreate, Math.Min(anew.Length, acreate.Length));
+					
+					//stash it into the config struct
+					fi.SetValue(config, acreate);
+				}
+					
+			return config;
+		}
+
+		public static void Save(string filepath, object config)
+		{
+			var file = new FileInfo(filepath);
+			using (var writer = file.CreateText())
+			{
+				var s = new JsonSerializer();
+				var w = new JsonWriter(writer) { Formatting = Formatting.Indented };
+				s.Serialize(w, config);
+			}
+		}
+	}
+}

BizHawk.Client.Common/Global.cs

@@ -0,0 +1,8 @@
+namespace BizHawk.Client.Common
+{
+	public static class Global
+	{
+		public static Config Config;
+		public static GameInfo Game;
+	}
+}

BizHawk.Client.Common/KeyTurbo.cs

@@ -1,4 +1,4 @@
-namespace BizHawk.Client.Core
+namespace BizHawk.Client.Common
 {
 	public class TurboKey
 	{

BizHawk.Client.Common/RecentFiles.cs

@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace BizHawk.Client.Core
+namespace BizHawk.Client.Common
 {
 	public class RecentFiles : IEnumerable
 	{

BizHawk.Client.Common/helpers/InputValidate.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace BizHawk.Client.Core
+namespace BizHawk.Client.Common
 {
 	/// <summary>
 	/// Includes helper functions to validate user input

BizHawk.Client.Common/helpers/StringHelpers.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 
-namespace BizHawk.Client.Core
+namespace BizHawk.Client.Common
 {
 	public static class StringHelpers
 	{

BizHawk.Client.Common/tools/Watch.cs

@@ -0,0 +1,930 @@
+using System;
+using System.Globalization;
+using System.Collections.Generic;
+
+namespace BizHawk.Client.Common
+{
+	public abstract class Watch
+	{
+		public enum WatchSize { Byte = 1, Word = 2, DWord = 4, Separator = 0 };
+		public enum DisplayType { Separator, Signed, Unsigned, Hex, Binary, FixedPoint_12_4, FixedPoint_20_12, Float };
+		public enum PreviousType { Original = 0, LastSearch = 1, LastFrame = 2, LastChange = 3 };
+
+		public static string DisplayTypeToString(DisplayType type)
+		{
+			switch (type)
+			{
+				default:
+					return type.ToString();
+				case DisplayType.FixedPoint_12_4:
+					return "Fixed Point 12.4";
+				case DisplayType.FixedPoint_20_12:
+					return "Fixed Point 20.12";
+			}
+		}
+
+		public static DisplayType StringToDisplayType(string name)
+		{
+			switch (name)
+			{
+				default:
+					return (DisplayType)Enum.Parse(typeof(DisplayType), name);
+				case "Fixed Point 12.4":
+					return DisplayType.FixedPoint_12_4;
+				case "Fixed Point 20.12":
+					return DisplayType.FixedPoint_20_12;
+			}
+		}
+
+		protected int _address;
+		protected MemoryDomain _domain;
+		protected DisplayType _type;
+		protected bool _bigEndian;
+		protected int _changecount;
+		protected string _notes = String.Empty;
+
+		public abstract int? Value { get; }
+		public abstract string ValueString { get; }
+		public abstract WatchSize Size { get; }
+
+		public abstract int? Previous { get; }
+		public abstract string PreviousStr { get; }
+		public abstract void ResetPrevious();
+
+		public abstract bool Poke(string value);
+
+		public virtual DisplayType Type { get { return _type; } set { _type = value; } }
+		public virtual bool BigEndian { get { return _bigEndian; } set { _bigEndian = value; } }
+
+		public MemoryDomain Domain { get { return _domain; } }
+
+		public string DomainName { get { return _domain != null ? _domain.Name : String.Empty; } }
+
+		public virtual int? Address { get { return _address; } }
+
+		public virtual string AddressString { get { return _address.ToString(AddressFormatStr); } }
+
+		public virtual bool IsSeparator { get { return false; } }
+
+		public char SizeAsChar
+		{
+			get
+			{
+				switch (Size)
+				{
+					default:
+					case WatchSize.Separator:
+						return 'S';
+					case WatchSize.Byte:
+						return 'b';
+					case WatchSize.Word:
+						return 'w';
+					case WatchSize.DWord:
+						return 'd';
+				}
+			}
+		}
+
+		public static WatchSize SizeFromChar(char c)
+		{
+			switch (c)
+			{
+				default:
+				case 'S':
+					return WatchSize.Separator;
+				case 'b':
+					return WatchSize.Byte;
+				case 'w':
+					return WatchSize.Word;
+				case 'd':
+					return WatchSize.DWord;
+			}
+		}
+
+		public char TypeAsChar
+		{
+			get
+			{
+				switch (Type)
+				{
+					default:
+					case DisplayType.Separator:
+						return '_';
+					case DisplayType.Unsigned:
+						return 's';
+					case DisplayType.Signed:
+						return 'u';
+					case DisplayType.Hex:
+						return 'h';
+					case DisplayType.Binary:
+						return 'b';
+					case DisplayType.FixedPoint_12_4:
+						return '1';
+					case DisplayType.FixedPoint_20_12:
+						return '2';
+					case DisplayType.Float:
+						return 'f';
+				}
+			}
+		}
+
+		public static DisplayType DisplayTypeFromChar(char c)
+		{
+			switch (c)
+			{
+				default:
+				case '_':
+					return DisplayType.Separator;
+				case 'u':
+					return DisplayType.Unsigned;
+				case 's':
+					return DisplayType.Signed;
+				case 'h':
+					return DisplayType.Hex;
+				case 'b':
+					return DisplayType.Binary;
+				case '1':
+					return DisplayType.FixedPoint_12_4;
+				case '2':
+					return DisplayType.FixedPoint_20_12;
+				case 'f':
+					return DisplayType.Float;
+			}
+		}
+
+		public string AddressFormatStr
+		{
+			get
+			{
+				if (_domain != null)
+				{
+					return "X" + IntHelpers.GetNumDigits(_domain.Size - 1).ToString();
+				}
+				else
+				{
+					return "";
+				}
+			}
+		}
+
+		protected byte GetByte()
+		{
+			return _domain.PeekByte(_address);
+		}
+
+		protected ushort GetWord()
+		{
+			return _domain.PeekWord(_address, _bigEndian ? Endian.Big : Endian.Little);
+		}
+
+		protected uint GetDWord()
+		{
+			return _domain.PeekDWord(_address, _bigEndian ? Endian.Big : Endian.Little);
+		}
+
+		protected void PokeByte(byte val)
+		{
+			_domain.PokeByte(_address, val);
+		}
+
+		protected void PokeWord(ushort val)
+		{
+			_domain.PokeWord(_address, val, _bigEndian ? Endian.Big : Endian.Little);
+		}
+
+		protected void PokeDWord(uint val)
+		{
+			_domain.PokeDWord(_address, val, _bigEndian ? Endian.Big : Endian.Little);
+		}
+
+		public void ClearChangeCount() { _changecount = 0; }
+
+		public string Notes { get { return _notes; } set { _notes = value; } }
+
+		public static Watch GenerateWatch(MemoryDomain domain, int address, WatchSize size, DisplayType type, string notes, bool bigEndian)
+		{
+			switch (size)
+			{
+				default:
+				case WatchSize.Separator:
+					return SeparatorWatch.Instance;
+				case WatchSize.Byte:
+					return new ByteWatch(domain, address, type, bigEndian, notes);
+				case WatchSize.Word:
+					return new WordWatch(domain, address, type, bigEndian, notes);
+				case WatchSize.DWord:
+					return new DWordWatch(domain, address, type, bigEndian, notes);
+			}
+		}
+
+		public static Watch GenerateWatch(MemoryDomain domain, int address, WatchSize size, DisplayType type, bool bigendian, int prev, int changecount)
+		{
+			switch (size)
+			{
+				default:
+				case WatchSize.Separator:
+					return SeparatorWatch.Instance;
+				case WatchSize.Byte:
+					return new ByteWatch(domain, address, type, bigendian, (byte)prev, changecount);
+				case WatchSize.Word:
+					return new WordWatch(domain, address, type, bigendian, (ushort)prev, changecount);
+				case WatchSize.DWord:
+					return new DWordWatch(domain, address, type, bigendian, (uint)prev, changecount);
+			}
+		}
+
+		public static List<DisplayType> AvailableTypes(WatchSize size)
+		{
+			switch (size)
+			{
+				default:
+				case WatchSize.Separator:
+					return SeparatorWatch.ValidTypes;
+				case WatchSize.Byte:
+					return ByteWatch.ValidTypes;
+				case WatchSize.Word:
+					return WordWatch.ValidTypes;
+				case WatchSize.DWord:
+					return DWordWatch.ValidTypes;
+			}
+		}
+
+		public int ChangeCount { get { return _changecount; } }
+		
+		public abstract string Diff { get; }
+		
+		public abstract void Update();
+	}
+
+	public sealed class SeparatorWatch : Watch
+	{
+		public static SeparatorWatch Instance
+		{
+			get { return new SeparatorWatch(); }
+		}
+
+		public override int? Address
+		{
+			get { return null; }
+		}
+
+		public override int? Value
+		{
+			get { return null; }
+		}
+
+		public override int? Previous
+		{
+			get { return null; }
+		}
+
+		public override string AddressString
+		{
+			get { return String.Empty; }
+		}
+
+		public override string ValueString
+		{
+			get { return String.Empty; }
+		}
+
+		public override string PreviousStr
+		{
+			get { return String.Empty; }
+		}
+
+		public override string ToString()
+		{
+			return "----";
+		}
+
+		public override bool IsSeparator
+		{
+			get { return true; }
+		}
+
+		public override WatchSize Size
+		{
+			get { return WatchSize.Separator; }
+		}
+
+		public static List<DisplayType> ValidTypes
+		{
+			get { return new List<DisplayType> { DisplayType.Separator }; }
+		}
+
+		public override DisplayType Type
+		{
+			get { return DisplayType.Separator; }
+		}
+
+		public override bool Poke(string value)
+		{
+			return false;
+		}
+
+		public override void ResetPrevious()
+		{
+			return;
+		}
+
+		public override string Diff { get { return String.Empty; } }
+
+		public override void Update() { return; }
+	}
+
+	public sealed class ByteWatch : Watch
+	{
+		private byte _previous;
+		private byte _value;
+
+		public ByteWatch(MemoryDomain domain, int address, DisplayType type, bool bigEndian, string notes)
+		{
+			_address = address;
+			_domain = domain;
+			_value = _previous = GetByte();
+			if (Watch.AvailableTypes(WatchSize.Byte).Contains(type))
+			{
+				_type = type;
+			}
+			_bigEndian = bigEndian;
+			if (notes != null)
+			{
+				Notes = notes;
+			}
+		}
+
+		public ByteWatch(MemoryDomain domain, int address, DisplayType type, bool bigEndian, byte prev, int changeCount, string notes = null)
+			: this(domain, address, type, bigEndian, notes)
+		{
+			_previous = prev;
+			_changecount = changeCount;
+		}
+
+		public override int? Address
+		{
+			get { return _address; }
+		}
+
+		public override int? Value
+		{
+			get { return GetByte(); }
+		}
+
+		public override string ValueString
+		{
+			get { return FormatValue(GetByte()); }
+		}
+
+		public override int? Previous
+		{
+			get { return _previous; }
+		}
+
+		public override string PreviousStr
+		{
+			get { return FormatValue(_previous); }
+		}
+
+		public override void ResetPrevious()
+		{
+			_previous = GetByte();
+		}
+
+		public override string ToString()
+		{
+			return Notes + ": " + ValueString;
+		}
+
+		public override bool IsSeparator
+		{
+			get { return false; }
+		}
+
+		public override WatchSize Size
+		{
+			get { return WatchSize.Byte; }
+		}
+
+		public static List<DisplayType> ValidTypes
+		{
+			get
+			{
+				return new List<DisplayType>
+				{
+					DisplayType.Unsigned, DisplayType.Signed, DisplayType.Hex, DisplayType.Binary
+				};
+			}
+		}
+
+		public string FormatValue(byte val)
+		{
+			switch (Type)
+			{
+				default:
+				case DisplayType.Unsigned:
+					return val.ToString();
+				case DisplayType.Signed:
+					return ((sbyte)val).ToString();
+				case DisplayType.Hex:
+					return String.Format("{0:X2}", val);
+				case DisplayType.Binary:
+					return Convert.ToString(val, 2).PadLeft(8, '0').Insert(4, " ");
+			}
+		}
+
+		public override bool Poke(string value)
+		{
+			try
+			{
+				byte val = 0;
+				switch (Type)
+				{
+					case DisplayType.Unsigned:
+						if (InputValidate.IsValidUnsignedNumber(value))
+						{
+							val = (byte)int.Parse(value);
+						}
+						else
+						{
+							return false;
+						}
+						break;
+					case DisplayType.Signed:
+						if (InputValidate.IsValidSignedNumber(value))
+						{
+							val = (byte)(sbyte)int.Parse(value);
+						}
+						else
+						{
+							return false;
+						}
+						break;
+					case DisplayType.Hex:
+						if (InputValidate.IsValidHexNumber(value))
+						{
+							val = (byte)int.Parse(value, NumberStyles.HexNumber);
+						}
+						else
+						{
+							return false;
+						}
+						break;
+					case DisplayType.Binary:
+						if (InputValidate.IsValidBinaryNumber(value))
+						{
+							val = (byte)Convert.ToInt32(value, 2);
+						}
+						else
+						{
+							return false;
+						}
+						break;
+				}
+
+				PokeByte(val);
+				return true;
+			}
+			catch
+			{
+				return false;
+			}
+		}
+
+		public override string Diff
+		{
+			get
+			{
+				string diff = String.Empty;
+				int diffVal = _value - _previous;
+				if (diffVal > 0)
+				{
+					diff = "+";
+				}
+				else if (diffVal < 0)
+				{
+					diff = "-";
+				}
+				return diff + FormatValue((byte)(_previous - _value));
+			}
+		}
+
+		public override void Update()
+		{
+			switch (Global.Config.RamWatchDefinePrevious)
+			{
+				case PreviousType.Original:
+					return;
+				case PreviousType.LastChange:
+					var temp = _value;
+					_value = GetByte();
+					if (_value != temp)
+					{
+						_previous = _value;
+						_changecount++;
+					}
+					break;
+				case PreviousType.LastFrame:
+					_previous = _value;
+					_value = GetByte();
+					if (_value != Previous)
+					{
+						_changecount++;
+					}
+					break;
+			}
+		}
+	}
+
+	public sealed class WordWatch : Watch
+	{
+		private ushort _previous;
+		private ushort _value;
+
+		public WordWatch(MemoryDomain domain, int address, DisplayType type, bool bigEndian, string notes)
+		{
+			_domain = domain;
+			_address = address;
+			_value = _previous = GetWord();
+
+			if (Watch.AvailableTypes(WatchSize.Word).Contains(type))
+			{
+				_type = type;
+			}
+			_bigEndian = bigEndian;
+
+			if (notes != null)
+			{
+				Notes = notes;
+			}
+		}
+
+		public WordWatch(MemoryDomain domain, int address, DisplayType type, bool bigEndian, ushort prev, int changeCount, string notes = null)
+			: this(domain, address, type, bigEndian, notes)
+		{
+			_previous = prev;
+			_changecount = changeCount;
+		}
+
+		public override int? Value
+		{
+			get { return GetWord(); }
+		}
+
+		public override int? Previous
+		{
+			get { return _previous; }
+		}
+
+		public override string PreviousStr
+		{
+			get { return FormatValue(_previous); }
+		}
+
+		public override void ResetPrevious()
+		{
+			_previous = GetWord();
+		}
+
+		public override WatchSize Size
+		{
+			get { return WatchSize.Word; }
+		}
+
+		public static List<DisplayType> ValidTypes
+		{
+			get
+			{
+				return new List<DisplayType>
+				{
+					DisplayType.Unsigned, DisplayType.Signed, DisplayType.Hex, DisplayType.FixedPoint_12_4, DisplayType.Binary
+				};
+			}
+		}
+
+		public override string ValueString
+		{
+			get { return FormatValue(GetWord()); }
+		}
+
+		public override string ToString()
+		{
+			return Notes + ": " + ValueString;
+		}
+
+		public string FormatValue(ushort val)
+		{
+			switch (Type)
+			{
+				default:
+				case DisplayType.Unsigned:
+					return val.ToString();
+				case DisplayType.Signed:
+					return ((short)val).ToString();
+				case DisplayType.Hex:
+					return String.Format("{0:X4}", val);
+				case DisplayType.FixedPoint_12_4:
+					return String.Format("{0:F4}", (val / 16.0));
+				case DisplayType.Binary:
+					return Convert.ToString(val, 2).PadLeft(16, '0').Insert(8, " ").Insert(4, " ").Insert(14, " ");
+			}
+		}
+
+		public override bool Poke(string value)
+		{
+			try
+			{
+				ushort val = 0;
+				switch (Type)
+				{
+					case DisplayType.Unsigned:
+						if (InputValidate.IsValidUnsignedNumber(value))
+						{
+							val = (ushort)int.Parse(value);
+						}
+						else
+						{
+							return false;
+						}
+						break;
+					case DisplayType.Signed:
+						if (InputValidate.IsValidSignedNumber(value))
+						{
+							val = (ushort)(short)int.Parse(value);
+						}
+						else
+						{
+							return false;
+						}
+						break;
+					case DisplayType.Hex:
+						if (InputValidate.IsValidHexNumber(value))
+						{
+							val = (ushort)int.Parse(value, NumberStyles.HexNumber);
+						}
+						else
+						{
+							return false;
+						}
+						break;
+					case DisplayType.Binary:
+						if (InputValidate.IsValidBinaryNumber(value))
+						{
+							val = (ushort)Convert.ToInt32(value, 2);
+						}
+						else
+						{
+							return false;
+						}
+						break;
+					case DisplayType.FixedPoint_12_4:
+						if (InputValidate.IsValidFixedPointNumber(value))
+						{
+							val = (ushort)(double.Parse(value) * 16.0);
+						}
+						else
+						{
+							return false;
+						}
+						break;
+				}
+				PokeWord(val);
+				return true;
+			}
+			catch
+			{
+				return false;
+			}
+		}
+
+		public override string Diff
+		{
+			get { return FormatValue((ushort)(_previous - _value)); }
+		}
+
+		public override void Update()
+		{
+			switch (Global.Config.RamWatchDefinePrevious)
+			{
+				case PreviousType.Original:
+					return;
+				case PreviousType.LastChange:
+					var temp = _value;
+					_value = GetWord();
+
+					if (_value != temp)
+					{
+						_previous = temp;
+						_changecount++;
+					}
+					break;
+				case PreviousType.LastFrame:
+					_previous = _value;
+					_value = GetWord();
+					if (_value != Previous)
+					{
+						_changecount++;
+					}
+					break;
+			}
+		}
+	}
+
+	public sealed class DWordWatch : Watch
+	{
+		private uint _value;
+		private uint _previous;
+
+		public DWordWatch(MemoryDomain domain, int address, DisplayType type, bool bigEndian, string notes)
+		{
+			_domain = domain;
+			_address = address;
+			_value = _previous = GetDWord();
+			
+			if (Watch.AvailableTypes(WatchSize.DWord).Contains(type))
+			{
+				_type = type;
+			}
+			_bigEndian = bigEndian;
+
+			if (notes != null)
+			{
+				Notes = notes;
+			}
+		}
+
+		public DWordWatch(MemoryDomain domain, int address, DisplayType type, bool bigEndian, uint prev, int changeCount, string notes = null)
+			: this(domain, address, type, bigEndian, notes)
+		{
+			_previous = prev;
+			_changecount = changeCount;
+			_type = type;
+			_bigEndian = bigEndian;
+		}
+
+		public override int? Value
+		{
+			get { return (int)GetDWord(); }
+		}
+
+		public override int? Previous
+		{
+			get { return (int)_previous; }
+		}
+
+		public override string PreviousStr
+		{
+			get { return FormatValue(_previous); }
+		}
+
+		public override void ResetPrevious()
+		{
+			_previous = GetWord();
+		}
+
+		public override WatchSize Size
+		{
+			get { return WatchSize.DWord; }
+		}
+
+		public static List<DisplayType> ValidTypes
+		{
+			get
+			{
+				return new List<DisplayType>
+					{
+					DisplayType.Unsigned, DisplayType.Signed, DisplayType.Hex, DisplayType.FixedPoint_20_12, DisplayType.Float
+				};
+			}
+		}
+
+		public override string ValueString
+		{
+			get { return FormatValue(GetDWord()); }
+		}
+
+		public override string ToString()
+		{
+			return Notes + ": " + ValueString;
+		}
+
+		public string FormatValue(uint val)
+		{
+			switch (Type)
+			{
+				default:
+				case DisplayType.Unsigned:
+					return val.ToString();
+				case DisplayType.Signed:
+					return ((int)val).ToString();
+				case DisplayType.Hex:
+					return String.Format("{0:X8}", val);
+				case DisplayType.FixedPoint_20_12:
+					return String.Format("{0:0.######}", (val / 4096.0));
+				case DisplayType.Float:
+					byte[] bytes = BitConverter.GetBytes(val);
+					float _float = BitConverter.ToSingle(bytes, 0);
+					return String.Format("{0:0.######}", _float);
+			}
+		}
+
+		public override bool Poke(string value)
+		{
+			try
+			{
+				uint val = 0;
+				switch (Type)
+				{
+					case DisplayType.Unsigned:
+						if (InputValidate.IsValidUnsignedNumber(value))
+						{
+							val = (uint)int.Parse(value);
+						}
+						else
+						{
+							return false;
+						}
+						break;
+					case DisplayType.Signed:
+						if (InputValidate.IsValidSignedNumber(value))
+						{
+							val = (uint)int.Parse(value);
+						}
+						else
+						{
+							return false;
+						}
+						break;
+					case DisplayType.Hex:
+						if (InputValidate.IsValidHexNumber(value))
+						{
+							val = (uint)int.Parse(value, NumberStyles.HexNumber);
+						}
+						else
+						{
+							return false;
+						}
+						break;
+					case DisplayType.FixedPoint_20_12:
+						if (InputValidate.IsValidFixedPointNumber(value))
+						{
+							val = (uint)(int)(double.Parse(value) * 4096.0);
+						}
+						else
+						{
+							return false;
+						}
+						break;
+					case DisplayType.Float:
+						if (InputValidate.IsValidDecimalNumber(value))
+						{
+							byte[] bytes = BitConverter.GetBytes(float.Parse(value));
+							val = BitConverter.ToUInt32(bytes, 0);
+						}
+						else
+						{
+							return false;
+						}
+						break;
+				}
+				PokeDWord(val);
+				return true;
+			}
+			catch
+			{
+				return false;
+			}
+		}
+
+		public override string Diff
+		{
+			get { return FormatValue(_previous - _value); }
+		}
+
+		public override void Update()
+		{
+			switch (Global.Config.RamWatchDefinePrevious)
+			{
+				case PreviousType.Original:
+					return;
+				case PreviousType.LastChange:
+					var temp = _value;
+					_value = GetDWord();
+					if (_value != temp)
+					{
+						_previous = _value;
+						_changecount++;
+					}
+					break;
+				case PreviousType.LastFrame:
+					_previous = _value;
+					_value = GetDWord();
+					if (_value != Previous)
+					{
+						_changecount++;
+					}
+					break;
+			}
+		}
+	}
+}

BizHawk.MultiClient/AVOut/AviWriter.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 //some helpful p/invoke from http://www.codeproject.com/KB/audio-video/Motion_Detection.aspx?msg=1142967
 

BizHawk.MultiClient/AVOut/FFmpegWriterForm.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/AVOut/GifWriter.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.IO;
 using System.Drawing;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient.AVOut
 {

BizHawk.MultiClient/AVOut/GifWriterForm.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient.AVOut
 {

BizHawk.MultiClient/AVOut/JMDWriter.cs

@@ -7,7 +7,7 @@ using System.Text;
 using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
 using ICSharpCode.SharpZipLib.Zip.Compression;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/AVOut/VideoWriterChooserForm.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/BizHawk.MultiClient.csproj

@@ -978,9 +978,9 @@
       <Project>{EE135301-08B3-4EFC-A61C-1C53E1C65CB9}</Project>
       <Name>BizHawk.Util</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Client.Core\Client.Core.csproj">
+    <ProjectReference Include="..\Client.Core\BizHawk.Client.Common.csproj">
       <Project>{24A0AA3C-B25F-4197-B23D-476D6462DBA0}</Project>
-      <Name>Client.Core</Name>
+      <Name>BizHawk.Client.Common</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

BizHawk.MultiClient/DisplayManager/DisplayManager.cs

@@ -11,7 +11,7 @@ using System.Drawing.Imaging;
 //using dx=SlimDX;
 //using d3d=SlimDX.Direct3D9;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/FirmwareManager.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.IO;
 using System.Collections.Generic;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 //IDEA: put filesizes in DB too. then scans can go real quick by only scanning filesizes that match (and then scanning filesizes that dont match, in case of an emergency)
 //this would be adviseable if we end up with a very large firmware file

BizHawk.MultiClient/Input/ControllerBinding.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {
@@ -16,7 +16,7 @@ namespace BizHawk.MultiClient
 
 		private readonly Dictionary<string, ControllerDefinition.FloatRange> FloatRanges = new WorkingDictionary<string, ControllerDefinition.FloatRange>();
 
-		private readonly Dictionary<string, BizHawk.Client.Core.Config.AnalogBind> FloatBinds = new Dictionary<string, Config.AnalogBind>();
+		private readonly Dictionary<string, BizHawk.Client.Common.Config.AnalogBind> FloatBinds = new Dictionary<string, Config.AnalogBind>();
 
 		public Controller(ControllerDefinition definition)
 		{
@@ -155,7 +155,7 @@ namespace BizHawk.MultiClient
 				bindings[button].Add(control.Trim());
 		}
 
-		public void BindFloat(string button, BizHawk.Client.Core.Config.AnalogBind bind)
+		public void BindFloat(string button, BizHawk.Client.Common.Config.AnalogBind bind)
 		{
 			FloatBinds[button] = bind;
 		}

BizHawk.MultiClient/LogConsole.cs

@@ -3,7 +3,7 @@ using System.Text;
 using System.IO;
 using System.Runtime.InteropServices;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 #pragma warning disable 162
 

BizHawk.MultiClient/LogWindow.cs

@@ -4,7 +4,7 @@ using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 //todo - perks - pause, copy to clipboard, backlog length limiting
 

BizHawk.MultiClient/MainForm.MenuItems.cs

@@ -7,7 +7,7 @@ using BizHawk.Emulation.Consoles.Calculator;
 using BizHawk.Emulation.Consoles.GB;
 using BizHawk.Emulation.Consoles.Nintendo.SNES;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/MainForm.Movie.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/MainForm.Rewind.cs

@@ -4,7 +4,7 @@ using System.Threading;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/MainForm.cs

@@ -22,7 +22,7 @@ using BizHawk.Emulation.Consoles.Nintendo.SNES;
 using BizHawk.Emulation.Consoles.Sega;
 using BizHawk.Emulation.Consoles.TurboGrafx;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {
@@ -967,7 +967,7 @@ namespace BizHawk.MultiClient
 			}
 		}
 
-		static Controller BindToDefinition(ControllerDefinition def, Dictionary<string, Dictionary<string, string>> allbinds, Dictionary<string, Dictionary<string, BizHawk.Client.Core.Config.AnalogBind>> analogbinds)
+		static Controller BindToDefinition(ControllerDefinition def, Dictionary<string, Dictionary<string, string>> allbinds, Dictionary<string, Dictionary<string, BizHawk.Client.Common.Config.AnalogBind>> analogbinds)
 		{
 			var ret = new Controller(def);
 			Dictionary<string, string> binds;

BizHawk.MultiClient/Program.cs

@@ -12,7 +12,7 @@ using Microsoft.VisualBasic.ApplicationServices;
 
 #pragma warning disable 618
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/RenderPanel.cs

@@ -11,7 +11,7 @@ using SlimDX.Direct3D9;
 using d3d9font=SlimDX.Direct3D9.Font;
 #endif
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 using BizHawk.Core;
 
 namespace BizHawk.MultiClient

BizHawk.MultiClient/SavestateManager.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/Sound.cs

@@ -6,7 +6,7 @@ using SlimDX.DirectSound;
 using SlimDX.Multimedia;
 #endif
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/Throttle.cs

@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 //this throttle is nitsuja's fine-tuned techniques from desmume
 

BizHawk.MultiClient/config/AutofireConfig.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/config/ControllerConfig.cs

@@ -4,7 +4,7 @@ using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {
@@ -53,7 +53,7 @@ namespace BizHawk.MultiClient
 			return cp;
 		}
 
-		Control CreateAnalogPanel(Dictionary<string, BizHawk.Client.Core.Config.AnalogBind> settings, List<string> buttons, Size size)
+		Control CreateAnalogPanel(Dictionary<string, BizHawk.Client.Common.Config.AnalogBind> settings, List<string> buttons, Size size)
 		{
 			var acp = new AnalogBindPanel(settings, buttons) { Dock = DockStyle.Fill };
 			return acp;
@@ -155,7 +155,7 @@ namespace BizHawk.MultiClient
 
 		private void LoadPanels(Dictionary<string, Dictionary<string, string>> normal,
 			Dictionary<string, Dictionary<string, string>> autofire,
-			Dictionary<string, Dictionary<string, BizHawk.Client.Core.Config.AnalogBind>> analog)
+			Dictionary<string, Dictionary<string, BizHawk.Client.Common.Config.AnalogBind>> analog)
 		{
 			LoadToPanel(tabPage1, the_definition.Name, the_definition.BoolButtons, normal, "", CreateNormalPanel);
 			LoadToPanel(tabPage2, the_definition.Name, the_definition.BoolButtons, autofire, "", CreateNormalPanel);
@@ -172,7 +172,7 @@ namespace BizHawk.MultiClient
 			LoadPanels(cd.AllTrollers, cd.AllTrollersAutoFire, cd.AllTrollersAnalog);
 		}
 
-		private void LoadPanels(BizHawk.Client.Core.Config c)
+		private void LoadPanels(BizHawk.Client.Common.Config c)
 		{
 			LoadPanels(c.AllTrollers, c.AllTrollersAutoFire, c.AllTrollersAnalog);
 		}
@@ -358,10 +358,10 @@ namespace BizHawk.MultiClient
 		{
 			public Dictionary<string, Dictionary<string, string>> AllTrollers = new Dictionary<string, Dictionary<string, string>>();
 			public Dictionary<string, Dictionary<string, string>> AllTrollersAutoFire = new Dictionary<string, Dictionary<string, string>>();
-			public Dictionary<string, Dictionary<string, BizHawk.Client.Core.Config.AnalogBind>> AllTrollersAnalog = new Dictionary<string, Dictionary<string, BizHawk.Client.Core.Config.AnalogBind>>();
+			public Dictionary<string, Dictionary<string, BizHawk.Client.Common.Config.AnalogBind>> AllTrollersAnalog = new Dictionary<string, Dictionary<string, BizHawk.Client.Common.Config.AnalogBind>>();
 		}
 
-		public static void ConfigCheckAllControlDefaults(BizHawk.Client.Core.Config c)
+		public static void ConfigCheckAllControlDefaults(BizHawk.Client.Common.Config c)
 		{
 			if (c.AllTrollers.Count == 0 && c.AllTrollersAutoFire.Count == 0 && c.AllTrollersAnalog.Count == 0)
 			{
@@ -382,7 +382,7 @@ namespace BizHawk.MultiClient
 				cd = ConfigService.Load(ControlDefaultPath, cd);
 				cd.AllTrollers[the_definition.Name] = new Dictionary<string, string>();
 				cd.AllTrollersAutoFire[the_definition.Name] = new Dictionary<string, string>();
-				cd.AllTrollersAnalog[the_definition.Name] = new Dictionary<string, BizHawk.Client.Core.Config.AnalogBind>();
+				cd.AllTrollersAnalog[the_definition.Name] = new Dictionary<string, BizHawk.Client.Common.Config.AnalogBind>();
 
 				SaveToDefaults(cd);
 

BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {
@@ -19,10 +19,10 @@ namespace BizHawk.MultiClient
 		}
 
 		public string ButtonName;
-		public BizHawk.Client.Core.Config.AnalogBind Bind;
+		public BizHawk.Client.Common.Config.AnalogBind Bind;
 		bool listening = false;
 
-		public AnalogBindControl(string ButtonName, BizHawk.Client.Core.Config.AnalogBind Bind)
+		public AnalogBindControl(string ButtonName, BizHawk.Client.Common.Config.AnalogBind Bind)
 			: this()
 		{
 			this.Bind = Bind;

BizHawk.MultiClient/config/ControllerConfig/AnalogBindPanel.cs

@@ -5,15 +5,15 @@ using System.Text;
 using System.Windows.Forms;
 using System.Drawing;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {
 	class AnalogBindPanel : UserControl
 	{
-		Dictionary<string, BizHawk.Client.Core.Config.AnalogBind> RealConfigObject;
+		Dictionary<string, BizHawk.Client.Common.Config.AnalogBind> RealConfigObject;
 
-		public AnalogBindPanel(Dictionary<string, BizHawk.Client.Core.Config.AnalogBind> RealConfigObject, List<string> RealConfigButtons = null)
+		public AnalogBindPanel(Dictionary<string, BizHawk.Client.Common.Config.AnalogBind> RealConfigObject, List<string> RealConfigButtons = null)
 			:base()
 		{
 			this.RealConfigObject = RealConfigObject;
@@ -40,7 +40,7 @@ namespace BizHawk.MultiClient
 		/// save to config
 		/// </summary>
 		/// <param name="SaveConfigObject">if non-null, save to possibly different config object than originally initialized from</param>
-		public void Save(Dictionary<string, BizHawk.Client.Core.Config.AnalogBind> SaveConfigObject = null)
+		public void Save(Dictionary<string, BizHawk.Client.Common.Config.AnalogBind> SaveConfigObject = null)
 		{
 			var saveto = SaveConfigObject ?? RealConfigObject;
 			foreach (Control c in Controls)

BizHawk.MultiClient/config/FirmwaresConfig.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 //notes: eventually, we intend to have a "firmware acquisition interface" exposed to the emulator cores.
 //it will be implemented by the multiclient, and use firmware keys to fetch the firmware content.

BizHawk.MultiClient/config/GifAnimator.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/config/HotkeyConfig.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/config/MessageConfig.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/config/PathConfig.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/config/PathManager.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.IO;
 using System.Reflection;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/config/RewindConfig.cs

@@ -2,7 +2,7 @@
 using System.Windows.Forms;
 using System.Drawing;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/config/SoundConfig.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/movie/InputAdapters.cs

@@ -2,7 +2,7 @@
 using System.Text;
 using System.Collections.Generic;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/movie/Movie.cs

@@ -3,7 +3,7 @@ using System.IO;
 using System.Windows.Forms;
 using System.Globalization;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/movie/MovieHeader.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Linq;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/movie/MovieImport.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.IO;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 #pragma warning disable 219
 

BizHawk.MultiClient/movie/MovieMnemonics.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/movie/PlayMovie.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Windows.Forms;
 using System.IO;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/movie/RecordMovie.cs

@@ -2,7 +2,7 @@
 using System.Windows.Forms;
 using System.IO;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 using BizHawk.Emulation.Consoles.GB;
 using BizHawk.Emulation.Consoles.Nintendo.SNES;
 using BizHawk.Emulation.Consoles.Sega;

BizHawk.MultiClient/tools/Cheats/Cheat.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/Cheats/CheatEdit.Designer.cs

@@ -231,7 +231,7 @@
 			// 
 			// CompareBox
 			// 
-			this.CompareBox.ByteSize = BizHawk.Client.Core.Watch.WatchSize.Byte;
+			this.CompareBox.ByteSize = BizHawk.Client.Common.Watch.WatchSize.Byte;
 			this.CompareBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
 			this.CompareBox.Location = new System.Drawing.Point(113, 91);
 			this.CompareBox.MaxLength = 2;
@@ -240,11 +240,11 @@
 			this.CompareBox.Size = new System.Drawing.Size(65, 20);
 			this.CompareBox.TabIndex = 15;
 			this.CompareBox.Text = "00";
-			this.CompareBox.Type = BizHawk.Client.Core.Watch.DisplayType.Hex;
+			this.CompareBox.Type = BizHawk.Client.Common.Watch.DisplayType.Hex;
 			// 
 			// ValueBox
 			// 
-			this.ValueBox.ByteSize = BizHawk.Client.Core.Watch.WatchSize.Byte;
+			this.ValueBox.ByteSize = BizHawk.Client.Common.Watch.WatchSize.Byte;
 			this.ValueBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
 			this.ValueBox.Location = new System.Drawing.Point(113, 65);
 			this.ValueBox.MaxLength = 2;
@@ -253,7 +253,7 @@
 			this.ValueBox.Size = new System.Drawing.Size(65, 20);
 			this.ValueBox.TabIndex = 12;
 			this.ValueBox.Text = "00";
-			this.ValueBox.Type = BizHawk.Client.Core.Watch.DisplayType.Hex;
+			this.ValueBox.Type = BizHawk.Client.Common.Watch.DisplayType.Hex;
 			// 
 			// CheatEdit
 			// 

BizHawk.MultiClient/tools/Cheats/CheatEdit.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/Cheats/CheatForm.cs

@@ -9,7 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 using BizHawk.Emulation.Consoles.Nintendo.SNES;
 using BizHawk.Emulation.Consoles.Nintendo;
 using BizHawk.Emulation.Consoles.Sega;

BizHawk.MultiClient/tools/Cheats/CheatList.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/GB/CGBColorChooserForm.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using BizHawk.Emulation.Consoles.GB;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient.GBtools
 {

BizHawk.MultiClient/tools/GB/ColorChooserForm.cs

@@ -4,7 +4,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using System.IO;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient.GBtools
 {

BizHawk.MultiClient/tools/GB/DualGBFileSelector.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient.GBtools
 {

BizHawk.MultiClient/tools/GB/GBGPUView.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient.GBtools
 {

BizHawk.MultiClient/tools/GB/GBGameGenie.cs

@@ -5,7 +5,7 @@ using System.Windows.Forms;
 using System.Globalization;
 using System.Text.RegularExpressions;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/Genesis/GenGameGenie.cs

@@ -5,7 +5,7 @@ using System.Windows.Forms;
 using System.Globalization;
 using System.Text.RegularExpressions;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 using BizHawk.Emulation.Consoles.Sega;
 
 #pragma warning disable 675 //TOOD: fix the potential problem this is masking

BizHawk.MultiClient/tools/HexEditor/HexColor.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/HexEditor/HexEditor.cs

@@ -8,7 +8,7 @@ using System.Windows.Forms;
 using System.Globalization;
 using System.IO;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/HexEditor/MemoryViewer.cs

@@ -4,7 +4,7 @@ using System.Windows.Forms;
 using System.Text;
 using System.Globalization;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/InputPrompt.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/Lua/LuaConsole.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Windows.Forms;
 using System.IO;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/Lua/LuaImplementation.cs

@@ -8,7 +8,7 @@ using System.Drawing;
 using System.Threading;
 using System.Globalization;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 using BizHawk.Emulation.Consoles.Nintendo;
 using System.Text;
 

BizHawk.MultiClient/tools/Lua/LuaTextBox.cs

@@ -1,6 +1,6 @@
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient.tools
 {

BizHawk.MultiClient/tools/Lua/LuaWriter.cs

@@ -7,7 +7,7 @@ using System.Windows.Forms;
 using System.Text.RegularExpressions;
 using System.IO;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/Lua/LuaWriterColorConfig.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/N64/N64VideoPluginconfig.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/NES/NESDebugger.cs

@@ -4,7 +4,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using BizHawk.Emulation.Consoles.Nintendo;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/NES/NESGameGenie.cs

@@ -4,7 +4,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using System.Globalization;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 using BizHawk.Emulation.Consoles.Nintendo;
 
 namespace BizHawk.MultiClient

BizHawk.MultiClient/tools/NES/NESGraphicsConfig.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using BizHawk.Emulation.Consoles.Nintendo;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/NES/NESNameTableViewer.cs

@@ -4,7 +4,7 @@ using System.Drawing.Imaging;
 using System.Windows.Forms;
 using BizHawk.Emulation.Consoles.Nintendo;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/NES/NESPPU.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using System.Globalization;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 using BizHawk.Emulation.Consoles.Nintendo;
 
 namespace BizHawk.MultiClient

BizHawk.MultiClient/tools/NES/NESSoundConfig.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/NES/NameTableViewer.cs

@@ -3,7 +3,7 @@ using System.Windows.Forms;
 using System.IO;
 using System.Drawing.Imaging;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/NES/PaletteViewer.cs

@@ -3,7 +3,7 @@ using System.Windows.Forms;
 using System.IO;
 using System.Drawing.Imaging;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/NES/PatternViewer.cs

@@ -3,7 +3,7 @@ using System.Windows.Forms;
 using System.IO;
 using System.Drawing.Imaging;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/NES/SpriteViewer.cs

@@ -3,7 +3,7 @@ using System.Windows.Forms;
 using System.IO;
 using System.Drawing.Imaging;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/PCE/PCEBGViewer.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using System.Drawing.Imaging;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 using BizHawk.Emulation.Consoles.TurboGrafx;
 
 namespace BizHawk.MultiClient

BizHawk.MultiClient/tools/PCE/PCEGraphicsConfig.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/SMS/SMSGraphicsConfig.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/SNES/SNESGameGenie.cs

@@ -6,7 +6,7 @@ using System.Globalization;
 using System.Text.RegularExpressions;
 using BizHawk.Emulation.Consoles.Nintendo.SNES;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/SNES/SNESGraphicsDebugger.cs

@@ -29,7 +29,7 @@ using System.Drawing;
 using System.Reflection;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 using BizHawk.Emulation.Consoles.Nintendo.SNES;
 using BizHawk.Core;
 

BizHawk.MultiClient/tools/Saturn/SaturnPrefs.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/StateVisualizer.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using System.IO;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/TAStudio.cs

@@ -4,7 +4,7 @@ using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/TI83/TI83KeyPad.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Windows.Forms;
 
 using BizHawk.Emulation.Consoles.Calculator;
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/ToolBox.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 using BizHawk.Emulation.Consoles.Nintendo;
 using BizHawk.Emulation.Consoles.Calculator;
 using BizHawk.Emulation.Consoles.Nintendo.SNES;

BizHawk.MultiClient/tools/ToolHelpers.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/TraceLogger.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Windows.Forms;
 using System.IO;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.cs

@@ -4,7 +4,7 @@ using System.Drawing;
 using System.Windows.Forms;
 
 using BizHawk.Emulation.Consoles.Nintendo.N64;
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.cs

@@ -4,7 +4,7 @@ using System.Windows.Forms;
 using System.Collections.Generic;
 using System.Linq;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/Watch/RamPoke.Designer.cs

@@ -99,7 +99,7 @@
 			// 
 			// ValueBox
 			// 
-			this.ValueBox.ByteSize = BizHawk.Client.Core.Watch.WatchSize.Byte;
+			this.ValueBox.ByteSize = BizHawk.Client.Common.Watch.WatchSize.Byte;
 			this.ValueBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
 			this.ValueBox.Location = new System.Drawing.Point(82, 57);
 			this.ValueBox.MaxLength = 9;
@@ -108,7 +108,7 @@
 			this.ValueBox.Size = new System.Drawing.Size(116, 20);
 			this.ValueBox.TabIndex = 10;
 			this.ValueBox.Text = "0000";
-			this.ValueBox.Type = BizHawk.Client.Core.Watch.DisplayType.Hex;
+			this.ValueBox.Type = BizHawk.Client.Common.Watch.DisplayType.Hex;
 			// 
 			// ValueHexLabel
 			// 

BizHawk.MultiClient/tools/Watch/RamPoke.cs

@@ -4,7 +4,7 @@ using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/Watch/RamSearch.Designer.cs

@@ -1352,7 +1352,7 @@
 			// 
 			this.SpecificValueBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.SpecificValueBox.ByteSize = BizHawk.Client.Core.Watch.WatchSize.Byte;
+			this.SpecificValueBox.ByteSize = BizHawk.Client.Common.Watch.WatchSize.Byte;
 			this.SpecificValueBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
 			this.SpecificValueBox.Enabled = false;
 			this.SpecificValueBox.Location = new System.Drawing.Point(114, 38);
@@ -1362,7 +1362,7 @@
 			this.SpecificValueBox.Size = new System.Drawing.Size(72, 20);
 			this.SpecificValueBox.TabIndex = 15;
 			this.SpecificValueBox.Text = "00";
-			this.SpecificValueBox.Type = BizHawk.Client.Core.Watch.DisplayType.Hex;
+			this.SpecificValueBox.Type = BizHawk.Client.Common.Watch.DisplayType.Hex;
 			this.SpecificValueBox.TextChanged += new System.EventHandler(this.CompareToValue_TextChanged);
 			// 
 			// RamSearch

BizHawk.MultiClient/tools/Watch/RamSearch.cs

@@ -10,7 +10,7 @@ using System.Windows.Forms;
 using System.IO;
 using System.Globalization;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {

BizHawk.MultiClient/tools/Watch/RamSearchEngine.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-using BizHawk.Client.Core;
+using BizHawk.Client.Common;
 
 namespace BizHawk.MultiClient
 {