From a91981c796bcbc04f57d476b6758f45d079c780b Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 26 Sep 2018 19:01:13 -0400 Subject: [PATCH] Match mus_girl_sup.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_girl_sup.mid | Bin 0 -> 11504 bytes sound/songs/mus_girl_sup.s | 2588 ----------------------------- 5 files changed, 5 insertions(+), 2590 deletions(-) create mode 100644 sound/songs/midi/mus_girl_sup.mid delete mode 100644 sound/songs/mus_girl_sup.s diff --git a/ld_script.txt b/ld_script.txt index 43544fc460..ce532f0b70 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -898,7 +898,7 @@ SECTIONS { sound/songs/mus_kachi1.o(.rodata); sound/songs/mus_title3.o(.rodata); sound/songs/midi/mus_demo1.o(.rodata); - sound/songs/mus_girl_sup.o(.rodata); + sound/songs/midi/mus_girl_sup.o(.rodata); sound/songs/mus_hageshii.o(.rodata); sound/songs/mus_kakkoii.o(.rodata); sound/songs/mus_kazanbai.o(.rodata); diff --git a/songs.mk b/songs.mk index 3c64adefcc..7446147fc0 100644 --- a/songs.mk +++ b/songs.mk @@ -171,6 +171,9 @@ $(MID_SUBDIR)/mus_fune_kan.s: %.s: %.mid $(MID_SUBDIR)/mus_gim.s: %.s: %.mid $(MID) $< $@ -G013 -R$(STD_REVERB) -V080 +$(MID_SUBDIR)/mus_girl_sup.s: %.s: %.mid + $(MID) $< $@ -G061 -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 f5d360c26a..c23895e1a2 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -419,7 +419,7 @@ gSongTable:: @ 86B49F0 song mus_kachi1, 0, 0 @ Victory! Trainer song mus_title3, 0, 0 @ Title Screen song mus_demo1, 0, 0 @ Opening Movie: Setting out on a Journey in the Hoenn Region - song mus_girl_sup, 0, 0 @ Encounter! May + song mus_girl_sup, 0, 0 @ May song mus_hageshii, 0, 0 @ Encounter! Biker song mus_kakkoii, 0, 0 @ Encounter! Electric Trainer song mus_kazanbai, 0, 0 @ Route 113 diff --git a/sound/songs/midi/mus_girl_sup.mid b/sound/songs/midi/mus_girl_sup.mid new file mode 100644 index 0000000000000000000000000000000000000000..6fea0ae1dc9b6f772296105475e101dd5dfeea39 GIT binary patch literal 11504 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