new song, VBL fix

artwork/sfx/rmt_feat.asm

@@ -1,22 +1,22 @@
 ;* --------BEGIN--------
-;* Z:\home\pkalinowski\Seafile\atari\projects\scorch_src\artwork\sfx\scorch_trial07_stripped.rmt
+;* C:\Atari\rmt\rmt128\aa.rmt
 FEAT_SFX        equ 1
 FEAT_GLOBALVOLUMEFADE   equ 0       ;RMTGLOBALVOLUMEFADE variable
 FEAT_NOSTARTINGSONGLINE equ 0
 FEAT_INSTRSPEED     equ 1
-FEAT_CONSTANTSPEED      equ 16      ;(0 times)
-FEAT_COMMAND1       equ 1       ;(4 times)
+FEAT_CONSTANTSPEED      equ 0       ;(8 times)
+FEAT_COMMAND1       equ 1       ;(11 times)
 FEAT_COMMAND2       equ 0       ;(0 times)
 FEAT_COMMAND3       equ 0       ;(0 times)
 FEAT_COMMAND4       equ 0       ;(0 times)
 FEAT_COMMAND5       equ 0       ;(0 times)
-FEAT_COMMAND6       equ 0       ;(0 times)
+FEAT_COMMAND6       equ 1       ;(2 times)
 FEAT_COMMAND7SETNOTE        equ 0       ;(0 times)
 FEAT_COMMAND7VOLUMEONLY     equ 0       ;(0 times)
 FEAT_PORTAMENTO     equ 0       ;(0 times)
-FEAT_FILTER     equ 1       ;(22 times)
-FEAT_FILTERG0L      equ 0       ;(0 times)
-FEAT_FILTERG1L      equ 0       ;(0 times)
+FEAT_FILTER     equ 1       ;(44 times)
+FEAT_FILTERG0L      equ 1       ;(13 times)
+FEAT_FILTERG1L      equ 1       ;(22 times)
 FEAT_FILTERG0R      equ 0       ;(0 times)
 FEAT_FILTERG1R      equ 0       ;(0 times)
 FEAT_BASS16     equ 0       ;(0 times)
@@ -33,8 +33,8 @@ FEAT_VOLUMEONLYG3R      equ 0       ;(0 times)
 FEAT_TABLETYPE      equ 0       ;(0 times)
 FEAT_TABLEMODE      equ 0       ;(0 times)
 FEAT_TABLEGO        equ 1       ;(1 times)
-FEAT_AUDCTLMANUALSET        equ 1       ;(4 times)
+FEAT_AUDCTLMANUALSET        equ 1       ;(6 times)
 FEAT_VOLUMEMIN      equ 0       ;(0 times)
-FEAT_EFFECTVIBRATO      equ 0       ;(0 times)
-FEAT_EFFECTFSHIFT       equ 1       ;(7 times)
+FEAT_EFFECTVIBRATO      equ 1       ;(1 times)
+FEAT_EFFECTFSHIFT       equ 1       ;(11 times)
 ;* --------END--------

definitions.asm

@@ -201,4 +201,5 @@ sfx_white_flag  = $1d ;4
 song_silencio   = $00
 song_end_round  = $02
 song_ingame     = $06
-song_game_over  = $0b
+song_old_game_over  = $0b
+song_game_over  = $0e

scorch.asm

@@ -878,7 +878,7 @@ NotNegativeShieldEnergy
 ;--------------------------------------------------
     ldx #$3f  ; TODO: maxweapons
 @    lda #$0
-      cpx #48  ; White Flag
+      cpx #ind_White_Flag_____  ; White Flag
       bne @+
        lda #99     
 @     sta TanksWeapon1,x
@@ -986,7 +986,7 @@ ClearResults
     lda #0
     jsr RmtSongSelect
 ;
-    VMAIN VBLinterrupt,6  		;jsr SetVBL
+    VMAIN VBLinterrupt,7  		;jsr SetVBL
 
     rts
 .endp
@@ -1108,7 +1108,7 @@ exitVBL
     ply
     plx
 	pla
-	jmp SYSVBV
+	jmp XITVBV
 .endp
 ;----------------------------------------------
 .proc RandomizeSequence0
@@ -1485,7 +1485,7 @@ TankFont
 
 MODUL    equ $b000                                 ;address of RMT module
     opt h-                                         ;RMT module is standard Atari binary file already
-    ins "artwork/sfx/scorch_trial0f_stripped.rmt"  ;include music RMT module
+    ins "artwork/sfx/scorch_trial0g_stripped.rmt"  ;include music RMT module
     opt h+
 ;
 ;