From 0320b000b388bc8f66c267904d19a13bb84ee11d Mon Sep 17 00:00:00 2001 From: Pecusx Date: Fri, 27 Oct 2023 08:47:50 +0200 Subject: [PATCH] Option key fix and opty --- scorch.asm | 1 + scorch.xex | Bin 56517 -> 56507 bytes weapons.asm | 10 ++-------- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/scorch.asm b/scorch.asm index f7e0527..9765aee 100644 --- a/scorch.asm +++ b/scorch.asm @@ -484,6 +484,7 @@ checkSelectKey beq SelectPressed lda CONSOL and #%00000100 ; Option + beq OptionPressed .ENDIF lda #@kbcode._none bne getkeyend diff --git a/scorch.xex b/scorch.xex index 13a75dc8c82ed1f945e91dec8fcae536e3df3494..77b7d5ce015765f8bd4913c6a85daf7282f6c83b 100644 GIT binary patch delta 6975 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 X??*GpV2%BGuot^fCv;u<$Q$y%qXF`j delta 7005 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 diff --git a/weapons.asm b/weapons.asm index 4268678..9e3c563 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1224,17 +1224,11 @@ notpressed spl:rts ; exit if pressed 'Exit keys' ldx TankNr ; for optimize - ; Select and Option - lda CONSOL - tay - and #%00000100 - beq callActivation ; Option key - tya - and #%00000010 - jeq pressedTAB ; Select key jsr GetKeyFast and #%10111111 ; SHIFT elimination + cmp #@kbcode._atari ; Option key + beq callActivation cmp #@kbcode._A ; $3f ; A bne @+ callActivation