#define JOY_RIGHT MV_RIGHT
#define JOY_UP MV_UP
#define JOY_DOWN MV_DOWN
-#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
#define JOY_BUTTON_NOT_PRESSED 0
#define JOY_BUTTON_PRESSED 1
int AnyJoystick(void);
int AnyJoystickButton(void);
-void DeactivateJoystickForCalibration();
-void ActivateJoystickIfAvailable();
+void DeactivateJoystick();
+void ActivateJoystick();
#endif /* JOYSTICK_H */