Merge pull request #152 from pkali/develop

1.25

MANUAL_EN.md

@@ -8,7 +8,7 @@ On the first screen, you can configure gameplay options:
 * number of players (2 - 6) includes both human and computer-controlled players
 * the initial amount of cash of each player (2K is the optimal value we chose, but for short games, it is worth choosing a higher value)
 * gravity
-* maximum wind strength (wind is drawn at the beginning of each round, here you can choose how strong it can be)
+* maximum wind strength (wind is drawn at the beginning of each round or during the round between turns, here we can choose how strong it can be)
 * number of rounds in a game
 * missile speed (does not affect the flight path - only changes the apparent missile speed - does not change anything in the gameplay itself)
 * frequency of suicides :) - if for a number of turns the game has not recorded hits (tanks are constantly shooting inaccurately), after one of such misses a tank commits suicide - here you determine how long they can "shooting for the stars" :) - if only people play the optimal setting is "norm", in the case of computer-controlled players ... you choose.
@@ -24,7 +24,7 @@ On the first screen, you can configure gameplay options:
 
 Select options with cursor keys or a joystick.
 
-The [TAB] or [SELECT] key, and on the Atari 5200 console the [5] controller key change the color of the mountains (3 versions to choose).
+The [TAB] or [SELECT] key, and on the Atari 5200 console, the [5] controller key change the color of the mountains (3 versions to choose from) or (if the cursor indicates the wind strength selection option "Wind") change the way the wind strength is drawn from "every round" to "every turn" and vice versa. Drawing every turn is indicated by the "?" sign next to the word "Wind".
 
 The [RETURN] key or a joystick button moves to the next screen.
 
@@ -75,6 +75,7 @@ The keyboard controls here are simple, cursor keys or joystick: left/right - cha
 | [START] | N/A | speed up some game animations. |
 | [O] | [3] | end the current game and jump to the Game Over screen with a summary. The summary of the results does not take into account the current round of the game, but only the rounds completed earlier. This corresponds to pressing the [ESC] key with the difference that the summary and credits are displayed. |
 | [START] + [OPTION] | N/A | immediately force the end of the game (Game Over), just like [O] but without confirmation.
+| [G] | N/A | changes the mountain shading |
 | [ESC] | [*] | during the entire game at any time (unless the computer is playing, then sometimes you have to wait a while) you can press the [ESC] key, which allows you to abort the game and return to the beginning (of course, there is protection against accidental pressing). |
 | [Y] | [1] | when asked to abort or terminate the game - confirmation |
 
@@ -182,6 +183,8 @@ Only these points determine the order in the summary
 * **Auto Defense** - activates the mode of automatic activation of defensive weapons. After its activation, the tank automatically activates the strongest shield it has (consuming it, of course) at any time when there is no shield (also between shots of other players). At the same time, if the tank's energy level drops below 30 units, it automatically activates **Battery** if it has it. This weapon remains active until the end of the round and is indicated by the "computer" symbol before the name of the active defensive weapon in the status line. It is the second defensive weapon that does not deactivate other defensive weapons when used.
 * **Spy Hard** - Help for the forgetful :) . When activated, it shows a preview of information about the next opponents one by one. Left/Right - changes the "spied" tank. Fire/Space/Return/Esc - ends the "spying". This is the last defensive weapon, which does not deactivate other defensive weapons when used.
 
+Due to the different warhead tracking system of **MIRV** weapons, the **Bouncy Castle** and **Mag Deflector** defensive weapons only use the shielding function when hit by these weapons. In addition, **MIRV** warheads do not bounce or fly through sidewalls when falling!
+
 None of the shields protect against **Napalm**. **Bouncy Castle** or **Mag Deflector** on a direct hit will deflect it or carry it past, but just hit very close to a tank and its shield will not save it.
 
 **White Flag**, **Hovercraft** and **Nuclear Winter** weapons, when selected, require activation, this is accomplished by "firing a shot" after the selection of that weapon. Of course, the shot of the offensive weapon is then not fired, but only the selected defensive weapon is activated.

MANUAL_PL.md

