#define TGI_COLOR_LIGHTBLUE COLOR_LIGHTBLUE
#define TGI_COLOR_WHITE COLOR_WHITE
-/* No support for dynamically loadable drivers */
-#define DYN_DRV 0
-
+/* Masks for joy_read */
+#define JOY_UP_MASK 0x80
+#define JOY_DOWN_MASK 0x40
+#define JOY_LEFT_MASK 0x20
+#define JOY_RIGHT_MASK 0x10
+#define JOY_BTN_1_MASK 0x01
+#define JOY_BTN_2_MASK 0x02
+#define JOY_BTN_A_MASK JOY_BTN_1_MASK
+#define JOY_BTN_B_MASK JOY_BTN_2_MASK
-/* Expanding upon joystick.h */
-#define JOY_BTN_A_IDX 4
-#define JOY_BTN_B_IDX 5
+#define JOY_BTN_A(v) ((v) & JOY_BTN_A_MASK)
+#define JOY_BTN_B(v) ((v) & JOY_BTN_B_MASK)
-#define JOY_BTN_A(v) ((v) & joy_masks[JOY_BTN_A_IDX])
-#define JOY_BTN_B(v) ((v) & joy_masks[JOY_BTN_B_IDX])
+/* No support for dynamically loadable drivers */
+#define DYN_DRV 0