diff --git a/packages/games/tools/351files/patches/handheld/rg552.patch b/packages/games/tools/351files/patches/handheld/device.patch
similarity index 94%
rename from packages/games/tools/351files/patches/handheld/rg552.patch
rename to packages/games/tools/351files/patches/handheld/device.patch
index a6bce88c7..388af95c9 100644
--- a/packages/games/tools/351files/patches/handheld/rg552.patch
+++ b/packages/games/tools/351files/patches/handheld/device.patch
@@ -42,10 +42,10 @@ index 92d1a01..db4fec4 100644
  // Button events
 -#if defined(DEVICE_RG351P)
 +#if defined(DEVICE_handheld)
-+   #define BUTTON_PRESSED_UP              event.type == SDL_JOYBUTTONDOWN && event.jbutton.button == 13
-+   #define BUTTON_PRESSED_DOWN            event.type == SDL_JOYBUTTONDOWN && event.jbutton.button == 14
-+   #define BUTTON_PRESSED_LEFT            event.type == SDL_JOYBUTTONDOWN && event.jbutton.button == 15
-+   #define BUTTON_PRESSED_RIGHT           event.type == SDL_JOYBUTTONDOWN && event.jbutton.button == 16
++   #define BUTTON_PRESSED_UP              event.type == SDL_JOYBUTTONDOWN && event.jhat.value == SDL_HAT_UP
++   #define BUTTON_PRESSED_DOWN            event.type == SDL_JOYBUTTONDOWN && event.jhat.value == SDL_HAT_DOWN
++   #define BUTTON_PRESSED_LEFT            event.type == SDL_JOYBUTTONDOWN && event.jhat.value == SDL_HAT_LEFT
++   #define BUTTON_PRESSED_RIGHT           event.type == SDL_JOYBUTTONDOWN && event.jhat.value == SDL_HAT_RIGHT
 +   #define BUTTON_PRESSED_PAGEUP          event.type == SDL_JOYBUTTONDOWN && (event.jbutton.button == 4 || event.jbutton.button == 6)
 +   #define BUTTON_PRESSED_PAGEDOWN        event.type == SDL_JOYBUTTONDOWN && (event.jbutton.button == 5 || event.jbutton.button == 7)
 +   #define BUTTON_PRESSED_VALIDATE        event.type == SDL_JOYBUTTONDOWN && event.jbutton.button == 1