From 66aac81ebe741f426bf0939fbdc130f92d294746 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 16:19:11 -0400 Subject: [PATCH] Match mus_rg_nanashima.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_nanashima.mid | Bin 0 -> 11862 bytes sound/songs/mus_rg_nanashima.s | 3038 ------------------------- 5 files changed, 5 insertions(+), 3040 deletions(-) create mode 100644 sound/songs/midi/mus_rg_nanashima.mid delete mode 100644 sound/songs/mus_rg_nanashima.s diff --git a/ld_script.txt b/ld_script.txt index 3f9622eb49..566689c94c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1028,7 +1028,7 @@ SECTIONS { sound/songs/midi/mus_rg_kinomikui.o(.rodata); sound/songs/midi/mus_rg_nanadungeon.o(.rodata); sound/songs/mus_rg_oshie_tv.o(.rodata); - sound/songs/mus_rg_nanashima.o(.rodata); + sound/songs/midi/mus_rg_nanashima.o(.rodata); sound/songs/midi/mus_rg_nanaiseki.o(.rodata); sound/songs/midi/mus_rg_nana123.o(.rodata); sound/songs/midi/mus_rg_nana45.o(.rodata); diff --git a/songs.mk b/songs.mk index d49ba86bb8..a2405c07e4 100644 --- a/songs.mk +++ b/songs.mk @@ -429,6 +429,9 @@ $(MID_SUBDIR)/mus_rg_nanadungeon.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_nanaiseki.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G146 -V090 +$(MID_SUBDIR)/mus_rg_nanashima.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G187 -V080 + $(MID_SUBDIR)/mus_ropeway.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G071 -V078 diff --git a/sound/song_table.inc b/sound/song_table.inc index 8ea25f5a2f..173f83641c 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -549,7 +549,7 @@ gSongTable:: @ 86B49F0 song mus_rg_kinomikui, 0, 0 @ Dodrio Berry Picking (FRLG) song mus_rg_nanadungeon, 0, 0 @ Mount Ember (FRLG) song mus_rg_oshie_tv, 0, 0 @ Follow Me! - song mus_rg_nanashima, 0, 0 @ Sevii Islands Routes (Lake of Rage) + song mus_rg_nanashima, 0, 0 @ Sevii Islands (FRLG) song mus_rg_nanaiseki, 0, 0 @ Tanoby Chambers (FRLG) song mus_rg_nana123, 0, 0 @ Sevii Islands: One, Two & Three Islands (FRLG) song mus_rg_nana45, 0, 0 @ Sevii Islands: Four & Five Islands (FRLG) diff --git a/sound/songs/midi/mus_rg_nanashima.mid b/sound/songs/midi/mus_rg_nanashima.mid new file mode 100644 index 0000000000000000000000000000000000000000..d215f0122e8092143c8adb51511823bf1c7583ee GIT binary patch literal 11862 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