From c15a80443c47346ef63b7af6956d78f4947b8c78 Mon Sep 17 00:00:00 2001 From: pkali Date: Sat, 17 Sep 2022 15:35:24 -0400 Subject: [PATCH] moving finished --- artwork/sfx/rmtplayr_modified.asm | 80 +++++++++++++++--------------- scorch.asm | 7 --- scorch.xex | Bin 48732 -> 48734 bytes textproc.asm | 16 ++++-- variables.asm | 36 +++++++++++++- 5 files changed, 85 insertions(+), 54 deletions(-) diff --git a/artwork/sfx/rmtplayr_modified.asm b/artwork/sfx/rmtplayr_modified.asm index 45972d8..b2c8f2e 100644 --- a/artwork/sfx/rmtplayr_modified.asm +++ b/artwork/sfx/rmtplayr_modified.asm @@ -48,42 +48,43 @@ p_instrstable = p_tis .zpvar v_speed .byte .zpvar RMTSFXVOLUME .byte - org PLAYER-$400+$e0 -track_variables -trackn_db .ds TRACKS -trackn_hb .ds TRACKS -trackn_idx .ds TRACKS -trackn_pause .ds TRACKS -trackn_note .ds TRACKS -trackn_volume .ds TRACKS -trackn_distor .ds TRACKS -trackn_shiftfrq .ds TRACKS -trackn_instrx2 .ds TRACKS -trackn_instrdb .ds TRACKS -trackn_instrhb .ds TRACKS -trackn_instridx .ds TRACKS -trackn_instrlen .ds TRACKS -trackn_instrlop .ds TRACKS -trackn_instrreachend .ds TRACKS -trackn_volumeslidedepth .ds TRACKS -trackn_volumeslidevalue .ds TRACKS -trackn_effdelay .ds TRACKS -trackn_effvibratoa .ds TRACKS -trackn_effshift .ds TRACKS -trackn_tabletypespeed .ds TRACKS -trackn_tablenote .ds TRACKS -trackn_tablea .ds TRACKS -trackn_tableend .ds TRACKS -trackn_tablelop .ds TRACKS -trackn_tablespeeda .ds TRACKS -trackn_command .ds TRACKS -trackn_filter .ds TRACKS -trackn_audf .ds TRACKS -trackn_audc .ds TRACKS -trackn_audctl .ds TRACKS -v_aspeed .ds 1 -track_endvariables - org PLAYER-$100-$140-$40+2 +; MOVED TO variables.asm +; org PLAYER-$400+$e0 +;track_variables +;trackn_db .ds TRACKS +;trackn_hb .ds TRACKS +;trackn_idx .ds TRACKS +;trackn_pause .ds TRACKS +;trackn_note .ds TRACKS +;trackn_volume .ds TRACKS +;trackn_distor .ds TRACKS +;trackn_shiftfrq .ds TRACKS +;trackn_instrx2 .ds TRACKS +;trackn_instrdb .ds TRACKS +;trackn_instrhb .ds TRACKS +;trackn_instridx .ds TRACKS +;trackn_instrlen .ds TRACKS +;trackn_instrlop .ds TRACKS +;trackn_instrreachend .ds TRACKS +;trackn_volumeslidedepth .ds TRACKS +;trackn_volumeslidevalue .ds TRACKS +;trackn_effdelay .ds TRACKS +;trackn_effvibratoa .ds TRACKS +;trackn_effshift .ds TRACKS +;trackn_tabletypespeed .ds TRACKS +;trackn_tablenote .ds TRACKS +;trackn_tablea .ds TRACKS +;trackn_tableend .ds TRACKS +;trackn_tablelop .ds TRACKS +;trackn_tablespeeda .ds TRACKS +;trackn_command .ds TRACKS +;trackn_filter .ds TRACKS +;trackn_audf .ds TRACKS +;trackn_audc .ds TRACKS +;trackn_audctl .ds TRACKS +;v_aspeed .ds 1 +;track_endvariables + INSTRPAR equ 12 tabbeganddistor dta frqtabpure-frqtab,$00 @@ -104,8 +105,7 @@ vibtabnext dta vib1-vib0+1,vib1-vib0+2,vib1-vib0+3,vib1-vib0+0 dta vib2-vib0+1,vib2-vib0+2,vib2-vib0+3,vib2-vib0+4,vib2-vib0+5,vib2-vib0+0 dta vib3-vib0+1,vib3-vib0+2,vib3-vib0+3,vib3-vib0+4,vib3-vib0+5,vib3-vib0+6,vib3-vib0+7,vib3-vib0+8,vib3-vib0+9,vib3-vib0+0 - org PLAYER-$100-$140 - org PLAYER-$100-$100 + .align $100 frqtab ERT [D66LJp_AcWWDDMi5gSS_wRM8N{#Q67texIx;|pltz7%A+Mvd!Zn= zq}+lOjTQgg09g9(6yzh(!C;}u)-qJZtDXgf;?3C|ISTYK;7?K6>`s}eWHsn_KAqrKSceEko*L%=~BM;%oF1@ zF%^1E9+^g1;oeE(g|U;O_u3~trXKdHo_%Phq;iig8Ko;A*WEq+ON&c#@OecdoK0dm zyX4`rB^|e1vI&ioC#t^_?lJ$#(U8a2X`~Kp#!Obff@NoxdFlhnOzs%QHHL9&Z;WL6 zjA2HPWQ>9P72y3$U^tUIl5q{EAE(AMPF9XV->J!rvs)rQex1y?6r^9rQzWy0vZMk4 zpTWxMQP+Q=3gj{0{U5>pfx``**lC0#bUK={z`My z7RhFi%N%w&7uAW>usPT0Vx8;a>a@FFUZZPI9W?YLIi+2EX zc%9D4NGg5+BbhiiTe94IeQMc~z+i^Us=x-wT65hL=_YrA^=C_JZdX}WKq%&GHSDvi z+2c6@yDrq5?N?Zqg$5fr!y9`fIH;GbW&17{kA>70^Ta9ar5Wtg^OY8Oq+~$iEk;;8 zwU6U1X5cYWV>v&7VafBLa5|Y`hg)`LDToExVj$Fq-8GZ_e!ZB*t;G`7Wzj`x*`K(2 z@?+WBby=Qw89AyfYrD(Cw2vx{1ly1^J8N1!xg>St+;s6NOem5L?u?O5OT;BL9y!8F zg=VfYV@C?786bgMk~u%!AVqO*Z`_gKgU)NgWxmV&RD)-lL6Jm3Hom}8c77JyCtu9w zvS<%oTtRl_G=niv%~&J2l)#6KRmG(y2I?4L$+W(XPfOT6Go`L!e(buSM(zL&nP+e< zFt{?X^WU0Frfize1ST`ajQLb)0^>mdnuGNmp3gWVzn{+#4TdCRu}1$G23RFy82?CM zm5gL880%IA=G?-KOZ3iXex1XVW6T_;j|D6)D$8=c#h}GL&P!_WgE_It!+u5>HhreU z&4^7n!H~q45?K z^M^E+(lL_i3@dA(?fZ%A8{+EL$u+K%E3=bpN2mIbmV9NA7Ru+q$+2>&KQx=+?AwcM zO*UE6WEX`S)Aje+3{nJdhopHA;r>B&j{VDY)-z2S%U{xzMo7dpmPoAY&jhQQM5LRp z@xtijKGUCJ>dAFU&F>@FxYsQ>eNnD53ZsjOk@;AekCXWhvNW65$(E$;NjqQji^U#) z@i*Um!*`cA8Re$e(#zAwCIP*>?DY$tf_>dgw zb?Jj^(a-Usp=LRVzF?@y4rzSny!LS0hPLy#m<<~tE{BZ>xS3PM(D=X( z=2Ri$)8Q9gfTGU=NtLrqK15rNPd9rZkL|r$0X{Ob6)qk%&DbJsGqYhXA3N){i4mal%aOQ7PyPS zV6^XInzEbE+2tc*wp>r;{yyW)*99X&v6C|2XXqab6~jTmEwBq-=1A~ns7vsQaCBxb z^%>!ZnMrE9@bIiDkbA+bhczBX_-Iys?Dy*@yqQ+&eVYi$v+ugCwRZMB_a+muj-Npi z#rl>=ekKt=Zc*{G2o6~#yXraiz*DdtEIdmrp?V}m^3#Q{X7_&}nQ(`^GYD7bok_TQ z?<~T741eTi_gi3cI!KY6Tj~G`)lW4{Cvp`e`jt0!??ZoK)X}w^O-!|R5~j?VroJG! z<_sMTn=;WTR#`i9DdJmJoOc}inp8OwMxZ9eHzHB2YEimc&_$v^E9G_+A@a#59BLwU zS|=fG}rfxxX5)GYTv>>{-jY% zp?1irX-f5e$r!DgxHzn8^>Y}sF;JQBjd7qctK!O}OX9)Sz095L1E=`_7s# zY?L}fHZkq8X_MHU&^C$P35{%(qfU{5`K7sV4OALtA^6nDc{iyKR1x#Wr{SKG4dvb^ z4P3hSDFbKq&NXn0v2V|bDf~M`Oy&Ph#5De0A}-?nL`>)3BchdmpNNb3Y9cyEQBAnT-T>jAqhm3w zc9UE~HP-vPVZ#2oy=RGil(JC(au*W)36wq;^BhN?Ml%>maG%GGJRS2|cCkloW@RsyPWJ8q=r2hA(2z3Ep}A)aQhM&g=0+Ew_rE7B0uFs#?XLWLQ|D zM`lvByrYLp%U=|F?C?n@q;Woy2)q_GKmqob#bQ9dn>`@h^K_E>fUx}OUXd6lbrMRR z9z5+NBjyA7BNw4zmDZ5R8-M(<4oR}CuCaFg+>NKgg)f0GHSLRxe2(-tV< zZ*9F|<--;q+E`8lF2rCLgjb(=U}E3p2&C$zvD`6Bu$LTz@C)ttEWt5yEX*I9mudcP zez2oF1Pw$mXW6}(G)9j?unkhjC@F-J*qmd6@vjSDiC6x$zoQWB-6+Pf;M{le;?$a- zo*#BPVRq02zlG4OIJhI{VT>{tJ|ntF1O~f;J$x)BQkHcZzN(N3-jq9@E@ns!^s1Qp zFANX&C!)7SA%Php<^xISYw0zT$%muDnS`&PGfR6BCo5AzkW~Gs*F$$AOc{_O6!sJ( zp`XR%VDjPY=;(dn(ds`Q4SPdJ`+Uk2tw>UL%67oR1pCU-VAq4-^M;23fW779ofFQo=FI-<>y66QGBQIH2049_ZAiRckx~P{VvgkR~jX2&1+JOVr}YsT&;L0^?mM;SeIJO)eXBx zU>Ejw+)qvC1JrarNKNNMFrDHdE?unStYSU4Sp1lK4kmLLX3?^tv|9_hwa9@b2_3{; zp$PFSTuuJ`JgmyoKqv9y#|b*IPH`}Yf{!|Th$-9wF_k+A`>vt(U5oIN6RH;u?{i>- zIj}%H03Ux4d}t^iTJQnFTK2#O;ozb^J@G46(I9|J758#!;y!MXX9NjF7i=0Kj7=GM zUk*J_cBZ0!XO=4r9Din-|0In|#4uXPSUf6njH~>p6Y)g4k-)esmvQrZ* z{F2hoavO+lG_}mI%Zbvy@82ezNP{JCdI+4>C4$wKNQ5|A0*QZ&J>6wKOpOb4v|X2e zr$<6=YHvpzRKvwUHCzTFzUS&e#P?l&h*<3!Km+d~q@J8KitkxdcoTZ8D!woJ@G}sx z*n2H0d{01IR6GkPeg+YWTgUebV4pwmM_}*dM{$bp^2&;a+wCl~n;pF^q;vG(c zk#eM@;)j#U;lhZt;r)jY2j@*wQGJ-%Y)1cxA*rY=o z{aQr3v3xF#TZF*~Y79_I_Ja-PnABTsC}o=Xv4dL#MC!yUhZAVrLq=fGFlo&_dC?&^HA8W6&CALt%xrmLLh4H=rXdp5T zLr7^vV2JScqM`A_3CR6cXWQ@52%Vw*0n4!W86hTpa+g?QnLeWZw2XE3KOZZkr4Pmp z7-~gz5EGW;dfArbK+r%_8OH=q`s29ivlpLZL+dR8j}AQBI#PZo-Yl|N*c}^!eVh?3 zI@}pM(?C52M*T6|49k%7c$WJdRKG~{#*!8tcbsiR@&JGp2wx7z66gJ`Gm9&Nkxm$B z_|*vU1Y?=Ar3rX#ZsnNyYvLvm_#7LVzUW7`CXmPnA;{ z#~ne_s^UI_Y`{og*x)%#&>;8u2AqaDUj7FhvtHr6wVS%H5V?4O<4lS9r*v<=M%J3E ztme?`U;L8E`t33@u?l7U!-w^t53uzS#5)9z0mFRY-x?q!XwJK-59EdA9 z4=xpP=eev<3Qf2C70|?%*m6aTxE5&~AEo#vZ#P;E6l7IV&_^lGk&xysB^nk>5}39X zD@&C-hq-TMUTWpq{H?W~Y{gi8YakF-Ld+R|!&S{7{Xf(eds#z|w)g?r}-CQ(djtmKaauW=9mIph6Y3D5vQ zL;Upc=ZqXF%7>3L&N%OJhLh3HeJXx-_ymO?Is66VivvmSi1!2|L}Uz%L4?%ndH!8S zNXRe@*KXx@1Y);xuU74_c>Bunk#YnLRpZqmedQp=+u`Wp4o5>j*UOhJNPG%QGiEsc zQ_Qc|dA}>>3lKDM9%@J0@}Wp~Lac4s(kn=PrgI*+hk*>cGlShb1A(vF5@h7g=La(0 zflM$~{tqsU0~zzz&j;qy9nR_G419TVbai$49#5{WRONrK7+Gcifnp? zuO2A$$(lisYmH(rZZWUOgb70oFRaNj&dcMU*Gon|Lr>#+crq_B*JMh~Q2g<*pQBrI z#udmJ>$#O?F3M)wAZo(!m z8F-fT^?HfiRS7@bsuQb8NLP2Tul$o6mmc=wvi$w*uouERs5M`j5gZoE4GJ5VbWM(2 zhCR`mBbUhyAV50Q?kC-m_{S^1tH2O4LBR~|Ta}ywkcN2MtXE!NOFcnAz zk)u2nLN*{!a1w!jNKv{` zOt*I9R)|(Omz5yMRj|4CG8+Z=Xb0N>4ouv}?S_2aJ*0@Dbn~}Mq{rIlJ8;{4^vL_nvh&Q<%qTRZUd(|CPwWBD#?qE0h z$}kU6Qdavz-M{k?x$`hDNr>@Q5C~<)Qtxj3Zal;KIzXZ&tI2r?Hx}Y9d7Yf!jd(BJ z%5v$jvDRkfgJY;dI3y!yJu@t%H771<+b~LvGGi@`j7lGDt(U<}x)sQf1@s3|k~L_= zeLX#x7t(DnN^eTXmECIIt4#mj24Wgzpy|$m57Lp}Ewx~uY|2u0?)R@I=AO&&`#P>& z<+N^e&9*IEH@Y@)8_x754-qE3Fx1g*!;DosR=lyTXh$%`86hn!+M%dO*DOk}qe2fM zkcWZ(DntEAfZo;o$EOE_AW&-UTRP8{ZSF{6D;3U1pgmgGduj8Uocd!FJOP}l}zH9mW!%@D{ ziGzkt<)D315$=@ogt0I7`V)@IJ<3sq#LD)E^tbI=y?jw}6s4CgbSD+2>o-~Tg@yV} zoAnlqEPAoGI#1a1V$b`Z*CY3pp{Gbnk^O+b~U0+y9%!^-CEO$Sl(q?j0!seWb zmZJlk`o%lK2oUzBe!yz_TKpQ`g61r~#*Bc}0)iYyOj}$0n&!}e`J>lhq`YBa-Y0e)qh+uITbNh;yD&oaXDp1%i; z{2d6_f!31!f*f{s4vn$K@(CJg5`V8o8qMFMkp}Wv8g{{Sp?cMzX{!uwRd~e}>u5E- zWULOpK?SM_oV_3cM%ZQ@626|8FRV;Ya;qx>kL@V3xwY*fSdk5;qXWuwS%JkuLQYo) zB!g=)nmIHWvm+RzRJtH`uv-yQ(19QwC3Y04@QMz zBo(-;lP{s1x)3#W#WA6Rj*6_LNA|chl8wtjjnz>aiKWyr!6aYD+b(k4l(H;bqNtOK z#c%jOiZ^tx$%1wj^5Wh?nW54(zM2w|jHz8@6`VgePKXh;h&Jc+ZL=jXQ4aoir4-ASku z144KY03J@Z^8iX;>iJW8{pgYiF&?lX`g&PYL@e^=&7?$&&2|CHa z>#?tV2cRcPszw+&*wscm#IqVe^yrxh_B7k=e?%Jy>p+vfL&>$nyr8XaZ-WCQ7b|F@ zdbf1Bb?Qf`sE}cw8ye`-1Kq)YOYa}e`cNNaE`LQXy8;t7Q`m#w>O*m8s(?ZvE$!Tw zWm&LU?H7@%){BT`r>DUGi14ywyZSC+;F|l?e-Y-a8K8byShZ%T`ZJ+y%{298;iol& z)P00rYX_+x6~?XY??_pbDCT0hDdK9ZHg#Bk+<2S*jp*`>JY{;4_*F+FZ?)`(jWl;B zE=ssRT#gzRuKFldU?qu{_NmR;z3rZ^~(iqiGddU6;FuvnZ&?f*UECUqN%TA8;SmlYi4-l3F4ZF;O9HVFH=r2W3QKx!dpmda<{eM+K*X~oP?R~=*S zzuq0~@3gJvmCyq<+e48BO>L308x8BhT!nb6w88IIVzkBrOVcujq5NH!ssHcajPjgEq!WL=oG=yD~9VWEa5iUp_aA2U;qmGD^SqiQ()|2Cn$0Vlir%7Ngt;&WSEVAK*z9GE7A;EDh4{Ab-KZ!Kf7~;EX zv`&ZdTuyCWHj!S%7tCzjk>Le8?gRR}UdMfi-*`2@lF(nKqPe-ba0Owdys*<)p*)6I zDW5+7ZGX=19e6Y)4uOr1+IpCwc0k<5i; z>eD1Mg(POClFST}nMN`*N#-JwnME?wN#+ugX(gFUN#1a^na`8V7fHSR z8oUN0-7JlEr4m;Limq2mRglSSGAb2m!#aGe zylaK2d@siu1Bn=le_|Ps!mG&)B86OZ`L6j$)@2}Br^uzAd?xbHio!dzf@%i+vol@X zj9kZWB=Nw1k;Lr_9)9PF>*Y^c7c%e!(cZQgrI{ggD|}$Y`wU)$qx52d(fh5FC6od1ek+w$sO62`rzzs@vdkqX+Y53MDuSpTE(ziRu;ZeIArtL z%^jRiId?f17UHnu*~zt_p58^u+lX0Equ`E8)A<)@mgGglbcyBhwpEL_t?a&JOJJU% z_X0!j3`1x*K7(_8v575_!8l*6v$xS28LaSivzktusd-l^ zMLnTq^8iOH@jGa<&B@|XJS;{Oj<>}K!|}YBeYDuZIybZXHnZJ|LX4O_Y0@M->9fZ0 z*#@Mj!p(`%XwlWsdseLPvM1YMT(M>|RxymOLXA~O)pQXWECM^QFS#3~yLj2kyp3CS zly)}tzx%$2$4v?(3vW2PIFPeUM&;2LiPyTgfl<0@(2ek2hJWe{#~_>B!wL@e3w5co zg{~Np)3j{|qLS~#`%p0Z-DdMWoBuaN)F+QQHyvfzr;ET+qFCDENCD5{n=MrKBo55C zipnUK;?;r;T~<|iFW5Q7!6>jvANaJ+`+IWt{da2j{UNnQx06e0=gu9$K2|K2VpGL8 zv7>bEn6|l5iInPbCslE4aijStD|DA1HPrroRDQJHSYlj}%+zH2I^*H_a*7jZU`{kJ zLXR!I76WZ)xasSX=x<w7P*4G>-?>~|i|iPGjPb74A+smd z{fbkTZS;RujD@CVV@dv_#SmSakm!|;zC9BDwk5&gflcB{#I=ZxpW4D6-hyYd@d+_I z0|lQPWkQ2JM;S!^H3wySoN5mEx*El!P-(YsB6rk$xF}IPiZ>}o5#p@~551>-=v}`V z>Wr;DTDu}d%rRT&mPT@=2u+|*g_cUPIoVuL^#5bV*;Sc7 z*wq;TGf!<%So`0Y@x?ZUnJMmnJ2$mQ5y&bp{tqcJ7GB-JUc3`-$ptx(-`|&Ki(T*y`E#u^WLwLEkrz4)`4Og`tImUOHjTdTH$>(7=DX<^T zAu=Zl5D{}bVxQX)QPZ0g?z$bFoCiGa_d^J!-8N+IttklR4UfU=V`U<0Tv$vL?yFJyCDN~+I% z_iHTa9{=$4r&g}tcChZ`)o8=O$7ar7T3qq|KfmiRc=WTmJA5@~zw0%8OzMk;Wz}cS zee>hZh-h8s5wqt#yJ)%a>YM&gK0A5I(EowiDeDTiY}@g-e;jM+IP}q3sY?sD`p?AP zH9BLn|I>fp(DWSo==|5(|8cp5Z_DlxdhY5Z+`X&6THHHz*DLD1E#>_+nzbgOy z0`HhW8`5EVZ!?wq9jXfMig-C*U+zD?i~B*m(&O`8uAfYST2rVW{FEv1y2+T^U@}(M zn^t_Y3k>>iQtr(*@9A1o^=Z?=j?Q}nO(rsU`>B&A{4Z!{O<)>tbxxWnGe3ec?o#zh z6V`g%6gXl+=?;Pkyk{cDz&2B;OSvQPAtu;wf)Jch+gk{vEM9hfV~SrAiWGk`U-AaF zn2f1E8FP=Df}@=D73xnWX-s+5560ZrO|FZk`UI`{rpJ5T)bVFi$6rhxe>GLCyXyVM zL`>eFOz}*pi}#|*m~r03UxN1WS4|sZBPzV#((Wrtcarx<^j|RXmudes^lK{4U6obq zu8P+zJFjANo&#r(jym}~s418wd9B7?`pdeZj!!I0?KUMKV+rQH1HN#4aFC3H zg9p80&22&t%t3~RzrDsB^V$U&3Ojk}Wmm765Lnryn2${V-+cy9dwhOB6=wF@YpuQZ z+H0@1_S)OyS2X{*qVWxQH1^#D>q84uRS#V=3U@x*TbTH0MAr{de<{p*l-GPzwdcg6 z4{4%DGMe>d24RIer#vD|oD#JscgiI7XcNQUlP0O$50>xM7m>^E0siO8$}i#T1&MHW ziRE&oWG+vN=ax%nh1RK))g8hZ%UzDf^?aj7ies0gv2iO{Hm$OzDR7v{-^aN2F;4B( zx0u2Em{PGBgkmsT zcHK%#;~;N!Pe9*thZ|HCI)c6X47E z1`WGl4J)q>oYRK}u>(pfbI@RQv%N7#g0~Kowd}y<;wK@s)iQY++c}$E@RZVmjFb&n zj3L6}>4P0($nZ}{z4eTnVafC0aQraC-frEMqabp5Vjwh_tx99R*(m04>oA4F96Bj2 z8{(SCxyp5gIW>0?IkGZmyDORWP*vz4HuTKSnbAZ#rM{e-PW~$WK-sobTv}fv zN7$&+EOi#FNXdsrXyCeL&NLgPNY3qzJrcazc`3Necb@;iSo5J#(FB)=ZxAW3Acr*- zhoivWTTA)0;-gHUkufbfN{uFPkg=&?IharLQO2qJ{wPBxTIx}JHS)&xepM$3PWCQm;wK?|jnQYArX(HdLsfdt>D?lXH^$x+T z4iV{^>!9%9tidzCWSYojNzLDBz{35*irp9K8b$!4lZlr37@3ci`8Zj6jMvN7)a|Le zUh%(LRx4n|($(oo7^nS8;k5Dt~HuYZN^I4;Z_h)QLe1CYMGXog! z048{ktn>C~f@|eiDFnEb!Vh4Cq}h+C-xacF-*U%Jru{^ue8F0wf@YJW>T7%#TsxVb z?}heV_Ahoap)*C~V!Lan@aF79$B)MPa82Hi3HO1dhsyR_;d0_69p{$fz+vB$hntC92aSH^E!=a@ApM6VqJ&Q)qyS&30~RF1!6FmQx7 ze3oG1iwTzr2Hc`esSq%$x`~`T?0AwuJOtFLxzsxbmr(S9D<6Fb|=DYQrJ~pBz7bHQWiGPb`}jAUqv5 zdc2<)xh(IeM$YE_%*ZXqx;-bR^M5jk8T>edn91K|5Et=x8^kRB9)oD(%?5EXKi(id z$KPv^G>~yE|0=`2z6MNR6`q=ROX{BtT)KChfy?mTW#BTscN@4x-g^uf!fe10;|<(m z@4W`@IZ6w%hGMy%TCDdsWWxS=gJvIJ+a|S1qEuh&JcrF$)m|vE6sADVE2d7z?+W@_ z%kp`!Mw3m;Wx+U2Fj5<0lDR_@o)?zlb>a5;{WXZnljq+$p@oqLP`@GOq!#ADJ4h;o z4EUCg^_4kUTnH=VnDu)^$TMbq^kYG@&yBR zpp$wDRoyDEkyXA3i1ogtU~{WY;;M{vh_X5( zgIf)%-U`)*(4aO@wXIfYgoLMNsy7HvKQ-ykE3upSRm8gzR_k2_t7TWu|BcL$@;5Lp zGdzc}bPhuMQ!^L#OtWqkml@JDWQv)ks~}nx`|>95Y9eb7=aa*$i8r4FRq+3-@e$Hm z$`)8*gunLnikA<2d|0E0CS1tDI)s=1GH&v~0=o*5E)n8tE6>d#%90;hVSy1Mo&u6E#5!<%OaTHF_9S8j9a-9gJXskMilpX8qaM1=aAiP> zP{dP^ghXq9M@#{N9i@IFOs)QXYWN#U?ei%^bRkLosMvvI5*#8&LEK~#(q2s_0I;_` zANmR*EIf4}sDLm82(tEg4?-&t22qKxP1~#I_v#gehlv1sSI@sIjCzJm|G{!Ez z`A$6sK4sq2F|XP(;2Cf|WtQf(iq(Pgt^Aurtl*A{JGn0b|4&79_M5_=pPkd^_j_J{ z_MUrdNJ^qve5>_1_m=o}hl+b!dh_7cugSI;rkO}ldZSc%wBuV7p#0Y{-=G8AxmVenQM==p_Rr-%38sfBInPb75t zU!?5R1q)Zw6RkIZ=t5J^48Lra-uQm3ffH%61W6A;(nd2x?a(2`S&R6NBnO_y(oCHT zY_!Lgeq%>Me#RijMwo`H7^dMWCE{M!HX^?3dYOp(TyC0piwNyUP2yf#I{$a{*i`&0 z=)=cr$i?<{r1RSW?NIS9K=DxlXSvtb$d`w4{}IOBso*y9JHoiHhH-ZhR{eZMpKB%6 z5LfdMor>B>YjfQLobfi5@^8O&PVOT0koEk}*^k`z7p6F$ft1ZJ5D z6Gy@(9pdP>MYNlG#7u4xh>_Hk((v%^iunfirucz_TLeTJ#A>SvEbbl?Fz9v! z4MJkBTO~GqZ1=IhrsEcYA4o9A=nVY3S%7e#TSb|1G>lSq9F4KLb#`+HjhlD`kA|MKHE*h0wO~CHgHrsQKM(Paf4_HT=i4dJNwRa)0&b*^%w@h>nJyR%T zW{toJ7-mIn5CeK}yzDM=AZehbjE{txtcP*ZXU{&zp5AB;B*#PMv+-2k$=6ElR<`WL z;9zG&haP9fUNljUhEsn4C&NnAJf7t~1J}>Z-a^u$=RRdmqIdwn3ZyU1g~a)%u93wR zL7fv08gX?ZN5we)2x(gZk(7>DZ>-};G7Y*DIm@W5ZnQrbLsGG)Fp3!&6A~mD+pt5$ zeXQ)tSndd#HWl}8=mvrefe&tBf<}4pX=y>1#LIt2Vzx>+W9zFPDCiasa~v(V{FLP_ z(8yX#oz3!D7C0zh-D>ve^cysZkrW#pPlDroaaYIFXgq;fp0G(;D5w{L73N1H_x)*> zTFNCf>GxP5t-ws69&&sKadw|JiY1$Tf-fd&cQ@Wkn@wR{@zT3_eq5bqo% zK?48{@#E$>MAnINa~g5RdeaCeqo4a&{CD%?6n>=nG2)8_OYVsGaUw)486J%cY2fqx zT|`J(V!ZvAGHypeyOn#nZim%7L{8Sp5j0gzR)-R5D;RHFOLJUH=;tQ+ycLB{;e{o$ z9bc945%J!(GF}&tYEBLHBi;2-lslo;?rP};ls>b#8ia?}73{_>nzYK+CS~2;d=4ZWse;IeY=8E3` zei?r^srg0kZ!F_A@ikZV{?E$z3Z~|o-v6I6UK?MdiuWs1^(#}gb{EKne`b%1yrhqf z&A%l4oIOc4JPaid1eSr{7|TOD{`U;chVd*gvhj!f z=@Sf{fO7TtTu7LO+J>z{RWj00l4M}-S_-y9yrT?qA0;JmtG@V|g!GLEhR8p;aS&pE zSXQu~O&0Q(-s;dS!@6iKnq~4~5RkZr{iGiX-TN&IbMQ5SeiirExB4_(D?k*bR~sPB zNd`HoCdp8wU@DN2205~3B!!5rCL2?~-xp;T_jfP~AvD_x;>lEzI0g48%OReG^7VfO zZ=ldo!+liqO4kp|u6GsM121obuz!7FSI+R0DLK+GzBePK@-VNi?ZRn@laF@Mq2Nh4~d?C?6c?SNy%?(n_EZ41# zw2#OwBA2L>yu|Ggb8XwWm)((dJ4&+}5A>BUj7~NvWvu<7e%~b< zj2FB~_}p}Y^~FKMEX{XY|nX&F8T7%Fo-^e*XA&bIJf(xpk;u+NK=4Z`HVj&k() zHB;S=6)$fq-4RT8Mo0@wcPJ*(D~IxnSNI_Y4o z<*|IZEI0~R0)r9Dj3`~pY><_E9~*;npEL+CT7_{T%=gEq|J8C=i-QUDNKm%}$zSOX z41t|A2Ac?bX@DUV)p#I|?xhct48BVR`@@;P(us|RPGzHgI5OPXvp;WhtDw~zR;!8p zfVq${3I-Hexj&R(5``E3*2mGBP~4VK62}zl8EZF#aCgsIH_2xu2dt}W`&YJ7;v0KW zMC(XE5$$wB#X@(g*cytcc;EeKiNYGTK!N5CSXq6mGos>a^mGlE$fpQ8`>?3+h13XP zjJ?m2b9(OU_QGmu9o$YL+|J5emdO=!sGCCW0!LMx72W!tSurx9f-m`S@CTK zcA339epHM&cDg*I!);kgp8(lWdz--px)af|x~b$ggJsd*lwdGesI&KX+-3;rPejR4 z0fnK0fVC=41XkPE;@1d3v<&h!!~moL5R^rtyW8T|v@8cCXO#Fg5~b^Ka|hrAP?N0( z3O+8HI_gDKRh;Kp-fmeG^|#6#@oU#PVOH+2>F?{6$(^+ZdT(=eH9D>CC}pw-RI(;{ z!iTpRWKGOk=%I+TTe17xn0L)>hKdmiQjm2<2CY6#%*10vIG8)nNOk}f+OhEVis-<% zWysz;g_OMUx7@#@e6*p6oOG)Y1xFiBsO0zqsPs4AFRafSk<`_D$~)T7eE$yR05{s; zRs*qg1uj0UewvW^amJPNp6pj|6m$6oqsYa^qG(}PiWa#jT1;Gii{lV(*7zo)x6#Pi zy+I?FThnB$vnNmBuNu8g#@JZXl6oV@OR6OeMy|wr$jEJmmYi%<@tGztY;H2jhpn|A z7z1-fzR`$`iVqsw@xkQ+f{L|h{~nz4#N6+}dpYj%IM$bIRSd>td!MsAB$Z9i<%)Jt zL&%`f9aU$C*~pg~3%Ff56d8v71;XKZW6gO;2A?z%vWcH@y!bg+B7WK#!cM{T-wteg_O*Wuh)g7Q#hFyN>r}zrCC&l!6$KD%uCFTf@dqU)Ig4h zD2k&;4rN-jm)4|xNbgE68m0G9>eX|rYcCqj_{|Gr!TkFC7WAjzfN)gky3U`!nw_y4RW@W+Q)p%-ytV31$3>%C6`o>sAx*8y z19}7n71*S3xkV}Ply+NE_^e{-SecdTR#yie*imYCYr{?rF0Is#O&^E5x*S~Gg|$Md z^hgqNZAczy>V-2ix-ZeJ>>RQ(+TWY@J8nkM5g=UaLV#v_7`TUd@5iWFo<^!0twmmW zATks!sUU8n+=T+CQauZe=OxSLP(op(J# zZ>fSRwBAJPu(7)}%6C5bswqEaD^7y}W~)u*nxJ69$tl8G??6Rl488BJcBxX@Py8rf zwBoUaUD^Tb4k39?;g%z7$PK=Ntic|9NZ68ZaXh#B`n4}2>b_*+|Mxb2JQFSpV*&1i zNzxY@NUdn44eWlMSY4xsQ6yHmZl=y&{vZR7h(ij`NHP3B7&_nHaC$t0hO`jmsa&pQ zZhjXZ$Bh}<&5TMYBfJ)X40C&A0H-GzejdZmXZQsSB!a#N(t1HZphcrkns*&H1}Nf( zkggd%@1qpGva$5U0I{yr}>+?N1!2cJcmXE33`sB8X$N;g=b3E16POehvj6;LQ7 z^9IgVES3`MX{5h{2}gSCu9_nM-9o8jyE;)AwRWs}rts9-VQNlTw|11eS*Te%L;Ztr zW$mqMlQ4AMt?K)P)OABg{$;IM%*S-o#Wk31#^_fW65aM+6 z9ODUg5VjkAS)<}F68;j(q5Nf1SwpXhqdfnr@pU4!%ReBr%co7=izGi{8}Q1<6Fi@| zM7)b*Y5hWg7R+0+6{OaXqg{_ZbV=@&$*=i%MV9noASxVzQhuP!R6 zVrL6uxc*svH=umCFpbIw0lHcU&YxIOnn5m@?$b16NVsIj%8IyZZCKQh*qcW3Dp_BPj-z-Vq-j3#~A?>tc6<(64Y%Drhi5 zLq2%QHvPr4G9-xH_fKcS473oUX7$R22Xt>HS zYu6*hGH@d@^0;mFe-DkT-yYHxk+UgtMi-E!Ghox*HQ&2^|D)(ljg0`X61g0x?-W2% z;HC@*5N8gQcC}8EvSqq3J7|nUmH|ZV8IBe(#mb;ojtrME=}fhjUWFjU{Ci7l-D=8B zOP>t=y-Ve1mRA9zfZ_gZm3Ey{3NA9EQdQC7|Y zAJe-H+9=@Gi60|tq4x~9e_ zS(o0p(_$}|S!c%zm)f!MUKalOVv6IV^{^s($z!HjLz3^J$u<+7@;r5HokV&W-{4bY zkKC?{=l)4QBjUM()Z3}~3(DgdrnBD#<= zL+Qesn}+s!n*;)cdm-=+;g$ssq4;}H=-4#Wu^u}VrIHNXj%FoC@n^}OZJAk_T|c|B zYTqW?@oug%litK+fgE=+Hf~w%St3@+@pW1Jhh$JE*39xSRu2tj0YT*bkhl&K@ddoT z6PMxjT}4FA+vK~qNoX*n_#!~$z7XV#cL;-P>OU$Uby><7)-L<7iWyVH^u<%Aa9Nd^`))+8%bI-cfzGW~@p*0uRw+Aj$%yO`T|Xvq ziESyjM9j8Ta@jbREt!0+{3K#;`Ds!_ex$w8+!CjzE!#af+<62`T7Hyv-mD?PTHF^R z!n;#lKog<#=|@QRQ8NACB>PJ;y@h1|hfM#3WFI5bKPB16$@I@i_J7Ir&q?+PGW`pZ z{S`51pCs9*N%q$y`&*KIie!IBvRg^^_awWGWS=3~-;nGdNOn8P4w38*lKmrTl3#)U zXQXQtQLdB3b=riGdZ9uE#T+3IoJ9Sv5nqpz2Tlv|{JjrfHDdc|aDw^8=)G#364nKs z;aX+>?_vI`3T@qz(Z3i;#3=lUVZaq{BTo}4MQR(Ql;JA8y@ z1mD0g!WAPTb0V7|tSNb@SNT@XFN(qWPM!3IS$T#a94Wa~{iATPBngoL&!zlgI{%3g z4|hH_;`aVCqczr3ROFvglIovclIqrVmm9d;?o3s*mrsQ$w9y)xo!(C5TK`s3S~7I= ze>Ur!Y0lT2PnA%A5P>sA0zE}|x|vyV_rSGCGx-p$O#En^DX~1>tZMOQm3?EDHSoD{ z&~f9S)5g&4_!^w&i!pcTg0a3B=OB|!7p(U6v@rW0r&RUA%1N`b}GQ zRP^dU^tQ40J~Raoku7ef*2zA zcaJVQkQnL>stXF$b|5MhOhysCZL=kL^REyce}IW=$d8=Gvk3cmDI_$D6?ke8GKxDp z=t_`SOr=Y4Cb0r<6V9T`rV6hNJF6@h2{Gw2p006!%WZ5IH^=X=8~eYqOYafR9l<_O zCRSjH#hqARI(BsT*nA<8n&?{}ZXHf0|H=uC^y8*FaIwPbI%hCG~l}eiXB9oy?fgcL}J^Z0UXHY~uY{k8+yS z_zSjKp2^=_hPh?rVG{nsWtd*KUg&9zJ}MH#Eh&yh=Dbc$E zMIX*0p%FE+2=e;+12WxD_3!!mn8X&?wA(kCYq1A5Ui&P|`qKYR7-t`4_+TGr z0K%kgQAGQ{3FC`t3ky@?xKWyh7NoJtQ~pCr28QP}@K`vc(N|UdJIwM+B>f%f*)D?AviV@^^0CWgp+XE%dBqyztwOL)#{V zChyAi<5I`&$E8j#t{%8NdX2VRTwb4x6J%b!-8s@M=HZd8j}e!*=HfQux&!mSER>cF za15ihzE#~Dk@1~phY1a<5JeWey0DE!wOsJGVzsQJwwzTb41QqR+~-Pmy%}uN zvE~JNW!3Nfr>*bE@lR(Lx!*c^{M7fCuBs#TNi!Z>@XRuPt7}g~bIX~8fp^UK%i5x1 zCrWW2eH}IYzUfatSG0N0QEj4m(TjUN_~PP~KEv;u`%2FrmrMAua*Wz7Bvy@8@7gn` z>hJ1^^`7@Ud%pDy)oA`(B`~|^_B~Nm_pR$x6?{)SUi7)XtCH5bR32gV?mHddRml$p zPE>I}1Wr|Pp?&RDSKF)Ve&9NjCj=h|CHTg992IM#(yc z_M@|Dwg$r;7sFUJ(ydp%j9ugsiN%e z_t;b}y+_i!%nJK)9xIzxdw79IHnjaL{#<_<-sufR&=A@!*yYiV2uJ#1!bP3ib9l0<6cBKhOguI3u@r z5NKIE?@IL~FAeF$pDdl;K&Z-;@slZkoG18z6DLXtCr$9w{bs41seRnTM;s~9 R9r31lYUg_PEUi7m{C`~B#DxF= diff --git a/textproc.asm b/textproc.asm index 615ec78..a1a02ca 100644 --- a/textproc.asm +++ b/textproc.asm @@ -278,6 +278,15 @@ AfterManualPurchase ; offensive weapon - 0, defensive - %10000000 jmp Purchase.GoToActivation .endp + +;-------------------------------------------------- +.proc CopyFromPurchaseAndGameOver + mwa #DisplayCopyPurchaseDlROM temp + mwa #DisplayCopyPurchase temp2 + mwa #DisplayCopyPurchaseEnd+1 modify + jmp CopyFromROM ; jsr:rts +.endp + ;-------------------------------------------------- .proc Purchase ; ;-------------------------------------------------- @@ -286,11 +295,7 @@ AfterManualPurchase ; Rest of the data is taken from appropriate tables ; and during the purchase these tables are modified. - mwa #DisplayCopyPurchaseDlROM temp - mwa #DisplayCopyPurchase temp2 - mwa #DisplayCopyPurchaseEnd+1 modify - jsr CopyFromROM - + jsr CopyFromPurchaseAndGameOver mwa #ListOfWeapons WeaponsListDL ;switch to the list of offensive weapons @@ -2015,6 +2020,7 @@ FinishResultDisplay jsr ClearPMmemory jsr PrepareCredits jsr GameOverResultsClear + jsr CopyFromPurchaseAndGameOver mwa #GameOverDL dlptrs lda #%00111110 ; normal screen width, DL on, P/M on sta dmactls diff --git a/variables.asm b/variables.asm index f8e7d67..9098334 100644 --- a/variables.asm +++ b/variables.asm @@ -437,8 +437,40 @@ ListOfDefensiveWeapons ;:16 dta d" " .ds 16*32 ListOfDefensiveWeaponsEnd ;constant useful when clearing - - +track_variables +trackn_db .ds TRACKS +trackn_hb .ds TRACKS +trackn_idx .ds TRACKS +trackn_pause .ds TRACKS +trackn_note .ds TRACKS +trackn_volume .ds TRACKS +trackn_distor .ds TRACKS +trackn_shiftfrq .ds TRACKS +trackn_instrx2 .ds TRACKS +trackn_instrdb .ds TRACKS +trackn_instrhb .ds TRACKS +trackn_instridx .ds TRACKS +trackn_instrlen .ds TRACKS +trackn_instrlop .ds TRACKS +trackn_instrreachend .ds TRACKS +trackn_volumeslidedepth .ds TRACKS +trackn_volumeslidevalue .ds TRACKS +trackn_effdelay .ds TRACKS +trackn_effvibratoa .ds TRACKS +trackn_effshift .ds TRACKS +trackn_tabletypespeed .ds TRACKS +trackn_tablenote .ds TRACKS +trackn_tablea .ds TRACKS +trackn_tableend .ds TRACKS +trackn_tablelop .ds TRACKS +trackn_tablespeeda .ds TRACKS +trackn_command .ds TRACKS +trackn_filter .ds TRACKS +trackn_audf .ds TRACKS +trackn_audc .ds TRACKS +trackn_audctl .ds TRACKS +v_aspeed .ds 1 +track_endvariables variablesEnd ;----------------------------------------------------