From c501f63be73f9dc64dea31029406c2ed4d098fa4 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 25 Sep 2018 17:17:30 -0400 Subject: [PATCH] Match mus_casino.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/songs/midi/mus_casino.mid | Bin 0 -> 19546 bytes sound/songs/mus_casino.s | 4151 ------------------------------- 4 files changed, 4 insertions(+), 4152 deletions(-) create mode 100644 sound/songs/midi/mus_casino.mid delete mode 100644 sound/songs/mus_casino.s diff --git a/ld_script.txt b/ld_script.txt index 5d9f8d324f..20bde37196 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -909,7 +909,7 @@ SECTIONS { sound/songs/midi/mus_ayasii.o(.rodata); sound/songs/mus_kachi4.o(.rodata); sound/songs/midi/mus_ropeway.o(.rodata); - sound/songs/mus_casino.o(.rodata); + sound/songs/midi/mus_casino.o(.rodata); sound/songs/mus_hightown.o(.rodata); sound/songs/mus_safari.o(.rodata); sound/songs/midi/mus_c_road.o(.rodata); diff --git a/songs.mk b/songs.mk index 853ed2b5dc..526a28c958 100644 --- a/songs.mk +++ b/songs.mk @@ -84,6 +84,9 @@ $(MID_SUBDIR)/mus_boyeye.s: %.s: %.mid $(MID_SUBDIR)/mus_c_road.s: %.s: %.mid $(MID) $< $@ -G075 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_casino.s: %.s: %.mid + $(MID) $< $@ -G072 -R$(STD_REVERB) + $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid $(MID) $< $@ -G017 -R$(STD_REVERB) diff --git a/sound/songs/midi/mus_casino.mid b/sound/songs/midi/mus_casino.mid new file mode 100644 index 0000000000000000000000000000000000000000..5571a0afe62a4515aece4e452d3f72cfbcc803e2 GIT binary patch literal 19546 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 rE#B~VVBYaG=G^x014HBk$B|