From 014aa3d137ef7791a7ad2c747564a34e5a5540c4 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 25 Sep 2018 23:00:10 -0400 Subject: [PATCH] Match mus_dooro_x4.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_dooro_x4.mid | Bin 0 -> 10643 bytes sound/songs/mus_dooro_x4.s | 2905 ----------------------------- 5 files changed, 5 insertions(+), 2907 deletions(-) create mode 100644 sound/songs/midi/mus_dooro_x4.mid delete mode 100644 sound/songs/mus_dooro_x4.s diff --git a/ld_script.txt b/ld_script.txt index e98f011e3..91504e4da 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -857,7 +857,7 @@ SECTIONS { sound/songs/mus_fanfa5.o(.rodata); sound/songs/mus_me_waza.o(.rodata); sound/songs/midi/mus_bijyutu.o(.rodata); - sound/songs/mus_dooro_x4.o(.rodata); + sound/songs/midi/mus_dooro_x4.o(.rodata); sound/songs/mus_fune_kan.o(.rodata); sound/songs/mus_me_shinka.o(.rodata); sound/songs/mus_shinka.o(.rodata); diff --git a/songs.mk b/songs.mk index 64664a88c..f2256d4b6 100644 --- a/songs.mk +++ b/songs.mk @@ -129,6 +129,9 @@ $(MID_SUBDIR)/mus_dooro_x1.s: %.s: %.mid $(MID_SUBDIR)/mus_dooro_x3.s: %.s: %.mid $(MID) $< $@ -G014 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_dooro_x4.s: %.s: %.mid + $(MID) $< $@ -G021 -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 f294b19cd..bccce1c3e 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -378,7 +378,7 @@ gSongTable:: @ 86B49F0 song mus_fanfa5, 2, 2 @ Your Pokémon Just Evolved! song mus_me_waza, 2, 2 @ Obtained a TM/HM! song mus_bijyutu, 0, 0 @ Museum - song mus_dooro_x4, 0, 0 @ Route 122/Intro + song mus_dooro_x4, 0, 0 @ Introductions song mus_fune_kan, 0, 0 @ Slateport Museum song mus_me_shinka, 2, 2 @ Evolution Intro song mus_shinka, 0, 0 @ Evolution diff --git a/sound/songs/midi/mus_dooro_x4.mid b/sound/songs/midi/mus_dooro_x4.mid new file mode 100644 index 0000000000000000000000000000000000000000..f82c7a30f17393b28fca00bdc1c8c8b10ad446c1 GIT binary patch literal 10643 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