From f8016d30c5394ed40d243b69924b7775eeaec362 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 25 Sep 2018 16:43:02 -0400 Subject: [PATCH] Match mus_battle32.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_battle32.mid | Bin 0 -> 13549 bytes sound/songs/mus_battle32.s | 2623 ----------------------------- 5 files changed, 5 insertions(+), 2625 deletions(-) create mode 100644 sound/songs/midi/mus_battle32.mid delete mode 100644 sound/songs/mus_battle32.s diff --git a/ld_script.txt b/ld_script.txt index 1d18fcae14..9e2c681a0b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -960,7 +960,7 @@ SECTIONS { sound/songs/midi/mus_battle27.o(.rodata); sound/songs/midi/mus_battle31.o(.rodata); sound/songs/midi/mus_battle20.o(.rodata); - sound/songs/mus_battle32.o(.rodata); + sound/songs/midi/mus_battle32.o(.rodata); sound/songs/mus_battle33.o(.rodata); sound/songs/mus_battle36.o(.rodata); sound/songs/mus_battle34.o(.rodata); diff --git a/songs.mk b/songs.mk index d9bf54c0ae..b19324285d 100644 --- a/songs.mk +++ b/songs.mk @@ -51,6 +51,9 @@ $(MID_SUBDIR)/mus_battle30.s: %.s: %.mid $(MID_SUBDIR)/mus_battle31.s: %.s: %.mid $(MID) $< $@ -G118 -R$(STD_REVERB) -P1 +$(MID_SUBDIR)/mus_battle32.s: %.s: %.mid + $(MID) $< $@ -G120 -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 9eb3101810..c369165881 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -481,7 +481,7 @@ gSongTable:: @ 86B49F0 song mus_battle27, 0, 0 @ Battle! (Wild Pokémon) song mus_battle31, 0, 0 @ Battle! (Team Aqua / Team Magma) song mus_battle20, 0, 0 @ Battle! (Trainer Battle) - song mus_battle32, 0, 0 @ Battle! Gym Leader + song mus_battle32, 0, 0 @ Battle! (Gym Leader) song mus_battle33, 0, 0 @ Battle! Champion song mus_battle36, 0, 0 @ Battle! Regi Trio song mus_battle34, 0, 0 @ Battle! Legendary Pokémon (dupe) diff --git a/sound/songs/midi/mus_battle32.mid b/sound/songs/midi/mus_battle32.mid new file mode 100644 index 0000000000000000000000000000000000000000..21e802b8eb17d4ae870aa23909bd6dab882052c8 GIT binary patch literal 13549 zcmeI2-)~dN6~`yUIK;XVyOCD1v|1Wi174u4vm_*Bo#YxP;U?JF3Epfd-fkZJ5UEy$ z+CQL}5Vnso*Y5raedtSQX!}+{!?sfYj{XhpBmJDYGq!VSaI!$4A}{&g@0l~_oH=vm zNA7jLv|3S0MOBaLSMhx5SHFP$L_J@QM2^Idspkv5kw5(NJNJ3C=l1Uvf4@=BKUaa; z(c|h#N^SNP)kgy=c3Ewd%F(+er8aJYH^D`45nKQlz#>=#3t$1f0p0-fV15tnIrMVq zT?em&^WZ!<2hM@r+CB6<^sa%|z*%q>oB?ORZtY=x%ZGjP>d+^VRrfPgF;>*(0MeoD66_ODH-kpw5cnGoa2&H9>#vUhCV? zz10)Qd;4Hs&^`tq>(CoRPq^)$ zrky}r+hXM3>S>R9WVXe5Rli+~)^00RFN0<9cG1!N|3vJu^O+j|Lj?R4t@5ar#}tcl&Vgxgqg3vuRzucZk>7oEWnFk z5uB^)ZuPK!0Xc`u3-Yg#e~p`z8BHaHSyi6}spC3Gq&`(H8On)mkX+lpA5!7i~{TTg|E&q$vARdOK z`!5(ynl!hwi#$l3ne9BN?N)dCXB!PtSUrKC|FI2{*d8qR>bkhf+?0D+y8S^3m8BG& z`eND4A1L#+ST;Eag)f0R=b+AcImmel&V8tUyIf|$N7xnWoD3`)RUZf0i{Nq1C*hnV zE%_vJ;pu8EiNgBW)3mKyPY;NbRHLoWxyp*HqWX1^yHP#QZYLSB<6@Tz99PZ-jw{i? zF*PZU*v)F}es!zIHmg_hIPDVX1nWaqwToX)-Ikt<9=x^t9sjxd+e!6Dc0cxvhpB4( z9((D-1egFXf)~Nl;A!vzctOh@Ex%B8G(QiXNB$Z38F&^v3!Vn0Ujh_+=fHDdSTD?N ze=Gm7{SW=WTlu$jV(0Ts^E1@jnU4Bjl3&7;;f&%SLow)Yoz7Tdh2mPpK_wr!rR%tqp&&09XvHji4{ zJX@L7o;rLchUt$e?sbU%FY&x~ZJ4b&8e;njZmOldWzQ4sM;k*IcihZd349{YI1{AlJ zw{+Zgzg_LHR&2kQ*-7K0Gd{~r{9Cc(3=18ZSPztmw7jK5Jhq=5r{yi3U$^`1V#gLj zDe1_hn0isZ<+qX!6Rsyw&(<<}GOjZ%TIZp90#C27W|7K|A6>I-imDH{w45|Zm%U@ui}VT zb7j46FSVDx&GdVQ+w6|^ATy_8i`(OilgBS`PRYJ+k1^Y)rQ`0w4#nEV&URmL{8;lZ z3n@oPd{cVmkh<6*L%Q^*amVi;?2+tSK8KvIEOI{kMV>iCeIt8Ohb-BC_K3H(y=j?Bu7eFXE%wy2o2^GH3gK_1i{bv!X4i_FS+BgW0bntL{n7>qCMlpnoAzZX^ z5FY8^;r1|psr~_sqO}(t`9}TlGxevwV!Sz8jIMLzZ;pXu;1%!+I1ch3K=VuROE3+x zgqsr}OSL%(@}EF61#($w4uM=wnqPolfR{inDa~PU7#sn)Su`($m%&%{JB1y7($sW8 z7GN_2vb!~}f>*&Tm{n`)hXrDHQ#$q(D6x)$GUg#rVh*=YAeS*-0xzits+s43-v=~v zASWw4Zg^bt1^5E;C6If2v*dc~>`zTAFSsk~1+`vodakq1#@H-?1?Bu`!#NyDASJhq zqkD;F0*`#;2OW*4Kt6glPve;%0W{Bo{3w9-T5^wyD_U<9!;-5}3<{2bGLK^zlzJHl zrA{*LeU}M%(EfEp?|;