From ce3b52f650d8d2226f0d6f6e4054c5a54de56b31 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Fri, 28 Sep 2018 17:16:00 -0400 Subject: [PATCH] Match mus_machi_s3.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_machi_s3.mid | Bin 0 -> 7885 bytes sound/songs/mus_machi_s3.s | 1768 ----------------------------- 5 files changed, 5 insertions(+), 1770 deletions(-) create mode 100644 sound/songs/midi/mus_machi_s3.mid delete mode 100644 sound/songs/mus_machi_s3.s diff --git a/ld_script.txt b/ld_script.txt index e6fd1bdb11..65283e9b08 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -865,7 +865,7 @@ SECTIONS { sound/songs/mus_syoujoeye.o(.rodata); sound/songs/midi/mus_boyeye.o(.rodata); sound/songs/midi/mus_dan02.o(.rodata); - sound/songs/mus_machi_s3.o(.rodata); + sound/songs/midi/mus_machi_s3.o(.rodata); sound/songs/mus_odamaki.o(.rodata); sound/songs/midi/mus_b_tower.o(.rodata); sound/songs/mus_swimeye.o(.rodata); diff --git a/songs.mk b/songs.mk index 00564b5acf..84e4c89eec 100644 --- a/songs.mk +++ b/songs.mk @@ -240,6 +240,9 @@ $(MID_SUBDIR)/mus_maborosi.s: %.s: %.mid $(MID_SUBDIR)/mus_machi_s2.s: %.s: %.mid $(MID) $< $@ -G015 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_machi_s3.s: %.s: %.mid + $(MID) $< $@ -G032 -R$(STD_REVERB) -V080 + $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid $(MID) $< $@ -G017 -R$(STD_REVERB) diff --git a/sound/song_table.inc b/sound/song_table.inc index 3ec39e7951..68a312590c 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -386,7 +386,7 @@ gSongTable:: @ 86B49F0 song mus_syoujoeye, 0, 0 @ Encounter! Tuber song mus_boyeye, 0, 0 @ Trainers' Eyes Meet (Youngster) song mus_dan02, 0, 0 @ Abandoned Ship - song mus_machi_s3, 0, 0 @ Fortree City/Pacifidlog Town + song mus_machi_s3, 0, 0 @ Fortree City song mus_odamaki, 0, 0 @ Professor Birch's Lab song mus_b_tower, 0, 0 @ Battle Tower song mus_swimeye, 0, 0 @ Encounter! Swimmer diff --git a/sound/songs/midi/mus_machi_s3.mid b/sound/songs/midi/mus_machi_s3.mid new file mode 100644 index 0000000000000000000000000000000000000000..65862625ca057306e8164f6bb8cfba7055ea4028 GIT binary patch literal 7885 zcmeI0TW@1m6~|ZF&73{aDLN0XF6M6HLpU_~b~39fNuIe6S;(uA~%RDmK9BqVr< zXdifiX(l#(fQKZunXeHp;hEbE--9nQ{Px*+D_!-hS}+DxBT_K zTt*M&^<`Q7uAFTj+fTN|o^63!B4-`2gS-iDBDcXdatmyY$$H*7E?-8!l!eGf$2R(j zjSg(oG10n-zGb4<4Zh@ZLCOR?+rY&JuDnYLA*>5|8U5Tu51cjsV%o*DOEjOA4Oz#^Pi+?8^OaHQ7!Ukq zT_k?S5A4!UII)fs-*(51h0KEBt*o8%Yi2~0*8g)m7sQacag~gfxGjeKj4M$mdiywW ztq!Hi+3xW&?Jr+L=x$Nm9=z2Z{VERvbD zb4R*x#e%tXm%<{Md_jv9apzUHysk6FrvFI(_D%W2;`inJ){!~6B_?2eUPZ1-Jf=@L zFOSK~WA^5J`N*Cuiw!8}ZyhBkZ;6~&&{x1)M`~}mS3!0t=l6(nkGLM=^A+S3;uiXZ za~D_bmxH|pE7&=l&3_gBD)|(3`TXyqzl;5C@U|oYUA{KUSK}1t2D=zLhvwYhPXZS8 zd3zZKFJ=;NS7%>#H8c$OgRylYlbDx6fbsR=-+r z@I$*lM=M+^Hc#m;DLN{ZvU{}Hw^B>>tyMdvuxN=Jx%hmxRgRjXb+?Ign>bpEFU{ty zt8rfA+}k<5Z`BHVN2OA@a#YUb6im^tf~y%Cuo(3!b<9%jD0eI2S}=L;M}KDIi!E!& zAESqdi{EMfeL*g&2lf$-y;wO&9+BNeicB^atH@*n8n846&BZ$B>!KJ3S+NvkMQ4{_ zFH?HX4{fHeA106L?mWnA*ssma!(7xjhwY0s@>t9AaDFVZ&F-y(POcr4GrI zk{=&>7j3W&wm@EDE}CEyEb@2xe);;OyeXf`x97F!i^|$J&oBIByf4A0pQAc+QD=Uy zN5}v5c60Wk*rMOcpZLgr)5;sK$(uLjjYU~JK3V!lB!gONPHSQYYiV-I=nmGAS&>0K zEuYe|!3Oe%#K;D@6wshg(94+Y?3~`)Z-SfL^KvPm8EkTok;&!z#Np*Izt>4irycxk zrb`oc>bH&G_BDRn_+mZM+!5ZlLSOZ!4m%fiXsXgTddaw=hmN`(_&rv1lZQjQ%?6$DiK6jam zt}J0^xL?eJo-6wKF6Kk~s`H?8r1pxl_Y(Rzcdv?-Je5CBujKbmmi}pFn5L$eiW#n^ zNsmvpAuHNrMTcu?xkqbaof}E(J8`6ZDeH ztU`|!9lnG8JJ`3=Qm>7ljdUrq^YL9gpNIPOaw+HwziQ9Q;Md^KWd5MA$13J=dGz#n z^n^Ukutgp%DG#B($7&3x@3V?MRxyvK{@UDYbB|RdU;KlPheb$EwJqLPE{VM7`m3>}w_bFe+S8mD`zt%(# zPnu7*d z#M7(KuU?QaVj%kr=!nmNK3~^I+o_Ac6bd)UjsytFP)0l1dDZ3aT9psP*B;5!hw>MG zc3WJM-@ljI-@GTu(_iy%Ws!exaLB(-tEZL!$!d;|r@tC=R|;-}`v(Mn;KEGl^YByp zuk0uJo968+e!h_WWE;h(vu9zG?9_(M(~qrAc3(Gg`aZHh_j~L@+1Wjw7iFIQ#YUg; z_S{_a3a_`iUOUb1w3YT?;^{W8`g!`9I;NxkH@SEcZ^*wy9xs1vKV1eJP4j6(;>S&p zH?e>w*Q;ISWAP@2pHHW(%#1hhRlS%g`#879YcL)6I;qtRzKEG>oi9(0Hgr~dQuM;t zP@Gqoknyfe)>_!<