Merge pull request #6 from Pecusx/develop

Second joystick button added to controls.

Timberman.asm

@@ -12,7 +12,7 @@
 
 ;---------------------------------------------------
 .macro build
-    dta d"1.07" ; number of this build (4 bytes)
+    dta d"1.05" ; number of this build (4 bytes)
 .endm
 
 .macro RMTSong
@@ -57,8 +57,7 @@
     .zpvar SpeedTableAdr .word
     .zpvar Difficulty .byte ; 0 - normal, 1 - easy
     .zpvar LumberjackDir .byte ; 2 - on left , 1 - on right
-    .zpvar Paddle1State .byte
+    .zpvar PaddleState .byte
-    .zpvar Paddle2State .byte
     .zpvar LowCharsetBase .byte
     .zpvar displayposition .word
     .zpvar LastKey  .byte   ; $ff if no key pressed or last key released
@@ -1807,10 +1806,8 @@ RIPLoop
     jsr GetKeyFast
     cmp #@kbcode._space ; space, Start
     beq restart
-    lda STRIG0
+    cmp #@kbcode._tab   ; TAB, 1st joy button
     beq restart
-;    cmp #@kbcode._tab   ; TAB, 1st joy button
-;    beq restart
     lda RTCLOK+1
     cmp #2
     bne RIPLoop
@@ -3615,10 +3612,8 @@ notpressedJoyGetKey
     ;fire
     lda STRIG0
     beq JoyButton
-    .IF TARGET = 800        ; More joy buttons , Select and Option key only on A800
+    .IF TARGET = 800           ; Second joy button , Select and Option key only on A800
-      jsr Check3button      ; Third joy button
+      jsr Check2button
-      bcc JoyButton         ; like First button
-      jsr Check2button      ; Second joy button
       bcc SecondButton
 checkSelectKey
       lda CONSOL
@@ -3657,15 +3652,8 @@ Check2button
     lda PADDL0
     and #$c0
     eor #$C0
-    cmp Paddle1State
+    cmp PaddleState
-    sta Paddle1State
+    sta PaddleState
-    rts
-Check3button
-    lda PADDL1
-    and #$c0
-    eor #$C0
-    cmp Paddle2State
-    sta Paddle2State
     rts
     .ENDIF
 .endp