From caadbc11cc7fa17da469142e268021c83537c375 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Sat, 29 Sep 2018 00:46:35 -0400 Subject: [PATCH] Match mus_thankfor.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_thankfor.mid | Bin 0 -> 25862 bytes sound/songs/mus_thankfor.s | 7462 ----------------------------- 5 files changed, 5 insertions(+), 7464 deletions(-) create mode 100644 sound/songs/midi/mus_thankfor.mid delete mode 100644 sound/songs/mus_thankfor.s diff --git a/ld_script.txt b/ld_script.txt index 589f92a2bc..13fc5ad3f1 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -938,7 +938,7 @@ SECTIONS { sound/songs/midi/mus_conlobby.o(.rodata); sound/songs/midi/mus_inter_v.o(.rodata); sound/songs/midi/mus_daigo.o(.rodata); - sound/songs/mus_thankfor.o(.rodata); + sound/songs/midi/mus_thankfor.o(.rodata); sound/songs/midi/mus_end.o(.rodata); sound/songs/midi/mus_b_frontier.o(.rodata); sound/songs/midi/mus_b_arena.o(.rodata); diff --git a/songs.mk b/songs.mk index 72897a6a23..9eb81f8af3 100644 --- a/songs.mk +++ b/songs.mk @@ -375,6 +375,9 @@ $(MID_SUBDIR)/mus_test4.s: %.s: %.mid $(MID_SUBDIR)/mus_tetsuji.s: %.s: %.mid $(MID) $< $@ -G034 -R$(STD_REVERB) -V099 +$(MID_SUBDIR)/mus_thankfor.s: %.s: %.mid + $(MID) $< $@ -G101 -R$(STD_REVERB) -V100 + $(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 bd35ed3fbd..f37467387c 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -459,7 +459,7 @@ gSongTable:: @ 86B49F0 song mus_conlobby, 0, 0 @ Contest Lobby song mus_inter_v, 0, 0 @ Interviewers song mus_daigo, 0, 0 @ Champion Wallace - song mus_thankfor, 0, 0 @ Credits + song mus_thankfor, 0, 0 @ Ending Theme song mus_end, 0, 0 @ The End song mus_b_frontier, 0, 0 @ Battle Frontier song mus_b_arena, 0, 0 @ Battle Arena diff --git a/sound/songs/midi/mus_thankfor.mid b/sound/songs/midi/mus_thankfor.mid new file mode 100644 index 0000000000000000000000000000000000000000..d4f9e1606bfd6a1597e23811ad8e561a59f17eb3 GIT binary patch literal 25862 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