refactoring joy

Parisoft · Jul 3, 2019 · b6b80b7 · b6b80b7
1 parent 3a98742
commit b6b80b7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/include/joy.h b/include/joy.h
@@ -21,7 +21,7 @@ typedef struct {
 #define JOYPAD2 *((u8_t *)0x4017)
 
 extern joy_t joy;
-#pragma zpsym("joy1")
+#pragma zpsym("joy")
 
 void __fastcall__ joy_poll(u8_t);
 

diff --git a/lib/runtime.lib b/lib/runtime.lib
diff --git a/src/joy/joy_poll.s b/src/joy/joy_poll.s
@@ -9,11 +9,11 @@ joy_poll = _joy_poll
     sta joy::prev, x ; prev = curr
     lda #1
     sta joy::curr, x
-    sta JOYPAD1 
+    sta JOYPAD1, x
     lsr a 
-    sta JOYPAD1  
+    sta JOYPAD1, x
 @loop:       
-    lda JOYPAD1 
+    lda JOYPAD1, x
     and #3
     cmp #1
     rol joy::curr, x 

diff --git a/src/joy/joy_poll_safe.s b/src/joy/joy_poll_safe.s
@@ -6,14 +6,14 @@ joy_poll_safe = _joy_poll_safe
     .proc _joy_poll_safe
     tax 
     lda joy::curr, x 
-    pha             ; preserve current state
-    jsr joypoll 
-    tay             ; Y = poll1   
-    jsr joypoll 
-    sta joy::prev, x   ; joy::prev = poll2
-    jsr joypoll 
-    pha             ; preserve poll3
-    jsr joypoll     ; A and joy::curr = poll4   
+    pha                  ; preserve current state
+    jsr joypoll  
+    tay                  ; Y = poll1   
+    jsr joypoll  
+    sta joy::prev, x     ; joy::prev = poll2
+    jsr joypoll  
+    pha                  ; preserve poll3
+    jsr joypoll          ; A and joy::curr = poll4   
     cmp joy::prev, x     ; poll4 == poll2 ?   
     beq @done
     tya
@@ -36,11 +36,11 @@ joy_poll_safe = _joy_poll_safe
     .proc joypoll
     lda #1
     sta joy::curr, x 
-    sta JOYPAD1 
+    sta JOYPAD1, x 
     lsr a
-    sta JOYPAD1  
+    sta JOYPAD1, x
 @loop:       
-	lda JOYPAD1 
+	lda JOYPAD1, x
     and #3
     cmp #1
     rol joy::curr, x