Fix shortcut flickering. Should be handled with care, dnSpy is a bitch.

KH-ReFined · Feb 27, 2022 · 994d592 · 994d592
1 parent 3fb9774
commit 994d592
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/KH2/Functions.cs b/KH2/Functions.cs
@@ -11,6 +11,7 @@
 using System.Text;
 using System.Linq;
 using System.Diagnostics;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
 using DiscordRPC;
@@ -391,21 +392,29 @@ public static void OverrideText()
         public static void OverrideShortcuts()
         {
             var _confirmRead = Hypervisor.Read<byte>(Variables.ConfirmAddress);
-            var _shortRead = Hypervisor.Read<ushort>(Variables.ShortcutStartAddress);
+                            Hypervisor.UnlockBlock(Variables.ShortcutStartAddress);
 
 
-            if (_confirmRead == 0x00 && _shortRead != 0x02BA)
+            if (_confirmRead == 0x00)
             {
-                Hypervisor.UnlockBlock(Variables.ShortcutStartAddress);
-                Hypervisor.Write<ushort>(Variables.ShortcutStartAddress, 0x02BA);
-                Hypervisor.Write<ushort>(Variables.ShortcutStartAddress + 0x06, 0x02AB);
+                var _shortRead = Hypervisor.Read<ushort>(Variables.ShortcutStartAddress);
+
+                if (_shortRead != 0x02BA)
+                {
+                    Hypervisor.Write<ushort>(Variables.ShortcutStartAddress, 0x02BA);
+                    Hypervisor.Write<ushort>(Variables.ShortcutStartAddress + 0x06, 0x02AB);
+                }
             }
 
-            else if (_confirmRead == 0x01 && _shortRead != 0x02AB)
+            else if (_confirmRead == 0x01)
             {
-                Hypervisor.UnlockBlock(Variables.ShortcutStartAddress);
-                Hypervisor.Write<ushort>(Variables.ShortcutStartAddress, 0x02AB);
-                Hypervisor.Write<ushort>(Variables.ShortcutStartAddress + 0x06, 0x02BA);
+                var _shortRead = Hypervisor.Read<ushort>(Variables.ShortcutStartAddress);
+
+                if (_shortRead != 0x02AB)
+                {
+                    Hypervisor.Write<ushort>(Variables.ShortcutStartAddress, 0x02AB);
+                    Hypervisor.Write<ushort>(Variables.ShortcutStartAddress + 0x06, 0x02BA);
+                }
             }
         }