From 68b0db70a8cd38901e45e7d118de18571355859e Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 26 Sep 2018 19:35:23 -0400 Subject: [PATCH] Match mus_hightown.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/songs/midi/mus_hightown.mid | Bin 0 -> 12306 bytes sound/songs/mus_hightown.s | 2703 ----------------------------- 4 files changed, 4 insertions(+), 2704 deletions(-) create mode 100644 sound/songs/midi/mus_hightown.mid delete mode 100644 sound/songs/mus_hightown.s diff --git a/ld_script.txt b/ld_script.txt index 44f1c8fbc..44b9795e7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -910,7 +910,7 @@ SECTIONS { sound/songs/mus_kachi4.o(.rodata); sound/songs/midi/mus_ropeway.o(.rodata); sound/songs/midi/mus_casino.o(.rodata); - sound/songs/mus_hightown.o(.rodata); + sound/songs/midi/mus_hightown.o(.rodata); sound/songs/mus_safari.o(.rodata); sound/songs/midi/mus_c_road.o(.rodata); sound/songs/midi/mus_ajito.o(.rodata); diff --git a/songs.mk b/songs.mk index ffcc4f44e..38a7d988b 100644 --- a/songs.mk +++ b/songs.mk @@ -192,6 +192,9 @@ $(MID_SUBDIR)/mus_hageshii.s: %.s: %.mid $(MID_SUBDIR)/mus_hideri.s: %.s: %.mid $(MID) $< $@ -G090 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_hightown.s: %.s: %.mid + $(MID) $< $@ -G073 -R$(STD_REVERB) + $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid $(MID) $< $@ -G017 -R$(STD_REVERB) diff --git a/sound/songs/midi/mus_hightown.mid b/sound/songs/midi/mus_hightown.mid new file mode 100644 index 0000000000000000000000000000000000000000..0907791525b610c727c005cc818435ce24d98e74 GIT binary patch literal 12306 zcmeI2TXPi06~}vK8ueJ-#3EUn4F)WXB4os6QDN?vm4qy<5V|02ZvdBh$b+l$GL_1M ztK!%eup6oJg0$>f`WD6t#5|NXoDI1mxG<(>uE>ZFDgvb`>xBbGpy{oH^4w z&Be>_{ay&sCOq-H$XvYq$3H;r5|0Z~`k7EXo(i7(=kLVhHt%XV$KQ9v<3qx7g^$D+ zABj(2+%M88(Vi1(m$+Ss{ErLbm$wTe8ryCcE;rH5`-L_3pUF4obF=v~d8Qtlm3Q_0 zY0H1w{*h2SXv06n?dRNf_(9Y9`It6sMtVMK+IReJ|607iQT;CcPG1Xuu3Zm5z9xRI z{>v{u^l!%@Fd2TXRrumV@hl2Exc~1@#Ist|UZT%x5zpS{8R};E`etlnN7W89^3USS zgW|3|%&5bnJuBv?A~`c9#QX#}0gi!VU>?ka!{9JD1P+1g55dO9FIldhHIrv-I zZRR@z|Cu_!n)e;;{C0Yq{b{xD;%t>4x8JO=vT%uD2zeDF|`bWBo1m-xBE!^Ibyj67s9-lk;z~|E7?!ei_^M=dVusGgpzj z5@lwt{15r7Q5f@uj!*lHz7+mTbwH|pQvFt{SEcIIA((K~VSj!a3)663LWB133Z7iS zlLA<%^Qd4n33X7a{YKedqi>H?yQO+Xs+To;tTi+L4$|+S?J8*f*IIS_hAoa$%)br& zwpm{-&n^#1Ue;G1Ni;g&E9Ev<2T4|JUTr)wj!(|Ni=B6|W8>9)HhXVTFOs}w{L}F3 z?AyK)^V7&_`pu|=esJsl{M$L->S39#zW{oBtlSvsTk$LKGyf)X5)Uk#rj%uE{?F~cQ5*TvD=H? zUhG)+(fRKA2B&I#qIg7Z6r zpNTyu$D0j)S$6SE6PK2^@w)huJlJ?^c9)gXDQ#a?&-v;(Pdy)~7d*8!P%nDwr9f@> z)Q&)PdTLLgx;(WvP`#eoAE<+#$_A>>Q%3@I)KkX;byBL+Ql0VCxj>!sRDYoQJv9)h z^PV~%s9~w{9Xfx@>b&zU{qSIRnU`K%0v&=4)un7A$}D?ZI&^uKITY6Rf4mY~d)iHH z&!$*6uxA3ZNM$-@T9d#i}?LuulitFO*y!g8v zkLsjo9~XD1{w*qhhic!#{GBn7F1o|myhYdDVQk()$DLu2^st^~eZKSSd;wl*czLL` zY|YM=N8-_>xQCrxq1gE=^S8r%+vlU|_L*GeY}8pKR~2ehJR>Bugq9UzC=x@3*<2*o ztY;0MqsfWcPvkP}hwIR@x;<)Hq?X8M@IzF1Hxvia=lmHgNN8DU=5zkji^wPbAB%d5 z$I#=}(RA1Mi0>?1A@u(697Q`o(^502~l)q)mchW%YgdHYi`yyFs}|zcy>v#kFzy zCu5&{K8yRQ^jUMg2FW|4uQEuV57zqIuME=XgY-G08w^|Q`;{E>dTiv7&mn&fxpQC+ z%puR`ATVsPj~$~w{b({1|C2}0JX(4pY0-qXtnPso70y+~;o1YNCy91-0CGM{>%zdFc#lJ;PRCCcxu0(q7Gp(v8qRtX8#Om=#mW~Sv zEum%gXp|`(W&Ie)kc7@Q&?lk}BX<=3qwrh45I#ps&A}d?_sL_+WVr`c;60pvLs1T`o13Sf606^&Bm)Xf1~e*C5l}g zea{E|YJSo$<-t*KRJ2t&3W8yaefTygU(>rmxkkU%woA7YM_A1hmyXBDJKU(>H93=) zwe2_O?OEJUx6hjEHAcTN+^S>r!x;T=fjV9Q$G|cAoC75ow%DhCkY{?<`e_8Yky>B1 zRh#>*aUVNIfBKuLOw1~(4DJ$xyUNL{#Qdz$RuzvV>-y2Oq6yu+&kybr^SsJgxWrkw zI>mHju2(OC{E)6rgZwbAUIs6N9QO?$V>i~HHL013LL)Z~YW@jO>ziacO@eFbb#}(k zt5ZD{ji4_X=TeDph4_d5I5Pg%j!*bf^;f=Ve$oT-LHLs{uxkY^<8>cC-|+Q(5Z3X# z{dBA+74y6Ggtm6l@qR1*M9%Uj^47mratYsh?N~l%PsaI3#c{axCuh(4@AN1BZZ57> z{2kNvbABhdkGk$--PT*y;&b(PX#H?r9*Cp}!%F~^CMgLE{??t~@gLERE!dy(8x6Ir(3MAB_|iTk(lMC2$Tl75t`-3Xz>sAH2zf9-R%*VeGH4r}FmBX!bs*Y&r3@bv1W>n^Et%3zWw z+jot1Sbx4ZE0@^cRGsLP6n#P;QD<(B7P&c^-Az9|sda8%=vNu{Ytmn>*10*Ne{}!r zcJq;n=lHC#^u}p_j!ywKfB4pboUF+;@+a$~QJ3{A zYyG-_o(tN)g7u$Iy!e&ab9!BTdE(*pU5jr7yCcvp9+w|S$MO$Un;^FEf%1Ii`$|gH z<|!4#_dUPx)C+;y>ZxD5Tc2&7$^`0VbN92${KpgSe)O+tsb2F`Z=m*j>Y%vZnV1`nyc_fyyRcx~e7K+Uh3jPouhGsh{lilfBieth>y1 z+aOujT`>gm1BFcLYA0RNy4pQ)7uv4eXmxEqlDs*8nyQOGh1fsquiY