From e5ce864254afaa9039833810bd6c47b8a970db7e Mon Sep 17 00:00:00 2001 From: pkali Date: Sat, 6 Aug 2022 01:03:01 -0400 Subject: [PATCH] new song, VBL fix --- artwork/sfx/rmt_feat.asm | 20 +++++++++--------- ...ripped.rmt => scorch_trial0g_stripped.rmt} | Bin 2791 -> 2988 bytes definitions.asm | 3 ++- scorch.asm | 8 +++---- scorch.xex | Bin 41884 -> 42291 bytes 5 files changed, 16 insertions(+), 15 deletions(-) rename artwork/sfx/{scorch_trial0f_stripped.rmt => scorch_trial0g_stripped.rmt} (61%) diff --git a/artwork/sfx/rmt_feat.asm b/artwork/sfx/rmt_feat.asm index 84a3f1d..73cb5ba 100644 --- a/artwork/sfx/rmt_feat.asm +++ b/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-------- diff --git a/artwork/sfx/scorch_trial0f_stripped.rmt b/artwork/sfx/scorch_trial0g_stripped.rmt similarity index 61% rename from artwork/sfx/scorch_trial0f_stripped.rmt rename to artwork/sfx/scorch_trial0g_stripped.rmt index 0343be7842dbc43599dd35e2ce6dd029f6ba7ad9..95855e321b857aa1afe824d52ac8b09219d9ef81 100644 GIT binary patch delta 417 zcmYj}y-UMT6vbcKq-oRG4@CqgKL$%Dp@L8`br3|XT5TO&x+{p{AZSrKxdbfYCcfu~Cocp`?z5TeOKq=BHWOgz)FcRUoh?dt@ zwLIC@4m4YP)@i>$&PywOozWj%y#aeq-0D7+*%x%$S?zjrnSJSqW>} zDq4u?)Vi~Hd(d97kL-I}aJrrJ$y=y3IluHUv{1gSe=??P*m0cbSySgtAw&q#i+f^R zmSZu5{O&7+<|NmnP5*|3gqVAzQm6mQgZNUzAMZ{1GFS=DV8~)c9LF$*Atj8nYMp}% z1j9%P*5m-@3YTeCrZG%mMVP`cfx#{QD1~QNVFqMf2HdZI%etxvb#KH5hEK^FX!1|;yU5jjL#7*9doAwsmZt(n97 F;F|9^%J4|WClhL|`AFfs~kNZ63SVdbv64O2F(-f(uq?+tPr(>KoAxO3zA zjqf&kY%1F{W0TD01)J|~R@u_IW#*RGTlBWNY%Sfod+WumBHPrrId7}j#sCD1w;kQ~ zW1IH&jO}x_AKU(OyJ-39>$jQNq-vgs`IfX!*#QDOL4b7^2yC1%oqci;$04Qz;giKU zwV3S`{%=m^T+C?kpZWj)e+(;k{bykO&%gx4ER6sEF>l@V|35q1|NoraK$-(cbNypG SxQmDHKQB=E|9?C;cL4y1zH?Uq diff --git a/definitions.asm b/definitions.asm index f04b4ae..06da232 100644 --- a/definitions.asm +++ b/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 diff --git a/scorch.asm b/scorch.asm index cdb30ba..cc3d052 100644 --- a/scorch.asm +++ b/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+ ; ; diff --git a/scorch.xex b/scorch.xex index 8773b7217ce2f469495d0d2094c14d3fcfbe6897..025c9f472ec6e0d5bdde797fd703f414378e61de 100644 GIT binary patch delta 1255 zcmZWpeP~-%6uTy@|A^~^Y^&17O)^@s%r*^Lu&ZygAL+Wy$x5Y^ffa`$OpS@M z4jFw(*|XgSK9?Bcn-)gQ82Hhy>K|g~kT439Qr`2vCpf{&x##`v zIlucm=W-wSvqdtoOvVPADo%xXk#4`jBWtof;JwzyYnU@lX`(-|zd7-wx(rA8)6B{K z>V)d`lO$1=7#Qe!#`zU^k=N>VqB*bE8$ff;IYg)oh!91BK%$5U`6B~FDwKp;qt)qE zMpIe2`LT-1Dg%>ez9r@pqo1k>+ixKXg{dx{8i`N?p>qpoziA7&d31T5`=qcHP{tSN z&Cn9|8J@W@wwoAa*2W$u9xxBb8lFh=B_)qa>j5%8k2&+hU!R-5hDu3%B14FIaeNQ) zEHgO%^f3`{rcVHMJd|%KRde~exspzAv$6L%N-b$)Ap9<2E^jwVwG1I?eT&bFC7qO) z7t|n+J6*PK%_6Y>WgQApz08l})gB5a;)|>kmasR=zDo9XU|VHyRQ5X|pv8Xky|IAQ1Ryjd}FvV1(oKd zmdJe(=8cOkj|*}&P}-Fz3OjP!oW;EtEVH$6W?Yh-2}|Xu55jkAV73Y7Or!gAtzdrY z(pn=Fv^gi>G6jXu2stGTFXpr`yfoVgxQ_|xuW?ydHA`fhkspvofmsIBllO8npCRw!G9Td}w)U@6FzII1dwy=4H0 z8X(_1s^Jmq0={J;e$(RK=GYEcwks%gIC>OJ$G~(POs_)7M@OP&UYsUF_vuIhVHuw23y66Cqzh5C7dUF57j;)!;M}gxM48kG&h~ z&z_G3V(HiqF-_bSe>)EGoAICGTXEOa$5Yp*Y7>#fM#4TlHqA{xoIa53NPd)DOs*xZ zsru9_sk14B#}}#ZQp)sm>37l->0(-y*_ELte=Vyx@Y?Cy&ktQ+S^WcZtj(EBW=0-2 zh%cQZatF^ERaaa_^#Uaw5U6R4nt>9 z=ngtG2ZO>(L7_!;5Qp4^kV8T7c*Jrj@vd@A z=$1Hwr1~hi>UXGC{U5ISh41~sy5FI>;}>rGg**QLl0=0l3aCGepAiv}cq$1|P`sHH sMU7hAC+Z9sXhl({7u4@%jb)+<^F_gUA*;e~i;T-Z&;CsQLcagP-7fK6rNotj+5Axl?2!}X=Rm!pMa35e8|BNx8)E;8yZ4rB5_C*6al9eiMAk` z#)qbArP>PG)C9x`H)x+S>pI%?#&$7TVH6;CAYk@_DntQ^L!tuO0}_9cr?dVv?|W~a z-hA)9(UwL6>{fnR z{P{*#{4_!5AIra%-o>l5#mGISAienGQ*K1^#y;d$r1n^VOG!hqP12dzX6`fTQf$Y# zH!=ufr&8>+n&sm5yj5G*-j1Kk;yNj4i!3Ow+Ob?LQmfX^u1pXB;_`U4>^$9c!q zVf7o8!bR!nakW>>Y%iYNRA?oBA!_lN6U_M kj?x+@rM30UyO^&lJFn;5A5ae~r)Bp)xhMQn{>&Hu1JA&{UH||9