Fixed _textcolor definition.

[cc65] / include / gamate.h

diff --git a/include/gamate.h b/include/gamate.h
index 7355ede84da6d8eb679653fe6b855baa29662d0d..0af21623d102664028703034e82831cf62ca96a9 100644 (file)
--- a/include/gamate.h
+++ b/include/gamate.h
@@ -170,16 +170,25 @@
 /* No support for dynamically loadable drivers */
 #define DYN_DRV         0
 
-/* Expanding upon joystick.h */
-#define JOY_BTN_A_IDX           4
-#define JOY_BTN_B_IDX           5
-#define JOY_START_IDX           6
-#define JOY_SELECT_IDX          7
-
-#define JOY_BTN_A(v)            ((v) & joy_masks[JOY_BTN_A_IDX])
-#define JOY_BTN_B(v)            ((v) & joy_masks[JOY_BTN_B_IDX])
-#define JOY_START(v)            ((v) & joy_masks[JOY_START_IDX])
-#define JOY_SELECT(v)           ((v) & joy_masks[JOY_SELECT_IDX])
+/* Masks for joy_read */
+#define JOY_UP_MASK     0x01
+#define JOY_DOWN_MASK   0x02
+#define JOY_LEFT_MASK   0x04
+#define JOY_RIGHT_MASK  0x08
+#define JOY_BTN_1_MASK  0x10
+#define JOY_BTN_2_MASK  0x20
+#define JOY_BTN_3_MASK  0x40
+#define JOY_BTN_4_MASK  0x80
+
+#define JOY_BTN_A_MASK  JOY_BTN_1_MASK
+#define JOY_BTN_B_MASk  JOY_BTN_2_MASK
+#define JOY_START_MASK  JOY_BTN_3_MASK
+#define JOY_SELECT_MASK JOY_BTN_4_MASK
+
+#define JOY_BTN_A(v)    ((v) & JOY_BTN_A_MASK)
+#define JOY_BTN_B(v)    ((v) & JOY_BTN_B_MASK)
+#define JOY_START(v)    ((v) & JOY_START_MASK)
+#define JOY_SELECT(v)   ((v) & JOY_SELECT_MASK)
 
 /* The addresses of the static drivers */
 extern void gamate_stdjoy_joy[];   /* Referred to by joy_static_stddrv[] */