fixed joypad bits

diff --git a/include/pce.h b/include/pce.h
index 27f70de0fce8c475ec1a868dcf8102f4464e00d4..6f18ba5010562797b36f235cb03fd08d01fd736a 100644 (file)
--- a/include/pce.h
+++ b/include/pce.h
@@ -80,8 +80,8 @@
 extern void pce_stdjoy_joy[];       /* Referred to by joy_static_stddrv[] */
 
 #define JOY_FIRE_B              5
-#define JOY_START               6
-#define JOY_SELECT              7
+#define JOY_SELECT              6
+#define JOY_RUN                 7
 
 void waitvblank (void);
 /* Wait for the vertical blanking */

diff --git a/libsrc/pce/joy/pce-stdjoy.s b/libsrc/pce/joy/pce-stdjoy.s
index 1aa98e16dc92ced814fbecc62114e779ca839f4b..592793250e57f0efaed6caafff829df9e1d90dbc 100644 (file)
--- a/libsrc/pce/joy/pce-stdjoy.s
+++ b/libsrc/pce/joy/pce-stdjoy.s
@@ -29,10 +29,10 @@
         .byte   $40                     ; JOY_DOWN
         .byte   $80                     ; JOY_LEFT
         .byte   $20                     ; JOY_RIGHT
-        .byte   $02                     ; JOY_FIRE A  ; FIXME: is this correct?
-        .byte   $01                     ; JOY_FIRE B  ; FIXME: is this correct?
-        .byte   $04                     ; JOY_START   ; FIXME: is this correct?
-        .byte   $08                     ; JOY_SELECT  ; FIXME: is this correct?
+        .byte   $01                     ; JOY_FIRE_A
+        .byte   $02                     ; JOY_FIRE_B
+        .byte   $04                     ; JOY_SELECT
+        .byte   $08                     ; JOY_RUN
 
 ; Jump table.
 

diff --git a/libsrc/pce/readme.txt b/libsrc/pce/readme.txt
index 243a07417bd1e493e924f22c145c4f2c7fc03920..a822205d456185995124ca368c05048de137d1e5 100644 (file)
--- a/libsrc/pce/readme.txt
+++ b/libsrc/pce/readme.txt
@@ -2,9 +2,7 @@ PC-Engine (PCE) target support for cc65. this is still work in progress and
 a couple of things need to be fixed:
 --------------------------------------------------------------------------------
 
-joystick support should get verified on real hw
- - the masks for buttons may be wrong.
- - 6 button gamepads are different and need slightly different code
+- 6 button gamepads are different and need slightly different code
 
 interruptor support in crt0 (and cfg) is missing
 - clock() should be hooked to a VBL interrupt

diff --git a/testcode/lib/pce/conio.c b/testcode/lib/pce/conio.c
index b94c918777448b142670bb26e97e85d36e311a26..f5231dba66d20191694fb207cf3d185d2abb1889 100644 (file)
--- a/testcode/lib/pce/conio.c
+++ b/testcode/lib/pce/conio.c
@@ -95,14 +95,16 @@ void main(void)
         {
             gotoxy(0, 12 + i);
             j = joy_read (i);
-            cprintf ("pad %d: %02x %-6s%-6s%-6s%-6s%-6s%-6s",
+            cprintf ("pad %d: %02x %-6s%-6s%-6s%-6s%-6s%-6s%-6s%-6s",
                      i, j,
                      (j & joy_masks[JOY_UP])?    "  up  " : " ---- ",
                      (j & joy_masks[JOY_DOWN])?  " down " : " ---- ",
                      (j & joy_masks[JOY_LEFT])?  " left " : " ---- ",
                      (j & joy_masks[JOY_RIGHT])? "right " : " ---- ",
                      (j & joy_masks[JOY_FIRE])?  " fire " : " ---- ",
-                     (j & joy_masks[JOY_FIRE2])? "fire2 " : " ---- ");
+                     (j & joy_masks[JOY_FIRE2])? "fire2 " : " ---- ",
+                     (j & joy_masks[JOY_SELECT])? "select" : " ---- ",
+                     (j & joy_masks[JOY_RUN])?   " run  " : " ---- ");
         }
 
         gotoxy(xsize - 10, 3);