From 927fa4b3844b5637465ee49b218435eacbe28a69 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Sat, 29 Sep 2018 00:17:49 -0400 Subject: [PATCH] Match mus_sattower.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 4 +- sound/songs/midi/mus_sattower.mid | Bin 0 -> 11709 bytes sound/songs/mus_sattower.s | 3498 ----------------------------- 5 files changed, 6 insertions(+), 3501 deletions(-) create mode 100644 sound/songs/midi/mus_sattower.mid delete mode 100644 sound/songs/mus_sattower.s diff --git a/ld_script.txt b/ld_script.txt index b43e9d755c..c88f40c823 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -948,7 +948,7 @@ SECTIONS { sound/songs/midi/mus_pyramid_top.o(.rodata); sound/songs/midi/mus_b_palace.o(.rodata); sound/songs/midi/mus_rekkuu_kourin.o(.rodata); - sound/songs/mus_sattower.o(.rodata); + sound/songs/midi/mus_sattower.o(.rodata); sound/songs/midi/mus_me_symbolget.o(.rodata); sound/songs/midi/mus_b_dome.o(.rodata); sound/songs/midi/mus_b_tube.o(.rodata); diff --git a/songs.mk b/songs.mk index 4a3e5b56d4..ae781bdc4f 100644 --- a/songs.mk +++ b/songs.mk @@ -336,6 +336,9 @@ $(MID_SUBDIR)/mus_runecity.s: %.s: %.mid $(MID_SUBDIR)/mus_safari.s: %.s: %.mid $(MID) $< $@ -G074 -R$(STD_REVERB) -V082 +$(MID_SUBDIR)/mus_sattower.s: %.s: %.mid + $(MID) $< $@ -G110 -R$(STD_REVERB) -V100 + $(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 2fd1c4629c..b800e07da4 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -388,7 +388,7 @@ gSongTable:: @ 86B49F0 song mus_dan02, 0, 0 @ Abandoned Ship song mus_machi_s3, 0, 0 @ Fortree City song mus_odamaki, 0, 0 @ Birch Pokémon Lab - song mus_b_tower, 0, 0 @ Battle Tower + song mus_b_tower, 0, 0 @ Battle Tower (RS) song mus_swimeye, 0, 0 @ Encounter! Swimmer song mus_dan03, 0, 0 @ Cave of Origin song mus_me_kinomi, 2, 2 @ Obtained a Berry! @@ -469,7 +469,7 @@ gSongTable:: @ 86B49F0 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_sattower, 0, 0 @ Battle Tower (Emerald) + song mus_sattower, 0, 0 @ Battle Tower song mus_me_symbolget, 2, 2 @ Obtained a Frontier Symbol! song mus_b_dome, 0, 0 @ Battle Dome song mus_b_tube, 0, 0 @ Battle Pike diff --git a/sound/songs/midi/mus_sattower.mid b/sound/songs/midi/mus_sattower.mid new file mode 100644 index 0000000000000000000000000000000000000000..a8294614f25266ac7f5264d1e5bf1a7f9d43c64f GIT binary patch literal 11709 zcmd5>-ESMm5nmqZTk3MK1tG18Bxr?(i6u*xXiJu5nGsK41S6UjtqPXiDk+f$NPq~4 zP`E%)6qRMmex^>6pWA<+uxO{xiPQGEkNt1l-^}jZm*m7v8lX>ev-_Lx+1cZ}3+uU4E&;W#eRb z5iTq$w_CgI-mAft#SP*S_Qw>qYxjj$-R2i@SxgEzyMwNAahv0cYH=C~FHl{(txX5d zPE7Aw{*Tc22UmaY>Q7kH2d-Xob={>>eU&qrT%k;sxYS-ho+pduxvmgl@g8D9>Wbt6 z+MvWm_K^J+a8z(Awd}|E5_?Sgn!r(lJ?LBL6uIp6HMY@hu2~%PH7oWRxF+nd49jcS z$g%wf{6M=T{7T3t?6iP`ZwbFj6vq?tXBjwtKEdw>>{2^Ye2qzd{;GoB=qT@fNPdiL zt{6>N>ekzQK)TDQE@i33`}P=Mf2HH!L%Vj{plwj_EKe;=@-3{hm%Lu)h-v+X(W9|_ z17c8XV4zfl_d(wWt%KrxMtpQ>Q$RiLDK8_-G!GZAsWH>7lcW@-<@U;)%lh%`liDz6RLhJ|%3EKTW9;5_TwKyF%Ob_5yziT((fEyhsK zd4W1{U>US@r3ED}1Rm}*Zlos>FxusNUQ#Gid_DeKeO*;YUdLXK$iUuQ!#%>~mOJI| zz{nBZk;>nj4cwhsg$>iFfxJz@wid_m>dH(vQMNVUV|| z5gK-{+4hh0lut1r*RtAZpIUC`;MOUeFu^c@Wac50JEb7DgBJjiS&lWKT1X5Hx4lN& zM7In|MXWPQkv-H-P;>DrHw4R)sYa|6ITBM%DC5qsN+}5IP$G!Mcy%$BH4Y%)A{;1) z1L7v`9PX(lk}WDd?duD^F8frGuPerZMQX8rZn@c@Xj|6sRq(hC_GUn55>(a&FTCJt zz~cobk`sOb>(tU&z7G4;`tg2$N`4;uC`}}n<;AX0(LWD+Njce{!#W)?@n85l*3A(# z`@%25J~Dn z(y6D8wS$TW7BDU_%-OTQjhd!wDw z&L|+G9S79O(j$FC?Oph^v~vNN%BHhZ0VYGadu}LPDRd_yb1tIrk(dAH+mMfJbiWt> zte%gn9^PzUH$Q)eR5;f0?~f@J4hQc2;RGEEXuV|DT}uZ-v+h4Xt$N-^DqIdq_i8NVc+SHZqL70wU2_c1cUIw<@Jo1hpeJ?~d4Y~dMaUDhIu zmFaoqsc;S$_#W*ogXb7GVmZ4OVXO>$I#}|4tHL&%!cQH}OcT%S!9{Vr^Lz|jgYKyl2%Sx_93a1NCH0HrvVLD`RqSH^}d$ROUH2Rq-PSFqtKWL8P0Lv^%1 zfU*yZ>_gZBr97^J0vq1K{w@zmfa`vA&5*tnXY(2G`LY`6-_IXI)jDacP@PvR0@;>z%x1Bq2I z!p}n&^=5|edE-$&Lc!SlL~&$zuIUZ^!21)^8thU>&4AMBod-pQpHIWHHvPg2Telr};9BZrsI33D zG^>Yrj+92c_YNjISeoo+VwWuyzGV5vtK!UP^U+a0cid{=<0i@LPF}C%b>JZBIW7l= z+B(uvF~h6|O6i#gMOu1ZfaXuHg>~>e2r#59PS(OE_V~bmf|Qrd5Nd)_Q`{)$;Y!YU zhE)4ut7?k9T79{5xT(asS#%&zT2M^do>#+^Os|D?@a!BW&YZ!?TDT0JCo(xVWSmIu4TWgvaQoC!#;K=rrY5hHd4YL+fmO|Cfc|BwiNKAJNOgWc0ESy{F{9 zQQw?aPfgnRRb?kY0(EUS_$G(-Ddknw{_1w=0mj!;jHmt8$)b6_ruJ`b7a!m%+Fu97 z_}RY$9LCyHeDU1B0~|j?UiM>riSVp%9XNglZlzOvfa_y_b&YN8udi7g^sQIyGwVA+ z9{#Ms4~)NrUlun2d9gD?ezI=~ze*IxQ}1)g0>{tLm-TxM@j*Yww>D{>bqyW&h`t(l zoyz|D?b1_y+0o+#{f?st3;L|1PZxB-;TY*tUQpS;^)e9l$@VwX$UNF0Q2VVf{HNOf zWn#X~<7brn0Q35(?sv7izZ{iP|5g3Ht)9UV`^u@*!R(g*Ob`3`nXrq)M|(M};y30l z&fo#&wAn4~;@HV9UbUa;A$J!OmX;1K2ktK3nLvw7FM(c4@R;U=jrQ?tn2a5eo}8=n zkk6_-{<1>m19EDJox&F(F=av{qxMV9aPO9!y{tuTck6pi`jY`g!9zr>&USH38$=+QqyD+VDoYcyK&HCK1Ca zZIVurj?TB_FbjxHw+$oOGZdBq+#oe3w8?>3l9F;^fldw<4EJ zB9iP~MPyfD`?A%F2+#?lmD}e$ez>1T`xMM-!P}<3DpEroEJ92VGhi_Wl1(P#B(X>wXN++6nVQQS2!tUx zTSnF=CA|V1TKt*kP@D5JH33(j^hr@q!bLWKi=JU`9*2vvA{3t)xP>jx_VF2mt0z>j zmS=xtP2};Bfg5QG6bFd)WY&;yW6Q2{o~~kz8ceV<1R@OQH;oaQE0C4^nB2O^vCJwQ z1AL23H|*@Di#B%;(C%_b5>rupz=sk(4EO?t`nxnOWsXsU*cqBeQ3L~=0r3D?M_ZM0 zZkdZMQX6RxFdM(c1MxGBlA|uYlZ~A%4`nS+p>t3f=>|F%w(@*(Xx$9uQqtc{&r;@W zZp;mGveZ)0_e_tT-CZ(g`d}$=@a!C;=%{D<{2MeqFf$y`9MYS!&rU?~aglKitFHlU z1Nx592F36?_IMf{G#VC{ruLSkb2ZyB^)PYz>6`I9uBgn-n69ym@Z$qNJ;LMB&N-$8 zN4K{7h5E<3`qEz60ez)79NTig#JA0d_(}04@xyJyDhgU!`Roe;EFn zL%{8G0ZJ}FNd?Q4PinMbtZ~;@O*@!U_)!U@nWRLre+i92i4!WVDf_XUX-3&M^tk>B z=%dyaxhb>;1&rUC4{`nvg%>^IkMOd8nVX#^Q7RGfYLpN1fnx3;2HQG5g(S(tt~oZG z7+F23`C?5XQ%K2(eyk?+8&6dZt5L~(I;@-ri6;>!yy3W_2KC8vt^#y%GYZ;RjLg}C z$Fq%_bND*N25nUQLKNF|2dr~AoS`EzdL%}V0EPcF4zqN0Ez&(2qes^qi~#2_OD}8~ zw5HaKJh`ypfOQTtlqNrYxuTihd6k)u2u&r-z#pLCDca+6?Sx?;%|r-C_s^++sedZ< zH~lC2x%qfrdEY`>+FhWalF6k=@8Y(Qk3zWzWd@v3wuPm? zTt&!Kg^S42iBWSlNvdF?$kKqajjVqw9e8}TYO*^N6iv06BFho|p4s87KA>{>)x zEBF)XNw^;t*VRQDhn2^Z7*msKXDc~bvy+ZpPfR)+%2nV