From fc36f7a3e562e47f94746ee106d6c366e97ff4e2 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Sat, 29 Sep 2018 00:12:54 -0400 Subject: [PATCH] Match mus_safari.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/songs/midi/mus_safari.mid | Bin 0 -> 8271 bytes sound/songs/mus_safari.s | 1246 ------------------------------- 4 files changed, 4 insertions(+), 1247 deletions(-) create mode 100644 sound/songs/midi/mus_safari.mid delete mode 100644 sound/songs/mus_safari.s diff --git a/ld_script.txt b/ld_script.txt index 40a8c6339..b43e9d755 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -911,7 +911,7 @@ SECTIONS { sound/songs/midi/mus_ropeway.o(.rodata); sound/songs/midi/mus_casino.o(.rodata); sound/songs/midi/mus_hightown.o(.rodata); - sound/songs/mus_safari.o(.rodata); + sound/songs/midi/mus_safari.o(.rodata); sound/songs/midi/mus_c_road.o(.rodata); sound/songs/midi/mus_ajito.o(.rodata); sound/songs/midi/mus_m_boat.o(.rodata); diff --git a/songs.mk b/songs.mk index 93773d57e..4a3e5b56d 100644 --- a/songs.mk +++ b/songs.mk @@ -333,6 +333,9 @@ $(MID_SUBDIR)/mus_rekkuu_kourin.s: %.s: %.mid $(MID_SUBDIR)/mus_runecity.s: %.s: %.mid $(MID) $< $@ -G091 -R$(STD_REVERB) -V062 +$(MID_SUBDIR)/mus_safari.s: %.s: %.mid + $(MID) $< $@ -G074 -R$(STD_REVERB) -V082 + $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid $(MID) $< $@ -G017 -R$(STD_REVERB) diff --git a/sound/songs/midi/mus_safari.mid b/sound/songs/midi/mus_safari.mid new file mode 100644 index 0000000000000000000000000000000000000000..95fab66a8096986ecfd1ebf60c33866ddc8823c1 GIT binary patch literal 8271 zcmeHK-%k`*6h6zv!QG76hDfpxVj8+p(SoF5HEcF8M0Z&blLa<11WcO7q%`_4@yRsA zZKW*s%{s7<^q*);rG4x#ZT}8^=$}EqbMKv*J0lR|%eL8JZ z#-XmuxhL+j_{=5o#I3Q+w)J*D-lBaF;oV4W(9aL)+vsk5V1Kpf*`F^`TmDCVh-UK< z{qi1thliFL5B~DgtFdZlF4#|d8`h&Zp)I2g3C=td}$;;h4cOWC%(D!(KAp5P#CImuV-u1$XHcIpp_y)@nbIf8GVutNfeeY`+LhobO~R@Cklj1YQUEL!SML z(jC+z=v_eroiy7)9}49nd^;x@expi<(za6F;PRDRho|AvaMC z1$i%-gHT&Hh~DvF-gxh@IRB(~dQs%!4Wf7Gy<9x?8#Mq|&Gvxau^s)Fw`9M?)4dx$ z>f#NnCPoj|Q}o*@`d(l6JawJRZ7g`=iv>z=EYw)`Y%DCZ%xWF-fj*D<;e43SDU#BT z^SX`?^pf@)(lUmV%m*Hh@^j(uGQP|ooi7A9F8hhdUSmDt<$|A#m-&*sn(4499beP) z8a+c(&Yq;+Zu$2e`Nb@#tGr5^S3R+Im1wgFiD%8`7~~k_HOOm_6)*QJbt1o3A$pdA zUdDNudbB+q%CcwS+R2TB0b}%fPPyzXHE9@XONQ zf^H|`;17J$zk+ybd~u4oG@*~Ch=u#!!zWDC=4 zVjWvkkW-L1yxcBUw0VPQ7mK9Nds^70CblV*Q=SEX>&2Yi8ixrlk`Q_n`Y7}gWC<|% zB5M^H*2*<;E0`azXoHgpBuZa0MQf_Yx`5q+Zfn0F4*pKu{|4e^9Pp=r zuZqitMNYy#$;APmaVLR4$$4Z^w)P9+s5J?E(_ispK1XX-1-O;ByjkIjW{UJX(GUEc z{;|E4Z;<0z>v_V*ByHs#a;78ArBP+WI&I}k(y*0RN9=1_>*Um;NJsl7(DiAJ95?cP zK+g3@tHw~l$6&Xj<4ZA?i5xK=ZY(~mAdzEKv5{4x4kIJ-8&z>8vCfThYQpT95mAd_ zqc)?`>H+a)A6H@#B{I1kUa5&#i%u{UOC%<9{BtbNDyt<+Dq z_8p6E74Jr*weOgEOCOi#VDdd^z73L3{Pue+dIKDn`Tf23Soj5b;x_#;OFzE;Pfpia zd%Nz5$8{3h^V8z-Jmf6&S;}fDw(B*vr?sBmuDi;=eqBlBk9fq*!>