From 75fd6c494aaff48909a7d55a14e65c5c2d6142c4 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Fri, 1 Mar 2024 14:16:26 +0100 Subject: [PATCH] VU Meter after 10s. :) --- Atari/lib/5200MACRO.ASM | 10 ++++++++ Atari/lib/ATARISYS.ASM | 2 +- definitions.asm | 2 ++ game.asm | 49 ++++++++++++++++++++++++++++++++++++++++ scorch.asm | 5 ++-- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 32702 -> 32661 bytes weapons.asm | 8 +++++-- 8 files changed, 71 insertions(+), 5 deletions(-) diff --git a/Atari/lib/5200MACRO.ASM b/Atari/lib/5200MACRO.ASM index 506a5cd..7747352 100644 --- a/Atari/lib/5200MACRO.ASM +++ b/Atari/lib/5200MACRO.ASM @@ -139,6 +139,16 @@ pla tay .endm +;------------------------------------- + .macro txy + txa + tay + .endm +;------------------------------------- + .macro tyx + tya + tax + .endm ;------------------------------------- .macro pause ;waits :1 number (byte) of frames diff --git a/Atari/lib/ATARISYS.ASM b/Atari/lib/ATARISYS.ASM index 3fa62a6..6784f24 100644 --- a/Atari/lib/ATARISYS.ASM +++ b/Atari/lib/ATARISYS.ASM @@ -161,7 +161,7 @@ APPMHI EQU $0E ;APPL MEM HI LIMIT ; POKMSK EQU $10 ;MASK POKEY IRQ BRKKEY EQU $11 ;BREAK KEY FLAG -RTCLOK EQU $12 ;REAL TIME CLOCK +RTCLOK EQU $13 ;REAL TIME CLOCK (only 2 bytes without $12 !!!) BUFADR EQU $15 ;INDIRECT BUFF ADDR ICCOMT EQU $17 ;COMMAND FOR VECTOR DSKFMS EQU $18 ;FMS POINTER diff --git a/definitions.asm b/definitions.asm index 691e50d..7d09d82 100644 --- a/definitions.asm +++ b/definitions.asm @@ -27,6 +27,8 @@ space = 0 ; space in screencodes KeyRepeatSpeed = 8 ; (max 127 !!!) FirstKeySpeed = 8 ; additional delay for first keypress +VuMeterTime = 2 ; Time of inactivity for VU Meter (1=5sec) + ;character codes for symbols (tank, parachute, etc. ) ; characters from tanks.fnt (graphics screen) char_parachute = $02 diff --git a/game.asm b/game.asm index 5d0c1cb..c32c65a 100644 --- a/game.asm +++ b/game.asm @@ -1430,4 +1430,53 @@ FinishResultDisplay jmp TypeLine4x4 ; jsr:rts .endp +.IF VU_METER = 1 +.proc VUMeter + ; No VUMeter if key pressed + jsr GetKeyFast + cmp #@kbcode._none + bne EndMeter + ; check timer + lda RTCLOK + cmp #VuMeterTime + bne EndMeter + ; store all angles + ldx NumberOfPlayers +@ lda AngleTable,x + sta previousAngle,x + dex + bpl @- + ; let's go! +Meter + jsr ClearTanks + ldx NumberOfPlayers +@ lda trackn_audc+2 + :4 asl + sta AngleTable,x + dex + bpl @- + jsr drawtanks + jsr WaitOneFrame + jsr GetKeyFast + cmp #@kbcode._none + beq Meter + ; restore all angles + jsr ClearTanks + ldx NumberOfPlayers +@ lda previousAngle,x + sta AngleTable,x + dex + bpl @- + jsr drawtanks + jsr drawtanknr +EndMeterAndReset + lda #0 + sta RTCLOK+1 + sta RTCLOK +EndMeter + rts +.endp +.ENDIF + + .ENDIF \ No newline at end of file diff --git a/scorch.asm b/scorch.asm index 22c0be8..5e47a22 100644 --- a/scorch.asm +++ b/scorch.asm @@ -30,7 +30,8 @@ .ifndef CART_VERSION .def CART_VERSION = 0 ; if 1 - dual splash screen .endif -.def METEORS = 1 ; if 1 - meteors on game +.def METEORS = 0 ; if 1 - meteors on game +.def VU_METER = 1 ; if 1 - VU Meter on game .def XCORRECTION_FOR_PM = 0 ; if 1 - active x position of tanks correction fo PMG .def FASTER_GRAF_PROCS = 1 ; if 1 - activates faster graphics routines ; (direct writes to screen memory - atari only :) ) @@ -40,7 +41,7 @@ ;--------------------------------------------------- .macro build - dta d"1.46" ; number of this build (4 bytes) + dta d"1.47" ; number of this build (4 bytes) .endm .macro RMTSong diff --git a/scorch.bin b/scorch.bin index f55e18f5e1742df4cbc1bc6230675a9decff64a7..b52949c17ce5d897e76ad4b0fb84473d32e20424 100644 GIT binary patch delta 7830 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 al{%$zwh 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 To8uS{uI7*emE*Tpv)ca$gTT5j diff --git a/scorch.xex b/scorch.xex index 93d6cfa690fd8e7bcfd4a5e5a2665a448d1fa806..737feefc59c3ed3bdaf974e7bd8bcbf4e9b963bb 100644 GIT binary patch delta 7439 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 delta 7302 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 diff --git a/weapons.asm b/weapons.asm index 922c255..4dbebe9 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1277,11 +1277,15 @@ ContinueToCheckMaxForce2 ; $FB - any key ; $f7 - shift ; $f3 - shift+key - +.IF VU_METER = 1 + jsr VUMeter.EndMeterAndReset +.ENDIF notpressed jsr CheckExitKeys ; Check for O, Esc or Start+Option keys spl:rts ; exit if pressed 'Exit keys' - +.IF VU_METER = 1 + jsr VUMeter +.ENDIF ldx TankNr ; for optimize jsr GetKeyFast and #%10111111 ; SHIFT elimination