From 1c4da06bfaf337f50bea2a585f36c01c8a1587a3 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 25 Sep 2018 16:59:56 -0400 Subject: [PATCH] Match mus_bd_time.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_bd_time.mid | Bin 0 -> 6635 bytes sound/songs/mus_bd_time.s | 1327 ------------------------------ 5 files changed, 5 insertions(+), 1329 deletions(-) create mode 100644 sound/songs/midi/mus_bd_time.mid delete mode 100644 sound/songs/mus_bd_time.s diff --git a/ld_script.txt b/ld_script.txt index ecc7290c4a..82eef010a0 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -875,7 +875,7 @@ SECTIONS { sound/songs/mus_me_b_big.o(.rodata); sound/songs/mus_me_b_small.o(.rodata); sound/songs/mus_me_zannen.o(.rodata); - sound/songs/mus_bd_time.o(.rodata); + sound/songs/midi/mus_bd_time.o(.rodata); sound/songs/mus_test1.o(.rodata); sound/songs/mus_test2.o(.rodata); sound/songs/mus_test3.o(.rodata); diff --git a/songs.mk b/songs.mk index 7d27cd4e02..e917f6ca86 100644 --- a/songs.mk +++ b/songs.mk @@ -69,6 +69,9 @@ $(MID_SUBDIR)/mus_battle36.s: %.s: %.mid $(MID_SUBDIR)/mus_battle38.s: %.s: %.mid $(MID) $< $@ -G125 -R$(STD_REVERB) -P1 +$(MID_SUBDIR)/mus_bd_time.s: %.s: %.mid + $(MID) $< $@ -G038 -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 fafcba9965..24d247c10c 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -396,7 +396,7 @@ gSongTable:: @ 86B49F0 song mus_me_b_big, 2, 2 @ Slots Jackpot! song mus_me_b_small, 2, 2 @ Slots Victory! song mus_me_zannen, 2, 2 @ Too bad! - song mus_bd_time, 0, 0 @ Roulette! + song mus_bd_time, 0, 0 @ Reel Time song mus_test1, 0, 0 @ Contest Test 1 song mus_test2, 0, 0 @ Contest Test 2 song mus_test3, 0, 0 @ Contest Test 3 diff --git a/sound/songs/midi/mus_bd_time.mid b/sound/songs/midi/mus_bd_time.mid new file mode 100644 index 0000000000000000000000000000000000000000..c023969096f24a4519eff878d6610071d482ce58 GIT binary patch literal 6635 zcmeI0O=}xh6o#)O`Nm02A&VA~LU4#Nj^oh5I8M?SGqEZx50Yl4l7(c|P}))o-Gr>N zYi8Vf(M5?q>V1DeOTX!|-@l>j{*b!QNIEm4yGckD!r-hP-h0lu_nvdl9E7Tk58qcx zX*HwfRH53q{}HOKPFnf=nZlep@pH4UzG97KU`P7hudE0^|6Kt3;=>_6do9A*^ZyL- zy!>jm{~)RngCZoRF8Ev35KWgTq8(y|UpaM#koF097wEJqQ&0e{08Tjv6nf2TAD5m>C$*Vx`=ZU zEq2FS;GX%O!#y1C!B-aYm7z!X7fqLiyfW)g=3m4=dXEb4Q&D=%OVqhAtn)79t2gW$ zV;!9{dcR#5`H7zHeo0r&zHI%TSKp6jRlm8e5BUcBb;vB}`;hMG*C5^0r@Id6uGmlP z=6Y7++vL|y<<~&dJ#ihXXu7K}equM*rH*2kI+=cAH`kw6e24rx4;=TDn zb3uQ?R2P^b@;P4u7kX%%Q{nWAbxUBb3Lo^2js_89PC4;VqAwkG*dC| z1M!nQ<$Yy6Yw_~FS-t<$)jyenvoBeH`szof;1_Fl?$b4ui+LM;8+`}ffm?7ZMbn;@ z_!4=P$YTfYKnFVT2E38tCVCSsdEZ6fMGH-PR^rR#Q6>+`yNa%&Z^D}?O5Qf>HtR)L zOwqJwC0_EbkWYntT