From e1841a111d2f5ac86a0e63f16061a473540cf431 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 25 Sep 2018 16:37:29 -0400 Subject: [PATCH] Match mus_battle30.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_battle30.mid | Bin 0 -> 13275 bytes sound/songs/mus_battle30.s | 2749 ----------------------------- 5 files changed, 5 insertions(+), 2751 deletions(-) create mode 100644 sound/songs/midi/mus_battle30.mid delete mode 100644 sound/songs/mus_battle30.s diff --git a/ld_script.txt b/ld_script.txt index 511b7c7cc..305a0313a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -966,7 +966,7 @@ SECTIONS { sound/songs/mus_battle34.o(.rodata); sound/songs/mus_battle35.o(.rodata); sound/songs/mus_battle38.o(.rodata); - sound/songs/mus_battle30.o(.rodata); + sound/songs/midi/mus_battle30.o(.rodata); sound/songs/mus_rg_annai.o(.rodata); sound/songs/mus_rg_slot.o(.rodata); sound/songs/mus_rg_ajito.o(.rodata); diff --git a/songs.mk b/songs.mk index c00776f33..3d8681dd3 100644 --- a/songs.mk +++ b/songs.mk @@ -45,6 +45,9 @@ $(MID_SUBDIR)/mus_battle20.s: %.s: %.mid $(MID_SUBDIR)/mus_battle27.s: %.s: %.mid $(MID) $< $@ -G117 -R$(STD_REVERB) -P1 +$(MID_SUBDIR)/mus_battle30.s: %.s: %.mid + $(MID) $< $@ -G126 -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 683f00645..8906c9fbd 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -487,7 +487,7 @@ gSongTable:: @ 86B49F0 song mus_battle34, 0, 0 @ Battle! Legendary Pokémon (dupe) song mus_battle35, 0, 0 @ Battle! Rival song mus_battle38, 0, 0 @ Battle! Elite Four - song mus_battle30, 0, 0 @ Battle! Archie/Maxie + song mus_battle30, 0, 0 @ Battle! (Team Aqua/Team Magma Leaders) @ FRLG Music Below song mus_rg_annai, 0, 0 @ Follow Me! song mus_rg_slot, 0, 0 @ Game Corner diff --git a/sound/songs/midi/mus_battle30.mid b/sound/songs/midi/mus_battle30.mid new file mode 100644 index 0000000000000000000000000000000000000000..35c15e4acd5b594b321a9b72c40443e41dbcd3e9 GIT binary patch literal 13275 zcmeHN%W@mn5xoq_83A=uQnAYMNU~r`hDlrH5{D!JQg{=52z<$O%8NLUG8S66Dp)Wn zF1S!71VPDMr3hnaen5Ue3>9Z9M~dOPuhG)e=tUU0{oY;v8aS$)dowzU#%yM+cgggy-TF5qi4Ek7;K3O() zlCYnJeioPjCV-AzJFm0eotJq8k06moQGmTh|GNc%Ku zOv642|4y~ij=auZbmygg@OaX$BZnGus>T&@kS|4d^2jv@gzg|!GImnHEaWUO4OF$< zh5oL+9<|r0r~PcHlD7}^lLvVCL{x>>8k5+*Nw_AkE$XP_kg>%F)K5S^0hvcgz280o zKjl9Qd$i7z@GTxu1Kls7}M_JZJYCEs8Fier1Kig12+ z<@;Gt%Wi8G+_qY7+dLl7%nEMe@qo~p^it_+nQd7?kHXH83qWjmEf2&k_Vf+AWl+CDP_s*#d+3Bl zKiON-(8~&RwcJCeggKy+7l11D0#I!Y^$ojbKG|WtGtUzEaQB*cgYk6Er=)U6eTv_- z^PYF>#$142*5(l(&tATinHTG(o^gWm6cG|I)fj0snp2ddr4L$5AE0kS%M>I<%Yu3X96 zH)(nk57UT|7BzD#TETai+9VJkRJFvGQNft1#UW!%dHMw6eGGbhx9V!2g1z$3z#h{;4UjZ0EGDgonQeQ?lewOQUJVk;#60wB z-{!!hZV?9xFD~u;7(9;Q#noS_C8;k+eNO7x%X&)cGb4KPvYwH8PU;1zFG^*w zBK7rcElvN$pdKF7hqcNVVh{&?{C15-XEbm$HjM^*bj+b? zRkIfCk@3!e7*u!O`Yvl>aRk+`d{?4>*oJ1 zc;2;nr5*3qmfXE{4sry%s*X|MD3EbJfc!xp@yHX@pYiC=e6Ax8wcphDDwD69J@aNf z#_83c{NxGhPrsX}_hwVQHz41D90f*!XD$2dW}FWZ@54Ugkte7>3TZ`M~}tV6Km7OO|MK~MpS|e)<+-2Mf9IVKKTp}W{ych(PoALu{(WFR zy~bx;+LMp6f1NV(W<2V9^(Q}hg8HBG{oQ+oF#HE`;=HMkToO0JA`%ieF70kS-w-F^ zE26#{)2gc?;=>W29I3Cxj4ED5x%%B}T?{J8`Z}1`!Q6@?J~>jq59a$|cI?31>fkr1 zB<;LE1^cI9Z^aRx9I0=BeFN-{9oSnP{095iPQrQld`Q&OX<5bV$a)fpH=LfFgN)aY z^$ZYiEm>L%>*hStN$v{A*IT2JQsH1v4m+NO^|k2kCJ zIC$_zw;ls3c@o%(hkU`~7;YRVF870&K|am(Q=fxg?GI&Q9(ufbIp6Cs#jDjDX`#GwqkJ~`$ff)1Pj_svAB=@qGCya z1+VQDi~HCwDwa4{&|-?kee4$%%LG{PQ-fl0ANxhcatADT92WPHs$NmCm|(%>Q@Oa0 zePXr5f!S?3d4qRIh^K9XSNtgQyBjZlDV|~`SW7W&Z%IUaIO3Bd*1edqho6pI{qD6c z29=~$1alG0tvKS7Bi1sQ@ymj%2Xm`~-=LDT^Iie_3fNn5#3x6rRj}iC4p$HMRtLYq z{*ng(J~w0Rg&Hu7(5jJ`b_*?{Q=rx+LVvd zLi*5fWg^!p6UAZN)E?pB50gOL37;SBPWR8i4~=k0bn>Ae@pS)S@l`yDxYENc{Q*YcC5cyui1QQ)QOAc@tjqh9P&UTALhW{jBlzQ=Ht}Y*f0M+ zQ7#~VT!6!Q(|j~9j@Xbqc;Z<%0C^jY_l6s=aXEhwFaIpQ!w;PVeU$5xww{+tWgU4?@zo0y< zJMHF0`J(%Rak(#)-_|@>xAZRf@R9iUg!qTL;6-sXy;=GiU)+GEi%K?*W;Ttlap5~) z)YUs^!VdqBfSq42ZN0gv*%$}n^Qwd0dHJ8l+et5v+VhmCQ|*I7)5Tup=o#~Mi~qXu zUe~`{e*X2UUvbg0^c|=;n!-U(3F;{m&E~^> Z>urCSH}|>M3w6=`(JkJYUl@$%{{Z#gk