diff --git a/src/BizHawk.Client.Common/tools/Cheat.cs b/src/BizHawk.Client.Common/tools/Cheat.cs
index ec1901038d..9c5551d269 100644
--- a/src/BizHawk.Client.Common/tools/Cheat.cs
+++ b/src/BizHawk.Client.Common/tools/Cheat.cs
@@ -173,42 +173,42 @@ namespace BizHawk.Client.Common
default:
case CompareType.None: // This should never happen, but it's here just in case. adelikat: And yet it does! Cheat Code converter doesn't do this. Changing this to default to equal since 99.9999% of all cheats are going to be equals
case CompareType.Equal:
- if (_compare.Value == _watch.ValueNoFreeze)
+ if (_compare.Value == _watch.Value)
{
_watch.Poke(GetStringForPulse(_val));
}
break;
case CompareType.GreaterThan:
- if (_compare.Value > _watch.ValueNoFreeze)
+ if (_compare.Value > _watch.Value)
{
_watch.Poke(GetStringForPulse(_val));
}
break;
case CompareType.GreaterThanOrEqual:
- if (_compare.Value >= _watch.ValueNoFreeze)
+ if (_compare.Value >= _watch.Value)
{
_watch.Poke(GetStringForPulse(_val));
}
break;
case CompareType.LessThan:
- if (_compare.Value < _watch.ValueNoFreeze)
+ if (_compare.Value < _watch.Value)
{
_watch.Poke(GetStringForPulse(_val));
}
break;
case CompareType.LessThanOrEqual:
- if (_compare.Value <= _watch.ValueNoFreeze)
+ if (_compare.Value <= _watch.Value)
{
_watch.Poke(GetStringForPulse(_val));
}
break;
case CompareType.NotEqual:
- if (_compare.Value != _watch.ValueNoFreeze)
+ if (_compare.Value != _watch.Value)
{
_watch.Poke(GetStringForPulse(_val));
}
diff --git a/src/BizHawk.Client.Common/tools/Watch/ByteWatch.cs b/src/BizHawk.Client.Common/tools/Watch/ByteWatch.cs
index ae16eaf750..46f3b9de30 100644
--- a/src/BizHawk.Client.Common/tools/Watch/ByteWatch.cs
+++ b/src/BizHawk.Client.Common/tools/Watch/ByteWatch.cs
@@ -207,13 +207,6 @@ namespace BizHawk.Client.Common
///
public override int Value => GetByte();
- ///
- /// Gets the current value
- /// but with stuff I don't understand
- ///
- /// zero 15-nov-2015 - bypass LIAR LOGIC, see fdc9ea2aa922876d20ba897fb76909bf75fa6c92 https://github.com/TASVideos/BizHawk/issues/326
- public override int ValueNoFreeze => GetByte(true);
-
///
/// Get a string representation of the current value
///
diff --git a/src/BizHawk.Client.Common/tools/Watch/DWordWatch.cs b/src/BizHawk.Client.Common/tools/Watch/DWordWatch.cs
index b485f94d8e..4a4f7e1d95 100644
--- a/src/BizHawk.Client.Common/tools/Watch/DWordWatch.cs
+++ b/src/BizHawk.Client.Common/tools/Watch/DWordWatch.cs
@@ -242,12 +242,6 @@ namespace BizHawk.Client.Common
///
public override int Value => (int)GetDWord();
- ///
- /// Gets the current value
- /// but with stuff I don't understand
- ///
- public override int ValueNoFreeze => (int)GetDWord(true);
-
///
/// Get a string representation of the current value
///
diff --git a/src/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs b/src/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs
index f8152107a9..c81b221228 100644
--- a/src/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs
+++ b/src/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs
@@ -43,11 +43,6 @@ namespace BizHawk.Client.Common
///
public override int Value => 0;
- ///
- /// Ignore that stuff
- ///
- public override int ValueNoFreeze => 0;
-
///
/// Ignore that stuff
///
diff --git a/src/BizHawk.Client.Common/tools/Watch/Watch.cs b/src/BizHawk.Client.Common/tools/Watch/Watch.cs
index dfd50ecca2..5ace10ed4e 100644
--- a/src/BizHawk.Client.Common/tools/Watch/Watch.cs
+++ b/src/BizHawk.Client.Common/tools/Watch/Watch.cs
@@ -265,14 +265,8 @@ namespace BizHawk.Client.Common
///
public abstract void Update();
- protected byte GetByte(bool bypassFreeze = false)
+ protected byte GetByte()
{
- if (!bypassFreeze && Global.CheatList.IsActive(_domain, Address))
- {
- // LIAR logic
- return Global.CheatList.GetByteValue(_domain, Address) ?? 0;
- }
-
if (_domain.Size == 0)
{
return _domain.PeekByte(Address);
@@ -281,14 +275,8 @@ namespace BizHawk.Client.Common
return _domain.PeekByte(Address % _domain.Size);
}
- protected ushort GetWord(bool bypassFreeze = false)
+ protected ushort GetWord()
{
- if (!bypassFreeze && Global.CheatList.IsActive(_domain, Address))
- {
- // LIAR logic
- return (ushort)(Global.CheatList.GetCheatValue(_domain, Address, WatchSize.Word) ?? 0);
- }
-
if (_domain.Size == 0)
{
return _domain.PeekUshort(Address, BigEndian);
@@ -297,14 +285,8 @@ namespace BizHawk.Client.Common
return _domain.PeekUshort(Address % _domain.Size, BigEndian); // TODO: % size still isn't correct since it could be the last byte of the domain
}
- protected uint GetDWord(bool bypassFreeze = false)
+ protected uint GetDWord()
{
- if (!bypassFreeze && Global.CheatList.IsActive(_domain, Address))
- {
- // LIAR logic
- return (uint)(Global.CheatList.GetCheatValue(_domain, Address, WatchSize.DWord) ?? 0);
- }
-
if (_domain.Size == 0)
{
return _domain.PeekUint(Address, BigEndian); // TODO: % size still isn't correct since it could be the last byte of the domain
@@ -485,13 +467,6 @@ namespace BizHawk.Client.Common
///
public abstract int Value { get; }
- ///
- /// Gets the current value
- /// but with stuff I don't understand
- ///
- /// zero 15-nov-2015 - bypass LIAR LOGIC, see fdc9ea2aa922876d20ba897fb76909bf75fa6c92 https://github.com/TASVideos/BizHawk/issues/326
- public abstract int ValueNoFreeze { get; }
-
///
/// Gets a string representation of the current value
///
diff --git a/src/BizHawk.Client.Common/tools/Watch/WordWatch.cs b/src/BizHawk.Client.Common/tools/Watch/WordWatch.cs
index b3ecda30e4..43d8f02bde 100644
--- a/src/BizHawk.Client.Common/tools/Watch/WordWatch.cs
+++ b/src/BizHawk.Client.Common/tools/Watch/WordWatch.cs
@@ -221,12 +221,6 @@ namespace BizHawk.Client.Common
///
public override int Value => GetWord();
- ///
- /// Gets the current value
- /// but with stuff I don't understand
- ///
- public override int ValueNoFreeze => GetWord(true);
-
///
/// Get a string representation of the current value
///