From 042bad2d434a1bf65a9cc84261e761c21d01d9b2 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 25 Sep 2018 23:47:55 -0400 Subject: [PATCH] Match mus_eikou_r.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_eikou_r.mid | Bin 0 -> 7098 bytes sound/songs/mus_eikou_r.s | 1610 ------------------------------ 5 files changed, 5 insertions(+), 1612 deletions(-) create mode 100644 sound/songs/midi/mus_eikou_r.mid delete mode 100644 sound/songs/mus_eikou_r.s diff --git a/ld_script.txt b/ld_script.txt index 4bdd50368d..edf079b412 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -930,7 +930,7 @@ SECTIONS { sound/songs/mus_hideri.o(.rodata); sound/songs/mus_runecity.o(.rodata); sound/songs/midi/mus_con_k.o(.rodata); - sound/songs/mus_eikou_r.o(.rodata); + sound/songs/midi/mus_eikou_r.o(.rodata); sound/songs/mus_karakuri.o(.rodata); sound/songs/mus_hutago.o(.rodata); sound/songs/mus_sitennou.o(.rodata); diff --git a/songs.mk b/songs.mk index 4acd2a835a..db2fb1424c 100644 --- a/songs.mk +++ b/songs.mk @@ -138,6 +138,9 @@ $(MID_SUBDIR)/mus_dooro1.s: %.s: %.mid $(MID_SUBDIR)/mus_dummy.s: %.s: %.mid $(MID) $< $@ -R40 +$(MID_SUBDIR)/mus_eikou_r.s: %.s: %.mid + $(MID) $< $@ -G093 -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 bccce1c3e3..1b8c430b02 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -451,7 +451,7 @@ gSongTable:: @ 86B49F0 song mus_hideri, 0, 0 @ The Drought song mus_runecity, 0, 0 @ Sootopolis City song mus_con_k, 0, 0 @ Results Announcement - song mus_eikou_r, 0, 0 @ Hall of Fame + song mus_eikou_r, 0, 0 @ Room of Glory song mus_karakuri, 0, 0 @ Trick House song mus_hutago, 0, 0 @ Encounter! Kid song mus_sitennou, 0, 0 @ Encounter! Elite Four diff --git a/sound/songs/midi/mus_eikou_r.mid b/sound/songs/midi/mus_eikou_r.mid new file mode 100644 index 0000000000000000000000000000000000000000..a3cad89cf715bb46246d5a57c2e0760cac630cd6 GIT binary patch literal 7098 zcmeI0OK%%h6vuDq&{&a?A_T}n0!3BTCM^lB^Qh9Mc`9k1ZBwOfDum<(3s5&Bz5qD3 zyJC^VHlL$VU=1y><%6)~1BBl_bN}OH(rMZvB#^rC@j3Ur|L5MhGaFlNCf*gRF}{j-#^r+Ys6#vPpQ`P3bJ>=Ny_-gG~YxJU1PWO-!o+-D`OT$L}6$awF{dV4rF#%0YiXo&Z>XM@8 zWn9Kh86V@&aj3d2#N=m=^|^qMI<$;z8JjG>j(i>Y26Q7JqzZy;S30UbQh}CvGYr`fjwmi$wJs}vAjjM#A`jz zqdKLm#fOMCKgvQr{()K zKMPIqT7TC5)_&IXh}Q(BHr4J_N=G)@@9Og%^0^bR+2;Q?xdqv=GeSP(Q)h(YOD?@k zEW_qSeFvY0%}d7t8^u;G%1yb-XXv+KqaC1ABzt;@59^kjY%=qaK3_CXVMdOeZ_ho? zvQIwSJvxt+;Yrce1x;jL7t&Ln$=hKIAjxapc*f+@vEL`H)YYeA!rmW?M~>%q6}n-}z-&Z~ULr)mYUIk)snspxkv7ovimN18R}bey%o2|lc~l{VUM^qZu)!7YK=FdJ@Tn> z+uyqmy$%Jl8n^tt)wo*YJ`7(C{I>CHaiPYW&fYq5?xlMhac#E7jSK;QyyUoL;wjf6 z&HL07_vEbmo;SE8b$5A;%EKl`%Cm+J)bgh%fzjaN99mH7m;5?uKbSX_3!2LPwP3^z5s5=>&o^) z^$ybq-f{OY(w~d;=REZMbMQJJ53ug`&!Bhakbc4!vG2F_5$0!v^-5f_c^D(k7ZKqoo_C!tI(@Z-azYo$7u1StMgr> z#R*mCglcg@)j6Ra_f44DLR_tLP$8~*aZCInJO@{6iF2pU%X@3l|3UI}3R{kiTV8k2 zY-i#^ozFg`&~GWsKs~<%O-u*PR|t(=WOj>jIm8$+JuW?UUed9Pj9nrGazdXe1>&Ur0*4J!3Vm)dl>xDEg9tQR6Ca-$CF06mKUvIe|fc3+I z``~T+?e|~Y`kd>XaBV(}H29p>=F;Eb(^MPC8$jL$@&=H%fxH3aZ6I#|d3z?VHoyVC zdW4^Yr=Io#kTz&&d*1&6eJlpd0)%XVE12B%df)wi+x>J5`qH;N_8xLA t3pC21MdU^F^44G5Cw