From ea765f5d880a89a4939083f4cb3d47a111b6d743 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 3 Oct 2018 00:04:47 -0400 Subject: [PATCH] Match mus_rg_vs_deo.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_vs_deo.mid | Bin 0 -> 33236 bytes sound/songs/mus_rg_vs_deo.s | 5968 ---------------------------- 5 files changed, 5 insertions(+), 5970 deletions(-) create mode 100644 sound/songs/midi/mus_rg_vs_deo.mid delete mode 100644 sound/songs/mus_rg_vs_deo.s diff --git a/ld_script.txt b/ld_script.txt index 28f067e04..6f2145425 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1034,7 +1034,7 @@ SECTIONS { sound/songs/midi/mus_rg_nana45.o(.rodata); sound/songs/midi/mus_rg_nana67.o(.rodata); sound/songs/midi/mus_rg_pokefue.o(.rodata); - sound/songs/mus_rg_vs_deo.o(.rodata); + sound/songs/midi/mus_rg_vs_deo.o(.rodata); sound/songs/mus_rg_vs_myu2.o(.rodata); sound/songs/midi/mus_rg_vs_den.o(.rodata); sound/songs/midi/mus_rg_exeye.o(.rodata); diff --git a/songs.mk b/songs.mk index d59db4a5c..e3346c4b4 100644 --- a/songs.mk +++ b/songs.mk @@ -531,6 +531,9 @@ $(MID_SUBDIR)/mus_rg_union.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_vs_den.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G157 -V090 +$(MID_SUBDIR)/mus_rg_vs_deo.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G185 -V080 + $(MID_SUBDIR)/mus_ropeway.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G071 -V078 diff --git a/sound/song_table.inc b/sound/song_table.inc index 1ce7e9af2..199b7b609 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -555,7 +555,7 @@ gSongTable:: @ 86B49F0 song mus_rg_nana45, 0, 0 @ Sevii Islands: Four & Five Islands (FRLG) song mus_rg_nana67, 0, 0 @ Sevii Islands: Six & Seven Islands (FRLG) song mus_rg_pokefue, 2, 2 @ The Poké Flute (FRLG) - song mus_rg_vs_deo, 0, 0 @ Battle! Deoxys + song mus_rg_vs_deo, 0, 0 @ Battle! (Deoxys) song mus_rg_vs_myu2, 0, 0 @ Battle! Mewtwo song mus_rg_vs_den, 0, 0 @ Battle! (Ho-Oh/Lugia) song mus_rg_exeye, 0, 0 @ Tense Battle! (FRLG) diff --git a/sound/songs/midi/mus_rg_vs_deo.mid b/sound/songs/midi/mus_rg_vs_deo.mid new file mode 100644 index 0000000000000000000000000000000000000000..1f9c00bb105f605aa4f734b1e4226b019a0601c9 GIT binary patch literal 33236 zcmeI5U2s&#mB-J$GnzXdPq6I5iDHbcU|~KD!-p{jAx0kv34|Do1VT7?4A>@FlGQpN z>)K>95QIql#K1+)rYc*tdC0S1!Om7*9B-W6tvshHPbt<(YOD5Tvrqfz{hhwkGn$r0 zqp>7AarEN92vTBUPKb&$%E2zWa#z367e?5ha>U0-;$IMkHvy@ zD=xQ3m{Lf6@L&WgCH|*a0#zn{{jiaK{jiaKHe#fojTq_2XN>gYGe&xIm66_DWu(`y z8R_+FMmqgNBc1-Ckq!(R>A;|ow*JUSTYqGv$1WM^u}em3`lFGW{-{#Z|Ngg1fRTRt znvs6{nvs5W)=0lPYowq4#z;T?jgfxxo{@g?o{?^?o-Y05y({uz!aMy>`rj|ghg&78 zSnxS{_oPfcx>;7HB`8QLdpUbwI_3I?Z2Hm$k?WhlP2iSn+odhwX5`J&^ww`3`gQ0_ z@_pH*ZQ{gA%Cl*0YQoxZZnKI$Q|k7y`?AlMJ-+Pn`nm)3+*GV$89 zi|(X!rZ2V8dnTK_lmXj7mA8P(+RB@dH5)5$K-Mg+ybhTx-W`;wR91p+I?2lQ_LcFe zpf4T_#)D(=;8Z-w$Ab&;U@RVdGah{F;(f{a@}e)V`ZDIr8@?1)NXD0SzC7;BL%v9} zWZ#hPxb(!O&zHl#4EQqW%aAW8d^u&>=6yNu%a?rlsxMzNLB8|IR4^6`UXBG!-HuqW zH5NP>yVNc+6+Dz@q+oU}`|cAE%}a2mCDkg|`wQ_){SsGA<$AilH7eRX{DO1SLcBEX zx>bT#tHpd&q~RB1_oX8y?J?OClie}d6_Xt?*%q4$PDpA!PFrH~OiVV%rcxQCjTmy^ zhM25JrI+hsvKDQhkidOe6O$)mvN|TK&}C74J|>^zayOSNWAZSU8fQgJ9^_IxNW~=J zQnPG|NsP-DF8!ED?9#Asxj!b^FHQydH?!|POW~Tu#AUX3jHRbiPly*!r#7ZjyVI#` zI&~_JF&<-JmA<9H>b?3u=-(Kut0OZU(o4n(1axGu;Ggrt3k?bRDRf zwt+f_xm?4gCfN#VlB>bbgR4Nz^z-0Kum#j~KMR_99Zl(IHkT%HKg&}G6O9{DZweC3 z6m-!`f^jfjl3BLUvtC@^1MbnenQy@N$$9(M>hJo#LVU_gth}@@>RYG$ys5S};5+}c z=0z2r<;UZbpOv5IRB4ow_}RH)d6Y-V_(vnvH0LOh4b`7}-oVHYW*?#3JX>|*3{lRZ z8Re`sNOa27hz3f_nY06C%3d{CrGZM=fij8Bem^zQI_3^tGqTA*O_9N(zU{`cv z6pvy*ivB2eMaSRp9>RwwO>qbx#TSrYP()U&wkM0j*m;RA4r5oWwnw~A;&T$)NqiLD zHm9(kLVpT7IBWgta@SRfIE%_%IXA|A28YwMKTVv|`?26U)=sk7-p8;$G_$az<2C)yKAH=Tc z#3<&l=g{Y{D?0vWJl!!rPMhQS9;c0BwLMupf&B#f6WA52?Gf)0d`7U1;G^ia8O1(| zeiS=scr?tN_1o#YxM1$exiRiDIJ`*v7m4#Cxhc-b72fW<@k_LM3E!7!qgZWE7SCco zi~cNj#cF$0zw`KC=?WDP{dO+(fx(lm@A=d8wenipP=73jwm?L1gn{ zgAAJP+%^OFm=_m(6dScWeVS3K7h^`7LUb1m=1TcwO8Fq0e2`5($R;0TlMkiHLm9Ox z18T(qWRnuINvYa?I~b!>=%$BuV>os#9bZrs57KNJgBe{r&3?W@ZktbJqVei1WXxu8 z_gKbk4!2*(vw56n1DdY2qFOTs(g(qJi6rY0;+|ynT`ZDUvE1vv~FW>OxTb>lQO2L!wc=Gq2 ze9M==i^&_Fd?O}b_vCe7z8seep1ekrn4I+`@5>kY2FuegvG^Wq$dea5Ip*mXT8Dh; z^W=ahJ)U&Nq{EYaB*n*Qe97d=W<%p?Pu6(S>hXbxJW5hFqXdaOBAzF{CtN?^OWI^X zz9h2B6oIxGPqM+C;F$M;bb8W7SM=#izjud6-3Kz@$q`S#FB>6APtKs;i~1!`nV<7C z>sLL#8@t1+*avdam#2jR(9K2eLX+R$NIUl z8^_vRy_H=a*5Agrey;4co3Ec6-<91s*6!-9?DDYwE?-x6+u3;a{M`7i?8dQnS8rvP zhxK=PxU$>M#;fP&#&=~mjg)L}^KWc? z=UdnL`u&O5U!TIuQz*LiZ5`~8ebgbIZ#(O^hb4xOWpC^U_k%mY9iY`)UbSS~&b7OG zE7yx}{cJodyX~yLp5LE1|2yo#-PlXb*-E^T1=&Kpu@hwLu&jR`nQg+FvTbMMSbtY< z<$Ce0pN(f_w_Qoklk8KG#&Bf>4p4D+3U9cT>_E?MV0olm*|xJ4vvyZ+<$Ce0pN(f_ zw_QnZMj~IKSIgbfvSD4>wsY;S-pVeWdhu$tE9v#QVBfkrsW_h=-mq_5R&Ve7TC#2D z+FiYs>&3TzHlCH;c2-}{?@yh7y|-AKxAk*no4;#!^;UM@lIz8*)z0c|zgDgnzg~aV zZsRo?f4=QXe&s!<6%We4enI}3(~4|6l@2W4+)zkg*&uRr6Szs_ckDsk+)`+}vIX5{ zbek)-vhO(H0l{*D8Sw29MJ4=id^6Q&f>y4|$RD*8;R>&JdK$AQI&)_%F!R`7}I z>zT!D`brxFGKJ(7_F1qbjl2a^;#S^-Oj2ce1F|M-?dy;=kw{LK_113VSI1p!ze*mq zpKXPfEBx`c%!~2S@wIiSH7?8bist|9^L2TCHFkgh`PFMJ_sLpG-i%PnxDCCoBU{0( z;L`ZXO}C%ztY6!gtiSo@xy;MX2X}nx>31<-*eop1qn*h76a%V+lX$(!r(UoXwPLFn_kxy+-Me|5aY>c5h&eQ$94kNQoPc-nql zS;}@>2m5@pvW;IWUR1Yc-mLU}#@3})e~aJ$8v0#Bzfu0$Z!_zU&FhNXd>n_znHUjT zSxN&bH=oA-G!2&hv`#bY(%1uQ`Gs`3UJbn{m;WSu{3-dxF}Yj%48hmW_(G0JwHRQ$XAk0nBm=X34dTkR$qFlj)Ho`s2sZaYP>! z8#&~7e$<2iK!ruYvSaDK?yZ;%@LiI7A3;~dftqjTR} za!B6`IiNod5;az5l!PdOJ4%L4X{1V{Wa=N}=T1WhAXaCPbm*x^Q#kuL!G{?TjaABw zc{LAroYcQ*&Oy@oH4jpS#GE6fb#iN2bA(L&qESlDIzmK?*-_HSfip^)m3u!W@blb} zvNO3fN))#c%$^6W#okNq5E;JJ_fj<8W6R?`ZH4=kk2jx&j!D>_jgRwXQrO-aVK;KO zEivnL2&wbb;zar`U_kLK*fVD^}Z++^%ufR0;dBD^}ZyiS95y9Lo<6 z5gVzoWueG(sz<%cKnQFPm!!p^b$@Dz5?@MyT^w0HAeaLsuDEqTr1?bK}HHHUY@ zHHSyTHK(6NuQ@!Hyyoy;^qRxF;hMvv;hNLWqSqWAOI~w$FM7@4-Ehs}(QwV_XVGg8 zk0q};ycfOZ@NT%~@MyT^^t0$ShsToF9Nvpwb9gsgb9gjdbNX5In!{tsYYy*4uQ|LM zt~op!t~vcIdd=anOHZ`y-Ix*NR zinB>1VGg^Z<8OGo@6McpGg~^xX`@>^)pp%PinGPTmJfEtYJ0?c1Rsv=ha>nXx@|_W zb8J5x#SR)C4cDCZZoUhyIrC-7YYuOxW^B_eu;%b?xaRO^xaRb;=rxDOlGhyGi(Yeh zH(YagG+cA~S@fF2W65g{??taUyc?|fFFIIW@+`x-=4cttCCzq7wcLD{|CM#P?R@Jv zKhV$VKS28dX$}vAhr#|?^QAa9k~n1BKTb5 zDmUG|;GxUeQnZ>q5v^uVu!wq+Kgj;Xy+FI;vV%+QvvjE)bJ>n|dhdUbY#)5z%m(N3 z?`Py*s!eY78D!bk9uZCn^f^!)in&G^E zby!xYrgWXSm-=hDwGFD<&*S;2gRS7&C9dFR@u&%4Y#=bf40 zt(o^TSMufCAohRq%je~7Zi6S1vicG8-)8eKz%b#nZ$AFZ_O{8si+yhg-^@(#qsiM4 zogBK@GQrSH9tHW)V)8J^j~|mqE;di_BM17{w}X5-$fbj9I>@Be$u#W4fgqFp7jqNL zECRn_Q8w` z>DvDH!(w8Kf!*=WOl5b z-V?#giQr69Q2YdX8+L;O&z84uScERN4?E1 z)k=b6*uGkM4X_FF?0KvG0u-o9?MHnnN7hhQ-OK5>THi=qYn3aXEib&EStoA0g7dFk;_BJ?XF7|Px;}-EcmD8I^DK9B zvb<{Wb#~R=ZRd?eJ8vw0(s#Y(VeymZ$viEm$u;gT+up^G%E#tg ztG%^h++XZ01{p9~K>A1i#E@v4{Cg6-AoNi7~_o&{;oEO035Ql6WVLy^C8 ze$ZBs=km2#@xR&obiRv9dtY^}%EL6v?M$KgyQ2KJQPPwDD9FFe{Hrv@4_4!P z{QV(`JGinWKVCvBf82g)hu6p5|9taa=DE1@Xt|!t^;}+;D(kXchZ