Merge pull request #340 from Kermalis/master

Music A-K

1 files changed, 77 insertions, 77 deletions

diff --git a/ld_script.txt b/ld_script.txt
index aa0e1e485..1e60cf1c7 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -563,7 +563,7 @@ SECTIONS {
     song_data :
     ALIGN(4)
     {
-        sound/songs/mus_dummy.o(.rodata);
+        sound/songs/midi/mus_dummy.o(.rodata);
         sound/songs/se_kaifuku.o(.rodata);
         sound/songs/se_pc_login.o(.rodata);
         sound/songs/se_pc_off.o(.rodata);
@@ -675,7 +675,7 @@ SECTIONS {
         sound/songs/se_z_page.o(.rodata);
         sound/songs/se_pn_on.o(.rodata);
         sound/songs/se_pn_off.o(.rodata);
-        sound/songs/se_z_search.o(.rodata);
+        sound/songs/midi/se_z_search.o(.rodata);
         sound/songs/se_tamago.o(.rodata);
         sound/songs/se_tb_start.o(.rodata);
         sound/songs/se_tb_kon.o(.rodata);
@@ -834,139 +834,139 @@ SECTIONS {
         sound/songs/se_curtain1.o(.rodata);
         sound/songs/se_ussoki.o(.rodata);
         sound/songs/mus_tetsuji.o(.rodata);
-        sound/songs/mus_field13.o(.rodata);
-        sound/songs/mus_kachi22.o(.rodata);
-        sound/songs/mus_kachi2.o(.rodata);
-        sound/songs/mus_kachi3.o(.rodata);
-        sound/songs/mus_kachi5.o(.rodata);
+        sound/songs/midi/mus_field13.o(.rodata);
+        sound/songs/midi/mus_kachi22.o(.rodata);
+        sound/songs/midi/mus_kachi2.o(.rodata);
+        sound/songs/midi/mus_kachi3.o(.rodata);
+        sound/songs/midi/mus_kachi5.o(.rodata);
         sound/songs/mus_pcc.o(.rodata);
         sound/songs/mus_nibi.o(.rodata);
         sound/songs/mus_suikun.o(.rodata);
-        sound/songs/mus_dooro1.o(.rodata);
-        sound/songs/mus_dooro_x1.o(.rodata);
-        sound/songs/mus_dooro_x3.o(.rodata);
+        sound/songs/midi/mus_dooro1.o(.rodata);
+        sound/songs/midi/mus_dooro_x1.o(.rodata);
+        sound/songs/midi/mus_dooro_x3.o(.rodata);
         sound/songs/mus_machi_s2.o(.rodata);
         sound/songs/mus_machi_s4.o(.rodata);
-        sound/songs/mus_gim.o(.rodata);
-        sound/songs/mus_naminori.o(.rodata);
-        sound/songs/mus_dan01.o(.rodata);
-        sound/songs/mus_fanfa1.o(.rodata);
+        sound/songs/midi/mus_gim.o(.rodata);
+        sound/songs/midi/mus_naminori.o(.rodata);
+        sound/songs/midi/mus_dan01.o(.rodata);
+        sound/songs/midi/mus_fanfa1.o(.rodata);
         sound/songs/mus_me_asa.o(.rodata);
         sound/songs/mus_me_bachi.o(.rodata);
-        sound/songs/mus_fanfa4.o(.rodata);
-        sound/songs/mus_fanfa5.o(.rodata);
+        sound/songs/midi/mus_fanfa4.o(.rodata);
+        sound/songs/midi/mus_fanfa5.o(.rodata);
         sound/songs/mus_me_waza.o(.rodata);
-        sound/songs/mus_bijyutu.o(.rodata);
-        sound/songs/mus_dooro_x4.o(.rodata);
-        sound/songs/mus_fune_kan.o(.rodata);
+        sound/songs/midi/mus_bijyutu.o(.rodata);
+        sound/songs/midi/mus_dooro_x4.o(.rodata);
+        sound/songs/midi/mus_fune_kan.o(.rodata);
         sound/songs/mus_me_shinka.o(.rodata);
         sound/songs/mus_shinka.o(.rodata);
         sound/songs/mus_me_wasure.o(.rodata);
         sound/songs/mus_syoujoeye.o(.rodata);
-        sound/songs/mus_boyeye.o(.rodata);
-        sound/songs/mus_dan02.o(.rodata);
+        sound/songs/midi/mus_boyeye.o(.rodata);
+        sound/songs/midi/mus_dan02.o(.rodata);
         sound/songs/mus_machi_s3.o(.rodata);
         sound/songs/mus_odamaki.o(.rodata);
-        sound/songs/mus_b_tower.o(.rodata);
+        sound/songs/midi/mus_b_tower.o(.rodata);
         sound/songs/mus_swimeye.o(.rodata);
-        sound/songs/mus_dan03.o(.rodata);
+        sound/songs/midi/mus_dan03.o(.rodata);
         sound/songs/mus_me_kinomi.o(.rodata);
         sound/songs/mus_me_tama.o(.rodata);
         sound/songs/mus_me_b_big.o(.rodata);
         sound/songs/mus_me_b_small.o(.rodata);
         sound/songs/mus_me_zannen.o(.rodata);
-        sound/songs/mus_bd_time.o(.rodata);
+        sound/songs/midi/mus_bd_time.o(.rodata);
         sound/songs/mus_test1.o(.rodata);
         sound/songs/mus_test2.o(.rodata);
         sound/songs/mus_test3.o(.rodata);
         sound/songs/mus_test4.o(.rodata);
         sound/songs/mus_test.o(.rodata);
-        sound/songs/mus_gomachi0.o(.rodata);
-        sound/songs/mus_gotown.o(.rodata);
+        sound/songs/midi/mus_gomachi0.o(.rodata);
+        sound/songs/midi/mus_gotown.o(.rodata);
         sound/songs/mus_pokecen.o(.rodata);
         sound/songs/mus_nextroad.o(.rodata);
-        sound/songs/mus_granroad.o(.rodata);
-        sound/songs/mus_cycling.o(.rodata);
-        sound/songs/mus_friendly.o(.rodata);
+        sound/songs/midi/mus_granroad.o(.rodata);
+        sound/songs/midi/mus_cycling.o(.rodata);
+        sound/songs/midi/mus_friendly.o(.rodata);
         sound/songs/mus_mishiro.o(.rodata);
         sound/songs/mus_tozan.o(.rodata);
-        sound/songs/mus_girleye.o(.rodata);
+        sound/songs/midi/mus_girleye.o(.rodata);
         sound/songs/mus_minamo.o(.rodata);
-        sound/songs/mus_ashroad.o(.rodata);
-        sound/songs/mus_event0.o(.rodata);
-        sound/songs/mus_deepdeep.o(.rodata);
-        sound/songs/mus_kachi1.o(.rodata);
+        sound/songs/midi/mus_ashroad.o(.rodata);
+        sound/songs/midi/mus_event0.o(.rodata);
+        sound/songs/midi/mus_deepdeep.o(.rodata);
+        sound/songs/midi/mus_kachi1.o(.rodata);
         sound/songs/mus_title3.o(.rodata);
-        sound/songs/mus_demo1.o(.rodata);
-        sound/songs/mus_girl_sup.o(.rodata);
-        sound/songs/mus_hageshii.o(.rodata);
-        sound/songs/mus_kakkoii.o(.rodata);
-        sound/songs/mus_kazanbai.o(.rodata);
-        sound/songs/mus_aqa_0.o(.rodata);
+        sound/songs/midi/mus_demo1.o(.rodata);
+        sound/songs/midi/mus_girl_sup.o(.rodata);
+        sound/songs/midi/mus_hageshii.o(.rodata);
+        sound/songs/midi/mus_kakkoii.o(.rodata);
+        sound/songs/midi/mus_kazanbai.o(.rodata);
+        sound/songs/midi/mus_aqa_0.o(.rodata);
         sound/songs/mus_tsuretek.o(.rodata);
-        sound/songs/mus_boy_sup.o(.rodata);
+        sound/songs/midi/mus_boy_sup.o(.rodata);
         sound/songs/mus_rainbow.o(.rodata);
-        sound/songs/mus_ayasii.o(.rodata);
-        sound/songs/mus_kachi4.o(.rodata);
-        sound/songs/mus_ropeway.o(.rodata);
-        sound/songs/mus_casino.o(.rodata);
-        sound/songs/mus_hightown.o(.rodata);
+        sound/songs/midi/mus_ayasii.o(.rodata);
+        sound/songs/midi/mus_kachi4.o(.rodata);
+        sound/songs/midi/mus_ropeway.o(.rodata);
+        sound/songs/midi/mus_casino.o(.rodata);
+        sound/songs/midi/mus_hightown.o(.rodata);
         sound/songs/mus_safari.o(.rodata);
-        sound/songs/mus_c_road.o(.rodata);
+        sound/songs/midi/mus_c_road.o(.rodata);
         sound/songs/midi/mus_ajito.o(.rodata);
         sound/songs/mus_m_boat.o(.rodata);
         sound/songs/mus_m_dungon.o(.rodata);
-        sound/songs/mus_finecity.o(.rodata);
+        sound/songs/midi/mus_finecity.o(.rodata);
         sound/songs/mus_machupi.o(.rodata);
         sound/songs/mus_p_school.o(.rodata);
-        sound/songs/mus_dendou.o(.rodata);
+        sound/songs/midi/mus_dendou.o(.rodata);
         sound/songs/mus_tonekusa.o(.rodata);
         sound/songs/mus_maborosi.o(.rodata);
-        sound/songs/mus_con_fan.o(.rodata);
-        sound/songs/mus_contest0.o(.rodata);
+        sound/songs/midi/mus_con_fan.o(.rodata);
+        sound/songs/midi/mus_contest0.o(.rodata);
         sound/songs/mus_mgm0.o(.rodata);
         sound/songs/mus_t_battle.o(.rodata);
         sound/songs/mus_ooame.o(.rodata);
-        sound/songs/mus_hideri.o(.rodata);
+        sound/songs/midi/mus_hideri.o(.rodata);
         sound/songs/mus_runecity.o(.rodata);
-        sound/songs/mus_con_k.o(.rodata);
-        sound/songs/mus_eikou_r.o(.rodata);
-        sound/songs/mus_karakuri.o(.rodata);
-        sound/songs/mus_hutago.o(.rodata);
+        sound/songs/midi/mus_con_k.o(.rodata);
+        sound/songs/midi/mus_eikou_r.o(.rodata);
+        sound/songs/midi/mus_karakuri.o(.rodata);
+        sound/songs/midi/mus_hutago.o(.rodata);
         sound/songs/mus_sitennou.o(.rodata);
         sound/songs/mus_yama_eye.o(.rodata);
-        sound/songs/mus_conlobby.o(.rodata);
-        sound/songs/mus_inter_v.o(.rodata);
-        sound/songs/mus_daigo.o(.rodata);
+        sound/songs/midi/mus_conlobby.o(.rodata);
+        sound/songs/midi/mus_inter_v.o(.rodata);
+        sound/songs/midi/mus_daigo.o(.rodata);
         sound/songs/mus_thankfor.o(.rodata);
-        sound/songs/mus_end.o(.rodata);
-        sound/songs/mus_b_frontier.o(.rodata);
-        sound/songs/mus_b_arena.o(.rodata);
+        sound/songs/midi/mus_end.o(.rodata);
+        sound/songs/midi/mus_b_frontier.o(.rodata);
+        sound/songs/midi/mus_b_arena.o(.rodata);
         sound/songs/mus_me_pointget.o(.rodata);
         sound/songs/mus_me_tore_eye.o(.rodata);
         sound/songs/mus_pyramid.o(.rodata);
         sound/songs/mus_pyramid_top.o(.rodata);
-        sound/songs/mus_b_palace.o(.rodata);
+        sound/songs/midi/mus_b_palace.o(.rodata);
         sound/songs/mus_rekkuu_kourin.o(.rodata);
         sound/songs/mus_sattower.o(.rodata);
         sound/songs/mus_me_symbolget.o(.rodata);
-        sound/songs/mus_b_dome.o(.rodata);
-        sound/songs/mus_b_tube.o(.rodata);
-        sound/songs/mus_b_factory.o(.rodata);
+        sound/songs/midi/mus_b_dome.o(.rodata);
+        sound/songs/midi/mus_b_tube.o(.rodata);
+        sound/songs/midi/mus_b_factory.o(.rodata);
         sound/songs/mus_vs_rekku.o(.rodata);
         sound/songs/mus_vs_front.o(.rodata);
         sound/songs/mus_vs_mew.o(.rodata);
-        sound/songs/mus_b_dome1.o(.rodata);
-        sound/songs/mus_battle27.o(.rodata);
-        sound/songs/mus_battle31.o(.rodata);
-        sound/songs/mus_battle20.o(.rodata);
-        sound/songs/mus_battle32.o(.rodata);
-        sound/songs/mus_battle33.o(.rodata);
-        sound/songs/mus_battle36.o(.rodata);
-        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_b_dome1.o(.rodata);
+        sound/songs/midi/mus_battle27.o(.rodata);
+        sound/songs/midi/mus_battle31.o(.rodata);
+        sound/songs/midi/mus_battle20.o(.rodata);
+        sound/songs/midi/mus_battle32.o(.rodata);
+        sound/songs/midi/mus_battle33.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/midi/mus_battle38.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);