From e8a081d0f2700f6912b42de9aae6918a16aa217f Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 25 Sep 2018 17:32:45 -0400 Subject: [PATCH] Match mus_contest0.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_contest0.mid | Bin 0 -> 12673 bytes sound/songs/mus_contest0.s | 3062 ----------------------------- 5 files changed, 5 insertions(+), 3064 deletions(-) create mode 100644 sound/songs/midi/mus_contest0.mid delete mode 100644 sound/songs/mus_contest0.s diff --git a/ld_script.txt b/ld_script.txt index 255a73622..1f25d87d3 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -923,7 +923,7 @@ SECTIONS { sound/songs/mus_tonekusa.o(.rodata); sound/songs/mus_maborosi.o(.rodata); sound/songs/midi/mus_con_fan.o(.rodata); - sound/songs/mus_contest0.o(.rodata); + sound/songs/midi/mus_contest0.o(.rodata); sound/songs/mus_mgm0.o(.rodata); sound/songs/mus_t_battle.o(.rodata); sound/songs/mus_ooame.o(.rodata); diff --git a/songs.mk b/songs.mk index 034b59b70..bf87ff2e3 100644 --- a/songs.mk +++ b/songs.mk @@ -96,6 +96,9 @@ $(MID_SUBDIR)/mus_con_k.s: %.s: %.mid $(MID_SUBDIR)/mus_conlobby.s: %.s: %.mid $(MID) $< $@ -G098 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_contest0.s: %.s: %.mid + $(MID) $< $@ -G086 -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 1e1588ecf..9ad7c616a 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -444,7 +444,7 @@ gSongTable:: @ 86B49F0 song mus_tonekusa, 0, 0 @ Fallarbor Town song mus_maborosi, 0, 0 @ Sealed Chamber song mus_con_fan, 0, 0 @ Contest Winner - song mus_contest0, 0, 0 @ Pokémon Contest + song mus_contest0, 0, 0 @ Pokémon Contest! song mus_mgm0, 0, 0 @ Encounter! Team Magma song mus_t_battle, 0, 0 @ Opening Battle song mus_ooame, 0, 0 @ The Flood diff --git a/sound/songs/midi/mus_contest0.mid b/sound/songs/midi/mus_contest0.mid new file mode 100644 index 0000000000000000000000000000000000000000..2878b399557aeed3a5a13910f8f3bf1d0589f9d8 GIT binary patch literal 12673 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