From 6d205b8ac0c8f9d1872b59cca89d986bf55ba441 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Sat, 29 Sep 2018 00:04:20 -0400 Subject: [PATCH] Match mus_rainbow.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rainbow.mid | Bin 0 -> 13818 bytes sound/songs/mus_rainbow.s | 2827 ------------------------------ 5 files changed, 5 insertions(+), 2829 deletions(-) create mode 100644 sound/songs/midi/mus_rainbow.mid delete mode 100644 sound/songs/mus_rainbow.s diff --git a/ld_script.txt b/ld_script.txt index db8e706a5..4c3bf6b02 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -905,7 +905,7 @@ SECTIONS { sound/songs/midi/mus_aqa_0.o(.rodata); sound/songs/mus_tsuretek.o(.rodata); sound/songs/midi/mus_boy_sup.o(.rodata); - sound/songs/mus_rainbow.o(.rodata); + sound/songs/midi/mus_rainbow.o(.rodata); sound/songs/midi/mus_ayasii.o(.rodata); sound/songs/midi/mus_kachi4.o(.rodata); sound/songs/midi/mus_ropeway.o(.rodata); diff --git a/songs.mk b/songs.mk index 0cbc61dc8..80cbf5d1f 100644 --- a/songs.mk +++ b/songs.mk @@ -324,6 +324,9 @@ $(MID_SUBDIR)/mus_pyramid.s: %.s: %.mid $(MID_SUBDIR)/mus_pyramid_top.s: %.s: %.mid $(MID) $< $@ -G107 -R$(STD_REVERB) -V077 +$(MID_SUBDIR)/mus_rainbow.s: %.s: %.mid + $(MID) $< $@ -G068 -R$(STD_REVERB) -V086 + $(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 b16a09761..0c46187c8 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -426,7 +426,7 @@ gSongTable:: @ 86B49F0 song mus_aqa_0, 0, 0 @ Team Aqua Appears! song mus_tsuretek, 0, 0 @ Follow Me! song mus_boy_sup, 0, 0 @ Brendan - song mus_rainbow, 0, 0 @ Ever Grande City + song mus_rainbow, 0, 0 @ Evergrande City song mus_ayasii, 0, 0 @ Trainers' Eyes Meet (Hex Maniac) song mus_kachi4, 0, 0 @ Victory! (Team Aqua / Team Magma) song mus_ropeway, 0, 0 @ Cable Car diff --git a/sound/songs/midi/mus_rainbow.mid b/sound/songs/midi/mus_rainbow.mid new file mode 100644 index 0000000000000000000000000000000000000000..8c1e20151a6d627a480141dd615a640f7b36966f GIT binary patch literal 13818 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