From 17610d37ecb16df658ac0fa0c8cc9fc6b352d855 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 25 Sep 2018 16:53:58 -0400 Subject: [PATCH] Match mus_battle38.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_battle38.mid | Bin 0 -> 11527 bytes sound/songs/mus_battle38.s | 2267 ----------------------------- 5 files changed, 5 insertions(+), 2269 deletions(-) create mode 100644 sound/songs/midi/mus_battle38.mid delete mode 100644 sound/songs/mus_battle38.s diff --git a/ld_script.txt b/ld_script.txt index 22cf6abc4d..ecc7290c4a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -965,7 +965,7 @@ SECTIONS { sound/songs/midi/mus_battle36.o(.rodata); sound/songs/midi/mus_battle34.o(.rodata); sound/songs/midi/mus_battle35.o(.rodata); - sound/songs/mus_battle38.o(.rodata); + sound/songs/midi/mus_battle38.o(.rodata); sound/songs/midi/mus_battle30.o(.rodata); sound/songs/mus_rg_annai.o(.rodata); sound/songs/mus_rg_slot.o(.rodata); diff --git a/songs.mk b/songs.mk index 73957e99d3..7d27cd4e02 100644 --- a/songs.mk +++ b/songs.mk @@ -66,6 +66,9 @@ $(MID_SUBDIR)/mus_battle35.s: %.s: %.mid $(MID_SUBDIR)/mus_battle36.s: %.s: %.mid $(MID) $< $@ -G122 -R$(STD_REVERB) -P1 +$(MID_SUBDIR)/mus_battle38.s: %.s: %.mid + $(MID) $< $@ -G125 -R$(STD_REVERB) -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 853c6946d8..fafcba9965 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -486,7 +486,7 @@ gSongTable:: @ 86B49F0 song mus_battle36, 0, 0 @ Battle! (Regirock/Regice/Registeel) song mus_battle34, 0, 0 @ Battle! (Groudon/Kyogre) song mus_battle35, 0, 0 @ Battle! (Brendan/May/Steven) - song mus_battle38, 0, 0 @ Battle! Elite Four + song mus_battle38, 0, 0 @ Battle! (Elite Four) song mus_battle30, 0, 0 @ Battle! (Team Aqua/Team Magma Leaders) @ FRLG Music Below song mus_rg_annai, 0, 0 @ Follow Me! diff --git a/sound/songs/midi/mus_battle38.mid b/sound/songs/midi/mus_battle38.mid new file mode 100644 index 0000000000000000000000000000000000000000..7f3ed1d59c42d479d8768c802c63a07729a449cb GIT binary patch literal 11527 zcmeI2O>Z056^5@Wm17E1I0zD83M8q460(EHF=5LevT2GUO^K!`Qj{23Xj6a-q6p9| zh{6l60x?pRMS()}&~CT=2U4x3Tf27JKapkshx?p6_lU}9hRC$omekE=0W5&% zMW^c?r_JV6%U_*>ng*xA4446xpG2PA!(T{W?nwz`A}H7XB#)S5*4giT7#al})$OwMtu7 zY<{ujRg+#N>CGg)>7;i(>0L>B;|cG~Fdo;2Cn^bp^ z+uK<*rdx-on?{$d0y8KA%QxT~R`!v7XD18Ohg=u=iTnrM8vbe~Q2$S^nQghfl2SWC zN{M|q*Y>x$y&Vqh_7ItJU$8S>?oWq9+eI%r;jJAyYgcRs9eOWzmdDoe1$cVBFOJ5K z$D7ALm!Vq&IqU=D)$z;W-IvEAyzOxNZSr_qY+N1hBA=F8tXy|_s(#Vgv)1b8+L68X zVbR&EzTxZ}&VJt6le=BtaQ3Rd6Ujp+=-eUg<-WLV$dCAVQ`R$X8Jp$dCR?uNcbxW>9j{>^JEB-6V23#($*Z@9ES4&CFY@fJ;H)%ivZ(^ueZGEvl z=%y28*d5(&;cm3AoGIJq{M~4uxRF-Q-Hpy4_u1(q`@TN1SAEvmbCKQp$iA{Wl$ z+23^bS(lIMb1olUpLh1emzf|}s@6)`Mpi-k*R9YB=5n_$r>tCtmyM`kC;Bod@@@Fr zdt}vD;l&?YI$^hTww35G7ulVJ-Rq+4nCx*uEaX-e&%;)Hz8U=xTwETJn| z*+=%Bt@UB`ZteH1i~K}(L0G^a@9)&VjhQW_$jgM2rC^OWuHlW6zjg!6fV`0nZ-V^v z4YQ>LcE186`zh>sgBwnxp9TvcKP9_ z*jfL(_P(_*uukIS;rFhO+efvU@D_Ib(4}_)z3t1YclkW6n@6K;(^NVNdkN&XKzJRz z4l18TmUdkP`Hmb;g3>nSGsx1mG{|q8@G^KAR9-Qzzloh~Gx&Y}HO`>;KMuXWudhFj zx(1({H}%Q6KdJkE((2xj2W6OHG|Q~i(XS&pdh8A6E3D)7sC%60W734m*U{?Qf<9aVg|D57;?zOmtMB=1yp9cP zLBv-;$+P-S#Fs%{=Z2NHBK|7z`J-ld1C&RuKKir|gZNqOdCR-cUimV5iKBkvy!NM# zovnwuZ9UX0eXE1E9_qIBfWlX(+tx$9!k0l?&wCMH0{JUYSf*~_XFp zMsyqY5_k)KFEinOr5PVHx$*Z$P8`%XR7C3$O|RqC?! zxH>DKt;g|Y>XSHH4|CBD1Fe&}X!9(AG9-#1!(n$Gns3cF3+C^8=b^Xo7xT@Cc~HwF z{!lZC2UV~NR=~<0S@m`JI{ZF)B3fThJN-E)pAq@WgZMg)6Zf-(|0VpZ{jQ9EiMurJ z^!T?j{+G<3mUn9$UN`?T=4)?Zqxo>`T4H0&n1^E-hdGD09F`nb94$iKzl;h4qL5mDFqZk@_U^>bYInuq$+d=!;GX~;Qp`+W9Of8(r4J$x}VZrzLa zQ`hM}seIJ^&~?Y{r$28-s^;Gp%s=G+30*UPzS#D^x@b}dpxOn_?xe{F_2+ffr(^pS g-#7n&eScl+I_|vmTx&m6R(#$0