Merge pull request #392 from Kermalis/master

Sound Effects Part 3/6

1 files changed, 50 insertions, 50 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 486562547..635f09662 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -617,10 +617,10 @@ SECTIONS {
     {
         sound/songs/midi/mus_dummy.o(.rodata);
         sound/songs/midi/se_kaifuku.o(.rodata);
-        sound/songs/se_pc_login.o(.rodata);
-        sound/songs/se_pc_off.o(.rodata);
-        sound/songs/se_pc_on.o(.rodata);
-        sound/songs/se_select.o(.rodata);
+        sound/songs/midi/se_pc_login.o(.rodata);
+        sound/songs/midi/se_pc_off.o(.rodata);
+        sound/songs/midi/se_pc_on.o(.rodata);
+        sound/songs/midi/se_select.o(.rodata);
         sound/songs/se_win_open.o(.rodata);
         sound/songs/se_wall_hit.o(.rodata);
         sound/songs/midi/se_door.o(.rodata);
@@ -631,12 +631,12 @@ SECTIONS {
         sound/songs/midi/se_kouka_m.o(.rodata);
         sound/songs/midi/se_kouka_h.o(.rodata);
         sound/songs/midi/se_bowa2.o(.rodata);
-        sound/songs/se_poke_dead.o(.rodata);
-        sound/songs/se_nigeru.o(.rodata);
+        sound/songs/midi/se_poke_dead.o(.rodata);
+        sound/songs/midi/se_nigeru.o(.rodata);
         sound/songs/midi/se_jido_doa.o(.rodata);
-        sound/songs/se_naminori.o(.rodata);
+        sound/songs/midi/se_naminori.o(.rodata);
         sound/songs/midi/se_ban.o(.rodata);
-        sound/songs/se_pin.o(.rodata);
+        sound/songs/midi/se_pin.o(.rodata);
         sound/songs/midi/se_boo.o(.rodata);
         sound/songs/midi/se_bowa.o(.rodata);
         sound/songs/midi/se_jyuni.o(.rodata);
@@ -644,21 +644,21 @@ SECTIONS {
         sound/songs/midi/se_i.o(.rodata);
         sound/songs/se_u.o(.rodata);
         sound/songs/midi/se_e.o(.rodata);
-        sound/songs/se_o.o(.rodata);
-        sound/songs/se_n.o(.rodata);
-        sound/songs/se_seikai.o(.rodata);
+        sound/songs/midi/se_o.o(.rodata);
+        sound/songs/midi/se_n.o(.rodata);
+        sound/songs/midi/se_seikai.o(.rodata);
         sound/songs/midi/se_hazure.o(.rodata);
         sound/songs/midi/se_exp.o(.rodata);
         sound/songs/midi/se_jite_pyoko.o(.rodata);
-        sound/songs/se_mu_pachi.o(.rodata);
+        sound/songs/midi/se_mu_pachi.o(.rodata);
         sound/songs/se_tk_kasya.o(.rodata);
         sound/songs/midi/se_fu_zaku.o(.rodata);
         sound/songs/midi/se_fu_zaku2.o(.rodata);
         sound/songs/midi/se_fu_zuzuzu.o(.rodata);
-        sound/songs/se_ru_gashin.o(.rodata);
-        sound/songs/se_ru_gasyan.o(.rodata);
-        sound/songs/se_ru_bari.o(.rodata);
-        sound/songs/se_ru_hyuu.o(.rodata);
+        sound/songs/midi/se_ru_gashin.o(.rodata);
+        sound/songs/midi/se_ru_gasyan.o(.rodata);
+        sound/songs/midi/se_ru_bari.o(.rodata);
+        sound/songs/midi/se_ru_hyuu.o(.rodata);
         sound/songs/midi/se_ki_gasyan.o(.rodata);
         sound/songs/se_tk_warpin.o(.rodata);
         sound/songs/se_tk_warpout.o(.rodata);
@@ -668,15 +668,15 @@ SECTIONS {
         sound/songs/se_track_stop.o(.rodata);
         sound/songs/se_track_haiki.o(.rodata);
         sound/songs/se_track_door.o(.rodata);
-        sound/songs/se_moter.o(.rodata);
+        sound/songs/midi/se_moter.o(.rodata);
         sound/songs/midi/se_card.o(.rodata);
-        sound/songs/se_save.o(.rodata);
+        sound/songs/midi/se_save.o(.rodata);
         sound/songs/midi/se_kon.o(.rodata);
         sound/songs/midi/se_kon2.o(.rodata);
         sound/songs/midi/se_kon3.o(.rodata);
         sound/songs/midi/se_kon4.o(.rodata);
-        sound/songs/se_suikomu.o(.rodata);
-        sound/songs/se_nageru.o(.rodata);
+        sound/songs/midi/se_suikomu.o(.rodata);
+        sound/songs/midi/se_nageru.o(.rodata);
         sound/songs/se_toy_c.o(.rodata);
         sound/songs/se_toy_d.o(.rodata);
         sound/songs/se_toy_e.o(.rodata);
@@ -685,10 +685,10 @@ SECTIONS {
         sound/songs/se_toy_a.o(.rodata);
         sound/songs/se_toy_b.o(.rodata);
         sound/songs/se_toy_c1.o(.rodata);
-        sound/songs/se_mizu.o(.rodata);
+        sound/songs/midi/se_mizu.o(.rodata);
         sound/songs/midi/se_hashi.o(.rodata);
         sound/songs/midi/se_daugi.o(.rodata);
-        sound/songs/se_pinpon.o(.rodata);
+        sound/songs/midi/se_pinpon.o(.rodata);
         sound/songs/midi/se_fuusen1.o(.rodata);
         sound/songs/midi/se_fuusen2.o(.rodata);
         sound/songs/midi/se_fuusen3.o(.rodata);
@@ -696,37 +696,37 @@ SECTIONS {
         sound/songs/se_toy_dango.o(.rodata);
         sound/songs/midi/se_doku.o(.rodata);
         sound/songs/midi/se_esuka.o(.rodata);
-        sound/songs/se_t_ame.o(.rodata);
-        sound/songs/se_t_ame_e.o(.rodata);
-        sound/songs/se_t_ooame.o(.rodata);
-        sound/songs/se_t_ooame_e.o(.rodata);
-        sound/songs/se_t_koame.o(.rodata);
-        sound/songs/se_t_koame_e.o(.rodata);
-        sound/songs/se_t_kami.o(.rodata);
-        sound/songs/se_t_kami2.o(.rodata);
+        sound/songs/midi/se_t_ame.o(.rodata);
+        sound/songs/midi/se_t_ame_e.o(.rodata);
+        sound/songs/midi/se_t_ooame.o(.rodata);
+        sound/songs/midi/se_t_ooame_e.o(.rodata);
+        sound/songs/midi/se_t_koame.o(.rodata);
+        sound/songs/midi/se_t_koame_e.o(.rodata);
+        sound/songs/midi/se_t_kami.o(.rodata);
+        sound/songs/midi/se_t_kami2.o(.rodata);
         sound/songs/midi/se_elebeta.o(.rodata);
         sound/songs/midi/se_hinsi.o(.rodata);
         sound/songs/midi/se_expmax.o(.rodata);
         sound/songs/se_tamakoro.o(.rodata);
         sound/songs/se_tamakoro_e.o(.rodata);
         sound/songs/midi/se_basabasa.o(.rodata);
-        sound/songs/se_regi.o(.rodata);
+        sound/songs/midi/se_regi.o(.rodata);
         sound/songs/midi/se_c_gaji.o(.rodata);
         sound/songs/midi/se_c_maku_u.o(.rodata);
         sound/songs/midi/se_c_maku_d.o(.rodata);
         sound/songs/midi/se_c_pasi.o(.rodata);
         sound/songs/midi/se_c_syu.o(.rodata);
         sound/songs/midi/se_c_pikon.o(.rodata);
-        sound/songs/se_reapoke.o(.rodata);
-        sound/songs/se_op_basyu.o(.rodata);
+        sound/songs/midi/se_reapoke.o(.rodata);
+        sound/songs/midi/se_op_basyu.o(.rodata);
         sound/songs/midi/se_bt_start.o(.rodata);
         sound/songs/midi/se_dendou.o(.rodata);
         sound/songs/midi/se_jihanki.o(.rodata);
         sound/songs/se_tama.o(.rodata);
         sound/songs/se_z_scroll.o(.rodata);
         sound/songs/se_z_page.o(.rodata);
-        sound/songs/se_pn_on.o(.rodata);
-        sound/songs/se_pn_off.o(.rodata);
+        sound/songs/midi/se_pn_on.o(.rodata);
+        sound/songs/midi/se_pn_off.o(.rodata);
         sound/songs/midi/se_z_search.o(.rodata);
         sound/songs/se_tamago.o(.rodata);
         sound/songs/se_tb_start.o(.rodata);
@@ -863,21 +863,21 @@ SECTIONS {
         sound/songs/se_w287b.o(.rodata);
         sound/songs/se_w114.o(.rodata);
         sound/songs/se_w063b.o(.rodata);
-        sound/songs/se_rg_w_door.o(.rodata);
-        sound/songs/se_rg_card1.o(.rodata);
-        sound/songs/se_rg_card2.o(.rodata);
-        sound/songs/se_rg_card3.o(.rodata);
-        sound/songs/se_rg_bag1.o(.rodata);
-        sound/songs/se_rg_bag2.o(.rodata);
-        sound/songs/se_rg_getting.o(.rodata);
-        sound/songs/se_rg_shop.o(.rodata);
-        sound/songs/se_rg_kiteki.o(.rodata);
-        sound/songs/se_rg_help_op.o(.rodata);
-        sound/songs/se_rg_help_cl.o(.rodata);
-        sound/songs/se_rg_help_ng.o(.rodata);
-        sound/songs/se_rg_deomov.o(.rodata);
-        sound/songs/se_rg_excellent.o(.rodata);
-        sound/songs/se_rg_nawamiss.o(.rodata);
+        sound/songs/midi/se_rg_w_door.o(.rodata);
+        sound/songs/midi/se_rg_card1.o(.rodata);
+        sound/songs/midi/se_rg_card2.o(.rodata);
+        sound/songs/midi/se_rg_card3.o(.rodata);
+        sound/songs/midi/se_rg_bag1.o(.rodata);
+        sound/songs/midi/se_rg_bag2.o(.rodata);
+        sound/songs/midi/se_rg_getting.o(.rodata);
+        sound/songs/midi/se_rg_shop.o(.rodata);
+        sound/songs/midi/se_rg_kiteki.o(.rodata);
+        sound/songs/midi/se_rg_help_op.o(.rodata);
+        sound/songs/midi/se_rg_help_cl.o(.rodata);
+        sound/songs/midi/se_rg_help_ng.o(.rodata);
+        sound/songs/midi/se_rg_deomov.o(.rodata);
+        sound/songs/midi/se_rg_excellent.o(.rodata);
+        sound/songs/midi/se_rg_nawamiss.o(.rodata);
         sound/songs/se_toreeye.o(.rodata);
         sound/songs/se_toreoff.o(.rodata);
         sound/songs/midi/se_hantei1.o(.rodata);