Removed joy_masks array.

[cc65] / libsrc / apple2 / joy / a2.stdjoy.s

diff --git a/libsrc/apple2/joy/a2.stdjoy.s b/libsrc/apple2/joy/a2.stdjoy.s
index 043b7814e331eee60e6b44e8dc3f586590d287ad..ed208325504c6f353209931ebff3f2db7db66d9f 100644 (file)
--- a/libsrc/apple2/joy/a2.stdjoy.s
+++ b/libsrc/apple2/joy/a2.stdjoy.s
@@ -13,6 +13,8 @@
         .include        "joy-error.inc"
         .include        "apple2.inc"
 
+        .macpack        module
+
 ; ------------------------------------------------------------------------
 
 ; Constants
@@ -29,7 +31,11 @@ PREAD   :=      $FB1E   ; Read paddle in X, return AD conv. value in Y
 
 ; Header. Includes jump table.
 
-        .segment        "JUMPTABLE"
+        .ifdef  __APPLE2ENH__
+        module_header   _a2e_stdjoy_joy
+        .else
+        module_header   _a2_stdjoy_joy
+        .endif
 
 ; Driver signature
 
@@ -40,17 +46,6 @@ PREAD   :=      $FB1E   ; Read paddle in X, return AD conv. value in Y
 
         .addr   $0000
 
-; Button state masks (8 values)
-
-        .byte   $10
-        .byte   $20
-        .byte   $04
-        .byte   $08
-        .byte   $40
-        .byte   $80
-        .byte   $00             ; Future expansion
-        .byte   $00             ; Future expansion
-
 ; Jump table
 
         .addr   INSTALL
@@ -113,7 +108,7 @@ READJOY:
         lda     BUTN0-1,x       ; Check button (1, 3)
         asl
         tya
-        ror                     ; FIRE DOWN !UP RIGHT !LEFT 0 0 0
+        ror                     ; BTN DOWN !UP RIGHT !LEFT 0 0 0
 
         ; Read secondary button
         tay
@@ -124,10 +119,10 @@ READJOY:
         lda     BUTN0-1,x       ; Check button (2, 0)
         asl
         tya
-        ror                     ; FIRE2 FIRE DOWN !UP RIGHT !LEFT 0 0
+        ror                     ; BTN2 BTN DOWN !UP RIGHT !LEFT 0 0
 
         ; Finalize
-        eor     #%00010100      ; FIRE2 FIRE DOWN UP RIGHT LEFT 0 0
+        eor     #%00010100      ; BTN2 BTN DOWN UP RIGHT LEFT 0 0
         ldx     #$00
         bit     $C080           ; Switch in LC bank 2 for R/O
         rts