-#define JOY_BUTTON_1 (1 << 4)
-#define JOY_BUTTON_2 (1 << 5)
-#define JOY_BUTTON (JOY_BUTTON_1 | JOY_BUTTON_2)
+#define JOY_BUTTON_1 KEY_BUTTON_1
+#define JOY_BUTTON_2 KEY_BUTTON_2
+#define JOY_MOTION KEY_MOTION
+#define JOY_BUTTON KEY_BUTTON
+#define JOY_ACTION KEY_ACTION