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 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 bawm_Q@8~`1+0taT^Vi|6@!gX>E