From 1791ab986939be9fe7129e50ad32326679af465e Mon Sep 17 00:00:00 2001 From: Pecusx Date: Thu, 26 Oct 2023 15:45:37 +0200 Subject: [PATCH] Better GetKey but..... --- game.asm | 2 ++ scorch.asm | 12 +++++++++--- scorch.xex | Bin 56539 -> 56544 bytes weapons.asm | 6 ++++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/game.asm b/game.asm index 44e7153..c86b248 100644 --- a/game.asm +++ b/game.asm @@ -401,7 +401,9 @@ ManualShooting jsr WaitForKeyRelease lda #%00000000 sta TestFlightFlag ; set "Test Fight" off + mva #$ff FastKeyRead jsr BeforeFire + mva #$00 FastKeyRead bit escFlag spl:rts ; keys Esc or O diff --git a/scorch.asm b/scorch.asm index a54f61a..393b15d 100644 --- a/scorch.asm +++ b/scorch.asm @@ -54,8 +54,9 @@ AdditionalZPvariables = $20 .zpvar MeteorsRound .byte ; set 7th bit - block meteors in round -FirstZpageVariable = $50 +FirstZpageVariable = $4f .zpvar DliColorBack .byte = FirstZpageVariable + .zpvar FastKeyRead .byte ; 0 - GetKey wait for any key (and generates SFX), $ff - fast GetKey .zpvar ClearSky .byte ; $ff - Crear sky during drawmountains, 0 - no clear sky .zpvar PaddleState .byte ; old state 2nd button for 2 buttons joysticks .zpvar GradientNr .byte @@ -470,7 +471,10 @@ checkSelectKey lda CONSOL and #%00000100 ; Option .ENDIF - bne getKeyAfterWait + bit FastKeyRead + bpl getKeyAfterWait + lda #@kbcode._none + bne getkeyend OptionPressed lda #@kbcode._atari ; Option key bne getkeyend @@ -483,8 +487,10 @@ JoyButton getkeyend ldy #0 sty ATRACT ; reset atract mode + bit FastKeyRead + bmi @+ mvy #sfx_keyclick sfx_effect - rts +@ rts .IF TARGET = 800 ; Second joy button only on A800 Check2button lda PADDL0 diff --git a/scorch.xex b/scorch.xex index 234c55f267dde92f4f71bbcf698bf491e3943e5d..e30eb11c5d4809ea63da0ef2fd6f29e0d69299eb 100644 GIT binary patch delta 7762 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 i%DF^?zc9EbcY)Vj{09Hn^b84 delta 7565 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 diff --git a/weapons.asm b/weapons.asm index 0a705f2..80e7274 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1270,12 +1270,12 @@ NoSpyHard mva #0 escFlag jmp ReleaseAndLoop @ - cmp #$80|@kbcode._up +/* cmp #$80|@kbcode._up jeq CTRLPressedUp cmp #$80|@kbcode._down jeq CTRLPressedDown cmp #$80|@kbcode._tab - jeq CTRLPressedTAB + jeq CTRLPressedTAB */ jumpFromStick .IF TARGET = 800 @@ -1321,6 +1321,7 @@ NoVdebugSwitch jmp ReleaseAndLoop .ENDIF EndKeys + mva #$80 pressTimer jmp notpressed ; @@ -1515,6 +1516,7 @@ pressedS eor:sta noSfx ReleaseAndLoop jsr WaitForKeyRelease + mva #$80 pressTimer jmp BeforeFire pressedSpace