From babe3d0e9298b6ec73e3112de75f68b68a9402ba Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 3 Oct 2018 00:06:42 -0400 Subject: [PATCH] Match mus_rg_vs_gym.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_vs_gym.mid | Bin 0 -> 20538 bytes sound/songs/mus_rg_vs_gym.s | 5087 ---------------------------- 5 files changed, 5 insertions(+), 5089 deletions(-) create mode 100644 sound/songs/midi/mus_rg_vs_gym.mid delete mode 100644 sound/songs/mus_rg_vs_gym.s diff --git a/ld_script.txt b/ld_script.txt index 6f2145425..cc90a259e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -991,7 +991,7 @@ SECTIONS { sound/songs/midi/mus_rg_load02.o(.rodata); sound/songs/midi/mus_rg_load03.o(.rodata); sound/songs/midi/mus_rg_champ_r.o(.rodata); - sound/songs/mus_rg_vs_gym.o(.rodata); + sound/songs/midi/mus_rg_vs_gym.o(.rodata); sound/songs/mus_rg_vs_tore.o(.rodata); sound/songs/mus_rg_vs_yasei.o(.rodata); sound/songs/mus_rg_vs_last.o(.rodata); diff --git a/songs.mk b/songs.mk index e3346c4b4..6eac1aba5 100644 --- a/songs.mk +++ b/songs.mk @@ -534,6 +534,9 @@ $(MID_SUBDIR)/mus_rg_vs_den.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_vs_deo.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G185 -V080 +$(MID_SUBDIR)/mus_rg_vs_gym.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G155 -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 199b7b609..a951bfcc7 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -512,7 +512,7 @@ gSongTable:: @ 86B49F0 song mus_rg_load02, 0, 0 @ Road to Cerulean City: Leaving Mt. Moon (FRLG) song mus_rg_load03, 0, 0 @ Road to Fuchsia City: Leaving Lavender Town (FRLG) song mus_rg_champ_r, 0, 0 @ The Final Road (FRLG) - song mus_rg_vs_gym, 0, 0 @ Battle! Gym Leader/Elite Four + song mus_rg_vs_gym, 0, 0 @ Battle! (Gym Leader Battle) (FRLG) song mus_rg_vs_tore, 0, 0 @ Battle! Trainer song mus_rg_vs_yasei, 0, 0 @ Battle! Wild Pokémon song mus_rg_vs_last, 0, 0 @ Battle! Champion diff --git a/sound/songs/midi/mus_rg_vs_gym.mid b/sound/songs/midi/mus_rg_vs_gym.mid new file mode 100644 index 0000000000000000000000000000000000000000..aa2da087f7c7965150f08b150204f1cbe57c3574 GIT binary patch literal 20538 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