replaced some constants with joystick enum references