From cc3e2d1845dca122d4da2dd12fb16e4356aec534 Mon Sep 17 00:00:00 2001 From: pkali Date: Sun, 19 Jun 2022 12:02:48 -0400 Subject: [PATCH] power timer 1/2s to speed up #75 --- artwork/HIMARS14.asm | 2 +- scorch.asm | 50 ++++++++++++++++++++++++++++++++++--------- scorch.xex | Bin 39123 -> 39173 bytes weapons.asm | 14 ++++++++++-- 4 files changed, 53 insertions(+), 13 deletions(-) diff --git a/artwork/HIMARS14.asm b/artwork/HIMARS14.asm index c658213..57adb4d 100644 --- a/artwork/HIMARS14.asm +++ b/artwork/HIMARS14.asm @@ -456,7 +456,7 @@ quit ini main ; --- - opt l- + ;opt l- .MACRO SPRITES missiles diff --git a/scorch.asm b/scorch.asm index f4b3fb8..f8f58b2 100644 --- a/scorch.asm +++ b/scorch.asm @@ -55,26 +55,33 @@ .zpvar xc .word .zpvar temp .word ;temporary word for the most embeded loops only .zpvar temp2 .word ;same as above + .zpvar modify .word ;origially used to replace self-modyfying code .zpvar tempXROLLER .word ;same as above for XROLLER routine (used also in result display routine) .zpvar xtempDRAW .word ;same as above for XDRAW routine .zpvar ytempDRAW .word ;same as above for XDRAW routine + .zpvar tempor2 .byte ;--------------temps used in circle routine .zpvar xi .word ;X (word) in draw routine - .zpvar fx .byte ;circle drawing variables + .zpvar fx .byte .zpvar yi .word ;Y (word) in draw routine .zpvar fy .byte .zpvar xk .word .zpvar fs .byte .zpvar yc .byte ;ycircle - temporary for circle .zpvar dx .word - .zpvar tempor2 .byte .zpvar dy .word .zpvar dd .word .zpvar di .word .zpvar dp .word - .zpvar modify .word + ;---------------------------- .zpvar weaponPointer .word .zpvar dliCounter .byte + .zpvar pressTimer .byte + .zpvar NTSCcounter .byte + ;.zpvar dliA .byte + ;.zpvar dliX .byte + ;.zpvar dliY .byte + ;* RMT ZeroPage addresses .zpvar p_tis .word .zpvar p_trackslbstable .word @@ -889,7 +896,8 @@ ClearResults bne ClearResults mva #1 CurrentRoundNr ;we start from round 1 - + mva #6 NTSCcounter + ; RMT INIT lda #$f0 ;initial value sta RMTSFXVOLUME ;sfx note volume * 16 (0,16,32,...,240) @@ -908,7 +916,9 @@ ClearResults .endp .proc DLIinterruptGraph - pha + ;sta dliA + ;sty dliY + pha phy ldy dliCounter lda dliColorsBack,y @@ -919,17 +929,21 @@ ClearResults sta COLPF1 sty COLPF2 inc dliCounter - ply + ;ldy dliY + ;lda dliA + ply pla rti .endp .proc DLIinterruptText - pha + ;sta dliA + pha sta WSYNC mva #TextBackgroundColor colpf2 mva #TextForegroundColor colpf3 - pla + ;lda dliA + pla DLIinterruptNone rti .endp @@ -940,6 +954,21 @@ DLIinterruptNone phy mva #0 dliCounter + lda PAL + and #%00001110 + beq itsPAL + ;it is NTSC here + dec NTSCcounter + bne itsPAL + mva #6 NTSCcounter + bne exitVBL ; skip doing VBL things each 6 frames in Amerika, Amerika + ; We're all living in Amerika, Coca Cola, Wonderbra + +itsPAL + ; pressTimer is trigger tick counter. always 50 ticks / s + bit:smi:inc pressTimer ; timer halted if >127. max time measured 2.5 s + + ; ------- RMT ------- lda sfx_effect bmi lab2 asl @ ; * 2 @@ -947,13 +976,14 @@ DLIinterruptNone ldx #0 ;X = 0 channel (0..3 or 0..7 for stereo module) lda #0 ;A = 12 note (0..60) jsr RASTERMUSICTRACKER+15 ;RMT_SFX start tone (It works only if FEAT_SFX is enabled !!!) -; + lda #$ff sta sfx_effect ;reinit value -; lab2 jsr RASTERMUSICTRACKER+3 ;1 play + ; ------- RMT ------- +exitVBL ply plx pla diff --git a/scorch.xex b/scorch.xex index 92e363ef3101f8f5837b091aadd5b3da8f2edca8..5d1ba2325bcf009eff6fb6eca821f586b98e5827 100644 GIT binary patch delta 14514 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 diff --git a/weapons.asm b/weapons.asm index 1f72fc4..c0198aa 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1025,8 +1025,6 @@ ContinueToCheckMaxForce2 ; $f3 - shift+key notpressed - lda TRIG0S - beq notpressed lda SKSTAT cmp #$ff jeq checkJoy @@ -1091,10 +1089,17 @@ notpressedJoy ;fire lda TRIG0S jeq pressedSpace + mva #$ff pressTimer ; stop counting frames jmp notpressed ; pressedUp + lda pressTimer + spl:mva #0 pressTimer ; if >128 then reset to 0 + cmp #25 ; 1/2s + bcs CTRLPressedUp + + ;force increaseeee! ldx TankNr inc ForceTableL,x @@ -1131,6 +1136,11 @@ CTRLPressedUp pressedDown + lda pressTimer + spl:mva #0 pressTimer ; if >128 then reset to 0 + cmp #50 ; 1s + bcs CTRLPressedDown + mva #sfx_set_power_1 sfx_effect ldx TankNr