# HG changeset patch
# User David Boddie <david@boddie.org.uk>
# Date 1317322594 -7200
# Node ID 5502cf6e30cbbaabff789a58957384fd2acfb14f
# Parent  e1a1513fde166fbbdc278ef4212b775262080042
Another attempt at joystick support.

diff -r e1a1513fde16 -r 5502cf6e30cb loader.oph
--- a/loader.oph	Thu Sep 29 00:42:43 2011 +0200
+++ b/loader.oph	Thu Sep 29 20:56:34 2011 +0200
@@ -114,8 +114,8 @@
 code_block: .byte <code_file_name, >code_file_name
                .byte $00, $1e, 0, 0
                .byte $00, $1e, 0, 0
-               .byte $22, $20, 0, 0
-               .byte $22, $3e, 0, 0
+               .byte $33, $20, 0, 0
+               .byte $33, $3e, 0, 0
 
 init_load_window_vdu_bytes: .byte 28,0,30,19,27
 
diff -r e1a1513fde16 -r 5502cf6e30cb mapcode.oph
--- a/mapcode.oph	Thu Sep 29 00:42:43 2011 +0200
+++ b/mapcode.oph	Thu Sep 29 20:56:34 2011 +0200
@@ -1758,28 +1758,38 @@
     lda #128
     ldx #1
     jsr $fff4
-    cpy #16
-    bmi move_player_joystick_left_check
-    jmp move_player_right
-
-    move_player_joystick_left_check:
-    cpy #240
-    bpl move_player_handle_joystick_up_down
-    jmp move_player_left
+    cpy #16                                     ; >= 16 but could be -128 ... -1
+    bcc move_player_handle_joystick_up_down
+
+    move_player_joystick_right_or_negative:
+    cmp #128
+    bcs move_player_joystick_not_right
+    jmp move_player_right                       ; 16 ... 255
+
+    move_player_joystick_not_right:
+
+    cmp #241
+    bcs move_player_handle_joystick_up_down
+    jmp move_player_left                        ; <= -16
 
     move_player_handle_joystick_up_down:
 
     lda #128
     ldx #2
     jsr $fff4
-    cpy #16
-    bmi move_player_joystick_down_check
-    jmp move_player_up
-
-    move_player_joystick_down_check:
-    cpy #240
-    bpl move_player_handle_left_key
-    jmp move_player_down
+    cpy #16                                     ; >= 16 but could be -128 ... -1
+    bcc move_player_handle_left_key
+
+    move_player_joystick_up_or_negative:
+    cmp #128
+    bcs move_player_joystick_not_up
+    jmp move_player_up                          ; 16 ... 255
+
+    move_player_joystick_not_up:
+
+    cmp #241
+    bcs move_player_handle_left_key
+    jmp move_player_down                        ; <= -16
 
     move_player_handle_left_key: