diff --git a/artwork/Scorch50.scr b/artwork/Scorch50.scr new file mode 100644 index 0000000..b1b3d7f Binary files /dev/null and b/artwork/Scorch50.scr differ diff --git a/artwork/sfx/feat.old b/artwork/sfx/feat.old new file mode 100644 index 0000000..cdab946 --- /dev/null +++ b/artwork/sfx/feat.old @@ -0,0 +1,41 @@ +STEREOMODE equ 0 +;* --------BEGIN-------- +;* C:\Atari\rmt\rmt128\schorch_str.rmt +FEAT_SFX equ 1 +FEAT_GLOBALVOLUMEFADE equ 0 ;RMTGLOBALVOLUMEFADE variable +FEAT_NOSTARTINGSONGLINE equ 0 +FEAT_INSTRSPEED equ 1 +FEAT_CONSTANTSPEED equ 0 ;(19 times) +FEAT_COMMAND1 equ 1 ;(18 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_COMMAND7SETNOTE equ 0 ;(0 times) +FEAT_COMMAND7VOLUMEONLY equ 0 ;(0 times) +FEAT_PORTAMENTO 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) +FEAT_BASS16G1L equ 0 ;(0 times) +FEAT_BASS16G3L equ 0 ;(0 times) +FEAT_BASS16G1R equ 0 ;(0 times) +FEAT_BASS16G3R equ 0 ;(0 times) +FEAT_VOLUMEONLYG0L equ 0 ;(0 times) +FEAT_VOLUMEONLYG2L equ 0 ;(0 times) +FEAT_VOLUMEONLYG3L equ 0 ;(0 times) +FEAT_VOLUMEONLYG0R equ 0 ;(0 times) +FEAT_VOLUMEONLYG2R equ 0 ;(0 times) +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 ;(6 times) +FEAT_VOLUMEMIN equ 0 ;(0 times) +FEAT_EFFECTVIBRATO equ 1 ;(3 times) +FEAT_EFFECTFSHIFT equ 1 ;(11 times) +;* --------END-------- diff --git a/artwork/sfx/feat.txt b/artwork/sfx/feat.txt index cdab946..cd2326c 100644 --- a/artwork/sfx/feat.txt +++ b/artwork/sfx/feat.txt @@ -1,6 +1,6 @@ STEREOMODE equ 0 ;* --------BEGIN-------- -;* C:\Atari\rmt\rmt128\schorch_str.rmt +;* C:\Atari\rmt\rmt128\schorch_str2.rmt FEAT_SFX equ 1 FEAT_GLOBALVOLUMEFADE equ 0 ;RMTGLOBALVOLUMEFADE variable FEAT_NOSTARTINGSONGLINE equ 0 @@ -33,7 +33,7 @@ FEAT_VOLUMEONLYG2R equ 0 ;(0 times) 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_TABLEGO equ 1 ;(2 times) FEAT_AUDCTLMANUALSET equ 1 ;(6 times) FEAT_VOLUMEMIN equ 0 ;(0 times) FEAT_EFFECTVIBRATO equ 1 ;(3 times) diff --git a/artwork/sfx/schorch_str2.rmt b/artwork/sfx/schorch_str2.rmt new file mode 100644 index 0000000..1c893ac Binary files /dev/null and b/artwork/sfx/schorch_str2.rmt differ diff --git a/constants.asm b/constants.asm index d762e06..af39038 100644 --- a/constants.asm +++ b/constants.asm @@ -430,7 +430,7 @@ WeaponUnits .by 3 ;Force_Shield___ .by 2 ;Super_Mag______ .by 1 ;Auto_Defense___ - .by 1 ;Long_Barrel____ + .by 2 ;Long_Barrel____ .by 1 ;Nuclear_Winter_ PurchaseMeTable ;weapons good to be purchased by the robot @@ -550,15 +550,15 @@ NamesOfWeapons ;the comment is an index in the tables dta d"Horz Guidance " ; 51 dta d"Vert Guidance " ; 52 dta d"Lazy Boy " ; 53 - dta d"Parachute " ; 54 - no energy + dta d"Parachute " ; 54 - no energy dta d"Strong Parachute" ; 55 - with energy (earlier Battery) dta d"Mag Deflector " ; 56 - with shield and energy dta d"Shield " ; 57 - shield for one shot - no energy - dta d"Heavy Shield " ; 58 - shield with energy - dta d"Force Shield " ; 59 - shield with energy and parachute + dta d"Heavy Shield " ; 58 - shield with energy + dta d"Force Shield " ; 59 - shield with energy and parachute dta d"Super Mag " ; 60 - dta d"Bouncy Castle " ; 61 - with shield and energy - dta d"Long Barrel " ; 62 + dta d"Bouncy Castle " ; 61 - with shield and energy + dta d"Long Schlong " ; 62 dta d"Nuclear Winter " ; 63 DefensiveEnergy = * - 48 .by 00 ; White Flag diff --git a/definitions.asm b/definitions.asm index 1e0987e..8a7025e 100644 --- a/definitions.asm +++ b/definitions.asm @@ -97,7 +97,7 @@ price_Heavy_Shield___ = 628 ;_58 price_Force_Shield___ = 1100 ;_59 price_Super_Mag______ = $ffff ;_60 price_Bouncy_Castle__ = 512 ;_61 -price_Long_Barrel____ = 920 ;_62 +price_Long_Barrel____ = 2100 ;_62 price_Nuclear_Winter_ = 1000 ;_63 ;Weapon indexes (numbers) ind_Baby_Missile___ = 0 @@ -197,6 +197,7 @@ sfx_seppuku = $1a ;1 sfx_liquid_dirt = $1b ;2 sfx_battery = $1c ;3 sfx_white_flag = $1d ;4 +sfx_long_barrel = $1e ;-------------------------------- ; RMT songs (lines) ;-------------------------------- diff --git a/grafproc.asm b/grafproc.asm index 7e47905..9d4ec3f 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -1905,6 +1905,7 @@ EndPut4x4 ; and #$fc ; ora #$02 ; 2=normal, 3 = wide screen width sta dmactls + jsr WaitOneFrame rts .endp ; ------------------------------------- diff --git a/scorch.asm b/scorch.asm index 6e8d5e6..1edd290 100644 --- a/scorch.asm +++ b/scorch.asm @@ -1593,7 +1593,7 @@ PLAYER MODUL equ $b000 ;address of RMT module opt h- ;RMT module is standard Atari binary file already - ins "artwork/sfx/scorch_trial0j_stripped.rmt" ;include music RMT module + ins "artwork/sfx/schorch_str2.rmt" ;include music RMT module opt h+ ; ; diff --git a/scorch.xex b/scorch.xex index 5a98348..0149cda 100644 Binary files a/scorch.xex and b/scorch.xex differ diff --git a/textproc.asm b/textproc.asm index 7093f99..624071c 100644 --- a/textproc.asm +++ b/textproc.asm @@ -840,6 +840,7 @@ NotBattery cmp #ind_Long_Barrel____ bne NotBarrel ; if activate long barrel, we do it differently too + mva #sfx_long_barrel sfx_effect mva #LongBarrel BarrelLength,x bne DecreaseDefensive ; bypass activation NotBarrel diff --git a/weapons.asm b/weapons.asm index 36fc466..e29d5f6 100644 --- a/weapons.asm +++ b/weapons.asm @@ -1210,11 +1210,14 @@ callInventory ; mva #$ff isInventory jsr Purchase + mva #0 dmactls ; dark screen + jsr WaitOneFrame lda #song_ingame jsr RmtSongSelect mva #0 escFlag jsr DisplayStatus jsr SetMainScreen + jsr WaitOneFrame jsr DrawTanks jsr WaitForKeyRelease jmp BeforeFire