From 48caaf4eb2803ef85adc10449fa09c7eff98e65b Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Sat, 29 Sep 2018 00:22:56 -0400 Subject: [PATCH] Match mus_sitennou.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_sitennou.mid | Bin 0 -> 10104 bytes sound/songs/mus_sitennou.s | 2344 ----------------------------- 5 files changed, 5 insertions(+), 2346 deletions(-) create mode 100644 sound/songs/midi/mus_sitennou.mid delete mode 100644 sound/songs/mus_sitennou.s diff --git a/ld_script.txt b/ld_script.txt index 758199160..1d576c377 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -933,7 +933,7 @@ SECTIONS { sound/songs/midi/mus_eikou_r.o(.rodata); sound/songs/midi/mus_karakuri.o(.rodata); sound/songs/midi/mus_hutago.o(.rodata); - sound/songs/mus_sitennou.o(.rodata); + sound/songs/midi/mus_sitennou.o(.rodata); sound/songs/mus_yama_eye.o(.rodata); sound/songs/midi/mus_conlobby.o(.rodata); sound/songs/midi/mus_inter_v.o(.rodata); diff --git a/songs.mk b/songs.mk index 42345a9b0..db2d157be 100644 --- a/songs.mk +++ b/songs.mk @@ -342,6 +342,9 @@ $(MID_SUBDIR)/mus_sattower.s: %.s: %.mid $(MID_SUBDIR)/mus_shinka.s: %.s: %.mid $(MID) $< $@ -G026 -R$(STD_REVERB) -V080 +$(MID_SUBDIR)/mus_sitennou.s: %.s: %.mid + $(MID) $< $@ -G096 -R$(STD_REVERB) -V078 + $(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 b800e07da..0c6df8ef6 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -454,7 +454,7 @@ gSongTable:: @ 86B49F0 song mus_eikou_r, 0, 0 @ Room of Glory song mus_karakuri, 0, 0 @ The Trick House song mus_hutago, 0, 0 @ Twins - song mus_sitennou, 0, 0 @ Encounter! Elite Four + song mus_sitennou, 0, 0 @ The Elite Four Appear! song mus_yama_eye, 0, 0 @ Encounter! Hiker song mus_conlobby, 0, 0 @ Contest Lobby song mus_inter_v, 0, 0 @ Interviewers diff --git a/sound/songs/midi/mus_sitennou.mid b/sound/songs/midi/mus_sitennou.mid new file mode 100644 index 0000000000000000000000000000000000000000..21ba64b98b533c7c4147954496cb0299eb7a1587 GIT binary patch literal 10104 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 z