From c9cef8f63160a6c9e83c077dc75bf35d81d0b915 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 26 Sep 2018 19:40:24 -0400 Subject: [PATCH] Match mus_inter_v.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_inter_v.mid | Bin 0 -> 3972 bytes sound/songs/mus_inter_v.s | 1067 ------------------------------ 5 files changed, 5 insertions(+), 1069 deletions(-) create mode 100644 sound/songs/midi/mus_inter_v.mid delete mode 100644 sound/songs/mus_inter_v.s diff --git a/ld_script.txt b/ld_script.txt index 21c2ac2f7..da1221a83 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -936,7 +936,7 @@ SECTIONS { sound/songs/mus_sitennou.o(.rodata); sound/songs/mus_yama_eye.o(.rodata); sound/songs/midi/mus_conlobby.o(.rodata); - sound/songs/mus_inter_v.o(.rodata); + sound/songs/midi/mus_inter_v.o(.rodata); sound/songs/midi/mus_daigo.o(.rodata); sound/songs/mus_thankfor.o(.rodata); sound/songs/midi/mus_end.o(.rodata); diff --git a/songs.mk b/songs.mk index 907bf5ca1..02749410f 100644 --- a/songs.mk +++ b/songs.mk @@ -198,6 +198,9 @@ $(MID_SUBDIR)/mus_hightown.s: %.s: %.mid $(MID_SUBDIR)/mus_hutago.s: %.s: %.mid $(MID) $< $@ -G095 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_inter_v.s: %.s: %.mid + $(MID) $< $@ -G099 -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 19c9211da..fb89fabe4 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -457,7 +457,7 @@ gSongTable:: @ 86B49F0 song mus_sitennou, 0, 0 @ Encounter! Elite Four song mus_yama_eye, 0, 0 @ Encounter! Hiker song mus_conlobby, 0, 0 @ Contest Lobby - song mus_inter_v, 0, 0 @ Encounter! Gabby and Ty + song mus_inter_v, 0, 0 @ Interviewers song mus_daigo, 0, 0 @ Champion Wallace song mus_thankfor, 0, 0 @ Credits song mus_end, 0, 0 @ The End diff --git a/sound/songs/midi/mus_inter_v.mid b/sound/songs/midi/mus_inter_v.mid new file mode 100644 index 0000000000000000000000000000000000000000..e05010135a71cf6382b421ab39d160098c9d4564 GIT binary patch literal 3972 zcmeHJO-~zF6g_5`_poK;$W0ZRh_(msf%oUeD1yH-Zyv7j6I(JW)6Tr z1TnOX=O2Ab)`^`$V`D>06LuyH@n}W(bivvYk>V2gIgOnRyz+*5{Pq}6K0Jq$amY@@ zEU{L!jUS4Lt`#jGr+n=7QRg++d0nsbn(O@h+vp8{J~5|s2XJ>zAnwj1cjH(qjwu~+ zz}JWC_wdBwy4?S1KF_)5I*N!Z2~n77JsyyMuBzJLwe1h>D>vOF0ILHOL@byXRQ`F-{GoH#b zSfAmT85rv`mLQUck@6YJ>({A1(OO;3@2mTVd3cWI@8@~8)xn0;#puLV;hSZM13?E7lF9(23b`rs8RLtjW*`nsB0&-6VKWS z#+A+>Cf*@`&^dzVX*q_uv%x3sq2S3HkJl}Qa`buXxYgni#T8lH$F@p zhA3SpUPp2lN6AMS=M&02N*)KfS3g1=aqCmm;bk+P@rf%HIHmxjRImh*JdBhT*tUM1 z>JzQi<@~<7f0&2oX#RelcOTrn)!S$7iNhfN_#VIbR?6^kTRiCN26dUTP0ChNek5hmtrn(ij09&{oWVCpxsTXK?61vgH|3{No-ySqDNpK&(mgES zJ>Iy$>nefQ6WBi37LQTMJv1Et*jH!|hxVv&tq#{(;q7;5j|%PK&>p+IUj8=gZwKnb z`g-|W)ZaQnUoW4hK2NpZr3uPfa5_7S#l zxan=r7L{wZaISH4{X~WIeQav6-^blM^c`#Q9aM^Z?#h^bDvd+-MC23tY{Z%8JbnYC057Da2-n z<@RvDvh#?F20H6@6wLcsbp*GU>fE6*M}u(@h%4Sg j9