From 699a326b4c7df2d2e3029cb902dde8950832f6f0 Mon Sep 17 00:00:00 2001
From: Cooliokid956 <68075390+Cooliokid956@users.noreply.github.com>
Date: Sun, 19 Oct 2025 19:01:38 -0500
Subject: [PATCH] That should be that

I have tested it, scroll works on the Up input, and on a regular input, so does everything else
---
 src/pc/controller/controller_sdl2.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pc/controller/controller_sdl2.c b/src/pc/controller/controller_sdl2.c
index 1784c883f..95dafbed1 100644
--- a/src/pc/controller/controller_sdl2.c
+++ b/src/pc/controller/controller_sdl2.c
@@ -190,10 +190,11 @@ static void controller_sdl_read(OSContPad *pad) {
     controller_mouse_read_relative();
     u32 mouse = mouse_buttons;
 
+    u32 buttons_down = 0;
     if (!gInteractableOverridePad) {
         for (u32 i = 0; i < num_mouse_binds; ++i)
             if (mouse & SDL_BUTTON(mouse_binds[i][0]))
-                pad->button |= mouse_binds[i][1];
+                buttons_down |= mouse_binds[i][1];
     }
     // remember buttons that changed from 0 to 1
     last_mouse = (mouse_prev ^ mouse) & mouse;
@@ -284,10 +285,12 @@ static void controller_sdl_read(OSContPad *pad) {
 
     for (u32 i = 0; i < num_joy_binds; ++i)
         if (joy_buttons[joy_binds[i][0]])
-            pad->button |= joy_binds[i][1];
+            buttons_down |= joy_binds[i][1];
 
-    const u32 xstick = pad->button & STICK_XMASK;
-    const u32 ystick = pad->button & STICK_YMASK;
+    pad->button |= buttons_down;
+
+    const u32 xstick = buttons_down & STICK_XMASK;
+    const u32 ystick = buttons_down & STICK_YMASK;
     if (xstick == STICK_LEFT)
         pad->stick_x = -128;
     else if (xstick == STICK_RIGHT)