From b8c4f542204c7833162309b61611c9590bc33d46 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 20:06:19 -0400 Subject: [PATCH] Match mus_rg_otsukimi.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_otsukimi.mid | Bin 0 -> 13409 bytes sound/songs/mus_rg_otsukimi.s | 3747 -------------------------- 5 files changed, 5 insertions(+), 3749 deletions(-) create mode 100644 sound/songs/midi/mus_rg_otsukimi.mid delete mode 100644 sound/songs/mus_rg_otsukimi.s diff --git a/ld_script.txt b/ld_script.txt index 802024ad8..bc4b71d77 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -983,7 +983,7 @@ SECTIONS { sound/songs/mus_rg_shounen.o(.rodata); sound/songs/midi/mus_rg_dendou.o(.rodata); sound/songs/mus_rg_t_mori.o(.rodata); - sound/songs/mus_rg_otsukimi.o(.rodata); + sound/songs/midi/mus_rg_otsukimi.o(.rodata); sound/songs/mus_rg_pokeyashi.o(.rodata); sound/songs/midi/mus_rg_ending.o(.rodata); sound/songs/midi/mus_rg_load01.o(.rodata); diff --git a/songs.mk b/songs.mk index ad2be5054..6152d8497 100644 --- a/songs.mk +++ b/songs.mk @@ -450,6 +450,9 @@ $(MID_SUBDIR)/mus_rg_opening.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_oshie_tv.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G131 -V068 +$(MID_SUBDIR)/mus_rg_otsukimi.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G147 -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 0a86f2950..c95a316e5 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -504,7 +504,7 @@ gSongTable:: @ 86B49F0 song mus_rg_shounen, 0, 0 @ Encounter! Boy song mus_rg_dendou, 0, 0 @ Hall of Fame (FRLG) song mus_rg_t_mori, 0, 0 @ Viridian Forest - song mus_rg_otsukimi, 0, 0 @ Mt. Moon + song mus_rg_otsukimi, 0, 0 @ Navel Rock song mus_rg_pokeyashi, 0, 0 @ Pokémon Mansion song mus_rg_ending, 0, 0 @ Ending Theme (FRLG) song mus_rg_load01, 0, 0 @ Road to Viridian City: Leaving Pallet Town (FRLG) diff --git a/sound/songs/midi/mus_rg_otsukimi.mid b/sound/songs/midi/mus_rg_otsukimi.mid new file mode 100644 index 0000000000000000000000000000000000000000..c7da3b0364c45b1ac5840e441fa86eee0024945e GIT binary patch literal 13409 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 rOW7~S=st)p7EeF-KT7*Oo}Uf;a{