From 40fc3d6af0962ebcda932e26b66fc9903ccb33ba Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 14:39:30 -0400 Subject: [PATCH] Match mus_rg_nana45.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_nana45.mid | Bin 0 -> 11266 bytes sound/songs/mus_rg_nana45.s | 2887 ---------------------------- 5 files changed, 5 insertions(+), 2889 deletions(-) create mode 100644 sound/songs/midi/mus_rg_nana45.mid delete mode 100644 sound/songs/mus_rg_nana45.s diff --git a/ld_script.txt b/ld_script.txt index 796e98ca0..4e6797c94 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1031,7 +1031,7 @@ SECTIONS { sound/songs/mus_rg_nanashima.o(.rodata); sound/songs/mus_rg_nanaiseki.o(.rodata); sound/songs/mus_rg_nana123.o(.rodata); - sound/songs/mus_rg_nana45.o(.rodata); + sound/songs/midi/mus_rg_nana45.o(.rodata); sound/songs/mus_rg_nana67.o(.rodata); sound/songs/mus_rg_pokefue.o(.rodata); sound/songs/mus_rg_vs_deo.o(.rodata); diff --git a/songs.mk b/songs.mk index 02f18d166..de5625410 100644 --- a/songs.mk +++ b/songs.mk @@ -414,6 +414,9 @@ $(MID_SUBDIR)/mus_rg_masara.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_naminori.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G164 -V071 +$(MID_SUBDIR)/mus_rg_nana45.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G188 -V084 + $(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 30da58883..140bd3d49 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -552,7 +552,7 @@ gSongTable:: @ 86B49F0 song mus_rg_nanashima, 0, 0 @ Sevii Islands Routes (Lake of Rage) song mus_rg_nanaiseki, 0, 0 @ Sevii Forests (Viridian Forest) song mus_rg_nana123, 0, 0 @ Sevii Islands 1-3 (Viridian/Saffron/Pewter) - song mus_rg_nana45, 0, 0 @ Sevii Islands 4-5 (Azalea Town) + song mus_rg_nana45, 0, 0 @ Sevii Islands: Four & Five Islands (FRLG) song mus_rg_nana67, 0, 0 @ Sevii Islands 6-7 (Violet City) song mus_rg_pokefue, 2, 2 @ Poké Flute song mus_rg_vs_deo, 0, 0 @ Battle! Deoxys diff --git a/sound/songs/midi/mus_rg_nana45.mid b/sound/songs/midi/mus_rg_nana45.mid new file mode 100644 index 0000000000000000000000000000000000000000..98b58113202180e6892292c83f6d75c09c0d77ca GIT binary patch literal 11266 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