From 304baaf49e247a1a4a3767c49087c5cd672a21e3 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 25 Sep 2018 20:19:36 -0400 Subject: [PATCH] Match mus_deepdeep.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_deepdeep.mid | Bin 0 -> 25102 bytes sound/songs/mus_deepdeep.s | 3932 ----------------------------- 5 files changed, 5 insertions(+), 3934 deletions(-) create mode 100644 sound/songs/midi/mus_deepdeep.mid delete mode 100644 sound/songs/mus_deepdeep.s diff --git a/ld_script.txt b/ld_script.txt index 56e8f2d60..614623315 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -894,7 +894,7 @@ SECTIONS { sound/songs/mus_minamo.o(.rodata); sound/songs/midi/mus_ashroad.o(.rodata); sound/songs/mus_event0.o(.rodata); - sound/songs/mus_deepdeep.o(.rodata); + sound/songs/midi/mus_deepdeep.o(.rodata); sound/songs/mus_kachi1.o(.rodata); sound/songs/mus_title3.o(.rodata); sound/songs/mus_demo1.o(.rodata); diff --git a/songs.mk b/songs.mk index cc927c129..d8762f180 100644 --- a/songs.mk +++ b/songs.mk @@ -111,6 +111,9 @@ $(MID_SUBDIR)/mus_dan02.s: %.s: %.mid $(MID_SUBDIR)/mus_dan03.s: %.s: %.mid $(MID) $< $@ -G037 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_deepdeep.s: %.s: %.mid + $(MID) $< $@ -G057 -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 7f4189c1e..bfc1486fe 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -415,7 +415,7 @@ gSongTable:: @ 86B49F0 song mus_minamo, 0, 0 @ Lilycove City song mus_ashroad, 0, 0 @ Route 111 song mus_event0, 0, 0 @ Help me! - song mus_deepdeep, 0, 0 @ Underwater + song mus_deepdeep, 0, 0 @ Dive song mus_kachi1, 0, 0 @ Victory! Trainer song mus_title3, 0, 0 @ Title Screen song mus_demo1, 0, 0 @ Opening Movie diff --git a/sound/songs/midi/mus_deepdeep.mid b/sound/songs/midi/mus_deepdeep.mid new file mode 100644 index 0000000000000000000000000000000000000000..3109f68060f3a07119b3d7ddfb7e2e1e54206e6c GIT binary patch literal 25102 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 l9^fzScI(AgM?P-JN4