From b7b95fd582860f3c2a78e17cee6379648acaeb1e Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 26 Sep 2018 19:13:45 -0400 Subject: [PATCH] Match mus_gotown.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_gotown.mid | Bin 0 -> 14750 bytes sound/songs/mus_gotown.s | 3337 ------------------------------- 5 files changed, 5 insertions(+), 3339 deletions(-) create mode 100644 sound/songs/midi/mus_gotown.mid delete mode 100644 sound/songs/mus_gotown.s diff --git a/ld_script.txt b/ld_script.txt index c41145aedb..aa3c905db2 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -882,7 +882,7 @@ SECTIONS { sound/songs/mus_test4.o(.rodata); sound/songs/mus_test.o(.rodata); sound/songs/midi/mus_gomachi0.o(.rodata); - sound/songs/mus_gotown.o(.rodata); + sound/songs/midi/mus_gotown.o(.rodata); sound/songs/mus_pokecen.o(.rodata); sound/songs/mus_nextroad.o(.rodata); sound/songs/mus_granroad.o(.rodata); diff --git a/songs.mk b/songs.mk index 0f152b2230..5da98dd1ae 100644 --- a/songs.mk +++ b/songs.mk @@ -180,6 +180,9 @@ $(MID_SUBDIR)/mus_girleye.s: %.s: %.mid $(MID_SUBDIR)/mus_gomachi0.s: %.s: %.mid $(MID) $< $@ -G044 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_gotown.s: %.s: %.mid + $(MID) $< $@ -G045 -R$(STD_REVERB) + $(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 0f5b3ca640..2121d92aa8 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -403,7 +403,7 @@ gSongTable:: @ 86B49F0 song mus_test4, 0, 0 @ Contest Test 4 song mus_test, 0, 0 @ Encounter! Gentleman song mus_gomachi0, 0, 0 @ Verdanturf Town - song mus_gotown, 0, 0 @ Rustboro/Mauville/Mossdeep City + song mus_gotown, 0, 0 @ Rustboro City song mus_pokecen, 0, 0 @ Pokémon Center song mus_nextroad, 0, 0 @ Route 104 song mus_granroad, 0, 0 @ Route 119 diff --git a/sound/songs/midi/mus_gotown.mid b/sound/songs/midi/mus_gotown.mid new file mode 100644 index 0000000000000000000000000000000000000000..f996eaddd5ff05cf6330d8aeab973a87e0199c9e GIT binary patch literal 14750 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