@@ -7,7 +7,7 @@ Na pierwszym ekranie możemy skonfigurować opcje rozgrywki:
 * ilość graczy (2 - 6) obejmuje tak ludzi jak graczy sterowanych przez komputer
 * początkową ilość gotówki każdego z graczy (8k to wybrana przez nas wartość optymalna, lecz przy krótkich rozgrywkach warto wybrać większą wartość)
 * grawitacja
-* maksymalna siła wiatru (wiatr jest losowany na początku każdej z rund, tu możemy wybrać jak silny może być)
+* maksymalna siła wiatru (wiatr jest losowany na początku każdej z rund lub w czasie rundy pomiędzy turami, tu możemy wybrać jak silny może być)
 * liczba rozgrywanych rund
 * szybkość lotu pocisków (nie ma wpływu na tor lotu - zmienia jedynie widoczną prędkość rysowania - nie zmienia nic w samej rozgrywce)
 * częstotliwość samobójstw :) - jeśli przez ileś tur gra nie odnotowała trafień (czołgi ciągle strzelają niecelnie) jeden z takich pudłujących czołgów popełnia samobójstwo - tu określamy jak długo mogą “strzelać w próżnię” :) - jeśli grają tylko ludzie optymalne ustawienie to “norm”, w przypadku graczy sterowanych przez komputer… wedle uznania.
@@ -23,7 +23,7 @@ Na pierwszym ekranie możemy skonfigurować opcje rozgrywki:
 
 Wybór opcji klawiszami kursora lub joystickiem.
 
-Klawisz [TAB] lub [SELECT], a na konsoli Atari 5200 klawisz [5] kontrolera zmieniają kolor gór (3 wersje do wyboru).
+Klawisz [TAB] lub [SELECT], a na konsoli Atari 5200 klawisz [5] kontrolera zmieniają kolor gór (3 wersje do wyboru) lub (leśli kursor wskazuje opcję wyboru siły wiatru "Wind") zmieniają sposób losowania siły wiatru z "co rundę" na "co turę" i odwrotnie. Losowanie co turę jest sygnalizowane znakiem "?" przy słowie "Wind".
 
 Klawisz [RETURN] lub przycisk Joysticka przechodzi do następnego ekranu.
 
@@ -74,6 +74,7 @@ Tutaj klawiszologia jest prosta, klawisze kursora lub joystick: lewo/prawo - zmi
 | [START] | brak | przyspiesza/pomija niektóre animacje w grze |
 | [O] | [3] | wymuszenie zakończenia gry (Game Over). W podsumowaniu wyników nie jest brana pod uwagę przerwana właśnie runda rozgrywki, a wyłącznie rundy zakończone wcześniej. Odpowiada to wciśnięciu klawisza [ESC] z tą różnicą, że wyświetlane jest podsumowanie oraz creditsy. |
 | [START] + [OPTION] | brak | natychmiastowe wymuszenie zakończenia gry (Game Over), tak jak [O] ale bez potwierdzenia. |
+| [G] | brak | zmienia cieniowanie gór |
 | [ESC] | [*] | w czasie całej gry w dowolnym momencie (chyba że akurat gra komputer, wtedy czasem trzeba chwilę poczekać) można nacisnąć klawisz [ESC], który umożliwia przerwanie gry i powrót na początek (oczywiście jest zabezpieczenie przed przypadkowym naciśnięciem). |
 | [Y] | [1] | w przypadku pytania o przerwanie lub zakończenie gry - potwierdzenie decyzji |
 

README.md

@@ -51,6 +51,14 @@ With the advent of [fujinet](https://fujinet.online/) we are thinking about maki
 
 ## Changelog:
 
+###### Version 1.23
+2023-01-01
+
+New year edition! Who could imagine?
+The new feature is that pressing [Tab] in the main menu now changes colors of the small tank area down the screen and makes it clear what color version you are going to run (classic/ Polish rainbow/ Christmas colors).
+Also a small gradient optimization. 
+
+
 ###### Version 1.22
 2022-12-24
 

constants.asm

@@ -599,7 +599,7 @@ CreditsStart
 	dta d"You were playin",d"g"*
 	dta d"Scorc",d"h"*
 	dta d"Warsaw, Miam",d"i"*
-	dta d"2000-202",d"2"*
+	dta d"2000-202",d"3"*
 	dta d" "*
 	dta d"Programmin",d"g"*
 	dta d"Tomasz 'Pecus' Peck",d"o"*
@@ -629,6 +629,7 @@ CreditsStart
 	dta d"Shaggy the Atarian, RetroBorsuk, ZP",d"H"*
 	.IF target = 5200
     dta d"x-usr(1536), Aking, JAC!, phaero",d"n"*
+	dta d"RB520",d"0"*
 	.ENDIF
 	dta d" "*
 	dta d"Additional testin",d"g"*

display_static.asm

@@ -9,7 +9,7 @@
 OptionsScreen
  dta d"Welcome to Scorch v. "
  build  ; 4 bytes from scorch.asm (fancy method) :) 
- dta                          d"  (un)2000-2022"
+ dta                          d"  (un)2000-2023"
 
 .IF TARGET = 800
  dta d" Please select option with cursor keys  "

lib/5200MACRO.ASM

@@ -91,6 +91,12 @@
 		 bcs ?WFRAME
 ?nowait
          .ENDM
+;-------------------------------------
+	.macro waitRTC
+	lda RTCLOK+1
+?wa	cmp RTCLOK+1
+	beq ?wa
+	.endm
 ;-------------------------------------
     .macro negw
     ; negate the given word (0-a)

lib/MACRO.ASM

@@ -77,10 +77,10 @@
 ;	WAIT
 ;	waits one frame (1/50 s(PAL) or 1/60s(NTSC))
 ?zero	 LDA VCOUNT
-		cmp #$05
+		cmp #$05	; if line<5 then wait for line>4
 		 bcc ?zero
 		 cmp #$70
-		 bcc ?WA
+		 bcc ?WA	; if line>=112 then
 		 sbc #10	; last lines correction
 ?WA		 cmp VCOUNT
 		 beq ?WA
@@ -90,6 +90,12 @@
 		 bcs ?WFRAME
 ?nowait
          .ENDM
+;-------------------------------------
+	.macro waitRTC
+	lda RTCLOK+2
+?wa	cmp RTCLOK+2
+	beq ?wa
+	.endm
 ;-------------------------------------
     .macro negw
     ; negate the given word (0-a)

scorch.asm

@@ -15,7 +15,7 @@
 
 ;---------------------------------------------------
 .macro build
-	dta d"1.22" ; number of this build (4 bytes)
+	dta d"1.25" ; number of this build (4 bytes)
 .endm
 
 .macro RMTSong
@@ -26,11 +26,12 @@
 ;---------------------------------------------------
     icl 'definitions.asm'
 ;---------------------------------------------------
-FirstZpageVariable = $5B
+
+FirstZpageVariable = $5A
     .zpvar DliColorBack		.byte = FirstZpageVariable
-	.zpvar Gradient			.byte
 	.zpvar GradientNr		.byte
 	.zpvar GradientColors	.word
+	.zpvar WindChangeInRound	.byte	; wind change after each turn (not round only) flag - (0 - round only, >0 - each turn)
 	.zpvar JoystickNumber	.byte
     .zpvar xdraw            .word ;= $64 ;variable X for plot
     .zpvar ydraw            .word ;variable Y for plot (like in Atari Basic - Y=0 in upper right corner of the screen)
@@ -93,6 +94,7 @@ FirstZpageVariable = $5B
     .zpvar NumberOfPlayers .byte ;current number of players (counted from 1)
     .zpvar Counter .byte ;temporary Counter for outside loops
     .zpvar ExplosionRadius .byte
+	.zpvar FunkyBombCounter .byte
     .zpvar ResultY .byte
     .zpvar xcircle .word
     .zpvar ycircle .word
@@ -130,7 +132,7 @@ FirstZpageVariable = $5B
     .zpvar goleft .byte
     .zpvar OffsetDL1 .byte
     .zpvar L1 .byte
-	
+	HotNapalmFlag = FunkyBombCounter ; reuse variable!
     ;* RMT ZeroPage addresses in artwork/sfx/rmtplayr.a65
 
     displayposition = modify
@@ -230,6 +232,62 @@ StatusBufferCopyEnd
 ; Game Code
 ;--------------------------------------------------
 FirstSTART
