From c5463ca1da8efd549a79e1a9ab32d824bf6142d4 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Sat, 29 Sep 2018 16:30:15 -0400 Subject: [PATCH] Match mus_vs_rekku.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_vs_rekku.mid | Bin 0 -> 6553 bytes sound/songs/mus_vs_rekku.s | 1213 ----------------------------- 5 files changed, 5 insertions(+), 1215 deletions(-) create mode 100644 sound/songs/midi/mus_vs_rekku.mid delete mode 100644 sound/songs/mus_vs_rekku.s diff --git a/ld_script.txt b/ld_script.txt index 6c39d065b..4b399623d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -953,7 +953,7 @@ SECTIONS { sound/songs/midi/mus_b_dome.o(.rodata); sound/songs/midi/mus_b_tube.o(.rodata); sound/songs/midi/mus_b_factory.o(.rodata); - sound/songs/mus_vs_rekku.o(.rodata); + sound/songs/midi/mus_vs_rekku.o(.rodata); sound/songs/midi/mus_vs_front.o(.rodata); sound/songs/midi/mus_vs_mew.o(.rodata); sound/songs/midi/mus_b_dome1.o(.rodata); diff --git a/songs.mk b/songs.mk index eb20f5837..1865e8130 100644 --- a/songs.mk +++ b/songs.mk @@ -396,6 +396,9 @@ $(MID_SUBDIR)/mus_vs_front.s: %.s: %.mid $(MID_SUBDIR)/mus_vs_mew.s: %.s: %.mid $(MID) $< $@ -G116 -R$(STD_REVERB) -V090 +$(MID_SUBDIR)/mus_vs_rekku.s: %.s: %.mid + $(MID) $< $@ -G114 -R$(STD_REVERB) -V080 -P1 + $(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 02958b7df..9cb60b0ac 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -474,7 +474,7 @@ gSongTable:: @ 86B49F0 song mus_b_dome, 0, 0 @ Battle Dome song mus_b_tube, 0, 0 @ Battle Pike song mus_b_factory, 0, 0 @ Battle Factory - song mus_vs_rekku, 0, 0 @ Battle! Legendary Pokémon + song mus_vs_rekku, 0, 0 @ Battle! (Rayquaza) song mus_vs_front, 0, 0 @ Battle! (Frontier Brain) song mus_vs_mew, 0, 0 @ Battle! (Mew) song mus_b_dome1, 0, 0 @ Battle Dome Lobby diff --git a/sound/songs/midi/mus_vs_rekku.mid b/sound/songs/midi/mus_vs_rekku.mid new file mode 100644 index 0000000000000000000000000000000000000000..2b4aced4401b7a9089c1e608358c48eaecce34b7 GIT binary patch literal 6553 zcmd5<&rcgi6n;(+(AA1oNRjr!kBUVh0^*f|nncZvzy z3^{vkBlUmi1q$3vlV19F^#7pW%+3tU!mM|bwDKYO-h1=C@4bDVWo8Sdw`C&grwk2{ zRVe-P4&E4D?e+EDvj*wv&HcXL|NcN%{h1$sWB>m|S6K>Z_YbKvL?;i1$tcpmJ~f=G zbKsDp!%mh?jB#pAd)C1;F*F70d^@rp(ZAP<=^l-&(Pi~HF9P1AV)UP0#YLn zKM#MgY@K8VoP$N8lMLcI-kRX8b>St|TNirkL>(t6UBKiDXsLin7SPHD{0-K!m*Xw# z){9s#g1_kT#{l2q{3XvjSh^!#MEo=O9hVwwkj4ZW%fMye3Zzy-zFgl%d>c>J+k2x| z_w4n%_=YZr=#;&S4tp1Ux8l@Xax_?XE}zk<@dNprWwW+PHqZi+UxZ(Tzgo6VvD<5_ zM5oy8THco6ZFS)#)!P<&*b|pdP`c!qwGvt?c@~iT9r!z}WiQ8D)~)YieHSu$@=KLr zJk2mm51yv-0RFcuo%8vY3)T3!DYs_D#Ni9XBJqz@NqbyqSN~pTc@jN5_}-WxYH3*DuyT^yl~V z$H4vvYK~RS_hV#h&}@!Yt@oqUji<|(@uWIta{~1yP|rqRHu}07lk+B_H+hHNB=jet zFELt2#siGjqvka7ao~&olKX)kHD{1NgZ#99&}Z^`QGVKbQT{{p{SbXW20jL+^{0@B zz1++Kv%s`|+Imrb+Imrbbe~9nqUyx%+nK7(fA8sPKi@ZxfRFI}GCzvl^n&-6n&X(` zICP{x0)K?AFSMCs`nXSL>=0dIhiL1$=hdH+4(s%>NN2`(G&)El29170BZJghoHOf- zWCJZAwU*#7!GAeto#8;Oza%=t`Jm-33mz^_vAm>uD?$&KFRqtEKe*nua_BFIKJxH! zy=DFK{?KzQZ%y!UxdX2@pCQkfhm7k%Munu`T6Uc}9;LPBT6LtfwtzUBT1D`2_Ov!# zyN**B>n2~9{B^9a6FxlT*T%hH=^Vcd`$PO`i_XI{H>%Wj=gdQwY@h|C_6ztg;6DXE zCHk~Y(mc-$C|ky&$SUAR(yG3K>Z?Fim|RuZZ4Gu){cn1mN3ZiiufpWL3cIaA+3Nzb z7cj>K%yj`1c@6(HpEH{`pKCCB3=DG>whp_g;$=C+hY0(%gvnKfEn`u{PsR43{8#r_ z8Ene-ifbNX-?vvF8$u=@32FS${xg22zp`{;xa=>(@pRQY!jX0hZNzakx-dNR*zxQm z2b^oPgl`IzzCrFGY6f%%I%T)g!@r;%yTJD!v1x0 zNE;8=Rd!6DI(?O!u>UY$*)eq$r$_X4b4VKxKbNv&=AhG8xjizUa6ih9c`n6C*uQQL zY2)F#%8uz%r>}Ao_8;aeJEpGUMD+2AcZ5$oe*Qjz{Y0F<;kdG)uQ<>N$CZt^;()J< rD^5fwZ9J^6Y}EY{9hDo?zp9n6|1e+a|1Wnf-5pHEzv`V1Up@Z