From f2bfa4409a341f74f080331c23a90f801d00484c Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 26 Sep 2018 19:48:30 -0400 Subject: [PATCH] Match mus_kachi2.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_kachi2.mid | Bin 0 -> 3747 bytes sound/songs/mus_kachi2.s | 1073 ------------------------------- 5 files changed, 5 insertions(+), 1075 deletions(-) create mode 100644 sound/songs/midi/mus_kachi2.mid delete mode 100644 sound/songs/mus_kachi2.s diff --git a/ld_script.txt b/ld_script.txt index 18386a163..9c9a83956 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -836,7 +836,7 @@ SECTIONS { sound/songs/mus_tetsuji.o(.rodata); sound/songs/midi/mus_field13.o(.rodata); sound/songs/mus_kachi22.o(.rodata); - sound/songs/mus_kachi2.o(.rodata); + sound/songs/midi/mus_kachi2.o(.rodata); sound/songs/mus_kachi3.o(.rodata); sound/songs/mus_kachi5.o(.rodata); sound/songs/mus_pcc.o(.rodata); diff --git a/songs.mk b/songs.mk index 8a0154e32..d20f12ae6 100644 --- a/songs.mk +++ b/songs.mk @@ -204,6 +204,9 @@ $(MID_SUBDIR)/mus_inter_v.s: %.s: %.mid $(MID_SUBDIR)/mus_kachi1.s: %.s: %.mid $(MID) $< $@ -G058 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_kachi2.s: %.s: %.mid + $(MID) $< $@ -G025 -R$(STD_REVERB) + $(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 df035af5d..217e2d4b6 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -357,7 +357,7 @@ gSongTable:: @ 86B49F0 song mus_tetsuji, 0, 0 @ Littleroot Town Test 'TETSUJI' song mus_field13, 0, 0 @ Unused - Route 38 song mus_kachi22, 0, 0 @ Wild Pokémon Defeated - song mus_kachi2, 0, 0 @ Wild Pokémon Defeated with Intro + song mus_kachi2, 0, 0 @ Victory! (Wild Pokémon) song mus_kachi3, 0, 0 @ Gym Leader Defeated song mus_kachi5, 0, 0 @ Victory! Elite Four song mus_pcc, 0, 0 @ Crystal - Pokémon Communication Center diff --git a/sound/songs/midi/mus_kachi2.mid b/sound/songs/midi/mus_kachi2.mid new file mode 100644 index 0000000000000000000000000000000000000000..011c526065aa3af9a26f91a838b3506525880b4d GIT binary patch literal 3747 zcmeH}OK)0N5XT1}=NvA*QmU(3auvn06sICpFjPVa2e7XlyS8g$Uof#ziW3q=Ri$o_ z7uhD*#EY!JfIkQEqwA(k`#HMFs=Iyx_kSOU%fUD=xmjhyk2y2*pE+}f$DP8@kBNv= zfPyr7r?CACtZ(SFI6OQw8l=-4<1emgo>@NSfgkq>uUm8)B{zC#S^I67I>Mr_7=@Db zHonX6ndr{Rfyq4$?rHiqG#$T6qkb3Xcai5)?*uOCIHOLlZhxM%-JUPHo>5;yUrV@` zoYflaHQ0GD4;H`z`gU#qp3;_nl}3F7c^k;{>E3t4yRRD0y*kGKT+gU4qOV2VYXw{Z z`Zge&yEDu$|}_p8jJms#{OnA|(>_A-ecCecd_ zjQPC`&X%fDrQ3_EqDz(T^oRb{e!oSB!W!KVKh+P#G7}jluCtvm;q+^KC~5zi;<)BJ z#udl7@Az=356_4^<%i-n6SufXa52S&$?V0*a$#vZczB0mn)ai1&@30Xxme(0S@Yac zqK~-l$Moorl%uIp4EimVCzN?k`18D>IBxik3(S~&+dQ#=&OBp-=NZF1KTVIl^PKeN zsZ_?!?l=SLUtHUP-R*9EAgKM3r=zhTT@BKhX1|8MBs`yHD$aLPM9mDC0cXG&a1NXU z=i~fH{SLZ(=BMoPF22Q%LZ;qKrEN9i9P(xc{tW$ej$h{aacRV-p*NVkISv0b^alH7 zo{YQa&*LBMwMECuJSz4)TFE%CC5c*7;1r1Y)G(hG=2F94T4tOdzjGcnlj!w29fvB^ zdN9sv4@hfmfm>h+EcMvZuX3dI5OEI?r*fpL*B>wKi>(uBmC;8TecT7{_w+4o=~p?@ zdW85#h*vq%)$5O!w$zpPkhb)zd{>=_|Hy;dpE)`a)L;?FmU+MDAJ-_RVji#RJ1 zZx?aqP_<9+Z|V)1<#sN{pXU(gQ$N8!E}W4a(_V#t6@Hc5J@GPM&9jhaQ8m=g<4qm{ zKHWh4ZE^~%!M_H-%I%(bnXl%#4S(C62iw*DBKj3Sh6mva+rv+w&k}d-v`5q9l1+XP zE_imikMg|Yol86G#_IqWPR2h)fqt&17^k5v=1rlT&q)Pf;iger& zH5rZwF6Y|L+pryFPk<6}r+LRJQo