+    .IF TARGET = 5200
+    ; start in 5200 diagnostic mode
+    ; move original startup procedure to RAM
+    Modified5200Splash = $2100  ; apparently there is some free space here
+    ; 6502 initialization
+    ; SEI
+    ; CLD
+    ; LDX #$FF
+    ; TXS
+    
+    ; check kernel version
+    Atari5200KernelByte = $fff8
+    ; $32 - 4 joy 
+    ; $00 - 2 joy
+    ; $ff - Altirra kernel
+
+    lda Atari5200KernelByte
+    beq rom2joy
+    cmp #$32
+    beq rom4joy
+altirra_kernel
+    mwa #Modified5200Splash+$8a modify
+    bne @+  ; JMP
+
+rom4joy
+    mwa #Modified5200Splash+$16b modify
+    bne @+  ; JMP
+
+rom2joy
+    mwa #Modified5200Splash+$181 modify
+@
+    mwa $fffc temp  ; startup proc address
+    mwa #Modified5200Splash temp2
+    jsr CopyFromROM    
+    ; modify the end of the splash procedure
+    lda #$60  ; rts
+    sta (temp2),y
+    
+    jsr Modified5200Splash+$0f  ; after the diag cart detection
+    ; modify the text
+    splash_text = $3c80 ; '.scorch.supersystem.copyright.19xx.atari'
+    splash_year = splash_text + $1e
+    lda #"2"
+    sta splash_year
+    sta splash_year+2
+    lda #"0"
+    sta splash_year+1
+    lda #"3"
+    sta splash_year+3
+    
+    
+    ; splash screen delay. maybe add fire to speed up?
+@    cpx RTCLOK+1
+    bne @-
+no5200splash  
+    .ENDIF
 	jsr MakeDarkScreen
 
 	; one time zero variables in RAM (non zero page)
@@ -290,12 +348,12 @@ FirstSTART
 	mva #$10 MODUL-6+$a69	; $12 > $10
 	mva #$04 MODUL-6+$bf8	; $05 > $04
 	mva #$08 MODUL-6+$e3d	; $0a > $08
-	; and colors - sorry no memory!
+	; and mountains colors
-;	mva #$c4 dliColorsFore2+16
+	mva #$c4 dliColorsFore2+16
-;	mva #$c6 dliColorsFore2+17
+	mva #$c6 dliColorsFore2+17
-;	mva #$a4 dliColorsFore2+18
+	mva #$a4 dliColorsFore2+18
-;	mva #$a6 dliColorsFore2+19
+	mva #$a6 dliColorsFore2+19
-;	sta dliColorsFore2+20
+	sta dliColorsFore2+20
 NoRMT_PALchange
 	.ELSE
 	mva #$7f SkStatSimulator
@@ -321,6 +379,7 @@ NoRMT_PALchange
 	mva #2 chactl  ; necessary for 5200
 	
 START
+	jsr MakeDarkScreen
     ; Startup sequence
     jsr Initialize
 
@@ -827,8 +886,14 @@ NoPlayerNoDeath
 
     inc:lda TankSequencePointer
     cmp NumberOfPlayers
-    sne:mva #0 TankSequencePointer
+	bne NotLastPlayerInRound
-
+    mva #0 TankSequencePointer
+	
+	lda WindChangeInRound
+	beq NoWindChangeNow
+	jsr GetRandomWind	; wind change after each turn (not round only)
+NoWindChangeNow
+NotLastPlayerInRound
     jmp MainRoundLoop
 .endp
 	
@@ -1193,72 +1258,47 @@ MakeTanksVisible
 .endp
 ;--------------------------------------------------
 .proc DLIinterruptGraph
-    ;sta dliA
-	;sty dliY
 	pha
 	phy
 	ldy dliCounter
 	lda dliColorsBack,y
-	bit Gradient
-	bmi GoGradient
-	ldy #$ff
-GoGradient
-	iny
     .IF TARGET = 800
 	    nop  ; necessary on 800 because DLIs take less time, jitter visible without it
-;		nop
+		nop
+		nop
     .ENDIF
+	nop
+	nop
     sta COLPF1
+	lda GradientNr
+	bne GoGradient
+	ldy #$ff	; one mauntain color
+GoGradient
+	iny
 	lda (GradientColors),y		; mountains colors array
-;	lda dliColorsFore		; one mauntain color
 	sta COLPF2
 	inc dliCounter
