Second button in Joy B2+ works

Atari/interrupts.asm

@@ -183,8 +183,8 @@ EndOfCreditsVBI
         tax
         lda PADDL0,x
         sta PADDL0
-        lda PADDL1,x
+;        lda PADDL1,x
-        sta PADDL1
+;        sta PADDL1
         jmp XITVBV
     .ELIF TARGET = 5200
         lda SkStatSimulator

constants.asm

@@ -364,7 +364,7 @@ WeaponUnits
   .by 1  ;Ton_of_Dirt    ;_26
   .by 4  ;Liquid_Dirt    ;_27
   .by 2  ;Dirt_Charge    ;_28
-  .by 10 ;Punch          ;_29
+  .by 2  ;Punch          ;_29
   .by 1  ;Buy_me         ;_30
   .by 5  ;Laser          ;_31
   .by 1  ;White_Flag     ;_32

definitions.asm

@@ -70,7 +70,7 @@ price_Dirt_Ball       =  130  ;_25
 price_Ton_of_Dirt     =  171  ;_26
 price_Liquid_Dirt     =  330  ;_27
 price_Dirt_Charge     =  343  ;_28
-price_Punch           =  158  ;_29
+price_Punch           =  208  ;_29
 price_Buy_me          =  170  ;_30
 price_Laser           =  277  ;_31
 price_White_Flag      =   $0  ;_32

scorch.asm

@@ -35,8 +35,9 @@
     icl 'definitions.asm'
 ;---------------------------------------------------
 
-FirstZpageVariable = $57
+FirstZpageVariable = $56
     .zpvar DliColorBack        .byte = FirstZpageVariable
+    .zpvar PaddleState      .byte   ; old state 2nd button for 2 buttons joysticks
     .zpvar GradientNr        .byte
     .zpvar GradientColors    .word
     .zpvar WindChangeInRound    .byte    ; wind change after each turn (not round only) flag - (0 - round only, >0 - each turn)
@@ -420,9 +421,8 @@ notpressedJoyGetKey
     lda STRIG0
     beq JoyButton
     .IF TARGET = 800    ; Second joy button , Select and Option key only on A800
-      lda PADDL0
+      jsr Check2button
-      cmp #$e4
+      bcc SecondButton
-      bne SecondButton
       bne checkSelectKey
 checkSelectKey
       lda CONSOL
@@ -446,6 +446,14 @@ getkeyend
     sty ATRACT    ; reset atract mode
     mvy #sfx_keyclick sfx_effect
     rts
+    .IF TARGET = 800    ; Second joy button only on A800
+Check2button
+    lda PADDL0
+    and #$c0
+    cmp PaddleState
+    sta PaddleState
+    rts
+    .ENDIF
 .endp
 
 ;--------------------------------------------------
@@ -472,12 +480,8 @@ StillWait
       beq StillWait
     .IF TARGET = 800
       ; second joy button
-      lda PADDL0
+;      jsr GetKey.Check2button
-      cmp #$e4
+;      bcs StillWait
-      bne StillWait
-;      lda PADDL1
-;      cmp #$e4
-;      bne StillWait
       lda SKSTAT
       cmp #$ff
       bne StillWait

weapons.asm

@@ -1329,10 +1329,11 @@ checkJoy
     lda joyToKeyTable,y
     jmp jumpFromStick
 notpressedJoy
-    ;second fire
+    .IF TARGET = 800
-    lda PADDL0
+    ;second fire only Atari 800
-    cmp #$e4
+    jsr GetKey.Check2button
-    jne pressedTAB
+    jcc pressedTAB
+    .ENDIF
     ;fire
     lda STRIG0
     jeq pressedSpace