From 55f8e4aed71d263aca8cc2a2eb7974b77dee3c13 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Sat, 29 Sep 2018 00:06:37 -0400 Subject: [PATCH] Match mus_rekkuu_kourin.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rekkuu_kourin.mid | Bin 0 -> 2870 bytes sound/songs/mus_rekkuu_kourin.s | 859 ------------------------- 5 files changed, 5 insertions(+), 861 deletions(-) create mode 100644 sound/songs/midi/mus_rekkuu_kourin.mid delete mode 100644 sound/songs/mus_rekkuu_kourin.s diff --git a/ld_script.txt b/ld_script.txt index 4c3bf6b02..de91b04e3 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -947,7 +947,7 @@ SECTIONS { sound/songs/midi/mus_pyramid.o(.rodata); sound/songs/midi/mus_pyramid_top.o(.rodata); sound/songs/midi/mus_b_palace.o(.rodata); - sound/songs/mus_rekkuu_kourin.o(.rodata); + sound/songs/midi/mus_rekkuu_kourin.o(.rodata); sound/songs/mus_sattower.o(.rodata); sound/songs/midi/mus_me_symbolget.o(.rodata); sound/songs/midi/mus_b_dome.o(.rodata); diff --git a/songs.mk b/songs.mk index 80cbf5d1f..ba3a85b56 100644 --- a/songs.mk +++ b/songs.mk @@ -327,6 +327,9 @@ $(MID_SUBDIR)/mus_pyramid_top.s: %.s: %.mid $(MID_SUBDIR)/mus_rainbow.s: %.s: %.mid $(MID) $< $@ -G068 -R$(STD_REVERB) -V086 +$(MID_SUBDIR)/mus_rekkuu_kourin.s: %.s: %.mid + $(MID) $< $@ -G109 -R$(STD_REVERB) -V090 + $(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 0c46187c8..2fd1c4629 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -468,7 +468,7 @@ gSongTable:: @ 86B49F0 song mus_pyramid, 0, 0 @ Battle Pyramid song mus_pyramid_top, 0, 0 @ Battle Pyramid Summit song mus_b_palace, 0, 0 @ Battle Palace - song mus_rekkuu_kourin, 0, 0 @ Rayquaza Enters + song mus_rekkuu_kourin, 0, 0 @ Rayquaza Enters! song mus_sattower, 0, 0 @ Battle Tower (Emerald) song mus_me_symbolget, 2, 2 @ Obtained a Frontier Symbol! song mus_b_dome, 0, 0 @ Battle Dome diff --git a/sound/songs/midi/mus_rekkuu_kourin.mid b/sound/songs/midi/mus_rekkuu_kourin.mid new file mode 100644 index 0000000000000000000000000000000000000000..a16b3f51187c6e7237abc7d25dc6863636cf7ba8 GIT binary patch literal 2870 zcmeHJ&ref95dPk>IMA%oq!1fVJrF!dB0&RzX!8g{3{q&xGtoqoMqZ5ZN75J%+>k!) zS&DG?KY&s>c=GojVu=3+&c1!yeJC+-C>K1a09|Bd8$>Z&8czw(39`I1>do>HiI07GZAi@?s z7xYBZBSA}&DuV7yx+mz4q(D$f(!8MCl5Pr`l5|7RsH9OrS0xPzx-99EpaDsFK^G-m z5R{d4R*;g^D@bH?4JYg)K4-CQgk?glZLJViRtwN})lUuqTXk5#GOcajsBCwx11+lE zf%g+%`q0!J3?efFT8YpoR8);g4ZotA+>+J8en{9?!GtS*e-HPcJTW#Fg0j(CNG#`kk{AMDi7aj)><;W9B zRWVsq=U!PqV3YN^mwte+S?nacTGGPT$ClL&RfqXIipGE))6V*M>Xch^|&f@cCMDUP<}=w%>7e+;a6jo5OKi8GW|?Q=L0f|7VfxRY&$i@viCoOYI*N z(T(qAd~my7#Rl)<8{YE`-dkf&1&+?0!p8ggf!#8A5AkCWyHo;yhGr#x!N+DHti7!B zzn{(7P}TXb)8u|rj