From 7a987810eff1d3cc0f1c756aa7dedd2b6583f7d9 Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Tue, 21 Nov 2017 09:58:16 -0500 Subject: [PATCH] Cheats: Fix 2 byte return values Fixes #1060 --- BizHawk.Client.Common/tools/Cheat.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BizHawk.Client.Common/tools/Cheat.cs b/BizHawk.Client.Common/tools/Cheat.cs index 4680168276..28ab738080 100644 --- a/BizHawk.Client.Common/tools/Cheat.cs +++ b/BizHawk.Client.Common/tools/Cheat.cs @@ -288,17 +288,17 @@ namespace BizHawk.Client.Common { if (addr == _watch.Address) { - return (byte)(_val & 0xFF); + return (byte)(_val >> 8); } - return (byte)(_val >> 8); + return (byte)(_val & 0xFF); } else { if (addr == _watch.Address) { - return (byte)(_val >> 8); + return (byte)(_val & 0xFF); } - return (byte)(_val & 0xFF); + return (byte)(_val >> 8); } case WatchSize.DWord: if (_watch.BigEndian)