X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fnes.h;h=217a90779ac716b6c644b6f8105d4216b76e896d;hb=2eac69a94361323bf7556d2cdde8f61c85c5ef99;hp=0b65cdbe4148ecf18d3fac7edfef3325ddc85c17;hpb=c802c9c946376801a0bbf5c501f5f73716c2b00f;p=cc65

diff --git a/include/nes.h b/include/nes.h
index 0b65cdbe4..217a90779 100644
--- a/include/nes.h
+++ b/include/nes.h
@@ -82,6 +82,26 @@
 #define COLOR_LIGHTBLUE         0x0E
 #define COLOR_GRAY3             0x0F
 
+/* Masks for joy_read */
+#define JOY_UP_MASK     0x10
+#define JOY_DOWN_MASK   0x20
+#define JOY_LEFT_MASK   0x40
+#define JOY_RIGHT_MASK  0x80
+#define JOY_BTN_1_MASK  0x01
+#define JOY_BTN_2_MASK  0x02
+#define JOY_BTN_3_MASK  0x04
+#define JOY_BTN_4_MASK  0x08
+
+#define JOY_BTN_A_MASK  JOY_BTN_1_MASK
+#define JOY_BTN_B_MASK  JOY_BTN_2_MASK
+#define JOY_SELECT_MASK JOY_BTN_3_MASK
+#define JOY_START_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_SELECT(v)   ((v) & JOY_SELECT_MASK)
+#define JOY_START(v)    ((v) & JOY_START_MASK)
+
 /* Return codes of get_tv */
 #define TV_NTSC         0
 #define TV_PAL          1
@@ -90,17 +110,6 @@
 /* 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_SELECT_IDX          6
-#define JOY_START_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_SELECT(v)           ((v) & joy_masks[JOY_SELECT_IDX])
-#define JOY_START(v)            ((v) & joy_masks[JOY_START_IDX])
-
 /* Define hardware */
 
 /* Picture Processing Unit */