From 602ca92b3b26278eae1f5553d1a46f44750067bb Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Mon, 1 Oct 2018 16:05:57 -0400 Subject: [PATCH] Match mus_rg_cycling.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_cycling.mid | Bin 0 -> 8344 bytes sound/songs/mus_rg_cycling.s | 2317 --------------------------- 5 files changed, 5 insertions(+), 2319 deletions(-) create mode 100644 sound/songs/midi/mus_rg_cycling.mid delete mode 100644 sound/songs/mus_rg_cycling.s diff --git a/ld_script.txt b/ld_script.txt index 5cae6bfad2..42c2cf0145 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -977,7 +977,7 @@ SECTIONS { sound/songs/mus_rg_guren.o(.rodata); sound/songs/mus_rg_shion.o(.rodata); sound/songs/mus_rg_kaihuku.o(.rodata); - sound/songs/mus_rg_cycling.o(.rodata); + sound/songs/midi/mus_rg_cycling.o(.rodata); sound/songs/mus_rg_rocket.o(.rodata); sound/songs/mus_rg_shoujo.o(.rodata); sound/songs/mus_rg_shounen.o(.rodata); diff --git a/songs.mk b/songs.mk index 3edbfe69e4..43b85f947c 100644 --- a/songs.mk +++ b/songs.mk @@ -345,6 +345,9 @@ $(MID_SUBDIR)/mus_rg_annai.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_champ_r.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G154 -V090 +$(MID_SUBDIR)/mus_rg_cycling.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G141 -V090 + $(MID_SUBDIR)/mus_ropeway.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G071 -V078 diff --git a/sound/song_table.inc b/sound/song_table.inc index f617446cd8..04f8e24e20 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -499,7 +499,7 @@ gSongTable:: @ 86B49F0 song mus_rg_guren, 0, 0 @ Cinnabar Island song mus_rg_shion, 0, 0 @ Lavender Town song mus_rg_kaihuku, 0, 0 @ RBY Pokémon Center Healing - song mus_rg_cycling, 0, 0 @ Cycling + song mus_rg_cycling, 0, 0 @ Cycling (FRLG) song mus_rg_rocket, 0, 0 @ Encounter! Team Rocket song mus_rg_shoujo, 0, 0 @ Encounter! Girl song mus_rg_shounen, 0, 0 @ Encounter! Boy diff --git a/sound/songs/midi/mus_rg_cycling.mid b/sound/songs/midi/mus_rg_cycling.mid new file mode 100644 index 0000000000000000000000000000000000000000..270bc8a75bc1324b83cf7ee448dc09fba211598d GIT binary patch literal 8344 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