From 61abaaf201d22c4f2af81e9fa63d494dca5ba24e Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Fri, 28 Sep 2018 23:04:18 -0400 Subject: [PATCH] Match mus_mgm0.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_mgm0.mid | Bin 0 -> 8029 bytes sound/songs/mus_mgm0.s | 2187 --------------------------------- 5 files changed, 5 insertions(+), 2189 deletions(-) create mode 100644 sound/songs/midi/mus_mgm0.mid delete mode 100644 sound/songs/mus_mgm0.s diff --git a/ld_script.txt b/ld_script.txt index cdd939627..837ff3d9b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -924,7 +924,7 @@ SECTIONS { sound/songs/midi/mus_maborosi.o(.rodata); sound/songs/midi/mus_con_fan.o(.rodata); sound/songs/midi/mus_contest0.o(.rodata); - sound/songs/mus_mgm0.o(.rodata); + sound/songs/midi/mus_mgm0.o(.rodata); sound/songs/mus_t_battle.o(.rodata); sound/songs/mus_ooame.o(.rodata); sound/songs/midi/mus_hideri.o(.rodata); diff --git a/songs.mk b/songs.mk index c6cd251f5..c9cf4537c 100644 --- a/songs.mk +++ b/songs.mk @@ -288,6 +288,9 @@ $(MID_SUBDIR)/mus_me_waza.s: %.s: %.mid $(MID_SUBDIR)/mus_me_zannen.s: %.s: %.mid $(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5 +$(MID_SUBDIR)/mus_mgm0.s: %.s: %.mid + $(MID) $< $@ -G087 -R$(STD_REVERB) -V072 + $(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 330949c97..423c85bfc 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -445,7 +445,7 @@ gSongTable:: @ 86B49F0 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_mgm0, 0, 0 @ Encounter! Team Magma + song mus_mgm0, 0, 0 @ Team Magma Appears! song mus_t_battle, 0, 0 @ Opening Battle song mus_ooame, 0, 0 @ The Flood song mus_hideri, 0, 0 @ The Drought diff --git a/sound/songs/midi/mus_mgm0.mid b/sound/songs/midi/mus_mgm0.mid new file mode 100644 index 0000000000000000000000000000000000000000..99f5c24a892b48e6eb79d3cb0b0c0c122de5726b GIT binary patch literal 8029 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