From 3327c587f087633ec40f78101f4ba7c4c1174f7a Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 25 Sep 2018 16:52:00 -0400 Subject: [PATCH] Match mus_battle36.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_battle36.mid | Bin 0 -> 11970 bytes sound/songs/mus_battle36.s | 1657 ----------------------------- 5 files changed, 5 insertions(+), 1659 deletions(-) create mode 100644 sound/songs/midi/mus_battle36.mid delete mode 100644 sound/songs/mus_battle36.s diff --git a/ld_script.txt b/ld_script.txt index ad52cc821..22cf6abc4 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -962,7 +962,7 @@ SECTIONS { sound/songs/midi/mus_battle20.o(.rodata); sound/songs/midi/mus_battle32.o(.rodata); sound/songs/midi/mus_battle33.o(.rodata); - sound/songs/mus_battle36.o(.rodata); + 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); diff --git a/songs.mk b/songs.mk index 573be5ed7..73957e99d 100644 --- a/songs.mk +++ b/songs.mk @@ -63,6 +63,9 @@ $(MID_SUBDIR)/mus_battle34.s: %.s: %.mid $(MID_SUBDIR)/mus_battle35.s: %.s: %.mid $(MID) $< $@ -G124 -R$(STD_REVERB) -P1 +$(MID_SUBDIR)/mus_battle36.s: %.s: %.mid + $(MID) $< $@ -G122 -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 0a28181e8..853c6946d 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -483,7 +483,7 @@ gSongTable:: @ 86B49F0 song mus_battle20, 0, 0 @ Battle! (Trainer Battle) song mus_battle32, 0, 0 @ Battle! (Gym Leader) song mus_battle33, 0, 0 @ Battle! (Champion Wallace) - song mus_battle36, 0, 0 @ Battle! Regi Trio + 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 diff --git a/sound/songs/midi/mus_battle36.mid b/sound/songs/midi/mus_battle36.mid new file mode 100644 index 0000000000000000000000000000000000000000..56d6a9559efa0a0418ba35f5ad3b6ca044438a2c GIT binary patch literal 11970 zcmeI2&u?2*7ROJEu`ia9qN)ocK?x#6)lAzsZE)-)cAUg^{i9BuG(`wnDGM)<=psTa zSfM@=%7O)P-ZT9J<{xN=0J9p=p)>O@u$;y4H?S<9>-UcHqcpLDBYxDIe)>K4ymRk6 z_uTugUtVqHy@rT{<&?Z2@!HA<@1tIo$8U#1r{hK*FFp7CKYsW^9*0l8+y3{qJRTF@ z?YY0ncL{kAsY^5`o8>igw=A-mhk2;Fgf5{M-~v>A6@3*w59gukBD#p4gL6=I0bM}n zU=FI*{${byVppyGWwB?mtJeN9*fZEwYkxD?XRxc*{-&`{V^^*HO<|wHu3Gy`V^3rE zwKMcxN*+Xq6HHTNa&_JDW9FLzkh=aTQi2 z7WjuZOX!k>1G^In3?z>Ro6J1Sb3qQ~aP;lrKreRPfj_{co%U#wd&$XWrs14#54O-4 zYEMwU;TOQw#%g3C-hYZ$1OLX&ZPmYlGTZE8=W#K%GlC*=i~h zbgz8@KU-Zzg8KH=cJK=R6@o?xI@K@_B54zuHj%7}%$Z2uL`o)7HIe$Tox--$^jQ^;hjS-vykP?62botQ%$;}L!No{hA4wc-jK`NQ+V(sgy zkV+2x!_5+!N^bggClnZ@S)_r9rGpq9#F{xsB?tC!pclLDz#rh^!x?TdC(UsR&KW0u zx-sOiY@4ZuaZ+%)vFfnwvFG;LllUdub`#iF+y3MD6Q>>YvJH9}rzxB%FoO8bGdQuw zV9)KdPvS?7VK;$&wH-W*KdWJzDsECu+fS=vhiYm&%^c=rd-mtUndm;`!eJpjn#k5L9ENYeH}LbRTDC4?zexK9 zcma;Xar}I$maQ~)%3&)7DThuRjen4@A&Y3tz0c|WOq zjxztF)RRx?@Dlb*d&Y4xe!J^H*Mo9@UFx_7vFK(b^R)Jed_%8Ha~-WY95t?eC|EZ{c)a~ zz3q2{=h2_!oZR`z6n#&=56f5nJGyg5UWv-N7vvQq?#&sqep5_`x6!vn+*|M#%)kuo z$^x3#HEtgA3*RlnGVRJG^b+vhV0U$1eM2ji<<`K+~9n5PQ!r(8xaGjEy) zwJQhh{mqZool^6z>qqU%LHqvwMf0NUH9uO{%0Yeix4t#6%0YgASNZ+^dHE{3CT^B( zpI6K70^}{On@QQnzPR&{ztXrfkQc`8+=N-@&vEWF34ChWkUTwRxkhjln z`hr>Kg{hl?HcsliS?9&6I|FT;Nysa1cY4H+lZ3oScc+H^IB&u?(dn1{I1_LJoq{&b zmAF~w1&lihiDM5pyua_9LXNu|=yl3ocN4u%`HWq^d)~Y!k0P>T&zozq_q_Rk$r|tG zu-V|u+2L(8XHM@H)L586sWTXj!cz1@ai%wDg2 z6p|f2lJYn{wIA$n!ME%KJ{3IR;Z5{)cpa`xn2i;<2p8dvgxR-fUFib!g*MAfE|&iz9xVGUT%suf_w)#wkHQJMyl*?8mtZ`FPE%LK~+T zHyeDN;#DAVcA{&BV^HUuqWg|M=k&aycIBXb|9MXHqUObkjMw&e z)Oelqzv6~;Aidn!?$@}df0F->$+yu8^Sdth6KnC$nBXTkhMft1!mj?~wDbMiQ`@`0 zJ`wcaZ`%7Z_b;xQ&-j4r{w2r