-	;ldy dliY
-    ;lda dliA
     ply
     pla
     rti
 .endp
-
-/* .proc DLIinterruptGraph
-	pha
-	lda dliColorsFore
-	nop
-	nop
-    nop
-    .IF TARGET = 800
-	    nop  ; necessary on 800 because DLIs take less time, jitter visible without it
-        nop
-
-    .ENDIF
-	sta COLPF2
-	lda DliColorBack
-    sta COLPF1
-	eor #$02
-	sta DliColorBack
-    pla
-    rti
-.endp */
 ;--------------------------------------------------
 .proc DLIinterruptOptions
-    ;sta dliA
-	;sty dliY
 	pha
-;	lda dliColorsBack
+	phy
-	lda #0
+	lda #0	; background color
     sta COLPF1
-	lda dliColorsFore+1
+	ldy GradientNr
-	bit Gradient
+	beq @+
-	bmi @+
+	ldy #1
-	lda dliColorsFore
+@	lda (GradientColors),y		; mountains colors array
-@	sta COLPF2
+	sta COLPF2
+	ply
     pla
     rti
 .endp
 ;--------------------------------------------------
 .proc DLIinterruptGameOver
-    ;sta dliA
-	;sty dliY
 	pha
 	phy
 	lda dliCounter
@@ -1295,7 +1335,6 @@ EndOfDLI_GO
 .endp
 ;--------------------------------------------------
 .proc DLIinterruptText
-	;sta dliA
     pha
 	lda dliCounter
 	bne MoreBarsColorChange
@@ -1867,7 +1906,7 @@ MakeDarkScreen
 	and #%00000101	; Start + Option
 	sne:mva #$40 escFlag	
 	and #%00000001 ; START KEY
-	seq:wait
+	seq:wait	; or waitRTC ?
     rts
 .endp
 
@@ -2088,7 +2127,7 @@ MODULEND
     org ROM_SETTINGS  ; 5200 ROM settings address $bfe8
     ;     "01234567890123456789"
     .byte " scorch supersystem "    ;20 characters title
-    .byte "7A"          ;2 characters year .. 1900 + $7A = 2020
+    .byte " ", $ff          ;$BFFD == $ff means diagnostic cart, no splash screen
     .word FirstSTART
   .ELSE
      run FirstSTART

textproc.asm

@@ -63,6 +63,10 @@
     mva #0 OptionsY
 
 OptionsMainLoop
+
+	lda WindChangeInRound
+	sta OptionsHere+126
+
     jsr OptionsInversion
     jsr getkey
     bit escFlag
@@ -114,26 +118,31 @@ OptionsNoRight
 OptionsNoReturn
 	cmp #@kbcode._tab	; Tab key
 	bne OptionsNoTab
-	bit Gradient
+	jsr SelectNextGradient
-	bmi NextGradientNr
+OptionsNoTab
-	lda Gradient
+    jmp OptionsMainLoop
-@	eor #$80
+.endp
-	sta Gradient
+.proc SelectNextGradient
-NextGradientNr
+	lda OptionsY	; if "Wind" option selected
+	cmp #$03
+	bne NotWind
+	lda WindChangeInRound	; wind change after each turn (not round only) flag
+	eor #$1f	; '?' character
+	sta WindChangeInRound
+	rts
+NotWind
 	ldy GradientNr
 	iny
 	cpy #$03
 	bne NoGradientLoop
-	mva #$ff GradientNr
+	ldy #$00
-	bne @-
 NoGradientLoop
 	sty GradientNr
 	lda GradientAddrL,y
 	sta GradientColors
 	lda GradientAddrH,y
 	sta GradientColors+1	
-OptionsNoTab
+	rts
-    jmp OptionsMainLoop
 .endp
 ;--------
 ; inversing selected option (cursor)
@@ -2097,6 +2106,7 @@ FinishResultDisplay
 ;--------------------------------------------------
 .proc GameOverScreen
 ;--------------------------------------------------
+	jsr MakeDarkScreen
     jsr WaitForKeyRelease
     jsr ClearScreen
     jsr ClearPMmemory

variables.asm

@@ -261,7 +261,6 @@ oldplotL .DS [5]
 oldora  .DS [5]
 oldply  .DS [5]
 OldOraTemp .DS 1
