# HG changeset patch
# User David Boddie <david@boddie.org.uk>
# Date 1317330056 -7200
# Node ID d0b47e8eaed29c5af6d4fc6ad693d81eebb4037a
# Parent  5502cf6e30cbbaabff789a58957384fd2acfb14f
Made changes to the joystick handling code based on the result of
modifying Elkulator to use constants for joystick input.

diff -r 5502cf6e30cb -r d0b47e8eaed2 loader.oph
--- a/loader.oph	Thu Sep 29 20:56:34 2011 +0200
+++ b/loader.oph	Thu Sep 29 23:00:56 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 $33, $20, 0, 0
-               .byte $33, $3e, 0, 0
+               .byte $22, $20, 0, 0
+               .byte $22, $3e, 0, 0
 
 init_load_window_vdu_bytes: .byte 28,0,30,19,27
 
diff -r 5502cf6e30cb -r d0b47e8eaed2 mapcode.oph
--- a/mapcode.oph	Thu Sep 29 20:56:34 2011 +0200
+++ b/mapcode.oph	Thu Sep 29 23:00:56 2011 +0200
@@ -1758,38 +1758,25 @@
     lda #128
     ldx #1
     jsr $fff4
-    cpy #16                                     ; >= 16 but could be -128 ... -1
+    cpy #112                ; <= -16
+    bcc move_player_left
+
+    cpy #144                ; >= 16
     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
+    jmp move_player_right
 
     move_player_handle_joystick_up_down:
 
     lda #128
     ldx #2
     jsr $fff4
-    cpy #16                                     ; >= 16 but could be -128 ... -1
+    cpy #112                ; <= -16
+    bcs move_player_handle_left_key
+    jmp move_player_down
+
+    cpy #144
     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
+    jmp move_player_up      ; >= 16
 
     move_player_handle_left_key: