From e280199c128e4f80047fa860349252d717be55bc Mon Sep 17 00:00:00 2001
From: Redline <>
Date: Fri, 28 Mar 2025 09:32:49 +0100
Subject: [PATCH 1/3] Controller scrolling bug fix

---
 .../mc2hook/handlers/ControllerScrollingFixHandler.cpp    | 7 +++++++
 mc2hook/mc2hook/handlers/ControllerScrollingFixHandler.h  | 8 ++++++++
 mc2hook/mc2hook/handlers/handlers.h                       | 1 +
 mc2hook/mc2hook/mc2hook.vcxproj                           | 2 ++
 mc2hook/mc2hook/mc2hook.vcxproj.filters                   | 6 ++++++
 5 files changed, 24 insertions(+)
 create mode 100644 mc2hook/mc2hook/handlers/ControllerScrollingFixHandler.cpp
 create mode 100644 mc2hook/mc2hook/handlers/ControllerScrollingFixHandler.h

diff --git a/mc2hook/mc2hook/handlers/ControllerScrollingFixHandler.cpp b/mc2hook/mc2hook/handlers/ControllerScrollingFixHandler.cpp
new file mode 100644
index 0000000..0f00e7d
--- /dev/null
+++ b/mc2hook/mc2hook/handlers/ControllerScrollingFixHandler.cpp
@@ -0,0 +1,7 @@
+#include "ControllerScrollingFixHandler.h"
+
+void ControllerScrollingFixHandler::Install()
+{
+    // Fixes controller scrolling bug in the menu
+    mem::write(0x603EBA, 0x90E9);
+}
\ No newline at end of file
diff --git a/mc2hook/mc2hook/handlers/ControllerScrollingFixHandler.h b/mc2hook/mc2hook/handlers/ControllerScrollingFixHandler.h
new file mode 100644
index 0000000..485c581
--- /dev/null
+++ b/mc2hook/mc2hook/handlers/ControllerScrollingFixHandler.h
@@ -0,0 +1,8 @@
+#pragma once
+#include <mc2hook\mc2hook.h>
+
+class ControllerScrollingFixHandler
+{
+public:
+    static void Install();
+};
\ No newline at end of file
diff --git a/mc2hook/mc2hook/handlers/handlers.h b/mc2hook/mc2hook/handlers/handlers.h
index ea7a661..4da3dc1 100644
--- a/mc2hook/mc2hook/handlers/handlers.h
+++ b/mc2hook/mc2hook/handlers/handlers.h
@@ -50,6 +50,7 @@ static void InstallMainHandlers()
     InstallHandler<ChatHandler>("Chat Handler");
     InstallHandler<InitHandler>("Game Init Handler");
     InstallHandler<ReflectionFidelityHandler>("Reflection Fidelity Handller");
+    InstallHandler<ControllerScrollingFixHandler>("Controller Scrolling Fix");
 
     InstallHandler<StateResearchHook>("SRH");
 }
\ No newline at end of file
diff --git a/mc2hook/mc2hook/mc2hook.vcxproj b/mc2hook/mc2hook/mc2hook.vcxproj
index 056702b..0fd255d 100644
--- a/mc2hook/mc2hook/mc2hook.vcxproj
+++ b/mc2hook/mc2hook/mc2hook.vcxproj
@@ -189,6 +189,7 @@
     <ClInclude Include="framework\hook_output.h" />
     <ClInclude Include="handlers\BorderlessHandler.h" />
     <ClInclude Include="handlers\ChatHandler.h" />
+    <ClInclude Include="handlers\ControllerScrollingFixHandler.h" />
     <ClInclude Include="handlers\CustomExceptionHandler.h" />
     <ClInclude Include="handlers\CustomVehicleHandler.h" />
     <ClInclude Include="handlers\FontCrashFixHandler.h" />
@@ -242,6 +243,7 @@
     <ClCompile Include="framework\hook_output.cpp" />
     <ClCompile Include="handlers\BorderlessHandler.cpp" />
     <ClCompile Include="handlers\ChatHandler.cpp" />
+    <ClCompile Include="handlers\ControllerScrollingFixHandler.cpp" />
     <ClCompile Include="handlers\CustomExceptionHandler.cpp" />
     <ClCompile Include="handlers\CustomVehicleHandler.cpp" />
     <ClCompile Include="handlers\FontCrashFixHandler.cpp" />
diff --git a/mc2hook/mc2hook/mc2hook.vcxproj.filters b/mc2hook/mc2hook/mc2hook.vcxproj.filters
index 027b650..484d9fb 100644
--- a/mc2hook/mc2hook/mc2hook.vcxproj.filters
+++ b/mc2hook/mc2hook/mc2hook.vcxproj.filters
@@ -219,6 +219,9 @@
     <ClInclude Include="handlers\ReflectionFidelityHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="handlers\ControllerScrollingFixHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">
@@ -341,5 +344,8 @@
     <ClCompile Include="handlers\ReflectionFidelityHandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="handlers\ControllerScrollingFixHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file

From 2be18b91d2f80080ee3fb10d81b980d04872f54c Mon Sep 17 00:00:00 2001
From: Redline <>
Date: Fri, 28 Mar 2025 09:59:30 +0100
Subject: [PATCH 2/3] Include header file

---
 mc2hook/mc2hook/handlers/handlers.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mc2hook/mc2hook/handlers/handlers.h b/mc2hook/mc2hook/handlers/handlers.h
index 4da3dc1..657783e 100644
--- a/mc2hook/mc2hook/handlers/handlers.h
+++ b/mc2hook/mc2hook/handlers/handlers.h
@@ -17,6 +17,7 @@
 #include <handlers\InputHandler.h>
 #include <handlers\BorderlessHandler.h>
 #include <handlers\ReflectionFidelityHandler.h>
+#include <handlers/ControllerScrollingFixHandler.h>
 
 #include <handlers\StateResearchHook.h>
 

From 4970ab5cd12d240d5379cefcd0294dc1d590faf9 Mon Sep 17 00:00:00 2001
From: Redline <>
Date: Wed, 14 May 2025 20:06:57 +0200
Subject: [PATCH 3/3] Made controller scrolling fix toggleable through .ini

---
 .../mc2hook/handlers/ControllerScrollingFixHandler.cpp    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mc2hook/mc2hook/handlers/ControllerScrollingFixHandler.cpp b/mc2hook/mc2hook/handlers/ControllerScrollingFixHandler.cpp
index 0f00e7d..d788580 100644
--- a/mc2hook/mc2hook/handlers/ControllerScrollingFixHandler.cpp
+++ b/mc2hook/mc2hook/handlers/ControllerScrollingFixHandler.cpp
@@ -2,6 +2,10 @@
 
 void ControllerScrollingFixHandler::Install()
 {
-    // Fixes controller scrolling bug in the menu
-    mem::write(0x603EBA, 0x90E9);
+    bool enableMenuScrollFix = HookConfig::GetBool("Experimental", "MenuScrollFix", true);
+    if (enableMenuScrollFix)
+    {
+        // Fixes controller scrolling bug in the menu
+        mem::write(0x603EBA, 0x90E9);
+    }
 }
\ No newline at end of file