From a5349dd82286543971b710090acf8b521f633754 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Thu, 17 Oct 2019 16:21:47 -0400 Subject: [PATCH] Finish music dump --- ld_script.txt | 8 +- songs.mk | 3 + sound/songs/midi/mus_battle20.mid | Bin 15959 -> 15995 bytes sound/songs/midi/mus_battle32.mid | Bin 13549 -> 13585 bytes sound/songs/midi/mus_fanfa1.mid | Bin 0 -> 485 bytes sound/songs/midi/mus_fanfa4.mid | Bin 0 -> 783 bytes sound/songs/midi/mus_fanfa5.mid | Bin 0 -> 1109 bytes sound/songs/midi/mus_me_b_big.mid | Bin 1330 -> 1362 bytes sound/songs/midi/mus_me_b_small.mid | Bin 783 -> 815 bytes sound/songs/midi/mus_me_bachi.mid | Bin 1690 -> 1722 bytes sound/songs/midi/mus_me_kinomi.mid | Bin 484 -> 508 bytes sound/songs/midi/mus_me_shinka.mid | Bin 234 -> 254 bytes sound/songs/midi/mus_me_waza.mid | Bin 973 -> 1005 bytes sound/songs/midi/mus_p_school.mid | Bin 3106 -> 3126 bytes sound/songs/midi/mus_shinka.mid | Bin 6474 -> 6506 bytes sound/songs/midi/mus_w_door.mid | Bin 0 -> 168 bytes sound/songs/mus_fanfa1.s | 180 -------------- sound/songs/mus_fanfa4.s | 283 ---------------------- sound/songs/mus_fanfa5.s | 350 ---------------------------- sound/songs/mus_w_door.s | 77 ------ 20 files changed, 7 insertions(+), 894 deletions(-) create mode 100644 sound/songs/midi/mus_fanfa1.mid create mode 100644 sound/songs/midi/mus_fanfa4.mid create mode 100644 sound/songs/midi/mus_fanfa5.mid create mode 100644 sound/songs/midi/mus_w_door.mid delete mode 100644 sound/songs/mus_fanfa1.s delete mode 100644 sound/songs/mus_fanfa4.s delete mode 100644 sound/songs/mus_fanfa5.s delete mode 100644 sound/songs/mus_w_door.s diff --git a/ld_script.txt b/ld_script.txt index 6ae4b85a6..551a63cef 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -768,7 +768,7 @@ SECTIONS { sound/songs/se_w287b.o(.rodata); sound/songs/se_w114.o(.rodata); sound/songs/se_w063b.o(.rodata); - sound/songs/mus_w_door.o(.rodata); + sound/songs/midi/mus_w_door.o(.rodata); sound/songs/se_card1.o(.rodata); sound/songs/se_card2.o(.rodata); sound/songs/se_card3.o(.rodata); @@ -784,9 +784,9 @@ SECTIONS { sound/songs/se_excellent.o(.rodata); sound/songs/se_nawamiss.o(.rodata); sound/songs/midi/mus_me_asa.o(.rodata); - sound/songs/mus_fanfa1.o(.rodata); - sound/songs/mus_fanfa4.o(.rodata); - sound/songs/mus_fanfa5.o(.rodata); + sound/songs/midi/mus_fanfa1.o(.rodata); + sound/songs/midi/mus_fanfa4.o(.rodata); + sound/songs/midi/mus_fanfa5.o(.rodata); sound/songs/midi/mus_me_bachi.o(.rodata); sound/songs/midi/mus_me_waza.o(.rodata); sound/songs/midi/mus_me_kinomi.o(.rodata); diff --git a/songs.mk b/songs.mk index 53b697cc9..6458c2c9e 100644 --- a/songs.mk +++ b/songs.mk @@ -270,6 +270,9 @@ $(MID_SUBDIR)/mus_vs_tore.s: %.s: %.mid $(MID_SUBDIR)/mus_vs_yasei.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G157 -V090 +$(MID_SUBDIR)/mus_w_door.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5 + $(MID_SUBDIR)/mus_win_gym.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G171 -V090 diff --git a/sound/songs/midi/mus_battle20.mid b/sound/songs/midi/mus_battle20.mid index a7140d9844b4502974739f93c6f0bf92ee55c5b6..531b5fba125566679d3c93a263115c2669539a4f 100644 GIT binary patch delta 158 zcmca!^Sfq(D5LU3F?k+_|N0ERAw}5?4D4Sw+J0n565uf3Y{p^Cfg~biwYgBhObAJY y&0zC-B^@>-5l-37k2NGYkwh52OlC3qfF!_TviXmZ0Sl4{yZUAmb7giGkZS-f!z;r8 delta 121 zcmexebG>GQD5LyDF?kN(kfLk`2KJ8|9Y3-|IUL5D?Kq4%pgbY7&9wq%LQo!?&gT6} pI&4rLr{w1E8j_q)9>a&pGDaVu92SGk62=BBP#(MT<`8pbb^tYD5LyDF?kN(kfLk`23G!!j{K}p4$HUAF|6NMpgjJ#&2e0D{7@cO{pJ&r p^;|HOEt`W?T3{-fVmCk5h-HGxF@N9eqy3#3%46NP*3_WGA3qWyXc}IcIA4^35v)-KvIaz2<{s}a3fy8{vE*D9;DNm1E}>@ zF2<;X&a{gz^1XRJ!t+7~>74^`0OC(~kUrjfI!1ZJf}krzV*{2+Tf5iy=a?r> zX5KhX>c&3aBdnW7$hLTiV>XGwcGARh?JW~iw+yjKkvA=3p%t5IV4*uz?qREBPD09W uDUT^XrMwkPElAGM`u~C>R{A>vkS%$L()i|SQ7^a2V+P~j4=+zMHCoKRP=j* z!0z7<;3vZKOeOWP^z@wDbAPwnaq|d(Mg|@V+wu7cT^W=8Y*rP-rz$EYJ9F9ZyR{@f zq-K8OGB7D4sh#?-CG@>(i&p7R#GWLJU2f7G`U29~;khqx&Nwr*lzKq|fFyPDCxrrhjt?rPi&Y(Gs+b~)4o z|9u@Vq&}`*2Dhsas-~(LUA~mtWzPR}g?{Dt`@&0_!?MG;@;@3Fl2H^a3X1dgnGevb zg)-!o?HVxTU-qh@Zdak0Yi4Tdw?b)eaqen03~WD5XW#Ccx!`jbBlm(cJXJ#(aYKi# z5ifYEgt}9KVy>B~soxBxv&p%ul`ydV^abqOUCsrk{#Oa({62WZb7W-9RyP91q(0Y- c?(%<`Yi4Td>qfeD&Rva6VEbumvg?of157fnmH+?% literal 0 HcmV?d00001 diff --git a/sound/songs/midi/mus_fanfa5.mid b/sound/songs/midi/mus_fanfa5.mid new file mode 100644 index 0000000000000000000000000000000000000000..519ebf29a60884929d65246374dba53222717cc9 GIT binary patch literal 1109 zcma)(zi-+=7=~Zd6SmL|9y*|^LxxE45D}wFh(tv0;K3?NX2&*xTJc`x#TnTG1F=U9GeVqUS8=eW}~=eM4N z4oY(s`P;}(qjp!$werJ38(=qYi3by^_o6EX7Z3#o%qcR?nDwdcD8{`oFNi&tUoY{I z%U&P&a(Dn);J$AR_o2oOj^p}}JS1y=byy?oWSz8qYiMI{_uMP_Ex@8;s&h|#%XrJ% znY2lsYT}U|u=vZ^-QJ1IIefirZeBag9p@SX`j$OrhVdBV#z$_3H~r|s_LaUhe3GHLr zC$x`gpU^(0eV%81jwP40S96yI`zP|p5kBets@`u-?Y?nk134S48!)GJk}FSZJ>!b6 znbYn|_P2Il^Mm{etoU3vRu9K-#5)W3(^CD58!NoSo~q?G-_+t5T;cy((>}GMS}L3O K8#lR|iv9vt-U^BU literal 0 HcmV?d00001 diff --git a/sound/songs/midi/mus_me_b_big.mid b/sound/songs/midi/mus_me_b_big.mid index 2028f0016287b93f63ea382c1a0c954f199198a2..150a669b46e35bba967b52c69148589b8a7ad26e 100644 GIT binary patch delta 135 zcmdnQb%|?&D5LsBF=ZZx|N0ERAw}5?3=BsmIvzmgZ=TG_xE@*H(BuP*`;Z0tC$}+m fBMbCSmSpZk7RaBxia8refKhU@EQ=^33&>gkco8M5 delta 102 zcmcb_wTWwjD5LU3F=Yn95`u7`2%sD?bl{|FWqCJ7E6D9!LckeMxd7Q=si1`zfQDavMGU^LulsmsWN5Ma1J yIgjx+vcUAoflQN;1vX87!?X@bfH8UVBIbA$L#!rqvYH_)3E%9_8qCN7vIhX5Q7Ym9 delta 137 zcmdnRJBxRMsERbh{|FWqCJ7E6D9!LckeMxd7Q=si2H%jPYz78K-Ho=oj2sXS!|lms zjJIK&$&+K5Cc`-ECjVht2jwuvZ{Efn57%TiS&`L@A8K4M&oKsuZS3`vKd{c9%*nPE E0Nj`*z5oCK diff --git a/sound/songs/midi/mus_me_kinomi.mid b/sound/songs/midi/mus_me_kinomi.mid index 30fbd360749d9498d8ecbf3bb110dbd1bb5e4195..e7eb4afd11f064b8551a3e5ba44f4c3e7b369e61 100644 GIT binary patch delta 121 zcmaFD{D*mhsD?bl{|FWqCJ7E6D9!LckeRJZn&H1b0|@(u6lF6oFjP&nEaO4q8%^A< ahs?K{_|^=CKUtd*MWB9iCSx@V$OHhw(jY+q delta 96 zcmeyv{DgUesERbh{|FWqCJ7E6D9!LckeRIuD6G%m8&Z_bz`#&8(YA~O%GR5>Uk}DM UoA}cV&Yo<|2XadsDe1d{|FWqCJ7FP|AEZx3l$jt>ob6`Z%9!#0|SH9L_;wiB);85e=B6Z i{ltmZYDn@@42KyQHnZ0=aD_8WwoWlofR<6lF6oFo-c6&}Z1dUeCZ~!7#z7 sUZTN>K>{IbH8I?Z1FF(`;#_MvxURzt44Xl^!Wkx8rx-L_Gl0wl0AS=CQ~&?~ diff --git a/sound/songs/midi/mus_me_waza.mid b/sound/songs/midi/mus_me_waza.mid index ac132f5ffda3a65b4b0a2e0847748817251b0c88..40f9c2ed8d5834def87904a00504d01f682c0792 100644 GIT binary patch delta 133 zcmX@h{+4}$D5L&FF>M}(|N0ERAw}5?3=DA-J)=MatkfLk`28O7KzEKGFW;ok;vLvH1Ok%<02*w34&XUP2OiN%K RyUAOa>|mVNlm9Wj1^`SN8}0xA diff --git a/sound/songs/midi/mus_p_school.mid b/sound/songs/midi/mus_p_school.mid index 55651dea57ca3f3532cae884bbb9cfc56c55c35d..4e6fd334076e72e06b508592a8663335c3ddcb58 100644 GIT binary patch delta 85 zcmZ1^u}xxvD5KIuF*zQF|N0ERAw}5?3=H8DZGw^bEL%5D-^hY2(6BjxwFX&)DQNQ* KPCq6VkRbs71s9b7 delta 64 zcmdlcu}ETqD5Km&F*y$3kfLk`28Q5?4#7}1%f^lKH?qJuHJf8tYhXMkzs*lL{g?nf C;1RC? diff --git a/sound/songs/midi/mus_shinka.mid b/sound/songs/midi/mus_shinka.mid index de8b2ab9127d2278de12cff174d602f4abd07628..375e6d5dbf729f4df6099e7e87f7a70bc49f0a3c 100644 GIT binary patch delta 141 zcmX?Q^vY<0D5LU3F?k+_|N0ERAw}5?3{3tTZM~V01%ftDVDdv2VddZajD?#ONe#2r m=AWEq%t#_ka+}S0rI2+oDQ%AAmqQj|Kfk$N@H9IM$Z`N%za+o_ delta 108 zcmaE5bjoOgD5LyDF?kN(kfLk`1}5)~j^0c#j^E}POnxvPEBEG4EZnS6IcBrXoLpwi dFqKl9y?LczDw*Uq7xK%&c