From 6eb842e4729a1cc90def037f1ec45cd3911ffd78 Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@gmail.com>
Date: Fri, 23 Feb 2018 15:23:42 -0800
Subject: [PATCH] More precision for axis

---
 src/inc/joybuzz.plh          |  4 +-
 src/libsrc/apple/joybuzz.pla | 83 +++++++++++++++++++-----------------
 2 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/src/inc/joybuzz.plh b/src/inc/joybuzz.plh
index 3c3d4b9..9bdc6d2 100644
--- a/src/inc/joybuzz.plh
+++ b/src/inc/joybuzz.plh
@@ -1,4 +1,4 @@
 import joybuzz
-    const MAX_JOY = 64
-    predef joypos(buzz)#3
+    const MAX_JOY = 79
+    predef joypos(buzz)#4
 end
diff --git a/src/libsrc/apple/joybuzz.pla b/src/libsrc/apple/joybuzz.pla
index 22b2bfd..2c831ec 100644
--- a/src/libsrc/apple/joybuzz.pla
+++ b/src/libsrc/apple/joybuzz.pla
@@ -1,53 +1,60 @@
 asm asmdefs
         !SOURCE    "vmsrc/plvmzp.inc"
-SPEAKER	=       $C030
+SPEAKER =       $C030
 GCSTRB  =       $C070
 GC0     =       $C064
 GC1     =       $C065
-GCPB1	=       $C061
-GCPB2	=       $C062
-GCMAX   =       64          ; MAX VALUE FOR GAME CONTROLLER
+GCPB1   =       $C061
+GCPB2   =       $C062
+GCMAX   =       79          ; MAX VALUE FOR GAME CONTROLLER
 end
 //
 // Read both game controllers in parallel
-// 
-export asm joypos(buzz)#3
+//
+export asm joypos(buzz)#4
+        LDY     ESTKL,X     ; BUZZ TONE
+        STY     TMPH
+        DEX
         DEX
         DEX
         LDA     #$00
-        STA     ESTKH,X
-        STA     ESTKH+1,X
-        STA     ESTKH+2,X
-        LDA     #GCMAX
-        STA     TMPL
-        STA     ESTKL,X
-        STA     ESTKL+1,X
-        LDY     ESTKL+2,X   ; BUZZ TONE        
-        BIT     GCSTRB
-JOYZZLP DEY
-        BEQ     +
-        NOP                 ; TIMING
-        NOP
-        NOP
-        NOP
-        BNE     ++
-+       BIT     SPEAKER
-        LDY     ESTKL+2,X   ; BUZZ TONE        
-++      LDA     #$FF
-        ASL     GC0
-        ADC     ESTKL,X
-        ASL     GC1
-        STA     ESTKL,X
-        LDA     #$FF
-        ADC     ESTKL+1,X
-        STA     ESTKL+1,X
-        DEC     TMPL
-        BNE     JOYZZLP
-        ASL     GCPB1       ; READ GC BUTTONS
-        LDA     GCPB2
-        ROR
-        AND     #$C0
         STA     ESTKL+2,X
+        STA     ESTKH+2,X
+        STA     ESTKL+3,X
+        STA     ESTKH+3,X
+        LDA     #GCMAX
+        SEC
+        BIT     GCSTRB
+BUZZ    DEY
+        BNE     BUZZDLY
+        BIT     SPEAKER
+        LDY     TMPH        ; BUZZ TONE
+GC0READ BIT     GC0
+        BPL     GC0DLY
+        INC     ESTKL+3,X
+GC1READ BIT     GC1
+        BPL     GC1DLY
+        INC     ESTKL+2,X
+JOYLP   SBC     #$01
+        BNE     BUZZ
+        TAY                 ; LDY     #$00
+        BIT     GCPB1       ; READ GC BUTTONS
+        BPL     +
+        DEY
++       STY     ESTKL+1,X
+        STY     ESTKH+1,X
+        TAY                 ; LDY     #$00
+        BIT     GCPB2
+        BPL     +
+        DEY
++       STY     ESTKL,X
+        STY     ESTKH,X
         RTS
+GC0DLY  NOP                 ; TIMING
+        BPL     GC1READ
+GC1DLY  NOP                 ; TIMING
+        BPL     JOYLP
+BUZZDLY BNE     +           ; TIMING
++       BNE     GC0READ
 end
 done