junglejourney

changeset 194:d0b47e8eaed2

find changesets by author, revision, files, or words in the commit message
Made changes to the joystick handling code based on the result of modifying Elkulator to use constants for joystick input.
author David Boddie <david@boddie.org.uk>
date Thu Sep 29 23:00:56 2011 +0200
parents 5502cf6e30cb
children 095ccf30c42a
files loader.oph mapcode.oph
diffstat 2 files changed, 13 insertions(+), 26 deletions(-) [+]
line diff
     1.1 --- a/loader.oph	Thu Sep 29 20:56:34 2011 +0200
     1.2 +++ b/loader.oph	Thu Sep 29 23:00:56 2011 +0200
     1.3 @@ -114,8 +114,8 @@
     1.4  code_block: .byte <code_file_name, >code_file_name
     1.5                 .byte $00, $1e, 0, 0
     1.6                 .byte $00, $1e, 0, 0
     1.7 -               .byte $33, $20, 0, 0
     1.8 -               .byte $33, $3e, 0, 0
     1.9 +               .byte $22, $20, 0, 0
    1.10 +               .byte $22, $3e, 0, 0
    1.11  
    1.12  init_load_window_vdu_bytes: .byte 28,0,30,19,27
    1.13  

     2.1 --- a/mapcode.oph	Thu Sep 29 20:56:34 2011 +0200
     2.2 +++ b/mapcode.oph	Thu Sep 29 23:00:56 2011 +0200
     2.3 @@ -1758,38 +1758,25 @@
     2.4      lda #128
     2.5      ldx #1
     2.6      jsr $fff4
     2.7 -    cpy #16                                     ; >= 16 but could be -128 ... -1
     2.8 +    cpy #112                ; <= -16
     2.9 +    bcc move_player_left
    2.10 +
    2.11 +    cpy #144                ; >= 16
    2.12      bcc move_player_handle_joystick_up_down
    2.13 -
    2.14 -    move_player_joystick_right_or_negative:
    2.15 -    cmp #128
    2.16 -    bcs move_player_joystick_not_right
    2.17 -    jmp move_player_right                       ; 16 ... 255
    2.18 -
    2.19 -    move_player_joystick_not_right:
    2.20 -
    2.21 -    cmp #241
    2.22 -    bcs move_player_handle_joystick_up_down
    2.23 -    jmp move_player_left                        ; <= -16
    2.24 +    jmp move_player_right
    2.25  
    2.26      move_player_handle_joystick_up_down:
    2.27  
    2.28      lda #128
    2.29      ldx #2
    2.30      jsr $fff4
    2.31 -    cpy #16                                     ; >= 16 but could be -128 ... -1
    2.32 +    cpy #112                ; <= -16
    2.33 +    bcs move_player_handle_left_key
    2.34 +    jmp move_player_down
    2.35 +
    2.36 +    cpy #144
    2.37      bcc move_player_handle_left_key
    2.38 -
    2.39 -    move_player_joystick_up_or_negative:
    2.40 -    cmp #128
    2.41 -    bcs move_player_joystick_not_up
    2.42 -    jmp move_player_up                          ; 16 ... 255
    2.43 -
    2.44 -    move_player_joystick_not_up:
    2.45 -
    2.46 -    cmp #241
    2.47 -    bcs move_player_handle_left_key
    2.48 -    jmp move_player_down                        ; <= -16
    2.49 +    jmp move_player_up      ; >= 16
    2.50  
    2.51      move_player_handle_left_key:
    2.52