From 9cc3a8331a129bfc1f180c8879bedfeacca9a75e Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 25 Sep 2018 22:47:44 -0400 Subject: [PATCH] Match mus_dooro_x1.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/songs/midi/mus_dooro_x1.mid | Bin 0 -> 8204 bytes sound/songs/mus_dooro_x1.s | 2206 ----------------------------- 4 files changed, 4 insertions(+), 2207 deletions(-) create mode 100644 sound/songs/midi/mus_dooro_x1.mid delete mode 100644 sound/songs/mus_dooro_x1.s diff --git a/ld_script.txt b/ld_script.txt index 7627207dbd..a7ee81a34b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -843,7 +843,7 @@ SECTIONS { sound/songs/mus_nibi.o(.rodata); sound/songs/mus_suikun.o(.rodata); sound/songs/mus_dooro1.o(.rodata); - sound/songs/mus_dooro_x1.o(.rodata); + sound/songs/midi/mus_dooro_x1.o(.rodata); sound/songs/mus_dooro_x3.o(.rodata); sound/songs/mus_machi_s2.o(.rodata); sound/songs/mus_machi_s4.o(.rodata); diff --git a/songs.mk b/songs.mk index af5f7ce7e2..b20b5dc3e2 100644 --- a/songs.mk +++ b/songs.mk @@ -123,6 +123,9 @@ $(MID_SUBDIR)/mus_daigo.s: %.s: %.mid $(MID_SUBDIR)/mus_dendou.s: %.s: %.mid $(MID) $< $@ -G082 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_dooro_x1.s: %.s: %.mid + $(MID) $< $@ -G010 -R$(STD_REVERB) -V080 + $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid $(MID) $< $@ -G017 -R$(STD_REVERB) diff --git a/sound/songs/midi/mus_dooro_x1.mid b/sound/songs/midi/mus_dooro_x1.mid new file mode 100644 index 0000000000000000000000000000000000000000..087682996ef7531b6149d5a6e98baa59c577fb39 GIT binary patch literal 8204 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