From e8c1c3879b974617e410f366a036e60247050cfb Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Fri, 28 Sep 2018 23:42:15 -0400 Subject: [PATCH] Match mus_nextroad.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/songs/midi/mus_nextroad.mid | Bin 0 -> 14713 bytes sound/songs/mus_nextroad.s | 3679 ----------------------------- 4 files changed, 4 insertions(+), 3680 deletions(-) create mode 100644 sound/songs/midi/mus_nextroad.mid delete mode 100644 sound/songs/mus_nextroad.s diff --git a/ld_script.txt b/ld_script.txt index 95e0df5f80..829653253e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -884,7 +884,7 @@ SECTIONS { sound/songs/midi/mus_gomachi0.o(.rodata); sound/songs/midi/mus_gotown.o(.rodata); sound/songs/mus_pokecen.o(.rodata); - sound/songs/mus_nextroad.o(.rodata); + sound/songs/midi/mus_nextroad.o(.rodata); sound/songs/midi/mus_granroad.o(.rodata); sound/songs/midi/mus_cycling.o(.rodata); sound/songs/midi/mus_friendly.o(.rodata); diff --git a/songs.mk b/songs.mk index c05e957106..7e69e0a90b 100644 --- a/songs.mk +++ b/songs.mk @@ -297,6 +297,9 @@ $(MID_SUBDIR)/mus_minamo.s: %.s: %.mid $(MID_SUBDIR)/mus_mishiro.s: %.s: %.mid $(MID) $< $@ -G051 -R$(STD_REVERB) -V100 +$(MID_SUBDIR)/mus_nextroad.s: %.s: %.mid + $(MID) $< $@ -G047 -R$(STD_REVERB) -V097 + $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid $(MID) $< $@ -G017 -R$(STD_REVERB) diff --git a/sound/songs/midi/mus_nextroad.mid b/sound/songs/midi/mus_nextroad.mid new file mode 100644 index 0000000000000000000000000000000000000000..571345f5a81e88f943df6203a7fa98749fc407b3 GIT binary patch literal 14713 zcmeI3-*;41md8)sI&!Yp8m#V)ZFL*ks4*6p#zMqINK8UPNIHZRAu%9mhovr1duFO# z&McQJuB60N*$=Z8p^_?moc{pGB
8L_x^EcFcplp}u=Tg>!c_)YpCLYA~qGw0f*t{lZtfer*5Es