-FunkyBombCounter .DS 1
 xtrajfb  .DS 2
 ytrajfb  .DS 2
 ;

weapons.asm

@@ -74,37 +74,38 @@ CheckNextTankBFG
 .endp
 ; ------------------------
 .proc babymissile
-    mva #sfx_baby_missile sfx_effect 
     mva #11 ExplosionRadius
+GoBabyMissileSFX
+    mva #sfx_baby_missile sfx_effect 
 GoXmissile
     jmp xmissile
 .endp
 ; ------------------------
 .proc missile ;
-    mva #sfx_baby_missile sfx_effect
     mva #17 ExplosionRadius
-	bne babymissile.GoXmissile
+	bne babymissile.GoBabyMissileSFX
 ;    jmp xmissile
 .endp
 ; ------------------------
 .proc babynuke
-    mva #sfx_nuke sfx_effect 
     mva #25 ExplosionRadius
+GoBabyNukeSFX
+    mva #sfx_nuke sfx_effect 	; allways <>0
 	bne babymissile.GoXmissile
 ;    jmp xmissile
 .endp
 ; ------------------------
 .proc nuke
-    mva #sfx_nuke sfx_effect 
     mva #30 ExplosionRadius
-	bne babymissile.GoXmissile
+	bne babynuke.GoBabyNukeSFX
 ;    jmp xmissile
 .endp
 ; ------------------------
 .proc leapfrog
-    mva #sfx_baby_missile sfx_effect
     mva #17 ExplosionRadius
-    jsr xmissile
+;    mva #sfx_baby_missile sfx_effect 
+;    jsr xmissile
+    jsr babymissile.GoBabyMissileSFX
 
 	jsr SecondRepeat
 	
@@ -238,22 +239,20 @@ GoXmissileWithSaveXYdraw
 .endp
 ; ------------------------
 .proc napalm
-    mva #sfx_napalm sfx_effect
+	mva #0 HotNapalmFlag	; in this weapon - flag: 0 - napalm, 1 - hotnapalm
-    mva #(napalmRadius+4) ExplosionRadius 	; real radius + 4 pixels (half characrer width)
-    jsr CalculateExplosionRange
-	mva #0 ExplosionRadius	; in this weapon - flag: 0 - napalm, 1 - hotnapalm
 	beq xnapalm
 .endp
 ; ------------------------
 .proc hotnapalm
-    mva #sfx_napalm sfx_effect
+	mva #1 HotNapalmFlag	; in this weapon - flag: 0 - napalm, 1 - hotnapalm
-    mva #(napalmRadius+4) ExplosionRadius 	; real radius + 4 pixels (half characrer width)
-    jsr CalculateExplosionRange
-	mva #1 ExplosionRadius	; in this weapon - flag: 0 - napalm, 1 - hotnapalm
 ;	jmp xnapalm
 .endp
 ; ------------------------
 .proc xnapalm
+    mva #sfx_napalm sfx_effect
+    mva #(napalmRadius+4) ExplosionRadius 	; real radius + 4 pixels (half characrer width)
+    jsr CalculateExplosionRange
+	;
 	mwa xdraw xcircle	; store hitpoint for future repeats
 	ldy #30		; repeat 30 times
 	sty magic	
@@ -271,7 +270,7 @@ RepeatFlame		; internal loop (draw flames)
 	sbc #1	; over ground
 	sta ydraw
 	lda xdraw
-	and ExplosionRadius	; if hotnapalm and x is odd:
+	and HotNapalmFlag	; if hotnapalm and x is odd:
 	:2 asl	; modify y position 4 pixels up
 	ldy ydraw
 	sta ydraw
@@ -343,7 +342,7 @@ BurnedCheckLoop
 	bcc TankOutOfFire
 
     ldy #40		; energy decrease (napalm) - but if hotnapalm:
-	lda ExplosionRadius
+	lda HotNapalmFlag
 	beq NotHot
 	ldy #80		; energy decrease (hotnapalm)
 NotHot
@@ -385,50 +384,40 @@ EndNurnedCheckLoop
 .endp
 ; ------------------------
 .proc babydigger
