diff --git a/Atari/interrupts.asm b/Atari/interrupts.asm index 21bfd42..ec7b769 100644 --- a/Atari/interrupts.asm +++ b/Atari/interrupts.asm @@ -177,6 +177,14 @@ EndOfCreditsVBI sta STICK0 lda STRIG0,x sta STRIG0 + ; and PADDLES (2 and 3 joystick button) + txa + asl + tax + lda PADDL0,x + sta PADDL0 + lda PADDL1,x + sta PADDL1 jmp XITVBV .ELIF TARGET = 5200 lda SkStatSimulator diff --git a/scorch.asm b/scorch.asm index f74befe..7081e41 100644 --- a/scorch.asm +++ b/scorch.asm @@ -418,8 +418,11 @@ checkJoyGetKey notpressedJoyGetKey ;fire lda STRIG0 - beq JoyButton - .IF TARGET = 800 ; Select and Option key only on A800 + beq JoyButton + .IF TARGET = 800 ; Second joy button , Select and Option key only on A800 + lda PADDL0 + cmp #$e4 + bne SecondButton bne checkSelectKey checkSelectKey lda CONSOL @@ -432,6 +435,7 @@ checkSelectKey OptionPressed lda #@kbcode._atari ; Option key bne getkeyend +SecondButton SelectPressed lda #@kbcode._tab ; Select key bne getkeyend @@ -467,6 +471,13 @@ StillWait lda STRIG0 beq StillWait .IF TARGET = 800 + ; second joy button + lda PADDL0 + cmp #$e4 + bne StillWait +; lda PADDL1 +; cmp #$e4 +; bne StillWait lda SKSTAT cmp #$ff bne StillWait diff --git a/scorch.bin b/scorch.bin index 4b0c4a2..5680389 100644 Binary files a/scorch.bin and b/scorch.bin differ diff --git a/scorch.xex b/scorch.xex index 5b8914b..7155ef7 100644 Binary files a/scorch.xex and b/scorch.xex differ diff --git a/weapons.asm b/weapons.asm index 043f785..ddbbcfb 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1238,7 +1238,7 @@ notpressed lda kbcode and #%10111111 ; SHIFT elimination - + cmp #@kbcode._A ; $3f ; A bne @+ callActivation @@ -1329,6 +1329,10 @@ checkJoy lda joyToKeyTable,y jmp jumpFromStick notpressedJoy + ;second fire + lda PADDL0 + cmp #$e4 + jne pressedTAB ;fire lda STRIG0 jeq pressedSpace