From 2689a0ffe6ee9c9b9478f95c4fb60cae56b88dcd Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Sat, 29 Sep 2018 00:38:28 -0400 Subject: [PATCH] Match mus_test1.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_test1.mid | Bin 0 -> 7174 bytes sound/songs/mus_test1.s | 1765 -------------------------------- 5 files changed, 5 insertions(+), 1767 deletions(-) create mode 100644 sound/songs/midi/mus_test1.mid delete mode 100644 sound/songs/mus_test1.s diff --git a/ld_script.txt b/ld_script.txt index 1c9e93e82..0d602aa04 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -876,7 +876,7 @@ SECTIONS { sound/songs/midi/mus_me_b_small.o(.rodata); sound/songs/midi/mus_me_zannen.o(.rodata); sound/songs/midi/mus_bd_time.o(.rodata); - sound/songs/mus_test1.o(.rodata); + sound/songs/midi/mus_test1.o(.rodata); sound/songs/mus_test2.o(.rodata); sound/songs/mus_test3.o(.rodata); sound/songs/mus_test4.o(.rodata); diff --git a/songs.mk b/songs.mk index 3339ea186..b0e1a9bce 100644 --- a/songs.mk +++ b/songs.mk @@ -360,6 +360,9 @@ $(MID_SUBDIR)/mus_t_battle.s: %.s: %.mid $(MID_SUBDIR)/mus_test.s: %.s: %.mid $(MID) $< $@ -G043 -R$(STD_REVERB) -V094 +$(MID_SUBDIR)/mus_test1.s: %.s: %.mid + $(MID) $< $@ -G039 -R$(STD_REVERB) -V079 + $(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 e6c74b8aa..a5c4145b7 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -397,7 +397,7 @@ gSongTable:: @ 86B49F0 song mus_me_b_small, 2, 2 @ Win song mus_me_zannen, 2, 2 @ Lose song mus_bd_time, 0, 0 @ Reel Time - song mus_test1, 0, 0 @ Contest Test 1 + song mus_test1, 0, 0 @ Pokémon Contest! (Multiplayer - Player 1) song mus_test2, 0, 0 @ Contest Test 2 song mus_test3, 0, 0 @ Contest Test 3 song mus_test4, 0, 0 @ Contest Test 4 diff --git a/sound/songs/midi/mus_test1.mid b/sound/songs/midi/mus_test1.mid new file mode 100644 index 0000000000000000000000000000000000000000..36c297994e9b8882979c9e0a3a946cb89ad09e61 GIT binary patch literal 7174 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