From 179541bc2a37534edc71f912c877dda8e5084c31 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 25 Sep 2018 17:11:50 -0400 Subject: [PATCH] Match mus_boyeye.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_boyeye.mid | Bin 0 -> 4644 bytes sound/songs/mus_boyeye.s | 1238 ------------------------------- 5 files changed, 5 insertions(+), 1240 deletions(-) create mode 100644 sound/songs/midi/mus_boyeye.mid delete mode 100644 sound/songs/mus_boyeye.s diff --git a/ld_script.txt b/ld_script.txt index 5b14bda6c..dc30dbd8b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -863,7 +863,7 @@ SECTIONS { sound/songs/mus_shinka.o(.rodata); sound/songs/mus_me_wasure.o(.rodata); sound/songs/mus_syoujoeye.o(.rodata); - sound/songs/mus_boyeye.o(.rodata); + sound/songs/midi/mus_boyeye.o(.rodata); sound/songs/mus_dan02.o(.rodata); sound/songs/mus_machi_s3.o(.rodata); sound/songs/mus_odamaki.o(.rodata); diff --git a/songs.mk b/songs.mk index f8790d692..db6845d61 100644 --- a/songs.mk +++ b/songs.mk @@ -78,6 +78,9 @@ $(MID_SUBDIR)/mus_bijyutu.s: %.s: %.mid $(MID_SUBDIR)/mus_boy_sup.s: %.s: %.mid $(MID) $< $@ -G067 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_boyeye.s: %.s: %.mid + $(MID) $< $@ -G028 -R$(STD_REVERB) + $(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 66c1e3160..3e52b54f4 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -384,7 +384,7 @@ gSongTable:: @ 86B49F0 song mus_shinka, 0, 0 @ Evolution song mus_me_wasure, 2, 2 @ Move Deleted/Messed Up Appeal song mus_syoujoeye, 0, 0 @ Encounter! Tuber - song mus_boyeye, 0, 0 @ Encounter! Boy + song mus_boyeye, 0, 0 @ Trainers' Eyes Meet (Youngster) song mus_dan02, 0, 0 @ Abandoned Ship/Southern Island song mus_machi_s3, 0, 0 @ Fortree City/Pacifidlog Town song mus_odamaki, 0, 0 @ Professor Birch's Lab diff --git a/sound/songs/midi/mus_boyeye.mid b/sound/songs/midi/mus_boyeye.mid new file mode 100644 index 0000000000000000000000000000000000000000..26124d93cbd58421da6920b859e13135b8eb9de3 GIT binary patch literal 4644 zcmcha-%cA>5XJ{ibk>WuqO}w$H_1hc6d);e#9tHhA1q^Iv$hB%iW=pj7m-@2Ruxsb zBw)A(d(8v%2`GVHw@umy>5I_c+1+CY3y0E5x$&ntGxNrEgviwx;y< zmdL>dxB*6Xvg>-m*V_f+*1>hq2Ys*tR=^G4g~vVE0=K}5?;iI!p79;`h-$^zyly=0 zIxclw>bTU2`4W~-4obe-E`@r$P*2hKwu{&W(C93YS0eARpWJ?oUGcr+p2R?`$GgOj z-b8=wH#||ltKcg6SuhJ)+xl()W$KniGasWz9~7x?^sJ$C4UF{ZgFOB`{v7_?1;2@R znWGo(N0B^}?}KK}<#3+;)G+gG>&v4nkDUVzpS6qFCcg}l6YJN^LD8exk8qY9`ZC%i#$2h`8`Y_I>R8q5oria%kgH#HWZKC4UsYNT1=0@<&)7Vf_L4 z034=|Vfwfn<#2+$3HXMIA13}G_CxepJJM_X3ctb2_-tQBSJdwWd=p`PlV|v%{I;&B z-Vl64=(`-{aGbnx>JGs-1Ygv@+p@pH|5fN$_)VPQ^FF}-c-{C-UKD5NKLGClymwi@ zi$6jICb8RnwbwQ4n)xc`tK$7M@!i(F4xT8^*0b}y`zmGPTBosRS^k)k6LTl_%il6D z_4Q@F!~Iq-fZQXoo$RvyrgG9ZCH3j5yE84So&hu9Ow~Ja@}9HoIT`JYX=lWBMzu4g zof+*cYp0-gW<*g|)gM*W&Liq%zzjG8#f-T1xvIA_CmQ?aiBoi)yz9(qC#9V)m6Plx zWX!0pFA%ms*eo~;S_Kih^%d4vSYN2RC{m~(JZw0w=*Fn(X+qPX5)UOWXiC$R7o(2R zlr$Wsq^9I>YnHt~$va=(qUugUZht0sT)Ew6-ZhQqV|w?wNaGp!42EabdhcB(N4a+VsiId^xKsu^t4 z<1{!8rddymvJ=YDn;C4G-gu=ksU(w%dSgPJDl$xllgqlP5>05H;%v4lUK~?oE6_76 zjXdkTu&_0DGPX@zXxj-E>7giIBSPGvEsafZ6WR(``QY@a@8$iJoOYhRssudAHJ;=k z2eN~)o$Rtc{JvLC`+kssHftQGAeV{Kmavzw8FGywpK=7Rig};Vr+p}hQr#}7sCX6A zb*fDwa8h(IiQq{DvoACv!2-y$Z>n(|YaGX*K&TlFj|x4hU=^D`J7KjeVr*|wsvA>u zV%XaiOxLM4jnHXvg9sIe3)LZL5n}O7L8= zL&~TKmceCFr(A+p$8ZeoH2xP4=QK}?dGTV@F-pL*R^yTjcm`|551zT+lKfegGxPSG z&ov7vy~kl{u7h0DO&{c+YqJ9K70}#BxqDpW%`K2G1lHX%z7UM>j4y;%oXzXT)2`!E z$EA)-otQ6S`J`D&sXcB%^mw73BFF`VPA}A1B9AYG=Hpayk1qu3duMzh#CkmPJN@WQ z^v8a~6ZN|a^3XK1AQwZ^+SYITFH@K6G}fb=Mfi=LHFWZYfNk{YW*+1Vp_#+aef5Fg z#JkMVV~!?Xh50^c=3EZv*-s5K&$hliy0~!R(;=U=i`b@q86+pxubG3QN3$Q{EIalw z8QUh#>}xVcFGjmA&8PVJLTGM+d?BDWs@G*-TmK`}jQl0?E2rux?WgwBa_eYtUhfZz z91X6;_$0=c5e~eTw6FIEL>~=j^gjQ@j|Qv8Wo