From 686ba9eb99d2299ad04b7329555001d837af3847 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 25 Sep 2018 22:22:02 -0400 Subject: [PATCH] Match mus_daigo.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_daigo.mid | Bin 0 -> 12720 bytes sound/songs/mus_daigo.s | 3315 -------------------------------- 5 files changed, 5 insertions(+), 3317 deletions(-) create mode 100644 sound/songs/midi/mus_daigo.mid delete mode 100644 sound/songs/mus_daigo.s diff --git a/ld_script.txt b/ld_script.txt index b7eebf9341..7627207dbd 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -937,7 +937,7 @@ SECTIONS { sound/songs/mus_yama_eye.o(.rodata); sound/songs/midi/mus_conlobby.o(.rodata); sound/songs/mus_inter_v.o(.rodata); - sound/songs/mus_daigo.o(.rodata); + sound/songs/midi/mus_daigo.o(.rodata); sound/songs/mus_thankfor.o(.rodata); sound/songs/mus_end.o(.rodata); sound/songs/midi/mus_b_frontier.o(.rodata); diff --git a/songs.mk b/songs.mk index c0ec1e5b37..af5f7ce7e2 100644 --- a/songs.mk +++ b/songs.mk @@ -117,6 +117,9 @@ $(MID_SUBDIR)/mus_deepdeep.s: %.s: %.mid $(MID_SUBDIR)/mus_demo1.s: %.s: %.mid $(MID) $< $@ -G060 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_daigo.s: %.s: %.mid + $(MID) $< $@ -G100 -R$(STD_REVERB) + $(MID_SUBDIR)/mus_dendou.s: %.s: %.mid $(MID) $< $@ -G082 -R$(STD_REVERB) diff --git a/sound/song_table.inc b/sound/song_table.inc index d2f2bd5e49..f294b19cda 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -458,7 +458,7 @@ gSongTable:: @ 86B49F0 song mus_yama_eye, 0, 0 @ Encounter! Hiker song mus_conlobby, 0, 0 @ Contest Lobby song mus_inter_v, 0, 0 @ Encounter! Gabby and Ty - song mus_daigo, 0, 0 @ Encounter! Wallace + song mus_daigo, 0, 0 @ Champion Wallace song mus_thankfor, 0, 0 @ Credits song mus_end, 0, 0 @ The End song mus_b_frontier, 0, 0 @ Battle Frontier diff --git a/sound/songs/midi/mus_daigo.mid b/sound/songs/midi/mus_daigo.mid new file mode 100644 index 0000000000000000000000000000000000000000..6e3a6f852a5a9b63b623ac4895acc16dc8fb8be2 GIT binary patch literal 12720 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