-    mva #sfx_digger sfx_effect
+    mva #1 diggery  ; how many branches (-1)
+GoBabydiggerSFX
+	mva #sfx_digger sfx_effect
     mva #0 sandhogflag
     mva #13 DigLong
-    mva #1 diggery  ; how many branches (-1)
     bne xdigger
 .endp
 ; ------------------------
 .proc digger ;
-    mva #sfx_digger sfx_effect
-    mva #0 sandhogflag
-    mva #13 DigLong
     mva #3 diggery  ; how many branches (-1)
-    bne xdigger
+    bne babydigger.GoBabydiggerSFX
 .endp
 ; ------------------------
 .proc heavydigger
-    mva #sfx_digger sfx_effect
-    mva #0 sandhogflag
-    mva #13 DigLong
     mva #7 diggery  ; how many branches  (-1)
-    bne xdigger
+    bne babydigger.GoBabydiggerSFX
 .endp
 ; ------------------------
 .proc babysandhog
-    mva #sfx_sandhog sfx_effect
-    mva #char_sandhog_offset sandhogflag
-    mva #13 DigLong
     mva #1 diggery  ; how many branches (-1)
-    bne xdigger
+    bne heavysandhog.GoHeavysandhogSFX
 .endp
 ; ------------------------
 .proc sandhog
-    mva #sfx_sandhog sfx_effect
-    mva #char_sandhog_offset sandhogflag
-    mva #13 DigLong
     mva #3 diggery  ; how many branches (-1)
-    bne xdigger
+    bne heavysandhog.GoHeavysandhogSFX
 .endp
 ; ------------------------
 .proc heavysandhog
+    mva #5 diggery  ; how many branches (-1)
+GoHeavysandhogSFX
     mva #sfx_sandhog sfx_effect
     mva #char_sandhog_offset sandhogflag
     mva #13 DigLong
-    mva #5 diggery  ; how many branches (-1)
 ;    jmp xdigger
 .endp
 ; ------------------------
@@ -1160,7 +1149,7 @@ afterInventory
 	jsr MakeDarkScreen	
     jsr DisplayStatus
     jsr SetMainScreen   
-    jsr WaitOneFrame
+    ;jsr WaitOneFrame    ; not necessary
     jsr DrawTanks
 	bit SpyHardFlag
 	bpl NoSpyHard
@@ -1168,8 +1157,7 @@ afterInventory
 NoSpyHard
     RmtSong song_ingame
     mva #0 escFlag
-    jsr WaitForKeyRelease
+    jmp ReleaseAndLoop   
-    jmp BeforeFire   
 @
     cmp #$80|@kbcode._up
     jeq CTRLPressedUp
@@ -1196,7 +1184,14 @@ jumpFromStick
     jeq pressedM
     cmp #@kbcode._S  ; $3e  ; S
     jeq pressedS
-    jmp notpressed
+	.IF TARGET = 800
+	cmp #61	; G
+	bne EndKeys
+	jsr SelectNextGradient
+	jmp ReleaseAndLoop
+	.ENDIF
+EndKeys
+	jmp notpressed
 checkJoy
     ;------------JOY-------------
     ;happy happy joy joy
@@ -1376,8 +1371,7 @@ pressedTAB
     lda ActiveWeapon,x
     jsr HowManyBullets ; and we have qty of owned shells. Ufff....
     beq pressedTAB
-    jsr WaitForKeyRelease
+    bne ReleaseAndLoop
-    jmp BeforeFire
 
 CTRLpressedTAB
     mva #sfx_purchase sfx_effect
@@ -1394,21 +1388,20 @@ CTRLpressedTAB
     lda ActiveWeapon,x
     jsr HowManyBullets ; and we have qty of owned shells. Ufff....
     beq CTRLpressedTAB
-    jsr WaitForKeyRelease
+    bne ReleaseAndLoop
-    jmp BeforeFire
 
 pressedM
     ; have you tried turning the music off and on again?
     lda #$ff
     eor:sta noMusic
     RmtSong song_ingame
-    jsr WaitForKeyRelease
+    jmp ReleaseAndLoop
-    jmp BeforeFire
 
 pressedS
     ; have you tried turning sfx off and on again?
     lda #$ff
     eor:sta noSfx
+ReleaseAndLoop
     jsr WaitForKeyRelease
     jmp BeforeFire