From 7ee84a675f24e331f9132e24484e8ca2342610bf Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 28 Mar 2022 15:37:54 -0400 Subject: [PATCH] lemm: update music for level6 --- games/lemm/level6.s | 55 +++++++++++++++++++------------------ games/lemm/music/Makefile | 47 ++++++++++++++++++++++++++++++- games/lemm/music/lemm13.ym | Bin 0 -> 1084 bytes games/lemm/music/lemm15.ym | Bin 0 -> 1451 bytes games/lemm/music/lemm17.ym | Bin 0 -> 1042 bytes 5 files changed, 74 insertions(+), 28 deletions(-) create mode 100644 games/lemm/music/lemm13.ym create mode 100644 games/lemm/music/lemm15.ym create mode 100644 games/lemm/music/lemm17.ym diff --git a/games/lemm/level6.s b/games/lemm/level6.s index 09bcf3be..1c52d7fe 100644 --- a/games/lemm/level6.s +++ b/games/lemm/level6.s @@ -78,14 +78,14 @@ do_level6: ; set up first song - lda #music8_parts_l + lda #>music12_parts_l sta chunk_l_smc+2 - lda #music8_parts_h + lda #>music12_parts_h sta chunk_h_smc+2 @@ -255,37 +255,38 @@ l4_level_over: rts - .include "graphics/graphics_level6.inc" -music8_parts_h: - .byte >lemm9_part1_lzsa,>lemm9_part2_lzsa,>lemm9_part3_lzsa - .byte >lemm9_part4_lzsa,>lemm9_part5_lzsa,>lemm9_part6_lzsa - .byte >lemm9_part7_lzsa +music12_parts_h: + .byte >lemm12_part1_lzsa,>lemm12_part2_lzsa,>lemm12_part3_lzsa + .byte >lemm12_part4_lzsa,>lemm12_part5_lzsa,>lemm12_part6_lzsa + .byte >lemm12_part7_lzsa,>lemm12_part8_lzsa .byte $00 -music8_parts_l: - .byte lemm11.raw +lemm12.raw: lemm12.ym + $(YM5_TO_RAW) ./lemm12.ym > lemm12.raw + +lemm13.raw: lemm13.ym + $(YM5_TO_RAW) ./lemm13.ym > lemm13.raw + +lemm15.raw: lemm15.ym + $(YM5_TO_RAW) ./lemm15.ym > lemm15.raw + +lemm17.raw: lemm17.ym + $(YM5_TO_RAW) ./lemm17.ym > lemm17.raw + #### lemm5.part1: lemm5.raw @@ -169,6 +184,36 @@ lemm11.part6.lzsa: lemm11.part6 lemm11.part7.lzsa: lemm11.part7 $(LZSA) -r -f2 lemm11.part7 lemm11.part7.lzsa +#### + +lemm12.part1: lemm12.raw + $(RAW_INTERLEAVE) -m 11 -c 512 ./lemm12 + +lemm12.part1.lzsa: lemm12.part1 + $(LZSA) -r -f2 lemm12.part1 lemm12.part1.lzsa + +lemm12.part2.lzsa: lemm12.part2 + $(LZSA) -r -f2 lemm12.part2 lemm12.part2.lzsa + +lemm12.part3.lzsa: lemm12.part3 + $(LZSA) -r -f2 lemm12.part3 lemm12.part3.lzsa + +lemm12.part4.lzsa: lemm12.part4 + $(LZSA) -r -f2 lemm12.part4 lemm12.part4.lzsa + +lemm12.part5.lzsa: lemm12.part5 + $(LZSA) -r -f2 lemm12.part5 lemm12.part5.lzsa + +lemm12.part6.lzsa: lemm12.part6 + $(LZSA) -r -f2 lemm12.part6 lemm12.part6.lzsa + +lemm12.part7.lzsa: lemm12.part7 + $(LZSA) -r -f2 lemm12.part7 lemm12.part7.lzsa + +lemm12.part8.lzsa: lemm12.part8 + $(LZSA) -r -f2 lemm12.part8 lemm12.part8.lzsa + + diff --git a/games/lemm/music/lemm13.ym b/games/lemm/music/lemm13.ym new file mode 100644 index 0000000000000000000000000000000000000000..3a63f0395076b4523ef968d677b7dbc12e8f3d81 GIT binary patch literal 1084 zcmV-C1jG9uvn_0BH7yzh002h7002jkktQGj30X~FFfuSMSxth60;_6#_|9jot zdhKs335QHtFc3>hiCA>lrns;bD1sqiSTwv+z`UicK}G_FU?v9$Qv(5l;7kl23Q>T= zP(*lVQiXxVD1{0oEfMbb&%xj2fyXWRU|mhUps+FMSVZ(K2{dgIyI5O6=$!+KA-w{? z(6nv%2c|k6fXreu829^-U964u+T(q@uHMJDk!gQxT+>mSm^U%}SX`F3O*n63-(OzH zyufSZYvtic;>W+@N4u@M<5t_pyS?Gy;5GH*#^35b_Wzxort$0J^}NqsKYmLq`CrQa z^!9s|`iUAhS4+iGtZ8-K87FJXq*K1i= zww!mh@;@W;KlR7wclbNM%=Q>J>23bZkI4Lw|LFa%)sg?$;^>g)3CD?|LYzeVk48L? z$o!A}arxc;2>&w^DpF$cQ%iq(CGA5_T5}dWx8?tYHq-6Wq+k#&;R%wIF%J67{)P=`fW}dg$f$m zFmpLk7T(w9YPAb*#PcD@t90Y`v_?Q>fB!4^={#&~jEx5>S7Wg%QgHM0+G%d8t7)`b zPCWe`PjR@hv0G+s{eFyojhOV0?d|v+4K|s%vAWuE-O1gU{{XWdw`u!OF z8!_o0v!&WHzrkPZ?CmWq?C1aGyEUfP&O6%rx=X32%+H61&*!cAY+AK7e8KAIKChUa zUoiT*8K=x|KL)QFxa!~1CrCX}o47QF%Krs_Jx}m@pW6Gz+gm|6{!Gt^(9QYv{b>L2 z$GxM!slBi0Qa?N&`P%>NEC2s){h!Z%kLz;3!C&=ky*uyjyXAkQX-`xCtJMAg00000 z9@1RA-w7`^UQSL=gT~ApzqcOtzvJ=F$Fc*bAF%Q3?!#q&EBRl_{#Ww9mHe;ee=Gm- zU-nZ-&J}JIP9F=0z~NHv4Z9|5Cr5AK>WzSN&@L`9^+TjQ_v>zLdwW`J+e5 z|EFKhkNVvo`5*uQ00057HUIzs000{Yd;kCd001@yfB*mh0000000003VELq7*8l+S C8&9VI literal 0 HcmV?d00001 diff --git a/games/lemm/music/lemm15.ym b/games/lemm/music/lemm15.ym new file mode 100644 index 0000000000000000000000000000000000000000..8e6fa2b15664d8ef1797201c53bd74ca10b08de2 GIT binary patch literal 1451 zcmY+Dc~H`M7{;;84k;TuG&dnNkMSV0@+gg3cXG!z*A7rr)YcX-ZzVAgTrFj-)+>)r z(aod4#GBMiM>5S@6a~jHLsv;uL|8$N-_kj=-+#XE%scbW^FGh#g@SBCamQ>jHi1BA z^ff?RvvbT2fVQH}1=t?8gQ3nH&)L{}HBo5rdP?4#&{A|AhofkFk6MHGrM8D1W1J42 z)ON?&r&A**C}Z!c+kG;MtDWM}B|nN*0zHSUA@ppQphE@SgjMu(aJXwx=!1q8HC_|M^8MAr zWkI6l*{R;P!enbA8W58N%ZZhD3Z-qj2!DduxO3jr7dysZT<1>G(R$+bcx9WBJX^^m zMVRNd+?i(f#}ckWT*&Uv9#8aR2p-%of>k_c{EF4zarap?(>DZKZnGWyG?^F0d^n$O zDK%1+!o%I>1c?F`EOS}jOw7Z^NhI25?IZZi{iG#VQP&qaFqOBW1-J#B8+|NT6;q11 z*zI)-c%a-(iuxxZS%g=u(P!Y%Q0DnzrfJNx4MTTI)YN1U!!bn@&3$6ZiUrIjGP@+_dkU?D93O<@`u-4Pu3(!+dDSwN#ejMpw#Y5CE*nsiX0tvex?y=XtDC3+Y*U1?q$9MIK_99} zZ%C0T2Xc=K$469|fV8rIZ)>I+10{aTo_-rvXD8Fk_0X$I`Xu@nzPSF!Vfa{Uf(X+y;w(oH$zCM)uj%{ zAfl3dU>LF*m~RVr6V;ijCgHr57n6w+I=!KRp5GM{Lm_1=O0927F1FkENYGgXS&^uqKb!pqD z*r`fSQONmoG{a^`59oM$+8$v)^rNttd`hM%+FTcJx%p2+z#x$XB*NWt%)2;3TJ*0Z zBUwjeVKPjGR!G%IFo3zKT{ou{mTxKy!!}T%#rPYMsn;|=Xq}8Csc^(8QEZi7_t^ZH z1q(OY=CyQ@H+>Y4Rj|r@8TTJP--1tt%1XW-cEp23wLS$s8E$c76__Bc1%5S1qu%4Y WSHlOtmG0v44?)dydiYTIrD8DtyzsBlMQW1)4{DfkP<nc>abJaHXyy#>2TmI*Bz204IZF#)a)Q{wU zBl=kMDlct$?5wRV7gn6Mo;WaUEEiUye(QdmtdINA{NeoP{Ey^+Bl#cB-|6=L?r~K( zbvSeI5XbPh=*r#f1b-v{(m%TXN>TrTzfLAc{pkL1{&W6E@;{OMkLPdn`+x2B@v)a! z(Yn1@(Y)2?`R}i=Fc(#IqdOiv^IIRA->i;BwF*xA|7SWvm#<<%Ft5<6X{S6_pDefOfqiAI+FE0dF% zn9Ann=Vvadv9+ai@_v~|p`oLr?OBr)Qe?%Nb*Z6K=UHe)x?2lrbu~40e}y&vYy8*w z+x7xiY0n z^!fHJ?Oy$K(|e=mqTkN9?lI(l|6~5fZ|`saO$Y3^@^qxRnNKhuxr5ByyJx1;pt{0;k5&3~HzHU4(~cK&ex0sHsQ ztE-;9t*xxAtE+hN+qX`fxvFo^LdQm!-;Ma+{G0NbOr~)DH{*Uc<9;{gKkA$R*nIh1 zm0X=%rClYfq}6nuu9Q{Mnz~h+rFo-?rnlZb7rm-}#twsK+n2P{&}PW~NB{mm{J4N)1&f+&5u1M{k?^> zQpe4In*TNacK=SFSO5S300002px^)i000000-@yq00000005{c000000000000000 M000#ZTwA*E08Lpm!vFvP literal 0 HcmV?d00001