From 2aeeb5f7b10723d24998da600086f113d1e2c7ec Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 3 Oct 2018 00:08:37 -0400 Subject: [PATCH] Match mus_rg_vs_last.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_vs_last.mid | Bin 0 -> 30475 bytes sound/songs/mus_rg_vs_last.s | 7614 --------------------------- 5 files changed, 5 insertions(+), 7616 deletions(-) create mode 100644 sound/songs/midi/mus_rg_vs_last.mid delete mode 100644 sound/songs/mus_rg_vs_last.s diff --git a/ld_script.txt b/ld_script.txt index cc90a259e..79818150b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -994,7 +994,7 @@ SECTIONS { 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); + sound/songs/midi/mus_rg_vs_last.o(.rodata); sound/songs/midi/mus_rg_masara.o(.rodata); sound/songs/midi/mus_rg_kenkyu.o(.rodata); sound/songs/midi/mus_rg_ohkido.o(.rodata); diff --git a/songs.mk b/songs.mk index 6eac1aba5..d030de225 100644 --- a/songs.mk +++ b/songs.mk @@ -537,6 +537,9 @@ $(MID_SUBDIR)/mus_rg_vs_deo.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_vs_gym.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G155 -V090 +$(MID_SUBDIR)/mus_rg_vs_last.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G158 -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 a951bfcc7..76cc1b1bd 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -515,7 +515,7 @@ gSongTable:: @ 86B49F0 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 + song mus_rg_vs_last, 0, 0 @ Final Battle! (Rival) (FRLG) song mus_rg_masara, 0, 0 @ Pallet Town Theme (FRLG) song mus_rg_kenkyu, 0, 0 @ Professor Oak's Laboratory (FRLG) song mus_rg_ohkido, 0, 0 @ Professor Oak (FRLG) diff --git a/sound/songs/midi/mus_rg_vs_last.mid b/sound/songs/midi/mus_rg_vs_last.mid new file mode 100644 index 0000000000000000000000000000000000000000..e63d2eb4594663b5252756924810c8d472c78746 GIT binary patch literal 30475 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