471 files changed, 4878 insertions, 4878 deletions

diff --git a/sound/songs/midi/mus_dan02.mid b/sound/songs/midi/mus_abandoned_ship.mid
index 84d0cd199..84d0cd199 100644
--- a/sound/songs/midi/mus_dan02.mid
+++ b/sound/songs/midi/mus_abandoned_ship.mid
diff --git a/sound/songs/midi/mus_ooame.mid b/sound/songs/midi/mus_abnormal_weather.mid
index be847f6a6..be847f6a6 100644
--- a/sound/songs/midi/mus_ooame.mid
+++ b/sound/songs/midi/mus_abnormal_weather.mid
diff --git a/sound/songs/midi/mus_ajito.mid b/sound/songs/midi/mus_aqua_magma_hideout.mid
index 200fa88dd..200fa88dd 100644
--- a/sound/songs/midi/mus_ajito.mid
+++ b/sound/songs/midi/mus_aqua_magma_hideout.mid
diff --git a/sound/songs/midi/mus_me_tama.mid b/sound/songs/midi/mus_awaken_legend.mid
index 4190733d9..4190733d9 100644
--- a/sound/songs/midi/mus_me_tama.mid
+++ b/sound/songs/midi/mus_awaken_legend.mid
diff --git a/sound/songs/midi/mus_b_dome1.mid b/sound/songs/midi/mus_b_dome_lobby.mid
index 69aefab0a..69aefab0a 100644
--- a/sound/songs/midi/mus_b_dome1.mid
+++ b/sound/songs/midi/mus_b_dome_lobby.mid
diff --git a/sound/songs/midi/mus_b_tube.mid b/sound/songs/midi/mus_b_pike.mid
index 1909543f3..1909543f3 100644
--- a/sound/songs/midi/mus_b_tube.mid
+++ b/sound/songs/midi/mus_b_pike.mid
diff --git a/sound/songs/midi/mus_pyramid.mid b/sound/songs/midi/mus_b_pyramid.mid
index ceb50e667..ceb50e667 100644
--- a/sound/songs/midi/mus_pyramid.mid
+++ b/sound/songs/midi/mus_b_pyramid.mid
diff --git a/sound/songs/midi/mus_pyramid_top.mid b/sound/songs/midi/mus_b_pyramid_top.mid
index 502013243..502013243 100644
--- a/sound/songs/midi/mus_pyramid_top.mid
+++ b/sound/songs/midi/mus_b_pyramid_top.mid
diff --git a/sound/songs/midi/mus_b_tower.mid b/sound/songs/midi/mus_b_tower.mid
index 8e0de8968..a8294614f 100644
--- a/sound/songs/midi/mus_b_tower.mid
+++ b/sound/songs/midi/mus_b_tower.mid
diff --git a/sound/songs/midi/mus_b_tower_rs.mid b/sound/songs/midi/mus_b_tower_rs.mid
new file mode 100644
index 000000000..8e0de8968
--- /dev/null
+++ b/sound/songs/midi/mus_b_tower_rs.mid
diff --git a/sound/songs/midi/mus_odamaki.mid b/sound/songs/midi/mus_birch_lab.mid
index ac4226f98..ac4226f98 100644
--- a/sound/songs/midi/mus_odamaki.mid
+++ b/sound/songs/midi/mus_birch_lab.mid
diff --git a/sound/songs/midi/mus_pcc.mid b/sound/songs/midi/mus_c_comm_center.mid
index 15417549f..15417549f 100644
--- a/sound/songs/midi/mus_pcc.mid
+++ b/sound/songs/midi/mus_c_comm_center.mid
diff --git a/sound/songs/midi/mus_suikun.mid b/sound/songs/midi/mus_c_vs_legend_beast.mid
index afb9742d5..afb9742d5 100644
--- a/sound/songs/midi/mus_suikun.mid
+++ b/sound/songs/midi/mus_c_vs_legend_beast.mid
diff --git a/sound/songs/midi/mus_ropeway.mid b/sound/songs/midi/mus_cable_car.mid
index 5aa3a411a..5aa3a411a 100644
--- a/sound/songs/midi/mus_ropeway.mid
+++ b/sound/songs/midi/mus_cable_car.mid
diff --git a/sound/songs/midi/mus_kachi22.mid b/sound/songs/midi/mus_caught.mid
index 30b40c946..30b40c946 100644
--- a/sound/songs/midi/mus_kachi22.mid
+++ b/sound/songs/midi/mus_caught.mid
diff --git a/sound/songs/midi/mus_dan03.mid b/sound/songs/midi/mus_cave_of_origin.mid
index e0dbcff4b..e0dbcff4b 100644
--- a/sound/songs/midi/mus_dan03.mid
+++ b/sound/songs/midi/mus_cave_of_origin.mid
diff --git a/sound/songs/midi/mus_contest0.mid b/sound/songs/midi/mus_contest.mid
index b2946775b..b2946775b 100644
--- a/sound/songs/midi/mus_contest0.mid
+++ b/sound/songs/midi/mus_contest.mid
diff --git a/sound/songs/midi/mus_conlobby.mid b/sound/songs/midi/mus_contest_lobby.mid
index 680482e0c..680482e0c 100644
--- a/sound/songs/midi/mus_conlobby.mid
+++ b/sound/songs/midi/mus_contest_lobby.mid
diff --git a/sound/songs/midi/mus_con_k.mid b/sound/songs/midi/mus_contest_results.mid
index b45cd3ff5..b45cd3ff5 100644
--- a/sound/songs/midi/mus_con_k.mid
+++ b/sound/songs/midi/mus_contest_results.mid
diff --git a/sound/songs/midi/mus_con_fan.mid b/sound/songs/midi/mus_contest_winner.mid
index 1786fac50..1786fac50 100644
--- a/sound/songs/midi/mus_con_fan.mid
+++ b/sound/songs/midi/mus_contest_winner.mid
diff --git a/sound/songs/midi/mus_thankfor.mid b/sound/songs/midi/mus_credits.mid
index d4f9e1606..d4f9e1606 100644
--- a/sound/songs/midi/mus_thankfor.mid
+++ b/sound/songs/midi/mus_credits.mid
diff --git a/sound/songs/midi/mus_hightown.mid b/sound/songs/midi/mus_dewford.mid
index a437b3c34..a437b3c34 100644
--- a/sound/songs/midi/mus_hightown.mid
+++ b/sound/songs/midi/mus_dewford.mid
diff --git a/sound/songs/midi/mus_aqa_0.mid b/sound/songs/midi/mus_encounter_aqua.mid
index d5a2474bd..d5a2474bd 100644
--- a/sound/songs/midi/mus_aqa_0.mid
+++ b/sound/songs/midi/mus_encounter_aqua.mid
diff --git a/sound/songs/midi/mus_boy_sup.mid b/sound/songs/midi/mus_encounter_brendan.mid
index 366eb1db6..366eb1db6 100644
--- a/sound/songs/midi/mus_boy_sup.mid
+++ b/sound/songs/midi/mus_encounter_brendan.mid
diff --git a/sound/songs/midi/mus_daigo.mid b/sound/songs/midi/mus_encounter_champion.mid
index 750a31fe7..750a31fe7 100644
--- a/sound/songs/midi/mus_daigo.mid
+++ b/sound/songs/midi/mus_encounter_champion.mid
diff --git a/sound/songs/midi/mus_kakkoii.mid b/sound/songs/midi/mus_encounter_cool.mid
index c1a75663b..c1a75663b 100644
--- a/sound/songs/midi/mus_kakkoii.mid
+++ b/sound/songs/midi/mus_encounter_cool.mid
diff --git a/sound/songs/midi/mus_sitennou.mid b/sound/songs/midi/mus_encounter_elite_four.mid
index 21ba64b98..21ba64b98 100644
--- a/sound/songs/midi/mus_sitennou.mid
+++ b/sound/songs/midi/mus_encounter_elite_four.mid
diff --git a/sound/songs/midi/mus_girleye.mid b/sound/songs/midi/mus_encounter_female.mid
index a4015e70d..a4015e70d 100644
--- a/sound/songs/midi/mus_girleye.mid
+++ b/sound/songs/midi/mus_encounter_female.mid
diff --git a/sound/songs/midi/mus_syoujoeye.mid b/sound/songs/midi/mus_encounter_girl.mid
index 00226b287..00226b287 100644
--- a/sound/songs/midi/mus_syoujoeye.mid
+++ b/sound/songs/midi/mus_encounter_girl.mid
diff --git a/sound/songs/midi/mus_yama_eye.mid b/sound/songs/midi/mus_encounter_hiker.mid
index 0b58912f6..0b58912f6 100644
--- a/sound/songs/midi/mus_yama_eye.mid
+++ b/sound/songs/midi/mus_encounter_hiker.mid
diff --git a/sound/songs/midi/mus_hageshii.mid b/sound/songs/midi/mus_encounter_intense.mid
index 6b217a1fa..6b217a1fa 100644
--- a/sound/songs/midi/mus_hageshii.mid
+++ b/sound/songs/midi/mus_encounter_intense.mid
diff --git a/sound/songs/midi/mus_inter_v.mid b/sound/songs/midi/mus_encounter_interviewer.mid
index 504bf3df1..504bf3df1 100644
--- a/sound/songs/midi/mus_inter_v.mid
+++ b/sound/songs/midi/mus_encounter_interviewer.mid
diff --git a/sound/songs/midi/mus_mgm0.mid b/sound/songs/midi/mus_encounter_magma.mid
index 99f5c24a8..99f5c24a8 100644
--- a/sound/songs/midi/mus_mgm0.mid
+++ b/sound/songs/midi/mus_encounter_magma.mid
diff --git a/sound/songs/midi/mus_boyeye.mid b/sound/songs/midi/mus_encounter_male.mid
index bb6dcc0b9..bb6dcc0b9 100644
--- a/sound/songs/midi/mus_boyeye.mid
+++ b/sound/songs/midi/mus_encounter_male.mid
diff --git a/sound/songs/midi/mus_girl_sup.mid b/sound/songs/midi/mus_encounter_may.mid
index 8f05b2b43..8f05b2b43 100644
--- a/sound/songs/midi/mus_girl_sup.mid
+++ b/sound/songs/midi/mus_encounter_may.mid
diff --git a/sound/songs/midi/mus_test.mid b/sound/songs/midi/mus_encounter_rich.mid
index 913a4f89a..913a4f89a 100644
--- a/sound/songs/midi/mus_test.mid
+++ b/sound/songs/midi/mus_encounter_rich.mid
diff --git a/sound/songs/midi/mus_ayasii.mid b/sound/songs/midi/mus_encounter_suspicious.mid
index c9942e907..c9942e907 100644
--- a/sound/songs/midi/mus_ayasii.mid
+++ b/sound/songs/midi/mus_encounter_suspicious.mid
diff --git a/sound/songs/midi/mus_swimeye.mid b/sound/songs/midi/mus_encounter_swimmer.mid
index 4a376a928..4a376a928 100644
--- a/sound/songs/midi/mus_swimeye.mid
+++ b/sound/songs/midi/mus_encounter_swimmer.mid
diff --git a/sound/songs/midi/mus_hutago.mid b/sound/songs/midi/mus_encounter_twins.mid
index bc1b1da05..bc1b1da05 100644
--- a/sound/songs/midi/mus_hutago.mid
+++ b/sound/songs/midi/mus_encounter_twins.mid
diff --git a/sound/songs/midi/mus_rainbow.mid b/sound/songs/midi/mus_ever_grande.mid
index 8c1e20151..8c1e20151 100644
--- a/sound/songs/midi/mus_rainbow.mid
+++ b/sound/songs/midi/mus_ever_grande.mid
diff --git a/sound/songs/midi/mus_shinka.mid b/sound/songs/midi/mus_evolution.mid
index 375e6d5db..375e6d5db 100644
--- a/sound/songs/midi/mus_shinka.mid
+++ b/sound/songs/midi/mus_evolution.mid
diff --git a/sound/songs/midi/mus_me_shinka.mid b/sound/songs/midi/mus_evolution_intro.mid
index 231f25533..231f25533 100644
--- a/sound/songs/midi/mus_me_shinka.mid
+++ b/sound/songs/midi/mus_evolution_intro.mid
diff --git a/sound/songs/midi/mus_fanfa5.mid b/sound/songs/midi/mus_evolved.mid
index 8c94f1178..8c94f1178 100644
--- a/sound/songs/midi/mus_fanfa5.mid
+++ b/sound/songs/midi/mus_evolved.mid
diff --git a/sound/songs/midi/mus_tonekusa.mid b/sound/songs/midi/mus_fallarbor.mid
index ac11b5378..ac11b5378 100644
--- a/sound/songs/midi/mus_tonekusa.mid
+++ b/sound/songs/midi/mus_fallarbor.mid
diff --git a/sound/songs/midi/mus_tsuretek.mid b/sound/songs/midi/mus_follow_me.mid
index 82664c27a..82664c27a 100644
--- a/sound/songs/midi/mus_tsuretek.mid
+++ b/sound/songs/midi/mus_follow_me.mid
diff --git a/sound/songs/midi/mus_machi_s3.mid b/sound/songs/midi/mus_fortree.mid
index 65862625c..65862625c 100644
--- a/sound/songs/midi/mus_machi_s3.mid
+++ b/sound/songs/midi/mus_fortree.mid
diff --git a/sound/songs/midi/mus_casino.mid b/sound/songs/midi/mus_game_corner.mid
index 55548bf94..55548bf94 100644
--- a/sound/songs/midi/mus_casino.mid
+++ b/sound/songs/midi/mus_game_corner.mid
diff --git a/sound/songs/midi/mus_nibi.mid b/sound/songs/midi/mus_gsc_pewter.mid
index dc0df50f2..dc0df50f2 100644
--- a/sound/songs/midi/mus_nibi.mid
+++ b/sound/songs/midi/mus_gsc_pewter.mid
diff --git a/sound/songs/midi/mus_field13.mid b/sound/songs/midi/mus_gsc_route38.mid
index 8adfa4639..8adfa4639 100644
--- a/sound/songs/midi/mus_field13.mid
+++ b/sound/songs/midi/mus_gsc_route38.mid
diff --git a/sound/songs/midi/mus_gim.mid b/sound/songs/midi/mus_gym.mid
index 81db02876..81db02876 100644
--- a/sound/songs/midi/mus_gim.mid
+++ b/sound/songs/midi/mus_gym.mid
diff --git a/sound/songs/midi/mus_dendou.mid b/sound/songs/midi/mus_hall_of_fame.mid
index d743efcfb..d743efcfb 100644
--- a/sound/songs/midi/mus_dendou.mid
+++ b/sound/songs/midi/mus_hall_of_fame.mid
diff --git a/sound/songs/midi/mus_eikou_r.mid b/sound/songs/midi/mus_hall_of_fame_room.mid
index a3cad89cf..a3cad89cf 100644
--- a/sound/songs/midi/mus_eikou_r.mid
+++ b/sound/songs/midi/mus_hall_of_fame_room.mid
diff --git a/sound/songs/midi/mus_me_asa.mid b/sound/songs/midi/mus_heal.mid
index 0606aafa6..0606aafa6 100644
--- a/sound/songs/midi/mus_me_asa.mid
+++ b/sound/songs/midi/mus_heal.mid
diff --git a/sound/songs/midi/mus_event0.mid b/sound/songs/midi/mus_help.mid
index 9292a4ba7..9292a4ba7 100644
--- a/sound/songs/midi/mus_event0.mid
+++ b/sound/songs/midi/mus_help.mid
diff --git a/sound/songs/midi/mus_demo1.mid b/sound/songs/midi/mus_intro.mid
index 66d4e112c..66d4e112c 100644
--- a/sound/songs/midi/mus_demo1.mid
+++ b/sound/songs/midi/mus_intro.mid
diff --git a/sound/songs/midi/mus_t_battle.mid b/sound/songs/midi/mus_intro_battle.mid
index 43d2f4bc3..43d2f4bc3 100644
--- a/sound/songs/midi/mus_t_battle.mid
+++ b/sound/songs/midi/mus_intro_battle.mid
diff --git a/sound/songs/midi/mus_fanfa1.mid b/sound/songs/midi/mus_level_up.mid
index 54d014597..54d014597 100644
--- a/sound/songs/midi/mus_fanfa1.mid
+++ b/sound/songs/midi/mus_level_up.mid
diff --git a/sound/songs/midi/mus_minamo.mid b/sound/songs/midi/mus_lilycove.mid
index 5bcf80645..5bcf80645 100644
--- a/sound/songs/midi/mus_minamo.mid
+++ b/sound/songs/midi/mus_lilycove.mid
diff --git a/sound/songs/midi/mus_bijyutu.mid b/sound/songs/midi/mus_lilycove_museum.mid
index 6aedd3b33..6aedd3b33 100644
--- a/sound/songs/midi/mus_bijyutu.mid
+++ b/sound/songs/midi/mus_lilycove_museum.mid
diff --git a/sound/songs/midi/mus_test1.mid b/sound/songs/midi/mus_link_contest_p1.mid
index 36c297994..36c297994 100644
--- a/sound/songs/midi/mus_test1.mid
+++ b/sound/songs/midi/mus_link_contest_p1.mid
diff --git a/sound/songs/midi/mus_test2.mid b/sound/songs/midi/mus_link_contest_p2.mid
index b09281538..b09281538 100644
--- a/sound/songs/midi/mus_test2.mid
+++ b/sound/songs/midi/mus_link_contest_p2.mid
diff --git a/sound/songs/midi/mus_test3.mid b/sound/songs/midi/mus_link_contest_p3.mid
index 62a18480a..62a18480a 100644
--- a/sound/songs/midi/mus_test3.mid
+++ b/sound/songs/midi/mus_link_contest_p3.mid
diff --git a/sound/songs/midi/mus_test4.mid b/sound/songs/midi/mus_link_contest_p4.mid
index aec8e22ad..aec8e22ad 100644
--- a/sound/songs/midi/mus_test4.mid
+++ b/sound/songs/midi/mus_link_contest_p4.mid
diff --git a/sound/songs/midi/mus_mishiro.mid b/sound/songs/midi/mus_littleroot.mid
index 1fbaa5bfe..1fbaa5bfe 100644
--- a/sound/songs/midi/mus_mishiro.mid
+++ b/sound/songs/midi/mus_littleroot.mid
diff --git a/sound/songs/midi/mus_tetsuji.mid b/sound/songs/midi/mus_littleroot_test.mid
index e29e82560..e29e82560 100644
--- a/sound/songs/midi/mus_tetsuji.mid
+++ b/sound/songs/midi/mus_littleroot_test.mid
diff --git a/sound/songs/midi/mus_me_wasure.mid b/sound/songs/midi/mus_move_deleted.mid
index 16fe3e1a0..16fe3e1a0 100644
--- a/sound/songs/midi/mus_me_wasure.mid
+++ b/sound/songs/midi/mus_move_deleted.mid
diff --git a/sound/songs/midi/mus_tozan.mid b/sound/songs/midi/mus_mt_chimney.mid
index 07d5c9565..07d5c9565 100644
--- a/sound/songs/midi/mus_tozan.mid
+++ b/sound/songs/midi/mus_mt_chimney.mid
diff --git a/sound/songs/midi/mus_m_dungon.mid b/sound/songs/midi/mus_mt_pyre.mid
index 3de0494b3..3de0494b3 100644
--- a/sound/songs/midi/mus_m_dungon.mid
+++ b/sound/songs/midi/mus_mt_pyre.mid
diff --git a/sound/songs/midi/mus_machupi.mid b/sound/songs/midi/mus_mt_pyre_exterior.mid
index 0232634af..0232634af 100644
--- a/sound/songs/midi/mus_machupi.mid
+++ b/sound/songs/midi/mus_mt_pyre_exterior.mid
diff --git a/sound/songs/midi/mus_me_pointget.mid b/sound/songs/midi/mus_obtain_b_points.mid
index 4a3890647..4a3890647 100644
--- a/sound/songs/midi/mus_me_pointget.mid
+++ b/sound/songs/midi/mus_obtain_b_points.mid
diff --git a/sound/songs/midi/mus_me_bachi.mid b/sound/songs/midi/mus_obtain_badge.mid
index 05fe1516a..05fe1516a 100644
--- a/sound/songs/midi/mus_me_bachi.mid
+++ b/sound/songs/midi/mus_obtain_badge.mid
diff --git a/sound/songs/midi/mus_me_kinomi.mid b/sound/songs/midi/mus_obtain_berry.mid
index e7eb4afd1..e7eb4afd1 100644
--- a/sound/songs/midi/mus_me_kinomi.mid
+++ b/sound/songs/midi/mus_obtain_berry.mid
diff --git a/sound/songs/midi/mus_fanfa4.mid b/sound/songs/midi/mus_obtain_item.mid
index 42e617558..42e617558 100644
--- a/sound/songs/midi/mus_fanfa4.mid
+++ b/sound/songs/midi/mus_obtain_item.mid
diff --git a/sound/songs/midi/mus_me_symbolget.mid b/sound/songs/midi/mus_obtain_symbol.mid
index 76b83abcd..76b83abcd 100644
--- a/sound/songs/midi/mus_me_symbolget.mid
+++ b/sound/songs/midi/mus_obtain_symbol.mid
diff --git a/sound/songs/midi/mus_me_waza.mid b/sound/songs/midi/mus_obtain_tmhm.mid
index 40f9c2ed8..40f9c2ed8 100644
--- a/sound/songs/midi/mus_me_waza.mid
+++ b/sound/songs/midi/mus_obtain_tmhm.mid
diff --git a/sound/songs/midi/mus_fune_kan.mid b/sound/songs/midi/mus_oceanic_museum.mid
index c95ab1e8d..c95ab1e8d 100644
--- a/sound/songs/midi/mus_fune_kan.mid
+++ b/sound/songs/midi/mus_oceanic_museum.mid
diff --git a/sound/songs/midi/mus_machi_s4.mid b/sound/songs/midi/mus_oldale.mid
index 2ae43fe7e..2ae43fe7e 100644
--- a/sound/songs/midi/mus_machi_s4.mid
+++ b/sound/songs/midi/mus_oldale.mid
diff --git a/sound/songs/midi/mus_machi_s2.mid b/sound/songs/midi/mus_petalburg.mid
index a3c4a0a6a..a3c4a0a6a 100644
--- a/sound/songs/midi/mus_machi_s2.mid
+++ b/sound/songs/midi/mus_petalburg.mid
diff --git a/sound/songs/midi/mus_dan01.mid b/sound/songs/midi/mus_petalburg_woods.mid
index 96fc4732d..96fc4732d 100644
--- a/sound/songs/midi/mus_dan01.mid
+++ b/sound/songs/midi/mus_petalburg_woods.mid
diff --git a/sound/songs/midi/mus_pokecen.mid b/sound/songs/midi/mus_poke_center.mid
index e8cfb473a..e8cfb473a 100644
--- a/sound/songs/midi/mus_pokecen.mid
+++ b/sound/songs/midi/mus_poke_center.mid
diff --git a/sound/songs/midi/mus_friendly.mid b/sound/songs/midi/mus_poke_mart.mid
index 38567b2bf..38567b2bf 100644
--- a/sound/songs/midi/mus_friendly.mid
+++ b/sound/songs/midi/mus_poke_mart.mid
diff --git a/sound/songs/midi/mus_rekkuu_kourin.mid b/sound/songs/midi/mus_rayquaza_appears.mid
index a16b3f511..a16b3f511 100644
--- a/sound/songs/midi/mus_rekkuu_kourin.mid
+++ b/sound/songs/midi/mus_rayquaza_appears.mid
diff --git a/sound/songs/midi/mus_me_tore_eye.mid b/sound/songs/midi/mus_register_match_call.mid
index f2682bf32..f2682bf32 100644
--- a/sound/songs/midi/mus_me_tore_eye.mid
+++ b/sound/songs/midi/mus_register_match_call.mid
diff --git a/sound/songs/midi/mus_rg_kinomikui.mid b/sound/songs/midi/mus_rg_berry_pick.mid
index 5e16a57cd..5e16a57cd 100644
--- a/sound/songs/midi/mus_rg_kinomikui.mid
+++ b/sound/songs/midi/mus_rg_berry_pick.mid
diff --git a/sound/songs/midi/mus_rg_get_yasei.mid b/sound/songs/midi/mus_rg_caught.mid
index 6599ca6b0..6599ca6b0 100644
--- a/sound/songs/midi/mus_rg_get_yasei.mid
+++ b/sound/songs/midi/mus_rg_caught.mid
diff --git a/sound/songs/midi/mus_rg_fan6.mid b/sound/songs/midi/mus_rg_caught_intro.mid
index d2bc1feb3..d2bc1feb3 100644
--- a/sound/songs/midi/mus_rg_fan6.mid
+++ b/sound/songs/midi/mus_rg_caught_intro.mid
diff --git a/sound/songs/midi/mus_rg_tamamusi.mid b/sound/songs/midi/mus_rg_celadon.mid
index fa0d655eb..fa0d655eb 100644
--- a/sound/songs/midi/mus_rg_tamamusi.mid
+++ b/sound/songs/midi/mus_rg_celadon.mid
diff --git a/sound/songs/midi/mus_rg_guren.mid b/sound/songs/midi/mus_rg_cinnabar.mid
index a5748ac48..a5748ac48 100644
--- a/sound/songs/midi/mus_rg_guren.mid
+++ b/sound/songs/midi/mus_rg_cinnabar.mid
diff --git a/sound/songs/midi/mus_rg_ending.mid b/sound/songs/midi/mus_rg_credits.mid
index 1f5790542..1f5790542 100644
--- a/sound/songs/midi/mus_rg_ending.mid
+++ b/sound/songs/midi/mus_rg_credits.mid
diff --git a/sound/songs/midi/mus_rg_fan2.mid b/sound/songs/midi/mus_rg_dex_rating.mid
index 98300bce1..98300bce1 100644
--- a/sound/songs/midi/mus_rg_fan2.mid
+++ b/sound/songs/midi/mus_rg_dex_rating.mid
diff --git a/sound/songs/midi/mus_rg_shounen.mid b/sound/songs/midi/mus_rg_encounter_boy.mid
index 0820f00ca..0820f00ca 100644
--- a/sound/songs/midi/mus_rg_shounen.mid
+++ b/sound/songs/midi/mus_rg_encounter_boy.mid
diff --git a/sound/songs/midi/mus_rg_deoeye.mid b/sound/songs/midi/mus_rg_encounter_deoxys.mid
index d322b9a1a..d322b9a1a 100644
--- a/sound/songs/midi/mus_rg_deoeye.mid
+++ b/sound/songs/midi/mus_rg_encounter_deoxys.mid
diff --git a/sound/songs/midi/mus_rg_shoujo.mid b/sound/songs/midi/mus_rg_encounter_girl.mid
index 48ede9b4c..48ede9b4c 100644
--- a/sound/songs/midi/mus_rg_shoujo.mid
+++ b/sound/songs/midi/mus_rg_encounter_girl.mid
diff --git a/sound/songs/midi/mus_rg_exeye.mid b/sound/songs/midi/mus_rg_encounter_gym_leader.mid
index cb5fef487..cb5fef487 100644
--- a/sound/songs/midi/mus_rg_exeye.mid
+++ b/sound/songs/midi/mus_rg_encounter_gym_leader.mid
diff --git a/sound/songs/midi/mus_rg_rival1.mid b/sound/songs/midi/mus_rg_encounter_rival.mid
index 41fe40e94..41fe40e94 100644
--- a/sound/songs/midi/mus_rg_rival1.mid
+++ b/sound/songs/midi/mus_rg_encounter_rival.mid
diff --git a/sound/songs/midi/mus_rg_rocket.mid b/sound/songs/midi/mus_rg_encounter_rocket.mid
index 966e56962..966e56962 100644
--- a/sound/songs/midi/mus_rg_rocket.mid
+++ b/sound/songs/midi/mus_rg_encounter_rocket.mid
diff --git a/sound/songs/midi/mus_rg_annai.mid b/sound/songs/midi/mus_rg_follow_me.mid
index efea75d49..efea75d49 100644
--- a/sound/songs/midi/mus_rg_annai.mid
+++ b/sound/songs/midi/mus_rg_follow_me.mid
diff --git a/sound/songs/midi/mus_rg_hanada.mid b/sound/songs/midi/mus_rg_fuchsia.mid
index 4831631fc..4831631fc 100644
--- a/sound/songs/midi/mus_rg_hanada.mid
+++ b/sound/songs/midi/mus_rg_fuchsia.mid
diff --git a/sound/songs/midi/mus_rg_slot.mid b/sound/songs/midi/mus_rg_game_corner.mid
index 24668ec68..24668ec68 100644
--- a/sound/songs/midi/mus_rg_slot.mid
+++ b/sound/songs/midi/mus_rg_game_corner.mid
diff --git a/sound/songs/midi/mus_rg_titlerog.mid b/sound/songs/midi/mus_rg_game_freak.mid
index baef8d1d4..baef8d1d4 100644
--- a/sound/songs/midi/mus_rg_titlerog.mid
+++ b/sound/songs/midi/mus_rg_game_freak.mid
diff --git a/sound/songs/midi/mus_rg_dendou.mid b/sound/songs/midi/mus_rg_hall_of_fame.mid
index 9d7647ccd..9d7647ccd 100644
--- a/sound/songs/midi/mus_rg_dendou.mid
+++ b/sound/songs/midi/mus_rg_hall_of_fame.mid
diff --git a/sound/songs/midi/mus_rg_kaihuku.mid b/sound/songs/midi/mus_rg_heal.mid
index 50c96d7c6..50c96d7c6 100644
--- a/sound/songs/midi/mus_rg_kaihuku.mid
+++ b/sound/songs/midi/mus_rg_heal.mid
diff --git a/sound/songs/midi/mus_rg_demo.mid b/sound/songs/midi/mus_rg_intro_fight.mid
index f5320a273..f5320a273 100644
--- a/sound/songs/midi/mus_rg_demo.mid
+++ b/sound/songs/midi/mus_rg_intro_fight.mid
diff --git a/sound/songs/midi/mus_rg_purin.mid b/sound/songs/midi/mus_rg_jigglypuff.mid
index cc3405f3c..cc3405f3c 100644
--- a/sound/songs/midi/mus_rg_purin.mid
+++ b/sound/songs/midi/mus_rg_jigglypuff.mid
diff --git a/sound/songs/midi/mus_rg_shion.mid b/sound/songs/midi/mus_rg_lavender.mid
index b31831dfa..b31831dfa 100644
--- a/sound/songs/midi/mus_rg_shion.mid
+++ b/sound/songs/midi/mus_rg_lavender.mid
diff --git a/sound/songs/midi/mus_rg_otsukimi.mid b/sound/songs/midi/mus_rg_mt_moon.mid
index c7da3b036..c7da3b036 100644
--- a/sound/songs/midi/mus_rg_otsukimi.mid
+++ b/sound/songs/midi/mus_rg_mt_moon.mid
diff --git a/sound/songs/midi/mus_rg_okurimono.mid b/sound/songs/midi/mus_rg_mystery_gift.mid
index bfde1f175..bfde1f175 100644
--- a/sound/songs/midi/mus_rg_okurimono.mid
+++ b/sound/songs/midi/mus_rg_mystery_gift.mid
diff --git a/sound/songs/midi/mus_rg_network.mid b/sound/songs/midi/mus_rg_net_center.mid
index 292dad852..292dad852 100644
--- a/sound/songs/midi/mus_rg_network.mid
+++ b/sound/songs/midi/mus_rg_net_center.mid
diff --git a/sound/songs/midi/mus_rg_seibetu.mid b/sound/songs/midi/mus_rg_new_game_exit.mid
index 8c0a1d7ea..8c0a1d7ea 100644
--- a/sound/songs/midi/mus_rg_seibetu.mid
+++ b/sound/songs/midi/mus_rg_new_game_exit.mid
diff --git a/sound/songs/midi/mus_rg_sousa.mid b/sound/songs/midi/mus_rg_new_game_instruct.mid
index 0c936e8f6..0c936e8f6 100644
--- a/sound/songs/midi/mus_rg_sousa.mid
+++ b/sound/songs/midi/mus_rg_new_game_instruct.mid
diff --git a/sound/songs/midi/mus_rg_sekaikan.mid b/sound/songs/midi/mus_rg_new_game_intro.mid
index aec6a0240..aec6a0240 100644
--- a/sound/songs/midi/mus_rg_sekaikan.mid
+++ b/sound/songs/midi/mus_rg_new_game_intro.mid
diff --git a/sound/songs/midi/mus_rg_ohkido.mid b/sound/songs/midi/mus_rg_oak.mid
index fa4710a23..fa4710a23 100644
--- a/sound/songs/midi/mus_rg_ohkido.mid
+++ b/sound/songs/midi/mus_rg_oak.mid
diff --git a/sound/songs/midi/mus_rg_kenkyu.mid b/sound/songs/midi/mus_rg_oak_lab.mid
index 471a1baab..471a1baab 100644
--- a/sound/songs/midi/mus_rg_kenkyu.mid
+++ b/sound/songs/midi/mus_rg_oak_lab.mid
diff --git a/sound/songs/midi/mus_rg_fan5.mid b/sound/songs/midi/mus_rg_obtain_key_item.mid
index e9c01b132..e9c01b132 100644
--- a/sound/songs/midi/mus_rg_fan5.mid
+++ b/sound/songs/midi/mus_rg_obtain_key_item.mid
diff --git a/sound/songs/midi/mus_rg_masara.mid b/sound/songs/midi/mus_rg_pallet.mid
index fa5917387..fa5917387 100644
--- a/sound/songs/midi/mus_rg_masara.mid
+++ b/sound/songs/midi/mus_rg_pallet.mid
diff --git a/sound/songs/midi/mus_rg_nana123.mid b/sound/songs/midi/mus_rg_pewter.mid
index dd88863d4..dd88863d4 100644
--- a/sound/songs/midi/mus_rg_nana123.mid
+++ b/sound/songs/midi/mus_rg_pewter.mid
diff --git a/sound/songs/midi/mus_me_rg_photo.mid b/sound/songs/midi/mus_rg_photo.mid
index 76fce4af3..76fce4af3 100644
--- a/sound/songs/midi/mus_me_rg_photo.mid
+++ b/sound/songs/midi/mus_rg_photo.mid
diff --git a/sound/songs/midi/mus_rg_pokecen.mid b/sound/songs/midi/mus_rg_poke_center.mid
index cd905db38..cd905db38 100644
--- a/sound/songs/midi/mus_rg_pokecen.mid
+++ b/sound/songs/midi/mus_rg_poke_center.mid
diff --git a/sound/songs/midi/mus_rg_pokefue.mid b/sound/songs/midi/mus_rg_poke_flute.mid
index 02686a30b..02686a30b 100644
--- a/sound/songs/midi/mus_rg_pokefue.mid
+++ b/sound/songs/midi/mus_rg_poke_flute.mid
diff --git a/sound/songs/midi/mus_rg_jump.mid b/sound/songs/midi/mus_rg_poke_jump.mid
index 6e656a1f0..6e656a1f0 100644
--- a/sound/songs/midi/mus_rg_jump.mid
+++ b/sound/songs/midi/mus_rg_poke_jump.mid
diff --git a/sound/songs/midi/mus_rg_pokeyashi.mid b/sound/songs/midi/mus_rg_poke_mansion.mid
index e5ee78eb0..e5ee78eb0 100644
--- a/sound/songs/midi/mus_rg_pokeyashi.mid
+++ b/sound/songs/midi/mus_rg_poke_mansion.mid
diff --git a/sound/songs/midi/mus_rg_p_tower.mid b/sound/songs/midi/mus_rg_poke_tower.mid
index 0a537d191..0a537d191 100644
--- a/sound/songs/midi/mus_rg_p_tower.mid
+++ b/sound/songs/midi/mus_rg_poke_tower.mid
diff --git a/sound/songs/midi/mus_rg_rival2.mid b/sound/songs/midi/mus_rg_rival_exit.mid
index cae821245..cae821245 100644
--- a/sound/songs/midi/mus_rg_rival2.mid
+++ b/sound/songs/midi/mus_rg_rival_exit.mid
diff --git a/sound/songs/midi/mus_rg_ajito.mid b/sound/songs/midi/mus_rg_rocket_hideout.mid
index 1e1fff0f6..1e1fff0f6 100644
--- a/sound/songs/midi/mus_rg_ajito.mid
+++ b/sound/songs/midi/mus_rg_rocket_hideout.mid
diff --git a/sound/songs/midi/mus_rg_load01.mid b/sound/songs/midi/mus_rg_route1.mid
index 9d0ebcde6..9d0ebcde6 100644
--- a/sound/songs/midi/mus_rg_load01.mid
+++ b/sound/songs/midi/mus_rg_route1.mid
diff --git a/sound/songs/midi/mus_rg_load03.mid b/sound/songs/midi/mus_rg_route11.mid
index 3fe21c381..3fe21c381 100644
--- a/sound/songs/midi/mus_rg_load03.mid
+++ b/sound/songs/midi/mus_rg_route11.mid
diff --git a/sound/songs/midi/mus_rg_opening.mid b/sound/songs/midi/mus_rg_route24.mid
index c15773fff..c15773fff 100644
--- a/sound/songs/midi/mus_rg_opening.mid
+++ b/sound/songs/midi/mus_rg_route24.mid
diff --git a/sound/songs/midi/mus_rg_load02.mid b/sound/songs/midi/mus_rg_route3.mid
index 2af80a5a8..2af80a5a8 100644
--- a/sound/songs/midi/mus_rg_load02.mid
+++ b/sound/songs/midi/mus_rg_route3.mid
diff --git a/sound/songs/midi/mus_rg_nibi.mid b/sound/songs/midi/mus_rg_sevii_123.mid
index dd88863d4..dd88863d4 100644
--- a/sound/songs/midi/mus_rg_nibi.mid
+++ b/sound/songs/midi/mus_rg_sevii_123.mid
diff --git a/sound/songs/midi/mus_rg_nana45.mid b/sound/songs/midi/mus_rg_sevii_45.mid
index 98b581132..98b581132 100644
--- a/sound/songs/midi/mus_rg_nana45.mid
+++ b/sound/songs/midi/mus_rg_sevii_45.mid
diff --git a/sound/songs/midi/mus_rg_nana67.mid b/sound/songs/midi/mus_rg_sevii_67.mid
index 537e59a71..537e59a71 100644
--- a/sound/songs/midi/mus_rg_nana67.mid
+++ b/sound/songs/midi/mus_rg_sevii_67.mid
diff --git a/sound/songs/midi/mus_rg_nanadungeon.mid b/sound/songs/midi/mus_rg_sevii_cave.mid
index 7f32963c9..7f32963c9 100644
--- a/sound/songs/midi/mus_rg_nanadungeon.mid
+++ b/sound/songs/midi/mus_rg_sevii_cave.mid
diff --git a/sound/songs/midi/mus_rg_nanaiseki.mid b/sound/songs/midi/mus_rg_sevii_dungeon.mid
index 76d73039e..76d73039e 100644
--- a/sound/songs/midi/mus_rg_nanaiseki.mid
+++ b/sound/songs/midi/mus_rg_sevii_dungeon.mid
diff --git a/sound/songs/midi/mus_rg_nanashima.mid b/sound/songs/midi/mus_rg_sevii_route.mid
index d215f0122..d215f0122 100644
--- a/sound/songs/midi/mus_rg_nanashima.mid
+++ b/sound/songs/midi/mus_rg_sevii_route.mid
diff --git a/sound/songs/midi/mus_rg_shiruhu.mid b/sound/songs/midi/mus_rg_silph.mid
index 8f66ea874..8f66ea874 100644
--- a/sound/songs/midi/mus_rg_shiruhu.mid
+++ b/sound/songs/midi/mus_rg_silph.mid
diff --git a/sound/songs/midi/mus_rg_slowmasara.mid b/sound/songs/midi/mus_rg_slow_pallet.mid
index 441fb6348..441fb6348 100644
--- a/sound/songs/midi/mus_rg_slowmasara.mid
+++ b/sound/songs/midi/mus_rg_slow_pallet.mid
diff --git a/sound/songs/midi/mus_rg_santoan.mid b/sound/songs/midi/mus_rg_ss_anne.mid
index b843ca364..b843ca364 100644
--- a/sound/songs/midi/mus_rg_santoan.mid
+++ b/sound/songs/midi/mus_rg_ss_anne.mid
diff --git a/sound/songs/midi/mus_rg_naminori.mid b/sound/songs/midi/mus_rg_surf.mid
index 3ac684ac2..3ac684ac2 100644
--- a/sound/songs/midi/mus_rg_naminori.mid
+++ b/sound/songs/midi/mus_rg_surf.mid
diff --git a/sound/songs/midi/mus_rg_tvnoize.mid b/sound/songs/midi/mus_rg_teachy_tv_menu.mid
index b5d446098..b5d446098 100644
--- a/sound/songs/midi/mus_rg_tvnoize.mid
+++ b/sound/songs/midi/mus_rg_teachy_tv_menu.mid
diff --git a/sound/songs/midi/mus_rg_oshie_tv.mid b/sound/songs/midi/mus_rg_teachy_tv_show.mid
index efea75d49..efea75d49 100644
--- a/sound/songs/midi/mus_rg_oshie_tv.mid
+++ b/sound/songs/midi/mus_rg_teachy_tv_show.mid
diff --git a/sound/songs/midi/mus_rg_t_tower.mid b/sound/songs/midi/mus_rg_trainer_tower.mid
index 81db02876..81db02876 100644
--- a/sound/songs/midi/mus_rg_t_tower.mid
+++ b/sound/songs/midi/mus_rg_trainer_tower.mid
diff --git a/sound/songs/midi/mus_rg_union.mid b/sound/songs/midi/mus_rg_union_room.mid
index b484050fa..b484050fa 100644
--- a/sound/songs/midi/mus_rg_union.mid
+++ b/sound/songs/midi/mus_rg_union_room.mid
diff --git a/sound/songs/midi/mus_rg_kuchiba.mid b/sound/songs/midi/mus_rg_vermillion.mid
index 11cb67d1a..11cb67d1a 100644
--- a/sound/songs/midi/mus_rg_kuchiba.mid
+++ b/sound/songs/midi/mus_rg_vermillion.mid
diff --git a/sound/songs/midi/mus_kachi3.mid b/sound/songs/midi/mus_rg_victory_gym_leader.mid
index 1ce5dd13c..1ce5dd13c 100644
--- a/sound/songs/midi/mus_kachi3.mid
+++ b/sound/songs/midi/mus_rg_victory_gym_leader.mid
diff --git a/sound/songs/midi/mus_rg_champ_r.mid b/sound/songs/midi/mus_rg_victory_road.mid
index 6552b65bd..6552b65bd 100644
--- a/sound/songs/midi/mus_rg_champ_r.mid
+++ b/sound/songs/midi/mus_rg_victory_road.mid
diff --git a/sound/songs/midi/mus_rg_win_tre.mid b/sound/songs/midi/mus_rg_victory_trainer.mid
index 26fe06bf0..26fe06bf0 100644
--- a/sound/songs/midi/mus_rg_win_tre.mid
+++ b/sound/songs/midi/mus_rg_victory_trainer.mid
diff --git a/sound/songs/midi/mus_kachi2.mid b/sound/songs/midi/mus_rg_victory_wild.mid
index 51fad46fc..51fad46fc 100644
--- a/sound/songs/midi/mus_kachi2.mid
+++ b/sound/songs/midi/mus_rg_victory_wild.mid
diff --git a/sound/songs/midi/mus_rg_t_mori.mid b/sound/songs/midi/mus_rg_viridian_forest.mid
index 76d73039e..76d73039e 100644
--- a/sound/songs/midi/mus_rg_t_mori.mid
+++ b/sound/songs/midi/mus_rg_viridian_forest.mid
diff --git a/sound/songs/midi/mus_rg_vs_last.mid b/sound/songs/midi/mus_rg_vs_champion.mid
index e63d2eb45..e63d2eb45 100644
--- a/sound/songs/midi/mus_rg_vs_last.mid
+++ b/sound/songs/midi/mus_rg_vs_champion.mid
diff --git a/sound/songs/midi/mus_rg_vs_deo.mid b/sound/songs/midi/mus_rg_vs_deoxys.mid
index 1f9c00bb1..1f9c00bb1 100644
--- a/sound/songs/midi/mus_rg_vs_deo.mid
+++ b/sound/songs/midi/mus_rg_vs_deoxys.mid
diff --git a/sound/songs/midi/mus_rg_vs_gym.mid b/sound/songs/midi/mus_rg_vs_gym_leader.mid
index aa2da087f..aa2da087f 100644
--- a/sound/songs/midi/mus_rg_vs_gym.mid
+++ b/sound/songs/midi/mus_rg_vs_gym_leader.mid
diff --git a/sound/songs/midi/mus_rg_vs_den.mid b/sound/songs/midi/mus_rg_vs_legend.mid
index 93d3785be..93d3785be 100644
--- a/sound/songs/midi/mus_rg_vs_den.mid
+++ b/sound/songs/midi/mus_rg_vs_legend.mid
diff --git a/sound/songs/midi/mus_rg_vs_myu2.mid b/sound/songs/midi/mus_rg_vs_mewtwo.mid
index e6a578320..e6a578320 100644
--- a/sound/songs/midi/mus_rg_vs_myu2.mid
+++ b/sound/songs/midi/mus_rg_vs_mewtwo.mid
diff --git a/sound/songs/midi/mus_rg_vs_tore.mid b/sound/songs/midi/mus_rg_vs_trainer.mid
index 95172f63e..95172f63e 100644
--- a/sound/songs/midi/mus_rg_vs_tore.mid
+++ b/sound/songs/midi/mus_rg_vs_trainer.mid
diff --git a/sound/songs/midi/mus_rg_vs_yasei.mid b/sound/songs/midi/mus_rg_vs_wild.mid
index 835aff19b..835aff19b 100644
--- a/sound/songs/midi/mus_rg_vs_yasei.mid
+++ b/sound/songs/midi/mus_rg_vs_wild.mid
diff --git a/sound/songs/midi/mus_bd_time.mid b/sound/songs/midi/mus_roulette.mid
index 39fb08327..39fb08327 100644
--- a/sound/songs/midi/mus_bd_time.mid
+++ b/sound/songs/midi/mus_roulette.mid
diff --git a/sound/songs/midi/mus_dooro1.mid b/sound/songs/midi/mus_route101.mid
index 5c4f5d76a..5c4f5d76a 100644
--- a/sound/songs/midi/mus_dooro1.mid
+++ b/sound/songs/midi/mus_route101.mid
diff --git a/sound/songs/midi/mus_nextroad.mid b/sound/songs/midi/mus_route104.mid
index 571345f5a..571345f5a 100644
--- a/sound/songs/midi/mus_nextroad.mid
+++ b/sound/songs/midi/mus_route104.mid
diff --git a/sound/songs/midi/mus_dooro_x1.mid b/sound/songs/midi/mus_route110.mid
index 087682996..087682996 100644
--- a/sound/songs/midi/mus_dooro_x1.mid
+++ b/sound/songs/midi/mus_route110.mid
diff --git a/sound/songs/midi/mus_ashroad.mid b/sound/songs/midi/mus_route111.mid
index 4b7f71c09..4b7f71c09 100644
--- a/sound/songs/midi/mus_ashroad.mid
+++ b/sound/songs/midi/mus_route111.mid
diff --git a/sound/songs/midi/mus_kazanbai.mid b/sound/songs/midi/mus_route113.mid
index bddb3947c..bddb3947c 100644
--- a/sound/songs/midi/mus_kazanbai.mid
+++ b/sound/songs/midi/mus_route113.mid
diff --git a/sound/songs/midi/mus_granroad.mid b/sound/songs/midi/mus_route119.mid
index cb286982d..cb286982d 100644
--- a/sound/songs/midi/mus_granroad.mid
+++ b/sound/songs/midi/mus_route119.mid
diff --git a/sound/songs/midi/mus_dooro_x3.mid b/sound/songs/midi/mus_route120.mid
index ac1fef688..ac1fef688 100644
--- a/sound/songs/midi/mus_dooro_x3.mid
+++ b/sound/songs/midi/mus_route120.mid
diff --git a/sound/songs/midi/mus_dooro_x4.mid b/sound/songs/midi/mus_route122.mid
index 14e439359..14e439359 100644
--- a/sound/songs/midi/mus_dooro_x4.mid
+++ b/sound/songs/midi/mus_route122.mid
diff --git a/sound/songs/midi/mus_gotown.mid b/sound/songs/midi/mus_rustboro.mid
index 6a2ab5dea..6a2ab5dea 100644
--- a/sound/songs/midi/mus_gotown.mid
+++ b/sound/songs/midi/mus_rustboro.mid
diff --git a/sound/songs/midi/mus_safari.mid b/sound/songs/midi/mus_safari_zone.mid
index 95fab66a8..95fab66a8 100644
--- a/sound/songs/midi/mus_safari.mid
+++ b/sound/songs/midi/mus_safari_zone.mid
diff --git a/sound/songs/midi/mus_m_boat.mid b/sound/songs/midi/mus_sailing.mid
index 97c539a75..97c539a75 100644
--- a/sound/songs/midi/mus_m_boat.mid
+++ b/sound/songs/midi/mus_sailing.mid
diff --git a/sound/songs/midi/mus_sattower.mid b/sound/songs/midi/mus_sattower.mid
deleted file mode 100644
index a8294614f..000000000
--- a/sound/songs/midi/mus_sattower.mid
+++ /dev/null
diff --git a/sound/songs/midi/mus_p_school.mid b/sound/songs/midi/mus_school.mid
index 4e6fd3340..4e6fd3340 100644
--- a/sound/songs/midi/mus_p_school.mid
+++ b/sound/songs/midi/mus_school.mid
diff --git a/sound/songs/midi/mus_maborosi.mid b/sound/songs/midi/mus_sealed_chamber.mid
index c888c0d54..c888c0d54 100644
--- a/sound/songs/midi/mus_maborosi.mid
+++ b/sound/songs/midi/mus_sealed_chamber.mid
diff --git a/sound/songs/midi/mus_finecity.mid b/sound/songs/midi/mus_slateport.mid
index f83647287..f83647287 100644
--- a/sound/songs/midi/mus_finecity.mid
+++ b/sound/songs/midi/mus_slateport.mid
diff --git a/sound/songs/midi/mus_me_b_big.mid b/sound/songs/midi/mus_slots_jackpot.mid
index 150a669b4..150a669b4 100644
--- a/sound/songs/midi/mus_me_b_big.mid
+++ b/sound/songs/midi/mus_slots_jackpot.mid
diff --git a/sound/songs/midi/mus_me_b_small.mid b/sound/songs/midi/mus_slots_win.mid
index bf7aa33be..bf7aa33be 100644
--- a/sound/songs/midi/mus_me_b_small.mid
+++ b/sound/songs/midi/mus_slots_win.mid
diff --git a/sound/songs/midi/mus_runecity.mid b/sound/songs/midi/mus_sootopolis.mid
index 2e8c49c2f..2e8c49c2f 100644
--- a/sound/songs/midi/mus_runecity.mid
+++ b/sound/songs/midi/mus_sootopolis.mid
diff --git a/sound/songs/midi/mus_naminori.mid b/sound/songs/midi/mus_surf.mid
index 70813e343..70813e343 100644
--- a/sound/songs/midi/mus_naminori.mid
+++ b/sound/songs/midi/mus_surf.mid
diff --git a/sound/songs/midi/mus_title3.mid b/sound/songs/midi/mus_title.mid
index 1664a86b2..1664a86b2 100644
--- a/sound/songs/midi/mus_title3.mid
+++ b/sound/songs/midi/mus_title.mid
diff --git a/sound/songs/midi/mus_me_zannen.mid b/sound/songs/midi/mus_too_bad.mid
index 2d071d524..2d071d524 100644
--- a/sound/songs/midi/mus_me_zannen.mid
+++ b/sound/songs/midi/mus_too_bad.mid
diff --git a/sound/songs/midi/mus_karakuri.mid b/sound/songs/midi/mus_trick_house.mid
index d6c387ee3..d6c387ee3 100644
--- a/sound/songs/midi/mus_karakuri.mid
+++ b/sound/songs/midi/mus_trick_house.mid
diff --git a/sound/songs/midi/mus_deepdeep.mid b/sound/songs/midi/mus_underwater.mid
index 352c80cd7..352c80cd7 100644
--- a/sound/songs/midi/mus_deepdeep.mid
+++ b/sound/songs/midi/mus_underwater.mid
diff --git a/sound/songs/midi/mus_gomachi0.mid b/sound/songs/midi/mus_verdanturf.mid
index b41d157a3..b41d157a3 100644
--- a/sound/songs/midi/mus_gomachi0.mid
+++ b/sound/songs/midi/mus_verdanturf.mid
diff --git a/sound/songs/midi/mus_kachi4.mid b/sound/songs/midi/mus_victory_aqua_magma.mid
index 3b8cc422e..3b8cc422e 100644
--- a/sound/songs/midi/mus_kachi4.mid
+++ b/sound/songs/midi/mus_victory_aqua_magma.mid
diff --git a/sound/songs/midi/mus_rg_win_gym.mid b/sound/songs/midi/mus_victory_gym_leader.mid
index 1ce5dd13c..1ce5dd13c 100644
--- a/sound/songs/midi/mus_rg_win_gym.mid
+++ b/sound/songs/midi/mus_victory_gym_leader.mid
diff --git a/sound/songs/midi/mus_kachi5.mid b/sound/songs/midi/mus_victory_league.mid
index 94be2e4c7..94be2e4c7 100644
--- a/sound/songs/midi/mus_kachi5.mid
+++ b/sound/songs/midi/mus_victory_league.mid
diff --git a/sound/songs/midi/mus_c_road.mid b/sound/songs/midi/mus_victory_road.mid
index f1dfc2a93..f1dfc2a93 100644
--- a/sound/songs/midi/mus_c_road.mid
+++ b/sound/songs/midi/mus_victory_road.mid
diff --git a/sound/songs/midi/mus_kachi1.mid b/sound/songs/midi/mus_victory_trainer.mid
index 7d3f75009..7d3f75009 100644
--- a/sound/songs/midi/mus_kachi1.mid
+++ b/sound/songs/midi/mus_victory_trainer.mid
diff --git a/sound/songs/midi/mus_rg_win_yasei.mid b/sound/songs/midi/mus_victory_wild.mid
index 51fad46fc..51fad46fc 100644
--- a/sound/songs/midi/mus_rg_win_yasei.mid
+++ b/sound/songs/midi/mus_victory_wild.mid
diff --git a/sound/songs/midi/mus_battle31.mid b/sound/songs/midi/mus_vs_aqua_magma.mid
index e38085793..e38085793 100644
--- a/sound/songs/midi/mus_battle31.mid
+++ b/sound/songs/midi/mus_vs_aqua_magma.mid
diff --git a/sound/songs/midi/mus_battle30.mid b/sound/songs/midi/mus_vs_aqua_magma_leader.mid
index 3bd5e9e11..3bd5e9e11 100644
--- a/sound/songs/midi/mus_battle30.mid
+++ b/sound/songs/midi/mus_vs_aqua_magma_leader.mid
diff --git a/sound/songs/midi/mus_battle33.mid b/sound/songs/midi/mus_vs_champion.mid
index b16580d66..b16580d66 100644
--- a/sound/songs/midi/mus_battle33.mid
+++ b/sound/songs/midi/mus_vs_champion.mid
diff --git a/sound/songs/midi/mus_battle38.mid b/sound/songs/midi/mus_vs_elite_four.mid
index e4b1f34b9..e4b1f34b9 100644
--- a/sound/songs/midi/mus_battle38.mid
+++ b/sound/songs/midi/mus_vs_elite_four.mid
diff --git a/sound/songs/midi/mus_vs_front.mid b/sound/songs/midi/mus_vs_frontier_brain.mid
index 7e251430c..7e251430c 100644
--- a/sound/songs/midi/mus_vs_front.mid
+++ b/sound/songs/midi/mus_vs_frontier_brain.mid
diff --git a/sound/songs/midi/mus_battle32.mid b/sound/songs/midi/mus_vs_gym_leader.mid
index 0b7c49bd7..0b7c49bd7 100644
--- a/sound/songs/midi/mus_battle32.mid
+++ b/sound/songs/midi/mus_vs_gym_leader.mid
diff --git a/sound/songs/midi/mus_battle34.mid b/sound/songs/midi/mus_vs_kyogre_groudon.mid
index 2b4aced44..2b4aced44 100644
--- a/sound/songs/midi/mus_battle34.mid
+++ b/sound/songs/midi/mus_vs_kyogre_groudon.mid
diff --git a/sound/songs/midi/mus_vs_rekku.mid b/sound/songs/midi/mus_vs_rayquaza.mid
index 2b4aced44..2b4aced44 100644
--- a/sound/songs/midi/mus_vs_rekku.mid
+++ b/sound/songs/midi/mus_vs_rayquaza.mid
diff --git a/sound/songs/midi/mus_battle36.mid b/sound/songs/midi/mus_vs_regi.mid
index 2aab509a3..2aab509a3 100644
--- a/sound/songs/midi/mus_battle36.mid
+++ b/sound/songs/midi/mus_vs_regi.mid
diff --git a/sound/songs/midi/mus_battle35.mid b/sound/songs/midi/mus_vs_rival.mid
index 2d34a08b9..2d34a08b9 100644
--- a/sound/songs/midi/mus_battle35.mid
+++ b/sound/songs/midi/mus_vs_rival.mid
diff --git a/sound/songs/midi/mus_battle20.mid b/sound/songs/midi/mus_vs_trainer.mid
index 531b5fba1..531b5fba1 100644
--- a/sound/songs/midi/mus_battle20.mid
+++ b/sound/songs/midi/mus_vs_trainer.mid
diff --git a/sound/songs/midi/mus_battle27.mid b/sound/songs/midi/mus_vs_wild.mid
index 3d55c0181..3d55c0181 100644
--- a/sound/songs/midi/mus_battle27.mid
+++ b/sound/songs/midi/mus_vs_wild.mid
diff --git a/sound/songs/midi/mus_hideri.mid b/sound/songs/midi/mus_weather_groudon.mid
index 0ca75c2e9..0ca75c2e9 100644
--- a/sound/songs/midi/mus_hideri.mid
+++ b/sound/songs/midi/mus_weather_groudon.mid
diff --git a/sound/songs/midi/se_dendou.mid b/sound/songs/midi/se_applause.mid
index 4ab2a2212..4ab2a2212 100644
--- a/sound/songs/midi/se_dendou.mid
+++ b/sound/songs/midi/se_applause.mid
diff --git a/sound/songs/midi/se_hantei1.mid b/sound/songs/midi/se_arena_timeup1.mid
index 1f2855420..1f2855420 100644
--- a/sound/songs/midi/se_hantei1.mid
+++ b/sound/songs/midi/se_arena_timeup1.mid
diff --git a/sound/songs/midi/se_hantei2.mid b/sound/songs/midi/se_arena_timeup2.mid
index 06698dde9..06698dde9 100644
--- a/sound/songs/midi/se_hantei2.mid
+++ b/sound/songs/midi/se_arena_timeup2.mid
diff --git a/sound/songs/midi/se_bowa.mid b/sound/songs/midi/se_ball.mid
index 684ea618c..684ea618c 100644
--- a/sound/songs/midi/se_bowa.mid
+++ b/sound/songs/midi/se_ball.mid
diff --git a/sound/songs/midi/se_kon.mid b/sound/songs/midi/se_ball_bounce_1.mid
index 438d4b047..438d4b047 100644
--- a/sound/songs/midi/se_kon.mid
+++ b/sound/songs/midi/se_ball_bounce_1.mid
diff --git a/sound/songs/midi/se_kon2.mid b/sound/songs/midi/se_ball_bounce_2.mid
index 961d82642..961d82642 100644
--- a/sound/songs/midi/se_kon2.mid
+++ b/sound/songs/midi/se_ball_bounce_2.mid
diff --git a/sound/songs/midi/se_kon3.mid b/sound/songs/midi/se_ball_bounce_3.mid
index fc35f1931..fc35f1931 100644
--- a/sound/songs/midi/se_kon3.mid
+++ b/sound/songs/midi/se_ball_bounce_3.mid
diff --git a/sound/songs/midi/se_kon4.mid b/sound/songs/midi/se_ball_bounce_4.mid
index b0f5561b9..b0f5561b9 100644
--- a/sound/songs/midi/se_kon4.mid
+++ b/sound/songs/midi/se_ball_bounce_4.mid
diff --git a/sound/songs/midi/se_bowa2.mid b/sound/songs/midi/se_ball_open.mid
index 669bed700..669bed700 100644
--- a/sound/songs/midi/se_bowa2.mid
+++ b/sound/songs/midi/se_ball_open.mid
diff --git a/sound/songs/midi/se_nageru.mid b/sound/songs/midi/se_ball_throw.mid
index 171f45a5a..171f45a5a 100644
--- a/sound/songs/midi/se_nageru.mid
+++ b/sound/songs/midi/se_ball_throw.mid
diff --git a/sound/songs/midi/se_suikomu.mid b/sound/songs/midi/se_ball_trade.mid
index 871c8e5d3..871c8e5d3 100644
--- a/sound/songs/midi/se_suikomu.mid
+++ b/sound/songs/midi/se_ball_trade.mid
diff --git a/sound/songs/midi/se_tb_kon.mid b/sound/songs/midi/se_ball_tray_ball.mid
index 8526da9c6..8526da9c6 100644
--- a/sound/songs/midi/se_tb_kon.mid
+++ b/sound/songs/midi/se_ball_tray_ball.mid
diff --git a/sound/songs/midi/se_tb_start.mid b/sound/songs/midi/se_ball_tray_enter.mid
index c88e2a8ea..c88e2a8ea 100644
--- a/sound/songs/midi/se_tb_start.mid
+++ b/sound/songs/midi/se_ball_tray_enter.mid
diff --git a/sound/songs/midi/se_tb_kara.mid b/sound/songs/midi/se_ball_tray_exit.mid
index a4c2a51d7..a4c2a51d7 100644
--- a/sound/songs/midi/se_tb_kara.mid
+++ b/sound/songs/midi/se_ball_tray_exit.mid
diff --git a/sound/songs/midi/se_fuusen2.mid b/sound/songs/midi/se_balloon_blue.mid
index 4efc1a525..4efc1a525 100644
--- a/sound/songs/midi/se_fuusen2.mid
+++ b/sound/songs/midi/se_balloon_blue.mid
diff --git a/sound/songs/midi/se_fuusen1.mid b/sound/songs/midi/se_balloon_red.mid
index d22679a86..d22679a86 100644
--- a/sound/songs/midi/se_fuusen1.mid
+++ b/sound/songs/midi/se_balloon_red.mid
diff --git a/sound/songs/midi/se_fuusen3.mid b/sound/songs/midi/se_balloon_yellow.mid
index ae40e0008..ae40e0008 100644
--- a/sound/songs/midi/se_fuusen3.mid
+++ b/sound/songs/midi/se_balloon_yellow.mid
diff --git a/sound/songs/midi/se_ban.mid b/sound/songs/midi/se_bang.mid
index 0722a1c36..0722a1c36 100644
--- a/sound/songs/midi/se_ban.mid
+++ b/sound/songs/midi/se_bang.mid
diff --git a/sound/songs/midi/se_moter.mid b/sound/songs/midi/se_berry_blender.mid
index 8203333e5..8203333e5 100644
--- a/sound/songs/midi/se_moter.mid
+++ b/sound/songs/midi/se_berry_blender.mid
diff --git a/sound/songs/midi/se_jitensya.mid b/sound/songs/midi/se_bike_bell.mid
index 9d5de6cbd..9d5de6cbd 100644
--- a/sound/songs/midi/se_jitensya.mid
+++ b/sound/songs/midi/se_bike_bell.mid
diff --git a/sound/songs/midi/se_jite_pyoko.mid b/sound/songs/midi/se_bike_hop.mid
index 013be8590..013be8590 100644
--- a/sound/songs/midi/se_jite_pyoko.mid
+++ b/sound/songs/midi/se_bike_hop.mid
diff --git a/sound/songs/midi/se_toy_kabe.mid b/sound/songs/midi/se_breakable_door.mid
index c35be0c0d..c35be0c0d 100644
--- a/sound/songs/midi/se_toy_kabe.mid
+++ b/sound/songs/midi/se_breakable_door.mid
diff --git a/sound/songs/midi/se_hashi.mid b/sound/songs/midi/se_bridge_walk.mid
index fdd772c18..fdd772c18 100644
--- a/sound/songs/midi/se_hashi.mid
+++ b/sound/songs/midi/se_bridge_walk.mid
diff --git a/sound/songs/midi/se_tk_kasya.mid b/sound/songs/midi/se_click.mid
index baa73e0c6..baa73e0c6 100644
--- a/sound/songs/midi/se_tk_kasya.mid
+++ b/sound/songs/midi/se_click.mid
diff --git a/sound/songs/midi/se_fu_zaku2.mid b/sound/songs/midi/se_contest_condition_lose.mid
index 3fc903844..3fc903844 100644
--- a/sound/songs/midi/se_fu_zaku2.mid
+++ b/sound/songs/midi/se_contest_condition_lose.mid
diff --git a/sound/songs/midi/se_c_maku_d.mid b/sound/songs/midi/se_contest_curtain_fall.mid
index 04e2bfb11..04e2bfb11 100644
--- a/sound/songs/midi/se_c_maku_d.mid
+++ b/sound/songs/midi/se_contest_curtain_fall.mid
diff --git a/sound/songs/midi/se_c_maku_u.mid b/sound/songs/midi/se_contest_curtain_rise.mid
index 109f92322..109f92322 100644
--- a/sound/songs/midi/se_c_maku_u.mid
+++ b/sound/songs/midi/se_contest_curtain_rise.mid
diff --git a/sound/songs/midi/se_c_gaji.mid b/sound/songs/midi/se_contest_heart.mid
index 94b6389b7..94b6389b7 100644
--- a/sound/songs/midi/se_c_gaji.mid
+++ b/sound/songs/midi/se_contest_heart.mid
diff --git a/sound/songs/midi/se_c_pasi.mid b/sound/songs/midi/se_contest_icon_change.mid
index eea9c5707..eea9c5707 100644
--- a/sound/songs/midi/se_c_pasi.mid
+++ b/sound/songs/midi/se_contest_icon_change.mid
diff --git a/sound/songs/midi/se_c_syu.mid b/sound/songs/midi/se_contest_icon_clear.mid
index 3766d5f51..3766d5f51 100644
--- a/sound/songs/midi/se_c_syu.mid
+++ b/sound/songs/midi/se_contest_icon_clear.mid
diff --git a/sound/songs/midi/se_c_pikon.mid b/sound/songs/midi/se_contest_mons_turn.mid
index 718a61443..718a61443 100644
--- a/sound/songs/midi/se_c_pikon.mid
+++ b/sound/songs/midi/se_contest_mons_turn.mid
diff --git a/sound/songs/midi/se_jyuni.mid b/sound/songs/midi/se_contest_place.mid
index f68a31e46..f68a31e46 100644
--- a/sound/songs/midi/se_jyuni.mid
+++ b/sound/songs/midi/se_contest_place.mid
diff --git a/sound/songs/midi/se_z_search.mid b/sound/songs/midi/se_dex_search.mid
index 1869374af..1869374af 100644
--- a/sound/songs/midi/se_z_search.mid
+++ b/sound/songs/midi/se_dex_search.mid
diff --git a/sound/songs/midi/se_pinpon.mid b/sound/songs/midi/se_ding_dong.mid
index 924dafda5..924dafda5 100644
--- a/sound/songs/midi/se_pinpon.mid
+++ b/sound/songs/midi/se_ding_dong.mid
diff --git a/sound/songs/midi/se_t_ooame.mid b/sound/songs/midi/se_downpour.mid
index 3aedd4404..3aedd4404 100644
--- a/sound/songs/midi/se_t_ooame.mid
+++ b/sound/songs/midi/se_downpour.mid
diff --git a/sound/songs/midi/se_t_ooame_e.mid b/sound/songs/midi/se_downpour_stop.mid
index b73010142..b73010142 100644
--- a/sound/songs/midi/se_t_ooame_e.mid
+++ b/sound/songs/midi/se_downpour_stop.mid
diff --git a/sound/songs/midi/se_kouka_m.mid b/sound/songs/midi/se_effective.mid
index d98bd0027..d98bd0027 100644
--- a/sound/songs/midi/se_kouka_m.mid
+++ b/sound/songs/midi/se_effective.mid
diff --git a/sound/songs/midi/se_tamago.mid b/sound/songs/midi/se_egg_hatch.mid
index 67d3959eb..67d3959eb 100644
--- a/sound/songs/midi/se_tamago.mid
+++ b/sound/songs/midi/se_egg_hatch.mid
diff --git a/sound/songs/midi/se_elebeta.mid b/sound/songs/midi/se_elevator.mid
index 66ee5fd1f..66ee5fd1f 100644
--- a/sound/songs/midi/se_elebeta.mid
+++ b/sound/songs/midi/se_elevator.mid
diff --git a/sound/songs/midi/se_esuka.mid b/sound/songs/midi/se_escalator.mid
index 6a9e22a5b..6a9e22a5b 100644
--- a/sound/songs/midi/se_esuka.mid
+++ b/sound/songs/midi/se_escalator.mid
diff --git a/sound/songs/midi/se_kaidan.mid b/sound/songs/midi/se_exit.mid
index 575307d86..575307d86 100644
--- a/sound/songs/midi/se_kaidan.mid
+++ b/sound/songs/midi/se_exit.mid
diff --git a/sound/songs/midi/se_expmax.mid b/sound/songs/midi/se_exp_max.mid
index 8772e915e..8772e915e 100644
--- a/sound/songs/midi/se_expmax.mid
+++ b/sound/songs/midi/se_exp_max.mid
diff --git a/sound/songs/midi/se_hazure.mid b/sound/songs/midi/se_failure.mid
index c3c52f88f..c3c52f88f 100644
--- a/sound/songs/midi/se_hazure.mid
+++ b/sound/songs/midi/se_failure.mid
diff --git a/sound/songs/midi/se_poke_dead.mid b/sound/songs/midi/se_faint.mid
index b6a0df4c8..b6a0df4c8 100644
--- a/sound/songs/midi/se_poke_dead.mid
+++ b/sound/songs/midi/se_faint.mid
diff --git a/sound/songs/midi/se_ru_hyuu.mid b/sound/songs/midi/se_fall.mid
index 1adfc9268..1adfc9268 100644
--- a/sound/songs/midi/se_ru_hyuu.mid
+++ b/sound/songs/midi/se_fall.mid
diff --git a/sound/songs/midi/se_doku.mid b/sound/songs/midi/se_field_poison.mid
index 83841203a..83841203a 100644
--- a/sound/songs/midi/se_doku.mid
+++ b/sound/songs/midi/se_field_poison.mid
diff --git a/sound/songs/midi/se_nigeru.mid b/sound/songs/midi/se_flee.mid
index faf37d529..faf37d529 100644
--- a/sound/songs/midi/se_nigeru.mid
+++ b/sound/songs/midi/se_flee.mid
diff --git a/sound/songs/midi/se_bidoro.mid b/sound/songs/midi/se_glass_flute.mid
index a0b639ba4..a0b639ba4 100644
--- a/sound/songs/midi/se_bidoro.mid
+++ b/sound/songs/midi/se_glass_flute.mid
diff --git a/sound/songs/midi/se_ru_gasyan.mid b/sound/songs/midi/se_ice_break.mid
index 486eabb9b..486eabb9b 100644
--- a/sound/songs/midi/se_ru_gasyan.mid
+++ b/sound/songs/midi/se_ice_break.mid
diff --git a/sound/songs/midi/se_ru_bari.mid b/sound/songs/midi/se_ice_crack.mid
index 14b1991e6..14b1991e6 100644
--- a/sound/songs/midi/se_ru_bari.mid
+++ b/sound/songs/midi/se_ice_crack.mid
diff --git a/sound/songs/midi/se_ru_gashin.mid b/sound/songs/midi/se_ice_stairs.mid
index ae29a385b..ae29a385b 100644
--- a/sound/songs/midi/se_ru_gashin.mid
+++ b/sound/songs/midi/se_ice_stairs.mid
diff --git a/sound/songs/midi/se_op_basyu.mid b/sound/songs/midi/se_intro_blast.mid
index 4648741c2..4648741c2 100644
--- a/sound/songs/midi/se_op_basyu.mid
+++ b/sound/songs/midi/se_intro_blast.mid
diff --git a/sound/songs/midi/se_daugi.mid b/sound/songs/midi/se_itemfinder.mid
index 9b6538a70..9b6538a70 100644
--- a/sound/songs/midi/se_daugi.mid
+++ b/sound/songs/midi/se_itemfinder.mid
diff --git a/sound/songs/midi/se_fu_zuzuzu.mid b/sound/songs/midi/se_lavaridge_fall_warp.mid
index 962113ad3..962113ad3 100644
--- a/sound/songs/midi/se_fu_zuzuzu.mid
+++ b/sound/songs/midi/se_lavaridge_fall_warp.mid
diff --git a/sound/songs/midi/se_dansa.mid b/sound/songs/midi/se_ledge.mid
index 61eae0318..61eae0318 100644
--- a/sound/songs/midi/se_dansa.mid
+++ b/sound/songs/midi/se_ledge.mid
diff --git a/sound/songs/midi/se_hinsi.mid b/sound/songs/midi/se_low_health.mid
index 3676a4a04..3676a4a04 100644
--- a/sound/songs/midi/se_hinsi.mid
+++ b/sound/songs/midi/se_low_health.mid
diff --git a/sound/songs/midi/se_w020.mid b/sound/songs/midi/se_m_bind.mid
index eec8ccae9..eec8ccae9 100644
--- a/sound/songs/midi/se_w020.mid
+++ b/sound/songs/midi/se_m_bind.mid
diff --git a/sound/songs/midi/se_w004.mid b/sound/songs/midi/se_m_comet_punch.mid
index a27538d81..a27538d81 100644
--- a/sound/songs/midi/se_w004.mid
+++ b/sound/songs/midi/se_m_comet_punch.mid
diff --git a/sound/songs/midi/se_w015.mid b/sound/songs/midi/se_m_cut.mid
index 2f1b4e059..2f1b4e059 100644
--- a/sound/songs/midi/se_w015.mid
+++ b/sound/songs/midi/se_m_cut.mid
diff --git a/sound/songs/midi/se_w003.mid b/sound/songs/midi/se_m_double_slap.mid
index 80e7a52a7..80e7a52a7 100644
--- a/sound/songs/midi/se_w003.mid
+++ b/sound/songs/midi/se_m_double_slap.mid
diff --git a/sound/songs/midi/se_w007.mid b/sound/songs/midi/se_m_fire_punch.mid
index 2f75754f3..2f75754f3 100644
--- a/sound/songs/midi/se_w007.mid
+++ b/sound/songs/midi/se_m_fire_punch.mid
diff --git a/sound/songs/midi/se_w019.mid b/sound/songs/midi/se_m_fly.mid
index 6e63f48cc..6e63f48cc 100644
--- a/sound/songs/midi/se_w019.mid
+++ b/sound/songs/midi/se_m_fly.mid
diff --git a/sound/songs/midi/se_w016.mid b/sound/songs/midi/se_m_gust.mid
index 8bf167109..8bf167109 100644
--- a/sound/songs/midi/se_w016.mid
+++ b/sound/songs/midi/se_m_gust.mid
diff --git a/sound/songs/midi/se_w016b.mid b/sound/songs/midi/se_m_gust2.mid
index 6dd7020f9..6dd7020f9 100644
--- a/sound/songs/midi/se_w016b.mid
+++ b/sound/songs/midi/se_m_gust2.mid
diff --git a/sound/songs/midi/se_w029.mid b/sound/songs/midi/se_m_headbutt.mid
index 4cde4e2d5..4cde4e2d5 100644
--- a/sound/songs/midi/se_w029.mid
+++ b/sound/songs/midi/se_m_headbutt.mid
diff --git a/sound/songs/midi/se_w030.mid b/sound/songs/midi/se_m_horn_attack.mid
index 426cdfea4..426cdfea4 100644
--- a/sound/songs/midi/se_w030.mid
+++ b/sound/songs/midi/se_m_horn_attack.mid
diff --git a/sound/songs/midi/se_w026.mid b/sound/songs/midi/se_m_jump_kick.mid
index d43366801..d43366801 100644
--- a/sound/songs/midi/se_w026.mid
+++ b/sound/songs/midi/se_m_jump_kick.mid
diff --git a/sound/songs/midi/se_w043.mid b/sound/songs/midi/se_m_leer.mid
index b44876722..b44876722 100644
--- a/sound/songs/midi/se_w043.mid
+++ b/sound/songs/midi/se_m_leer.mid
diff --git a/sound/songs/midi/se_w025.mid b/sound/songs/midi/se_m_mega_kick.mid
index bcc9590b4..bcc9590b4 100644
--- a/sound/songs/midi/se_w025.mid
+++ b/sound/songs/midi/se_m_mega_kick.mid
diff --git a/sound/songs/midi/se_w025b.mid b/sound/songs/midi/se_m_mega_kick2.mid
index ac165424b..ac165424b 100644
--- a/sound/songs/midi/se_w025b.mid
+++ b/sound/songs/midi/se_m_mega_kick2.mid
diff --git a/sound/songs/midi/se_w006.mid b/sound/songs/midi/se_m_pay_day.mid
index 5f59591be..5f59591be 100644
--- a/sound/songs/midi/se_w006.mid
+++ b/sound/songs/midi/se_m_pay_day.mid
diff --git a/sound/songs/midi/se_w013.mid b/sound/songs/midi/se_m_razor_wind.mid
index ae94dafa2..ae94dafa2 100644
--- a/sound/songs/midi/se_w013.mid
+++ b/sound/songs/midi/se_m_razor_wind.mid
diff --git a/sound/songs/midi/se_w013b.mid b/sound/songs/midi/se_m_razor_wind2.mid
index 09e8d4c5d..09e8d4c5d 100644
--- a/sound/songs/midi/se_w013b.mid
+++ b/sound/songs/midi/se_m_razor_wind2.mid
diff --git a/sound/songs/midi/se_w028.mid b/sound/songs/midi/se_m_sand_attack.mid
index 7a053f799..7a053f799 100644
--- a/sound/songs/midi/se_w028.mid
+++ b/sound/songs/midi/se_m_sand_attack.mid
diff --git a/sound/songs/midi/se_w010.mid b/sound/songs/midi/se_m_scratch.mid
index 4b3c1cfcf..4b3c1cfcf 100644
--- a/sound/songs/midi/se_w010.mid
+++ b/sound/songs/midi/se_m_scratch.mid
diff --git a/sound/songs/midi/se_w014.mid b/sound/songs/midi/se_m_swords_dance.mid
index 8b17c79a9..8b17c79a9 100644
--- a/sound/songs/midi/se_w014.mid
+++ b/sound/songs/midi/se_m_swords_dance.mid
diff --git a/sound/songs/midi/se_w039.mid b/sound/songs/midi/se_m_tail_whip.mid
index 771581ce0..771581ce0 100644
--- a/sound/songs/midi/se_w039.mid
+++ b/sound/songs/midi/se_m_tail_whip.mid
diff --git a/sound/songs/midi/se_w036.mid b/sound/songs/midi/se_m_take_down.mid
index e5427c8df..e5427c8df 100644
--- a/sound/songs/midi/se_w036.mid
+++ b/sound/songs/midi/se_m_take_down.mid
diff --git a/sound/songs/midi/se_w011.mid b/sound/songs/midi/se_m_vicegrip.mid
index 703ae492b..703ae492b 100644
--- a/sound/songs/midi/se_w011.mid
+++ b/sound/songs/midi/se_m_vicegrip.mid
diff --git a/sound/songs/midi/se_w017.mid b/sound/songs/midi/se_m_wing_attack.mid
index 459e72406..459e72406 100644
--- a/sound/songs/midi/se_w017.mid
+++ b/sound/songs/midi/se_m_wing_attack.mid
diff --git a/sound/songs/midi/se_toy_dango.mid b/sound/songs/midi/se_mud_ball.mid
index baa1ed24e..baa1ed24e 100644
--- a/sound/songs/midi/se_toy_dango.mid
+++ b/sound/songs/midi/se_mud_ball.mid
diff --git a/sound/songs/midi/se_bt_start.mid b/sound/songs/midi/se_mugshot.mid
index 8c13783e9..8c13783e9 100644
--- a/sound/songs/midi/se_bt_start.mid
+++ b/sound/songs/midi/se_mugshot.mid
diff --git a/sound/songs/midi/se_kouka_l.mid b/sound/songs/midi/se_not_effective.mid
index 34aafbb18..34aafbb18 100644
--- a/sound/songs/midi/se_kouka_l.mid
+++ b/sound/songs/midi/se_not_effective.mid
diff --git a/sound/songs/midi/se_toy_a.mid b/sound/songs/midi/se_note_a.mid
index b6d5b6159..b6d5b6159 100644
--- a/sound/songs/midi/se_toy_a.mid
+++ b/sound/songs/midi/se_note_a.mid
diff --git a/sound/songs/midi/se_toy_b.mid b/sound/songs/midi/se_note_b.mid
index 9e27e72e7..9e27e72e7 100644
--- a/sound/songs/midi/se_toy_b.mid
+++ b/sound/songs/midi/se_note_b.mid
diff --git a/sound/songs/midi/se_toy_c.mid b/sound/songs/midi/se_note_c.mid
index 3d10dc6cb..3d10dc6cb 100644
--- a/sound/songs/midi/se_toy_c.mid
+++ b/sound/songs/midi/se_note_c.mid
diff --git a/sound/songs/midi/se_toy_c1.mid b/sound/songs/midi/se_note_c_high.mid
index 345925255..345925255 100644
--- a/sound/songs/midi/se_toy_c1.mid
+++ b/sound/songs/midi/se_note_c_high.mid
diff --git a/sound/songs/midi/se_toy_d.mid b/sound/songs/midi/se_note_d.mid
index 0de257ee5..0de257ee5 100644
--- a/sound/songs/midi/se_toy_d.mid
+++ b/sound/songs/midi/se_note_d.mid
diff --git a/sound/songs/midi/se_toy_e.mid b/sound/songs/midi/se_note_e.mid
index 214b32bca..214b32bca 100644
--- a/sound/songs/midi/se_toy_e.mid
+++ b/sound/songs/midi/se_note_e.mid
diff --git a/sound/songs/midi/se_toy_f.mid b/sound/songs/midi/se_note_f.mid
index 780e162e0..780e162e0 100644
--- a/sound/songs/midi/se_toy_f.mid
+++ b/sound/songs/midi/se_note_f.mid
diff --git a/sound/songs/midi/se_toy_g.mid b/sound/songs/midi/se_note_g.mid
index 73dae55a5..73dae55a5 100644
--- a/sound/songs/midi/se_toy_g.mid
+++ b/sound/songs/midi/se_note_g.mid
diff --git a/sound/songs/midi/se_tama.mid b/sound/songs/midi/se_orb.mid
index aa9fc7889..aa9fc7889 100644
--- a/sound/songs/midi/se_tama.mid
+++ b/sound/songs/midi/se_orb.mid
diff --git a/sound/songs/midi/se_curtain.mid b/sound/songs/midi/se_pike_curtain_close.mid
index 88c684318..88c684318 100644
--- a/sound/songs/midi/se_curtain.mid
+++ b/sound/songs/midi/se_pike_curtain_close.mid
diff --git a/sound/songs/midi/se_curtain1.mid b/sound/songs/midi/se_pike_curtain_open.mid
index 0a40e158e..0a40e158e 100644
--- a/sound/songs/midi/se_curtain1.mid
+++ b/sound/songs/midi/se_pike_curtain_open.mid
diff --git a/sound/songs/midi/se_toreeye.mid b/sound/songs/midi/se_pokenav_call.mid
index e25a9ac74..e25a9ac74 100644
--- a/sound/songs/midi/se_toreeye.mid
+++ b/sound/songs/midi/se_pokenav_call.mid
diff --git a/sound/songs/midi/se_toreoff.mid b/sound/songs/midi/se_pokenav_hang_up.mid
index 391f23a3d..391f23a3d 100644
--- a/sound/songs/midi/se_toreoff.mid
+++ b/sound/songs/midi/se_pokenav_hang_up.mid
diff --git a/sound/songs/midi/se_pn_off.mid b/sound/songs/midi/se_pokenav_off.mid
index 2fba0d159..2fba0d159 100644
--- a/sound/songs/midi/se_pn_off.mid
+++ b/sound/songs/midi/se_pokenav_off.mid
diff --git a/sound/songs/midi/se_pn_on.mid b/sound/songs/midi/se_pokenav_on.mid
index dfe850794..dfe850794 100644
--- a/sound/songs/midi/se_pn_on.mid
+++ b/sound/songs/midi/se_pokenav_on.mid
diff --git a/sound/songs/midi/se_mizu.mid b/sound/songs/midi/se_puddle.mid
index dfdc85619..dfdc85619 100644
--- a/sound/songs/midi/se_mizu.mid
+++ b/sound/songs/midi/se_puddle.mid
diff --git a/sound/songs/midi/se_t_koame.mid b/sound/songs/midi/se_rain.mid
index d8491b293..d8491b293 100644
--- a/sound/songs/midi/se_t_koame.mid
+++ b/sound/songs/midi/se_rain.mid
diff --git a/sound/songs/midi/se_t_koame_e.mid b/sound/songs/midi/se_rain_stop.mid
index 4a04f73f9..4a04f73f9 100644
--- a/sound/songs/midi/se_t_koame_e.mid
+++ b/sound/songs/midi/se_rain_stop.mid
diff --git a/sound/songs/midi/se_tu_saa.mid b/sound/songs/midi/se_repel.mid
index c84b176cb..c84b176cb 100644
--- a/sound/songs/midi/se_tu_saa.mid
+++ b/sound/songs/midi/se_repel.mid
diff --git a/sound/songs/midi/se_rg_bag1.mid b/sound/songs/midi/se_rg_bag_cursor.mid
index ac783bd38..ac783bd38 100644
--- a/sound/songs/midi/se_rg_bag1.mid
+++ b/sound/songs/midi/se_rg_bag_cursor.mid
diff --git a/sound/songs/midi/se_rg_bag2.mid b/sound/songs/midi/se_rg_bag_pocket.mid
index 97a5b32df..97a5b32df 100644
--- a/sound/songs/midi/se_rg_bag2.mid
+++ b/sound/songs/midi/se_rg_bag_pocket.mid
diff --git a/sound/songs/midi/se_rg_getting.mid b/sound/songs/midi/se_rg_ball_click.mid
index f8bf4b38f..f8bf4b38f 100644
--- a/sound/songs/midi/se_rg_getting.mid
+++ b/sound/songs/midi/se_rg_ball_click.mid
diff --git a/sound/songs/midi/se_rg_card1.mid b/sound/songs/midi/se_rg_card_flip.mid
index 22a50e6df..22a50e6df 100644
--- a/sound/songs/midi/se_rg_card1.mid
+++ b/sound/songs/midi/se_rg_card_flip.mid
diff --git a/sound/songs/midi/se_rg_card2.mid b/sound/songs/midi/se_rg_card_flipping.mid
index 02276b2ad..02276b2ad 100644
--- a/sound/songs/midi/se_rg_card2.mid
+++ b/sound/songs/midi/se_rg_card_flipping.mid
diff --git a/sound/songs/midi/se_rg_card3.mid b/sound/songs/midi/se_rg_card_open.mid
index 47cc451d0..47cc451d0 100644
--- a/sound/songs/midi/se_rg_card3.mid
+++ b/sound/songs/midi/se_rg_card_open.mid
diff --git a/sound/songs/midi/se_rg_deomov.mid b/sound/songs/midi/se_rg_deoxys_move.mid
index 0149d29db..0149d29db 100644
--- a/sound/songs/midi/se_rg_deomov.mid
+++ b/sound/songs/midi/se_rg_deoxys_move.mid
diff --git a/sound/songs/midi/se_rg_w_door.mid b/sound/songs/midi/se_rg_door.mid
index e0b6ba957..e0b6ba957 100644
--- a/sound/songs/midi/se_rg_w_door.mid
+++ b/sound/songs/midi/se_rg_door.mid
diff --git a/sound/songs/midi/se_rg_help_cl.mid b/sound/songs/midi/se_rg_help_close.mid
index 09b151631..09b151631 100644
--- a/sound/songs/midi/se_rg_help_cl.mid
+++ b/sound/songs/midi/se_rg_help_close.mid
diff --git a/sound/songs/midi/se_rg_help_ng.mid b/sound/songs/midi/se_rg_help_error.mid
index f9597632a..f9597632a 100644
--- a/sound/songs/midi/se_rg_help_ng.mid
+++ b/sound/songs/midi/se_rg_help_error.mid
diff --git a/sound/songs/midi/se_rg_help_op.mid b/sound/songs/midi/se_rg_help_open.mid
index 79b6c53a8..79b6c53a8 100644
--- a/sound/songs/midi/se_rg_help_op.mid
+++ b/sound/songs/midi/se_rg_help_open.mid
diff --git a/sound/songs/midi/se_rg_nawamiss.mid b/sound/songs/midi/se_rg_poke_jump_failure.mid
index c3c52f88f..c3c52f88f 100644
--- a/sound/songs/midi/se_rg_nawamiss.mid
+++ b/sound/songs/midi/se_rg_poke_jump_failure.mid
diff --git a/sound/songs/midi/se_rg_excellent.mid b/sound/songs/midi/se_rg_poke_jump_success.mid
index 8f7c267c4..8f7c267c4 100644
--- a/sound/songs/midi/se_rg_excellent.mid
+++ b/sound/songs/midi/se_rg_poke_jump_success.mid
diff --git a/sound/songs/midi/se_rg_kiteki.mid b/sound/songs/midi/se_rg_ss_anne_horn.mid
index 07e19663a..07e19663a 100644
--- a/sound/songs/midi/se_rg_kiteki.mid
+++ b/sound/songs/midi/se_rg_ss_anne_horn.mid
diff --git a/sound/songs/midi/se_hi_turun.mid b/sound/songs/midi/se_rotating_gate.mid
index 2a09f6c55..2a09f6c55 100644
--- a/sound/songs/midi/se_hi_turun.mid
+++ b/sound/songs/midi/se_rotating_gate.mid
diff --git a/sound/songs/midi/se_tamakoro.mid b/sound/songs/midi/se_roulette_ball.mid
index c6dce2865..c6dce2865 100644
--- a/sound/songs/midi/se_tamakoro.mid
+++ b/sound/songs/midi/se_roulette_ball.mid
diff --git a/sound/songs/midi/se_tamakoro_e.mid b/sound/songs/midi/se_roulette_ball2.mid
index 13675c690..13675c690 100644
--- a/sound/songs/midi/se_tamakoro_e.mid
+++ b/sound/songs/midi/se_roulette_ball2.mid
diff --git a/sound/songs/midi/se_reapoke.mid b/sound/songs/midi/se_shiny.mid
index b9a4fe810..b9a4fe810 100644
--- a/sound/songs/midi/se_reapoke.mid
+++ b/sound/songs/midi/se_shiny.mid
diff --git a/sound/songs/midi/se_naminori.mid b/sound/songs/midi/se_ship.mid
index ba2aa4931..ba2aa4931 100644
--- a/sound/songs/midi/se_naminori.mid
+++ b/sound/songs/midi/se_ship.mid
diff --git a/sound/songs/midi/se_regi.mid b/sound/songs/midi/se_shop.mid
index 28b727cb5..28b727cb5 100644
--- a/sound/songs/midi/se_regi.mid
+++ b/sound/songs/midi/se_shop.mid
diff --git a/sound/songs/midi/se_jido_doa.mid b/sound/songs/midi/se_sliding_door.mid
index 62fa8c911..62fa8c911 100644
--- a/sound/songs/midi/se_jido_doa.mid
+++ b/sound/songs/midi/se_sliding_door.mid
diff --git a/sound/songs/midi/se_seikai.mid b/sound/songs/midi/se_success.mid
index 32bfa07a8..32bfa07a8 100644
--- a/sound/songs/midi/se_seikai.mid
+++ b/sound/songs/midi/se_success.mid
diff --git a/sound/songs/midi/se_ussoki.mid b/sound/songs/midi/se_sudowoodo_shake.mid
index c5be0de8d..c5be0de8d 100644
--- a/sound/songs/midi/se_ussoki.mid
+++ b/sound/songs/midi/se_sudowoodo_shake.mid
diff --git a/sound/songs/midi/se_kouka_h.mid b/sound/songs/midi/se_super_effective.mid
index e70b12901..e70b12901 100644
--- a/sound/songs/midi/se_kouka_h.mid
+++ b/sound/songs/midi/se_super_effective.mid
diff --git a/sound/songs/midi/se_mu_pachi.mid b/sound/songs/midi/se_switch.mid
index 3d909dadb..3d909dadb 100644
--- a/sound/songs/midi/se_mu_pachi.mid
+++ b/sound/songs/midi/se_switch.mid
diff --git a/sound/songs/midi/se_basabasa.mid b/sound/songs/midi/se_taillow_wing_flap.mid
index 7a965abf5..7a965abf5 100644
--- a/sound/songs/midi/se_basabasa.mid
+++ b/sound/songs/midi/se_taillow_wing_flap.mid
diff --git a/sound/songs/midi/se_t_kami.mid b/sound/songs/midi/se_thunder.mid
index 71d8163bd..71d8163bd 100644
--- a/sound/songs/midi/se_t_kami.mid
+++ b/sound/songs/midi/se_thunder.mid
diff --git a/sound/songs/midi/se_t_kami2.mid b/sound/songs/midi/se_thunder2.mid
index c47731b94..c47731b94 100644
--- a/sound/songs/midi/se_t_kami2.mid
+++ b/sound/songs/midi/se_thunder2.mid
diff --git a/sound/songs/midi/se_t_ame.mid b/sound/songs/midi/se_thunderstorm.mid
index 9e15434cd..9e15434cd 100644
--- a/sound/songs/midi/se_t_ame.mid
+++ b/sound/songs/midi/se_thunderstorm.mid
diff --git a/sound/songs/midi/se_t_ame_e.mid b/sound/songs/midi/se_thunderstorm_stop.mid
index 2397eea64..2397eea64 100644
--- a/sound/songs/midi/se_t_ame_e.mid
+++ b/sound/songs/midi/se_thunderstorm_stop.mid
diff --git a/sound/songs/midi/se_track_door.mid b/sound/songs/midi/se_truck_door.mid
index 5cc1dbad8..5cc1dbad8 100644
--- a/sound/songs/midi/se_track_door.mid
+++ b/sound/songs/midi/se_truck_door.mid
diff --git a/sound/songs/midi/se_track_move.mid b/sound/songs/midi/se_truck_move.mid
index ced96f83a..ced96f83a 100644
--- a/sound/songs/midi/se_track_move.mid
+++ b/sound/songs/midi/se_truck_move.mid
diff --git a/sound/songs/midi/se_track_stop.mid b/sound/songs/midi/se_truck_stop.mid
index 509b2dd8e..509b2dd8e 100644
--- a/sound/songs/midi/se_track_stop.mid
+++ b/sound/songs/midi/se_truck_stop.mid
diff --git a/sound/songs/midi/se_track_haiki.mid b/sound/songs/midi/se_truck_unload.mid
index 42db7fd0e..42db7fd0e 100644
--- a/sound/songs/midi/se_track_haiki.mid
+++ b/sound/songs/midi/se_truck_unload.mid
diff --git a/sound/songs/midi/se_ki_gasyan.mid b/sound/songs/midi/se_unlock.mid
index 8a57132d9..8a57132d9 100644
--- a/sound/songs/midi/se_ki_gasyan.mid
+++ b/sound/songs/midi/se_unlock.mid
diff --git a/sound/songs/midi/se_kaifuku.mid b/sound/songs/midi/se_use_item.mid
index 4375a705d..4375a705d 100644
--- a/sound/songs/midi/se_kaifuku.mid
+++ b/sound/songs/midi/se_use_item.mid
diff --git a/sound/songs/midi/se_jihanki.mid b/sound/songs/midi/se_vend.mid
index ac6436d72..ac6436d72 100644
--- a/sound/songs/midi/se_jihanki.mid
+++ b/sound/songs/midi/se_vend.mid
diff --git a/sound/songs/midi/se_tk_warpin.mid b/sound/songs/midi/se_warp_in.mid
index e47d3df4d..e47d3df4d 100644
--- a/sound/songs/midi/se_tk_warpin.mid
+++ b/sound/songs/midi/se_warp_in.mid
diff --git a/sound/songs/midi/se_tk_warpout.mid b/sound/songs/midi/se_warp_out.mid
index 5072e6448..5072e6448 100644
--- a/sound/songs/midi/se_tk_warpout.mid
+++ b/sound/songs/midi/se_warp_out.mid
diff --git a/sound/songs/se_z_page.s b/sound/songs/se_dex_page.s
index a767bf5ad..884f0d12a 100644
--- a/sound/songs/se_z_page.s
+++ b/sound/songs/se_dex_page.s
@@ -1,28 +1,28 @@
 	.include "MPlayDef.s"
 
-	.equ	se_z_page_grp, voicegroup127
-	.equ	se_z_page_pri, 5
-	.equ	se_z_page_rev, reverb_set+50
-	.equ	se_z_page_mvl, 127
-	.equ	se_z_page_key, 0
-	.equ	se_z_page_tbs, 1
-	.equ	se_z_page_exg, 0
-	.equ	se_z_page_cmp, 1
+	.equ	se_dex_page_grp, voicegroup127
+	.equ	se_dex_page_pri, 5
+	.equ	se_dex_page_rev, reverb_set+50
+	.equ	se_dex_page_mvl, 127
+	.equ	se_dex_page_key, 0
+	.equ	se_dex_page_tbs, 1
+	.equ	se_dex_page_exg, 0
+	.equ	se_dex_page_cmp, 1
 
 	.section .rodata
-	.global	se_z_page
+	.global	se_dex_page
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_z_page_1:
-	.byte	KEYSH , se_z_page_key+0
-	.byte	TEMPO , 100*se_z_page_tbs/2
+se_dex_page_1:
+	.byte	KEYSH , se_dex_page_key+0
+	.byte	TEMPO , 100*se_dex_page_tbs/2
 	.byte		VOICE , 4
 	.byte		BENDR , 12
 	.byte		XCMD  , xIECV , 10
 	.byte		        xIECL , 8
-	.byte		VOL   , 90*se_z_page_mvl/mxv
+	.byte		VOL   , 90*se_dex_page_mvl/mxv
 	.byte		BEND  , c_v+4
 	.byte		N01   , Cn5 , v064
 	.byte	W01
@@ -41,14 +41,14 @@ se_z_page_1:
 @******************************************************@
 	.align	2
 
-se_z_page:
+se_dex_page:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_z_page_pri	@ Priority
-	.byte	se_z_page_rev	@ Reverb.
+	.byte	se_dex_page_pri	@ Priority
+	.byte	se_dex_page_rev	@ Reverb.
 
-	.word	se_z_page_grp
+	.word	se_dex_page_grp
 
-	.word	se_z_page_1
+	.word	se_dex_page_1
 
 	.end
diff --git a/sound/songs/se_dex_scroll.s b/sound/songs/se_dex_scroll.s
new file mode 100644
index 000000000..6c7ad7746
--- /dev/null
+++ b/sound/songs/se_dex_scroll.s
@@ -0,0 +1,46 @@
+	.include "MPlayDef.s"
+
+	.equ	se_dex_scroll_grp, voicegroup127
+	.equ	se_dex_scroll_pri, 5
+	.equ	se_dex_scroll_rev, reverb_set+50
+	.equ	se_dex_scroll_mvl, 127
+	.equ	se_dex_scroll_key, 0
+	.equ	se_dex_scroll_tbs, 1
+	.equ	se_dex_scroll_exg, 0
+	.equ	se_dex_scroll_cmp, 1
+
+	.section .rodata
+	.global	se_dex_scroll
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_dex_scroll_1:
+	.byte	KEYSH , se_dex_scroll_key+0
+	.byte	TEMPO , 100*se_dex_scroll_tbs/2
+	.byte		VOICE , 4
+	.byte		BENDR , 12
+	.byte		XCMD  , xIECV , 10
+	.byte		        xIECL , 8
+	.byte		VOL   , 40*se_dex_scroll_mvl/mxv
+	.byte		BEND  , c_v+4
+	.byte		N01   , Gn4 , v127
+	.byte	W01
+	.byte		        Gn4 , v020
+	.byte	W02
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_dex_scroll:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_dex_scroll_pri	@ Priority
+	.byte	se_dex_scroll_rev	@ Reverb.
+
+	.word	se_dex_scroll_grp
+
+	.word	se_dex_scroll_1
+
+	.end
diff --git a/sound/songs/se_w071.s b/sound/songs/se_m_absorb.s
index 3f1e008b9..35213fdaa 100644
--- a/sound/songs/se_w071.s
+++ b/sound/songs/se_m_absorb.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w071_grp, voicegroup128
-	.equ	se_w071_pri, 4
-	.equ	se_w071_rev, reverb_set+50
-	.equ	se_w071_mvl, 127
-	.equ	se_w071_key, 0
-	.equ	se_w071_tbs, 1
-	.equ	se_w071_exg, 0
-	.equ	se_w071_cmp, 1
+	.equ	se_m_absorb_grp, voicegroup128
+	.equ	se_m_absorb_pri, 4
+	.equ	se_m_absorb_rev, reverb_set+50
+	.equ	se_m_absorb_mvl, 127
+	.equ	se_m_absorb_key, 0
+	.equ	se_m_absorb_tbs, 1
+	.equ	se_m_absorb_exg, 0
+	.equ	se_m_absorb_cmp, 1
 
 	.section .rodata
-	.global	se_w071
+	.global	se_m_absorb
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w071_1:
-	.byte	KEYSH , se_w071_key+0
-	.byte	TEMPO , 150*se_w071_tbs/2
+se_m_absorb_1:
+	.byte	KEYSH , se_m_absorb_key+0
+	.byte	TEMPO , 150*se_m_absorb_tbs/2
 	.byte		VOICE , 24
-	.byte		VOL   , 110*se_w071_mvl/mxv
+	.byte		VOL   , 110*se_m_absorb_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -28,30 +28,30 @@ se_w071_1:
 	.byte		        Gn6 , v112
 	.byte	W01
 	.byte		VOICE , 38
-	.byte		VOL   , 58*se_w071_mvl/mxv
+	.byte		VOL   , 58*se_m_absorb_mvl/mxv
 	.byte		N08   , Gn4 
 	.byte	W01
-	.byte		VOL   , 68*se_w071_mvl/mxv
+	.byte		VOL   , 68*se_m_absorb_mvl/mxv
 	.byte		PAN   , c_v+8
 	.byte		BEND  , c_v-20
 	.byte	W01
-	.byte		VOL   , 75*se_w071_mvl/mxv
+	.byte		VOL   , 75*se_m_absorb_mvl/mxv
 	.byte		PAN   , c_v-8
 	.byte		BEND  , c_v-48
 	.byte	W02
-	.byte		VOL   , 83*se_w071_mvl/mxv
+	.byte		VOL   , 83*se_m_absorb_mvl/mxv
 	.byte		PAN   , c_v+8
 	.byte		BEND  , c_v-18
 	.byte	W01
-	.byte		VOL   , 90*se_w071_mvl/mxv
+	.byte		VOL   , 90*se_m_absorb_mvl/mxv
 	.byte		PAN   , c_v-8
 	.byte		BEND  , c_v+10
 	.byte	W01
-	.byte		VOL   , 101*se_w071_mvl/mxv
+	.byte		VOL   , 101*se_m_absorb_mvl/mxv
 	.byte		PAN   , c_v+9
 	.byte		BEND  , c_v+39
 	.byte	W01
-	.byte		VOL   , 110*se_w071_mvl/mxv
+	.byte		VOL   , 110*se_m_absorb_mvl/mxv
 	.byte		PAN   , c_v-8
 	.byte		BEND  , c_v+63
 	.byte	W03
@@ -60,14 +60,14 @@ se_w071_1:
 @******************************************************@
 	.align	2
 
-se_w071:
+se_m_absorb:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w071_pri	@ Priority
-	.byte	se_w071_rev	@ Reverb.
+	.byte	se_m_absorb_pri	@ Priority
+	.byte	se_m_absorb_rev	@ Reverb.
 
-	.word	se_w071_grp
+	.word	se_m_absorb_grp
 
-	.word	se_w071_1
+	.word	se_m_absorb_1
 
 	.end
diff --git a/sound/songs/se_w071b.s b/sound/songs/se_m_absorb_2.s
index 81d8fe8c7..3f9df6dc4 100644
--- a/sound/songs/se_w071b.s
+++ b/sound/songs/se_m_absorb_2.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w071b_grp, voicegroup128
-	.equ	se_w071b_pri, 4
-	.equ	se_w071b_rev, reverb_set+50
-	.equ	se_w071b_mvl, 127
-	.equ	se_w071b_key, 0
-	.equ	se_w071b_tbs, 1
-	.equ	se_w071b_exg, 0
-	.equ	se_w071b_cmp, 1
+	.equ	se_m_absorb_2_grp, voicegroup128
+	.equ	se_m_absorb_2_pri, 4
+	.equ	se_m_absorb_2_rev, reverb_set+50
+	.equ	se_m_absorb_2_mvl, 127
+	.equ	se_m_absorb_2_key, 0
+	.equ	se_m_absorb_2_tbs, 1
+	.equ	se_m_absorb_2_exg, 0
+	.equ	se_m_absorb_2_cmp, 1
 
 	.section .rodata
-	.global	se_w071b
+	.global	se_m_absorb_2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w071b_1:
-	.byte	KEYSH , se_w071b_key+0
-	.byte	TEMPO , 150*se_w071b_tbs/2
+se_m_absorb_2_1:
+	.byte	KEYSH , se_m_absorb_2_key+0
+	.byte	TEMPO , 150*se_m_absorb_2_tbs/2
 	.byte		VOICE , 46
-	.byte		VOL   , 110*se_w071b_mvl/mxv
+	.byte		VOL   , 110*se_m_absorb_2_mvl/mxv
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+15
@@ -81,11 +81,11 @@ se_w071b_1:
 
 @********************** Track  2 **********************@
 
-se_w071b_2:
-	.byte	KEYSH , se_w071b_key+0
+se_m_absorb_2_2:
+	.byte	KEYSH , se_m_absorb_2_key+0
 	.byte		VOICE , 53
 	.byte		BENDR , 2
-	.byte		VOL   , 43*se_w071b_mvl/mxv
+	.byte		VOL   , 43*se_m_absorb_2_mvl/mxv
 	.byte		BEND  , c_v+15
 	.byte		N02   , An6 , v112
 	.byte	W02
@@ -141,15 +141,15 @@ se_w071b_2:
 @******************************************************@
 	.align	2
 
-se_w071b:
+se_m_absorb_2:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w071b_pri	@ Priority
-	.byte	se_w071b_rev	@ Reverb.
+	.byte	se_m_absorb_2_pri	@ Priority
+	.byte	se_m_absorb_2_rev	@ Reverb.
 
-	.word	se_w071b_grp
+	.word	se_m_absorb_2_grp
 
-	.word	se_w071b_1
-	.word	se_w071b_2
+	.word	se_m_absorb_2_1
+	.word	se_m_absorb_2_2
 
 	.end
diff --git a/sound/songs/se_w151.s b/sound/songs/se_m_acid_armor.s
index c012b2d5f..c7f350a9b 100644
--- a/sound/songs/se_w151.s
+++ b/sound/songs/se_m_acid_armor.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w151_grp, voicegroup128
-	.equ	se_w151_pri, 4
-	.equ	se_w151_rev, reverb_set+50
-	.equ	se_w151_mvl, 127
-	.equ	se_w151_key, 0
-	.equ	se_w151_tbs, 1
-	.equ	se_w151_exg, 0
-	.equ	se_w151_cmp, 1
+	.equ	se_m_acid_armor_grp, voicegroup128
+	.equ	se_m_acid_armor_pri, 4
+	.equ	se_m_acid_armor_rev, reverb_set+50
+	.equ	se_m_acid_armor_mvl, 127
+	.equ	se_m_acid_armor_key, 0
+	.equ	se_m_acid_armor_tbs, 1
+	.equ	se_m_acid_armor_exg, 0
+	.equ	se_m_acid_armor_cmp, 1
 
 	.section .rodata
-	.global	se_w151
+	.global	se_m_acid_armor
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w151_1:
-	.byte	KEYSH , se_w151_key+0
-	.byte	TEMPO , 150*se_w151_tbs/2
+se_m_acid_armor_1:
+	.byte	KEYSH , se_m_acid_armor_key+0
+	.byte	TEMPO , 150*se_m_acid_armor_tbs/2
 	.byte		VOICE , 31
-	.byte		VOL   , 110*se_w151_mvl/mxv
+	.byte		VOL   , 110*se_m_acid_armor_mvl/mxv
 	.byte		BENDR , 24
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-37
@@ -189,14 +189,14 @@ se_w151_1:
 @******************************************************@
 	.align	2
 
-se_w151:
+se_m_acid_armor:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w151_pri	@ Priority
-	.byte	se_w151_rev	@ Reverb.
+	.byte	se_m_acid_armor_pri	@ Priority
+	.byte	se_m_acid_armor_rev	@ Reverb.
 
-	.word	se_w151_grp
+	.word	se_m_acid_armor_grp
 
-	.word	se_w151_1
+	.word	se_m_acid_armor_1
 
 	.end
diff --git a/sound/songs/se_w213.s b/sound/songs/se_m_attract.s
index b35e17038..8e18c16dc 100644
--- a/sound/songs/se_w213.s
+++ b/sound/songs/se_m_attract.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w213_grp, voicegroup128
-	.equ	se_w213_pri, 4
-	.equ	se_w213_rev, reverb_set+50
-	.equ	se_w213_mvl, 127
-	.equ	se_w213_key, 0
-	.equ	se_w213_tbs, 1
-	.equ	se_w213_exg, 0
-	.equ	se_w213_cmp, 1
+	.equ	se_m_attract_grp, voicegroup128
+	.equ	se_m_attract_pri, 4
+	.equ	se_m_attract_rev, reverb_set+50
+	.equ	se_m_attract_mvl, 127
+	.equ	se_m_attract_key, 0
+	.equ	se_m_attract_tbs, 1
+	.equ	se_m_attract_exg, 0
+	.equ	se_m_attract_cmp, 1
 
 	.section .rodata
-	.global	se_w213
+	.global	se_m_attract
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w213_1:
-	.byte	KEYSH , se_w213_key+0
-	.byte	TEMPO , 210*se_w213_tbs/2
+se_m_attract_1:
+	.byte	KEYSH , se_m_attract_key+0
+	.byte	TEMPO , 210*se_m_attract_tbs/2
 	.byte		VOICE , 46
-	.byte		VOL   , 95*se_w213_mvl/mxv
+	.byte		VOL   , 95*se_m_attract_mvl/mxv
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+15
@@ -67,11 +67,11 @@ se_w213_1:
 
 @********************** Track  2 **********************@
 
-se_w213_2:
-	.byte	KEYSH , se_w213_key+0
+se_m_attract_2:
+	.byte	KEYSH , se_m_attract_key+0
 	.byte		VOICE , 53
 	.byte		BENDR , 2
-	.byte		VOL   , 43*se_w213_mvl/mxv
+	.byte		VOL   , 43*se_m_attract_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+15
 	.byte		N06   , Cn5 , v120
@@ -112,15 +112,15 @@ se_w213_2:
 @******************************************************@
 	.align	2
 
-se_w213:
+se_m_attract:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w213_pri	@ Priority
-	.byte	se_w213_rev	@ Reverb.
+	.byte	se_m_attract_pri	@ Priority
+	.byte	se_m_attract_rev	@ Reverb.
 
-	.word	se_w213_grp
+	.word	se_m_attract_grp
 
-	.word	se_w213_1
-	.word	se_w213_2
+	.word	se_m_attract_1
+	.word	se_m_attract_2
 
 	.end
diff --git a/sound/songs/se_w213b.s b/sound/songs/se_m_attract2.s
index b7da4378e..7d3d6f3c5 100644
--- a/sound/songs/se_w213b.s
+++ b/sound/songs/se_m_attract2.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w213b_grp, voicegroup128
-	.equ	se_w213b_pri, 4
-	.equ	se_w213b_rev, reverb_set+50
-	.equ	se_w213b_mvl, 127
-	.equ	se_w213b_key, 0
-	.equ	se_w213b_tbs, 1
-	.equ	se_w213b_exg, 0
-	.equ	se_w213b_cmp, 1
+	.equ	se_m_attract2_grp, voicegroup128
+	.equ	se_m_attract2_pri, 4
+	.equ	se_m_attract2_rev, reverb_set+50
+	.equ	se_m_attract2_mvl, 127
+	.equ	se_m_attract2_key, 0
+	.equ	se_m_attract2_tbs, 1
+	.equ	se_m_attract2_exg, 0
+	.equ	se_m_attract2_cmp, 1
 
 	.section .rodata
-	.global	se_w213b
+	.global	se_m_attract2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w213b_1:
-	.byte	KEYSH , se_w213b_key+0
-	.byte	TEMPO , 150*se_w213b_tbs/2
+se_m_attract2_1:
+	.byte	KEYSH , se_m_attract2_key+0
+	.byte	TEMPO , 150*se_m_attract2_tbs/2
 	.byte		VOICE , 61
 	.byte		BENDR , 44
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w213b_mvl/mxv
+	.byte		VOL   , 110*se_m_attract2_mvl/mxv
 	.byte		MOD   , 30
 	.byte		BEND  , c_v+2
 	.byte		N54   , Dn4 , v080
@@ -69,11 +69,11 @@ se_w213b_1:
 
 @********************** Track  2 **********************@
 
-se_w213b_2:
-	.byte	KEYSH , se_w213b_key+0
+se_m_attract2_2:
+	.byte	KEYSH , se_m_attract2_key+0
 	.byte		VOICE , 62
 	.byte		BENDR , 44
-	.byte		VOL   , 110*se_w213b_mvl/mxv
+	.byte		VOL   , 110*se_m_attract2_mvl/mxv
 	.byte		MOD   , 30
 	.byte		PAN   , c_v+1
 	.byte		BEND  , c_v+1
@@ -113,15 +113,15 @@ se_w213b_2:
 @******************************************************@
 	.align	2
 
-se_w213b:
+se_m_attract2:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w213b_pri	@ Priority
-	.byte	se_w213b_rev	@ Reverb.
+	.byte	se_m_attract2_pri	@ Priority
+	.byte	se_m_attract2_rev	@ Reverb.
 
-	.word	se_w213b_grp
+	.word	se_m_attract2_grp
 
-	.word	se_w213b_1
-	.word	se_w213b_2
+	.word	se_m_attract2_1
+	.word	se_m_attract2_2
 
 	.end
diff --git a/sound/songs/se_m_barrier.s b/sound/songs/se_m_barrier.s
new file mode 100644
index 000000000..54d57700f
--- /dev/null
+++ b/sound/songs/se_m_barrier.s
@@ -0,0 +1,276 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_barrier_grp, voicegroup128
+	.equ	se_m_barrier_pri, 4
+	.equ	se_m_barrier_rev, reverb_set+50
+	.equ	se_m_barrier_mvl, 127
+	.equ	se_m_barrier_key, 0
+	.equ	se_m_barrier_tbs, 1
+	.equ	se_m_barrier_exg, 0
+	.equ	se_m_barrier_cmp, 1
+
+	.section .rodata
+	.global	se_m_barrier
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_barrier_1:
+	.byte	KEYSH , se_m_barrier_key+0
+	.byte	TEMPO , 150*se_m_barrier_tbs/2
+	.byte		VOICE , 19
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v+3
+	.byte		N06   , Cn6 , v088
+	.byte	W01
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-8
+	.byte	W01
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-17
+	.byte	W01
+	.byte		PAN   , c_v-6
+	.byte		VOL   , 24*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-34
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 11*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-45
+	.byte	W02
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N06   , Cn6 , v084
+	.byte	W01
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-11
+	.byte	W01
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-20
+	.byte	W01
+	.byte		PAN   , c_v-6
+	.byte		VOL   , 24*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-37
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 11*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-47
+	.byte	W02
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-1
+	.byte		N06   , Cn6 , v076
+	.byte	W01
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-11
+	.byte	W01
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-21
+	.byte	W01
+	.byte		PAN   , c_v-6
+	.byte		VOL   , 24*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-38
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 11*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-48
+	.byte	W02
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-1
+	.byte		N06   , Cn6 , v064
+	.byte	W01
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-11
+	.byte	W01
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-21
+	.byte	W01
+	.byte		PAN   , c_v-6
+	.byte		VOL   , 24*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-38
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 11*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-48
+	.byte	W02
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-2
+	.byte		N06   , Cn6 , v056
+	.byte	W01
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-12
+	.byte	W01
+	.byte		PAN   , c_v-6
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-22
+	.byte	W01
+	.byte		PAN   , c_v+8
+	.byte		VOL   , 24*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-39
+	.byte	W01
+	.byte		PAN   , c_v-10
+	.byte		VOL   , 11*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-49
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-2
+	.byte		N06   , Cn6 , v044
+	.byte	W01
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-12
+	.byte	W01
+	.byte		PAN   , c_v-6
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-22
+	.byte	W01
+	.byte		PAN   , c_v+8
+	.byte		VOL   , 24*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-39
+	.byte	W01
+	.byte		PAN   , c_v-10
+	.byte		VOL   , 11*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-49
+	.byte	W02
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-2
+	.byte		N06   , Cn6 , v036
+	.byte	W01
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-13
+	.byte	W01
+	.byte		PAN   , c_v-6
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-22
+	.byte	W01
+	.byte		PAN   , c_v+8
+	.byte		VOL   , 24*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-39
+	.byte	W01
+	.byte		PAN   , c_v-10
+	.byte		VOL   , 11*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-49
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-2
+	.byte		N06   , Cn6 , v028
+	.byte	W01
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-13
+	.byte	W01
+	.byte		PAN   , c_v-6
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-22
+	.byte	W01
+	.byte		PAN   , c_v+8
+	.byte		VOL   , 24*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-39
+	.byte	W01
+	.byte		PAN   , c_v-10
+	.byte		VOL   , 11*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-49
+	.byte	W02
+	.byte	W06
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_barrier_2:
+	.byte	KEYSH , se_m_barrier_key+0
+	.byte		VOICE , 53
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-5
+	.byte	W02
+	.byte		N06   , An5 , v064
+	.byte	W02
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte	W02
+	.byte		        56*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        24*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_barrier_mvl/mxv
+	.byte		N06   , An5 , v056
+	.byte	W02
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte	W02
+se_m_barrier_2_000:
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        24*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_barrier_mvl/mxv
+	.byte		N06   , An5 , v052
+	.byte	W02
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte	W02
+	.byte	PEND
+	.byte	PATT
+	 .word	se_m_barrier_2_000
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        24*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_barrier_mvl/mxv
+	.byte		N06   , An5 , v048
+	.byte	W02
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte	W02
+	.byte		        56*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        24*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_barrier_mvl/mxv
+	.byte		N06   , An5 , v044
+	.byte	W02
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte	W02
+	.byte		        56*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        24*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_barrier_mvl/mxv
+	.byte		N06   , An5 , v040
+	.byte	W02
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte	W02
+	.byte		        56*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        24*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_barrier_mvl/mxv
+	.byte		N06   , An5 , v036
+	.byte	W02
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte	W02
+	.byte		        56*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        24*se_m_barrier_mvl/mxv
+	.byte	W05
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_barrier:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_barrier_pri	@ Priority
+	.byte	se_m_barrier_rev	@ Reverb.
+
+	.word	se_m_barrier_grp
+
+	.word	se_m_barrier_1
+	.word	se_m_barrier_2
+
+	.end
diff --git a/sound/songs/se_w226.s b/sound/songs/se_m_baton_pass.s
index fe6c6d05e..30027e5b6 100644
--- a/sound/songs/se_w226.s
+++ b/sound/songs/se_m_baton_pass.s
@@ -1,43 +1,43 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w226_grp, voicegroup128
-	.equ	se_w226_pri, 4
-	.equ	se_w226_rev, reverb_set+50
-	.equ	se_w226_mvl, 127
-	.equ	se_w226_key, 0
-	.equ	se_w226_tbs, 1
-	.equ	se_w226_exg, 0
-	.equ	se_w226_cmp, 1
+	.equ	se_m_baton_pass_grp, voicegroup128
+	.equ	se_m_baton_pass_pri, 4
+	.equ	se_m_baton_pass_rev, reverb_set+50
+	.equ	se_m_baton_pass_mvl, 127
+	.equ	se_m_baton_pass_key, 0
+	.equ	se_m_baton_pass_tbs, 1
+	.equ	se_m_baton_pass_exg, 0
+	.equ	se_m_baton_pass_cmp, 1
 
 	.section .rodata
-	.global	se_w226
+	.global	se_m_baton_pass
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w226_1:
-	.byte	KEYSH , se_w226_key+0
+se_m_baton_pass_1:
+	.byte	KEYSH , se_m_baton_pass_key+0
 	.byte		VOICE , 19
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 12*se_w226_mvl/mxv
+	.byte		VOL   , 12*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+49
 	.byte		N06   , Gn4 , v080
 	.byte	W01
-	.byte		VOL   , 44*se_w226_mvl/mxv
+	.byte		VOL   , 44*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+22
 	.byte	W01
-	.byte		VOL   , 62*se_w226_mvl/mxv
+	.byte		VOL   , 62*se_m_baton_pass_mvl/mxv
 	.byte		PAN   , c_v+8
-	.byte		VOL   , 75*se_w226_mvl/mxv
+	.byte		VOL   , 75*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+20
 	.byte	W01
-	.byte		VOL   , 87*se_w226_mvl/mxv
+	.byte		VOL   , 87*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+33
 	.byte	W01
-	.byte		VOL   , 96*se_w226_mvl/mxv
+	.byte		VOL   , 96*se_m_baton_pass_mvl/mxv
 	.byte		PAN   , c_v-7
-	.byte		VOL   , 100*se_w226_mvl/mxv
+	.byte		VOL   , 100*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+54
 	.byte	W01
 	.byte		        c_v+63
@@ -51,18 +51,18 @@ se_w226_1:
 	.byte		VOICE , 45
 	.byte		MOD   , 30
 	.byte		BENDR , 24
-	.byte		VOL   , 54*se_w226_mvl/mxv
+	.byte		VOL   , 54*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   , Gn3 , v108
 	.byte	W01
-	.byte		VOL   , 70*se_w226_mvl/mxv
+	.byte		VOL   , 70*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+4
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 80*se_w226_mvl/mxv
+	.byte		VOL   , 80*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+9
 	.byte	W01
-	.byte		VOL   , 100*se_w226_mvl/mxv
+	.byte		VOL   , 100*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+16
 	.byte	W01
 	.byte		        c_v+24
@@ -123,17 +123,17 @@ se_w226_1:
 
 @********************** Track  2 **********************@
 
-se_w226_2:
-	.byte	KEYSH , se_w226_key+0
+se_m_baton_pass_2:
+	.byte	KEYSH , se_m_baton_pass_key+0
 	.byte		VOICE , 57
-	.byte		VOL   , 59*se_w226_mvl/mxv
+	.byte		VOL   , 59*se_m_baton_pass_mvl/mxv
 	.byte		N06   , Gs4 , v052
 	.byte	W01
-	.byte		VOL   , 72*se_w226_mvl/mxv
+	.byte		VOL   , 72*se_m_baton_pass_mvl/mxv
 	.byte	W01
-	.byte		        90*se_w226_mvl/mxv
+	.byte		        90*se_m_baton_pass_mvl/mxv
 	.byte	W01
-	.byte		        100*se_w226_mvl/mxv
+	.byte		        100*se_m_baton_pass_mvl/mxv
 	.byte	W03
 	.byte	W02
 	.byte		N04   , Gs4 , v024
@@ -155,15 +155,15 @@ se_w226_2:
 @******************************************************@
 	.align	2
 
-se_w226:
+se_m_baton_pass:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w226_pri	@ Priority
-	.byte	se_w226_rev	@ Reverb.
+	.byte	se_m_baton_pass_pri	@ Priority
+	.byte	se_m_baton_pass_rev	@ Reverb.
 
-	.word	se_w226_grp
+	.word	se_m_baton_pass_grp
 
-	.word	se_w226_1
-	.word	se_w226_2
+	.word	se_m_baton_pass_1
+	.word	se_m_baton_pass_2
 
 	.end
diff --git a/sound/songs/se_m_belly_drum.s b/sound/songs/se_m_belly_drum.s
new file mode 100644
index 000000000..919c02b16
--- /dev/null
+++ b/sound/songs/se_m_belly_drum.s
@@ -0,0 +1,72 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_belly_drum_grp, voicegroup128
+	.equ	se_m_belly_drum_pri, 4
+	.equ	se_m_belly_drum_rev, reverb_set+50
+	.equ	se_m_belly_drum_mvl, 127
+	.equ	se_m_belly_drum_key, 0
+	.equ	se_m_belly_drum_tbs, 1
+	.equ	se_m_belly_drum_exg, 0
+	.equ	se_m_belly_drum_cmp, 1
+
+	.section .rodata
+	.global	se_m_belly_drum
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_belly_drum_1:
+	.byte	KEYSH , se_m_belly_drum_key+0
+	.byte	TEMPO , 150*se_m_belly_drum_tbs/2
+	.byte		VOICE , 6
+	.byte		BENDR , 12
+	.byte		VOL   , 115*se_m_belly_drum_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+0
+	.byte		N19   , An2 , v127
+	.byte	W01
+	.byte		BEND  , c_v-6
+	.byte	W01
+	.byte		        c_v-10
+	.byte	W01
+	.byte		        c_v-14
+	.byte	W01
+	.byte		        c_v-12
+	.byte	W02
+	.byte		        c_v-14
+	.byte	W01
+	.byte		        c_v-18
+	.byte	W01
+	.byte		VOL   , 108*se_m_belly_drum_mvl/mxv
+	.byte		BEND  , c_v-20
+	.byte	W01
+	.byte		        c_v-22
+	.byte	W01
+	.byte		VOL   , 94*se_m_belly_drum_mvl/mxv
+	.byte	W03
+	.byte		        78*se_m_belly_drum_mvl/mxv
+	.byte	W01
+	.byte		        62*se_m_belly_drum_mvl/mxv
+	.byte	W01
+	.byte		        40*se_m_belly_drum_mvl/mxv
+	.byte	W01
+	.byte		        27*se_m_belly_drum_mvl/mxv
+	.byte	W02
+	.byte		        12*se_m_belly_drum_mvl/mxv
+	.byte	W06
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_belly_drum:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_belly_drum_pri	@ Priority
+	.byte	se_m_belly_drum_rev	@ Reverb.
+
+	.word	se_m_belly_drum_grp
+
+	.word	se_m_belly_drum_1
+
+	.end
diff --git a/sound/songs/se_w044.s b/sound/songs/se_m_bite.s
index ad706d93f..3c51a8f2f 100644
--- a/sound/songs/se_w044.s
+++ b/sound/songs/se_m_bite.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w044_grp, voicegroup128
-	.equ	se_w044_pri, 4
-	.equ	se_w044_rev, reverb_set+50
-	.equ	se_w044_mvl, 127
-	.equ	se_w044_key, 0
-	.equ	se_w044_tbs, 1
-	.equ	se_w044_exg, 0
-	.equ	se_w044_cmp, 1
+	.equ	se_m_bite_grp, voicegroup128
+	.equ	se_m_bite_pri, 4
+	.equ	se_m_bite_rev, reverb_set+50
+	.equ	se_m_bite_mvl, 127
+	.equ	se_m_bite_key, 0
+	.equ	se_m_bite_tbs, 1
+	.equ	se_m_bite_exg, 0
+	.equ	se_m_bite_cmp, 1
 
 	.section .rodata
-	.global	se_w044
+	.global	se_m_bite
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w044_1:
-	.byte	KEYSH , se_w044_key+0
-	.byte	TEMPO , 220*se_w044_tbs/2
+se_m_bite_1:
+	.byte	KEYSH , se_m_bite_key+0
+	.byte	TEMPO , 220*se_m_bite_tbs/2
 	.byte		VOICE , 26
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+6
-	.byte		VOL   , 110*se_w044_mvl/mxv
+	.byte		VOL   , 110*se_m_bite_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N02   , Gn3 , v112
 	.byte	W02
@@ -70,10 +70,10 @@ se_w044_1:
 
 @********************** Track  2 **********************@
 
-se_w044_2:
-	.byte	KEYSH , se_w044_key+0
+se_m_bite_2:
+	.byte	KEYSH , se_m_bite_key+0
 	.byte		VOICE , 27
-	.byte		VOL   , 110*se_w044_mvl/mxv
+	.byte		VOL   , 110*se_m_bite_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte	W10
@@ -86,15 +86,15 @@ se_w044_2:
 @******************************************************@
 	.align	2
 
-se_w044:
+se_m_bite:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w044_pri	@ Priority
-	.byte	se_w044_rev	@ Reverb.
+	.byte	se_m_bite_pri	@ Priority
+	.byte	se_m_bite_rev	@ Reverb.
 
-	.word	se_w044_grp
+	.word	se_m_bite_grp
 
-	.word	se_w044_1
-	.word	se_w044_2
+	.word	se_m_bite_1
+	.word	se_m_bite_2
 
 	.end
diff --git a/sound/songs/se_w059.s b/sound/songs/se_m_blizzard.s
index 6b163ef7e..6bce3c987 100644
--- a/sound/songs/se_w059.s
+++ b/sound/songs/se_m_blizzard.s
@@ -1,49 +1,49 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w059_grp, voicegroup128
-	.equ	se_w059_pri, 4
-	.equ	se_w059_rev, reverb_set+50
-	.equ	se_w059_mvl, 127
-	.equ	se_w059_key, 0
-	.equ	se_w059_tbs, 1
-	.equ	se_w059_exg, 0
-	.equ	se_w059_cmp, 1
+	.equ	se_m_blizzard_grp, voicegroup128
+	.equ	se_m_blizzard_pri, 4
+	.equ	se_m_blizzard_rev, reverb_set+50
+	.equ	se_m_blizzard_mvl, 127
+	.equ	se_m_blizzard_key, 0
+	.equ	se_m_blizzard_tbs, 1
+	.equ	se_m_blizzard_exg, 0
+	.equ	se_m_blizzard_cmp, 1
 
 	.section .rodata
-	.global	se_w059
+	.global	se_m_blizzard
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w059_1:
-	.byte	KEYSH , se_w059_key+0
-	.byte	TEMPO , 150*se_w059_tbs/2
+se_m_blizzard_1:
+	.byte	KEYSH , se_m_blizzard_key+0
+	.byte	TEMPO , 150*se_m_blizzard_tbs/2
 	.byte		VOICE , 22
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 64*se_w059_mvl/mxv
+	.byte		VOL   , 64*se_m_blizzard_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N24   , Gn3 , v108
 	.byte	W03
-	.byte		VOL   , 79*se_w059_mvl/mxv
+	.byte		VOL   , 79*se_m_blizzard_mvl/mxv
 	.byte		BEND  , c_v+22
 	.byte	W02
 	.byte		        c_v+8
 	.byte	W01
-	.byte		VOL   , 84*se_w059_mvl/mxv
+	.byte		VOL   , 84*se_m_blizzard_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte	W03
-	.byte		VOL   , 91*se_w059_mvl/mxv
+	.byte		VOL   , 91*se_m_blizzard_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte	W03
-	.byte		VOL   , 100*se_w059_mvl/mxv
+	.byte		VOL   , 100*se_m_blizzard_mvl/mxv
 	.byte		PAN   , c_v-8
 	.byte	W03
-	.byte		VOL   , 110*se_w059_mvl/mxv
+	.byte		VOL   , 110*se_m_blizzard_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-12
 	.byte	W06
-se_w059_1_B1:
+se_m_blizzard_1_B1:
 	.byte		PAN   , c_v-17
 	.byte		BEND  , c_v+0
 	.byte		N48   , Gn3 , v108
@@ -84,20 +84,20 @@ se_w059_1_B1:
 	.byte		PAN   , c_v-11
 	.byte	W03
 	.byte	GOTO
-	 .word	se_w059_1_B1
+	 .word	se_m_blizzard_1_B1
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w059:
+se_m_blizzard:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w059_pri	@ Priority
-	.byte	se_w059_rev	@ Reverb.
+	.byte	se_m_blizzard_pri	@ Priority
+	.byte	se_m_blizzard_rev	@ Reverb.
 
-	.word	se_w059_grp
+	.word	se_m_blizzard_grp
 
-	.word	se_w059_1
+	.word	se_m_blizzard_1
 
 	.end
diff --git a/sound/songs/se_m_blizzard2.s b/sound/songs/se_m_blizzard2.s
new file mode 100644
index 000000000..8c1518e63
--- /dev/null
+++ b/sound/songs/se_m_blizzard2.s
@@ -0,0 +1,72 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_blizzard2_grp, voicegroup128
+	.equ	se_m_blizzard2_pri, 4
+	.equ	se_m_blizzard2_rev, reverb_set+50
+	.equ	se_m_blizzard2_mvl, 127
+	.equ	se_m_blizzard2_key, 0
+	.equ	se_m_blizzard2_tbs, 1
+	.equ	se_m_blizzard2_exg, 0
+	.equ	se_m_blizzard2_cmp, 1
+
+	.section .rodata
+	.global	se_m_blizzard2
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_blizzard2_1:
+	.byte	KEYSH , se_m_blizzard2_key+0
+	.byte	TEMPO , 150*se_m_blizzard2_tbs/2
+	.byte		VOICE , 22
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 110*se_m_blizzard2_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N24   , Gn3 , v108
+	.byte	W02
+	.byte		PAN   , c_v-19
+	.byte	W04
+	.byte		        c_v+0
+	.byte	W01
+	.byte		VOL   , 97*se_m_blizzard2_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+16
+	.byte	W01
+	.byte		VOL   , 84*se_m_blizzard2_mvl/mxv
+	.byte	W03
+	.byte		        76*se_m_blizzard2_mvl/mxv
+	.byte		PAN   , c_v+2
+	.byte	W02
+	.byte		VOL   , 55*se_m_blizzard2_mvl/mxv
+	.byte		PAN   , c_v-8
+	.byte	W02
+	.byte		VOL   , 39*se_m_blizzard2_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 25*se_m_blizzard2_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+8
+	.byte	W01
+	.byte		VOL   , 13*se_m_blizzard2_mvl/mxv
+	.byte	W03
+	.byte		        7*se_m_blizzard2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte	W24
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_blizzard2:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_blizzard2_pri	@ Priority
+	.byte	se_m_blizzard2_rev	@ Reverb.
+
+	.word	se_m_blizzard2_grp
+
+	.word	se_m_blizzard2_1
+
+	.end
diff --git a/sound/songs/se_w155.s b/sound/songs/se_m_bonemerang.s
index 29508b608..11f035347 100644
--- a/sound/songs/se_w155.s
+++ b/sound/songs/se_m_bonemerang.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w155_grp, voicegroup128
-	.equ	se_w155_pri, 4
-	.equ	se_w155_rev, reverb_set+50
-	.equ	se_w155_mvl, 127
-	.equ	se_w155_key, 0
-	.equ	se_w155_tbs, 1
-	.equ	se_w155_exg, 0
-	.equ	se_w155_cmp, 1
+	.equ	se_m_bonemerang_grp, voicegroup128
+	.equ	se_m_bonemerang_pri, 4
+	.equ	se_m_bonemerang_rev, reverb_set+50
+	.equ	se_m_bonemerang_mvl, 127
+	.equ	se_m_bonemerang_key, 0
+	.equ	se_m_bonemerang_tbs, 1
+	.equ	se_m_bonemerang_exg, 0
+	.equ	se_m_bonemerang_cmp, 1
 
 	.section .rodata
-	.global	se_w155
+	.global	se_m_bonemerang
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w155_1:
-	.byte	KEYSH , se_w155_key+0
-	.byte	TEMPO , 150*se_w155_tbs/2
+se_m_bonemerang_1:
+	.byte	KEYSH , se_m_bonemerang_key+0
+	.byte	TEMPO , 150*se_m_bonemerang_tbs/2
 	.byte		VOICE , 24
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w155_mvl/mxv
+	.byte		VOL   , 110*se_m_bonemerang_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N01   , Cn5 , v127
 	.byte	W01
@@ -44,14 +44,14 @@ se_w155_1:
 @******************************************************@
 	.align	2
 
-se_w155:
+se_m_bonemerang:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w155_pri	@ Priority
-	.byte	se_w155_rev	@ Reverb.
+	.byte	se_m_bonemerang_pri	@ Priority
+	.byte	se_m_bonemerang_rev	@ Reverb.
 
-	.word	se_w155_grp
+	.word	se_m_bonemerang_grp
 
-	.word	se_w155_1
+	.word	se_m_bonemerang_1
 
 	.end
diff --git a/sound/songs/se_w280.s b/sound/songs/se_m_brick_break.s
index 19d383176..08058089f 100644
--- a/sound/songs/se_w280.s
+++ b/sound/songs/se_m_brick_break.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w280_grp, voicegroup128
-	.equ	se_w280_pri, 4
-	.equ	se_w280_rev, reverb_set+50
-	.equ	se_w280_mvl, 127
-	.equ	se_w280_key, 0
-	.equ	se_w280_tbs, 1
-	.equ	se_w280_exg, 0
-	.equ	se_w280_cmp, 1
+	.equ	se_m_brick_break_grp, voicegroup128
+	.equ	se_m_brick_break_pri, 4
+	.equ	se_m_brick_break_rev, reverb_set+50
+	.equ	se_m_brick_break_mvl, 127
+	.equ	se_m_brick_break_key, 0
+	.equ	se_m_brick_break_tbs, 1
+	.equ	se_m_brick_break_exg, 0
+	.equ	se_m_brick_break_cmp, 1
 
 	.section .rodata
-	.global	se_w280
+	.global	se_m_brick_break
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w280_1:
-	.byte	KEYSH , se_w280_key+0
-	.byte	TEMPO , 150*se_w280_tbs/2
+se_m_brick_break_1:
+	.byte	KEYSH , se_m_brick_break_key+0
+	.byte	TEMPO , 150*se_m_brick_break_tbs/2
 	.byte		VOICE , 41
-	.byte		VOL   , 110*se_w280_mvl/mxv
+	.byte		VOL   , 110*se_m_brick_break_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N01   , Cn4 , v127
 	.byte	W01
@@ -56,10 +56,10 @@ se_w280_1:
 
 @********************** Track  2 **********************@
 
-se_w280_2:
-	.byte	KEYSH , se_w280_key+0
+se_m_brick_break_2:
+	.byte	KEYSH , se_m_brick_break_key+0
 	.byte		VOICE , 4
-	.byte		VOL   , 110*se_w280_mvl/mxv
+	.byte		VOL   , 110*se_m_brick_break_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N01   , Cn3 , v064
 	.byte	W01
@@ -86,15 +86,15 @@ se_w280_2:
 @******************************************************@
 	.align	2
 
-se_w280:
+se_m_brick_break:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w280_pri	@ Priority
-	.byte	se_w280_rev	@ Reverb.
+	.byte	se_m_brick_break_pri	@ Priority
+	.byte	se_m_brick_break_rev	@ Reverb.
 
-	.word	se_w280_grp
+	.word	se_m_brick_break_grp
 
-	.word	se_w280_1
-	.word	se_w280_2
+	.word	se_m_brick_break_1
+	.word	se_m_brick_break_2
 
 	.end
diff --git a/sound/songs/se_w145.s b/sound/songs/se_m_bubble.s
index bb7d87a2d..ee31a176b 100644
--- a/sound/songs/se_w145.s
+++ b/sound/songs/se_m_bubble.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w145_grp, voicegroup128
-	.equ	se_w145_pri, 4
-	.equ	se_w145_rev, reverb_set+50
-	.equ	se_w145_mvl, 127
-	.equ	se_w145_key, 0
-	.equ	se_w145_tbs, 1
-	.equ	se_w145_exg, 0
-	.equ	se_w145_cmp, 1
+	.equ	se_m_bubble_grp, voicegroup128
+	.equ	se_m_bubble_pri, 4
+	.equ	se_m_bubble_rev, reverb_set+50
+	.equ	se_m_bubble_mvl, 127
+	.equ	se_m_bubble_key, 0
+	.equ	se_m_bubble_tbs, 1
+	.equ	se_m_bubble_exg, 0
+	.equ	se_m_bubble_cmp, 1
 
 	.section .rodata
-	.global	se_w145
+	.global	se_m_bubble
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w145_1:
-	.byte	KEYSH , se_w145_key+0
-	.byte	TEMPO , 220*se_w145_tbs/2
+se_m_bubble_1:
+	.byte	KEYSH , se_m_bubble_key+0
+	.byte	TEMPO , 220*se_m_bubble_tbs/2
 	.byte		VOICE , 23
-	.byte		VOL   , 95*se_w145_mvl/mxv
+	.byte		VOL   , 95*se_m_bubble_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -44,14 +44,14 @@ se_w145_1:
 @******************************************************@
 	.align	2
 
-se_w145:
+se_m_bubble:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w145_pri	@ Priority
-	.byte	se_w145_rev	@ Reverb.
+	.byte	se_m_bubble_pri	@ Priority
+	.byte	se_m_bubble_rev	@ Reverb.
 
-	.word	se_w145_grp
+	.word	se_m_bubble_grp
 
-	.word	se_w145_1
+	.word	se_m_bubble_1
 
 	.end
diff --git a/sound/songs/se_m_bubble2.s b/sound/songs/se_m_bubble2.s
new file mode 100644
index 000000000..97e7cbbf8
--- /dev/null
+++ b/sound/songs/se_m_bubble2.s
@@ -0,0 +1,60 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_bubble2_grp, voicegroup128
+	.equ	se_m_bubble2_pri, 4
+	.equ	se_m_bubble2_rev, reverb_set+50
+	.equ	se_m_bubble2_mvl, 127
+	.equ	se_m_bubble2_key, 0
+	.equ	se_m_bubble2_tbs, 1
+	.equ	se_m_bubble2_exg, 0
+	.equ	se_m_bubble2_cmp, 1
+
+	.section .rodata
+	.global	se_m_bubble2
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_bubble2_1:
+	.byte	KEYSH , se_m_bubble2_key+0
+	.byte	TEMPO , 220*se_m_bubble2_tbs/2
+	.byte		VOICE , 24
+	.byte		VOL   , 110*se_m_bubble2_mvl/mxv
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+0
+	.byte	W03
+	.byte		N09   , Gn4 , v127
+	.byte	W02
+	.byte		BEND  , c_v+31
+	.byte	W02
+	.byte		        c_v-34
+	.byte	W17
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_bubble2_2:
+	.byte	KEYSH , se_m_bubble2_key+0
+	.byte		VOICE , 4
+	.byte		VOL   , 110*se_m_bubble2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		N01   , Cn4 , v044
+	.byte	W24
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_bubble2:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_bubble2_pri	@ Priority
+	.byte	se_m_bubble2_rev	@ Reverb.
+
+	.word	se_m_bubble2_grp
+
+	.word	se_m_bubble2_1
+	.word	se_m_bubble2_2
+
+	.end
diff --git a/sound/songs/se_w145c.s b/sound/songs/se_m_bubble3.s
index 61bf7fa0d..c14badb5a 100644
--- a/sound/songs/se_w145c.s
+++ b/sound/songs/se_m_bubble3.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w145c_grp, voicegroup128
-	.equ	se_w145c_pri, 4
-	.equ	se_w145c_rev, reverb_set+50
-	.equ	se_w145c_mvl, 127
-	.equ	se_w145c_key, 0
-	.equ	se_w145c_tbs, 1
-	.equ	se_w145c_exg, 0
-	.equ	se_w145c_cmp, 1
+	.equ	se_m_bubble3_grp, voicegroup128
+	.equ	se_m_bubble3_pri, 4
+	.equ	se_m_bubble3_rev, reverb_set+50
+	.equ	se_m_bubble3_mvl, 127
+	.equ	se_m_bubble3_key, 0
+	.equ	se_m_bubble3_tbs, 1
+	.equ	se_m_bubble3_exg, 0
+	.equ	se_m_bubble3_cmp, 1
 
 	.section .rodata
-	.global	se_w145c
+	.global	se_m_bubble3
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w145c_1:
-	.byte	KEYSH , se_w145c_key+0
-	.byte	TEMPO , 220*se_w145c_tbs/2
+se_m_bubble3_1:
+	.byte	KEYSH , se_m_bubble3_key+0
+	.byte	TEMPO , 220*se_m_bubble3_tbs/2
 	.byte		VOICE , 23
-	.byte		VOL   , 95*se_w145c_mvl/mxv
+	.byte		VOL   , 95*se_m_bubble3_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -49,14 +49,14 @@ se_w145c_1:
 @******************************************************@
 	.align	2
 
-se_w145c:
+se_m_bubble3:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w145c_pri	@ Priority
-	.byte	se_w145c_rev	@ Reverb.
+	.byte	se_m_bubble3_pri	@ Priority
+	.byte	se_m_bubble3_rev	@ Reverb.
 
-	.word	se_w145c_grp
+	.word	se_m_bubble3_grp
 
-	.word	se_w145c_1
+	.word	se_m_bubble3_1
 
 	.end
diff --git a/sound/songs/se_w062.s b/sound/songs/se_m_bubble_beam.s
index 58de81e57..621882b03 100644
--- a/sound/songs/se_w062.s
+++ b/sound/songs/se_m_bubble_beam.s
@@ -1,56 +1,56 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w062_grp, voicegroup128
-	.equ	se_w062_pri, 4
-	.equ	se_w062_rev, reverb_set+50
-	.equ	se_w062_mvl, 127
-	.equ	se_w062_key, 0
-	.equ	se_w062_tbs, 1
-	.equ	se_w062_exg, 0
-	.equ	se_w062_cmp, 1
+	.equ	se_m_bubble_beam_grp, voicegroup128
+	.equ	se_m_bubble_beam_pri, 4
+	.equ	se_m_bubble_beam_rev, reverb_set+50
+	.equ	se_m_bubble_beam_mvl, 127
+	.equ	se_m_bubble_beam_key, 0
+	.equ	se_m_bubble_beam_tbs, 1
+	.equ	se_m_bubble_beam_exg, 0
+	.equ	se_m_bubble_beam_cmp, 1
 
 	.section .rodata
-	.global	se_w062
+	.global	se_m_bubble_beam
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w062_1:
-	.byte	KEYSH , se_w062_key+0
-	.byte	TEMPO , 150*se_w062_tbs/2
+se_m_bubble_beam_1:
+	.byte	KEYSH , se_m_bubble_beam_key+0
+	.byte	TEMPO , 150*se_m_bubble_beam_tbs/2
 	.byte		VOICE , 9
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 24*se_w062_mvl/mxv
+	.byte		VOL   , 24*se_m_bubble_beam_mvl/mxv
 	.byte		BEND  , c_v-17
 	.byte		N78   , Bn4 , v080
 	.byte	W01
-	.byte		VOL   , 32*se_w062_mvl/mxv
+	.byte		VOL   , 32*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte	W01
-	.byte		VOL   , 38*se_w062_mvl/mxv
+	.byte		VOL   , 38*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v-7
 	.byte	W01
-	.byte		VOL   , 48*se_w062_mvl/mxv
+	.byte		VOL   , 48*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v+9
 	.byte	W01
-	.byte		VOL   , 66*se_w062_mvl/mxv
+	.byte		VOL   , 66*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v-13
 	.byte	W02
-	.byte		VOL   , 78*se_w062_mvl/mxv
+	.byte		VOL   , 78*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte	W01
-	.byte		VOL   , 94*se_w062_mvl/mxv
+	.byte		VOL   , 94*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte	W01
-	.byte		VOL   , 110*se_w062_mvl/mxv
+	.byte		VOL   , 110*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v+6
 	.byte	W01
 	.byte		        c_v-7
 	.byte	W02
-se_w062_1_000:
+se_m_bubble_beam_1_000:
 	.byte		PAN   , c_v+9
 	.byte	W01
 	.byte		        c_v-13
@@ -62,7 +62,7 @@ se_w062_1_000:
 	.byte		        c_v+0
 	.byte	W02
 	.byte	PEND
-se_w062_1_001:
+se_m_bubble_beam_1_001:
 	.byte		PAN   , c_v+6
 	.byte	W01
 	.byte		        c_v-7
@@ -125,34 +125,34 @@ se_w062_1_001:
 	.byte		        c_v-7
 	.byte	W02
 	.byte	PATT
-	 .word	se_w062_1_000
+	 .word	se_m_bubble_beam_1_000
 	.byte	PATT
-	 .word	se_w062_1_001
+	 .word	se_m_bubble_beam_1_001
 	.byte		PAN   , c_v-6
 	.byte	W01
 	.byte		        c_v+0
 	.byte	W01
 	.byte		        c_v+6
 	.byte	W01
-	.byte		VOL   , 103*se_w062_mvl/mxv
+	.byte		VOL   , 103*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v-7
 	.byte	W01
-	.byte		VOL   , 91*se_w062_mvl/mxv
+	.byte		VOL   , 91*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v+9
 	.byte	W02
-	.byte		VOL   , 72*se_w062_mvl/mxv
+	.byte		VOL   , 72*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v-13
 	.byte	W01
-	.byte		VOL   , 58*se_w062_mvl/mxv
+	.byte		VOL   , 58*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte	W01
-	.byte		VOL   , 38*se_w062_mvl/mxv
+	.byte		VOL   , 38*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte	W01
-	.byte		VOL   , 15*se_w062_mvl/mxv
+	.byte		VOL   , 15*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 7*se_w062_mvl/mxv
+	.byte		VOL   , 7*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte	W02
 	.byte	FINE
@@ -160,14 +160,14 @@ se_w062_1_001:
 @******************************************************@
 	.align	2
 
-se_w062:
+se_m_bubble_beam:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w062_pri	@ Priority
-	.byte	se_w062_rev	@ Reverb.
+	.byte	se_m_bubble_beam_pri	@ Priority
+	.byte	se_m_bubble_beam_rev	@ Reverb.
 
-	.word	se_w062_grp
+	.word	se_m_bubble_beam_grp
 
-	.word	se_w062_1
+	.word	se_m_bubble_beam_1
 
 	.end
diff --git a/sound/songs/se_m_bubble_beam2.s b/sound/songs/se_m_bubble_beam2.s
new file mode 100644
index 000000000..0e8cbf5e4
--- /dev/null
+++ b/sound/songs/se_m_bubble_beam2.s
@@ -0,0 +1,131 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_bubble_beam2_grp, voicegroup128
+	.equ	se_m_bubble_beam2_pri, 4
+	.equ	se_m_bubble_beam2_rev, reverb_set+50
+	.equ	se_m_bubble_beam2_mvl, 127
+	.equ	se_m_bubble_beam2_key, 0
+	.equ	se_m_bubble_beam2_tbs, 1
+	.equ	se_m_bubble_beam2_exg, 0
+	.equ	se_m_bubble_beam2_cmp, 1
+
+	.section .rodata
+	.global	se_m_bubble_beam2
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_bubble_beam2_1:
+	.byte	KEYSH , se_m_bubble_beam2_key+0
+	.byte	TEMPO , 150*se_m_bubble_beam2_tbs/2
+	.byte		VOICE , 9
+	.byte		BENDR , 2
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 26*se_m_bubble_beam2_mvl/mxv
+	.byte		BEND  , c_v-23
+	.byte		N09   , Dn5 , v127
+	.byte	W01
+	.byte		VOL   , 34*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+6
+	.byte		BEND  , c_v-20
+	.byte	W01
+	.byte		VOL   , 42*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-7
+	.byte		BEND  , c_v-16
+	.byte	W01
+	.byte		VOL   , 52*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+9
+	.byte	W01
+	.byte		VOL   , 72*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-13
+	.byte		BEND  , c_v-18
+	.byte	W02
+	.byte		VOL   , 85*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+6
+	.byte		BEND  , c_v-21
+	.byte	W01
+	.byte		VOL   , 102*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-6
+	.byte		BEND  , c_v-23
+	.byte	W01
+	.byte		VOL   , 120*se_m_bubble_beam2_mvl/mxv
+	.byte		BEND  , c_v-24
+	.byte	W02
+	.byte		VOL   , 26*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v-23
+	.byte		N09   , Dn5 , v100
+	.byte	W02
+	.byte		VOL   , 34*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+6
+	.byte		BEND  , c_v-20
+	.byte	W01
+	.byte		VOL   , 42*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-7
+	.byte		BEND  , c_v-16
+	.byte	W01
+	.byte		VOL   , 52*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+9
+	.byte	W01
+	.byte		VOL   , 72*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-13
+	.byte		BEND  , c_v-18
+	.byte	W01
+	.byte		VOL   , 85*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+6
+	.byte		BEND  , c_v-21
+	.byte	W02
+	.byte		VOL   , 102*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-6
+	.byte		BEND  , c_v-23
+	.byte	W01
+	.byte		VOL   , 120*se_m_bubble_beam2_mvl/mxv
+	.byte		BEND  , c_v-24
+	.byte	W02
+	.byte		VOL   , 26*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v-23
+	.byte		N09   , Dn5 , v080
+	.byte	W01
+	.byte		VOL   , 34*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+6
+	.byte		BEND  , c_v-20
+	.byte	W02
+	.byte		VOL   , 42*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-7
+	.byte		BEND  , c_v-16
+	.byte	W01
+	.byte		VOL   , 52*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+9
+	.byte	W01
+	.byte		VOL   , 72*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-13
+	.byte		BEND  , c_v-18
+	.byte	W01
+	.byte		VOL   , 85*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+6
+	.byte		BEND  , c_v-21
+	.byte	W01
+	.byte		VOL   , 102*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-6
+	.byte		BEND  , c_v-23
+	.byte	W02
+	.byte		VOL   , 120*se_m_bubble_beam2_mvl/mxv
+	.byte		BEND  , c_v-24
+	.byte	W06
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_bubble_beam2:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_bubble_beam2_pri	@ Priority
+	.byte	se_m_bubble_beam2_rev	@ Reverb.
+
+	.word	se_m_bubble_beam2_grp
+
+	.word	se_m_bubble_beam2_1
+
+	.end
diff --git a/sound/songs/se_w268.s b/sound/songs/se_m_charge.s
index c2c9ee9f7..47d70a4bf 100644
--- a/sound/songs/se_w268.s
+++ b/sound/songs/se_m_charge.s
@@ -1,56 +1,56 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w268_grp, voicegroup128
-	.equ	se_w268_pri, 4
-	.equ	se_w268_rev, reverb_set+50
-	.equ	se_w268_mvl, 127
-	.equ	se_w268_key, 0
-	.equ	se_w268_tbs, 1
-	.equ	se_w268_exg, 0
-	.equ	se_w268_cmp, 1
+	.equ	se_m_charge_grp, voicegroup128
+	.equ	se_m_charge_pri, 4
+	.equ	se_m_charge_rev, reverb_set+50
+	.equ	se_m_charge_mvl, 127
+	.equ	se_m_charge_key, 0
+	.equ	se_m_charge_tbs, 1
+	.equ	se_m_charge_exg, 0
+	.equ	se_m_charge_cmp, 1
 
 	.section .rodata
-	.global	se_w268
+	.global	se_m_charge
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w268_1:
-	.byte	KEYSH , se_w268_key+0
-	.byte	TEMPO , 150*se_w268_tbs/2
+se_m_charge_1:
+	.byte	KEYSH , se_m_charge_key+0
+	.byte	TEMPO , 150*se_m_charge_tbs/2
 	.byte		VOICE , 18
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 34*se_w268_mvl/mxv
+	.byte		VOL   , 34*se_m_charge_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N66   , Cn5 , v127
 	.byte	W01
 	.byte		PAN   , c_v-2
 	.byte	W01
-	.byte		VOL   , 43*se_w268_mvl/mxv
+	.byte		VOL   , 43*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v+2
 	.byte		BEND  , c_v-2
 	.byte	W01
-	.byte		VOL   , 58*se_w268_mvl/mxv
+	.byte		VOL   , 58*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W02
 	.byte		        c_v-2
 	.byte	W01
-	.byte		VOL   , 70*se_w268_mvl/mxv
+	.byte		VOL   , 70*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v-4
 	.byte	W01
 	.byte		PAN   , c_v-2
 	.byte	W01
-	.byte		VOL   , 76*se_w268_mvl/mxv
+	.byte		VOL   , 76*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v+2
 	.byte		BEND  , c_v-6
 	.byte	W02
-	.byte		VOL   , 90*se_w268_mvl/mxv
+	.byte		VOL   , 90*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte	W01
 	.byte		        c_v+2
@@ -118,14 +118,14 @@ se_w268_1:
 	.byte	W01
 	.byte		PAN   , c_v+2
 	.byte	W01
-	.byte		VOL   , 84*se_w268_mvl/mxv
+	.byte		VOL   , 84*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v+0
 	.byte	W02
 	.byte		        c_v-2
 	.byte	W01
-	.byte		VOL   , 78*se_w268_mvl/mxv
+	.byte		VOL   , 78*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v+2
@@ -133,39 +133,39 @@ se_w268_1:
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 70*se_w268_mvl/mxv
+	.byte		VOL   , 70*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W02
 	.byte		        c_v-4
 	.byte	W01
-	.byte		VOL   , 55*se_w268_mvl/mxv
+	.byte		VOL   , 55*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte		BEND  , c_v-29
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 46*se_w268_mvl/mxv
+	.byte		VOL   , 46*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+2
 	.byte	W01
 	.byte		        c_v+4
 	.byte		BEND  , c_v-31
 	.byte	W02
-	.byte		VOL   , 36*se_w268_mvl/mxv
+	.byte		VOL   , 36*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+2
 	.byte	W01
 	.byte		        c_v+0
 	.byte	W01
-	.byte		VOL   , 24*se_w268_mvl/mxv
+	.byte		VOL   , 24*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-36
 	.byte	W01
 	.byte		PAN   , c_v-2
 	.byte	W01
-	.byte		VOL   , 13*se_w268_mvl/mxv
+	.byte		VOL   , 13*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-42
 	.byte	W02
-	.byte		VOL   , 5*se_w268_mvl/mxv
+	.byte		VOL   , 5*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+2
 	.byte	W06
 	.byte	FINE
@@ -173,14 +173,14 @@ se_w268_1:
 @******************************************************@
 	.align	2
 
-se_w268:
+se_m_charge:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w268_pri	@ Priority
-	.byte	se_w268_rev	@ Reverb.
+	.byte	se_m_charge_pri	@ Priority
+	.byte	se_m_charge_rev	@ Reverb.
 
-	.word	se_w268_grp
+	.word	se_m_charge_grp
 
-	.word	se_w268_1
+	.word	se_m_charge_1
 
 	.end
diff --git a/sound/songs/se_w204.s b/sound/songs/se_m_charm.s
index 1e66392ac..ef10cb3e3 100644
--- a/sound/songs/se_w204.s
+++ b/sound/songs/se_m_charm.s
@@ -1,52 +1,52 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w204_grp, voicegroup128
-	.equ	se_w204_pri, 4
-	.equ	se_w204_rev, reverb_set+50
-	.equ	se_w204_mvl, 127
-	.equ	se_w204_key, 0
-	.equ	se_w204_tbs, 1
-	.equ	se_w204_exg, 0
-	.equ	se_w204_cmp, 1
+	.equ	se_m_charm_grp, voicegroup128
+	.equ	se_m_charm_pri, 4
+	.equ	se_m_charm_rev, reverb_set+50
+	.equ	se_m_charm_mvl, 127
+	.equ	se_m_charm_key, 0
+	.equ	se_m_charm_tbs, 1
+	.equ	se_m_charm_exg, 0
+	.equ	se_m_charm_cmp, 1
 
 	.section .rodata
-	.global	se_w204
+	.global	se_m_charm
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w204_1:
-	.byte	KEYSH , se_w204_key+0
-	.byte	TEMPO , 150*se_w204_tbs/2
+se_m_charm_1:
+	.byte	KEYSH , se_m_charm_key+0
+	.byte	TEMPO , 150*se_m_charm_tbs/2
 	.byte		VOICE , 37
 	.byte		BENDR , 24
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 25*se_w204_mvl/mxv
+	.byte		VOL   , 25*se_m_charm_mvl/mxv
 	.byte		BEND  , c_v+11
 	.byte		N02   , Fn4 , v127
 	.byte	W01
-	.byte		VOL   , 42*se_w204_mvl/mxv
+	.byte		VOL   , 42*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte		BEND  , c_v+5
 	.byte	W01
-	.byte		VOL   , 62*se_w204_mvl/mxv
+	.byte		VOL   , 62*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+0
 	.byte		N15   
 	.byte	W01
-	.byte		VOL   , 77*se_w204_mvl/mxv
+	.byte		VOL   , 77*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+5
 	.byte	W01
-	.byte		VOL   , 84*se_w204_mvl/mxv
+	.byte		VOL   , 84*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte		BEND  , c_v+12
 	.byte	W02
-	.byte		VOL   , 96*se_w204_mvl/mxv
+	.byte		VOL   , 96*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+20
 	.byte	W01
-	.byte		VOL   , 100*se_w204_mvl/mxv
+	.byte		VOL   , 100*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+25
 	.byte	W01
@@ -59,22 +59,22 @@ se_w204_1:
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+40
 	.byte	W02
-	.byte		VOL   , 94*se_w204_mvl/mxv
+	.byte		VOL   , 94*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte	W01
-	.byte		VOL   , 85*se_w204_mvl/mxv
+	.byte		VOL   , 85*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+37
 	.byte	W01
-	.byte		VOL   , 66*se_w204_mvl/mxv
+	.byte		VOL   , 66*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+36
 	.byte	W01
-	.byte		VOL   , 49*se_w204_mvl/mxv
+	.byte		VOL   , 49*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte		BEND  , c_v+34
 	.byte	W01
-	.byte		VOL   , 32*se_w204_mvl/mxv
+	.byte		VOL   , 32*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+32
 	.byte	W02
@@ -83,14 +83,14 @@ se_w204_1:
 @******************************************************@
 	.align	2
 
-se_w204:
+se_m_charm:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w204_pri	@ Priority
-	.byte	se_w204_rev	@ Reverb.
+	.byte	se_m_charm_pri	@ Priority
+	.byte	se_m_charm_rev	@ Reverb.
 
-	.word	se_w204_grp
+	.word	se_m_charm_grp
 
-	.word	se_w204_1
+	.word	se_m_charm_1
 
 	.end
diff --git a/sound/songs/se_w109.s b/sound/songs/se_m_confuse_ray.s
index 1f43988eb..12aea8ab8 100644
--- a/sound/songs/se_w109.s
+++ b/sound/songs/se_m_confuse_ray.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w109_grp, voicegroup128
-	.equ	se_w109_pri, 4
-	.equ	se_w109_rev, reverb_set+50
-	.equ	se_w109_mvl, 127
-	.equ	se_w109_key, 0
-	.equ	se_w109_tbs, 1
-	.equ	se_w109_exg, 0
-	.equ	se_w109_cmp, 1
+	.equ	se_m_confuse_ray_grp, voicegroup128
+	.equ	se_m_confuse_ray_pri, 4
+	.equ	se_m_confuse_ray_rev, reverb_set+50
+	.equ	se_m_confuse_ray_mvl, 127
+	.equ	se_m_confuse_ray_key, 0
+	.equ	se_m_confuse_ray_tbs, 1
+	.equ	se_m_confuse_ray_exg, 0
+	.equ	se_m_confuse_ray_cmp, 1
 
 	.section .rodata
-	.global	se_w109
+	.global	se_m_confuse_ray
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w109_1:
-	.byte	KEYSH , se_w109_key+0
-	.byte	TEMPO , 220*se_w109_tbs/2
+se_m_confuse_ray_1:
+	.byte	KEYSH , se_m_confuse_ray_key+0
+	.byte	TEMPO , 220*se_m_confuse_ray_tbs/2
 	.byte		VOICE , 52
-	.byte		VOL   , 127*se_w109_mvl/mxv
+	.byte		VOL   , 127*se_m_confuse_ray_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -104,14 +104,14 @@ se_w109_1:
 @******************************************************@
 	.align	2
 
-se_w109:
+se_m_confuse_ray:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w109_pri	@ Priority
-	.byte	se_w109_rev	@ Reverb.
+	.byte	se_m_confuse_ray_pri	@ Priority
+	.byte	se_m_confuse_ray_rev	@ Reverb.
 
-	.word	se_w109_grp
+	.word	se_m_confuse_ray_grp
 
-	.word	se_w109_1
+	.word	se_m_confuse_ray_1
 
 	.end
diff --git a/sound/songs/se_w322.s b/sound/songs/se_m_cosmic_power.s
index 2f48ff968..76812478b 100644
--- a/sound/songs/se_w322.s
+++ b/sound/songs/se_m_cosmic_power.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w322_grp, voicegroup128
-	.equ	se_w322_pri, 4
-	.equ	se_w322_rev, reverb_set+50
-	.equ	se_w322_mvl, 127
-	.equ	se_w322_key, 0
-	.equ	se_w322_tbs, 1
-	.equ	se_w322_exg, 0
-	.equ	se_w322_cmp, 1
+	.equ	se_m_cosmic_power_grp, voicegroup128
+	.equ	se_m_cosmic_power_pri, 4
+	.equ	se_m_cosmic_power_rev, reverb_set+50
+	.equ	se_m_cosmic_power_mvl, 127
+	.equ	se_m_cosmic_power_key, 0
+	.equ	se_m_cosmic_power_tbs, 1
+	.equ	se_m_cosmic_power_exg, 0
+	.equ	se_m_cosmic_power_cmp, 1
 
 	.section .rodata
-	.global	se_w322
+	.global	se_m_cosmic_power
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w322_1:
-	.byte	KEYSH , se_w322_key+0
-	.byte	TEMPO , 150*se_w322_tbs/2
+se_m_cosmic_power_1:
+	.byte	KEYSH , se_m_cosmic_power_key+0
+	.byte	TEMPO , 150*se_m_cosmic_power_tbs/2
 	.byte		VOICE , 46
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w322_mvl/mxv
+	.byte		VOL   , 110*se_m_cosmic_power_mvl/mxv
 	.byte		BEND  , c_v-4
 	.byte		N09   , As5 , v112
 	.byte	W06
@@ -117,12 +117,12 @@ se_w322_1:
 
 @********************** Track  2 **********************@
 
-se_w322_2:
-	.byte	KEYSH , se_w322_key+0
+se_m_cosmic_power_2:
+	.byte	KEYSH , se_m_cosmic_power_key+0
 	.byte		VOICE , 53
 	.byte		XCMD  , xIECV , 9
 	.byte		        xIECL , 8
-	.byte		VOL   , 43*se_w322_mvl/mxv
+	.byte		VOL   , 43*se_m_cosmic_power_mvl/mxv
 	.byte		BEND  , c_v-2
 	.byte	W04
 	.byte		N08   , Fn5 , v112
@@ -194,15 +194,15 @@ se_w322_2:
 @******************************************************@
 	.align	2
 
-se_w322:
+se_m_cosmic_power:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w322_pri	@ Priority
-	.byte	se_w322_rev	@ Reverb.
+	.byte	se_m_cosmic_power_pri	@ Priority
+	.byte	se_m_cosmic_power_rev	@ Reverb.
 
-	.word	se_w322_grp
+	.word	se_m_cosmic_power_grp
 
-	.word	se_w322_1
-	.word	se_w322_2
+	.word	se_m_cosmic_power_1
+	.word	se_m_cosmic_power_2
 
 	.end
diff --git a/sound/songs/se_w152.s b/sound/songs/se_m_crabhammer.s
index dc03fe76c..6333150dc 100644
--- a/sound/songs/se_w152.s
+++ b/sound/songs/se_m_crabhammer.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w152_grp, voicegroup128
-	.equ	se_w152_pri, 4
-	.equ	se_w152_rev, reverb_set+50
-	.equ	se_w152_mvl, 127
-	.equ	se_w152_key, 0
-	.equ	se_w152_tbs, 1
-	.equ	se_w152_exg, 0
-	.equ	se_w152_cmp, 1
+	.equ	se_m_crabhammer_grp, voicegroup128
+	.equ	se_m_crabhammer_pri, 4
+	.equ	se_m_crabhammer_rev, reverb_set+50
+	.equ	se_m_crabhammer_mvl, 127
+	.equ	se_m_crabhammer_key, 0
+	.equ	se_m_crabhammer_tbs, 1
+	.equ	se_m_crabhammer_exg, 0
+	.equ	se_m_crabhammer_cmp, 1
 
 	.section .rodata
-	.global	se_w152
+	.global	se_m_crabhammer
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w152_1:
-	.byte	KEYSH , se_w152_key+0
-	.byte	TEMPO , 150*se_w152_tbs/2
+se_m_crabhammer_1:
+	.byte	KEYSH , se_m_crabhammer_key+0
+	.byte	TEMPO , 150*se_m_crabhammer_tbs/2
 	.byte		VOICE , 23
-	.byte		VOL   , 100*se_w152_mvl/mxv
+	.byte		VOL   , 100*se_m_crabhammer_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+2
@@ -45,14 +45,14 @@ se_w152_1:
 @******************************************************@
 	.align	2
 
-se_w152:
+se_m_crabhammer:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w152_pri	@ Priority
-	.byte	se_w152_rev	@ Reverb.
+	.byte	se_m_crabhammer_pri	@ Priority
+	.byte	se_m_crabhammer_rev	@ Reverb.
 
-	.word	se_w152_grp
+	.word	se_m_crabhammer_grp
 
-	.word	se_w152_1
+	.word	se_m_crabhammer_1
 
 	.end
diff --git a/sound/songs/se_w197.s b/sound/songs/se_m_detect.s
index 619b81b40..181fb4079 100644
--- a/sound/songs/se_w197.s
+++ b/sound/songs/se_m_detect.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w197_grp, voicegroup128
-	.equ	se_w197_pri, 4
-	.equ	se_w197_rev, reverb_set+50
-	.equ	se_w197_mvl, 127
-	.equ	se_w197_key, 0
-	.equ	se_w197_tbs, 1
-	.equ	se_w197_exg, 0
-	.equ	se_w197_cmp, 1
+	.equ	se_m_detect_grp, voicegroup128
+	.equ	se_m_detect_pri, 4
+	.equ	se_m_detect_rev, reverb_set+50
+	.equ	se_m_detect_mvl, 127
+	.equ	se_m_detect_key, 0
+	.equ	se_m_detect_tbs, 1
+	.equ	se_m_detect_exg, 0
+	.equ	se_m_detect_cmp, 1
 
 	.section .rodata
-	.global	se_w197
+	.global	se_m_detect
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w197_1:
-	.byte	KEYSH , se_w197_key+0
-	.byte	TEMPO , 220*se_w197_tbs/2
+se_m_detect_1:
+	.byte	KEYSH , se_m_detect_key+0
+	.byte	TEMPO , 220*se_m_detect_tbs/2
 	.byte		VOICE , 54
-	.byte		VOL   , 100*se_w197_mvl/mxv
+	.byte		VOL   , 100*se_m_detect_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+1
@@ -82,14 +82,14 @@ se_w197_1:
 @******************************************************@
 	.align	2
 
-se_w197:
+se_m_detect:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w197_pri	@ Priority
-	.byte	se_w197_rev	@ Reverb.
+	.byte	se_m_detect_pri	@ Priority
+	.byte	se_m_detect_rev	@ Reverb.
 
-	.word	se_w197_grp
+	.word	se_m_detect_grp
 
-	.word	se_w197_1
+	.word	se_m_detect_1
 
 	.end
diff --git a/sound/songs/se_w091.s b/sound/songs/se_m_dig.s
index 953edf429..42fed8ab5 100644
--- a/sound/songs/se_w091.s
+++ b/sound/songs/se_m_dig.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w091_grp, voicegroup128
-	.equ	se_w091_pri, 4
-	.equ	se_w091_rev, reverb_set+50
-	.equ	se_w091_mvl, 127
-	.equ	se_w091_key, 0
-	.equ	se_w091_tbs, 1
-	.equ	se_w091_exg, 0
-	.equ	se_w091_cmp, 1
+	.equ	se_m_dig_grp, voicegroup128
+	.equ	se_m_dig_pri, 4
+	.equ	se_m_dig_rev, reverb_set+50
+	.equ	se_m_dig_mvl, 127
+	.equ	se_m_dig_key, 0
+	.equ	se_m_dig_tbs, 1
+	.equ	se_m_dig_exg, 0
+	.equ	se_m_dig_cmp, 1
 
 	.section .rodata
-	.global	se_w091
+	.global	se_m_dig
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w091_1:
-	.byte	KEYSH , se_w091_key+0
-	.byte	TEMPO , 150*se_w091_tbs/2
+se_m_dig_1:
+	.byte	KEYSH , se_m_dig_key+0
+	.byte	TEMPO , 150*se_m_dig_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 115*se_w091_mvl/mxv
+	.byte		VOL   , 115*se_m_dig_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N01   , Cn2 , v112
 	.byte	W01
@@ -53,14 +53,14 @@ se_w091_1:
 @******************************************************@
 	.align	2
 
-se_w091:
+se_m_dig:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w091_pri	@ Priority
-	.byte	se_w091_rev	@ Reverb.
+	.byte	se_m_dig_pri	@ Priority
+	.byte	se_m_dig_rev	@ Reverb.
 
-	.word	se_w091_grp
+	.word	se_m_dig_grp
 
-	.word	se_w091_1
+	.word	se_m_dig_1
 
 	.end
diff --git a/sound/songs/se_w291.s b/sound/songs/se_m_dive.s
index ae8d11134..2313667fc 100644
--- a/sound/songs/se_w291.s
+++ b/sound/songs/se_m_dive.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w291_grp, voicegroup128
-	.equ	se_w291_pri, 4
-	.equ	se_w291_rev, reverb_set+50
-	.equ	se_w291_mvl, 127
-	.equ	se_w291_key, 0
-	.equ	se_w291_tbs, 1
-	.equ	se_w291_exg, 0
-	.equ	se_w291_cmp, 1
+	.equ	se_m_dive_grp, voicegroup128
+	.equ	se_m_dive_pri, 4
+	.equ	se_m_dive_rev, reverb_set+50
+	.equ	se_m_dive_mvl, 127
+	.equ	se_m_dive_key, 0
+	.equ	se_m_dive_tbs, 1
+	.equ	se_m_dive_exg, 0
+	.equ	se_m_dive_cmp, 1
 
 	.section .rodata
-	.global	se_w291
+	.global	se_m_dive
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w291_1:
-	.byte	KEYSH , se_w291_key+0
-	.byte	TEMPO , 150*se_w291_tbs/2
+se_m_dive_1:
+	.byte	KEYSH , se_m_dive_key+0
+	.byte	TEMPO , 150*se_m_dive_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 105*se_w291_mvl/mxv
+	.byte		VOL   , 105*se_m_dive_mvl/mxv
 	.byte		BEND  , c_v-18
 	.byte		N06   , Fn2 , v127
 	.byte	W03
@@ -43,39 +43,39 @@ se_w291_1:
 	.byte		PAN   , c_v-3
 	.byte		BEND  , c_v-5
 	.byte	W02
-	.byte		VOL   , 100*se_w291_mvl/mxv
+	.byte		VOL   , 100*se_m_dive_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v-2
 	.byte	W03
-	.byte		VOL   , 94*se_w291_mvl/mxv
+	.byte		VOL   , 94*se_m_dive_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v-3
 	.byte		BEND  , c_v+1
 	.byte	W02
-	.byte		VOL   , 84*se_w291_mvl/mxv
+	.byte		VOL   , 84*se_m_dive_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+4
 	.byte	W04
 	.byte		PAN   , c_v+3
-	.byte		VOL   , 72*se_w291_mvl/mxv
+	.byte		VOL   , 72*se_m_dive_mvl/mxv
 	.byte		BEND  , c_v+2
 	.byte	W04
 	.byte		PAN   , c_v+6
-	.byte		VOL   , 57*se_w291_mvl/mxv
+	.byte		VOL   , 57*se_m_dive_mvl/mxv
 	.byte		BEND  , c_v-3
 	.byte	W03
 	.byte		PAN   , c_v+3
-	.byte		VOL   , 37*se_w291_mvl/mxv
+	.byte		VOL   , 37*se_m_dive_mvl/mxv
 	.byte		BEND  , c_v-7
 	.byte	W03
-	.byte		VOL   , 20*se_w291_mvl/mxv
+	.byte		VOL   , 20*se_m_dive_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-11
 	.byte	W01
-	.byte		VOL   , 7*se_w291_mvl/mxv
+	.byte		VOL   , 7*se_m_dive_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-3
 	.byte		BEND  , c_v-16
@@ -84,10 +84,10 @@ se_w291_1:
 
 @********************** Track  2 **********************@
 
-se_w291_2:
-	.byte	KEYSH , se_w291_key+0
+se_m_dive_2:
+	.byte	KEYSH , se_m_dive_key+0
 	.byte		VOICE , 25
-	.byte		VOL   , 105*se_w291_mvl/mxv
+	.byte		VOL   , 105*se_m_dive_mvl/mxv
 	.byte		N06   , An2 , v040
 	.byte	W06
 	.byte		        Gn2 
@@ -109,15 +109,15 @@ se_w291_2:
 @******************************************************@
 	.align	2
 
-se_w291:
+se_m_dive:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w291_pri	@ Priority
-	.byte	se_w291_rev	@ Reverb.
+	.byte	se_m_dive_pri	@ Priority
+	.byte	se_m_dive_rev	@ Reverb.
 
-	.word	se_w291_grp
+	.word	se_m_dive_grp
 
-	.word	se_w291_1
-	.word	se_w291_2
+	.word	se_m_dive_1
+	.word	se_m_dive_2
 
 	.end
diff --git a/sound/songs/se_m_dizzy_punch.s b/sound/songs/se_m_dizzy_punch.s
new file mode 100644
index 000000000..886a4bc4e
--- /dev/null
+++ b/sound/songs/se_m_dizzy_punch.s
@@ -0,0 +1,79 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_dizzy_punch_grp, voicegroup128
+	.equ	se_m_dizzy_punch_pri, 4
+	.equ	se_m_dizzy_punch_rev, reverb_set+50
+	.equ	se_m_dizzy_punch_mvl, 127
+	.equ	se_m_dizzy_punch_key, 0
+	.equ	se_m_dizzy_punch_tbs, 1
+	.equ	se_m_dizzy_punch_exg, 0
+	.equ	se_m_dizzy_punch_cmp, 1
+
+	.section .rodata
+	.global	se_m_dizzy_punch
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_dizzy_punch_1:
+	.byte	KEYSH , se_m_dizzy_punch_key+0
+	.byte	TEMPO , 150*se_m_dizzy_punch_tbs/2
+	.byte		VOICE , 19
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 5*se_m_dizzy_punch_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N07   , Bn5 , v080
+	.byte	W01
+	.byte		VOL   , 55*se_m_dizzy_punch_mvl/mxv
+	.byte		PAN   , c_v+11
+	.byte		BEND  , c_v+3
+	.byte	W01
+	.byte		VOL   , 67*se_m_dizzy_punch_mvl/mxv
+	.byte		PAN   , c_v+22
+	.byte		BEND  , c_v+0
+	.byte	W01
+	.byte		VOL   , 90*se_m_dizzy_punch_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v-6
+	.byte	W01
+	.byte		PAN   , c_v-12
+	.byte		BEND  , c_v-14
+	.byte	W02
+	.byte		VOL   , 4*se_m_dizzy_punch_mvl/mxv
+	.byte		PAN   , c_v-22
+	.byte		BEND  , c_v-23
+	.byte	W01
+	.byte		PAN   , c_v-13
+	.byte		BEND  , c_v+0
+	.byte		N04   , Cn6 
+	.byte	W01
+	.byte		VOL   , 66*se_m_dizzy_punch_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+1
+	.byte	W01
+	.byte		VOL   , 90*se_m_dizzy_punch_mvl/mxv
+	.byte		PAN   , c_v+11
+	.byte		BEND  , c_v+3
+	.byte	W01
+	.byte		VOL   , 4*se_m_dizzy_punch_mvl/mxv
+	.byte		PAN   , c_v+21
+	.byte		BEND  , c_v+5
+	.byte	W14
+	.byte		VOL   , 90*se_m_dizzy_punch_mvl/mxv
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_dizzy_punch:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_dizzy_punch_pri	@ Priority
+	.byte	se_m_dizzy_punch_rev	@ Reverb.
+
+	.word	se_m_dizzy_punch_grp
+
+	.word	se_m_dizzy_punch_1
+
+	.end
diff --git a/sound/songs/se_m_double_team.s b/sound/songs/se_m_double_team.s
new file mode 100644
index 000000000..49bcfb13d
--- /dev/null
+++ b/sound/songs/se_m_double_team.s
@@ -0,0 +1,71 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_double_team_grp, voicegroup128
+	.equ	se_m_double_team_pri, 4
+	.equ	se_m_double_team_rev, reverb_set+50
+	.equ	se_m_double_team_mvl, 127
+	.equ	se_m_double_team_key, 0
+	.equ	se_m_double_team_tbs, 1
+	.equ	se_m_double_team_exg, 0
+	.equ	se_m_double_team_cmp, 1
+
+	.section .rodata
+	.global	se_m_double_team
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_double_team_1:
+	.byte	KEYSH , se_m_double_team_key+0
+	.byte	TEMPO , 150*se_m_double_team_tbs/2
+	.byte		VOICE , 22
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 110*se_m_double_team_mvl/mxv
+	.byte		BEND  , c_v-18
+	.byte		N19   , Dn3 , v108
+	.byte	W02
+	.byte		BEND  , c_v-7
+	.byte	W01
+	.byte		VOL   , 101*se_m_double_team_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v-9
+	.byte		BEND  , c_v+8
+	.byte	W02
+	.byte		VOL   , 84*se_m_double_team_mvl/mxv
+	.byte		BEND  , c_v+4
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 64*se_m_double_team_mvl/mxv
+	.byte		BEND  , c_v-13
+	.byte	W01
+	.byte		PAN   , c_v+8
+	.byte	W02
+	.byte		VOL   , 45*se_m_double_team_mvl/mxv
+	.byte		BEND  , c_v-31
+	.byte	W02
+	.byte		VOL   , 32*se_m_double_team_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOICE , 2
+	.byte	W01
+	.byte		VOL   , 13*se_m_double_team_mvl/mxv
+	.byte		BEND  , c_v-52
+	.byte	W08
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_double_team:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_double_team_pri	@ Priority
+	.byte	se_m_double_team_rev	@ Reverb.
+
+	.word	se_m_double_team_grp
+
+	.word	se_m_double_team_1
+
+	.end
diff --git a/sound/songs/se_m_dragon_rage.s b/sound/songs/se_m_dragon_rage.s
new file mode 100644
index 000000000..e9eaefca0
--- /dev/null
+++ b/sound/songs/se_m_dragon_rage.s
@@ -0,0 +1,150 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_dragon_rage_grp, voicegroup128
+	.equ	se_m_dragon_rage_pri, 4
+	.equ	se_m_dragon_rage_rev, reverb_set+50
+	.equ	se_m_dragon_rage_mvl, 127
+	.equ	se_m_dragon_rage_key, 0
+	.equ	se_m_dragon_rage_tbs, 1
+	.equ	se_m_dragon_rage_exg, 0
+	.equ	se_m_dragon_rage_cmp, 1
+
+	.section .rodata
+	.global	se_m_dragon_rage
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_dragon_rage_1:
+	.byte	KEYSH , se_m_dragon_rage_key+0
+	.byte	TEMPO , 150*se_m_dragon_rage_tbs/2
+	.byte		VOICE , 29
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 21*se_m_dragon_rage_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N10   , An2 , v127
+	.byte	W02
+	.byte		VOL   , 47*se_m_dragon_rage_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 88*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v-5
+	.byte	W01
+	.byte		VOL   , 120*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 21*se_m_dragon_rage_mvl/mxv
+	.byte		BEND  , c_v+10
+	.byte		N10   , Bn2 
+	.byte	W02
+	.byte		PAN   , c_v+5
+	.byte	W01
+	.byte		VOL   , 47*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 88*se_m_dragon_rage_mvl/mxv
+	.byte	W03
+	.byte		PAN   , c_v-5
+	.byte		VOL   , 120*se_m_dragon_rage_mvl/mxv
+	.byte	W03
+	.byte		PAN   , c_v-2
+	.byte		VOL   , 21*se_m_dragon_rage_mvl/mxv
+	.byte		BEND  , c_v+18
+	.byte		N10   , Cs3 
+	.byte	W03
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 47*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		        88*se_m_dragon_rage_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 120*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v-5
+	.byte	W02
+	.byte		VOL   , 20*se_m_dragon_rage_mvl/mxv
+	.byte		BEND  , c_v+29
+	.byte		N10   , Dn3 
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 47*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+5
+	.byte	W01
+	.byte		VOL   , 88*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 120*se_m_dragon_rage_mvl/mxv
+	.byte	W03
+	.byte		PAN   , c_v-5
+	.byte	W01
+	.byte		VOL   , 21*se_m_dragon_rage_mvl/mxv
+	.byte		BEND  , c_v+37
+	.byte		N10   , En3 
+	.byte	W02
+	.byte		PAN   , c_v-2
+	.byte		VOL   , 46*se_m_dragon_rage_mvl/mxv
+	.byte	W03
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 102*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		        120*se_m_dragon_rage_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		        c_v-5
+	.byte		VOL   , 20*se_m_dragon_rage_mvl/mxv
+	.byte		BEND  , c_v+42
+	.byte		N20   , Fs3 
+	.byte	W02
+	.byte		VOL   , 47*se_m_dragon_rage_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 88*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+5
+	.byte	W01
+	.byte		VOL   , 120*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 99*se_m_dragon_rage_mvl/mxv
+	.byte		BEND  , c_v+50
+	.byte	W02
+	.byte		PAN   , c_v-5
+	.byte	W01
+	.byte		VOL   , 74*se_m_dragon_rage_mvl/mxv
+	.byte	W01
+	.byte		BEND  , c_v+56
+	.byte	W01
+	.byte		PAN   , c_v-2
+	.byte		VOL   , 53*se_m_dragon_rage_mvl/mxv
+	.byte	W03
+	.byte		        34*se_m_dragon_rage_mvl/mxv
+	.byte		BEND  , c_v+63
+	.byte	W01
+	.byte		VOL   , 15*se_m_dragon_rage_mvl/mxv
+	.byte	W23
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_dragon_rage:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_dragon_rage_pri	@ Priority
+	.byte	se_m_dragon_rage_rev	@ Reverb.
+
+	.word	se_m_dragon_rage_grp
+
+	.word	se_m_dragon_rage_1
+
+	.end
diff --git a/sound/songs/se_w089.s b/sound/songs/se_m_earthquake.s
index 081988ee9..104eb1bef 100644
--- a/sound/songs/se_w089.s
+++ b/sound/songs/se_m_earthquake.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w089_grp, voicegroup128
-	.equ	se_w089_pri, 4
-	.equ	se_w089_rev, reverb_set+50
-	.equ	se_w089_mvl, 127
-	.equ	se_w089_key, 0
-	.equ	se_w089_tbs, 1
-	.equ	se_w089_exg, 0
-	.equ	se_w089_cmp, 1
+	.equ	se_m_earthquake_grp, voicegroup128
+	.equ	se_m_earthquake_pri, 4
+	.equ	se_m_earthquake_rev, reverb_set+50
+	.equ	se_m_earthquake_mvl, 127
+	.equ	se_m_earthquake_key, 0
+	.equ	se_m_earthquake_tbs, 1
+	.equ	se_m_earthquake_exg, 0
+	.equ	se_m_earthquake_cmp, 1
 
 	.section .rodata
-	.global	se_w089
+	.global	se_m_earthquake
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w089_1:
-	.byte	KEYSH , se_w089_key+0
-	.byte	TEMPO , 150*se_w089_tbs/2
+se_m_earthquake_1:
+	.byte	KEYSH , se_m_earthquake_key+0
+	.byte	TEMPO , 150*se_m_earthquake_tbs/2
 	.byte		VOICE , 26
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w089_mvl/mxv
+	.byte		VOL   , 110*se_m_earthquake_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N03   , Cs2 , v127
 	.byte	W03
@@ -35,13 +35,13 @@ se_w089_1:
 	.byte		PAN   , c_v+11
 	.byte		N03   , Cn2 , v112
 	.byte	W02
-se_w089_1_000:
+se_m_earthquake_1_000:
 	.byte	W02
 	.byte		PAN   , c_v-11
 	.byte		N03   , Cs2 , v108
 	.byte	W04
 	.byte	PEND
-se_w089_1_001:
+se_m_earthquake_1_001:
 	.byte		PAN   , c_v+0
 	.byte		N03   , Cn2 , v100
 	.byte	W03
@@ -49,7 +49,7 @@ se_w089_1_001:
 	.byte		N03   , Cs2 , v116
 	.byte	W03
 	.byte	PEND
-se_w089_1_002:
+se_m_earthquake_1_002:
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte		N03   , Cn2 , v112
@@ -58,13 +58,13 @@ se_w089_1_002:
 	.byte		N03   , Cs2 , v108
 	.byte	W02
 	.byte	PEND
-se_w089_1_003:
+se_m_earthquake_1_003:
 	.byte	W02
 	.byte		PAN   , c_v-11
 	.byte		N03   , Cn2 , v100
 	.byte	W04
 	.byte	PEND
-se_w089_1_004:
+se_m_earthquake_1_004:
 	.byte		PAN   , c_v+0
 	.byte		N03   , Cs2 , v116
 	.byte	W03
@@ -72,7 +72,7 @@ se_w089_1_004:
 	.byte		N03   , Cn2 , v112
 	.byte	W03
 	.byte	PEND
-se_w089_1_005:
+se_m_earthquake_1_005:
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte		N03   , Cs2 , v108
@@ -81,7 +81,7 @@ se_w089_1_005:
 	.byte		N03   , Cn2 , v100
 	.byte	W02
 	.byte	PEND
-se_w089_1_006:
+se_m_earthquake_1_006:
 	.byte	W02
 	.byte		PAN   , c_v-11
 	.byte		N03   , Cs2 , v116
@@ -104,7 +104,7 @@ se_w089_1_006:
 	.byte		PAN   , c_v-11
 	.byte		N03   , Cn2 , v112
 	.byte	W04
-se_w089_1_007:
+se_m_earthquake_1_007:
 	.byte		PAN   , c_v+0
 	.byte		N03   , Cs2 , v108
 	.byte	W03
@@ -112,7 +112,7 @@ se_w089_1_007:
 	.byte		N03   , Cn2 , v100
 	.byte	W03
 	.byte	PEND
-se_w089_1_008:
+se_m_earthquake_1_008:
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte		N03   , Cs2 , v116
@@ -122,91 +122,91 @@ se_w089_1_008:
 	.byte	W02
 	.byte	PEND
 	.byte	PATT
-	 .word	se_w089_1_000
+	 .word	se_m_earthquake_1_000
 	.byte	PATT
-	 .word	se_w089_1_001
+	 .word	se_m_earthquake_1_001
 	.byte	PATT
-	 .word	se_w089_1_002
+	 .word	se_m_earthquake_1_002
 	.byte	PATT
-	 .word	se_w089_1_003
+	 .word	se_m_earthquake_1_003
 	.byte	PATT
-	 .word	se_w089_1_007
+	 .word	se_m_earthquake_1_007
 	.byte	PATT
-	 .word	se_w089_1_008
+	 .word	se_m_earthquake_1_008
 	.byte	PATT
-	 .word	se_w089_1_000
+	 .word	se_m_earthquake_1_000
 	.byte	PATT
-	 .word	se_w089_1_001
+	 .word	se_m_earthquake_1_001
 	.byte	PATT
-	 .word	se_w089_1_002
+	 .word	se_m_earthquake_1_002
 	.byte	PATT
-	 .word	se_w089_1_003
+	 .word	se_m_earthquake_1_003
 	.byte	PATT
-	 .word	se_w089_1_004
+	 .word	se_m_earthquake_1_004
 	.byte	PATT
-	 .word	se_w089_1_005
+	 .word	se_m_earthquake_1_005
 	.byte	PATT
-	 .word	se_w089_1_006
-	.byte		VOL   , 106*se_w089_mvl/mxv
+	 .word	se_m_earthquake_1_006
+	.byte		VOL   , 106*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N03   , Cn2 , v112
 	.byte	W03
-	.byte		VOL   , 103*se_w089_mvl/mxv
+	.byte		VOL   , 103*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		N03   , Cs2 , v108
 	.byte	W03
 	.byte	W01
-	.byte		VOL   , 97*se_w089_mvl/mxv
+	.byte		VOL   , 97*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		N03   , Cn2 , v100
 	.byte	W03
-	.byte		VOL   , 89*se_w089_mvl/mxv
+	.byte		VOL   , 89*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+11
 	.byte		N03   , Cs2 , v116
 	.byte	W02
 	.byte	W02
-	.byte		VOL   , 85*se_w089_mvl/mxv
+	.byte		VOL   , 85*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v-11
 	.byte		N03   , Cn2 , v112
 	.byte	W04
-	.byte		VOL   , 78*se_w089_mvl/mxv
+	.byte		VOL   , 78*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N03   , Cs2 , v108
 	.byte	W03
-	.byte		VOL   , 72*se_w089_mvl/mxv
+	.byte		VOL   , 72*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		N03   , Cn2 , v100
 	.byte	W03
 	.byte	W01
-	.byte		VOL   , 66*se_w089_mvl/mxv
+	.byte		VOL   , 66*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		N03   , Cs2 , v116
 	.byte	W03
-	.byte		VOL   , 58*se_w089_mvl/mxv
+	.byte		VOL   , 58*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+11
 	.byte		N03   , Cn2 , v112
 	.byte	W02
 	.byte	W02
-	.byte		VOL   , 46*se_w089_mvl/mxv
+	.byte		VOL   , 46*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v-11
 	.byte		N03   , Cs2 , v108
 	.byte	W04
-	.byte		VOL   , 30*se_w089_mvl/mxv
+	.byte		VOL   , 30*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N03   , Cn2 , v100
 	.byte	W03
-	.byte		VOL   , 12*se_w089_mvl/mxv
+	.byte		VOL   , 12*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte	W03
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w089_2:
-	.byte	KEYSH , se_w089_key+0
+se_m_earthquake_2:
+	.byte	KEYSH , se_m_earthquake_key+0
 	.byte		VOICE , 5
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w089_mvl/mxv
+	.byte		VOL   , 110*se_m_earthquake_mvl/mxv
 	.byte		N02   , Fn2 , v072
 	.byte	W02
 	.byte		N01   
@@ -218,7 +218,7 @@ se_w089_2:
 	.byte		VOICE , 27
 	.byte		N06   , Bn1 , v080
 	.byte	W06
-se_w089_2_000:
+se_m_earthquake_2_000:
 	.byte		PAN   , c_v+0
 	.byte		N06   , Bn1 , v080
 	.byte	W06
@@ -228,99 +228,99 @@ se_w089_2_000:
 	.byte		N06   
 	.byte	W06
 	.byte	PATT
-	 .word	se_w089_2_000
+	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
 	.byte		N06   
 	.byte	W06
 	.byte	PATT
-	 .word	se_w089_2_000
+	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
 	.byte		N06   
 	.byte	W06
 	.byte	PATT
-	 .word	se_w089_2_000
+	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
 	.byte		N06   
 	.byte	W06
 	.byte	PATT
-	 .word	se_w089_2_000
+	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
 	.byte		N06   
 	.byte	W06
 	.byte	PATT
-	 .word	se_w089_2_000
+	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
 	.byte		N06   
 	.byte	W06
 	.byte	PATT
-	 .word	se_w089_2_000
+	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
 	.byte		N06   
 	.byte	W06
 	.byte	PATT
-	 .word	se_w089_2_000
+	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
 	.byte		N06   
 	.byte	W06
-	.byte		VOL   , 106*se_w089_mvl/mxv
+	.byte		VOL   , 106*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N06   
 	.byte	W03
-	.byte		VOL   , 103*se_w089_mvl/mxv
+	.byte		VOL   , 103*se_m_earthquake_mvl/mxv
 	.byte	W03
 	.byte		N06   
 	.byte	W01
-	.byte		VOL   , 97*se_w089_mvl/mxv
+	.byte		VOL   , 97*se_m_earthquake_mvl/mxv
 	.byte	W03
-	.byte		        89*se_w089_mvl/mxv
+	.byte		        89*se_m_earthquake_mvl/mxv
 	.byte	W02
 	.byte		N06   
 	.byte	W02
-	.byte		VOL   , 85*se_w089_mvl/mxv
+	.byte		VOL   , 85*se_m_earthquake_mvl/mxv
 	.byte	W04
-	.byte		        78*se_w089_mvl/mxv
+	.byte		        78*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N06   
 	.byte	W03
-	.byte		VOL   , 72*se_w089_mvl/mxv
+	.byte		VOL   , 72*se_m_earthquake_mvl/mxv
 	.byte	W03
 	.byte		N06   
 	.byte	W01
-	.byte		VOL   , 66*se_w089_mvl/mxv
+	.byte		VOL   , 66*se_m_earthquake_mvl/mxv
 	.byte	W03
-	.byte		        58*se_w089_mvl/mxv
+	.byte		        58*se_m_earthquake_mvl/mxv
 	.byte	W02
 	.byte		N06   
 	.byte	W02
-	.byte		VOL   , 46*se_w089_mvl/mxv
+	.byte		VOL   , 46*se_m_earthquake_mvl/mxv
 	.byte	W04
-	.byte		        30*se_w089_mvl/mxv
+	.byte		        30*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N06   
 	.byte	W03
-	.byte		VOL   , 12*se_w089_mvl/mxv
+	.byte		VOL   , 12*se_m_earthquake_mvl/mxv
 	.byte	W03
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w089:
+se_m_earthquake:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w089_pri	@ Priority
-	.byte	se_w089_rev	@ Reverb.
+	.byte	se_m_earthquake_pri	@ Priority
+	.byte	se_m_earthquake_rev	@ Reverb.
 
-	.word	se_w089_grp
+	.word	se_m_earthquake_grp
 
-	.word	se_w089_1
-	.word	se_w089_2
+	.word	se_m_earthquake_1
+	.word	se_m_earthquake_2
 
 	.end
diff --git a/sound/songs/se_m_ember.s b/sound/songs/se_m_ember.s
new file mode 100644
index 000000000..a685ca24c
--- /dev/null
+++ b/sound/songs/se_m_ember.s
@@ -0,0 +1,61 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_ember_grp, voicegroup128
+	.equ	se_m_ember_pri, 4
+	.equ	se_m_ember_rev, reverb_set+50
+	.equ	se_m_ember_mvl, 127
+	.equ	se_m_ember_key, 0
+	.equ	se_m_ember_tbs, 1
+	.equ	se_m_ember_exg, 0
+	.equ	se_m_ember_cmp, 1
+
+	.section .rodata
+	.global	se_m_ember
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_ember_1:
+	.byte	KEYSH , se_m_ember_key+0
+	.byte	TEMPO , 150*se_m_ember_tbs/2
+	.byte		VOICE , 29
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 61*se_m_ember_mvl/mxv
+	.byte		BEND  , c_v+8
+	.byte		N10   , Gn3 , v127
+	.byte	W01
+	.byte		VOL   , 84*se_m_ember_mvl/mxv
+	.byte	W01
+	.byte		        97*se_m_ember_mvl/mxv
+	.byte		BEND  , c_v+16
+	.byte	W01
+	.byte		VOL   , 110*se_m_ember_mvl/mxv
+	.byte	W01
+	.byte		BEND  , c_v+7
+	.byte	W02
+	.byte		        c_v-12
+	.byte	W01
+	.byte		VOL   , 89*se_m_ember_mvl/mxv
+	.byte	W01
+	.byte		        64*se_m_ember_mvl/mxv
+	.byte		BEND  , c_v-42
+	.byte	W01
+	.byte		VOL   , 34*se_m_ember_mvl/mxv
+	.byte	W15
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_ember:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_ember_pri	@ Priority
+	.byte	se_m_ember_rev	@ Reverb.
+
+	.word	se_m_ember_grp
+
+	.word	se_m_ember_1
+
+	.end
diff --git a/sound/songs/se_w227.s b/sound/songs/se_m_encore.s
index 7a6f87abc..cf13ab761 100644
--- a/sound/songs/se_w227.s
+++ b/sound/songs/se_m_encore.s
@@ -1,26 +1,26 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w227_grp, voicegroup128
-	.equ	se_w227_pri, 4
-	.equ	se_w227_rev, reverb_set+50
-	.equ	se_w227_mvl, 127
-	.equ	se_w227_key, 0
-	.equ	se_w227_tbs, 1
-	.equ	se_w227_exg, 0
-	.equ	se_w227_cmp, 1
+	.equ	se_m_encore_grp, voicegroup128
+	.equ	se_m_encore_pri, 4
+	.equ	se_m_encore_rev, reverb_set+50
+	.equ	se_m_encore_mvl, 127
+	.equ	se_m_encore_key, 0
+	.equ	se_m_encore_tbs, 1
+	.equ	se_m_encore_exg, 0
+	.equ	se_m_encore_cmp, 1
 
 	.section .rodata
-	.global	se_w227
+	.global	se_m_encore
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w227_1:
-	.byte	KEYSH , se_w227_key+0
-	.byte	TEMPO , 150*se_w227_tbs/2
+se_m_encore_1:
+	.byte	KEYSH , se_m_encore_key+0
+	.byte	TEMPO , 150*se_m_encore_tbs/2
 	.byte		VOICE , 59
 	.byte		BENDR , 12
-	.byte		VOL   , 110*se_w227_mvl/mxv
+	.byte		VOL   , 110*se_m_encore_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte		N06   , En3 , v127
@@ -45,14 +45,14 @@ se_w227_1:
 @******************************************************@
 	.align	2
 
-se_w227:
+se_m_encore:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w227_pri	@ Priority
-	.byte	se_w227_rev	@ Reverb.
+	.byte	se_m_encore_pri	@ Priority
+	.byte	se_m_encore_rev	@ Reverb.
 
-	.word	se_w227_grp
+	.word	se_m_encore_grp
 
-	.word	se_w227_1
+	.word	se_m_encore_1
 
 	.end
diff --git a/sound/songs/se_w227b.s b/sound/songs/se_m_encore2.s
index a3fa4adfe..9c53cdfe3 100644
--- a/sound/songs/se_w227b.s
+++ b/sound/songs/se_m_encore2.s
@@ -1,26 +1,26 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w227b_grp, voicegroup128
-	.equ	se_w227b_pri, 4
-	.equ	se_w227b_rev, reverb_set+50
-	.equ	se_w227b_mvl, 127
-	.equ	se_w227b_key, 0
-	.equ	se_w227b_tbs, 1
-	.equ	se_w227b_exg, 0
-	.equ	se_w227b_cmp, 1
+	.equ	se_m_encore2_grp, voicegroup128
+	.equ	se_m_encore2_pri, 4
+	.equ	se_m_encore2_rev, reverb_set+50
+	.equ	se_m_encore2_mvl, 127
+	.equ	se_m_encore2_key, 0
+	.equ	se_m_encore2_tbs, 1
+	.equ	se_m_encore2_exg, 0
+	.equ	se_m_encore2_cmp, 1
 
 	.section .rodata
-	.global	se_w227b
+	.global	se_m_encore2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w227b_1:
-	.byte	KEYSH , se_w227b_key+0
-	.byte	TEMPO , 150*se_w227b_tbs/2
+se_m_encore2_1:
+	.byte	KEYSH , se_m_encore2_key+0
+	.byte	TEMPO , 150*se_m_encore2_tbs/2
 	.byte		VOICE , 60
 	.byte		BENDR , 12
-	.byte		VOL   , 25*se_w227b_mvl/mxv
+	.byte		VOL   , 25*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte		TIE   , Cn3 , v127
@@ -29,18 +29,18 @@ se_w227b_1:
 	.byte	W01
 	.byte		        c_v+5
 	.byte	W01
-	.byte		VOL   , 34*se_w227b_mvl/mxv
+	.byte		VOL   , 34*se_m_encore2_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+2
 	.byte	W02
 	.byte		        c_v+0
 	.byte	W01
-	.byte		VOL   , 46*se_w227b_mvl/mxv
+	.byte		VOL   , 46*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W01
 	.byte		        c_v-4
 	.byte	W02
-	.byte		VOL   , 56*se_w227b_mvl/mxv
+	.byte		VOL   , 56*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W02
 	.byte		        c_v+0
@@ -49,30 +49,30 @@ se_w227b_1:
 	.byte	W01
 	.byte		        c_v+5
 	.byte	W01
-	.byte		VOL   , 70*se_w227b_mvl/mxv
+	.byte		VOL   , 70*se_m_encore2_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+2
 	.byte	W02
 	.byte		        c_v+0
 	.byte	W01
-	.byte		VOL   , 80*se_w227b_mvl/mxv
+	.byte		VOL   , 80*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W01
 	.byte		        c_v-4
 	.byte	W02
-	.byte		VOL   , 88*se_w227b_mvl/mxv
+	.byte		VOL   , 88*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W02
 	.byte		        c_v+0
 	.byte	W01
 	.byte		        c_v+2
 	.byte	W01
-	.byte		VOL   , 96*se_w227b_mvl/mxv
+	.byte		VOL   , 96*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v+5
 	.byte	W02
 	.byte		        c_v+2
 	.byte	W02
-	.byte		VOL   , 100*se_w227b_mvl/mxv
+	.byte		VOL   , 100*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v-2
@@ -81,7 +81,7 @@ se_w227b_1:
 	.byte	W02
 	.byte		        c_v-2
 	.byte	W02
-se_w227b_1_000:
+se_m_encore2_1_000:
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v+2
@@ -100,58 +100,58 @@ se_w227b_1_000:
 	.byte	W02
 	.byte	PEND
 	.byte	PATT
-	 .word	se_w227b_1_000
+	 .word	se_m_encore2_1_000
 	.byte	PATT
-	 .word	se_w227b_1_000
+	 .word	se_m_encore2_1_000
 	.byte	PATT
-	 .word	se_w227b_1_000
+	 .word	se_m_encore2_1_000
 	.byte	PATT
-	 .word	se_w227b_1_000
+	 .word	se_m_encore2_1_000
 	.byte	PATT
-	 .word	se_w227b_1_000
+	 .word	se_m_encore2_1_000
 	.byte	PATT
-	 .word	se_w227b_1_000
-	.byte		VOL   , 96*se_w227b_mvl/mxv
+	 .word	se_m_encore2_1_000
+	.byte		VOL   , 96*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v+2
 	.byte	W01
 	.byte		        c_v+5
 	.byte	W01
-	.byte		VOL   , 92*se_w227b_mvl/mxv
+	.byte		VOL   , 92*se_m_encore2_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+2
 	.byte	W02
 	.byte		        c_v+0
 	.byte	W01
-	.byte		VOL   , 84*se_w227b_mvl/mxv
+	.byte		VOL   , 84*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W01
 	.byte		        c_v-4
 	.byte	W02
-	.byte		VOL   , 72*se_w227b_mvl/mxv
+	.byte		VOL   , 72*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W02
 	.byte		        c_v+0
 	.byte	W01
 	.byte		        c_v+2
 	.byte	W01
-	.byte		VOL   , 63*se_w227b_mvl/mxv
+	.byte		VOL   , 63*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v+5
 	.byte	W02
-	.byte		VOL   , 52*se_w227b_mvl/mxv
+	.byte		VOL   , 52*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v+2
 	.byte	W02
 	.byte		        c_v+0
 	.byte	W01
-	.byte		VOL   , 37*se_w227b_mvl/mxv
+	.byte		VOL   , 37*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W01
 	.byte		        c_v-4
 	.byte	W01
-	.byte		VOL   , 22*se_w227b_mvl/mxv
+	.byte		VOL   , 22*se_m_encore2_mvl/mxv
 	.byte	W01
-	.byte		        12*se_w227b_mvl/mxv
+	.byte		        12*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W02
 	.byte		EOT   , Cn3 
@@ -160,14 +160,14 @@ se_w227b_1_000:
 @******************************************************@
 	.align	2
 
-se_w227b:
+se_m_encore2:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w227b_pri	@ Priority
-	.byte	se_w227b_rev	@ Reverb.
+	.byte	se_m_encore2_pri	@ Priority
+	.byte	se_m_encore2_rev	@ Reverb.
 
-	.word	se_w227b_grp
+	.word	se_m_encore2_grp
 
-	.word	se_w227b_1
+	.word	se_m_encore2_1
 
 	.end
diff --git a/sound/songs/se_w153.s b/sound/songs/se_m_explosion.s
index fe4e25a9e..c93f485b8 100644
--- a/sound/songs/se_w153.s
+++ b/sound/songs/se_m_explosion.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w153_grp, voicegroup128
-	.equ	se_w153_pri, 4
-	.equ	se_w153_rev, reverb_set+50
-	.equ	se_w153_mvl, 127
-	.equ	se_w153_key, 0
-	.equ	se_w153_tbs, 1
-	.equ	se_w153_exg, 0
-	.equ	se_w153_cmp, 1
+	.equ	se_m_explosion_grp, voicegroup128
+	.equ	se_m_explosion_pri, 4
+	.equ	se_m_explosion_rev, reverb_set+50
+	.equ	se_m_explosion_mvl, 127
+	.equ	se_m_explosion_key, 0
+	.equ	se_m_explosion_tbs, 1
+	.equ	se_m_explosion_exg, 0
+	.equ	se_m_explosion_cmp, 1
 
 	.section .rodata
-	.global	se_w153
+	.global	se_m_explosion
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w153_1:
-	.byte	KEYSH , se_w153_key+0
-	.byte	TEMPO , 150*se_w153_tbs/2
+se_m_explosion_1:
+	.byte	KEYSH , se_m_explosion_key+0
+	.byte	TEMPO , 150*se_m_explosion_tbs/2
 	.byte		VOICE , 41
-	.byte		VOL   , 125*se_w153_mvl/mxv
+	.byte		VOL   , 125*se_m_explosion_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -82,20 +82,20 @@ se_w153_1:
 
 @********************** Track  2 **********************@
 
-se_w153_2:
-	.byte	KEYSH , se_w153_key+0
+se_m_explosion_2:
+	.byte	KEYSH , se_m_explosion_key+0
 	.byte		VOICE , 4
-	.byte		VOL   , 125*se_w153_mvl/mxv
+	.byte		VOL   , 125*se_m_explosion_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+1
 	.byte		N02   , Cn3 , v052
 	.byte	W01
-	.byte		VOL   , 74*se_w153_mvl/mxv
+	.byte		VOL   , 74*se_m_explosion_mvl/mxv
 	.byte	W06
-	.byte		        125*se_w153_mvl/mxv
+	.byte		        125*se_m_explosion_mvl/mxv
 	.byte		N02   
 	.byte	W01
-	.byte		VOL   , 74*se_w153_mvl/mxv
+	.byte		VOL   , 74*se_m_explosion_mvl/mxv
 	.byte	W16
 	.byte	W24
 	.byte	W24
@@ -104,15 +104,15 @@ se_w153_2:
 @******************************************************@
 	.align	2
 
-se_w153:
+se_m_explosion:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w153_pri	@ Priority
-	.byte	se_w153_rev	@ Reverb.
+	.byte	se_m_explosion_pri	@ Priority
+	.byte	se_m_explosion_rev	@ Reverb.
 
-	.word	se_w153_grp
+	.word	se_m_explosion_grp
 
-	.word	se_w153_1
-	.word	se_w153_2
+	.word	se_m_explosion_1
+	.word	se_m_explosion_2
 
 	.end
diff --git a/sound/songs/se_w185.s b/sound/songs/se_m_faint_attack.s
index 8ec9ebfe8..ce53c7173 100644
--- a/sound/songs/se_w185.s
+++ b/sound/songs/se_m_faint_attack.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w185_grp, voicegroup128
-	.equ	se_w185_pri, 4
-	.equ	se_w185_rev, reverb_set+50
-	.equ	se_w185_mvl, 127
-	.equ	se_w185_key, 0
-	.equ	se_w185_tbs, 1
-	.equ	se_w185_exg, 0
-	.equ	se_w185_cmp, 1
+	.equ	se_m_faint_attack_grp, voicegroup128
+	.equ	se_m_faint_attack_pri, 4
+	.equ	se_m_faint_attack_rev, reverb_set+50
+	.equ	se_m_faint_attack_mvl, 127
+	.equ	se_m_faint_attack_key, 0
+	.equ	se_m_faint_attack_tbs, 1
+	.equ	se_m_faint_attack_exg, 0
+	.equ	se_m_faint_attack_cmp, 1
 
 	.section .rodata
-	.global	se_w185
+	.global	se_m_faint_attack
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w185_1:
-	.byte	KEYSH , se_w185_key+0
-	.byte	TEMPO , 150*se_w185_tbs/2
+se_m_faint_attack_1:
+	.byte	KEYSH , se_m_faint_attack_key+0
+	.byte	TEMPO , 150*se_m_faint_attack_tbs/2
 	.byte		VOICE , 45
-	.byte		VOL   , 100*se_w185_mvl/mxv
+	.byte		VOL   , 100*se_m_faint_attack_mvl/mxv
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-5
@@ -76,14 +76,14 @@ se_w185_1:
 @******************************************************@
 	.align	2
 
-se_w185:
+se_m_faint_attack:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w185_pri	@ Priority
-	.byte	se_w185_rev	@ Reverb.
+	.byte	se_m_faint_attack_pri	@ Priority
+	.byte	se_m_faint_attack_rev	@ Reverb.
 
-	.word	se_w185_grp
+	.word	se_m_faint_attack_grp
 
-	.word	se_w185_1
+	.word	se_m_faint_attack_1
 
 	.end
diff --git a/sound/songs/se_m_flame_wheel.s b/sound/songs/se_m_flame_wheel.s
new file mode 100644
index 000000000..797073466
--- /dev/null
+++ b/sound/songs/se_m_flame_wheel.s
@@ -0,0 +1,124 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_flame_wheel_grp, voicegroup128
+	.equ	se_m_flame_wheel_pri, 4
+	.equ	se_m_flame_wheel_rev, reverb_set+50
+	.equ	se_m_flame_wheel_mvl, 127
+	.equ	se_m_flame_wheel_key, 0
+	.equ	se_m_flame_wheel_tbs, 1
+	.equ	se_m_flame_wheel_exg, 0
+	.equ	se_m_flame_wheel_cmp, 1
+
+	.section .rodata
+	.global	se_m_flame_wheel
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_flame_wheel_1:
+	.byte	KEYSH , se_m_flame_wheel_key+0
+	.byte	TEMPO , 150*se_m_flame_wheel_tbs/2
+	.byte		VOICE , 29
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 22*se_m_flame_wheel_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N30   , Dn4 , v127
+	.byte	W01
+	.byte		VOL   , 49*se_m_flame_wheel_mvl/mxv
+	.byte	W01
+	.byte		        71*se_m_flame_wheel_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_flame_wheel_mvl/mxv
+	.byte		BEND  , c_v+8
+	.byte	W01
+	.byte		VOL   , 110*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+5
+	.byte		BEND  , c_v+16
+	.byte	W01
+	.byte		VOL   , 95*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte		        88*se_m_flame_wheel_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+7
+	.byte	W01
+	.byte		VOL   , 93*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte		        110*se_m_flame_wheel_mvl/mxv
+	.byte		PAN   , c_v-5
+	.byte		BEND  , c_v+0
+	.byte	W02
+	.byte		VOL   , 86*se_m_flame_wheel_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v-9
+	.byte	W01
+	.byte		VOL   , 63*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte		        37*se_m_flame_wheel_mvl/mxv
+	.byte		BEND  , c_v-24
+	.byte	W03
+	.byte		VOL   , 13*se_m_flame_wheel_mvl/mxv
+	.byte		BEND  , c_v-46
+	.byte	W03
+	.byte	W03
+	.byte	W03
+	.byte	W03
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_flame_wheel_2:
+	.byte	KEYSH , se_m_flame_wheel_key+0
+	.byte		VOICE , 27
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 22*se_m_flame_wheel_mvl/mxv
+	.byte		N30   , Gn2 , v032
+	.byte	W01
+	.byte		VOL   , 49*se_m_flame_wheel_mvl/mxv
+	.byte	W01
+	.byte		        71*se_m_flame_wheel_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_flame_wheel_mvl/mxv
+	.byte	W01
+	.byte		        110*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte	W01
+	.byte		        95*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte		        88*se_m_flame_wheel_mvl/mxv
+	.byte	W01
+	.byte		        93*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte		        110*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte		        86*se_m_flame_wheel_mvl/mxv
+	.byte	W01
+	.byte	W01
+	.byte		        63*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte		        37*se_m_flame_wheel_mvl/mxv
+	.byte	W03
+	.byte		        13*se_m_flame_wheel_mvl/mxv
+	.byte	W03
+	.byte	W03
+	.byte	W03
+	.byte	W03
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_flame_wheel:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_flame_wheel_pri	@ Priority
+	.byte	se_m_flame_wheel_rev	@ Reverb.
+
+	.word	se_m_flame_wheel_grp
+
+	.word	se_m_flame_wheel_1
+	.word	se_m_flame_wheel_2
+
+	.end
diff --git a/sound/songs/se_m_flame_wheel2.s b/sound/songs/se_m_flame_wheel2.s
new file mode 100644
index 000000000..21f911b0b
--- /dev/null
+++ b/sound/songs/se_m_flame_wheel2.s
@@ -0,0 +1,99 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_flame_wheel2_grp, voicegroup128
+	.equ	se_m_flame_wheel2_pri, 4
+	.equ	se_m_flame_wheel2_rev, reverb_set+50
+	.equ	se_m_flame_wheel2_mvl, 127
+	.equ	se_m_flame_wheel2_key, 0
+	.equ	se_m_flame_wheel2_tbs, 1
+	.equ	se_m_flame_wheel2_exg, 0
+	.equ	se_m_flame_wheel2_cmp, 1
+
+	.section .rodata
+	.global	se_m_flame_wheel2
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_flame_wheel2_1:
+	.byte	KEYSH , se_m_flame_wheel2_key+0
+	.byte	TEMPO , 150*se_m_flame_wheel2_tbs/2
+	.byte		VOICE , 29
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 110*se_m_flame_wheel2_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N48   , Cn4 , v127
+	.byte	W06
+	.byte		PAN   , c_v+4
+	.byte	W03
+	.byte		BEND  , c_v+2
+	.byte	W03
+	.byte		PAN   , c_v+10
+	.byte	W03
+	.byte		BEND  , c_v+5
+	.byte	W03
+	.byte		VOL   , 98*se_m_flame_wheel2_mvl/mxv
+	.byte		PAN   , c_v+4
+	.byte	W03
+	.byte		BEND  , c_v+3
+	.byte	W03
+	.byte		VOL   , 88*se_m_flame_wheel2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		BEND  , c_v-5
+	.byte	W03
+	.byte		VOL   , 68*se_m_flame_wheel2_mvl/mxv
+	.byte		PAN   , c_v-5
+	.byte	W03
+	.byte		        c_v+7
+	.byte		BEND  , c_v-9
+	.byte	W03
+	.byte		VOL   , 44*se_m_flame_wheel2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		BEND  , c_v-15
+	.byte	W03
+	.byte		VOL   , 13*se_m_flame_wheel2_mvl/mxv
+	.byte		BEND  , c_v-24
+	.byte	W03
+	.byte		        c_v-40
+	.byte	W03
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_flame_wheel2_2:
+	.byte	KEYSH , se_m_flame_wheel2_key+0
+	.byte		VOICE , 27
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 110*se_m_flame_wheel2_mvl/mxv
+	.byte		N48   , Gn2 , v032
+	.byte	W18
+	.byte		VOL   , 98*se_m_flame_wheel2_mvl/mxv
+	.byte	W06
+	.byte		        88*se_m_flame_wheel2_mvl/mxv
+	.byte	W06
+	.byte		        68*se_m_flame_wheel2_mvl/mxv
+	.byte	W06
+	.byte		        44*se_m_flame_wheel2_mvl/mxv
+	.byte	W06
+	.byte		        13*se_m_flame_wheel2_mvl/mxv
+	.byte	W06
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_flame_wheel2:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_flame_wheel2_pri	@ Priority
+	.byte	se_m_flame_wheel2_rev	@ Reverb.
+
+	.word	se_m_flame_wheel2_grp
+
+	.word	se_m_flame_wheel2_1
+	.word	se_m_flame_wheel2_2
+
+	.end
diff --git a/sound/songs/se_w053.s b/sound/songs/se_m_flamethrower.s
index 7c414896a..29438337f 100644
--- a/sound/songs/se_w053.s
+++ b/sound/songs/se_m_flamethrower.s
@@ -1,26 +1,26 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w053_grp, voicegroup128
-	.equ	se_w053_pri, 4
-	.equ	se_w053_rev, reverb_set+50
-	.equ	se_w053_mvl, 127
-	.equ	se_w053_key, 0
-	.equ	se_w053_tbs, 1
-	.equ	se_w053_exg, 0
-	.equ	se_w053_cmp, 1
+	.equ	se_m_flamethrower_grp, voicegroup128
+	.equ	se_m_flamethrower_pri, 4
+	.equ	se_m_flamethrower_rev, reverb_set+50
+	.equ	se_m_flamethrower_mvl, 127
+	.equ	se_m_flamethrower_key, 0
+	.equ	se_m_flamethrower_tbs, 1
+	.equ	se_m_flamethrower_exg, 0
+	.equ	se_m_flamethrower_cmp, 1
 
 	.section .rodata
-	.global	se_w053
+	.global	se_m_flamethrower
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w053_1:
-	.byte	KEYSH , se_w053_key+0
-	.byte	TEMPO , 150*se_w053_tbs/2
+se_m_flamethrower_1:
+	.byte	KEYSH , se_m_flamethrower_key+0
+	.byte	TEMPO , 150*se_m_flamethrower_tbs/2
 	.byte		VOICE , 29
 	.byte		BENDR , 12
-	.byte		VOL   , 110*se_w053_mvl/mxv
+	.byte		VOL   , 110*se_m_flamethrower_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte		BEND  , c_v+50
 	.byte		TIE   , Cn3 , v127
@@ -66,7 +66,7 @@ se_w053_1:
 	.byte	W03
 	.byte		        c_v+0
 	.byte	W03
-se_w053_1_000:
+se_m_flamethrower_1_000:
 	.byte		PAN   , c_v+4
 	.byte	W03
 	.byte		        c_v-5
@@ -83,48 +83,48 @@ se_w053_1_000:
 	.byte	W03
 	.byte	PEND
 	.byte	PATT
-	 .word	se_w053_1_000
+	 .word	se_m_flamethrower_1_000
 	.byte	PATT
-	 .word	se_w053_1_000
+	 .word	se_m_flamethrower_1_000
 	.byte	PATT
-	 .word	se_w053_1_000
+	 .word	se_m_flamethrower_1_000
 	.byte		PAN   , c_v+4
 	.byte	W03
 	.byte		        c_v-5
 	.byte	W03
-	.byte		VOL   , 103*se_w053_mvl/mxv
+	.byte		VOL   , 103*se_m_flamethrower_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+8
 	.byte	W03
-	.byte		VOL   , 96*se_w053_mvl/mxv
+	.byte		VOL   , 96*se_m_flamethrower_mvl/mxv
 	.byte		PAN   , c_v-9
 	.byte	W04
 	.byte		        c_v+4
 	.byte	W02
-	.byte		VOL   , 88*se_w053_mvl/mxv
+	.byte		VOL   , 88*se_m_flamethrower_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-5
 	.byte	W03
 	.byte		        c_v+0
 	.byte	W01
-	.byte		VOL   , 73*se_w053_mvl/mxv
+	.byte		VOL   , 73*se_m_flamethrower_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+4
 	.byte	W03
-	.byte		VOL   , 62*se_w053_mvl/mxv
+	.byte		VOL   , 62*se_m_flamethrower_mvl/mxv
 	.byte		PAN   , c_v-5
 	.byte	W04
 	.byte		        c_v+8
 	.byte	W01
-	.byte		VOL   , 47*se_w053_mvl/mxv
+	.byte		VOL   , 47*se_m_flamethrower_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-9
 	.byte	W03
-	.byte		VOL   , 27*se_w053_mvl/mxv
+	.byte		VOL   , 27*se_m_flamethrower_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+4
 	.byte	W04
-	.byte		VOL   , 10*se_w053_mvl/mxv
+	.byte		VOL   , 10*se_m_flamethrower_mvl/mxv
 	.byte		PAN   , c_v-5
 	.byte	W03
 	.byte		        c_v+0
@@ -134,20 +134,20 @@ se_w053_1_000:
 
 @********************** Track  2 **********************@
 
-se_w053_2:
-	.byte	KEYSH , se_w053_key+0
+se_m_flamethrower_2:
+	.byte	KEYSH , se_m_flamethrower_key+0
 	.byte		VOICE , 27
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w053_mvl/mxv
+	.byte		VOL   , 110*se_m_flamethrower_mvl/mxv
 	.byte		N24   , Fn2 , v060
 	.byte	W10
-	.byte		VOL   , 99*se_w053_mvl/mxv
+	.byte		VOL   , 99*se_m_flamethrower_mvl/mxv
 	.byte	W05
-	.byte		        82*se_w053_mvl/mxv
+	.byte		        82*se_m_flamethrower_mvl/mxv
 	.byte	W04
-	.byte		        54*se_w053_mvl/mxv
+	.byte		        54*se_m_flamethrower_mvl/mxv
 	.byte	W02
-	.byte		        25*se_w053_mvl/mxv
+	.byte		        25*se_m_flamethrower_mvl/mxv
 	.byte	W03
 	.byte	W24
 	.byte	W24
@@ -161,15 +161,15 @@ se_w053_2:
 @******************************************************@
 	.align	2
 
-se_w053:
+se_m_flamethrower:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w053_pri	@ Priority
-	.byte	se_w053_rev	@ Reverb.
+	.byte	se_m_flamethrower_pri	@ Priority
+	.byte	se_m_flamethrower_rev	@ Reverb.
 
-	.word	se_w053_grp
+	.word	se_m_flamethrower_grp
 
-	.word	se_w053_1
-	.word	se_w053_2
+	.word	se_m_flamethrower_1
+	.word	se_m_flamethrower_2
 
 	.end
diff --git a/sound/songs/se_m_flatter.s b/sound/songs/se_m_flatter.s
new file mode 100644
index 000000000..e3746c990
--- /dev/null
+++ b/sound/songs/se_m_flatter.s
@@ -0,0 +1,67 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_flatter_grp, voicegroup128
+	.equ	se_m_flatter_pri, 4
+	.equ	se_m_flatter_rev, reverb_set+50
+	.equ	se_m_flatter_mvl, 127
+	.equ	se_m_flatter_key, 0
+	.equ	se_m_flatter_tbs, 1
+	.equ	se_m_flatter_exg, 0
+	.equ	se_m_flatter_cmp, 1
+
+	.section .rodata
+	.global	se_m_flatter
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_flatter_1:
+	.byte	KEYSH , se_m_flatter_key+0
+	.byte	TEMPO , 150*se_m_flatter_tbs/2
+	.byte		VOICE , 41
+	.byte		VOL   , 100*se_m_flatter_mvl/mxv
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+0
+	.byte		N01   , Dn5 , v127
+	.byte	W01
+	.byte		        Gn4 
+	.byte	W01
+	.byte		N09   , En5 
+	.byte	W02
+	.byte		PAN   , c_v+6
+	.byte	W02
+	.byte		VOL   , 92*se_m_flatter_mvl/mxv
+	.byte		PAN   , c_v-8
+	.byte	W01
+	.byte		VOL   , 83*se_m_flatter_mvl/mxv
+	.byte		PAN   , c_v+6
+	.byte	W01
+	.byte		VOL   , 71*se_m_flatter_mvl/mxv
+	.byte		PAN   , c_v-8
+	.byte		BEND  , c_v-4
+	.byte	W01
+	.byte		VOL   , 46*se_m_flatter_mvl/mxv
+	.byte		PAN   , c_v+11
+	.byte		BEND  , c_v-8
+	.byte	W01
+	.byte		VOL   , 22*se_m_flatter_mvl/mxv
+	.byte		PAN   , c_v-12
+	.byte		BEND  , c_v-15
+	.byte	W02
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_flatter:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_flatter_pri	@ Priority
+	.byte	se_m_flatter_rev	@ Reverb.
+
+	.word	se_m_flatter_grp
+
+	.word	se_m_flatter_1
+
+	.end
diff --git a/sound/songs/se_w202.s b/sound/songs/se_m_giga_drain.s
index 6149a878d..4596a0252 100644
--- a/sound/songs/se_w202.s
+++ b/sound/songs/se_m_giga_drain.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w202_grp, voicegroup128
-	.equ	se_w202_pri, 4
-	.equ	se_w202_rev, reverb_set+50
-	.equ	se_w202_mvl, 127
-	.equ	se_w202_key, 0
-	.equ	se_w202_tbs, 1
-	.equ	se_w202_exg, 0
-	.equ	se_w202_cmp, 1
+	.equ	se_m_giga_drain_grp, voicegroup128
+	.equ	se_m_giga_drain_pri, 4
+	.equ	se_m_giga_drain_rev, reverb_set+50
+	.equ	se_m_giga_drain_mvl, 127
+	.equ	se_m_giga_drain_key, 0
+	.equ	se_m_giga_drain_tbs, 1
+	.equ	se_m_giga_drain_exg, 0
+	.equ	se_m_giga_drain_cmp, 1
 
 	.section .rodata
-	.global	se_w202
+	.global	se_m_giga_drain
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w202_1:
-	.byte	KEYSH , se_w202_key+0
-	.byte	TEMPO , 150*se_w202_tbs/2
+se_m_giga_drain_1:
+	.byte	KEYSH , se_m_giga_drain_key+0
+	.byte	TEMPO , 150*se_m_giga_drain_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w202_mvl/mxv
+	.byte		VOL   , 110*se_m_giga_drain_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N03   , Gn2 , v127
 	.byte	W02
@@ -68,14 +68,14 @@ se_w202_1:
 @******************************************************@
 	.align	2
 
-se_w202:
+se_m_giga_drain:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w202_pri	@ Priority
-	.byte	se_w202_rev	@ Reverb.
+	.byte	se_m_giga_drain_pri	@ Priority
+	.byte	se_m_giga_drain_rev	@ Reverb.
 
-	.word	se_w202_grp
+	.word	se_m_giga_drain_grp
 
-	.word	se_w202_1
+	.word	se_m_giga_drain_1
 
 	.end
diff --git a/sound/songs/se_w320.s b/sound/songs/se_m_grasswhistle.s
index 82d93b571..111bc2166 100644
--- a/sound/songs/se_w320.s
+++ b/sound/songs/se_m_grasswhistle.s
@@ -1,28 +1,28 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w320_grp, voicegroup128
-	.equ	se_w320_pri, 4
-	.equ	se_w320_rev, reverb_set+50
-	.equ	se_w320_mvl, 127
-	.equ	se_w320_key, 0
-	.equ	se_w320_tbs, 1
-	.equ	se_w320_exg, 0
-	.equ	se_w320_cmp, 1
+	.equ	se_m_grasswhistle_grp, voicegroup128
+	.equ	se_m_grasswhistle_pri, 4
+	.equ	se_m_grasswhistle_rev, reverb_set+50
+	.equ	se_m_grasswhistle_mvl, 127
+	.equ	se_m_grasswhistle_key, 0
+	.equ	se_m_grasswhistle_tbs, 1
+	.equ	se_m_grasswhistle_exg, 0
+	.equ	se_m_grasswhistle_cmp, 1
 
 	.section .rodata
-	.global	se_w320
+	.global	se_m_grasswhistle
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w320_1:
-	.byte	KEYSH , se_w320_key+0
-	.byte	TEMPO , 100*se_w320_tbs/2
+se_m_grasswhistle_1:
+	.byte	KEYSH , se_m_grasswhistle_key+0
+	.byte	TEMPO , 100*se_m_grasswhistle_tbs/2
 	.byte		VOICE , 64
 	.byte		BENDR , 2
 	.byte		LFOS  , 40
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 70*se_w320_mvl/mxv
+	.byte		VOL   , 70*se_m_grasswhistle_mvl/mxv
 	.byte		BEND  , c_v-16
 	.byte		N21   , Gn5 , v112
 	.byte	W03
@@ -52,24 +52,24 @@ se_w320_1:
 	.byte	W12
 	.byte	W12
 	.byte	W06
-	.byte		VOL   , 61*se_w320_mvl/mxv
+	.byte		VOL   , 61*se_m_grasswhistle_mvl/mxv
 	.byte	W06
-	.byte		        51*se_w320_mvl/mxv
+	.byte		        51*se_m_grasswhistle_mvl/mxv
 	.byte	W06
-	.byte		        36*se_w320_mvl/mxv
+	.byte		        36*se_m_grasswhistle_mvl/mxv
 	.byte	W06
-	.byte		        18*se_w320_mvl/mxv
+	.byte		        18*se_m_grasswhistle_mvl/mxv
 	.byte	W12
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w320_2:
-	.byte	KEYSH , se_w320_key+0
+se_m_grasswhistle_2:
+	.byte	KEYSH , se_m_grasswhistle_key+0
 	.byte		VOICE , 64
 	.byte		BENDR , 2
 	.byte		LFOS  , 40
-	.byte		VOL   , 70*se_w320_mvl/mxv
+	.byte		VOL   , 70*se_m_grasswhistle_mvl/mxv
 	.byte	W12
 	.byte		PAN   , c_v+12
 	.byte		BEND  , c_v-16
@@ -103,28 +103,28 @@ se_w320_2:
 	.byte		MOD   , 10
 	.byte	W12
 	.byte	W06
-	.byte		VOL   , 61*se_w320_mvl/mxv
+	.byte		VOL   , 61*se_m_grasswhistle_mvl/mxv
 	.byte	W06
-	.byte		        51*se_w320_mvl/mxv
+	.byte		        51*se_m_grasswhistle_mvl/mxv
 	.byte	W06
-	.byte		        36*se_w320_mvl/mxv
+	.byte		        36*se_m_grasswhistle_mvl/mxv
 	.byte	W06
-	.byte		        18*se_w320_mvl/mxv
+	.byte		        18*se_m_grasswhistle_mvl/mxv
 	.byte	W12
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w320:
+se_m_grasswhistle:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w320_pri	@ Priority
-	.byte	se_w320_rev	@ Reverb.
+	.byte	se_m_grasswhistle_pri	@ Priority
+	.byte	se_m_grasswhistle_rev	@ Reverb.
 
-	.word	se_w320_grp
+	.word	se_m_grasswhistle_grp
 
-	.word	se_w320_1
-	.word	se_w320_2
+	.word	se_m_grasswhistle_1
+	.word	se_m_grasswhistle_2
 
 	.end
diff --git a/sound/songs/se_w258.s b/sound/songs/se_m_hail.s
index e2b1a531f..0c04af212 100644
--- a/sound/songs/se_w258.s
+++ b/sound/songs/se_m_hail.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w258_grp, voicegroup128
-	.equ	se_w258_pri, 4
-	.equ	se_w258_rev, reverb_set+50
-	.equ	se_w258_mvl, 127
-	.equ	se_w258_key, 0
-	.equ	se_w258_tbs, 1
-	.equ	se_w258_exg, 0
-	.equ	se_w258_cmp, 1
+	.equ	se_m_hail_grp, voicegroup128
+	.equ	se_m_hail_pri, 4
+	.equ	se_m_hail_rev, reverb_set+50
+	.equ	se_m_hail_mvl, 127
+	.equ	se_m_hail_key, 0
+	.equ	se_m_hail_tbs, 1
+	.equ	se_m_hail_exg, 0
+	.equ	se_m_hail_cmp, 1
 
 	.section .rodata
-	.global	se_w258
+	.global	se_m_hail
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w258_1:
-	.byte	KEYSH , se_w258_key+0
-	.byte	TEMPO , 150*se_w258_tbs/2
+se_m_hail_1:
+	.byte	KEYSH , se_m_hail_key+0
+	.byte	TEMPO , 150*se_m_hail_tbs/2
 	.byte		VOICE , 3
-	.byte		VOL   , 100*se_w258_mvl/mxv
+	.byte		VOL   , 100*se_m_hail_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N01   , Fn4 , v112
 	.byte	W04
@@ -57,10 +57,10 @@ se_w258_1:
 
 @********************** Track  2 **********************@
 
-se_w258_2:
-	.byte	KEYSH , se_w258_key+0
+se_m_hail_2:
+	.byte	KEYSH , se_m_hail_key+0
 	.byte		VOICE , 4
-	.byte		VOL   , 100*se_w258_mvl/mxv
+	.byte		VOL   , 100*se_m_hail_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N01   , Dn4 , v040
 	.byte	W04
@@ -84,15 +84,15 @@ se_w258_2:
 @******************************************************@
 	.align	2
 
-se_w258:
+se_m_hail:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w258_pri	@ Priority
-	.byte	se_w258_rev	@ Reverb.
+	.byte	se_m_hail_pri	@ Priority
+	.byte	se_m_hail_rev	@ Reverb.
 
-	.word	se_w258_grp
+	.word	se_m_hail_grp
 
-	.word	se_w258_1
-	.word	se_w258_2
+	.word	se_m_hail_1
+	.word	se_m_hail_2
 
 	.end
diff --git a/sound/songs/se_w231.s b/sound/songs/se_m_harden.s
index 46e5ba938..e9bd888de 100644
--- a/sound/songs/se_w231.s
+++ b/sound/songs/se_m_harden.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w231_grp, voicegroup128
-	.equ	se_w231_pri, 4
-	.equ	se_w231_rev, reverb_set+50
-	.equ	se_w231_mvl, 127
-	.equ	se_w231_key, 0
-	.equ	se_w231_tbs, 1
-	.equ	se_w231_exg, 0
-	.equ	se_w231_cmp, 1
+	.equ	se_m_harden_grp, voicegroup128
+	.equ	se_m_harden_pri, 4
+	.equ	se_m_harden_rev, reverb_set+50
+	.equ	se_m_harden_mvl, 127
+	.equ	se_m_harden_key, 0
+	.equ	se_m_harden_tbs, 1
+	.equ	se_m_harden_exg, 0
+	.equ	se_m_harden_cmp, 1
 
 	.section .rodata
-	.global	se_w231
+	.global	se_m_harden
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w231_1:
-	.byte	KEYSH , se_w231_key+0
-	.byte	TEMPO , 150*se_w231_tbs/2
+se_m_harden_1:
+	.byte	KEYSH , se_m_harden_key+0
+	.byte	TEMPO , 150*se_m_harden_tbs/2
 	.byte		VOICE , 28
-	.byte		VOL   , 100*se_w231_mvl/mxv
+	.byte		VOL   , 100*se_m_harden_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+16
 	.byte		N03   , Gs3 , v080
@@ -46,10 +46,10 @@ se_w231_1:
 
 @********************** Track  2 **********************@
 
-se_w231_2:
-	.byte	KEYSH , se_w231_key+0
+se_m_harden_2:
+	.byte	KEYSH , se_m_harden_key+0
 	.byte		VOICE , 4
-	.byte		VOL   , 100*se_w231_mvl/mxv
+	.byte		VOL   , 100*se_m_harden_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N01   , En4 , v060
 	.byte	W04
@@ -60,15 +60,15 @@ se_w231_2:
 @******************************************************@
 	.align	2
 
-se_w231:
+se_m_harden:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w231_pri	@ Priority
-	.byte	se_w231_rev	@ Reverb.
+	.byte	se_m_harden_pri	@ Priority
+	.byte	se_m_harden_rev	@ Reverb.
 
-	.word	se_w231_grp
+	.word	se_m_harden_grp
 
-	.word	se_w231_1
-	.word	se_w231_2
+	.word	se_m_harden_1
+	.word	se_m_harden_2
 
 	.end
diff --git a/sound/songs/se_w114.s b/sound/songs/se_m_haze.s
index 4de8c4ed8..4bf61faa6 100644
--- a/sound/songs/se_w114.s
+++ b/sound/songs/se_m_haze.s
@@ -1,191 +1,191 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w114_grp, voicegroup128
-	.equ	se_w114_pri, 4
-	.equ	se_w114_rev, reverb_set+50
-	.equ	se_w114_mvl, 127
-	.equ	se_w114_key, 0
-	.equ	se_w114_tbs, 1
-	.equ	se_w114_exg, 0
-	.equ	se_w114_cmp, 1
+	.equ	se_m_haze_grp, voicegroup128
+	.equ	se_m_haze_pri, 4
+	.equ	se_m_haze_rev, reverb_set+50
+	.equ	se_m_haze_mvl, 127
+	.equ	se_m_haze_key, 0
+	.equ	se_m_haze_tbs, 1
+	.equ	se_m_haze_exg, 0
+	.equ	se_m_haze_cmp, 1
 
 	.section .rodata
-	.global	se_w114
+	.global	se_m_haze
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w114_1:
-	.byte	KEYSH , se_w114_key+0
-	.byte	TEMPO , 190*se_w114_tbs/2
+se_m_haze_1:
+	.byte	KEYSH , se_m_haze_key+0
+	.byte	TEMPO , 190*se_m_haze_tbs/2
 	.byte		VOICE , 45
 	.byte		BENDR , 8
 	.byte		PAN   , c_v-47
-	.byte		VOL   , 10*se_w114_mvl/mxv
+	.byte		VOL   , 10*se_m_haze_mvl/mxv
 	.byte		MOD   , 30
 	.byte		BEND  , c_v+1
 	.byte		TIE   , As2 , v100
 	.byte	W03
-	.byte		VOL   , 14*se_w114_mvl/mxv
+	.byte		VOL   , 14*se_m_haze_mvl/mxv
 	.byte	W03
-	.byte		        22*se_w114_mvl/mxv
+	.byte		        22*se_m_haze_mvl/mxv
 	.byte		PAN   , c_v-45
 	.byte	W02
-	.byte		VOL   , 31*se_w114_mvl/mxv
+	.byte		VOL   , 31*se_m_haze_mvl/mxv
 	.byte	W02
-	.byte		        39*se_w114_mvl/mxv
+	.byte		        39*se_m_haze_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-43
 	.byte	W02
-	.byte		VOL   , 45*se_w114_mvl/mxv
+	.byte		VOL   , 45*se_m_haze_mvl/mxv
 	.byte	W02
-	.byte		        50*se_w114_mvl/mxv
+	.byte		        50*se_m_haze_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-41
 	.byte	W01
-	.byte		VOL   , 61*se_w114_mvl/mxv
+	.byte		VOL   , 61*se_m_haze_mvl/mxv
 	.byte	W02
-	.byte		        66*se_w114_mvl/mxv
+	.byte		        66*se_m_haze_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-39
-	.byte		VOL   , 73*se_w114_mvl/mxv
+	.byte		VOL   , 73*se_m_haze_mvl/mxv
 	.byte	W02
-	.byte		        78*se_w114_mvl/mxv
+	.byte		        78*se_m_haze_mvl/mxv
 	.byte	W04
-	.byte		        84*se_w114_mvl/mxv
+	.byte		        84*se_m_haze_mvl/mxv
 	.byte		PAN   , c_v-37
 	.byte	W03
-	.byte		VOL   , 91*se_w114_mvl/mxv
+	.byte		VOL   , 91*se_m_haze_mvl/mxv
 	.byte	W03
-	.byte		        98*se_w114_mvl/mxv
+	.byte		        98*se_m_haze_mvl/mxv
 	.byte		PAN   , c_v-35
 	.byte	W02
-	.byte		VOL   , 104*se_w114_mvl/mxv
+	.byte		VOL   , 104*se_m_haze_mvl/mxv
 	.byte	W04
-	.byte		        110*se_w114_mvl/mxv
+	.byte		        110*se_m_haze_mvl/mxv
 	.byte		PAN   , c_v-32
 	.byte	W06
 	.byte		        c_v-28
 	.byte	W06
 	.byte		        c_v-25
-	.byte		VOL   , 106*se_w114_mvl/mxv
+	.byte		VOL   , 106*se_m_haze_mvl/mxv
 	.byte	W04
-	.byte		        104*se_w114_mvl/mxv
+	.byte		        104*se_m_haze_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-23
 	.byte	W03
-	.byte		VOL   , 101*se_w114_mvl/mxv
+	.byte		VOL   , 101*se_m_haze_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-20
 	.byte	W03
-	.byte		VOL   , 97*se_w114_mvl/mxv
+	.byte		VOL   , 97*se_m_haze_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-17
 	.byte	W02
-	.byte		VOL   , 91*se_w114_mvl/mxv
+	.byte		VOL   , 91*se_m_haze_mvl/mxv
 	.byte	W04
 	.byte		PAN   , c_v-13
 	.byte	W03
-	.byte		VOL   , 88*se_w114_mvl/mxv
+	.byte		VOL   , 88*se_m_haze_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-10
 	.byte	W03
-	.byte		VOL   , 81*se_w114_mvl/mxv
+	.byte		VOL   , 81*se_m_haze_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-7
 	.byte	W04
-	.byte		VOL   , 75*se_w114_mvl/mxv
+	.byte		VOL   , 75*se_m_haze_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-3
 	.byte	W02
-	.byte		VOL   , 74*se_w114_mvl/mxv
+	.byte		VOL   , 74*se_m_haze_mvl/mxv
 	.byte	W02
-	.byte		        76*se_w114_mvl/mxv
+	.byte		        76*se_m_haze_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 79*se_w114_mvl/mxv
+	.byte		VOL   , 79*se_m_haze_mvl/mxv
 	.byte	W02
-	.byte		        83*se_w114_mvl/mxv
+	.byte		        83*se_m_haze_mvl/mxv
 	.byte	W03
 	.byte	W01
-	.byte		        86*se_w114_mvl/mxv
+	.byte		        86*se_m_haze_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+2
-	.byte		VOL   , 90*se_w114_mvl/mxv
+	.byte		VOL   , 90*se_m_haze_mvl/mxv
 	.byte	W03
-	.byte		        95*se_w114_mvl/mxv
+	.byte		        95*se_m_haze_mvl/mxv
 	.byte	W03
-	.byte		        98*se_w114_mvl/mxv
+	.byte		        98*se_m_haze_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v+7
-	.byte		VOL   , 102*se_w114_mvl/mxv
+	.byte		VOL   , 102*se_m_haze_mvl/mxv
 	.byte	W02
-	.byte		        104*se_w114_mvl/mxv
+	.byte		        104*se_m_haze_mvl/mxv
 	.byte	W04
 	.byte		PAN   , c_v+10
-	.byte		VOL   , 110*se_w114_mvl/mxv
+	.byte		VOL   , 110*se_m_haze_mvl/mxv
 	.byte	W06
 	.byte		PAN   , c_v+14
 	.byte	W06
 	.byte		        c_v+16
 	.byte	W02
-	.byte		VOL   , 106*se_w114_mvl/mxv
+	.byte		VOL   , 106*se_m_haze_mvl/mxv
 	.byte	W04
 	.byte		PAN   , c_v+19
 	.byte	W01
-	.byte		VOL   , 100*se_w114_mvl/mxv
+	.byte		VOL   , 100*se_m_haze_mvl/mxv
 	.byte	W05
 	.byte		PAN   , c_v+22
-	.byte		VOL   , 94*se_w114_mvl/mxv
+	.byte		VOL   , 94*se_m_haze_mvl/mxv
 	.byte	W06
 	.byte		PAN   , c_v+25
-	.byte		VOL   , 88*se_w114_mvl/mxv
+	.byte		VOL   , 88*se_m_haze_mvl/mxv
 	.byte	W04
-	.byte		        83*se_w114_mvl/mxv
+	.byte		        83*se_m_haze_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+27
 	.byte	W06
 	.byte		        c_v+29
-	.byte		VOL   , 75*se_w114_mvl/mxv
+	.byte		VOL   , 75*se_m_haze_mvl/mxv
 	.byte	W06
 	.byte		PAN   , c_v+32
-	.byte		VOL   , 64*se_w114_mvl/mxv
+	.byte		VOL   , 64*se_m_haze_mvl/mxv
 	.byte	W06
 	.byte		PAN   , c_v+34
 	.byte	W01
-	.byte		VOL   , 55*se_w114_mvl/mxv
+	.byte		VOL   , 55*se_m_haze_mvl/mxv
 	.byte	W05
 	.byte		PAN   , c_v+38
 	.byte	W01
-	.byte		VOL   , 47*se_w114_mvl/mxv
+	.byte		VOL   , 47*se_m_haze_mvl/mxv
 	.byte	W05
 	.byte		PAN   , c_v+41
 	.byte	W01
-	.byte		VOL   , 41*se_w114_mvl/mxv
+	.byte		VOL   , 41*se_m_haze_mvl/mxv
 	.byte	W05
 	.byte		PAN   , c_v+44
-	.byte		VOL   , 32*se_w114_mvl/mxv
+	.byte		VOL   , 32*se_m_haze_mvl/mxv
 	.byte	W03
-	.byte		        25*se_w114_mvl/mxv
+	.byte		        25*se_m_haze_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v+47
 	.byte	W01
-	.byte		VOL   , 12*se_w114_mvl/mxv
+	.byte		VOL   , 12*se_m_haze_mvl/mxv
 	.byte	W03
-	.byte		        6*se_w114_mvl/mxv
+	.byte		        6*se_m_haze_mvl/mxv
 	.byte	W02
 	.byte		EOT   
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w114_2:
-	.byte	KEYSH , se_w114_key+0
+se_m_haze_2:
+	.byte	KEYSH , se_m_haze_key+0
 	.byte		VOICE , 70
 	.byte		BENDR , 8
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w114_mvl/mxv
+	.byte		VOL   , 110*se_m_haze_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N24   , Fn4 , v020
 	.byte	W06
@@ -236,15 +236,15 @@ se_w114_2:
 @******************************************************@
 	.align	2
 
-se_w114:
+se_m_haze:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w114_pri	@ Priority
-	.byte	se_w114_rev	@ Reverb.
+	.byte	se_m_haze_pri	@ Priority
+	.byte	se_m_haze_rev	@ Reverb.
 
-	.word	se_w114_grp
+	.word	se_m_haze_grp
 
-	.word	se_w114_1
-	.word	se_w114_2
+	.word	se_m_haze_1
+	.word	se_m_haze_2
 
 	.end
diff --git a/sound/songs/se_w215.s b/sound/songs/se_m_heal_bell.s
index 196686fbd..b2b17f7d8 100644
--- a/sound/songs/se_w215.s
+++ b/sound/songs/se_m_heal_bell.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w215_grp, voicegroup128
-	.equ	se_w215_pri, 4
-	.equ	se_w215_rev, reverb_set+50
-	.equ	se_w215_mvl, 127
-	.equ	se_w215_key, 0
-	.equ	se_w215_tbs, 1
-	.equ	se_w215_exg, 0
-	.equ	se_w215_cmp, 1
+	.equ	se_m_heal_bell_grp, voicegroup128
+	.equ	se_m_heal_bell_pri, 4
+	.equ	se_m_heal_bell_rev, reverb_set+50
+	.equ	se_m_heal_bell_mvl, 127
+	.equ	se_m_heal_bell_key, 0
+	.equ	se_m_heal_bell_tbs, 1
+	.equ	se_m_heal_bell_exg, 0
+	.equ	se_m_heal_bell_cmp, 1
 
 	.section .rodata
-	.global	se_w215
+	.global	se_m_heal_bell
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w215_1:
-	.byte	KEYSH , se_w215_key+0
-	.byte	TEMPO , 150*se_w215_tbs/2
+se_m_heal_bell_1:
+	.byte	KEYSH , se_m_heal_bell_key+0
+	.byte	TEMPO , 150*se_m_heal_bell_tbs/2
 	.byte		VOICE , 51
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 90*se_w215_mvl/mxv
+	.byte		VOL   , 90*se_m_heal_bell_mvl/mxv
 	.byte		BEND  , c_v+4
 	.byte		N03   , As5 , v100
 	.byte	W01
@@ -70,14 +70,14 @@ se_w215_1:
 @******************************************************@
 	.align	2
 
-se_w215:
+se_m_heal_bell:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w215_pri	@ Priority
-	.byte	se_w215_rev	@ Reverb.
+	.byte	se_m_heal_bell_pri	@ Priority
+	.byte	se_m_heal_bell_rev	@ Reverb.
 
-	.word	se_w215_grp
+	.word	se_m_heal_bell_grp
 
-	.word	se_w215_1
+	.word	se_m_heal_bell_1
 
 	.end
diff --git a/sound/songs/se_w257.s b/sound/songs/se_m_heat_wave.s
index 5e9b6d06d..a4b5cc896 100644
--- a/sound/songs/se_w257.s
+++ b/sound/songs/se_m_heat_wave.s
@@ -1,60 +1,60 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w257_grp, voicegroup128
-	.equ	se_w257_pri, 4
-	.equ	se_w257_rev, reverb_set+50
-	.equ	se_w257_mvl, 127
-	.equ	se_w257_key, 0
-	.equ	se_w257_tbs, 1
-	.equ	se_w257_exg, 0
-	.equ	se_w257_cmp, 1
+	.equ	se_m_heat_wave_grp, voicegroup128
+	.equ	se_m_heat_wave_pri, 4
+	.equ	se_m_heat_wave_rev, reverb_set+50
+	.equ	se_m_heat_wave_mvl, 127
+	.equ	se_m_heat_wave_key, 0
+	.equ	se_m_heat_wave_tbs, 1
+	.equ	se_m_heat_wave_exg, 0
+	.equ	se_m_heat_wave_cmp, 1
 
 	.section .rodata
-	.global	se_w257
+	.global	se_m_heat_wave
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w257_1:
-	.byte	KEYSH , se_w257_key+0
-	.byte	TEMPO , 150*se_w257_tbs/2
+se_m_heat_wave_1:
+	.byte	KEYSH , se_m_heat_wave_key+0
+	.byte	TEMPO , 150*se_m_heat_wave_tbs/2
 	.byte		VOICE , 29
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 23*se_w257_mvl/mxv
+	.byte		VOL   , 23*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		TIE   , Fn4 , v127
 	.byte	W01
-	.byte		VOL   , 51*se_w257_mvl/mxv
+	.byte		VOL   , 51*se_m_heat_wave_mvl/mxv
 	.byte	W01
-	.byte		        75*se_w257_mvl/mxv
+	.byte		        75*se_m_heat_wave_mvl/mxv
 	.byte	W01
-	.byte		        99*se_w257_mvl/mxv
+	.byte		        99*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v+8
 	.byte	W01
-	.byte		VOL   , 115*se_w257_mvl/mxv
+	.byte		VOL   , 115*se_m_heat_wave_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+16
 	.byte	W01
-	.byte		VOL   , 99*se_w257_mvl/mxv
+	.byte		VOL   , 99*se_m_heat_wave_mvl/mxv
 	.byte	W02
-	.byte		        92*se_w257_mvl/mxv
+	.byte		        92*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v+7
 	.byte	W01
-	.byte		VOL   , 97*se_w257_mvl/mxv
+	.byte		VOL   , 97*se_m_heat_wave_mvl/mxv
 	.byte	W02
-	.byte		        105*se_w257_mvl/mxv
+	.byte		        105*se_m_heat_wave_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte	W03
-	.byte		VOL   , 110*se_w257_mvl/mxv
+	.byte		VOL   , 110*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v-9
 	.byte	W03
 	.byte		PAN   , c_v-8
 	.byte		BEND  , c_v-24
 	.byte	W03
-	.byte		VOL   , 115*se_w257_mvl/mxv
+	.byte		VOL   , 115*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v-38
 	.byte	W03
 	.byte		PAN   , c_v+0
@@ -100,78 +100,78 @@ se_w257_1:
 	.byte		BEND  , c_v-3
 	.byte	W02
 	.byte		PAN   , c_v-8
-	.byte		VOL   , 113*se_w257_mvl/mxv
+	.byte		VOL   , 113*se_m_heat_wave_mvl/mxv
 	.byte	W04
-	.byte		        110*se_w257_mvl/mxv
+	.byte		        110*se_m_heat_wave_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte	W02
 	.byte		BEND  , c_v-7
 	.byte	W02
-	.byte		VOL   , 105*se_w257_mvl/mxv
+	.byte		VOL   , 105*se_m_heat_wave_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+6
 	.byte	W03
-	.byte		VOL   , 98*se_w257_mvl/mxv
+	.byte		VOL   , 98*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v-11
 	.byte	W03
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 91*se_w257_mvl/mxv
+	.byte		VOL   , 91*se_m_heat_wave_mvl/mxv
 	.byte	W03
-	.byte		        81*se_w257_mvl/mxv
+	.byte		        81*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v-15
 	.byte	W02
 	.byte		PAN   , c_v-8
 	.byte	W02
-	.byte		VOL   , 74*se_w257_mvl/mxv
+	.byte		VOL   , 74*se_m_heat_wave_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-22
 	.byte	W03
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 63*se_w257_mvl/mxv
+	.byte		VOL   , 63*se_m_heat_wave_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-30
 	.byte	W01
-	.byte		VOL   , 50*se_w257_mvl/mxv
+	.byte		VOL   , 50*se_m_heat_wave_mvl/mxv
 	.byte	W02
-	.byte		        40*se_w257_mvl/mxv
+	.byte		        40*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v-39
 	.byte	W02
 	.byte		PAN   , c_v+6
 	.byte	W01
-	.byte		VOL   , 28*se_w257_mvl/mxv
+	.byte		VOL   , 28*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v-52
 	.byte	W02
-	.byte		VOL   , 17*se_w257_mvl/mxv
+	.byte		VOL   , 17*se_m_heat_wave_mvl/mxv
 	.byte	W03
 	.byte		EOT   
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w257_2:
-	.byte	KEYSH , se_w257_key+0
+se_m_heat_wave_2:
+	.byte	KEYSH , se_m_heat_wave_key+0
 	.byte		VOICE , 27
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 23*se_w257_mvl/mxv
+	.byte		VOL   , 23*se_m_heat_wave_mvl/mxv
 	.byte		N30   , Gn2 , v032
 	.byte	W01
-	.byte		VOL   , 51*se_w257_mvl/mxv
+	.byte		VOL   , 51*se_m_heat_wave_mvl/mxv
 	.byte	W01
-	.byte		        75*se_w257_mvl/mxv
+	.byte		        75*se_m_heat_wave_mvl/mxv
 	.byte	W01
-	.byte		        99*se_w257_mvl/mxv
+	.byte		        99*se_m_heat_wave_mvl/mxv
 	.byte	W01
-	.byte		        115*se_w257_mvl/mxv
+	.byte		        115*se_m_heat_wave_mvl/mxv
 	.byte	W03
-	.byte		        99*se_w257_mvl/mxv
+	.byte		        99*se_m_heat_wave_mvl/mxv
 	.byte	W02
-	.byte		        92*se_w257_mvl/mxv
+	.byte		        92*se_m_heat_wave_mvl/mxv
 	.byte	W01
-	.byte		        97*se_w257_mvl/mxv
+	.byte		        97*se_m_heat_wave_mvl/mxv
 	.byte	W02
-	.byte		        115*se_w257_mvl/mxv
+	.byte		        115*se_m_heat_wave_mvl/mxv
 	.byte	W12
 	.byte		PAN   , c_v+0
 	.byte	W12
@@ -192,15 +192,15 @@ se_w257_2:
 @******************************************************@
 	.align	2
 
-se_w257:
+se_m_heat_wave:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w257_pri	@ Priority
-	.byte	se_w257_rev	@ Reverb.
+	.byte	se_m_heat_wave_pri	@ Priority
+	.byte	se_m_heat_wave_rev	@ Reverb.
 
-	.word	se_w257_grp
+	.word	se_m_heat_wave_grp
 
-	.word	se_w257_1
-	.word	se_w257_2
+	.word	se_m_heat_wave_1
+	.word	se_m_heat_wave_2
 
 	.end
diff --git a/sound/songs/se_w056.s b/sound/songs/se_m_hydro_pump.s
index d553f418f..050f6281b 100644
--- a/sound/songs/se_w056.s
+++ b/sound/songs/se_m_hydro_pump.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w056_grp, voicegroup128
-	.equ	se_w056_pri, 4
-	.equ	se_w056_rev, reverb_set+50
-	.equ	se_w056_mvl, 127
-	.equ	se_w056_key, 0
-	.equ	se_w056_tbs, 1
-	.equ	se_w056_exg, 0
-	.equ	se_w056_cmp, 1
+	.equ	se_m_hydro_pump_grp, voicegroup128
+	.equ	se_m_hydro_pump_pri, 4
+	.equ	se_m_hydro_pump_rev, reverb_set+50
+	.equ	se_m_hydro_pump_mvl, 127
+	.equ	se_m_hydro_pump_key, 0
+	.equ	se_m_hydro_pump_tbs, 1
+	.equ	se_m_hydro_pump_exg, 0
+	.equ	se_m_hydro_pump_cmp, 1
 
 	.section .rodata
-	.global	se_w056
+	.global	se_m_hydro_pump
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w056_1:
-	.byte	KEYSH , se_w056_key+0
-	.byte	TEMPO , 150*se_w056_tbs/2
+se_m_hydro_pump_1:
+	.byte	KEYSH , se_m_hydro_pump_key+0
+	.byte	TEMPO , 150*se_m_hydro_pump_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 115*se_w056_mvl/mxv
+	.byte		VOL   , 115*se_m_hydro_pump_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		TIE   , Gn2 , v127
 	.byte	W06
@@ -53,53 +53,53 @@ se_w056_1:
 	.byte	W06
 	.byte		        c_v+11
 	.byte	W02
-	.byte		VOL   , 103*se_w056_mvl/mxv
+	.byte		VOL   , 103*se_m_hydro_pump_mvl/mxv
 	.byte	W04
 	.byte		PAN   , c_v+4
 	.byte	W01
-	.byte		VOL   , 85*se_w056_mvl/mxv
+	.byte		VOL   , 85*se_m_hydro_pump_mvl/mxv
 	.byte	W05
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 71*se_w056_mvl/mxv
+	.byte		VOL   , 71*se_m_hydro_pump_mvl/mxv
 	.byte	W05
-	.byte		        52*se_w056_mvl/mxv
+	.byte		        52*se_m_hydro_pump_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte	W04
-	.byte		VOL   , 32*se_w056_mvl/mxv
+	.byte		VOL   , 32*se_m_hydro_pump_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-10
 	.byte	W03
-	.byte		VOL   , 11*se_w056_mvl/mxv
+	.byte		VOL   , 11*se_m_hydro_pump_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-5
 	.byte	W01
-	.byte		VOL   , 6*se_w056_mvl/mxv
+	.byte		VOL   , 6*se_m_hydro_pump_mvl/mxv
 	.byte	W05
 	.byte		EOT   
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w056_2:
-	.byte	KEYSH , se_w056_key+0
-	.byte		VOL   , 58*se_w056_mvl/mxv
+se_m_hydro_pump_2:
+	.byte	KEYSH , se_m_hydro_pump_key+0
+	.byte		VOL   , 58*se_m_hydro_pump_mvl/mxv
 	.byte		N14   , Gn3 , v080
 	.byte	W01
 	.byte		VOICE , 25
-	.byte		VOL   , 76*se_w056_mvl/mxv
+	.byte		VOL   , 76*se_m_hydro_pump_mvl/mxv
 	.byte	W01
-	.byte		        89*se_w056_mvl/mxv
+	.byte		        89*se_m_hydro_pump_mvl/mxv
 	.byte	W01
-	.byte		        100*se_w056_mvl/mxv
+	.byte		        100*se_m_hydro_pump_mvl/mxv
 	.byte	W01
-	.byte		        115*se_w056_mvl/mxv
+	.byte		        115*se_m_hydro_pump_mvl/mxv
 	.byte	W06
-	.byte		        90*se_w056_mvl/mxv
+	.byte		        90*se_m_hydro_pump_mvl/mxv
 	.byte	W02
-	.byte		        76*se_w056_mvl/mxv
+	.byte		        76*se_m_hydro_pump_mvl/mxv
 	.byte	W01
-	.byte		        58*se_w056_mvl/mxv
+	.byte		        58*se_m_hydro_pump_mvl/mxv
 	.byte	W11
 	.byte	W24
 	.byte	W24
@@ -110,15 +110,15 @@ se_w056_2:
 @******************************************************@
 	.align	2
 
-se_w056:
+se_m_hydro_pump:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w056_pri	@ Priority
-	.byte	se_w056_rev	@ Reverb.
+	.byte	se_m_hydro_pump_pri	@ Priority
+	.byte	se_m_hydro_pump_rev	@ Reverb.
 
-	.word	se_w056_grp
+	.word	se_m_hydro_pump_grp
 
-	.word	se_w056_1
-	.word	se_w056_2
+	.word	se_m_hydro_pump_1
+	.word	se_m_hydro_pump_2
 
 	.end
diff --git a/sound/songs/se_w063.s b/sound/songs/se_m_hyper_beam.s
index e2db381bd..bce85a21a 100644
--- a/sound/songs/se_w063.s
+++ b/sound/songs/se_m_hyper_beam.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w063_grp, voicegroup128
-	.equ	se_w063_pri, 4
-	.equ	se_w063_rev, reverb_set+50
-	.equ	se_w063_mvl, 127
-	.equ	se_w063_key, 0
-	.equ	se_w063_tbs, 1
-	.equ	se_w063_exg, 0
-	.equ	se_w063_cmp, 1
+	.equ	se_m_hyper_beam_grp, voicegroup128
+	.equ	se_m_hyper_beam_pri, 4
+	.equ	se_m_hyper_beam_rev, reverb_set+50
+	.equ	se_m_hyper_beam_mvl, 127
+	.equ	se_m_hyper_beam_key, 0
+	.equ	se_m_hyper_beam_tbs, 1
+	.equ	se_m_hyper_beam_exg, 0
+	.equ	se_m_hyper_beam_cmp, 1
 
 	.section .rodata
-	.global	se_w063
+	.global	se_m_hyper_beam
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w063_1:
-	.byte	KEYSH , se_w063_key+0
-	.byte	TEMPO , 150*se_w063_tbs/2
+se_m_hyper_beam_1:
+	.byte	KEYSH , se_m_hyper_beam_key+0
+	.byte	TEMPO , 150*se_m_hyper_beam_tbs/2
 	.byte		VOICE , 18
-	.byte		VOL   , 110*se_w063_mvl/mxv
+	.byte		VOL   , 110*se_m_hyper_beam_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -45,10 +45,10 @@ se_w063_1:
 
 @********************** Track  2 **********************@
 
-se_w063_2:
-	.byte	KEYSH , se_w063_key+0
+se_m_hyper_beam_2:
+	.byte	KEYSH , se_m_hyper_beam_key+0
 	.byte		VOICE , 5
-	.byte		VOL   , 110*se_w063_mvl/mxv
+	.byte		VOL   , 110*se_m_hyper_beam_mvl/mxv
 	.byte		N01   , Cn3 , v040
 	.byte	W02
 	.byte		N01   
@@ -57,28 +57,28 @@ se_w063_2:
 	.byte	W02
 	.byte		N01   
 	.byte	W04
-se_w063_2_000:
+se_m_hyper_beam_2_000:
 	.byte		N01   , Cn3 , v020
 	.byte	W02
 	.byte		N01   
 	.byte	W04
 	.byte	PEND
 	.byte	PATT
-	 .word	se_w063_2_000
+	 .word	se_m_hyper_beam_2_000
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w063:
+se_m_hyper_beam:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w063_pri	@ Priority
-	.byte	se_w063_rev	@ Reverb.
+	.byte	se_m_hyper_beam_pri	@ Priority
+	.byte	se_m_hyper_beam_rev	@ Reverb.
 
-	.word	se_w063_grp
+	.word	se_m_hyper_beam_grp
 
-	.word	se_w063_1
-	.word	se_w063_2
+	.word	se_m_hyper_beam_1
+	.word	se_m_hyper_beam_2
 
 	.end
diff --git a/sound/songs/se_w063b.s b/sound/songs/se_m_hyper_beam2.s
index eef257849..304fa7b3f 100644
--- a/sound/songs/se_w063b.s
+++ b/sound/songs/se_m_hyper_beam2.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w063b_grp, voicegroup128
-	.equ	se_w063b_pri, 4
-	.equ	se_w063b_rev, reverb_set+50
-	.equ	se_w063b_mvl, 127
-	.equ	se_w063b_key, 0
-	.equ	se_w063b_tbs, 1
-	.equ	se_w063b_exg, 0
-	.equ	se_w063b_cmp, 1
+	.equ	se_m_hyper_beam2_grp, voicegroup128
+	.equ	se_m_hyper_beam2_pri, 4
+	.equ	se_m_hyper_beam2_rev, reverb_set+50
+	.equ	se_m_hyper_beam2_mvl, 127
+	.equ	se_m_hyper_beam2_key, 0
+	.equ	se_m_hyper_beam2_tbs, 1
+	.equ	se_m_hyper_beam2_exg, 0
+	.equ	se_m_hyper_beam2_cmp, 1
 
 	.section .rodata
-	.global	se_w063b
+	.global	se_m_hyper_beam2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w063b_1:
-	.byte	KEYSH , se_w063b_key+0
-	.byte	TEMPO , 150*se_w063b_tbs/2
+se_m_hyper_beam2_1:
+	.byte	KEYSH , se_m_hyper_beam2_key+0
+	.byte	TEMPO , 150*se_m_hyper_beam2_tbs/2
 	.byte		VOICE , 45
-	.byte		VOL   , 110*se_w063b_mvl/mxv
+	.byte		VOL   , 110*se_m_hyper_beam2_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -76,10 +76,10 @@ se_w063b_1:
 
 @********************** Track  2 **********************@
 
-se_w063b_2:
-	.byte	KEYSH , se_w063b_key+0
+se_m_hyper_beam2_2:
+	.byte	KEYSH , se_m_hyper_beam2_key+0
 	.byte		VOICE , 5
-	.byte		VOL   , 110*se_w063b_mvl/mxv
+	.byte		VOL   , 110*se_m_hyper_beam2_mvl/mxv
 	.byte		N01   , Cn3 , v032
 	.byte	W02
 	.byte		N01   
@@ -88,28 +88,28 @@ se_w063b_2:
 	.byte	W02
 	.byte		N01   
 	.byte	W04
-se_w063b_2_000:
+se_m_hyper_beam2_2_000:
 	.byte		N01   , Cn3 , v020
 	.byte	W02
 	.byte		N01   
 	.byte	W04
 	.byte	PEND
 	.byte	PATT
-	 .word	se_w063b_2_000
+	 .word	se_m_hyper_beam2_2_000
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w063b:
+se_m_hyper_beam2:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w063b_pri	@ Priority
-	.byte	se_w063b_rev	@ Reverb.
+	.byte	se_m_hyper_beam2_pri	@ Priority
+	.byte	se_m_hyper_beam2_rev	@ Reverb.
 
-	.word	se_w063b_grp
+	.word	se_m_hyper_beam2_grp
 
-	.word	se_w063b_1
-	.word	se_w063b_2
+	.word	se_m_hyper_beam2_1
+	.word	se_m_hyper_beam2_2
 
 	.end
diff --git a/sound/songs/se_w196.s b/sound/songs/se_m_icy_wind.s
index 8a47a8c1b..d15350525 100644
--- a/sound/songs/se_w196.s
+++ b/sound/songs/se_m_icy_wind.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w196_grp, voicegroup128
-	.equ	se_w196_pri, 4
-	.equ	se_w196_rev, reverb_set+50
-	.equ	se_w196_mvl, 127
-	.equ	se_w196_key, 0
-	.equ	se_w196_tbs, 1
-	.equ	se_w196_exg, 0
-	.equ	se_w196_cmp, 1
+	.equ	se_m_icy_wind_grp, voicegroup128
+	.equ	se_m_icy_wind_pri, 4
+	.equ	se_m_icy_wind_rev, reverb_set+50
+	.equ	se_m_icy_wind_mvl, 127
+	.equ	se_m_icy_wind_key, 0
+	.equ	se_m_icy_wind_tbs, 1
+	.equ	se_m_icy_wind_exg, 0
+	.equ	se_m_icy_wind_cmp, 1
 
 	.section .rodata
-	.global	se_w196
+	.global	se_m_icy_wind
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w196_1:
-	.byte	KEYSH , se_w196_key+0
-	.byte	TEMPO , 150*se_w196_tbs/2
+se_m_icy_wind_1:
+	.byte	KEYSH , se_m_icy_wind_key+0
+	.byte	TEMPO , 150*se_m_icy_wind_tbs/2
 	.byte		VOICE , 3
-	.byte		VOL   , 100*se_w196_mvl/mxv
+	.byte		VOL   , 100*se_m_icy_wind_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N01   , Ds4 , v112
 	.byte	W04
@@ -36,10 +36,10 @@ se_w196_1:
 
 @********************** Track  2 **********************@
 
-se_w196_2:
-	.byte	KEYSH , se_w196_key+0
+se_m_icy_wind_2:
+	.byte	KEYSH , se_m_icy_wind_key+0
 	.byte		VOICE , 5
-	.byte		VOL   , 100*se_w196_mvl/mxv
+	.byte		VOL   , 100*se_m_icy_wind_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N01   , Dn4 , v040
 	.byte	W04
@@ -58,15 +58,15 @@ se_w196_2:
 @******************************************************@
 	.align	2
 
-se_w196:
+se_m_icy_wind:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w196_pri	@ Priority
-	.byte	se_w196_rev	@ Reverb.
+	.byte	se_m_icy_wind_pri	@ Priority
+	.byte	se_m_icy_wind_rev	@ Reverb.
 
-	.word	se_w196_grp
+	.word	se_m_icy_wind_grp
 
-	.word	se_w196_1
-	.word	se_w196_2
+	.word	se_m_icy_wind_1
+	.word	se_m_icy_wind_2
 
 	.end
diff --git a/sound/songs/se_w122.s b/sound/songs/se_m_lick.s
index 95eb26ead..1aa0c35a2 100644
--- a/sound/songs/se_w122.s
+++ b/sound/songs/se_m_lick.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w122_grp, voicegroup128
-	.equ	se_w122_pri, 4
-	.equ	se_w122_rev, reverb_set+50
-	.equ	se_w122_mvl, 127
-	.equ	se_w122_key, 0
-	.equ	se_w122_tbs, 1
-	.equ	se_w122_exg, 0
-	.equ	se_w122_cmp, 1
+	.equ	se_m_lick_grp, voicegroup128
+	.equ	se_m_lick_pri, 4
+	.equ	se_m_lick_rev, reverb_set+50
+	.equ	se_m_lick_mvl, 127
+	.equ	se_m_lick_key, 0
+	.equ	se_m_lick_tbs, 1
+	.equ	se_m_lick_exg, 0
+	.equ	se_m_lick_cmp, 1
 
 	.section .rodata
-	.global	se_w122
+	.global	se_m_lick
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w122_1:
-	.byte	KEYSH , se_w122_key+0
-	.byte	TEMPO , 150*se_w122_tbs/2
+se_m_lick_1:
+	.byte	KEYSH , se_m_lick_key+0
+	.byte	TEMPO , 150*se_m_lick_tbs/2
 	.byte		VOICE , 31
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w122_mvl/mxv
+	.byte		VOL   , 110*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v-5
 	.byte		N32   , Cn3 , v127
 	.byte	W01
@@ -68,47 +68,47 @@ se_w122_1:
 	.byte		BEND  , c_v+16
 	.byte	W02
 	.byte		PAN   , c_v-4
-	.byte		VOL   , 102*se_w122_mvl/mxv
+	.byte		VOL   , 102*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v+12
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+16
 	.byte	W01
 	.byte		PAN   , c_v+4
-	.byte		VOL   , 97*se_w122_mvl/mxv
+	.byte		VOL   , 97*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v+18
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+14
 	.byte	W01
 	.byte		PAN   , c_v-4
-	.byte		VOL   , 92*se_w122_mvl/mxv
+	.byte		VOL   , 92*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v+18
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+20
 	.byte	W01
 	.byte		PAN   , c_v+4
-	.byte		VOL   , 88*se_w122_mvl/mxv
+	.byte		VOL   , 88*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v+17
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+12
 	.byte	W01
 	.byte		PAN   , c_v-4
-	.byte		VOL   , 81*se_w122_mvl/mxv
+	.byte		VOL   , 81*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v+16
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 64*se_w122_mvl/mxv
+	.byte		VOL   , 64*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v+12
 	.byte	W02
 	.byte		PAN   , c_v+4
-	.byte		VOL   , 49*se_w122_mvl/mxv
+	.byte		VOL   , 49*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v+14
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 25*se_w122_mvl/mxv
+	.byte		VOL   , 25*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v+11
 	.byte	W05
 	.byte	FINE
@@ -116,14 +116,14 @@ se_w122_1:
 @******************************************************@
 	.align	2
 
-se_w122:
+se_m_lick:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w122_pri	@ Priority
-	.byte	se_w122_rev	@ Reverb.
+	.byte	se_m_lick_pri	@ Priority
+	.byte	se_m_lick_rev	@ Reverb.
 
-	.word	se_w122_grp
+	.word	se_m_lick_grp
 
-	.word	se_w122_1
+	.word	se_m_lick_1
 
 	.end
diff --git a/sound/songs/se_w199.s b/sound/songs/se_m_lock_on.s
index 26ffc82b7..d8e1de5b0 100644
--- a/sound/songs/se_w199.s
+++ b/sound/songs/se_m_lock_on.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w199_grp, voicegroup128
-	.equ	se_w199_pri, 4
-	.equ	se_w199_rev, reverb_set+50
-	.equ	se_w199_mvl, 127
-	.equ	se_w199_key, 0
-	.equ	se_w199_tbs, 1
-	.equ	se_w199_exg, 0
-	.equ	se_w199_cmp, 1
+	.equ	se_m_lock_on_grp, voicegroup128
+	.equ	se_m_lock_on_pri, 4
+	.equ	se_m_lock_on_rev, reverb_set+50
+	.equ	se_m_lock_on_mvl, 127
+	.equ	se_m_lock_on_key, 0
+	.equ	se_m_lock_on_tbs, 1
+	.equ	se_m_lock_on_exg, 0
+	.equ	se_m_lock_on_cmp, 1
 
 	.section .rodata
-	.global	se_w199
+	.global	se_m_lock_on
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w199_1:
-	.byte	KEYSH , se_w199_key+0
-	.byte	TEMPO , 150*se_w199_tbs/2
+se_m_lock_on_1:
+	.byte	KEYSH , se_m_lock_on_key+0
+	.byte	TEMPO , 150*se_m_lock_on_tbs/2
 	.byte		VOICE , 40
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w199_mvl/mxv
+	.byte		VOL   , 110*se_m_lock_on_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N01   , Cn4 , v100
 	.byte	W01
@@ -56,14 +56,14 @@ se_w199_1:
 @******************************************************@
 	.align	2
 
-se_w199:
+se_m_lock_on:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w199_pri	@ Priority
-	.byte	se_w199_rev	@ Reverb.
+	.byte	se_m_lock_on_pri	@ Priority
+	.byte	se_m_lock_on_rev	@ Reverb.
 
-	.word	se_w199_grp
+	.word	se_m_lock_on_grp
 
-	.word	se_w199_1
+	.word	se_m_lock_on_1
 
 	.end
diff --git a/sound/songs/se_w118.s b/sound/songs/se_m_metronome.s
index 3c4d1404c..ba0a55d8b 100644
--- a/sound/songs/se_w118.s
+++ b/sound/songs/se_m_metronome.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w118_grp, voicegroup128
-	.equ	se_w118_pri, 4
-	.equ	se_w118_rev, reverb_set+50
-	.equ	se_w118_mvl, 127
-	.equ	se_w118_key, 0
-	.equ	se_w118_tbs, 1
-	.equ	se_w118_exg, 0
-	.equ	se_w118_cmp, 1
+	.equ	se_m_metronome_grp, voicegroup128
+	.equ	se_m_metronome_pri, 4
+	.equ	se_m_metronome_rev, reverb_set+50
+	.equ	se_m_metronome_mvl, 127
+	.equ	se_m_metronome_key, 0
+	.equ	se_m_metronome_tbs, 1
+	.equ	se_m_metronome_exg, 0
+	.equ	se_m_metronome_cmp, 1
 
 	.section .rodata
-	.global	se_w118
+	.global	se_m_metronome
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w118_1:
-	.byte	KEYSH , se_w118_key+0
-	.byte	TEMPO , 150*se_w118_tbs/2
+se_m_metronome_1:
+	.byte	KEYSH , se_m_metronome_key+0
+	.byte	TEMPO , 150*se_m_metronome_tbs/2
 	.byte		VOICE , 37
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 115*se_w118_mvl/mxv
+	.byte		VOL   , 115*se_m_metronome_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N15   , En3 , v127
 	.byte	W01
@@ -66,14 +66,14 @@ se_w118_1:
 @******************************************************@
 	.align	2
 
-se_w118:
+se_m_metronome:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w118_pri	@ Priority
-	.byte	se_w118_rev	@ Reverb.
+	.byte	se_m_metronome_pri	@ Priority
+	.byte	se_m_metronome_rev	@ Reverb.
 
-	.word	se_w118_grp
+	.word	se_m_metronome_grp
 
-	.word	se_w118_1
+	.word	se_m_metronome_1
 
 	.end
diff --git a/sound/songs/se_w208.s b/sound/songs/se_m_milk_drink.s
index b26ce23d7..30a051540 100644
--- a/sound/songs/se_w208.s
+++ b/sound/songs/se_m_milk_drink.s
@@ -1,42 +1,42 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w208_grp, voicegroup128
-	.equ	se_w208_pri, 4
-	.equ	se_w208_rev, reverb_set+50
-	.equ	se_w208_mvl, 127
-	.equ	se_w208_key, 0
-	.equ	se_w208_tbs, 1
-	.equ	se_w208_exg, 0
-	.equ	se_w208_cmp, 1
+	.equ	se_m_milk_drink_grp, voicegroup128
+	.equ	se_m_milk_drink_pri, 4
+	.equ	se_m_milk_drink_rev, reverb_set+50
+	.equ	se_m_milk_drink_mvl, 127
+	.equ	se_m_milk_drink_key, 0
+	.equ	se_m_milk_drink_tbs, 1
+	.equ	se_m_milk_drink_exg, 0
+	.equ	se_m_milk_drink_cmp, 1
 
 	.section .rodata
-	.global	se_w208
+	.global	se_m_milk_drink
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w208_1:
-	.byte	KEYSH , se_w208_key+0
-	.byte	TEMPO , 180*se_w208_tbs/2
+se_m_milk_drink_1:
+	.byte	KEYSH , se_m_milk_drink_key+0
+	.byte	TEMPO , 180*se_m_milk_drink_tbs/2
 	.byte		VOICE , 16
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 100*se_w208_mvl/mxv
+	.byte		VOL   , 100*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   , An6 , v100
 	.byte	W01
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 90*se_w208_mvl/mxv
+	.byte		VOL   , 90*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 77*se_w208_mvl/mxv
+	.byte		VOL   , 77*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-37
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 37*se_w208_mvl/mxv
+	.byte		VOL   , 37*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-47
 	.byte	W02
 	.byte		N02   , An6 , v056
@@ -44,7 +44,7 @@ se_w208_1:
 	.byte		PAN   , c_v+5
 	.byte	W01
 	.byte		        c_v-6
-	.byte		VOL   , 100*se_w208_mvl/mxv
+	.byte		VOL   , 100*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   , An6 , v100
 	.byte	W01
@@ -52,15 +52,15 @@ se_w208_1:
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		VOL   , 90*se_w208_mvl/mxv
+	.byte		VOL   , 90*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W02
 	.byte		PAN   , c_v+1
-	.byte		VOL   , 77*se_w208_mvl/mxv
+	.byte		VOL   , 77*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-37
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 37*se_w208_mvl/mxv
+	.byte		VOL   , 37*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-47
 	.byte	W01
 	.byte		PAN   , c_v-6
@@ -69,7 +69,7 @@ se_w208_1:
 	.byte		PAN   , c_v+8
 	.byte	W01
 	.byte		        c_v-10
-	.byte		VOL   , 100*se_w208_mvl/mxv
+	.byte		VOL   , 100*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   , An6 , v072
 	.byte	W02
@@ -77,15 +77,15 @@ se_w208_1:
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 90*se_w208_mvl/mxv
+	.byte		VOL   , 90*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 77*se_w208_mvl/mxv
+	.byte		VOL   , 77*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-37
 	.byte	W01
 	.byte		PAN   , c_v+8
-	.byte		VOL   , 37*se_w208_mvl/mxv
+	.byte		VOL   , 37*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-47
 	.byte	W01
 	.byte		PAN   , c_v-10
@@ -95,10 +95,10 @@ se_w208_1:
 
 @********************** Track  2 **********************@
 
-se_w208_2:
-	.byte	KEYSH , se_w208_key+0
+se_m_milk_drink_2:
+	.byte	KEYSH , se_m_milk_drink_key+0
 	.byte		VOICE , 53
-	.byte		VOL   , 100*se_w208_mvl/mxv
+	.byte		VOL   , 100*se_m_milk_drink_mvl/mxv
 	.byte	W02
 	.byte		N06   , Fs6 , v040
 	.byte	W04
@@ -115,15 +115,15 @@ se_w208_2:
 @******************************************************@
 	.align	2
 
-se_w208:
+se_m_milk_drink:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w208_pri	@ Priority
-	.byte	se_w208_rev	@ Reverb.
+	.byte	se_m_milk_drink_pri	@ Priority
+	.byte	se_m_milk_drink_rev	@ Reverb.
 
-	.word	se_w208_grp
+	.word	se_m_milk_drink_grp
 
-	.word	se_w208_1
-	.word	se_w208_2
+	.word	se_m_milk_drink_1
+	.word	se_m_milk_drink_2
 
 	.end
diff --git a/sound/songs/se_w107.s b/sound/songs/se_m_minimize.s
index da7bc3d39..565450b2b 100644
--- a/sound/songs/se_w107.s
+++ b/sound/songs/se_m_minimize.s
@@ -1,58 +1,58 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w107_grp, voicegroup128
-	.equ	se_w107_pri, 4
-	.equ	se_w107_rev, reverb_set+50
-	.equ	se_w107_mvl, 127
-	.equ	se_w107_key, 0
-	.equ	se_w107_tbs, 1
-	.equ	se_w107_exg, 0
-	.equ	se_w107_cmp, 1
+	.equ	se_m_minimize_grp, voicegroup128
+	.equ	se_m_minimize_pri, 4
+	.equ	se_m_minimize_rev, reverb_set+50
+	.equ	se_m_minimize_mvl, 127
+	.equ	se_m_minimize_key, 0
+	.equ	se_m_minimize_tbs, 1
+	.equ	se_m_minimize_exg, 0
+	.equ	se_m_minimize_cmp, 1
 
 	.section .rodata
-	.global	se_w107
+	.global	se_m_minimize
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w107_1:
-	.byte	KEYSH , se_w107_key+0
-	.byte	TEMPO , 150*se_w107_tbs/2
+se_m_minimize_1:
+	.byte	KEYSH , se_m_minimize_key+0
+	.byte	TEMPO , 150*se_m_minimize_tbs/2
 	.byte		VOICE , 45
 	.byte		BENDR , 24
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 32*se_w107_mvl/mxv
+	.byte		VOL   , 32*se_m_minimize_mvl/mxv
 	.byte		MOD   , 30
 	.byte		BEND  , c_v+39
 	.byte		N06   , Dn4 , v127
 	.byte	W01
 	.byte		BEND  , c_v+31
 	.byte	W01
-	.byte		VOL   , 49*se_w107_mvl/mxv
+	.byte		VOL   , 49*se_m_minimize_mvl/mxv
 	.byte		PAN   , c_v+5
 	.byte		BEND  , c_v+23
 	.byte	W01
 	.byte		        c_v+15
 	.byte	W01
-	.byte		VOL   , 61*se_w107_mvl/mxv
+	.byte		VOL   , 61*se_m_minimize_mvl/mxv
 	.byte		BEND  , c_v+8
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+35
 	.byte		N06   , Cn4 , v116
 	.byte	W01
-	.byte		VOL   , 71*se_w107_mvl/mxv
+	.byte		VOL   , 71*se_m_minimize_mvl/mxv
 	.byte		BEND  , c_v+27
 	.byte	W01
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+19
 	.byte	W01
-	.byte		VOL   , 81*se_w107_mvl/mxv
+	.byte		VOL   , 81*se_m_minimize_mvl/mxv
 	.byte		BEND  , c_v+12
 	.byte	W01
 	.byte		        c_v+5
 	.byte	W02
-	.byte		VOL   , 95*se_w107_mvl/mxv
+	.byte		VOL   , 95*se_m_minimize_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+32
 	.byte		N06   , Bn3 , v112
@@ -92,20 +92,20 @@ se_w107_1:
 	.byte	W01
 	.byte		        c_v-6
 	.byte	W02
-	.byte		VOL   , 82*se_w107_mvl/mxv
+	.byte		VOL   , 82*se_m_minimize_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+21
 	.byte		N06   , Fn3 , v100
 	.byte	W01
 	.byte		BEND  , c_v+13
 	.byte	W01
-	.byte		VOL   , 71*se_w107_mvl/mxv
+	.byte		VOL   , 71*se_m_minimize_mvl/mxv
 	.byte		PAN   , c_v-8
 	.byte		BEND  , c_v+5
 	.byte	W01
 	.byte		        c_v-2
 	.byte	W01
-	.byte		VOL   , 61*se_w107_mvl/mxv
+	.byte		VOL   , 61*se_m_minimize_mvl/mxv
 	.byte		BEND  , c_v-10
 	.byte	W02
 	.byte		PAN   , c_v+0
@@ -152,14 +152,14 @@ se_w107_1:
 @******************************************************@
 	.align	2
 
-se_w107:
+se_m_minimize:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w107_pri	@ Priority
-	.byte	se_w107_rev	@ Reverb.
+	.byte	se_m_minimize_pri	@ Priority
+	.byte	se_m_minimize_rev	@ Reverb.
 
-	.word	se_w107_grp
+	.word	se_m_minimize_grp
 
-	.word	se_w107_1
+	.word	se_m_minimize_1
 
 	.end
diff --git a/sound/songs/se_w054.s b/sound/songs/se_m_mist.s
index 712dc3338..f46eb130a 100644
--- a/sound/songs/se_w054.s
+++ b/sound/songs/se_m_mist.s
@@ -1,48 +1,48 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w054_grp, voicegroup128
-	.equ	se_w054_pri, 4
-	.equ	se_w054_rev, reverb_set+50
-	.equ	se_w054_mvl, 127
-	.equ	se_w054_key, 0
-	.equ	se_w054_tbs, 1
-	.equ	se_w054_exg, 0
-	.equ	se_w054_cmp, 1
+	.equ	se_m_mist_grp, voicegroup128
+	.equ	se_m_mist_pri, 4
+	.equ	se_m_mist_rev, reverb_set+50
+	.equ	se_m_mist_mvl, 127
+	.equ	se_m_mist_key, 0
+	.equ	se_m_mist_tbs, 1
+	.equ	se_m_mist_exg, 0
+	.equ	se_m_mist_cmp, 1
 
 	.section .rodata
-	.global	se_w054
+	.global	se_m_mist
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w054_1:
-	.byte	KEYSH , se_w054_key+0
-	.byte	TEMPO , 150*se_w054_tbs/2
+se_m_mist_1:
+	.byte	KEYSH , se_m_mist_key+0
+	.byte	TEMPO , 150*se_m_mist_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 7*se_w054_mvl/mxv
+	.byte		VOL   , 7*se_m_mist_mvl/mxv
 	.byte		BEND  , c_v+1
 	.byte		N18   , Cn5 , v052
 	.byte	W01
-	.byte		VOL   , 20*se_w054_mvl/mxv
+	.byte		VOL   , 20*se_m_mist_mvl/mxv
 	.byte		PAN   , c_v+16
 	.byte		BEND  , c_v-8
 	.byte	W01
-	.byte		VOL   , 41*se_w054_mvl/mxv
+	.byte		VOL   , 41*se_m_mist_mvl/mxv
 	.byte		PAN   , c_v-14
 	.byte		BEND  , c_v-16
 	.byte	W01
-	.byte		VOL   , 70*se_w054_mvl/mxv
+	.byte		VOL   , 70*se_m_mist_mvl/mxv
 	.byte		PAN   , c_v+16
 	.byte		BEND  , c_v-8
 	.byte	W01
-	.byte		VOL   , 93*se_w054_mvl/mxv
+	.byte		VOL   , 93*se_m_mist_mvl/mxv
 	.byte		PAN   , c_v-14
 	.byte		BEND  , c_v+0
 	.byte	W02
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w054_mvl/mxv
+	.byte		VOL   , 110*se_m_mist_mvl/mxv
 	.byte		BEND  , c_v+8
 	.byte	W01
 	.byte		PAN   , c_v+16
@@ -50,30 +50,30 @@ se_w054_1:
 	.byte	W01
 	.byte		PAN   , c_v-14
 	.byte	W01
-	.byte		VOL   , 98*se_w054_mvl/mxv
+	.byte		VOL   , 98*se_m_mist_mvl/mxv
 	.byte		PAN   , c_v+16
 	.byte		BEND  , c_v+10
 	.byte	W01
-	.byte		VOL   , 85*se_w054_mvl/mxv
+	.byte		VOL   , 85*se_m_mist_mvl/mxv
 	.byte		PAN   , c_v-14
 	.byte		BEND  , c_v+4
 	.byte	W02
-	.byte		VOL   , 69*se_w054_mvl/mxv
+	.byte		VOL   , 69*se_m_mist_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-7
 	.byte	W01
-	.byte		VOL   , 51*se_w054_mvl/mxv
+	.byte		VOL   , 51*se_m_mist_mvl/mxv
 	.byte		PAN   , c_v+16
 	.byte		BEND  , c_v-22
 	.byte	W01
 	.byte		PAN   , c_v-14
-	.byte		VOL   , 38*se_w054_mvl/mxv
+	.byte		VOL   , 38*se_m_mist_mvl/mxv
 	.byte		BEND  , c_v-28
 	.byte	W01
-	.byte		VOL   , 17*se_w054_mvl/mxv
+	.byte		VOL   , 17*se_m_mist_mvl/mxv
 	.byte		BEND  , c_v-32
 	.byte	W01
-	.byte		VOL   , 4*se_w054_mvl/mxv
+	.byte		VOL   , 4*se_m_mist_mvl/mxv
 	.byte		BEND  , c_v-38
 	.byte	W08
 	.byte	FINE
@@ -81,14 +81,14 @@ se_w054_1:
 @******************************************************@
 	.align	2
 
-se_w054:
+se_m_mist:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w054_pri	@ Priority
-	.byte	se_w054_rev	@ Reverb.
+	.byte	se_m_mist_pri	@ Priority
+	.byte	se_m_mist_rev	@ Reverb.
 
-	.word	se_w054_grp
+	.word	se_m_mist_grp
 
-	.word	se_w054_1
+	.word	se_m_mist_1
 
 	.end
diff --git a/sound/songs/se_w236.s b/sound/songs/se_m_moonlight.s
index c3bb3d90f..bd4410b32 100644
--- a/sound/songs/se_w236.s
+++ b/sound/songs/se_m_moonlight.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w236_grp, voicegroup128
-	.equ	se_w236_pri, 4
-	.equ	se_w236_rev, reverb_set+50
-	.equ	se_w236_mvl, 127
-	.equ	se_w236_key, 0
-	.equ	se_w236_tbs, 1
-	.equ	se_w236_exg, 0
-	.equ	se_w236_cmp, 1
+	.equ	se_m_moonlight_grp, voicegroup128
+	.equ	se_m_moonlight_pri, 4
+	.equ	se_m_moonlight_rev, reverb_set+50
+	.equ	se_m_moonlight_mvl, 127
+	.equ	se_m_moonlight_key, 0
+	.equ	se_m_moonlight_tbs, 1
+	.equ	se_m_moonlight_exg, 0
+	.equ	se_m_moonlight_cmp, 1
 
 	.section .rodata
-	.global	se_w236
+	.global	se_m_moonlight
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w236_1:
-	.byte	KEYSH , se_w236_key+0
-	.byte	TEMPO , 150*se_w236_tbs/2
+se_m_moonlight_1:
+	.byte	KEYSH , se_m_moonlight_key+0
+	.byte	TEMPO , 150*se_m_moonlight_tbs/2
 	.byte		VOICE , 46
-	.byte		VOL   , 100*se_w236_mvl/mxv
+	.byte		VOL   , 100*se_m_moonlight_mvl/mxv
 	.byte		BENDR , 4
 	.byte		PAN   , c_v+0
 	.byte		MOD   , 6
@@ -32,7 +32,7 @@ se_w236_1:
 	.byte	W01
 	.byte		N20   , Gn6 , v100
 	.byte	W21
-se_w236_1_000:
+se_m_moonlight_1_000:
 	.byte		N01   , Ds6 , v056
 	.byte	W01
 	.byte		        Dn6 
@@ -50,7 +50,7 @@ se_w236_1_000:
 	.byte		        c_v-4
 	.byte	W04
 	.byte	PEND
-se_w236_1_001:
+se_m_moonlight_1_001:
 	.byte		PAN   , c_v+0
 	.byte		N01   , Gs5 , v092
 	.byte	W01
@@ -61,7 +61,7 @@ se_w236_1_001:
 	.byte		N20   , Cn6 , v100
 	.byte	W21
 	.byte	PEND
-se_w236_1_002:
+se_m_moonlight_1_002:
 	.byte		PAN   , c_v+16
 	.byte		N01   , Gs5 , v056
 	.byte	W01
@@ -72,7 +72,7 @@ se_w236_1_002:
 	.byte		N20   , Cn6 , v064
 	.byte	W21
 	.byte	PEND
-se_w236_1_003:
+se_m_moonlight_1_003:
 	.byte		PAN   , c_v-16
 	.byte		N01   , Gs5 , v040
 	.byte	W01
@@ -83,7 +83,7 @@ se_w236_1_003:
 	.byte		N20   , Cn6 
 	.byte	W21
 	.byte	PEND
-se_w236_1_004:
+se_m_moonlight_1_004:
 	.byte		PAN   , c_v+32
 	.byte		N01   , Gs5 , v020
 	.byte	W01
@@ -105,24 +105,24 @@ se_w236_1_004:
 	.byte		N20   , Gn6 , v100
 	.byte	W21
 	.byte	PATT
-	 .word	se_w236_1_000
+	 .word	se_m_moonlight_1_000
 	.byte	PATT
-	 .word	se_w236_1_001
+	 .word	se_m_moonlight_1_001
 	.byte	PATT
-	 .word	se_w236_1_002
+	 .word	se_m_moonlight_1_002
 	.byte	PATT
-	 .word	se_w236_1_003
+	 .word	se_m_moonlight_1_003
 	.byte	PATT
-	 .word	se_w236_1_004
+	 .word	se_m_moonlight_1_004
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w236_2:
-	.byte	KEYSH , se_w236_key+0
+se_m_moonlight_2:
+	.byte	KEYSH , se_m_moonlight_key+0
 	.byte		VOICE , 55
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 39*se_w236_mvl/mxv
+	.byte		VOL   , 39*se_m_moonlight_mvl/mxv
 	.byte		BEND  , c_v-4
 	.byte	W10
 	.byte		N01   , Ds6 , v112
@@ -135,7 +135,7 @@ se_w236_2:
 	.byte	W05
 	.byte		        Gn6 , v096
 	.byte	W05
-se_w236_2_000:
+se_m_moonlight_2_000:
 	.byte		PAN   , c_v+50
 	.byte		N04   , Gn6 , v080
 	.byte	W04
@@ -149,7 +149,7 @@ se_w236_2_000:
 	.byte		N04   , Gn6 , v032
 	.byte	W10
 	.byte	PEND
-se_w236_2_001:
+se_m_moonlight_2_001:
 	.byte		PAN   , c_v+0
 	.byte	W10
 	.byte		N01   , Gs5 , v112
@@ -163,7 +163,7 @@ se_w236_2_001:
 	.byte		        Cn6 , v096
 	.byte	W05
 	.byte	PEND
-se_w236_2_002:
+se_m_moonlight_2_002:
 	.byte		PAN   , c_v+50
 	.byte		N04   , Cn6 , v080
 	.byte	W04
@@ -192,11 +192,11 @@ se_w236_2_002:
 	.byte		        Gn6 , v096
 	.byte	W05
 	.byte	PATT
-	 .word	se_w236_2_000
+	 .word	se_m_moonlight_2_000
 	.byte	PATT
-	 .word	se_w236_2_001
+	 .word	se_m_moonlight_2_001
 	.byte	PATT
-	 .word	se_w236_2_002
+	 .word	se_m_moonlight_2_002
 	.byte	W24
 	.byte	W24
 	.byte	FINE
@@ -204,15 +204,15 @@ se_w236_2_002:
 @******************************************************@
 	.align	2
 
-se_w236:
+se_m_moonlight:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w236_pri	@ Priority
-	.byte	se_w236_rev	@ Reverb.
+	.byte	se_m_moonlight_pri	@ Priority
+	.byte	se_m_moonlight_rev	@ Reverb.
 
-	.word	se_w236_grp
+	.word	se_m_moonlight_grp
 
-	.word	se_w236_1
-	.word	se_w236_2
+	.word	se_m_moonlight_1
+	.word	se_m_moonlight_2
 
 	.end
diff --git a/sound/songs/se_w234.s b/sound/songs/se_m_morning_sun.s
index 4f07ef30a..ac7667246 100644
--- a/sound/songs/se_w234.s
+++ b/sound/songs/se_m_morning_sun.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w234_grp, voicegroup128
-	.equ	se_w234_pri, 5
-	.equ	se_w234_rev, reverb_set+50
-	.equ	se_w234_mvl, 127
-	.equ	se_w234_key, 0
-	.equ	se_w234_tbs, 1
-	.equ	se_w234_exg, 0
-	.equ	se_w234_cmp, 1
+	.equ	se_m_morning_sun_grp, voicegroup128
+	.equ	se_m_morning_sun_pri, 5
+	.equ	se_m_morning_sun_rev, reverb_set+50
+	.equ	se_m_morning_sun_mvl, 127
+	.equ	se_m_morning_sun_key, 0
+	.equ	se_m_morning_sun_tbs, 1
+	.equ	se_m_morning_sun_exg, 0
+	.equ	se_m_morning_sun_cmp, 1
 
 	.section .rodata
-	.global	se_w234
+	.global	se_m_morning_sun
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w234_1:
-	.byte	KEYSH , se_w234_key+0
-	.byte	TEMPO , 150*se_w234_tbs/2
+se_m_morning_sun_1:
+	.byte	KEYSH , se_m_morning_sun_key+0
+	.byte	TEMPO , 150*se_m_morning_sun_tbs/2
 	.byte		VOICE , 46
-	.byte		VOL   , 95*se_w234_mvl/mxv
+	.byte		VOL   , 95*se_m_morning_sun_mvl/mxv
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+15
@@ -72,11 +72,11 @@ se_w234_1:
 
 @********************** Track  2 **********************@
 
-se_w234_2:
-	.byte	KEYSH , se_w234_key+0
+se_m_morning_sun_2:
+	.byte	KEYSH , se_m_morning_sun_key+0
 	.byte		VOICE , 53
 	.byte		BENDR , 2
-	.byte		VOL   , 43*se_w234_mvl/mxv
+	.byte		VOL   , 43*se_m_morning_sun_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+15
 	.byte		N06   , Gs6 , v108
@@ -121,15 +121,15 @@ se_w234_2:
 @******************************************************@
 	.align	2
 
-se_w234:
+se_m_morning_sun:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w234_pri	@ Priority
-	.byte	se_w234_rev	@ Reverb.
+	.byte	se_m_morning_sun_pri	@ Priority
+	.byte	se_m_morning_sun_rev	@ Reverb.
 
-	.word	se_w234_grp
+	.word	se_m_morning_sun_grp
 
-	.word	se_w234_1
-	.word	se_w234_2
+	.word	se_m_morning_sun_1
+	.word	se_m_morning_sun_2
 
 	.end
diff --git a/sound/songs/se_w171.s b/sound/songs/se_m_nightmare.s
index a953faa50..825bfaea2 100644
--- a/sound/songs/se_w171.s
+++ b/sound/songs/se_m_nightmare.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w171_grp, voicegroup128
-	.equ	se_w171_pri, 4
-	.equ	se_w171_rev, reverb_set+50
-	.equ	se_w171_mvl, 127
-	.equ	se_w171_key, 0
-	.equ	se_w171_tbs, 1
-	.equ	se_w171_exg, 0
-	.equ	se_w171_cmp, 1
+	.equ	se_m_nightmare_grp, voicegroup128
+	.equ	se_m_nightmare_pri, 4
+	.equ	se_m_nightmare_rev, reverb_set+50
+	.equ	se_m_nightmare_mvl, 127
+	.equ	se_m_nightmare_key, 0
+	.equ	se_m_nightmare_tbs, 1
+	.equ	se_m_nightmare_exg, 0
+	.equ	se_m_nightmare_cmp, 1
 
 	.section .rodata
-	.global	se_w171
+	.global	se_m_nightmare
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w171_1:
-	.byte	KEYSH , se_w171_key+0
-	.byte	TEMPO , 220*se_w171_tbs/2
+se_m_nightmare_1:
+	.byte	KEYSH , se_m_nightmare_key+0
+	.byte	TEMPO , 220*se_m_nightmare_tbs/2
 	.byte		VOICE , 3
-	.byte		VOL   , 110*se_w171_mvl/mxv
+	.byte		VOL   , 110*se_m_nightmare_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -65,12 +65,12 @@ se_w171_1:
 
 @********************** Track  2 **********************@
 
-se_w171_2:
-	.byte	KEYSH , se_w171_key+0
+se_m_nightmare_2:
+	.byte	KEYSH , se_m_nightmare_key+0
 	.byte		VOICE , 20
 	.byte		XCMD  , xIECV , 10
 	.byte		        xIECL , 8
-	.byte		VOL   , 110*se_w171_mvl/mxv
+	.byte		VOL   , 110*se_m_nightmare_mvl/mxv
 	.byte		PAN   , c_v-7
 	.byte		BEND  , c_v+55
 	.byte		N03   , Cn2 , v100
@@ -132,15 +132,15 @@ se_w171_2:
 @******************************************************@
 	.align	2
 
-se_w171:
+se_m_nightmare:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w171_pri	@ Priority
-	.byte	se_w171_rev	@ Reverb.
+	.byte	se_m_nightmare_pri	@ Priority
+	.byte	se_m_nightmare_rev	@ Reverb.
 
-	.word	se_w171_grp
+	.word	se_m_nightmare_grp
 
-	.word	se_w171_1
-	.word	se_w171_2
+	.word	se_m_nightmare_1
+	.word	se_m_nightmare_2
 
 	.end
diff --git a/sound/songs/se_m_perish_song.s b/sound/songs/se_m_perish_song.s
new file mode 100644
index 000000000..af30e2457
--- /dev/null
+++ b/sound/songs/se_m_perish_song.s
@@ -0,0 +1,221 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_perish_song_grp, voicegroup128
+	.equ	se_m_perish_song_pri, 4
+	.equ	se_m_perish_song_rev, reverb_set+50
+	.equ	se_m_perish_song_mvl, 127
+	.equ	se_m_perish_song_key, 0
+	.equ	se_m_perish_song_tbs, 1
+	.equ	se_m_perish_song_exg, 0
+	.equ	se_m_perish_song_cmp, 1
+
+	.section .rodata
+	.global	se_m_perish_song
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_perish_song_1:
+	.byte	KEYSH , se_m_perish_song_key+0
+	.byte	TEMPO , 100*se_m_perish_song_tbs/2
+	.byte		VOICE , 73
+	.byte		BENDR , 12
+	.byte		LFOS  , 40
+	.byte		PAN   , c_v+7
+	.byte		VOL   , 25*se_m_perish_song_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte	W03
+	.byte		VOL   , 29*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        33*se_m_perish_song_mvl/mxv
+	.byte		N48   , An3 , v112
+	.byte	W03
+	.byte		VOL   , 40*se_m_perish_song_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+4
+	.byte	W02
+se_m_perish_song_1_000:
+	.byte		VOL   , 45*se_m_perish_song_mvl/mxv
+	.byte		MOD   , 8
+	.byte	W03
+	.byte		VOL   , 51*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	PEND
+se_m_perish_song_1_001:
+	.byte		VOL   , 56*se_m_perish_song_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		VOL   , 62*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	PEND
+se_m_perish_song_1_002:
+	.byte		VOL   , 72*se_m_perish_song_mvl/mxv
+	.byte		PAN   , c_v-4
+	.byte	W03
+	.byte		VOL   , 81*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	PEND
+se_m_perish_song_1_003:
+	.byte		VOL   , 92*se_m_perish_song_mvl/mxv
+	.byte		PAN   , c_v-8
+	.byte	W03
+	.byte		VOL   , 100*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	PEND
+	.byte		PAN   , c_v-4
+	.byte	W06
+	.byte		VOL   , 82*se_m_perish_song_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		VOL   , 52*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        25*se_m_perish_song_mvl/mxv
+	.byte		MOD   , 0
+	.byte		PAN   , c_v+4
+	.byte	W03
+	.byte		VOL   , 29*se_m_perish_song_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+7
+	.byte	W02
+	.byte		VOL   , 33*se_m_perish_song_mvl/mxv
+	.byte		N72   , Gs3 , v112
+	.byte	W03
+	.byte		VOL   , 40*se_m_perish_song_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+4
+	.byte	W02
+	.byte	PATT
+	 .word	se_m_perish_song_1_000
+	.byte	PATT
+	 .word	se_m_perish_song_1_001
+	.byte	PATT
+	 .word	se_m_perish_song_1_002
+	.byte	PATT
+	 .word	se_m_perish_song_1_003
+	.byte		PAN   , c_v-4
+	.byte	W06
+	.byte		        c_v+0
+	.byte	W06
+	.byte		        c_v+4
+	.byte	W03
+	.byte		VOL   , 87*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        75*se_m_perish_song_mvl/mxv
+	.byte		PAN   , c_v+7
+	.byte	W03
+	.byte		VOL   , 62*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        48*se_m_perish_song_mvl/mxv
+	.byte		PAN   , c_v+4
+	.byte	W03
+	.byte		VOL   , 33*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        25*se_m_perish_song_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W02
+	.byte		VOL   , 10*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	W01
+	.byte		PAN   , c_v-4
+	.byte	W05
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_perish_song_2:
+	.byte	KEYSH , se_m_perish_song_key+0
+	.byte		VOICE , 73
+	.byte		VOL   , 25*se_m_perish_song_mvl/mxv
+	.byte		PAN   , c_v-17
+	.byte		N48   , Cn4 , v100
+	.byte	W03
+	.byte		VOL   , 29*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        33*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        40*se_m_perish_song_mvl/mxv
+	.byte	W03
+se_m_perish_song_2_000:
+	.byte		VOL   , 45*se_m_perish_song_mvl/mxv
+	.byte		MOD   , 8
+	.byte	W03
+	.byte		VOL   , 51*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	PEND
+	.byte		        56*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        62*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        72*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        81*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        92*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        100*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	W06
+	.byte		        82*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        52*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        25*se_m_perish_song_mvl/mxv
+	.byte		MOD   , 0
+	.byte		N72   , Bn3 , v100
+	.byte	W03
+	.byte		VOL   , 29*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        33*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        40*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	PATT
+	 .word	se_m_perish_song_2_000
+	.byte		VOL   , 56*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        62*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        72*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        81*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        92*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        100*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	W06
+	.byte	W06
+	.byte	W03
+	.byte		        87*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        75*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        62*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        48*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        33*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        25*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        10*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	W06
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_perish_song:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_perish_song_pri	@ Priority
+	.byte	se_m_perish_song_rev	@ Reverb.
+
+	.word	se_m_perish_song_grp
+
+	.word	se_m_perish_song_1
+	.word	se_m_perish_song_2
+
+	.end
diff --git a/sound/songs/se_w080.s b/sound/songs/se_m_petal_dance.s
index 0027a0d65..c8ad2810d 100644
--- a/sound/songs/se_w080.s
+++ b/sound/songs/se_m_petal_dance.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w080_grp, voicegroup128
-	.equ	se_w080_pri, 4
-	.equ	se_w080_rev, reverb_set+50
-	.equ	se_w080_mvl, 127
-	.equ	se_w080_key, 0
-	.equ	se_w080_tbs, 1
-	.equ	se_w080_exg, 0
-	.equ	se_w080_cmp, 1
+	.equ	se_m_petal_dance_grp, voicegroup128
+	.equ	se_m_petal_dance_pri, 4
+	.equ	se_m_petal_dance_rev, reverb_set+50
+	.equ	se_m_petal_dance_mvl, 127
+	.equ	se_m_petal_dance_key, 0
+	.equ	se_m_petal_dance_tbs, 1
+	.equ	se_m_petal_dance_exg, 0
+	.equ	se_m_petal_dance_cmp, 1
 
 	.section .rodata
-	.global	se_w080
+	.global	se_m_petal_dance
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w080_1:
-	.byte	KEYSH , se_w080_key+0
-	.byte	TEMPO , 150*se_w080_tbs/2
+se_m_petal_dance_1:
+	.byte	KEYSH , se_m_petal_dance_key+0
+	.byte	TEMPO , 150*se_m_petal_dance_tbs/2
 	.byte		VOICE , 46
-	.byte		VOL   , 95*se_w080_mvl/mxv
+	.byte		VOL   , 95*se_m_petal_dance_mvl/mxv
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+15
@@ -112,11 +112,11 @@ se_w080_1:
 
 @********************** Track  2 **********************@
 
-se_w080_2:
-	.byte	KEYSH , se_w080_key+0
+se_m_petal_dance_2:
+	.byte	KEYSH , se_m_petal_dance_key+0
 	.byte		VOICE , 53
 	.byte		BENDR , 2
-	.byte		VOL   , 43*se_w080_mvl/mxv
+	.byte		VOL   , 43*se_m_petal_dance_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+15
 	.byte		N06   , En6 , v108
@@ -191,15 +191,15 @@ se_w080_2:
 @******************************************************@
 	.align	2
 
-se_w080:
+se_m_petal_dance:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w080_pri	@ Priority
-	.byte	se_w080_rev	@ Reverb.
+	.byte	se_m_petal_dance_pri	@ Priority
+	.byte	se_m_petal_dance_rev	@ Reverb.
 
-	.word	se_w080_grp
+	.word	se_m_petal_dance_grp
 
-	.word	se_w080_1
-	.word	se_w080_2
+	.word	se_m_petal_dance_1
+	.word	se_m_petal_dance_2
 
 	.end
diff --git a/sound/songs/se_m_poison_powder.s b/sound/songs/se_m_poison_powder.s
new file mode 100644
index 000000000..f48637385
--- /dev/null
+++ b/sound/songs/se_m_poison_powder.s
@@ -0,0 +1,58 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_poison_powder_grp, voicegroup128
+	.equ	se_m_poison_powder_pri, 4
+	.equ	se_m_poison_powder_rev, reverb_set+50
+	.equ	se_m_poison_powder_mvl, 127
+	.equ	se_m_poison_powder_key, 0
+	.equ	se_m_poison_powder_tbs, 1
+	.equ	se_m_poison_powder_exg, 0
+	.equ	se_m_poison_powder_cmp, 1
+
+	.section .rodata
+	.global	se_m_poison_powder
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_poison_powder_1:
+	.byte	KEYSH , se_m_poison_powder_key+0
+	.byte	TEMPO , 150*se_m_poison_powder_tbs/2
+	.byte		VOICE , 18
+	.byte		BENDR , 12
+	.byte		VOL   , 55*se_m_poison_powder_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+1
+	.byte		N01   , Cn6 , v100
+	.byte	W01
+	.byte		VOL   , 110*se_m_poison_powder_mvl/mxv
+	.byte	W01
+	.byte		VOICE , 36
+	.byte		VOL   , 55*se_m_poison_powder_mvl/mxv
+	.byte		N02   , Gn6 , v080
+	.byte	W01
+	.byte		VOL   , 110*se_m_poison_powder_mvl/mxv
+	.byte	W04
+	.byte		PAN   , c_v+20
+	.byte		N01   , Gn6 , v024
+	.byte	W03
+	.byte		        Gn6 , v016
+	.byte	W02
+	.byte		PAN   , c_v-21
+	.byte	W12
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_poison_powder:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_poison_powder_pri	@ Priority
+	.byte	se_m_poison_powder_rev	@ Reverb.
+
+	.word	se_m_poison_powder_grp
+
+	.word	se_m_poison_powder_1
+
+	.end
diff --git a/sound/songs/se_w060.s b/sound/songs/se_m_psybeam.s
index 520720429..c7f68cffd 100644
--- a/sound/songs/se_w060.s
+++ b/sound/songs/se_m_psybeam.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w060_grp, voicegroup128
-	.equ	se_w060_pri, 4
-	.equ	se_w060_rev, reverb_set+50
-	.equ	se_w060_mvl, 127
-	.equ	se_w060_key, 0
-	.equ	se_w060_tbs, 1
-	.equ	se_w060_exg, 0
-	.equ	se_w060_cmp, 1
+	.equ	se_m_psybeam_grp, voicegroup128
+	.equ	se_m_psybeam_pri, 4
+	.equ	se_m_psybeam_rev, reverb_set+50
+	.equ	se_m_psybeam_mvl, 127
+	.equ	se_m_psybeam_key, 0
+	.equ	se_m_psybeam_tbs, 1
+	.equ	se_m_psybeam_exg, 0
+	.equ	se_m_psybeam_cmp, 1
 
 	.section .rodata
-	.global	se_w060
+	.global	se_m_psybeam
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w060_1:
-	.byte	KEYSH , se_w060_key+0
-	.byte	TEMPO , 190*se_w060_tbs/2
+se_m_psybeam_1:
+	.byte	KEYSH , se_m_psybeam_key+0
+	.byte	TEMPO , 190*se_m_psybeam_tbs/2
 	.byte		VOICE , 45
 	.byte		BENDR , 8
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 38*se_w060_mvl/mxv
+	.byte		VOL   , 38*se_m_psybeam_mvl/mxv
 	.byte		MOD   , 30
 	.byte		BEND  , c_v+1
 	.byte		N42   , As2 , v120
@@ -29,26 +29,26 @@ se_w060_1:
 	.byte		PAN   , c_v+3
 	.byte	W01
 	.byte		        c_v+5
-	.byte		VOL   , 57*se_w060_mvl/mxv
+	.byte		VOL   , 57*se_m_psybeam_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+9
 	.byte	W01
-	.byte		VOL   , 71*se_w060_mvl/mxv
+	.byte		VOL   , 71*se_m_psybeam_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+5
 	.byte	W01
 	.byte		        c_v+1
-	.byte		VOL   , 82*se_w060_mvl/mxv
+	.byte		VOL   , 82*se_m_psybeam_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v-3
-	.byte		VOL   , 94*se_w060_mvl/mxv
+	.byte		VOL   , 94*se_m_psybeam_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte	W02
 	.byte		        c_v-10
-	.byte		VOL   , 110*se_w060_mvl/mxv
+	.byte		VOL   , 110*se_m_psybeam_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-6
 	.byte	W01
@@ -66,79 +66,79 @@ se_w060_1:
 	.byte		        c_v+5
 	.byte	W02
 	.byte		        c_v+1
-	.byte		VOL   , 95*se_w060_mvl/mxv
+	.byte		VOL   , 95*se_m_psybeam_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v-3
-	.byte		VOL   , 83*se_w060_mvl/mxv
+	.byte		VOL   , 83*se_m_psybeam_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte	W01
 	.byte		        c_v-10
-	.byte		VOL   , 71*se_w060_mvl/mxv
+	.byte		VOL   , 71*se_m_psybeam_mvl/mxv
 	.byte	W02
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 56*se_w060_mvl/mxv
+	.byte		VOL   , 56*se_m_psybeam_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v-3
 	.byte	W01
-	.byte		VOL   , 38*se_w060_mvl/mxv
+	.byte		VOL   , 38*se_m_psybeam_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v+0
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w060_2:
-	.byte	KEYSH , se_w060_key+0
+se_m_psybeam_2:
+	.byte	KEYSH , se_m_psybeam_key+0
 	.byte		VOICE , 47
 	.byte		BENDR , 8
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 38*se_w060_mvl/mxv
+	.byte		VOL   , 38*se_m_psybeam_mvl/mxv
 	.byte		MOD   , 30
 	.byte		BEND  , c_v+1
 	.byte		N42   , As1 , v040
 	.byte	W02
-	.byte		VOL   , 57*se_w060_mvl/mxv
+	.byte		VOL   , 57*se_m_psybeam_mvl/mxv
 	.byte	W02
-	.byte		        71*se_w060_mvl/mxv
+	.byte		        71*se_m_psybeam_mvl/mxv
 	.byte	W02
 	.byte	W01
-	.byte		        82*se_w060_mvl/mxv
+	.byte		        82*se_m_psybeam_mvl/mxv
 	.byte	W02
-	.byte		        94*se_w060_mvl/mxv
+	.byte		        94*se_m_psybeam_mvl/mxv
 	.byte	W03
-	.byte		        110*se_w060_mvl/mxv
+	.byte		        110*se_m_psybeam_mvl/mxv
 	.byte	W06
 	.byte	W06
 	.byte	W06
-	.byte		        95*se_w060_mvl/mxv
+	.byte		        95*se_m_psybeam_mvl/mxv
 	.byte	W02
-	.byte		        83*se_w060_mvl/mxv
+	.byte		        83*se_m_psybeam_mvl/mxv
 	.byte	W02
-	.byte		        71*se_w060_mvl/mxv
+	.byte		        71*se_m_psybeam_mvl/mxv
 	.byte	W02
 	.byte	W01
-	.byte		        56*se_w060_mvl/mxv
+	.byte		        56*se_m_psybeam_mvl/mxv
 	.byte	W02
-	.byte		        38*se_w060_mvl/mxv
+	.byte		        38*se_m_psybeam_mvl/mxv
 	.byte	W03
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w060:
+se_m_psybeam:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w060_pri	@ Priority
-	.byte	se_w060_rev	@ Reverb.
+	.byte	se_m_psybeam_pri	@ Priority
+	.byte	se_m_psybeam_rev	@ Reverb.
 
-	.word	se_w060_grp
+	.word	se_m_psybeam_grp
 
-	.word	se_w060_1
-	.word	se_w060_2
+	.word	se_m_psybeam_1
+	.word	se_m_psybeam_2
 
 	.end
diff --git a/sound/songs/se_w060b.s b/sound/songs/se_m_psybeam2.s
index 45dc69634..e26a844c9 100644
--- a/sound/songs/se_w060b.s
+++ b/sound/songs/se_m_psybeam2.s
@@ -1,43 +1,43 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w060b_grp, voicegroup128
-	.equ	se_w060b_pri, 4
-	.equ	se_w060b_rev, reverb_set+50
-	.equ	se_w060b_mvl, 127
-	.equ	se_w060b_key, 0
-	.equ	se_w060b_tbs, 1
-	.equ	se_w060b_exg, 0
-	.equ	se_w060b_cmp, 1
+	.equ	se_m_psybeam2_grp, voicegroup128
+	.equ	se_m_psybeam2_pri, 4
+	.equ	se_m_psybeam2_rev, reverb_set+50
+	.equ	se_m_psybeam2_mvl, 127
+	.equ	se_m_psybeam2_key, 0
+	.equ	se_m_psybeam2_tbs, 1
+	.equ	se_m_psybeam2_exg, 0
+	.equ	se_m_psybeam2_cmp, 1
 
 	.section .rodata
-	.global	se_w060b
+	.global	se_m_psybeam2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w060b_1:
-	.byte	KEYSH , se_w060b_key+0
-	.byte	TEMPO , 190*se_w060b_tbs/2
+se_m_psybeam2_1:
+	.byte	KEYSH , se_m_psybeam2_key+0
+	.byte	TEMPO , 190*se_m_psybeam2_tbs/2
 	.byte		VOICE , 45
 	.byte		BENDR , 8
-	.byte		VOL   , 36*se_w060b_mvl/mxv
+	.byte		VOL   , 36*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-44
 	.byte		N12   , Gs2 , v127
 	.byte	W01
-	.byte		VOL   , 52*se_w060b_mvl/mxv
+	.byte		VOL   , 52*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-20
 	.byte	W01
-	.byte		VOL   , 67*se_w060b_mvl/mxv
+	.byte		VOL   , 67*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+17
 	.byte	W01
-	.byte		VOL   , 78*se_w060b_mvl/mxv
+	.byte		VOL   , 78*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+27
 	.byte	W01
-	.byte		VOL   , 105*se_w060b_mvl/mxv
+	.byte		VOL   , 105*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+44
 	.byte	W02
@@ -47,42 +47,42 @@ se_w060b_1:
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+44
 	.byte	W01
-	.byte		VOL   , 86*se_w060b_mvl/mxv
+	.byte		VOL   , 86*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+28
 	.byte	W01
-	.byte		VOL   , 55*se_w060b_mvl/mxv
+	.byte		VOL   , 55*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+17
 	.byte	W01
-	.byte		VOL   , 33*se_w060b_mvl/mxv
+	.byte		VOL   , 33*se_m_psybeam2_mvl/mxv
 	.byte		BEND  , c_v+5
 	.byte	W02
 	.byte		VOICE , 37
-	.byte		VOL   , 105*se_w060b_mvl/mxv
+	.byte		VOL   , 105*se_m_psybeam2_mvl/mxv
 	.byte		N02   , Gs3 , v080
 	.byte	W01
 	.byte		BEND  , c_v+16
 	.byte	W01
 	.byte		VOICE , 45
-	.byte		VOL   , 36*se_w060b_mvl/mxv
+	.byte		VOL   , 36*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-44
 	.byte		N12   , As2 , v127
 	.byte	W01
-	.byte		VOL   , 52*se_w060b_mvl/mxv
+	.byte		VOL   , 52*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-20
 	.byte	W01
-	.byte		VOL   , 67*se_w060b_mvl/mxv
+	.byte		VOL   , 67*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+17
 	.byte	W02
-	.byte		VOL   , 78*se_w060b_mvl/mxv
+	.byte		VOL   , 78*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+27
 	.byte	W01
-	.byte		VOL   , 105*se_w060b_mvl/mxv
+	.byte		VOL   , 105*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+11
 	.byte		BEND  , c_v+44
 	.byte	W01
@@ -92,41 +92,41 @@ se_w060b_1:
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+44
 	.byte	W01
-	.byte		VOL   , 86*se_w060b_mvl/mxv
+	.byte		VOL   , 86*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+11
 	.byte		BEND  , c_v+28
 	.byte	W02
-	.byte		VOL   , 55*se_w060b_mvl/mxv
+	.byte		VOL   , 55*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v-11
 	.byte		BEND  , c_v+17
 	.byte	W01
-	.byte		VOL   , 33*se_w060b_mvl/mxv
+	.byte		VOL   , 33*se_m_psybeam2_mvl/mxv
 	.byte		BEND  , c_v+5
 	.byte	W01
 	.byte		VOICE , 37
-	.byte		VOL   , 105*se_w060b_mvl/mxv
+	.byte		VOL   , 105*se_m_psybeam2_mvl/mxv
 	.byte		N02   , As3 , v056
 	.byte	W01
 	.byte		BEND  , c_v+16
 	.byte	W01
 	.byte		VOICE , 45
-	.byte		VOL   , 36*se_w060b_mvl/mxv
+	.byte		VOL   , 36*se_m_psybeam2_mvl/mxv
 	.byte		BEND  , c_v-44
 	.byte		N12   , Gs2 , v080
 	.byte	W02
-	.byte		VOL   , 52*se_w060b_mvl/mxv
+	.byte		VOL   , 52*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-20
 	.byte	W01
-	.byte		VOL   , 67*se_w060b_mvl/mxv
+	.byte		VOL   , 67*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+17
 	.byte	W01
-	.byte		VOL   , 78*se_w060b_mvl/mxv
+	.byte		VOL   , 78*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+27
 	.byte	W01
-	.byte		VOL   , 105*se_w060b_mvl/mxv
+	.byte		VOL   , 105*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+44
 	.byte	W01
@@ -136,42 +136,42 @@ se_w060b_1:
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+44
 	.byte	W01
-	.byte		VOL   , 86*se_w060b_mvl/mxv
+	.byte		VOL   , 86*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+28
 	.byte	W01
-	.byte		VOL   , 55*se_w060b_mvl/mxv
+	.byte		VOL   , 55*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+17
 	.byte	W01
-	.byte		VOL   , 33*se_w060b_mvl/mxv
+	.byte		VOL   , 33*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+5
 	.byte	W01
 	.byte		VOICE , 37
-	.byte		VOL   , 105*se_w060b_mvl/mxv
+	.byte		VOL   , 105*se_m_psybeam2_mvl/mxv
 	.byte		N02   , Gs3 , v024
 	.byte	W02
 	.byte		BEND  , c_v+16
 	.byte	W01
 	.byte		VOICE , 45
-	.byte		VOL   , 36*se_w060b_mvl/mxv
+	.byte		VOL   , 36*se_m_psybeam2_mvl/mxv
 	.byte		BEND  , c_v-44
 	.byte		N12   , As2 , v040
 	.byte	W01
-	.byte		VOL   , 52*se_w060b_mvl/mxv
+	.byte		VOL   , 52*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-20
 	.byte	W01
-	.byte		VOL   , 67*se_w060b_mvl/mxv
+	.byte		VOL   , 67*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+17
 	.byte	W01
-	.byte		VOL   , 78*se_w060b_mvl/mxv
+	.byte		VOL   , 78*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+27
 	.byte	W02
-	.byte		VOL   , 105*se_w060b_mvl/mxv
+	.byte		VOL   , 105*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+44
 	.byte	W01
@@ -181,19 +181,19 @@ se_w060b_1:
 	.byte		PAN   , c_v-11
 	.byte		BEND  , c_v+44
 	.byte	W01
-	.byte		VOL   , 86*se_w060b_mvl/mxv
+	.byte		VOL   , 86*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+28
 	.byte	W01
-	.byte		VOL   , 55*se_w060b_mvl/mxv
+	.byte		VOL   , 55*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+11
 	.byte		BEND  , c_v+17
 	.byte	W02
-	.byte		VOL   , 33*se_w060b_mvl/mxv
+	.byte		VOL   , 33*se_m_psybeam2_mvl/mxv
 	.byte		BEND  , c_v+5
 	.byte	W01
 	.byte		VOICE , 37
-	.byte		VOL   , 105*se_w060b_mvl/mxv
+	.byte		VOL   , 105*se_m_psybeam2_mvl/mxv
 	.byte		N02   , As3 , v016
 	.byte	W01
 	.byte		BEND  , c_v+16
@@ -203,14 +203,14 @@ se_w060b_1:
 @******************************************************@
 	.align	2
 
-se_w060b:
+se_m_psybeam2:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w060b_pri	@ Priority
-	.byte	se_w060b_rev	@ Reverb.
+	.byte	se_m_psybeam2_pri	@ Priority
+	.byte	se_m_psybeam2_rev	@ Reverb.
 
-	.word	se_w060b_grp
+	.word	se_m_psybeam2_grp
 
-	.word	se_w060b_1
+	.word	se_m_psybeam2_1
 
 	.end
diff --git a/sound/songs/se_m_rain_dance.s b/sound/songs/se_m_rain_dance.s
new file mode 100644
index 000000000..810be0663
--- /dev/null
+++ b/sound/songs/se_m_rain_dance.s
@@ -0,0 +1,116 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_rain_dance_grp, voicegroup128
+	.equ	se_m_rain_dance_pri, 4
+	.equ	se_m_rain_dance_rev, reverb_set+50
+	.equ	se_m_rain_dance_mvl, 127
+	.equ	se_m_rain_dance_key, 0
+	.equ	se_m_rain_dance_tbs, 1
+	.equ	se_m_rain_dance_exg, 0
+	.equ	se_m_rain_dance_cmp, 1
+
+	.section .rodata
+	.global	se_m_rain_dance
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_rain_dance_1:
+	.byte	KEYSH , se_m_rain_dance_key+0
+	.byte	TEMPO , 220*se_m_rain_dance_tbs/2
+	.byte		VOICE , 36
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 20*se_m_rain_dance_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		TIE   , Gn3 , v064
+	.byte	W03
+	.byte		VOL   , 37*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        53*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        60*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        71*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        81*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        93*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        110*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		PAN   , c_v+3
+	.byte	W06
+	.byte		        c_v+11
+	.byte	W12
+	.byte		        c_v+20
+	.byte	W06
+	.byte		        c_v+25
+	.byte	W12
+	.byte		        c_v+14
+	.byte	W06
+	.byte		        c_v+8
+	.byte	W06
+	.byte	W06
+	.byte		        c_v-3
+	.byte	W12
+	.byte		        c_v-16
+	.byte	W06
+	.byte	W06
+	.byte		        c_v-26
+	.byte	W12
+	.byte		        c_v-16
+	.byte	W06
+	.byte		VOL   , 104*se_m_rain_dance_mvl/mxv
+	.byte		PAN   , c_v-5
+	.byte	W03
+	.byte		VOL   , 101*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        98*se_m_rain_dance_mvl/mxv
+	.byte		PAN   , c_v+6
+	.byte	W03
+	.byte		VOL   , 93*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        90*se_m_rain_dance_mvl/mxv
+	.byte		PAN   , c_v+14
+	.byte	W03
+	.byte		VOL   , 86*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        83*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        77*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        73*se_m_rain_dance_mvl/mxv
+	.byte		PAN   , c_v+24
+	.byte	W03
+	.byte		VOL   , 66*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        58*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        44*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        32*se_m_rain_dance_mvl/mxv
+	.byte		PAN   , c_v+15
+	.byte	W03
+	.byte		VOL   , 16*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        1*se_m_rain_dance_mvl/mxv
+	.byte		PAN   , c_v+4
+	.byte	W06
+	.byte		EOT   
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_rain_dance:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_rain_dance_pri	@ Priority
+	.byte	se_m_rain_dance_rev	@ Reverb.
+
+	.word	se_m_rain_dance_grp
+
+	.word	se_m_rain_dance_1
+
+	.end
diff --git a/sound/songs/se_w115.s b/sound/songs/se_m_reflect.s
index 4f9bfb71a..56699c65e 100644
--- a/sound/songs/se_w115.s
+++ b/sound/songs/se_m_reflect.s
@@ -1,99 +1,99 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w115_grp, voicegroup128
-	.equ	se_w115_pri, 4
-	.equ	se_w115_rev, reverb_set+50
-	.equ	se_w115_mvl, 127
-	.equ	se_w115_key, 0
-	.equ	se_w115_tbs, 1
-	.equ	se_w115_exg, 0
-	.equ	se_w115_cmp, 1
+	.equ	se_m_reflect_grp, voicegroup128
+	.equ	se_m_reflect_pri, 4
+	.equ	se_m_reflect_rev, reverb_set+50
+	.equ	se_m_reflect_mvl, 127
+	.equ	se_m_reflect_key, 0
+	.equ	se_m_reflect_tbs, 1
+	.equ	se_m_reflect_exg, 0
+	.equ	se_m_reflect_cmp, 1
 
 	.section .rodata
-	.global	se_w115
+	.global	se_m_reflect
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w115_1:
-	.byte	KEYSH , se_w115_key+0
-	.byte	TEMPO , 150*se_w115_tbs/2
+se_m_reflect_1:
+	.byte	KEYSH , se_m_reflect_key+0
+	.byte	TEMPO , 150*se_m_reflect_tbs/2
 	.byte		VOICE , 19
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v+6
 	.byte		N06   , Gn6 , v080
 	.byte	W01
 	.byte		BEND  , c_v-4
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-14
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-31
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 20*se_w115_mvl/mxv
+	.byte		VOL   , 20*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-41
 	.byte	W02
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   , Gn6 , v072
 	.byte	W01
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-37
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 20*se_w115_mvl/mxv
+	.byte		VOL   , 20*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-47
 	.byte	W02
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-1
 	.byte		N06   , Gn6 , v068
 	.byte	W01
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-21
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-38
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 20*se_w115_mvl/mxv
+	.byte		VOL   , 20*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-48
 	.byte	W02
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-1
 	.byte		N06   , Gn6 , v060
 	.byte	W01
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-21
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-38
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 20*se_w115_mvl/mxv
+	.byte		VOL   , 20*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-48
 	.byte	W02
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-2
 	.byte		N06   , Gn6 , v052
 	.byte	W01
@@ -101,19 +101,19 @@ se_w115_1:
 	.byte		BEND  , c_v-12
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-22
 	.byte	W01
 	.byte		PAN   , c_v+8
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-39
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		VOL   , 20*se_w115_mvl/mxv
+	.byte		VOL   , 20*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-49
 	.byte	W02
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-2
 	.byte		N06   , Gn6 , v048
 	.byte	W01
@@ -121,18 +121,18 @@ se_w115_1:
 	.byte		BEND  , c_v-12
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-22
 	.byte	W01
 	.byte		PAN   , c_v+8
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-39
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		VOL   , 20*se_w115_mvl/mxv
+	.byte		VOL   , 20*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-49
 	.byte	W02
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-2
 	.byte		N06   , Gn6 , v040
 	.byte	W01
@@ -140,19 +140,19 @@ se_w115_1:
 	.byte		BEND  , c_v-13
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-22
 	.byte	W01
 	.byte		PAN   , c_v+8
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-39
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		VOL   , 20*se_w115_mvl/mxv
+	.byte		VOL   , 20*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-49
 	.byte	W02
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-2
 	.byte		N06   , Gn6 , v032
 	.byte	W01
@@ -160,15 +160,15 @@ se_w115_1:
 	.byte		BEND  , c_v-13
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-22
 	.byte	W01
 	.byte		PAN   , c_v+8
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-39
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		VOL   , 20*se_w115_mvl/mxv
+	.byte		VOL   , 20*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-49
 	.byte	W02
 	.byte	W06
@@ -176,92 +176,92 @@ se_w115_1:
 
 @********************** Track  2 **********************@
 
-se_w115_2:
-	.byte	KEYSH , se_w115_key+0
+se_m_reflect_2:
+	.byte	KEYSH , se_m_reflect_key+0
 	.byte		VOICE , 53
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte	W02
 	.byte		N06   , En6 , v064
 	.byte	W02
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte	W02
-	.byte		        60*se_w115_mvl/mxv
+	.byte		        60*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        20*se_w115_mvl/mxv
+	.byte		        20*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        90*se_w115_mvl/mxv
+	.byte		        90*se_m_reflect_mvl/mxv
 	.byte		N06   , En6 , v056
 	.byte	W02
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte	W02
-se_w115_2_000:
-	.byte		VOL   , 60*se_w115_mvl/mxv
+se_m_reflect_2_000:
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        20*se_w115_mvl/mxv
+	.byte		        20*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        90*se_w115_mvl/mxv
+	.byte		        90*se_m_reflect_mvl/mxv
 	.byte		N06   , En6 , v052
 	.byte	W02
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte	W02
 	.byte	PEND
 	.byte	PATT
-	 .word	se_w115_2_000
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	 .word	se_m_reflect_2_000
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        20*se_w115_mvl/mxv
+	.byte		        20*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        90*se_w115_mvl/mxv
+	.byte		        90*se_m_reflect_mvl/mxv
 	.byte		N06   , En6 , v048
 	.byte	W02
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte	W02
-	.byte		        60*se_w115_mvl/mxv
+	.byte		        60*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        20*se_w115_mvl/mxv
+	.byte		        20*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        90*se_w115_mvl/mxv
+	.byte		        90*se_m_reflect_mvl/mxv
 	.byte		N06   , En6 , v044
 	.byte	W02
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte	W02
-	.byte		        60*se_w115_mvl/mxv
+	.byte		        60*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        20*se_w115_mvl/mxv
+	.byte		        20*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        90*se_w115_mvl/mxv
+	.byte		        90*se_m_reflect_mvl/mxv
 	.byte		N06   , En6 , v040
 	.byte	W02
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte	W02
-	.byte		        60*se_w115_mvl/mxv
+	.byte		        60*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        20*se_w115_mvl/mxv
+	.byte		        20*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        90*se_w115_mvl/mxv
+	.byte		        90*se_m_reflect_mvl/mxv
 	.byte		N06   , En6 , v036
 	.byte	W02
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte	W02
-	.byte		        60*se_w115_mvl/mxv
+	.byte		        60*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        20*se_w115_mvl/mxv
+	.byte		        20*se_m_reflect_mvl/mxv
 	.byte	W05
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w115:
+se_m_reflect:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w115_pri	@ Priority
-	.byte	se_w115_rev	@ Reverb.
+	.byte	se_m_reflect_pri	@ Priority
+	.byte	se_m_reflect_rev	@ Reverb.
 
-	.word	se_w115_grp
+	.word	se_m_reflect_grp
 
-	.word	se_w115_1
-	.word	se_w115_2
+	.word	se_m_reflect_1
+	.word	se_m_reflect_2
 
 	.end
diff --git a/sound/songs/se_w179.s b/sound/songs/se_m_reversal.s
index 9ea055b44..609c399f5 100644
--- a/sound/songs/se_w179.s
+++ b/sound/songs/se_m_reversal.s
@@ -1,33 +1,33 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w179_grp, voicegroup128
-	.equ	se_w179_pri, 4
-	.equ	se_w179_rev, reverb_set+50
-	.equ	se_w179_mvl, 127
-	.equ	se_w179_key, 0
-	.equ	se_w179_tbs, 1
-	.equ	se_w179_exg, 0
-	.equ	se_w179_cmp, 1
+	.equ	se_m_reversal_grp, voicegroup128
+	.equ	se_m_reversal_pri, 4
+	.equ	se_m_reversal_rev, reverb_set+50
+	.equ	se_m_reversal_mvl, 127
+	.equ	se_m_reversal_key, 0
+	.equ	se_m_reversal_tbs, 1
+	.equ	se_m_reversal_exg, 0
+	.equ	se_m_reversal_cmp, 1
 
 	.section .rodata
-	.global	se_w179
+	.global	se_m_reversal
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w179_1:
-	.byte	KEYSH , se_w179_key+0
-	.byte	TEMPO , 150*se_w179_tbs/2
+se_m_reversal_1:
+	.byte	KEYSH , se_m_reversal_key+0
+	.byte	TEMPO , 150*se_m_reversal_tbs/2
 	.byte		VOICE , 19
 	.byte		BENDR , 24
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		N03   , Cn5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -36,14 +36,14 @@ se_w179_1:
 	.byte		N01   , Gn4 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v-33
 	.byte		N03   , Cs5 , v092
 	.byte	W02
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -52,14 +52,14 @@ se_w179_1:
 	.byte		N01   , Gs4 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-33
 	.byte		N03   , Dn5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W02
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -68,14 +68,14 @@ se_w179_1:
 	.byte		N01   , An4 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v-33
 	.byte		N03   , Ds5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W02
 	.byte		VOICE , 22
@@ -84,14 +84,14 @@ se_w179_1:
 	.byte		N01   , As4 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-33
 	.byte		N03   , En5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -100,14 +100,14 @@ se_w179_1:
 	.byte		N01   , Bn4 , v127
 	.byte	W02
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v-33
 	.byte		N03   , Fn5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -116,14 +116,14 @@ se_w179_1:
 	.byte		N01   , Cn5 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-33
 	.byte		N03   , Fs5 , v092
 	.byte	W02
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -132,14 +132,14 @@ se_w179_1:
 	.byte		N01   , Cs5 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v-33
 	.byte		N03   , Gn5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W02
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -148,14 +148,14 @@ se_w179_1:
 	.byte		N01   , Dn5 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-33
 	.byte		N03   , Gs5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W02
 	.byte		VOICE , 22
@@ -164,14 +164,14 @@ se_w179_1:
 	.byte		N01   , Ds5 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v-33
 	.byte		N03   , An5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -180,14 +180,14 @@ se_w179_1:
 	.byte		N01   , En5 , v127
 	.byte	W02
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-33
 	.byte		N03   , As5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -196,14 +196,14 @@ se_w179_1:
 	.byte		N01   , Fn5 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v-33
 	.byte		N03   , Bn5 , v092
 	.byte	W02
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -218,10 +218,10 @@ se_w179_1:
 
 @********************** Track  2 **********************@
 
-se_w179_2:
-	.byte	KEYSH , se_w179_key+0
+se_m_reversal_2:
+	.byte	KEYSH , se_m_reversal_key+0
 	.byte		VOICE , 17
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v+31
 	.byte		N03   , Cn5 , v040
@@ -322,15 +322,15 @@ se_w179_2:
 @******************************************************@
 	.align	2
 
-se_w179:
+se_m_reversal:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w179_pri	@ Priority
-	.byte	se_w179_rev	@ Reverb.
+	.byte	se_m_reversal_pri	@ Priority
+	.byte	se_m_reversal_rev	@ Reverb.
 
-	.word	se_w179_grp
+	.word	se_m_reversal_grp
 
-	.word	se_w179_1
-	.word	se_w179_2
+	.word	se_m_reversal_1
+	.word	se_m_reversal_2
 
 	.end
diff --git a/sound/songs/se_w088.s b/sound/songs/se_m_rock_throw.s
index 9eceb812d..71dddd447 100644
--- a/sound/songs/se_w088.s
+++ b/sound/songs/se_m_rock_throw.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w088_grp, voicegroup128
-	.equ	se_w088_pri, 4
-	.equ	se_w088_rev, reverb_set+50
-	.equ	se_w088_mvl, 127
-	.equ	se_w088_key, 0
-	.equ	se_w088_tbs, 1
-	.equ	se_w088_exg, 0
-	.equ	se_w088_cmp, 1
+	.equ	se_m_rock_throw_grp, voicegroup128
+	.equ	se_m_rock_throw_pri, 4
+	.equ	se_m_rock_throw_rev, reverb_set+50
+	.equ	se_m_rock_throw_mvl, 127
+	.equ	se_m_rock_throw_key, 0
+	.equ	se_m_rock_throw_tbs, 1
+	.equ	se_m_rock_throw_exg, 0
+	.equ	se_m_rock_throw_cmp, 1
 
 	.section .rodata
-	.global	se_w088
+	.global	se_m_rock_throw
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w088_1:
-	.byte	KEYSH , se_w088_key+0
-	.byte	TEMPO , 150*se_w088_tbs/2
+se_m_rock_throw_1:
+	.byte	KEYSH , se_m_rock_throw_key+0
+	.byte	TEMPO , 150*se_m_rock_throw_tbs/2
 	.byte		VOICE , 26
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 105*se_w088_mvl/mxv
+	.byte		VOL   , 105*se_m_rock_throw_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   , En3 , v127
 	.byte	W03
@@ -52,14 +52,14 @@ se_w088_1:
 @******************************************************@
 	.align	2
 
-se_w088:
+se_m_rock_throw:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w088_pri	@ Priority
-	.byte	se_w088_rev	@ Reverb.
+	.byte	se_m_rock_throw_pri	@ Priority
+	.byte	se_m_rock_throw_rev	@ Reverb.
 
-	.word	se_w088_grp
+	.word	se_m_rock_throw_grp
 
-	.word	se_w088_1
+	.word	se_m_rock_throw_1
 
 	.end
diff --git a/sound/songs/se_m_sacred_fire.s b/sound/songs/se_m_sacred_fire.s
new file mode 100644
index 000000000..5e6c864e2
--- /dev/null
+++ b/sound/songs/se_m_sacred_fire.s
@@ -0,0 +1,105 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_sacred_fire_grp, voicegroup128
+	.equ	se_m_sacred_fire_pri, 4
+	.equ	se_m_sacred_fire_rev, reverb_set+50
+	.equ	se_m_sacred_fire_mvl, 127
+	.equ	se_m_sacred_fire_key, 0
+	.equ	se_m_sacred_fire_tbs, 1
+	.equ	se_m_sacred_fire_exg, 0
+	.equ	se_m_sacred_fire_cmp, 1
+
+	.section .rodata
+	.global	se_m_sacred_fire
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_sacred_fire_1:
+	.byte	KEYSH , se_m_sacred_fire_key+0
+	.byte	TEMPO , 150*se_m_sacred_fire_tbs/2
+	.byte		VOICE , 29
+	.byte		BENDR , 12
+	.byte		VOL   , 110*se_m_sacred_fire_mvl/mxv
+	.byte		PAN   , c_v+5
+	.byte		BEND  , c_v+0
+	.byte		N04   , Cn3 , v127
+	.byte	W03
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		N18   , Gn4 
+	.byte	W02
+	.byte		PAN   , c_v-5
+	.byte	W01
+	.byte		VOL   , 98*se_m_sacred_fire_mvl/mxv
+	.byte		BEND  , c_v+2
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 83*se_m_sacred_fire_mvl/mxv
+	.byte		BEND  , c_v+6
+	.byte	W02
+	.byte		PAN   , c_v+5
+	.byte	W01
+	.byte		BEND  , c_v+9
+	.byte	W01
+	.byte		VOL   , 63*se_m_sacred_fire_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		BEND  , c_v+13
+	.byte	W02
+	.byte		VOL   , 44*se_m_sacred_fire_mvl/mxv
+	.byte		PAN   , c_v-5
+	.byte	W02
+	.byte		VOL   , 28*se_m_sacred_fire_mvl/mxv
+	.byte		BEND  , c_v+20
+	.byte	W01
+	.byte		PAN   , c_v-2
+	.byte	W01
+	.byte		VOL   , 12*se_m_sacred_fire_mvl/mxv
+	.byte	W02
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_sacred_fire_2:
+	.byte	KEYSH , se_m_sacred_fire_key+0
+	.byte		VOICE , 27
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 110*se_m_sacred_fire_mvl/mxv
+	.byte		N01   , Gn2 , v032
+	.byte	W02
+	.byte		N01   
+	.byte	W02
+	.byte		N18   
+	.byte	W03
+	.byte		VOL   , 98*se_m_sacred_fire_mvl/mxv
+	.byte	W03
+	.byte		        83*se_m_sacred_fire_mvl/mxv
+	.byte	W04
+	.byte		        63*se_m_sacred_fire_mvl/mxv
+	.byte	W04
+	.byte		        44*se_m_sacred_fire_mvl/mxv
+	.byte	W02
+	.byte		        28*se_m_sacred_fire_mvl/mxv
+	.byte	W02
+	.byte		        12*se_m_sacred_fire_mvl/mxv
+	.byte	W02
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_sacred_fire:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_sacred_fire_pri	@ Priority
+	.byte	se_m_sacred_fire_rev	@ Reverb.
+
+	.word	se_m_sacred_fire_grp
+
+	.word	se_m_sacred_fire_1
+	.word	se_m_sacred_fire_2
+
+	.end
diff --git a/sound/songs/se_m_sacred_fire2.s b/sound/songs/se_m_sacred_fire2.s
new file mode 100644
index 000000000..f255e712a
--- /dev/null
+++ b/sound/songs/se_m_sacred_fire2.s
@@ -0,0 +1,180 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_sacred_fire2_grp, voicegroup128
+	.equ	se_m_sacred_fire2_pri, 4
+	.equ	se_m_sacred_fire2_rev, reverb_set+50
+	.equ	se_m_sacred_fire2_mvl, 127
+	.equ	se_m_sacred_fire2_key, 0
+	.equ	se_m_sacred_fire2_tbs, 1
+	.equ	se_m_sacred_fire2_exg, 0
+	.equ	se_m_sacred_fire2_cmp, 1
+
+	.section .rodata
+	.global	se_m_sacred_fire2
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_sacred_fire2_1:
+	.byte	KEYSH , se_m_sacred_fire2_key+0
+	.byte	TEMPO , 150*se_m_sacred_fire2_tbs/2
+	.byte		VOICE , 29
+	.byte		BENDR , 12
+	.byte		VOL   , 22*se_m_sacred_fire2_mvl/mxv
+	.byte		PAN   , c_v+5
+	.byte		BEND  , c_v+0
+	.byte		N96   , Gn3 , v127
+	.byte	W01
+	.byte		VOL   , 49*se_m_sacred_fire2_mvl/mxv
+	.byte	W01
+	.byte		        71*se_m_sacred_fire2_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 95*se_m_sacred_fire2_mvl/mxv
+	.byte		BEND  , c_v+8
+	.byte	W01
+	.byte		VOL   , 110*se_m_sacred_fire2_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v-5
+	.byte		BEND  , c_v+16
+	.byte	W03
+	.byte		VOL   , 97*se_m_sacred_fire2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+7
+	.byte	W03
+	.byte		PAN   , c_v+5
+	.byte		BEND  , c_v+0
+	.byte	W01
+	.byte		VOL   , 84*se_m_sacred_fire2_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v-9
+	.byte	W03
+	.byte		VOL   , 76*se_m_sacred_fire2_mvl/mxv
+	.byte		PAN   , c_v-5
+	.byte		BEND  , c_v-24
+	.byte	W03
+	.byte		PAN   , c_v-2
+	.byte		BEND  , c_v-46
+	.byte	W03
+	.byte		VOL   , 84*se_m_sacred_fire2_mvl/mxv
+	.byte		PAN   , c_v+5
+	.byte	W03
+	.byte		        c_v+0
+	.byte	W01
+	.byte		VOL   , 92*se_m_sacred_fire2_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v-5
+	.byte	W01
+	.byte		BEND  , c_v-32
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 86*se_m_sacred_fire2_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+5
+	.byte	W02
+	.byte		BEND  , c_v-18
+	.byte	W01
+	.byte		VOL   , 78*se_m_sacred_fire2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		        c_v-5
+	.byte	W02
+	.byte		VOL   , 71*se_m_sacred_fire2_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v-2
+	.byte	W03
+	.byte		        c_v+5
+	.byte	W03
+	.byte		        c_v+0
+	.byte		VOL   , 78*se_m_sacred_fire2_mvl/mxv
+	.byte	W03
+	.byte		PAN   , c_v-5
+	.byte	W02
+	.byte		VOL   , 86*se_m_sacred_fire2_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		        c_v+5
+	.byte	W02
+	.byte		VOL   , 90*se_m_sacred_fire2_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		        c_v-5
+	.byte	W03
+	.byte		        c_v-2
+	.byte	W01
+	.byte		VOL   , 80*se_m_sacred_fire2_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+5
+	.byte	W03
+	.byte		        c_v+0
+	.byte	W01
+	.byte		VOL   , 86*se_m_sacred_fire2_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v-5
+	.byte	W03
+	.byte		        c_v+0
+	.byte		VOL   , 83*se_m_sacred_fire2_mvl/mxv
+	.byte	W03
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 63*se_m_sacred_fire2_mvl/mxv
+	.byte	W03
+	.byte		        37*se_m_sacred_fire2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		        c_v-5
+	.byte		VOL   , 13*se_m_sacred_fire2_mvl/mxv
+	.byte	W03
+	.byte		PAN   , c_v-2
+	.byte	W03
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_sacred_fire2_2:
+	.byte	KEYSH , se_m_sacred_fire2_key+0
+	.byte		VOICE , 27
+	.byte		VOL   , 22*se_m_sacred_fire2_mvl/mxv
+	.byte		N96   , Gn2 , v032
+	.byte	W01
+	.byte		VOL   , 49*se_m_sacred_fire2_mvl/mxv
+	.byte	W01
+	.byte		        71*se_m_sacred_fire2_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_sacred_fire2_mvl/mxv
+	.byte	W01
+	.byte		        110*se_m_sacred_fire2_mvl/mxv
+	.byte	W05
+	.byte		        97*se_m_sacred_fire2_mvl/mxv
+	.byte	W15
+	.byte	W24
+	.byte	W24
+	.byte	W09
+	.byte		        83*se_m_sacred_fire2_mvl/mxv
+	.byte	W03
+	.byte		        63*se_m_sacred_fire2_mvl/mxv
+	.byte	W03
+	.byte		        37*se_m_sacred_fire2_mvl/mxv
+	.byte	W03
+	.byte		        13*se_m_sacred_fire2_mvl/mxv
+	.byte	W06
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_sacred_fire2:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_sacred_fire2_pri	@ Priority
+	.byte	se_m_sacred_fire2_rev	@ Reverb.
+
+	.word	se_m_sacred_fire2_grp
+
+	.word	se_m_sacred_fire2_1
+	.word	se_m_sacred_fire2_2
+
+	.end
diff --git a/sound/songs/se_w328.s b/sound/songs/se_m_sand_tomb.s
index 6b5a2d923..8edf0abf8 100644
--- a/sound/songs/se_w328.s
+++ b/sound/songs/se_m_sand_tomb.s
@@ -1,45 +1,45 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w328_grp, voicegroup128
-	.equ	se_w328_pri, 4
-	.equ	se_w328_rev, reverb_set+50
-	.equ	se_w328_mvl, 127
-	.equ	se_w328_key, 0
-	.equ	se_w328_tbs, 1
-	.equ	se_w328_exg, 0
-	.equ	se_w328_cmp, 1
+	.equ	se_m_sand_tomb_grp, voicegroup128
+	.equ	se_m_sand_tomb_pri, 4
+	.equ	se_m_sand_tomb_rev, reverb_set+50
+	.equ	se_m_sand_tomb_mvl, 127
+	.equ	se_m_sand_tomb_key, 0
+	.equ	se_m_sand_tomb_tbs, 1
+	.equ	se_m_sand_tomb_exg, 0
+	.equ	se_m_sand_tomb_cmp, 1
 
 	.section .rodata
-	.global	se_w328
+	.global	se_m_sand_tomb
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w328_1:
-	.byte	KEYSH , se_w328_key+0
-	.byte	TEMPO , 150*se_w328_tbs/2
+se_m_sand_tomb_1:
+	.byte	KEYSH , se_m_sand_tomb_key+0
+	.byte	TEMPO , 150*se_m_sand_tomb_tbs/2
 	.byte		VOICE , 22
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 64*se_w328_mvl/mxv
+	.byte		VOL   , 64*se_m_sand_tomb_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N96   , En2 , v127
 	.byte	W03
-	.byte		VOL   , 79*se_w328_mvl/mxv
+	.byte		VOL   , 79*se_m_sand_tomb_mvl/mxv
 	.byte		BEND  , c_v+22
 	.byte	W02
 	.byte		        c_v+8
 	.byte	W01
-	.byte		VOL   , 84*se_w328_mvl/mxv
+	.byte		VOL   , 84*se_m_sand_tomb_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte	W03
-	.byte		VOL   , 91*se_w328_mvl/mxv
+	.byte		VOL   , 91*se_m_sand_tomb_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte	W03
-	.byte		VOL   , 100*se_w328_mvl/mxv
+	.byte		VOL   , 100*se_m_sand_tomb_mvl/mxv
 	.byte		PAN   , c_v-8
 	.byte	W03
-	.byte		VOL   , 110*se_w328_mvl/mxv
+	.byte		VOL   , 110*se_m_sand_tomb_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-12
 	.byte	W06
@@ -82,46 +82,46 @@ se_w328_1:
 	.byte		PAN   , c_v-11
 	.byte	W03
 	.byte		        c_v-17
-	.byte		VOL   , 98*se_w328_mvl/mxv
+	.byte		VOL   , 98*se_m_sand_tomb_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte	W03
-	.byte		VOL   , 90*se_w328_mvl/mxv
+	.byte		VOL   , 90*se_m_sand_tomb_mvl/mxv
 	.byte		BEND  , c_v-7
 	.byte	W03
 	.byte		PAN   , c_v-9
 	.byte		BEND  , c_v-12
 	.byte	W01
-	.byte		VOL   , 80*se_w328_mvl/mxv
+	.byte		VOL   , 80*se_m_sand_tomb_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v-20
 	.byte	W01
-	.byte		VOL   , 71*se_w328_mvl/mxv
+	.byte		VOL   , 71*se_m_sand_tomb_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-3
 	.byte	W02
-	.byte		VOL   , 58*se_w328_mvl/mxv
+	.byte		VOL   , 58*se_m_sand_tomb_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-13
 	.byte	W03
 	.byte		PAN   , c_v+10
-	.byte		VOL   , 45*se_w328_mvl/mxv
+	.byte		VOL   , 45*se_m_sand_tomb_mvl/mxv
 	.byte	W02
-	.byte		        27*se_w328_mvl/mxv
+	.byte		        27*se_m_sand_tomb_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-6
 	.byte	W01
-	.byte		VOL   , 11*se_w328_mvl/mxv
+	.byte		VOL   , 11*se_m_sand_tomb_mvl/mxv
 	.byte	W02
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w328_2:
-	.byte	KEYSH , se_w328_key+0
+se_m_sand_tomb_2:
+	.byte	KEYSH , se_m_sand_tomb_key+0
 	.byte		VOICE , 57
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w328_mvl/mxv
+	.byte		VOL   , 110*se_m_sand_tomb_mvl/mxv
 	.byte		N03   , Cn3 , v100
 	.byte	W03
 	.byte		        En3 , v080
@@ -183,15 +183,15 @@ se_w328_2:
 @******************************************************@
 	.align	2
 
-se_w328:
+se_m_sand_tomb:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w328_pri	@ Priority
-	.byte	se_w328_rev	@ Reverb.
+	.byte	se_m_sand_tomb_pri	@ Priority
+	.byte	se_m_sand_tomb_rev	@ Reverb.
 
-	.word	se_w328_grp
+	.word	se_m_sand_tomb_grp
 
-	.word	se_w328_1
-	.word	se_w328_2
+	.word	se_m_sand_tomb_1
+	.word	se_m_sand_tomb_2
 
 	.end
diff --git a/sound/songs/se_w201.s b/sound/songs/se_m_sandstorm.s
index b6a6aaff5..9674cd043 100644
--- a/sound/songs/se_w201.s
+++ b/sound/songs/se_m_sandstorm.s
@@ -1,58 +1,58 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w201_grp, voicegroup128
-	.equ	se_w201_pri, 4
-	.equ	se_w201_rev, reverb_set+50
-	.equ	se_w201_mvl, 127
-	.equ	se_w201_key, 0
-	.equ	se_w201_tbs, 1
-	.equ	se_w201_exg, 0
-	.equ	se_w201_cmp, 1
+	.equ	se_m_sandstorm_grp, voicegroup128
+	.equ	se_m_sandstorm_pri, 4
+	.equ	se_m_sandstorm_rev, reverb_set+50
+	.equ	se_m_sandstorm_mvl, 127
+	.equ	se_m_sandstorm_key, 0
+	.equ	se_m_sandstorm_tbs, 1
+	.equ	se_m_sandstorm_exg, 0
+	.equ	se_m_sandstorm_cmp, 1
 
 	.section .rodata
-	.global	se_w201
+	.global	se_m_sandstorm
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w201_1:
-	.byte	KEYSH , se_w201_key+0
-	.byte	TEMPO , 200*se_w201_tbs/2
+se_m_sandstorm_1:
+	.byte	KEYSH , se_m_sandstorm_key+0
+	.byte	TEMPO , 200*se_m_sandstorm_tbs/2
 	.byte		VOICE , 2
 	.byte		BENDR , 12
 	.byte		PAN   , c_v-48
-	.byte		VOL   , 11*se_w201_mvl/mxv
+	.byte		VOL   , 11*se_m_sandstorm_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		TIE   , En3 , v127
 	.byte	W03
-	.byte		VOL   , 17*se_w201_mvl/mxv
+	.byte		VOL   , 17*se_m_sandstorm_mvl/mxv
 	.byte		BEND  , c_v+22
 	.byte	W02
 	.byte		        c_v+8
 	.byte	W01
-	.byte		VOL   , 24*se_w201_mvl/mxv
+	.byte		VOL   , 24*se_m_sandstorm_mvl/mxv
 	.byte	W03
-	.byte		        32*se_w201_mvl/mxv
+	.byte		        32*se_m_sandstorm_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte	W03
-	.byte		VOL   , 52*se_w201_mvl/mxv
+	.byte		VOL   , 52*se_m_sandstorm_mvl/mxv
 	.byte	W03
-	.byte		        65*se_w201_mvl/mxv
+	.byte		        65*se_m_sandstorm_mvl/mxv
 	.byte	W03
-	.byte		        76*se_w201_mvl/mxv
+	.byte		        76*se_m_sandstorm_mvl/mxv
 	.byte	W02
-	.byte		        88*se_w201_mvl/mxv
+	.byte		        88*se_m_sandstorm_mvl/mxv
 	.byte		PAN   , c_v-43
 	.byte	W02
-	.byte		VOL   , 98*se_w201_mvl/mxv
+	.byte		VOL   , 98*se_m_sandstorm_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v+0
 	.byte	W02
-	.byte		VOL   , 111*se_w201_mvl/mxv
+	.byte		VOL   , 111*se_m_sandstorm_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-7
 	.byte	W01
-	.byte		VOL   , 127*se_w201_mvl/mxv
+	.byte		VOL   , 127*se_m_sandstorm_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v-12
 	.byte	W02
@@ -134,31 +134,31 @@ se_w201_1:
 	.byte	W03
 	.byte		        c_v+7
 	.byte	W04
-	.byte		VOL   , 114*se_w201_mvl/mxv
+	.byte		VOL   , 114*se_m_sandstorm_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v+0
 	.byte	W01
 	.byte		PAN   , c_v+48
 	.byte	W01
-	.byte		VOL   , 104*se_w201_mvl/mxv
+	.byte		VOL   , 104*se_m_sandstorm_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-7
 	.byte	W03
-	.byte		VOL   , 93*se_w201_mvl/mxv
+	.byte		VOL   , 93*se_m_sandstorm_mvl/mxv
 	.byte		BEND  , c_v-12
 	.byte	W03
-	.byte		VOL   , 82*se_w201_mvl/mxv
+	.byte		VOL   , 82*se_m_sandstorm_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W04
-	.byte		VOL   , 67*se_w201_mvl/mxv
+	.byte		VOL   , 67*se_m_sandstorm_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v-13
 	.byte	W01
-	.byte		VOL   , 52*se_w201_mvl/mxv
+	.byte		VOL   , 52*se_m_sandstorm_mvl/mxv
 	.byte	W03
-	.byte		        32*se_w201_mvl/mxv
+	.byte		        32*se_m_sandstorm_mvl/mxv
 	.byte	W02
-	.byte		        13*se_w201_mvl/mxv
+	.byte		        13*se_m_sandstorm_mvl/mxv
 	.byte		BEND  , c_v-6
 	.byte	W03
 	.byte		EOT   
@@ -166,11 +166,11 @@ se_w201_1:
 
 @********************** Track  2 **********************@
 
-se_w201_2:
-	.byte	KEYSH , se_w201_key+0
+se_m_sandstorm_2:
+	.byte	KEYSH , se_m_sandstorm_key+0
 	.byte		VOICE , 57
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 60*se_w201_mvl/mxv
+	.byte		VOL   , 60*se_m_sandstorm_mvl/mxv
 	.byte		N03   , Cn3 , v100
 	.byte	W03
 	.byte		        En3 , v080
@@ -185,7 +185,7 @@ se_w201_2:
 	.byte	W03
 	.byte		        Cn3 , v100
 	.byte	W03
-se_w201_2_000:
+se_m_sandstorm_2_000:
 	.byte	W01
 	.byte		N03   , En3 , v080
 	.byte	W03
@@ -230,7 +230,7 @@ se_w201_2_000:
 	.byte		        Cn3 , v100
 	.byte	W03
 	.byte	PATT
-	 .word	se_w201_2_000
+	 .word	se_m_sandstorm_2_000
 	.byte	W02
 	.byte		N03   , Cn3 , v076
 	.byte	W04
@@ -276,15 +276,15 @@ se_w201_2_000:
 @******************************************************@
 	.align	2
 
-se_w201:
+se_m_sandstorm:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w201_pri	@ Priority
-	.byte	se_w201_rev	@ Reverb.
+	.byte	se_m_sandstorm_pri	@ Priority
+	.byte	se_m_sandstorm_rev	@ Reverb.
 
-	.word	se_w201_grp
+	.word	se_m_sandstorm_grp
 
-	.word	se_w201_1
-	.word	se_w201_2
+	.word	se_m_sandstorm_1
+	.word	se_m_sandstorm_2
 
 	.end
diff --git a/sound/songs/se_w103.s b/sound/songs/se_m_screech.s
index d35ec99ad..378cf7128 100644
--- a/sound/songs/se_w103.s
+++ b/sound/songs/se_m_screech.s
@@ -1,24 +1,24 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w103_grp, voicegroup128
-	.equ	se_w103_pri, 4
-	.equ	se_w103_rev, reverb_set+50
-	.equ	se_w103_mvl, 127
-	.equ	se_w103_key, 0
-	.equ	se_w103_tbs, 1
-	.equ	se_w103_exg, 0
-	.equ	se_w103_cmp, 1
+	.equ	se_m_screech_grp, voicegroup128
+	.equ	se_m_screech_pri, 4
+	.equ	se_m_screech_rev, reverb_set+50
+	.equ	se_m_screech_mvl, 127
+	.equ	se_m_screech_key, 0
+	.equ	se_m_screech_tbs, 1
+	.equ	se_m_screech_exg, 0
+	.equ	se_m_screech_cmp, 1
 
 	.section .rodata
-	.global	se_w103
+	.global	se_m_screech
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w103_1:
-	.byte		VOL   , 110*se_w103_mvl/mxv
-	.byte	KEYSH , se_w103_key+0
-	.byte	TEMPO , 150*se_w103_tbs/2
+se_m_screech_1:
+	.byte		VOL   , 110*se_m_screech_mvl/mxv
+	.byte	KEYSH , se_m_screech_key+0
+	.byte	TEMPO , 150*se_m_screech_tbs/2
 	.byte		VOICE , 44
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
@@ -28,27 +28,27 @@ se_w103_1:
 	.byte		PAN   , c_v-5
 	.byte	W01
 	.byte		        c_v-10
-	.byte		VOL   , 15*se_w103_mvl/mxv
+	.byte		VOL   , 15*se_m_screech_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v-4
-	.byte		VOL   , 41*se_w103_mvl/mxv
+	.byte		VOL   , 41*se_m_screech_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 69*se_w103_mvl/mxv
+	.byte		VOL   , 69*se_m_screech_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+4
 	.byte	W01
 	.byte		        c_v+10
-	.byte		VOL   , 84*se_w103_mvl/mxv
+	.byte		VOL   , 84*se_m_screech_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+4
 	.byte	W01
-	.byte		VOL   , 97*se_w103_mvl/mxv
+	.byte		VOL   , 97*se_m_screech_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v-5
 	.byte	W02
-	.byte		VOL   , 110*se_w103_mvl/mxv
+	.byte		VOL   , 110*se_m_screech_mvl/mxv
 	.byte		PAN   , c_v-10
 	.byte	W01
 	.byte		        c_v-4
@@ -59,13 +59,13 @@ se_w103_1:
 	.byte	W01
 	.byte		        c_v+10
 	.byte	W02
-	.byte		VOL   , 100*se_w103_mvl/mxv
+	.byte		VOL   , 100*se_m_screech_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte	W01
-	.byte		VOL   , 84*se_w103_mvl/mxv
+	.byte		VOL   , 84*se_m_screech_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 55*se_w103_mvl/mxv
+	.byte		VOL   , 55*se_m_screech_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v+0
 	.byte	W02
@@ -73,9 +73,9 @@ se_w103_1:
 
 @********************** Track  2 **********************@
 
-se_w103_2:
-	.byte		VOL   , 110*se_w103_mvl/mxv
-	.byte	KEYSH , se_w103_key+0
+se_m_screech_2:
+	.byte		VOL   , 110*se_m_screech_mvl/mxv
+	.byte	KEYSH , se_m_screech_key+0
 	.byte		VOICE , 42
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -98,15 +98,15 @@ se_w103_2:
 @******************************************************@
 	.align	2
 
-se_w103:
+se_m_screech:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w103_pri	@ Priority
-	.byte	se_w103_rev	@ Reverb.
+	.byte	se_m_screech_pri	@ Priority
+	.byte	se_m_screech_rev	@ Reverb.
 
-	.word	se_w103_grp
+	.word	se_m_screech_grp
 
-	.word	se_w103_1
-	.word	se_w103_2
+	.word	se_m_screech_1
+	.word	se_m_screech_2
 
 	.end
diff --git a/sound/songs/se_m_self_destruct.s b/sound/songs/se_m_self_destruct.s
new file mode 100644
index 000000000..f2ab617ca
--- /dev/null
+++ b/sound/songs/se_m_self_destruct.s
@@ -0,0 +1,74 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_self_destruct_grp, voicegroup128
+	.equ	se_m_self_destruct_pri, 4
+	.equ	se_m_self_destruct_rev, reverb_set+50
+	.equ	se_m_self_destruct_mvl, 127
+	.equ	se_m_self_destruct_key, 0
+	.equ	se_m_self_destruct_tbs, 1
+	.equ	se_m_self_destruct_exg, 0
+	.equ	se_m_self_destruct_cmp, 1
+
+	.section .rodata
+	.global	se_m_self_destruct
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_self_destruct_1:
+	.byte	KEYSH , se_m_self_destruct_key+0
+	.byte	TEMPO , 150*se_m_self_destruct_tbs/2
+	.byte		VOICE , 41
+	.byte		VOL   , 115*se_m_self_destruct_mvl/mxv
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+0
+	.byte		N01   , Gn3 , v127
+	.byte	W01
+	.byte		        Cn3 
+	.byte	W01
+	.byte		N24   , An3 
+	.byte	W06
+	.byte		PAN   , c_v+6
+	.byte	W04
+	.byte		        c_v+0
+	.byte	W01
+	.byte		VOL   , 102*se_m_self_destruct_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v-8
+	.byte		VOL   , 88*se_m_self_destruct_mvl/mxv
+	.byte	W03
+	.byte		        78*se_m_self_destruct_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 67*se_m_self_destruct_mvl/mxv
+	.byte	W01
+	.byte		BEND  , c_v-2
+	.byte	W01
+	.byte		PAN   , c_v+7
+	.byte		VOL   , 45*se_m_self_destruct_mvl/mxv
+	.byte	W02
+	.byte		BEND  , c_v-8
+	.byte	W01
+	.byte		VOL   , 13*se_m_self_destruct_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v-15
+	.byte	W22
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_self_destruct:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_self_destruct_pri	@ Priority
+	.byte	se_m_self_destruct_rev	@ Reverb.
+
+	.word	se_m_self_destruct_grp
+
+	.word	se_m_self_destruct_1
+
+	.end
diff --git a/sound/songs/se_w047.s b/sound/songs/se_m_sing.s
index 688b782ed..f12509f56 100644
--- a/sound/songs/se_w047.s
+++ b/sound/songs/se_m_sing.s
@@ -1,28 +1,28 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w047_grp, voicegroup128
-	.equ	se_w047_pri, 4
-	.equ	se_w047_rev, reverb_set+50
-	.equ	se_w047_mvl, 127
-	.equ	se_w047_key, 0
-	.equ	se_w047_tbs, 1
-	.equ	se_w047_exg, 0
-	.equ	se_w047_cmp, 1
+	.equ	se_m_sing_grp, voicegroup128
+	.equ	se_m_sing_pri, 4
+	.equ	se_m_sing_rev, reverb_set+50
+	.equ	se_m_sing_mvl, 127
+	.equ	se_m_sing_key, 0
+	.equ	se_m_sing_tbs, 1
+	.equ	se_m_sing_exg, 0
+	.equ	se_m_sing_cmp, 1
 
 	.section .rodata
-	.global	se_w047
+	.global	se_m_sing
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w047_1:
-	.byte	KEYSH , se_w047_key+0
-	.byte	TEMPO , 100*se_w047_tbs/2
+se_m_sing_1:
+	.byte	KEYSH , se_m_sing_key+0
+	.byte	TEMPO , 100*se_m_sing_tbs/2
 	.byte		VOICE , 73
 	.byte		BENDR , 12
 	.byte		LFOS  , 40
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 95*se_w047_mvl/mxv
+	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N44   , Gn4 , v112
 	.byte	W06
@@ -31,47 +31,47 @@ se_w047_1:
 	.byte		MOD   , 7
 	.byte	W03
 	.byte	W03
-	.byte		VOL   , 83*se_w047_mvl/mxv
+	.byte		VOL   , 83*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	W03
-	.byte		        69*se_w047_mvl/mxv
+	.byte		        69*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	W03
-	.byte		        50*se_w047_mvl/mxv
+	.byte		        50*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	W03
-	.byte		        24*se_w047_mvl/mxv
+	.byte		        24*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	W03
 	.byte		MOD   , 0
 	.byte	W03
-	.byte		VOL   , 95*se_w047_mvl/mxv
+	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		N21   , Fn5 
 	.byte	W06
 	.byte	W06
-se_w047_1_000:
-	.byte		VOL   , 86*se_w047_mvl/mxv
+se_m_sing_1_000:
+	.byte		VOL   , 86*se_m_sing_mvl/mxv
 	.byte		MOD   , 7
 	.byte	W03
-	.byte		VOL   , 75*se_w047_mvl/mxv
+	.byte		VOL   , 75*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	PEND
-se_w047_1_001:
-	.byte		VOL   , 55*se_w047_mvl/mxv
+se_m_sing_1_001:
+	.byte		VOL   , 55*se_m_sing_mvl/mxv
 	.byte	W03
-	.byte		        26*se_w047_mvl/mxv
+	.byte		        26*se_m_sing_mvl/mxv
 	.byte		MOD   , 0
 	.byte	W03
 	.byte	PEND
-	.byte		VOL   , 95*se_w047_mvl/mxv
+	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		N21   , Ds5 , v112
 	.byte	W06
 	.byte	W06
 	.byte	PATT
-	 .word	se_w047_1_000
+	 .word	se_m_sing_1_000
 	.byte	PATT
-	 .word	se_w047_1_001
-	.byte		VOL   , 95*se_w047_mvl/mxv
+	 .word	se_m_sing_1_001
+	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		N66   , Gn4 , v112
 	.byte	W06
 	.byte	W06
@@ -81,13 +81,13 @@ se_w047_1_001:
 	.byte	W06
 	.byte	W06
 	.byte	W06
-	.byte		VOL   , 83*se_w047_mvl/mxv
+	.byte		VOL   , 83*se_m_sing_mvl/mxv
 	.byte	W06
-	.byte		        69*se_w047_mvl/mxv
+	.byte		        69*se_m_sing_mvl/mxv
 	.byte	W06
-	.byte		        50*se_w047_mvl/mxv
+	.byte		        50*se_m_sing_mvl/mxv
 	.byte	W06
-	.byte		        24*se_w047_mvl/mxv
+	.byte		        24*se_m_sing_mvl/mxv
 	.byte	W06
 	.byte		MOD   , 0
 	.byte	W06
@@ -96,11 +96,11 @@ se_w047_1_001:
 
 @********************** Track  2 **********************@
 
-se_w047_2:
-	.byte	KEYSH , se_w047_key+0
+se_m_sing_2:
+	.byte	KEYSH , se_m_sing_key+0
 	.byte		VOICE , 73
 	.byte		LFOS  , 40
-	.byte		VOL   , 95*se_w047_mvl/mxv
+	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		BEND  , c_v+9
 	.byte	W06
 	.byte	W06
@@ -112,49 +112,49 @@ se_w047_2:
 	.byte		MOD   , 7
 	.byte	W03
 	.byte	W03
-	.byte		VOL   , 83*se_w047_mvl/mxv
+	.byte		VOL   , 83*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	W03
-	.byte		        69*se_w047_mvl/mxv
+	.byte		        69*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	W03
-	.byte		        50*se_w047_mvl/mxv
+	.byte		        50*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	W03
-	.byte		        24*se_w047_mvl/mxv
+	.byte		        24*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	W03
 	.byte		MOD   , 0
 	.byte	W03
-	.byte		VOL   , 95*se_w047_mvl/mxv
+	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		PAN   , c_v-12
 	.byte		N21   , Fn5 
 	.byte	W06
 	.byte	W06
-se_w047_2_000:
-	.byte		VOL   , 86*se_w047_mvl/mxv
+se_m_sing_2_000:
+	.byte		VOL   , 86*se_m_sing_mvl/mxv
 	.byte		MOD   , 7
 	.byte	W03
-	.byte		VOL   , 75*se_w047_mvl/mxv
+	.byte		VOL   , 75*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	PEND
-se_w047_2_001:
-	.byte		VOL   , 55*se_w047_mvl/mxv
+se_m_sing_2_001:
+	.byte		VOL   , 55*se_m_sing_mvl/mxv
 	.byte	W03
-	.byte		        26*se_w047_mvl/mxv
+	.byte		        26*se_m_sing_mvl/mxv
 	.byte		MOD   , 0
 	.byte	W03
 	.byte	PEND
-	.byte		VOL   , 95*se_w047_mvl/mxv
+	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		PAN   , c_v+12
 	.byte		N21   , Ds5 , v060
 	.byte	W06
 	.byte	W06
 	.byte	PATT
-	 .word	se_w047_2_000
+	 .word	se_m_sing_2_000
 	.byte	PATT
-	 .word	se_w047_2_001
-	.byte		VOL   , 95*se_w047_mvl/mxv
+	 .word	se_m_sing_2_001
+	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		PAN   , c_v-12
 	.byte		N66   , Gn4 , v060
 	.byte	W06
@@ -168,14 +168,14 @@ se_w047_2_001:
 	.byte	W06
 	.byte		        c_v+7
 	.byte	W06
-	.byte		VOL   , 83*se_w047_mvl/mxv
+	.byte		VOL   , 83*se_m_sing_mvl/mxv
 	.byte	W06
-	.byte		        69*se_w047_mvl/mxv
+	.byte		        69*se_m_sing_mvl/mxv
 	.byte		PAN   , c_v+15
 	.byte	W06
-	.byte		VOL   , 50*se_w047_mvl/mxv
+	.byte		VOL   , 50*se_m_sing_mvl/mxv
 	.byte	W06
-	.byte		        24*se_w047_mvl/mxv
+	.byte		        24*se_m_sing_mvl/mxv
 	.byte		PAN   , c_v+8
 	.byte	W06
 	.byte		MOD   , 0
@@ -184,15 +184,15 @@ se_w047_2_001:
 @******************************************************@
 	.align	2
 
-se_w047:
+se_m_sing:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w047_pri	@ Priority
-	.byte	se_w047_rev	@ Reverb.
+	.byte	se_m_sing_pri	@ Priority
+	.byte	se_m_sing_rev	@ Reverb.
 
-	.word	se_w047_grp
+	.word	se_m_sing_grp
 
-	.word	se_w047_1
-	.word	se_w047_2
+	.word	se_m_sing_1
+	.word	se_m_sing_2
 
 	.end
diff --git a/sound/songs/se_m_sketch.s b/sound/songs/se_m_sketch.s
new file mode 100644
index 000000000..3657d2009
--- /dev/null
+++ b/sound/songs/se_m_sketch.s
@@ -0,0 +1,68 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_sketch_grp, voicegroup128
+	.equ	se_m_sketch_pri, 4
+	.equ	se_m_sketch_rev, reverb_set+50
+	.equ	se_m_sketch_mvl, 127
+	.equ	se_m_sketch_key, 0
+	.equ	se_m_sketch_tbs, 1
+	.equ	se_m_sketch_exg, 0
+	.equ	se_m_sketch_cmp, 1
+
+	.section .rodata
+	.global	se_m_sketch
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_sketch_1:
+	.byte	KEYSH , se_m_sketch_key+0
+	.byte	TEMPO , 180*se_m_sketch_tbs/2
+	.byte		VOICE , 38
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 110*se_m_sketch_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N02   , Gn4 , v127
+	.byte	W01
+	.byte		VOL   , 74*se_m_sketch_mvl/mxv
+	.byte		BEND  , c_v-11
+	.byte	W01
+	.byte		VOICE , 31
+	.byte		VOL   , 40*se_m_sketch_mvl/mxv
+	.byte		BEND  , c_v-1
+	.byte		N03   , Cs5 
+	.byte	W01
+	.byte		VOL   , 64*se_m_sketch_mvl/mxv
+	.byte		PAN   , c_v-6
+	.byte		BEND  , c_v-12
+	.byte	W01
+	.byte		VOL   , 86*se_m_sketch_mvl/mxv
+	.byte		PAN   , c_v+4
+	.byte		BEND  , c_v-16
+	.byte	W02
+	.byte		VOL   , 110*se_m_sketch_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+0
+	.byte		N02   , As5 
+	.byte	W01
+	.byte		BEND  , c_v+12
+	.byte	W01
+	.byte		VOL   , 0*se_m_sketch_mvl/mxv
+	.byte	W04
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_sketch:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_sketch_pri	@ Priority
+	.byte	se_m_sketch_rev	@ Reverb.
+
+	.word	se_m_sketch_grp
+
+	.word	se_m_sketch_1
+
+	.end
diff --git a/sound/songs/se_m_sky_uppercut.s b/sound/songs/se_m_sky_uppercut.s
new file mode 100644
index 000000000..66a791f96
--- /dev/null
+++ b/sound/songs/se_m_sky_uppercut.s
@@ -0,0 +1,103 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_sky_uppercut_grp, voicegroup128
+	.equ	se_m_sky_uppercut_pri, 4
+	.equ	se_m_sky_uppercut_rev, reverb_set+50
+	.equ	se_m_sky_uppercut_mvl, 127
+	.equ	se_m_sky_uppercut_key, 0
+	.equ	se_m_sky_uppercut_tbs, 1
+	.equ	se_m_sky_uppercut_exg, 0
+	.equ	se_m_sky_uppercut_cmp, 1
+
+	.section .rodata
+	.global	se_m_sky_uppercut
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_sky_uppercut_1:
+	.byte	KEYSH , se_m_sky_uppercut_key+0
+	.byte	TEMPO , 220*se_m_sky_uppercut_tbs/2
+	.byte		VOICE , 41
+	.byte		VOL   , 110*se_m_sky_uppercut_mvl/mxv
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+6
+	.byte		BEND  , c_v+0
+	.byte		N02   , Cn4 , v127
+	.byte	W03
+	.byte		VOL   , 104*se_m_sky_uppercut_mvl/mxv
+	.byte	W03
+	.byte		        93*se_m_sky_uppercut_mvl/mxv
+	.byte		PAN   , c_v-6
+	.byte		N02   , Cn5 
+	.byte	W03
+	.byte		VOL   , 110*se_m_sky_uppercut_mvl/mxv
+	.byte	W01
+	.byte		VOICE , 22
+	.byte		PAN   , c_v+0
+	.byte		N24   , Cn4 , v060
+	.byte	W02
+	.byte	W02
+	.byte		BEND  , c_v+0
+	.byte	W04
+	.byte		        c_v+1
+	.byte	W03
+	.byte		        c_v+1
+	.byte	W01
+	.byte		VOL   , 105*se_m_sky_uppercut_mvl/mxv
+	.byte	W02
+	.byte		BEND  , c_v+0
+	.byte	W01
+	.byte		VOL   , 103*se_m_sky_uppercut_mvl/mxv
+	.byte	W02
+	.byte		        91*se_m_sky_uppercut_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte	W03
+	.byte		VOL   , 77*se_m_sky_uppercut_mvl/mxv
+	.byte		BEND  , c_v-1
+	.byte	W02
+	.byte		VOL   , 61*se_m_sky_uppercut_mvl/mxv
+	.byte		BEND  , c_v-2
+	.byte	W01
+	.byte		VOL   , 38*se_m_sky_uppercut_mvl/mxv
+	.byte	W01
+	.byte		        15*se_m_sky_uppercut_mvl/mxv
+	.byte		BEND  , c_v-3
+	.byte	W02
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_sky_uppercut_2:
+	.byte	KEYSH , se_m_sky_uppercut_key+0
+	.byte		VOICE , 4
+	.byte		VOL   , 110*se_m_sky_uppercut_mvl/mxv
+	.byte		N02   , Cn3 , v060
+	.byte	W03
+	.byte		        Gn2 
+	.byte	W03
+	.byte		        Gs4 
+	.byte	W04
+	.byte		        Gs4 , v020
+	.byte	W02
+	.byte	W06
+	.byte	W06
+	.byte	W06
+	.byte	W06
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_sky_uppercut:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_sky_uppercut_pri	@ Priority
+	.byte	se_m_sky_uppercut_rev	@ Reverb.
+
+	.word	se_m_sky_uppercut_grp
+
+	.word	se_m_sky_uppercut_1
+	.word	se_m_sky_uppercut_2
+
+	.end
diff --git a/sound/songs/se_w173.s b/sound/songs/se_m_snore.s
index a0bbd6378..aff9ef5e3 100644
--- a/sound/songs/se_w173.s
+++ b/sound/songs/se_m_snore.s
@@ -1,65 +1,65 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w173_grp, voicegroup128
-	.equ	se_w173_pri, 4
-	.equ	se_w173_rev, reverb_set+50
-	.equ	se_w173_mvl, 127
-	.equ	se_w173_key, 0
-	.equ	se_w173_tbs, 1
-	.equ	se_w173_exg, 0
-	.equ	se_w173_cmp, 1
+	.equ	se_m_snore_grp, voicegroup128
+	.equ	se_m_snore_pri, 4
+	.equ	se_m_snore_rev, reverb_set+50
+	.equ	se_m_snore_mvl, 127
+	.equ	se_m_snore_key, 0
+	.equ	se_m_snore_tbs, 1
+	.equ	se_m_snore_exg, 0
+	.equ	se_m_snore_cmp, 1
 
 	.section .rodata
-	.global	se_w173
+	.global	se_m_snore
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w173_1:
-	.byte	KEYSH , se_w173_key+0
-	.byte	TEMPO , 220*se_w173_tbs/2
+se_m_snore_1:
+	.byte	KEYSH , se_m_snore_key+0
+	.byte	TEMPO , 220*se_m_snore_tbs/2
 	.byte		VOICE , 38
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 27*se_w173_mvl/mxv
+	.byte		VOL   , 27*se_m_snore_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N10   , An1 , v127
 	.byte	W01
-	.byte		VOL   , 75*se_w173_mvl/mxv
+	.byte		VOL   , 75*se_m_snore_mvl/mxv
 	.byte	W01
-	.byte		        120*se_w173_mvl/mxv
+	.byte		        120*se_m_snore_mvl/mxv
 	.byte	W04
 	.byte	W02
-	.byte		        75*se_w173_mvl/mxv
+	.byte		        75*se_m_snore_mvl/mxv
 	.byte	W01
-	.byte		        28*se_w173_mvl/mxv
+	.byte		        28*se_m_snore_mvl/mxv
 	.byte	W03
 	.byte		VOICE , 36
-	.byte		VOL   , 83*se_w173_mvl/mxv
+	.byte		VOL   , 83*se_m_snore_mvl/mxv
 	.byte		N18   , En2 , v112
 	.byte	W02
-	.byte		VOL   , 87*se_w173_mvl/mxv
+	.byte		VOL   , 87*se_m_snore_mvl/mxv
 	.byte	W02
-	.byte		        91*se_w173_mvl/mxv
+	.byte		        91*se_m_snore_mvl/mxv
 	.byte	W02
 	.byte	W01
-	.byte		        97*se_w173_mvl/mxv
+	.byte		        97*se_m_snore_mvl/mxv
 	.byte	W02
-	.byte		        102*se_w173_mvl/mxv
+	.byte		        102*se_m_snore_mvl/mxv
 	.byte	W01
-	.byte		        109*se_w173_mvl/mxv
+	.byte		        109*se_m_snore_mvl/mxv
 	.byte	W02
-	.byte		        113*se_w173_mvl/mxv
+	.byte		        113*se_m_snore_mvl/mxv
 	.byte	W01
-	.byte		        120*se_w173_mvl/mxv
+	.byte		        120*se_m_snore_mvl/mxv
 	.byte	W05
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w173_2:
-	.byte		VOL   , 120*se_w173_mvl/mxv
-	.byte	KEYSH , se_w173_key+0
+se_m_snore_2:
+	.byte		VOL   , 120*se_m_snore_mvl/mxv
+	.byte	KEYSH , se_m_snore_key+0
 	.byte		VOICE , 27
 	.byte		N01   , En2 , v052
 	.byte	W02
@@ -91,15 +91,15 @@ se_w173_2:
 @******************************************************@
 	.align	2
 
-se_w173:
+se_m_snore:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w173_pri	@ Priority
-	.byte	se_w173_rev	@ Reverb.
+	.byte	se_m_snore_pri	@ Priority
+	.byte	se_m_snore_rev	@ Reverb.
 
-	.word	se_w173_grp
+	.word	se_m_snore_grp
 
-	.word	se_w173_1
-	.word	se_w173_2
+	.word	se_m_snore_1
+	.word	se_m_snore_2
 
 	.end
diff --git a/sound/songs/se_w076.s b/sound/songs/se_m_solar_beam.s
index 82508b774..c260c332a 100644
--- a/sound/songs/se_w076.s
+++ b/sound/songs/se_m_solar_beam.s
@@ -1,41 +1,41 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w076_grp, voicegroup128
-	.equ	se_w076_pri, 4
-	.equ	se_w076_rev, reverb_set+50
-	.equ	se_w076_mvl, 127
-	.equ	se_w076_key, 0
-	.equ	se_w076_tbs, 1
-	.equ	se_w076_exg, 0
-	.equ	se_w076_cmp, 1
+	.equ	se_m_solar_beam_grp, voicegroup128
+	.equ	se_m_solar_beam_pri, 4
+	.equ	se_m_solar_beam_rev, reverb_set+50
+	.equ	se_m_solar_beam_mvl, 127
+	.equ	se_m_solar_beam_key, 0
+	.equ	se_m_solar_beam_tbs, 1
+	.equ	se_m_solar_beam_exg, 0
+	.equ	se_m_solar_beam_cmp, 1
 
 	.section .rodata
-	.global	se_w076
+	.global	se_m_solar_beam
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w076_1:
-	.byte	KEYSH , se_w076_key+0
-	.byte	TEMPO , 150*se_w076_tbs/2
+se_m_solar_beam_1:
+	.byte	KEYSH , se_m_solar_beam_key+0
+	.byte	TEMPO , 150*se_m_solar_beam_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 24
-	.byte		VOL   , 25*se_w076_mvl/mxv
+	.byte		VOL   , 25*se_m_solar_beam_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+63
 	.byte		TIE   , Cn4 , v112
 	.byte	W04
-	.byte		VOL   , 40*se_w076_mvl/mxv
+	.byte		VOL   , 40*se_m_solar_beam_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+52
 	.byte	W03
-	.byte		VOL   , 55*se_w076_mvl/mxv
+	.byte		VOL   , 55*se_m_solar_beam_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-10
 	.byte		BEND  , c_v+41
 	.byte	W03
-	.byte		VOL   , 80*se_w076_mvl/mxv
+	.byte		VOL   , 80*se_m_solar_beam_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-5
 	.byte		BEND  , c_v+30
@@ -43,7 +43,7 @@ se_w076_1:
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+22
 	.byte	W01
-	.byte		VOL   , 100*se_w076_mvl/mxv
+	.byte		VOL   , 100*se_m_solar_beam_mvl/mxv
 	.byte	W05
 	.byte		PAN   , c_v+4
 	.byte		BEND  , c_v+63
@@ -114,36 +114,36 @@ se_w076_1:
 	.byte		        c_v-10
 	.byte		BEND  , c_v-18
 	.byte	W03
-	.byte		VOL   , 89*se_w076_mvl/mxv
+	.byte		VOL   , 89*se_m_solar_beam_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-5
 	.byte	W02
-	.byte		VOL   , 74*se_w076_mvl/mxv
+	.byte		VOL   , 74*se_m_solar_beam_mvl/mxv
 	.byte		BEND  , c_v-25
 	.byte	W04
 	.byte		PAN   , c_v+0
 	.byte	W02
-	.byte		VOL   , 62*se_w076_mvl/mxv
+	.byte		VOL   , 62*se_m_solar_beam_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-32
 	.byte	W03
 	.byte		PAN   , c_v+4
 	.byte	W01
-	.byte		VOL   , 45*se_w076_mvl/mxv
+	.byte		VOL   , 45*se_m_solar_beam_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-40
 	.byte	W04
-	.byte		VOL   , 28*se_w076_mvl/mxv
+	.byte		VOL   , 28*se_m_solar_beam_mvl/mxv
 	.byte		PAN   , c_v+11
 	.byte		BEND  , c_v-49
 	.byte	W03
 	.byte		        c_v-64
 	.byte	W01
-	.byte		VOL   , 10*se_w076_mvl/mxv
+	.byte		VOL   , 10*se_m_solar_beam_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+4
 	.byte	W02
-	.byte		VOL   , 5*se_w076_mvl/mxv
+	.byte		VOL   , 5*se_m_solar_beam_mvl/mxv
 	.byte	W04
 	.byte		EOT   
 	.byte	FINE
@@ -151,14 +151,14 @@ se_w076_1:
 @******************************************************@
 	.align	2
 
-se_w076:
+se_m_solar_beam:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w076_pri	@ Priority
-	.byte	se_w076_rev	@ Reverb.
+	.byte	se_m_solar_beam_pri	@ Priority
+	.byte	se_m_solar_beam_rev	@ Reverb.
 
-	.word	se_w076_grp
+	.word	se_m_solar_beam_grp
 
-	.word	se_w076_1
+	.word	se_m_solar_beam_1
 
 	.end
diff --git a/sound/songs/se_w255.s b/sound/songs/se_m_spit_up.s
index 73169ec42..5d96c7b86 100644
--- a/sound/songs/se_w255.s
+++ b/sound/songs/se_m_spit_up.s
@@ -1,26 +1,26 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w255_grp, voicegroup128
-	.equ	se_w255_pri, 4
-	.equ	se_w255_rev, reverb_set+50
-	.equ	se_w255_mvl, 127
-	.equ	se_w255_key, 0
-	.equ	se_w255_tbs, 1
-	.equ	se_w255_exg, 0
-	.equ	se_w255_cmp, 1
+	.equ	se_m_spit_up_grp, voicegroup128
+	.equ	se_m_spit_up_pri, 4
+	.equ	se_m_spit_up_rev, reverb_set+50
+	.equ	se_m_spit_up_mvl, 127
+	.equ	se_m_spit_up_key, 0
+	.equ	se_m_spit_up_tbs, 1
+	.equ	se_m_spit_up_exg, 0
+	.equ	se_m_spit_up_cmp, 1
 
 	.section .rodata
-	.global	se_w255
+	.global	se_m_spit_up
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w255_1:
-	.byte	KEYSH , se_w255_key+0
-	.byte	TEMPO , 150*se_w255_tbs/2
+se_m_spit_up_1:
+	.byte	KEYSH , se_m_spit_up_key+0
+	.byte	TEMPO , 150*se_m_spit_up_tbs/2
 	.byte		VOICE , 65
 	.byte		BENDR , 12
-	.byte		VOL   , 110*se_w255_mvl/mxv
+	.byte		VOL   , 110*se_m_spit_up_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte		N03   , Gn3 , v112
@@ -56,10 +56,10 @@ se_w255_1:
 
 @********************** Track  2 **********************@
 
-se_w255_2:
-	.byte	KEYSH , se_w255_key+0
+se_m_spit_up_2:
+	.byte	KEYSH , se_m_spit_up_key+0
 	.byte		VOICE , 57
-	.byte		VOL   , 110*se_w255_mvl/mxv
+	.byte		VOL   , 110*se_m_spit_up_mvl/mxv
 	.byte		N03   , En3 , v052
 	.byte	W03
 	.byte	W01
@@ -74,15 +74,15 @@ se_w255_2:
 @******************************************************@
 	.align	2
 
-se_w255:
+se_m_spit_up:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w255_pri	@ Priority
-	.byte	se_w255_rev	@ Reverb.
+	.byte	se_m_spit_up_pri	@ Priority
+	.byte	se_m_spit_up_rev	@ Reverb.
 
-	.word	se_w255_grp
+	.word	se_m_spit_up_grp
 
-	.word	se_w255_1
-	.word	se_w255_2
+	.word	se_m_spit_up_1
+	.word	se_m_spit_up_2
 
 	.end
diff --git a/sound/songs/se_w287b.s b/sound/songs/se_m_stat_decrease.s
index a88a960cb..5cdf8ac36 100644
--- a/sound/songs/se_w287b.s
+++ b/sound/songs/se_m_stat_decrease.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w287b_grp, voicegroup128
-	.equ	se_w287b_pri, 4
-	.equ	se_w287b_rev, reverb_set+50
-	.equ	se_w287b_mvl, 127
-	.equ	se_w287b_key, 0
-	.equ	se_w287b_tbs, 1
-	.equ	se_w287b_exg, 0
-	.equ	se_w287b_cmp, 1
+	.equ	se_m_stat_decrease_grp, voicegroup128
+	.equ	se_m_stat_decrease_pri, 4
+	.equ	se_m_stat_decrease_rev, reverb_set+50
+	.equ	se_m_stat_decrease_mvl, 127
+	.equ	se_m_stat_decrease_key, 0
+	.equ	se_m_stat_decrease_tbs, 1
+	.equ	se_m_stat_decrease_exg, 0
+	.equ	se_m_stat_decrease_cmp, 1
 
 	.section .rodata
-	.global	se_w287b
+	.global	se_m_stat_decrease
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w287b_1:
-	.byte	KEYSH , se_w287b_key+0
-	.byte	TEMPO , 170*se_w287b_tbs/2
+se_m_stat_decrease_1:
+	.byte	KEYSH , se_m_stat_decrease_key+0
+	.byte	TEMPO , 170*se_m_stat_decrease_tbs/2
 	.byte		VOICE , 67
-	.byte		VOL   , 70*se_w287b_mvl/mxv
+	.byte		VOL   , 70*se_m_stat_decrease_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+42
 	.byte		N02   , Cs6 , v076
@@ -194,12 +194,12 @@ se_w287b_1:
 
 @********************** Track  2 **********************@
 
-se_w287b_2:
-	.byte	KEYSH , se_w287b_key+0
+se_m_stat_decrease_2:
+	.byte	KEYSH , se_m_stat_decrease_key+0
 	.byte		VOICE , 55
 	.byte		XCMD  , xIECV , 10
 	.byte		        xIECL , 8
-	.byte		VOL   , 70*se_w287b_mvl/mxv
+	.byte		VOL   , 70*se_m_stat_decrease_mvl/mxv
 	.byte		N02   , As3 , v052
 	.byte	W03
 	.byte		N02   
@@ -257,15 +257,15 @@ se_w287b_2:
 @******************************************************@
 	.align	2
 
-se_w287b:
+se_m_stat_decrease:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w287b_pri	@ Priority
-	.byte	se_w287b_rev	@ Reverb.
+	.byte	se_m_stat_decrease_pri	@ Priority
+	.byte	se_m_stat_decrease_rev	@ Reverb.
 
-	.word	se_w287b_grp
+	.word	se_m_stat_decrease_grp
 
-	.word	se_w287b_1
-	.word	se_w287b_2
+	.word	se_m_stat_decrease_1
+	.word	se_m_stat_decrease_2
 
 	.end
diff --git a/sound/songs/se_w287.s b/sound/songs/se_m_stat_increase.s
index 5f5cc503d..e9eea563a 100644
--- a/sound/songs/se_w287.s
+++ b/sound/songs/se_m_stat_increase.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w287_grp, voicegroup128
-	.equ	se_w287_pri, 4
-	.equ	se_w287_rev, reverb_set+50
-	.equ	se_w287_mvl, 127
-	.equ	se_w287_key, 0
-	.equ	se_w287_tbs, 1
-	.equ	se_w287_exg, 0
-	.equ	se_w287_cmp, 1
+	.equ	se_m_stat_increase_grp, voicegroup128
+	.equ	se_m_stat_increase_pri, 4
+	.equ	se_m_stat_increase_rev, reverb_set+50
+	.equ	se_m_stat_increase_mvl, 127
+	.equ	se_m_stat_increase_key, 0
+	.equ	se_m_stat_increase_tbs, 1
+	.equ	se_m_stat_increase_exg, 0
+	.equ	se_m_stat_increase_cmp, 1
 
 	.section .rodata
-	.global	se_w287
+	.global	se_m_stat_increase
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w287_1:
-	.byte	KEYSH , se_w287_key+0
-	.byte	TEMPO , 170*se_w287_tbs/2
+se_m_stat_increase_1:
+	.byte	KEYSH , se_m_stat_increase_key+0
+	.byte	TEMPO , 170*se_m_stat_increase_tbs/2
 	.byte		VOICE , 67
-	.byte		VOL   , 70*se_w287_mvl/mxv
+	.byte		VOL   , 70*se_m_stat_increase_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte		N02   , An5 , v076
@@ -206,12 +206,12 @@ se_w287_1:
 
 @********************** Track  2 **********************@
 
-se_w287_2:
-	.byte	KEYSH , se_w287_key+0
+se_m_stat_increase_2:
+	.byte	KEYSH , se_m_stat_increase_key+0
 	.byte		VOICE , 55
 	.byte		XCMD  , xIECV , 10
 	.byte		        xIECL , 8
-	.byte		VOL   , 70*se_w287_mvl/mxv
+	.byte		VOL   , 70*se_m_stat_increase_mvl/mxv
 	.byte		N02   , Cn3 , v052
 	.byte	W03
 	.byte		N02   
@@ -269,15 +269,15 @@ se_w287_2:
 @******************************************************@
 	.align	2
 
-se_w287:
+se_m_stat_increase:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w287_pri	@ Priority
-	.byte	se_w287_rev	@ Reverb.
+	.byte	se_m_stat_increase_pri	@ Priority
+	.byte	se_m_stat_increase_rev	@ Reverb.
 
-	.word	se_w287_grp
+	.word	se_m_stat_increase_grp
 
-	.word	se_w287_1
-	.word	se_w287_2
+	.word	se_m_stat_increase_1
+	.word	se_m_stat_increase_2
 
 	.end
diff --git a/sound/songs/se_w070.s b/sound/songs/se_m_strength.s
index 876bad52b..0fca48906 100644
--- a/sound/songs/se_w070.s
+++ b/sound/songs/se_m_strength.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w070_grp, voicegroup128
-	.equ	se_w070_pri, 4
-	.equ	se_w070_rev, reverb_set+50
-	.equ	se_w070_mvl, 127
-	.equ	se_w070_key, 0
-	.equ	se_w070_tbs, 1
-	.equ	se_w070_exg, 0
-	.equ	se_w070_cmp, 1
+	.equ	se_m_strength_grp, voicegroup128
+	.equ	se_m_strength_pri, 4
+	.equ	se_m_strength_rev, reverb_set+50
+	.equ	se_m_strength_mvl, 127
+	.equ	se_m_strength_key, 0
+	.equ	se_m_strength_tbs, 1
+	.equ	se_m_strength_exg, 0
+	.equ	se_m_strength_cmp, 1
 
 	.section .rodata
-	.global	se_w070
+	.global	se_m_strength
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w070_1:
-	.byte	KEYSH , se_w070_key+0
-	.byte	TEMPO , 150*se_w070_tbs/2
+se_m_strength_1:
+	.byte	KEYSH , se_m_strength_key+0
+	.byte	TEMPO , 150*se_m_strength_tbs/2
 	.byte		VOICE , 26
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w070_mvl/mxv
+	.byte		VOL   , 110*se_m_strength_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N03   , Gn2 , v127
 	.byte	W03
@@ -44,11 +44,11 @@ se_w070_1:
 
 @********************** Track  2 **********************@
 
-se_w070_2:
-	.byte	KEYSH , se_w070_key+0
+se_m_strength_2:
+	.byte	KEYSH , se_m_strength_key+0
 	.byte		VOICE , 5
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w070_mvl/mxv
+	.byte		VOL   , 110*se_m_strength_mvl/mxv
 	.byte		N02   , Fn2 , v072
 	.byte	W02
 	.byte		N01   
@@ -70,15 +70,15 @@ se_w070_2:
 @******************************************************@
 	.align	2
 
-se_w070:
+se_m_strength:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w070_pri	@ Priority
-	.byte	se_w070_rev	@ Reverb.
+	.byte	se_m_strength_pri	@ Priority
+	.byte	se_m_strength_rev	@ Reverb.
 
-	.word	se_w070_grp
+	.word	se_m_strength_grp
 
-	.word	se_w070_1
-	.word	se_w070_2
+	.word	se_m_strength_1
+	.word	se_m_strength_2
 
 	.end
diff --git a/sound/songs/se_w081.s b/sound/songs/se_m_string_shot.s
index 248f44c6f..d750d26b9 100644
--- a/sound/songs/se_w081.s
+++ b/sound/songs/se_m_string_shot.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w081_grp, voicegroup128
-	.equ	se_w081_pri, 4
-	.equ	se_w081_rev, reverb_set+50
-	.equ	se_w081_mvl, 127
-	.equ	se_w081_key, 0
-	.equ	se_w081_tbs, 1
-	.equ	se_w081_exg, 0
-	.equ	se_w081_cmp, 1
+	.equ	se_m_string_shot_grp, voicegroup128
+	.equ	se_m_string_shot_pri, 4
+	.equ	se_m_string_shot_rev, reverb_set+50
+	.equ	se_m_string_shot_mvl, 127
+	.equ	se_m_string_shot_key, 0
+	.equ	se_m_string_shot_tbs, 1
+	.equ	se_m_string_shot_exg, 0
+	.equ	se_m_string_shot_cmp, 1
 
 	.section .rodata
-	.global	se_w081
+	.global	se_m_string_shot
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w081_1:
-	.byte	KEYSH , se_w081_key+0
-	.byte	TEMPO , 250*se_w081_tbs/2
+se_m_string_shot_1:
+	.byte	KEYSH , se_m_string_shot_key+0
+	.byte	TEMPO , 250*se_m_string_shot_tbs/2
 	.byte		VOICE , 22
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w081_mvl/mxv
+	.byte		VOL   , 110*se_m_string_shot_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N48   , Fn4 , v108
 	.byte	W03
@@ -50,31 +50,31 @@ se_w081_1:
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte	W06
-	.byte		VOL   , 90*se_w081_mvl/mxv
+	.byte		VOL   , 90*se_m_string_shot_mvl/mxv
 	.byte	W03
-	.byte		        71*se_w081_mvl/mxv
+	.byte		        71*se_m_string_shot_mvl/mxv
 	.byte	W03
-	.byte		        58*se_w081_mvl/mxv
+	.byte		        58*se_m_string_shot_mvl/mxv
 	.byte	W03
-	.byte		        41*se_w081_mvl/mxv
+	.byte		        41*se_m_string_shot_mvl/mxv
 	.byte	W03
-	.byte		        27*se_w081_mvl/mxv
+	.byte		        27*se_m_string_shot_mvl/mxv
 	.byte	W03
-	.byte		        7*se_w081_mvl/mxv
+	.byte		        7*se_m_string_shot_mvl/mxv
 	.byte	W03
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w081:
+se_m_string_shot:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w081_pri	@ Priority
-	.byte	se_w081_rev	@ Reverb.
+	.byte	se_m_string_shot_pri	@ Priority
+	.byte	se_m_string_shot_rev	@ Reverb.
 
-	.word	se_w081_grp
+	.word	se_m_string_shot_grp
 
-	.word	se_w081_1
+	.word	se_m_string_shot_1
 
 	.end
diff --git a/sound/songs/se_w081b.s b/sound/songs/se_m_string_shot2.s
index d20162cd3..7bd0a7427 100644
--- a/sound/songs/se_w081b.s
+++ b/sound/songs/se_m_string_shot2.s
@@ -1,26 +1,26 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w081b_grp, voicegroup128
-	.equ	se_w081b_pri, 4
-	.equ	se_w081b_rev, reverb_set+50
-	.equ	se_w081b_mvl, 127
-	.equ	se_w081b_key, 0
-	.equ	se_w081b_tbs, 1
-	.equ	se_w081b_exg, 0
-	.equ	se_w081b_cmp, 1
+	.equ	se_m_string_shot2_grp, voicegroup128
+	.equ	se_m_string_shot2_pri, 4
+	.equ	se_m_string_shot2_rev, reverb_set+50
+	.equ	se_m_string_shot2_mvl, 127
+	.equ	se_m_string_shot2_key, 0
+	.equ	se_m_string_shot2_tbs, 1
+	.equ	se_m_string_shot2_exg, 0
+	.equ	se_m_string_shot2_cmp, 1
 
 	.section .rodata
-	.global	se_w081b
+	.global	se_m_string_shot2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w081b_1:
-	.byte	KEYSH , se_w081b_key+0
-	.byte	TEMPO , 250*se_w081b_tbs/2
+se_m_string_shot2_1:
+	.byte	KEYSH , se_m_string_shot2_key+0
+	.byte	TEMPO , 250*se_m_string_shot2_tbs/2
 	.byte		VOICE , 10
 	.byte		BENDR , 12
-	.byte		VOL   , 105*se_w081b_mvl/mxv
+	.byte		VOL   , 105*se_m_string_shot2_mvl/mxv
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v+0
 	.byte		N09   , En4 , v112
@@ -93,17 +93,17 @@ se_w081b_1:
 
 @********************** Track  2 **********************@
 
-se_w081b_2:
-	.byte	KEYSH , se_w081b_key+0
+se_m_string_shot2_2:
+	.byte	KEYSH , se_m_string_shot2_key+0
 	.byte		VOICE , 5
-	.byte		VOL   , 105*se_w081b_mvl/mxv
+	.byte		VOL   , 105*se_m_string_shot2_mvl/mxv
 	.byte		PAN   , c_v+9
 	.byte		N09   , Cn3 , v052
 	.byte	W12
 	.byte		PAN   , c_v-7
 	.byte		N09   , Gn2 
 	.byte	W12
-se_w081b_2_000:
+se_m_string_shot2_2_000:
 	.byte		PAN   , c_v+9
 	.byte		N09   , Cn3 , v052
 	.byte	W12
@@ -112,23 +112,23 @@ se_w081b_2_000:
 	.byte	W12
 	.byte	PEND
 	.byte	PATT
-	 .word	se_w081b_2_000
+	 .word	se_m_string_shot2_2_000
 	.byte	PATT
-	 .word	se_w081b_2_000
+	 .word	se_m_string_shot2_2_000
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w081b:
+se_m_string_shot2:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w081b_pri	@ Priority
-	.byte	se_w081b_rev	@ Reverb.
+	.byte	se_m_string_shot2_pri	@ Priority
+	.byte	se_m_string_shot2_rev	@ Reverb.
 
-	.word	se_w081b_grp
+	.word	se_m_string_shot2_grp
 
-	.word	se_w081b_1
-	.word	se_w081b_2
+	.word	se_m_string_shot2_1
+	.word	se_m_string_shot2_2
 
 	.end
diff --git a/sound/songs/se_w048.s b/sound/songs/se_m_supersonic.s
index 8046eae58..f791c9b15 100644
--- a/sound/songs/se_w048.s
+++ b/sound/songs/se_m_supersonic.s
@@ -1,47 +1,47 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w048_grp, voicegroup128
-	.equ	se_w048_pri, 4
-	.equ	se_w048_rev, reverb_set+50
-	.equ	se_w048_mvl, 127
-	.equ	se_w048_key, 0
-	.equ	se_w048_tbs, 1
-	.equ	se_w048_exg, 0
-	.equ	se_w048_cmp, 1
+	.equ	se_m_supersonic_grp, voicegroup128
+	.equ	se_m_supersonic_pri, 4
+	.equ	se_m_supersonic_rev, reverb_set+50
+	.equ	se_m_supersonic_mvl, 127
+	.equ	se_m_supersonic_key, 0
+	.equ	se_m_supersonic_tbs, 1
+	.equ	se_m_supersonic_exg, 0
+	.equ	se_m_supersonic_cmp, 1
 
 	.section .rodata
-	.global	se_w048
+	.global	se_m_supersonic
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w048_1:
-	.byte	KEYSH , se_w048_key+0
-	.byte	TEMPO , 150*se_w048_tbs/2
+se_m_supersonic_1:
+	.byte	KEYSH , se_m_supersonic_key+0
+	.byte	TEMPO , 150*se_m_supersonic_tbs/2
 	.byte		VOICE , 43
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 61*se_w048_mvl/mxv
+	.byte		VOL   , 61*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v-4
 	.byte		N07   , Gs4 , v127
 	.byte	W01
 	.byte		PAN   , c_v+6
-	.byte		VOL   , 75*se_w048_mvl/mxv
+	.byte		VOL   , 75*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v-1
 	.byte	W01
 	.byte		PAN   , c_v-7
-	.byte		VOL   , 93*se_w048_mvl/mxv
+	.byte		VOL   , 93*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v+2
 	.byte	W01
 	.byte		PAN   , c_v+9
-	.byte		VOL   , 110*se_w048_mvl/mxv
+	.byte		VOL   , 110*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v+4
 	.byte	W01
 	.byte		PAN   , c_v-12
 	.byte		BEND  , c_v+7
 	.byte	W02
 	.byte	W02
-	.byte		VOL   , 0*se_w048_mvl/mxv
+	.byte		VOL   , 0*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-4
 	.byte		N32   
@@ -50,68 +50,68 @@ se_w048_1:
 	.byte		BEND  , c_v-1
 	.byte	W01
 	.byte		PAN   , c_v-7
-	.byte		VOL   , 36*se_w048_mvl/mxv
+	.byte		VOL   , 36*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v+2
 	.byte	W02
 	.byte		PAN   , c_v+9
-	.byte		VOL   , 67*se_w048_mvl/mxv
+	.byte		VOL   , 67*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v-1
 	.byte	W01
 	.byte		PAN   , c_v-13
-	.byte		VOL   , 84*se_w048_mvl/mxv
+	.byte		VOL   , 84*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v-4
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-6
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 92*se_w048_mvl/mxv
+	.byte		VOL   , 92*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v-8
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-7
 	.byte	W02
 	.byte		PAN   , c_v+6
-	.byte		VOL   , 99*se_w048_mvl/mxv
+	.byte		VOL   , 99*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v-4
 	.byte	W01
 	.byte		PAN   , c_v-7
 	.byte		BEND  , c_v-1
 	.byte	W01
-	.byte		VOL   , 105*se_w048_mvl/mxv
+	.byte		VOL   , 105*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v+9
 	.byte		BEND  , c_v+2
 	.byte	W01
-	.byte		VOL   , 110*se_w048_mvl/mxv
+	.byte		VOL   , 110*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v-13
 	.byte		BEND  , c_v-1
 	.byte	W01
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v-4
 	.byte	W02
-	.byte		VOL   , 46*se_w048_mvl/mxv
+	.byte		VOL   , 46*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-1
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+2
 	.byte	W01
-	.byte		VOL   , 67*se_w048_mvl/mxv
+	.byte		VOL   , 67*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v-7
 	.byte		BEND  , c_v-1
 	.byte	W01
 	.byte		PAN   , c_v+9
 	.byte		BEND  , c_v-4
 	.byte	W01
-	.byte		VOL   , 84*se_w048_mvl/mxv
+	.byte		VOL   , 84*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v-13
 	.byte		BEND  , c_v-6
 	.byte	W02
-	.byte		VOL   , 100*se_w048_mvl/mxv
+	.byte		VOL   , 100*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-8
 	.byte	W01
-	.byte		VOL   , 110*se_w048_mvl/mxv
+	.byte		VOL   , 110*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v-7
 	.byte	W01
@@ -121,26 +121,26 @@ se_w048_1:
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-1
 	.byte	W01
-	.byte		VOL   , 101*se_w048_mvl/mxv
+	.byte		VOL   , 101*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v-7
 	.byte		BEND  , c_v+2
 	.byte	W02
-	.byte		VOL   , 85*se_w048_mvl/mxv
+	.byte		VOL   , 85*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v+9
 	.byte		BEND  , c_v-1
 	.byte	W01
-	.byte		VOL   , 75*se_w048_mvl/mxv
+	.byte		VOL   , 75*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v-13
 	.byte		BEND  , c_v-4
 	.byte	W01
-	.byte		VOL   , 48*se_w048_mvl/mxv
+	.byte		VOL   , 48*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v-6
 	.byte	W01
-	.byte		VOL   , 24*se_w048_mvl/mxv
+	.byte		VOL   , 24*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v-8
 	.byte	W01
-	.byte		VOL   , 6*se_w048_mvl/mxv
+	.byte		VOL   , 6*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v-7
 	.byte	W02
 	.byte	FINE
@@ -148,14 +148,14 @@ se_w048_1:
 @******************************************************@
 	.align	2
 
-se_w048:
+se_m_supersonic:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w048_pri	@ Priority
-	.byte	se_w048_rev	@ Reverb.
+	.byte	se_m_supersonic_pri	@ Priority
+	.byte	se_m_supersonic_rev	@ Reverb.
 
-	.word	se_w048_grp
+	.word	se_m_supersonic_grp
 
-	.word	se_w048_1
+	.word	se_m_supersonic_1
 
 	.end
diff --git a/sound/songs/se_w057.s b/sound/songs/se_m_surf.s
index 6d74168ce..d3e307782 100644
--- a/sound/songs/se_w057.s
+++ b/sound/songs/se_m_surf.s
@@ -1,43 +1,43 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w057_grp, voicegroup128
-	.equ	se_w057_pri, 4
-	.equ	se_w057_rev, reverb_set+50
-	.equ	se_w057_mvl, 127
-	.equ	se_w057_key, 0
-	.equ	se_w057_tbs, 1
-	.equ	se_w057_exg, 0
-	.equ	se_w057_cmp, 1
+	.equ	se_m_surf_grp, voicegroup128
+	.equ	se_m_surf_pri, 4
+	.equ	se_m_surf_rev, reverb_set+50
+	.equ	se_m_surf_mvl, 127
+	.equ	se_m_surf_key, 0
+	.equ	se_m_surf_tbs, 1
+	.equ	se_m_surf_exg, 0
+	.equ	se_m_surf_cmp, 1
 
 	.section .rodata
-	.global	se_w057
+	.global	se_m_surf
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w057_1:
-	.byte	KEYSH , se_w057_key+0
-	.byte	TEMPO , 150*se_w057_tbs/2
+se_m_surf_1:
+	.byte	KEYSH , se_m_surf_key+0
+	.byte	TEMPO , 150*se_m_surf_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 12
-	.byte		VOL   , 27*se_w057_mvl/mxv
+	.byte		VOL   , 27*se_m_surf_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte		N96   , Cn3 , v112
 	.byte	W04
-	.byte		VOL   , 45*se_w057_mvl/mxv
+	.byte		VOL   , 45*se_m_surf_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-4
 	.byte	W02
 	.byte		BEND  , c_v+4
 	.byte	W01
-	.byte		VOL   , 60*se_w057_mvl/mxv
+	.byte		VOL   , 60*se_m_surf_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-10
 	.byte	W02
 	.byte		BEND  , c_v+9
 	.byte	W01
-	.byte		VOL   , 88*se_w057_mvl/mxv
+	.byte		VOL   , 88*se_m_surf_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-5
 	.byte	W02
@@ -45,7 +45,7 @@ se_w057_1:
 	.byte	W04
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 110*se_w057_mvl/mxv
+	.byte		VOL   , 110*se_m_surf_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v+19
 	.byte	W03
@@ -65,29 +65,29 @@ se_w057_1:
 	.byte	W04
 	.byte		PAN   , c_v-10
 	.byte	W01
-	.byte		VOL   , 98*se_w057_mvl/mxv
+	.byte		VOL   , 98*se_m_surf_mvl/mxv
 	.byte	W05
-	.byte		        81*se_w057_mvl/mxv
+	.byte		        81*se_m_surf_mvl/mxv
 	.byte		PAN   , c_v-5
 	.byte		BEND  , c_v+12
 	.byte	W06
-	.byte		VOL   , 68*se_w057_mvl/mxv
+	.byte		VOL   , 68*se_m_surf_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W03
 	.byte		BEND  , c_v+17
 	.byte	W01
-	.byte		VOL   , 50*se_w057_mvl/mxv
+	.byte		VOL   , 50*se_m_surf_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+4
 	.byte	W03
-	.byte		VOL   , 31*se_w057_mvl/mxv
+	.byte		VOL   , 31*se_m_surf_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v+11
 	.byte		BEND  , c_v+22
 	.byte	W02
-	.byte		VOL   , 11*se_w057_mvl/mxv
+	.byte		VOL   , 11*se_m_surf_mvl/mxv
 	.byte	W04
-	.byte		        6*se_w057_mvl/mxv
+	.byte		        6*se_m_surf_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte		BEND  , c_v+30
 	.byte	W06
@@ -96,14 +96,14 @@ se_w057_1:
 @******************************************************@
 	.align	2
 
-se_w057:
+se_m_surf:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w057_pri	@ Priority
-	.byte	se_w057_rev	@ Reverb.
+	.byte	se_m_surf_pri	@ Priority
+	.byte	se_m_surf_rev	@ Reverb.
 
-	.word	se_w057_grp
+	.word	se_m_surf_grp
 
-	.word	se_w057_1
+	.word	se_m_surf_1
 
 	.end
diff --git a/sound/songs/se_m_swagger.s b/sound/songs/se_m_swagger.s
new file mode 100644
index 000000000..9b4b5756b
--- /dev/null
+++ b/sound/songs/se_m_swagger.s
@@ -0,0 +1,77 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_swagger_grp, voicegroup128
+	.equ	se_m_swagger_pri, 4
+	.equ	se_m_swagger_rev, reverb_set+50
+	.equ	se_m_swagger_mvl, 127
+	.equ	se_m_swagger_key, 0
+	.equ	se_m_swagger_tbs, 1
+	.equ	se_m_swagger_exg, 0
+	.equ	se_m_swagger_cmp, 1
+
+	.section .rodata
+	.global	se_m_swagger
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_swagger_1:
+	.byte	KEYSH , se_m_swagger_key+0
+	.byte	TEMPO , 190*se_m_swagger_tbs/2
+	.byte		VOICE , 2
+	.byte		BENDR , 8
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 28*se_m_swagger_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N15   , An1 , v127
+	.byte	W01
+	.byte		VOL   , 60*se_m_swagger_mvl/mxv
+	.byte	W01
+	.byte		        111*se_m_swagger_mvl/mxv
+	.byte	W01
+	.byte		        120*se_m_swagger_mvl/mxv
+	.byte	W01
+	.byte		BEND  , c_v-3
+	.byte	W02
+	.byte		PAN   , c_v+5
+	.byte		BEND  , c_v-6
+	.byte	W01
+	.byte		PAN   , c_v-4
+	.byte		BEND  , c_v-8
+	.byte	W01
+	.byte		VOL   , 109*se_m_swagger_mvl/mxv
+	.byte		PAN   , c_v+9
+	.byte		BEND  , c_v-10
+	.byte	W01
+	.byte		PAN   , c_v-9
+	.byte		BEND  , c_v-14
+	.byte	W01
+	.byte		VOL   , 95*se_m_swagger_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v-19
+	.byte	W02
+	.byte		VOL   , 71*se_m_swagger_mvl/mxv
+	.byte		BEND  , c_v-29
+	.byte	W01
+	.byte		VOL   , 41*se_m_swagger_mvl/mxv
+	.byte		BEND  , c_v-38
+	.byte	W01
+	.byte		VOL   , 15*se_m_swagger_mvl/mxv
+	.byte		BEND  , c_v-52
+	.byte	W04
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_swagger:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_swagger_pri	@ Priority
+	.byte	se_m_swagger_rev	@ Reverb.
+
+	.word	se_m_swagger_grp
+
+	.word	se_m_swagger_1
+
+	.end
diff --git a/sound/songs/se_w207b.s b/sound/songs/se_m_swagger2.s
index 9d199e8d3..0a0d76767 100644
--- a/sound/songs/se_w207b.s
+++ b/sound/songs/se_m_swagger2.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w207b_grp, voicegroup128
-	.equ	se_w207b_pri, 4
-	.equ	se_w207b_rev, reverb_set+50
-	.equ	se_w207b_mvl, 127
-	.equ	se_w207b_key, 0
-	.equ	se_w207b_tbs, 1
-	.equ	se_w207b_exg, 0
-	.equ	se_w207b_cmp, 1
+	.equ	se_m_swagger2_grp, voicegroup128
+	.equ	se_m_swagger2_pri, 4
+	.equ	se_m_swagger2_rev, reverb_set+50
+	.equ	se_m_swagger2_mvl, 127
+	.equ	se_m_swagger2_key, 0
+	.equ	se_m_swagger2_tbs, 1
+	.equ	se_m_swagger2_exg, 0
+	.equ	se_m_swagger2_cmp, 1
 
 	.section .rodata
-	.global	se_w207b
+	.global	se_m_swagger2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w207b_1:
-	.byte	KEYSH , se_w207b_key+0
-	.byte	TEMPO , 150*se_w207b_tbs/2
+se_m_swagger2_1:
+	.byte	KEYSH , se_m_swagger2_key+0
+	.byte	TEMPO , 150*se_m_swagger2_tbs/2
 	.byte		VOICE , 56
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 65*se_w207b_mvl/mxv
+	.byte		VOL   , 65*se_m_swagger2_mvl/mxv
 	.byte		BEND  , c_v+8
 	.byte		N01   , Cs6 , v112
 	.byte	W01
@@ -43,14 +43,14 @@ se_w207b_1:
 @******************************************************@
 	.align	2
 
-se_w207b:
+se_m_swagger2:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w207b_pri	@ Priority
-	.byte	se_w207b_rev	@ Reverb.
+	.byte	se_m_swagger2_pri	@ Priority
+	.byte	se_m_swagger2_rev	@ Reverb.
 
-	.word	se_w207b_grp
+	.word	se_m_swagger2_grp
 
-	.word	se_w207b_1
+	.word	se_m_swagger2_1
 
 	.end
diff --git a/sound/songs/se_w230.s b/sound/songs/se_m_sweet_scent.s
index b446b3448..0abf858d2 100644
--- a/sound/songs/se_w230.s
+++ b/sound/songs/se_m_sweet_scent.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w230_grp, voicegroup128
-	.equ	se_w230_pri, 4
-	.equ	se_w230_rev, reverb_set+50
-	.equ	se_w230_mvl, 127
-	.equ	se_w230_key, 0
-	.equ	se_w230_tbs, 1
-	.equ	se_w230_exg, 0
-	.equ	se_w230_cmp, 1
+	.equ	se_m_sweet_scent_grp, voicegroup128
+	.equ	se_m_sweet_scent_pri, 4
+	.equ	se_m_sweet_scent_rev, reverb_set+50
+	.equ	se_m_sweet_scent_mvl, 127
+	.equ	se_m_sweet_scent_key, 0
+	.equ	se_m_sweet_scent_tbs, 1
+	.equ	se_m_sweet_scent_exg, 0
+	.equ	se_m_sweet_scent_cmp, 1
 
 	.section .rodata
-	.global	se_w230
+	.global	se_m_sweet_scent
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w230_1:
-	.byte	KEYSH , se_w230_key+0
-	.byte	TEMPO , 150*se_w230_tbs/2
+se_m_sweet_scent_1:
+	.byte	KEYSH , se_m_sweet_scent_key+0
+	.byte	TEMPO , 150*se_m_sweet_scent_tbs/2
 	.byte		VOICE , 61
 	.byte		BENDR , 44
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w230_mvl/mxv
+	.byte		VOL   , 110*se_m_sweet_scent_mvl/mxv
 	.byte		BEND  , c_v+2
 	.byte		N36   , En3 , v096
 	.byte	W12
@@ -61,67 +61,67 @@ se_w230_1:
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+12
 	.byte	W04
-	.byte		VOL   , 103*se_w230_mvl/mxv
+	.byte		VOL   , 103*se_m_sweet_scent_mvl/mxv
 	.byte	W04
-	.byte		        97*se_w230_mvl/mxv
+	.byte		        97*se_m_sweet_scent_mvl/mxv
 	.byte	W04
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+12
 	.byte	W01
-	.byte		VOL   , 91*se_w230_mvl/mxv
+	.byte		VOL   , 91*se_m_sweet_scent_mvl/mxv
 	.byte	W05
-	.byte		        81*se_w230_mvl/mxv
+	.byte		        81*se_m_sweet_scent_mvl/mxv
 	.byte	W03
-	.byte		        72*se_w230_mvl/mxv
+	.byte		        72*se_m_sweet_scent_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+13
 	.byte	W01
-	.byte		VOL   , 62*se_w230_mvl/mxv
+	.byte		VOL   , 62*se_m_sweet_scent_mvl/mxv
 	.byte	W02
-	.byte		        51*se_w230_mvl/mxv
+	.byte		        51*se_m_sweet_scent_mvl/mxv
 	.byte	W03
-	.byte		        39*se_w230_mvl/mxv
+	.byte		        39*se_m_sweet_scent_mvl/mxv
 	.byte	W02
-	.byte		        24*se_w230_mvl/mxv
+	.byte		        24*se_m_sweet_scent_mvl/mxv
 	.byte	W02
-	.byte		        12*se_w230_mvl/mxv
+	.byte		        12*se_m_sweet_scent_mvl/mxv
 	.byte	W02
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w230_2:
-	.byte	KEYSH , se_w230_key+0
+se_m_sweet_scent_2:
+	.byte	KEYSH , se_m_sweet_scent_key+0
 	.byte		VOICE , 22
 	.byte		BENDR , 44
 	.byte		PAN   , c_v+1
-	.byte		VOL   , 38*se_w230_mvl/mxv
+	.byte		VOL   , 38*se_m_sweet_scent_mvl/mxv
 	.byte		BEND  , c_v+1
 	.byte		TIE   , Gn3 , v100
 	.byte	W03
-	.byte		VOL   , 50*se_w230_mvl/mxv
+	.byte		VOL   , 50*se_m_sweet_scent_mvl/mxv
 	.byte	W04
-	.byte		        62*se_w230_mvl/mxv
+	.byte		        62*se_m_sweet_scent_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v-1
 	.byte	W01
-	.byte		VOL   , 65*se_w230_mvl/mxv
+	.byte		VOL   , 65*se_m_sweet_scent_mvl/mxv
 	.byte	W04
-	.byte		        74*se_w230_mvl/mxv
+	.byte		        74*se_m_sweet_scent_mvl/mxv
 	.byte	W04
-	.byte		        78*se_w230_mvl/mxv
+	.byte		        78*se_m_sweet_scent_mvl/mxv
 	.byte		BEND  , c_v-2
 	.byte	W03
-	.byte		VOL   , 86*se_w230_mvl/mxv
+	.byte		VOL   , 86*se_m_sweet_scent_mvl/mxv
 	.byte	W03
-	.byte		        95*se_w230_mvl/mxv
+	.byte		        95*se_m_sweet_scent_mvl/mxv
 	.byte	W03
-	.byte		        105*se_w230_mvl/mxv
+	.byte		        105*se_m_sweet_scent_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-4
 	.byte	W03
-	.byte		VOL   , 110*se_w230_mvl/mxv
+	.byte		VOL   , 110*se_m_sweet_scent_mvl/mxv
 	.byte	W13
 	.byte		BEND  , c_v-2
 	.byte	W04
@@ -140,37 +140,37 @@ se_w230_2:
 	.byte	W14
 	.byte		        c_v+3
 	.byte	W08
-	.byte		VOL   , 105*se_w230_mvl/mxv
+	.byte		VOL   , 105*se_m_sweet_scent_mvl/mxv
 	.byte	W03
-	.byte		        101*se_w230_mvl/mxv
+	.byte		        101*se_m_sweet_scent_mvl/mxv
 	.byte	W05
-	.byte		        96*se_w230_mvl/mxv
+	.byte		        96*se_m_sweet_scent_mvl/mxv
 	.byte	W04
 	.byte		BEND  , c_v+2
 	.byte	W01
-	.byte		VOL   , 91*se_w230_mvl/mxv
+	.byte		VOL   , 91*se_m_sweet_scent_mvl/mxv
 	.byte	W03
-	.byte		        86*se_w230_mvl/mxv
+	.byte		        86*se_m_sweet_scent_mvl/mxv
 	.byte	W05
-	.byte		        78*se_w230_mvl/mxv
+	.byte		        78*se_m_sweet_scent_mvl/mxv
 	.byte	W03
 	.byte	W02
-	.byte		        68*se_w230_mvl/mxv
+	.byte		        68*se_m_sweet_scent_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v+1
 	.byte	W04
-	.byte		VOL   , 58*se_w230_mvl/mxv
+	.byte		VOL   , 58*se_m_sweet_scent_mvl/mxv
 	.byte	W03
-	.byte		        48*se_w230_mvl/mxv
+	.byte		        48*se_m_sweet_scent_mvl/mxv
 	.byte	W04
-	.byte		        37*se_w230_mvl/mxv
+	.byte		        37*se_m_sweet_scent_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte	W04
-	.byte		VOL   , 23*se_w230_mvl/mxv
+	.byte		VOL   , 23*se_m_sweet_scent_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-1
 	.byte	W02
-	.byte		VOL   , 12*se_w230_mvl/mxv
+	.byte		VOL   , 12*se_m_sweet_scent_mvl/mxv
 	.byte	W03
 	.byte		EOT   
 	.byte	FINE
@@ -178,15 +178,15 @@ se_w230_2:
 @******************************************************@
 	.align	2
 
-se_w230:
+se_m_sweet_scent:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w230_pri	@ Priority
-	.byte	se_w230_rev	@ Reverb.
+	.byte	se_m_sweet_scent_pri	@ Priority
+	.byte	se_m_sweet_scent_rev	@ Reverb.
 
-	.word	se_w230_grp
+	.word	se_m_sweet_scent_grp
 
-	.word	se_w230_1
-	.word	se_w230_2
+	.word	se_m_sweet_scent_1
+	.word	se_m_sweet_scent_2
 
 	.end
diff --git a/sound/songs/se_w129.s b/sound/songs/se_m_swift.s
index 61b101462..10649a80e 100644
--- a/sound/songs/se_w129.s
+++ b/sound/songs/se_m_swift.s
@@ -1,45 +1,45 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w129_grp, voicegroup128
-	.equ	se_w129_pri, 4
-	.equ	se_w129_rev, reverb_set+50
-	.equ	se_w129_mvl, 127
-	.equ	se_w129_key, 0
-	.equ	se_w129_tbs, 1
-	.equ	se_w129_exg, 0
-	.equ	se_w129_cmp, 1
+	.equ	se_m_swift_grp, voicegroup128
+	.equ	se_m_swift_pri, 4
+	.equ	se_m_swift_rev, reverb_set+50
+	.equ	se_m_swift_mvl, 127
+	.equ	se_m_swift_key, 0
+	.equ	se_m_swift_tbs, 1
+	.equ	se_m_swift_exg, 0
+	.equ	se_m_swift_cmp, 1
 
 	.section .rodata
-	.global	se_w129
+	.global	se_m_swift
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w129_1:
-	.byte	KEYSH , se_w129_key+0
-	.byte	TEMPO , 180*se_w129_tbs/2
+se_m_swift_1:
+	.byte	KEYSH , se_m_swift_key+0
+	.byte	TEMPO , 180*se_m_swift_tbs/2
 	.byte		VOICE , 16
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 100*se_w129_mvl/mxv
+	.byte		VOL   , 100*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   , Ds6 , v100
 	.byte	W01
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 90*se_w129_mvl/mxv
+	.byte		VOL   , 90*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 77*se_w129_mvl/mxv
+	.byte		VOL   , 77*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-37
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 37*se_w129_mvl/mxv
+	.byte		VOL   , 37*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-47
 	.byte	W02
-	.byte		VOL   , 100*se_w129_mvl/mxv
+	.byte		VOL   , 100*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   
 	.byte	W01
@@ -47,18 +47,18 @@ se_w129_1:
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 90*se_w129_mvl/mxv
+	.byte		VOL   , 90*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W01
 	.byte		PAN   , c_v+8
-	.byte		VOL   , 77*se_w129_mvl/mxv
+	.byte		VOL   , 77*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-37
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		VOL   , 37*se_w129_mvl/mxv
+	.byte		VOL   , 37*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-47
 	.byte	W02
-	.byte		VOL   , 100*se_w129_mvl/mxv
+	.byte		VOL   , 100*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   , Ds6 , v056
 	.byte	W01
@@ -66,25 +66,25 @@ se_w129_1:
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 90*se_w129_mvl/mxv
+	.byte		VOL   , 90*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W01
 	.byte		PAN   , c_v+8
-	.byte		VOL   , 77*se_w129_mvl/mxv
+	.byte		VOL   , 77*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-37
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		VOL   , 37*se_w129_mvl/mxv
+	.byte		VOL   , 37*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-47
 	.byte	W02
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w129_2:
-	.byte	KEYSH , se_w129_key+0
+se_m_swift_2:
+	.byte	KEYSH , se_m_swift_key+0
 	.byte		VOICE , 53
-	.byte		VOL   , 100*se_w129_mvl/mxv
+	.byte		VOL   , 100*se_m_swift_mvl/mxv
 	.byte	W02
 	.byte		N06   , Cn6 , v040
 	.byte	W04
@@ -97,15 +97,15 @@ se_w129_2:
 @******************************************************@
 	.align	2
 
-se_w129:
+se_m_swift:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w129_pri	@ Priority
-	.byte	se_w129_rev	@ Reverb.
+	.byte	se_m_swift_pri	@ Priority
+	.byte	se_m_swift_rev	@ Reverb.
 
-	.word	se_w129_grp
+	.word	se_m_swift_grp
 
-	.word	se_w129_1
-	.word	se_w129_2
+	.word	se_m_swift_1
+	.word	se_m_swift_2
 
 	.end
diff --git a/sound/songs/se_w298.s b/sound/songs/se_m_teeter_dance.s
index d21e4b710..8238afeb2 100644
--- a/sound/songs/se_w298.s
+++ b/sound/songs/se_m_teeter_dance.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w298_grp, voicegroup128
-	.equ	se_w298_pri, 4
-	.equ	se_w298_rev, reverb_set+50
-	.equ	se_w298_mvl, 127
-	.equ	se_w298_key, 0
-	.equ	se_w298_tbs, 1
-	.equ	se_w298_exg, 0
-	.equ	se_w298_cmp, 1
+	.equ	se_m_teeter_dance_grp, voicegroup128
+	.equ	se_m_teeter_dance_pri, 4
+	.equ	se_m_teeter_dance_rev, reverb_set+50
+	.equ	se_m_teeter_dance_mvl, 127
+	.equ	se_m_teeter_dance_key, 0
+	.equ	se_m_teeter_dance_tbs, 1
+	.equ	se_m_teeter_dance_exg, 0
+	.equ	se_m_teeter_dance_cmp, 1
 
 	.section .rodata
-	.global	se_w298
+	.global	se_m_teeter_dance
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w298_1:
-	.byte	KEYSH , se_w298_key+0
-	.byte	TEMPO , 170*se_w298_tbs/2
+se_m_teeter_dance_1:
+	.byte	KEYSH , se_m_teeter_dance_key+0
+	.byte	TEMPO , 170*se_m_teeter_dance_tbs/2
 	.byte		VOICE , 37
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w298_mvl/mxv
+	.byte		VOL   , 110*se_m_teeter_dance_mvl/mxv
 	.byte		BEND  , c_v-4
 	.byte		N03   , Gn4 , v100
 	.byte	W06
@@ -66,13 +66,13 @@ se_w298_1:
 
 @********************** Track  2 **********************@
 
-se_w298_2:
-	.byte	KEYSH , se_w298_key+0
+se_m_teeter_dance_2:
+	.byte	KEYSH , se_m_teeter_dance_key+0
 	.byte		VOICE , 47
 	.byte		XCMD  , xIECV , 10
 	.byte		        xIECL , 8
 	.byte		MOD   , 20
-	.byte		VOL   , 44*se_w298_mvl/mxv
+	.byte		VOL   , 44*se_m_teeter_dance_mvl/mxv
 	.byte		BEND  , c_v-2
 	.byte	W03
 	.byte		N03   , Gn3 , v112
@@ -107,15 +107,15 @@ se_w298_2:
 @******************************************************@
 	.align	2
 
-se_w298:
+se_m_teeter_dance:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w298_pri	@ Priority
-	.byte	se_w298_rev	@ Reverb.
+	.byte	se_m_teeter_dance_pri	@ Priority
+	.byte	se_m_teeter_dance_rev	@ Reverb.
 
-	.word	se_w298_grp
+	.word	se_m_teeter_dance_grp
 
-	.word	se_w298_1
-	.word	se_w298_2
+	.word	se_m_teeter_dance_1
+	.word	se_m_teeter_dance_2
 
 	.end
diff --git a/sound/songs/se_w100.s b/sound/songs/se_m_teleport.s
index e2a43dbcc..2c4ad40e8 100644
--- a/sound/songs/se_w100.s
+++ b/sound/songs/se_m_teleport.s
@@ -1,58 +1,58 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w100_grp, voicegroup128
-	.equ	se_w100_pri, 4
-	.equ	se_w100_rev, reverb_set+50
-	.equ	se_w100_mvl, 127
-	.equ	se_w100_key, 0
-	.equ	se_w100_tbs, 1
-	.equ	se_w100_exg, 0
-	.equ	se_w100_cmp, 1
+	.equ	se_m_teleport_grp, voicegroup128
+	.equ	se_m_teleport_pri, 4
+	.equ	se_m_teleport_rev, reverb_set+50
+	.equ	se_m_teleport_mvl, 127
+	.equ	se_m_teleport_key, 0
+	.equ	se_m_teleport_tbs, 1
+	.equ	se_m_teleport_exg, 0
+	.equ	se_m_teleport_cmp, 1
 
 	.section .rodata
-	.global	se_w100
+	.global	se_m_teleport
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w100_1:
-	.byte	KEYSH , se_w100_key+0
-	.byte	TEMPO , 150*se_w100_tbs/2
+se_m_teleport_1:
+	.byte	KEYSH , se_m_teleport_key+0
+	.byte	TEMPO , 150*se_m_teleport_tbs/2
 	.byte		VOICE , 45
 	.byte		BENDR , 24
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 32*se_w100_mvl/mxv
+	.byte		VOL   , 32*se_m_teleport_mvl/mxv
 	.byte		MOD   , 30
 	.byte		BEND  , c_v+0
 	.byte		N06   , Cn3 , v127
 	.byte	W01
 	.byte		BEND  , c_v+4
 	.byte	W01
-	.byte		VOL   , 49*se_w100_mvl/mxv
+	.byte		VOL   , 49*se_m_teleport_mvl/mxv
 	.byte		PAN   , c_v+5
 	.byte		BEND  , c_v+9
 	.byte	W01
 	.byte		        c_v+16
 	.byte	W01
-	.byte		VOL   , 61*se_w100_mvl/mxv
+	.byte		VOL   , 61*se_m_teleport_mvl/mxv
 	.byte		BEND  , c_v+24
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+2
 	.byte		N06   , Dn3 , v116
 	.byte	W01
-	.byte		VOL   , 71*se_w100_mvl/mxv
+	.byte		VOL   , 71*se_m_teleport_mvl/mxv
 	.byte		BEND  , c_v+7
 	.byte	W01
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+12
 	.byte	W01
-	.byte		VOL   , 81*se_w100_mvl/mxv
+	.byte		VOL   , 81*se_m_teleport_mvl/mxv
 	.byte		BEND  , c_v+18
 	.byte	W01
 	.byte		        c_v+27
 	.byte	W02
-	.byte		VOL   , 95*se_w100_mvl/mxv
+	.byte		VOL   , 95*se_m_teleport_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+4
 	.byte		N06   , En3 , v112
@@ -92,20 +92,20 @@ se_w100_1:
 	.byte	W01
 	.byte		        c_v+34
 	.byte	W02
-	.byte		VOL   , 82*se_w100_mvl/mxv
+	.byte		VOL   , 82*se_m_teleport_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+14
 	.byte		N06   , An3 , v100
 	.byte	W01
 	.byte		BEND  , c_v+18
 	.byte	W01
-	.byte		VOL   , 71*se_w100_mvl/mxv
+	.byte		VOL   , 71*se_m_teleport_mvl/mxv
 	.byte		PAN   , c_v-8
 	.byte		BEND  , c_v+23
 	.byte	W01
 	.byte		        c_v+30
 	.byte	W01
-	.byte		VOL   , 61*se_w100_mvl/mxv
+	.byte		VOL   , 61*se_m_teleport_mvl/mxv
 	.byte		BEND  , c_v+38
 	.byte	W02
 	.byte		PAN   , c_v+0
@@ -152,14 +152,14 @@ se_w100_1:
 @******************************************************@
 	.align	2
 
-se_w100:
+se_m_teleport:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w100_pri	@ Priority
-	.byte	se_w100_rev	@ Reverb.
+	.byte	se_m_teleport_pri	@ Priority
+	.byte	se_m_teleport_rev	@ Reverb.
 
-	.word	se_w100_grp
+	.word	se_m_teleport_grp
 
-	.word	se_w100_1
+	.word	se_m_teleport_1
 
 	.end
diff --git a/sound/songs/se_w086.s b/sound/songs/se_m_thunder_wave.s
index 37bf21db0..c26535500 100644
--- a/sound/songs/se_w086.s
+++ b/sound/songs/se_m_thunder_wave.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w086_grp, voicegroup128
-	.equ	se_w086_pri, 4
-	.equ	se_w086_rev, reverb_set+50
-	.equ	se_w086_mvl, 127
-	.equ	se_w086_key, 0
-	.equ	se_w086_tbs, 1
-	.equ	se_w086_exg, 0
-	.equ	se_w086_cmp, 1
+	.equ	se_m_thunder_wave_grp, voicegroup128
+	.equ	se_m_thunder_wave_pri, 4
+	.equ	se_m_thunder_wave_rev, reverb_set+50
+	.equ	se_m_thunder_wave_mvl, 127
+	.equ	se_m_thunder_wave_key, 0
+	.equ	se_m_thunder_wave_tbs, 1
+	.equ	se_m_thunder_wave_exg, 0
+	.equ	se_m_thunder_wave_cmp, 1
 
 	.section .rodata
-	.global	se_w086
+	.global	se_m_thunder_wave
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w086_1:
-	.byte	KEYSH , se_w086_key+0
-	.byte	TEMPO , 150*se_w086_tbs/2
+se_m_thunder_wave_1:
+	.byte	KEYSH , se_m_thunder_wave_key+0
+	.byte	TEMPO , 150*se_m_thunder_wave_tbs/2
 	.byte		VOICE , 18
-	.byte		VOL   , 110*se_w086_mvl/mxv
+	.byte		VOL   , 110*se_m_thunder_wave_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+32
@@ -45,21 +45,21 @@ se_w086_1:
 	.byte	W02
 	.byte		N13   , Gn3 
 	.byte	W02
-	.byte		VOL   , 96*se_w086_mvl/mxv
+	.byte		VOL   , 96*se_m_thunder_wave_mvl/mxv
 	.byte	W01
-	.byte		        85*se_w086_mvl/mxv
+	.byte		        85*se_m_thunder_wave_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-23
 	.byte	W01
-	.byte		VOL   , 66*se_w086_mvl/mxv
+	.byte		VOL   , 66*se_m_thunder_wave_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-40
 	.byte	W01
-	.byte		VOL   , 36*se_w086_mvl/mxv
+	.byte		VOL   , 36*se_m_thunder_wave_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-54
 	.byte	W02
-	.byte		VOL   , 12*se_w086_mvl/mxv
+	.byte		VOL   , 12*se_m_thunder_wave_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-64
 	.byte	W21
@@ -67,10 +67,10 @@ se_w086_1:
 
 @********************** Track  2 **********************@
 
-se_w086_2:
-	.byte	KEYSH , se_w086_key+0
+se_m_thunder_wave_2:
+	.byte	KEYSH , se_m_thunder_wave_key+0
 	.byte		VOICE , 5
-	.byte		VOL   , 110*se_w086_mvl/mxv
+	.byte		VOL   , 110*se_m_thunder_wave_mvl/mxv
 	.byte		PAN   , c_v-7
 	.byte		N02   , En3 , v052
 	.byte	W04
@@ -92,15 +92,15 @@ se_w086_2:
 @******************************************************@
 	.align	2
 
-se_w086:
+se_m_thunder_wave:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w086_pri	@ Priority
-	.byte	se_w086_rev	@ Reverb.
+	.byte	se_m_thunder_wave_pri	@ Priority
+	.byte	se_m_thunder_wave_rev	@ Reverb.
 
-	.word	se_w086_grp
+	.word	se_m_thunder_wave_grp
 
-	.word	se_w086_1
-	.word	se_w086_2
+	.word	se_m_thunder_wave_1
+	.word	se_m_thunder_wave_2
 
 	.end
diff --git a/sound/songs/se_w085.s b/sound/songs/se_m_thunderbolt.s
index 21e8fc6df..3b3790313 100644
--- a/sound/songs/se_w085.s
+++ b/sound/songs/se_m_thunderbolt.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w085_grp, voicegroup128
-	.equ	se_w085_pri, 4
-	.equ	se_w085_rev, reverb_set+50
-	.equ	se_w085_mvl, 127
-	.equ	se_w085_key, 0
-	.equ	se_w085_tbs, 1
-	.equ	se_w085_exg, 0
-	.equ	se_w085_cmp, 1
+	.equ	se_m_thunderbolt_grp, voicegroup128
+	.equ	se_m_thunderbolt_pri, 4
+	.equ	se_m_thunderbolt_rev, reverb_set+50
+	.equ	se_m_thunderbolt_mvl, 127
+	.equ	se_m_thunderbolt_key, 0
+	.equ	se_m_thunderbolt_tbs, 1
+	.equ	se_m_thunderbolt_exg, 0
+	.equ	se_m_thunderbolt_cmp, 1
 
 	.section .rodata
-	.global	se_w085
+	.global	se_m_thunderbolt
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w085_1:
-	.byte	KEYSH , se_w085_key+0
-	.byte	TEMPO , 220*se_w085_tbs/2
+se_m_thunderbolt_1:
+	.byte	KEYSH , se_m_thunderbolt_key+0
+	.byte	TEMPO , 220*se_m_thunderbolt_tbs/2
 	.byte		VOICE , 18
-	.byte		VOL   , 120*se_w085_mvl/mxv
+	.byte		VOL   , 120*se_m_thunderbolt_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+32
@@ -55,23 +55,23 @@ se_w085_1:
 	.byte	W01
 	.byte		BEND  , c_v-23
 	.byte	W02
-	.byte		VOL   , 100*se_w085_mvl/mxv
+	.byte		VOL   , 100*se_m_thunderbolt_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-40
 	.byte	W01
-	.byte		VOL   , 86*se_w085_mvl/mxv
+	.byte		VOL   , 86*se_m_thunderbolt_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-54
 	.byte	W01
 	.byte		PAN   , c_v+10
-	.byte		VOL   , 68*se_w085_mvl/mxv
+	.byte		VOL   , 68*se_m_thunderbolt_mvl/mxv
 	.byte	W02
-	.byte		        37*se_w085_mvl/mxv
+	.byte		        37*se_m_thunderbolt_mvl/mxv
 	.byte		BEND  , c_v-64
 	.byte	W01
 	.byte		PAN   , c_v+16
 	.byte	W02
-	.byte		VOL   , 17*se_w085_mvl/mxv
+	.byte		VOL   , 17*se_m_thunderbolt_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+10
 	.byte	W15
@@ -79,10 +79,10 @@ se_w085_1:
 
 @********************** Track  2 **********************@
 
-se_w085_2:
-	.byte	KEYSH , se_w085_key+0
+se_m_thunderbolt_2:
+	.byte	KEYSH , se_m_thunderbolt_key+0
 	.byte		VOICE , 5
-	.byte		VOL   , 120*se_w085_mvl/mxv
+	.byte		VOL   , 120*se_m_thunderbolt_mvl/mxv
 	.byte		PAN   , c_v-7
 	.byte		N02   , En3 , v048
 	.byte	W05
@@ -103,15 +103,15 @@ se_w085_2:
 @******************************************************@
 	.align	2
 
-se_w085:
+se_m_thunderbolt:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w085_pri	@ Priority
-	.byte	se_w085_rev	@ Reverb.
+	.byte	se_m_thunderbolt_pri	@ Priority
+	.byte	se_m_thunderbolt_rev	@ Reverb.
 
-	.word	se_w085_grp
+	.word	se_m_thunderbolt_grp
 
-	.word	se_w085_1
-	.word	se_w085_2
+	.word	se_m_thunderbolt_1
+	.word	se_m_thunderbolt_2
 
 	.end
diff --git a/sound/songs/se_w085b.s b/sound/songs/se_m_thunderbolt2.s
index b42007094..506820395 100644
--- a/sound/songs/se_w085b.s
+++ b/sound/songs/se_m_thunderbolt2.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w085b_grp, voicegroup128
-	.equ	se_w085b_pri, 4
-	.equ	se_w085b_rev, reverb_set+50
-	.equ	se_w085b_mvl, 127
-	.equ	se_w085b_key, 0
-	.equ	se_w085b_tbs, 1
-	.equ	se_w085b_exg, 0
-	.equ	se_w085b_cmp, 1
+	.equ	se_m_thunderbolt2_grp, voicegroup128
+	.equ	se_m_thunderbolt2_pri, 4
+	.equ	se_m_thunderbolt2_rev, reverb_set+50
+	.equ	se_m_thunderbolt2_mvl, 127
+	.equ	se_m_thunderbolt2_key, 0
+	.equ	se_m_thunderbolt2_tbs, 1
+	.equ	se_m_thunderbolt2_exg, 0
+	.equ	se_m_thunderbolt2_cmp, 1
 
 	.section .rodata
-	.global	se_w085b
+	.global	se_m_thunderbolt2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w085b_1:
-	.byte	KEYSH , se_w085b_key+0
-	.byte	TEMPO , 220*se_w085b_tbs/2
+se_m_thunderbolt2_1:
+	.byte	KEYSH , se_m_thunderbolt2_key+0
+	.byte	TEMPO , 220*se_m_thunderbolt2_tbs/2
 	.byte		VOICE , 18
-	.byte		VOL   , 100*se_w085b_mvl/mxv
+	.byte		VOL   , 100*se_m_thunderbolt2_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -44,10 +44,10 @@ se_w085b_1:
 
 @********************** Track  2 **********************@
 
-se_w085b_2:
-	.byte	KEYSH , se_w085b_key+0
+se_m_thunderbolt2_2:
+	.byte	KEYSH , se_m_thunderbolt2_key+0
 	.byte		VOICE , 5
-	.byte		VOL   , 100*se_w085b_mvl/mxv
+	.byte		VOL   , 100*se_m_thunderbolt2_mvl/mxv
 	.byte		PAN   , c_v+9
 	.byte		N02   , Gn3 , v072
 	.byte	W06
@@ -71,15 +71,15 @@ se_w085b_2:
 @******************************************************@
 	.align	2
 
-se_w085b:
+se_m_thunderbolt2:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w085b_pri	@ Priority
-	.byte	se_w085b_rev	@ Reverb.
+	.byte	se_m_thunderbolt2_pri	@ Priority
+	.byte	se_m_thunderbolt2_rev	@ Reverb.
 
-	.word	se_w085b_grp
+	.word	se_m_thunderbolt2_grp
 
-	.word	se_w085b_1
-	.word	se_w085b_2
+	.word	se_m_thunderbolt2_1
+	.word	se_m_thunderbolt2_2
 
 	.end
diff --git a/sound/songs/se_w092.s b/sound/songs/se_m_toxic.s
index b82665340..0e3ebe220 100644
--- a/sound/songs/se_w092.s
+++ b/sound/songs/se_m_toxic.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w092_grp, voicegroup128
-	.equ	se_w092_pri, 4
-	.equ	se_w092_rev, reverb_set+50
-	.equ	se_w092_mvl, 127
-	.equ	se_w092_key, 0
-	.equ	se_w092_tbs, 1
-	.equ	se_w092_exg, 0
-	.equ	se_w092_cmp, 1
+	.equ	se_m_toxic_grp, voicegroup128
+	.equ	se_m_toxic_pri, 4
+	.equ	se_m_toxic_rev, reverb_set+50
+	.equ	se_m_toxic_mvl, 127
+	.equ	se_m_toxic_key, 0
+	.equ	se_m_toxic_tbs, 1
+	.equ	se_m_toxic_exg, 0
+	.equ	se_m_toxic_cmp, 1
 
 	.section .rodata
-	.global	se_w092
+	.global	se_m_toxic
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w092_1:
-	.byte	KEYSH , se_w092_key+0
-	.byte	TEMPO , 150*se_w092_tbs/2
+se_m_toxic_1:
+	.byte	KEYSH , se_m_toxic_key+0
+	.byte	TEMPO , 150*se_m_toxic_tbs/2
 	.byte		VOICE , 31
-	.byte		VOL   , 110*se_w092_mvl/mxv
+	.byte		VOL   , 110*se_m_toxic_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -74,14 +74,14 @@ se_w092_1:
 @******************************************************@
 	.align	2
 
-se_w092:
+se_m_toxic:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w092_pri	@ Priority
-	.byte	se_w092_rev	@ Reverb.
+	.byte	se_m_toxic_pri	@ Priority
+	.byte	se_m_toxic_rev	@ Reverb.
 
-	.word	se_w092_grp
+	.word	se_m_toxic_grp
 
-	.word	se_w092_1
+	.word	se_m_toxic_1
 
 	.end
diff --git a/sound/songs/se_w161.s b/sound/songs/se_m_tri_attack.s
index 8b378b121..448998e77 100644
--- a/sound/songs/se_w161.s
+++ b/sound/songs/se_m_tri_attack.s
@@ -1,40 +1,40 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w161_grp, voicegroup128
-	.equ	se_w161_pri, 4
-	.equ	se_w161_rev, reverb_set+50
-	.equ	se_w161_mvl, 127
-	.equ	se_w161_key, 0
-	.equ	se_w161_tbs, 1
-	.equ	se_w161_exg, 0
-	.equ	se_w161_cmp, 1
+	.equ	se_m_tri_attack_grp, voicegroup128
+	.equ	se_m_tri_attack_pri, 4
+	.equ	se_m_tri_attack_rev, reverb_set+50
+	.equ	se_m_tri_attack_mvl, 127
+	.equ	se_m_tri_attack_key, 0
+	.equ	se_m_tri_attack_tbs, 1
+	.equ	se_m_tri_attack_exg, 0
+	.equ	se_m_tri_attack_cmp, 1
 
 	.section .rodata
-	.global	se_w161
+	.global	se_m_tri_attack
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w161_1:
-	.byte	KEYSH , se_w161_key+0
-	.byte	TEMPO , 220*se_w161_tbs/2
+se_m_tri_attack_1:
+	.byte	KEYSH , se_m_tri_attack_key+0
+	.byte	TEMPO , 220*se_m_tri_attack_tbs/2
 	.byte		VOICE , 58
 	.byte		BENDR , 24
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 19*se_w161_mvl/mxv
+	.byte		VOL   , 19*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v-32
 	.byte		N16   , Gn1 , v127
 	.byte	W01
-	.byte		VOL   , 43*se_w161_mvl/mxv
+	.byte		VOL   , 43*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W01
-	.byte		VOL   , 72*se_w161_mvl/mxv
+	.byte		VOL   , 72*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v-8
 	.byte	W01
-	.byte		VOL   , 92*se_w161_mvl/mxv
+	.byte		VOL   , 92*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v+7
 	.byte	W01
-	.byte		VOL   , 109*se_w161_mvl/mxv
+	.byte		VOL   , 109*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v+19
 	.byte	W02
 	.byte		        c_v+28
@@ -43,29 +43,29 @@ se_w161_1:
 	.byte	W01
 	.byte		        c_v+28
 	.byte	W01
-	.byte		VOL   , 102*se_w161_mvl/mxv
+	.byte		VOL   , 102*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v+19
 	.byte	W01
-	.byte		VOL   , 88*se_w161_mvl/mxv
+	.byte		VOL   , 88*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v+5
 	.byte	W02
-	.byte		VOL   , 69*se_w161_mvl/mxv
+	.byte		VOL   , 69*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v-9
 	.byte	W01
-	.byte		VOL   , 37*se_w161_mvl/mxv
+	.byte		VOL   , 37*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W01
-	.byte		VOL   , 17*se_w161_mvl/mxv
+	.byte		VOL   , 17*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v-34
 	.byte	W10
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w161_2:
-	.byte	KEYSH , se_w161_key+0
+se_m_tri_attack_2:
+	.byte	KEYSH , se_m_tri_attack_key+0
 	.byte		VOICE , 4
-	.byte		VOL   , 110*se_w161_mvl/mxv
+	.byte		VOL   , 110*se_m_tri_attack_mvl/mxv
 	.byte		N02   , Gs3 , v032
 	.byte	W02
 	.byte		        Gn3 
@@ -85,15 +85,15 @@ se_w161_2:
 @******************************************************@
 	.align	2
 
-se_w161:
+se_m_tri_attack:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w161_pri	@ Priority
-	.byte	se_w161_rev	@ Reverb.
+	.byte	se_m_tri_attack_pri	@ Priority
+	.byte	se_m_tri_attack_rev	@ Reverb.
 
-	.word	se_w161_grp
+	.word	se_m_tri_attack_grp
 
-	.word	se_w161_1
-	.word	se_w161_2
+	.word	se_m_tri_attack_1
+	.word	se_m_tri_attack_2
 
 	.end
diff --git a/sound/songs/se_w161b.s b/sound/songs/se_m_tri_attack2.s
index 87c27eb7e..0afade13c 100644
--- a/sound/songs/se_w161b.s
+++ b/sound/songs/se_m_tri_attack2.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w161b_grp, voicegroup128
-	.equ	se_w161b_pri, 4
-	.equ	se_w161b_rev, reverb_set+50
-	.equ	se_w161b_mvl, 127
-	.equ	se_w161b_key, 0
-	.equ	se_w161b_tbs, 1
-	.equ	se_w161b_exg, 0
-	.equ	se_w161b_cmp, 1
+	.equ	se_m_tri_attack2_grp, voicegroup128
+	.equ	se_m_tri_attack2_pri, 4
+	.equ	se_m_tri_attack2_rev, reverb_set+50
+	.equ	se_m_tri_attack2_mvl, 127
+	.equ	se_m_tri_attack2_key, 0
+	.equ	se_m_tri_attack2_tbs, 1
+	.equ	se_m_tri_attack2_exg, 0
+	.equ	se_m_tri_attack2_cmp, 1
 
 	.section .rodata
-	.global	se_w161b
+	.global	se_m_tri_attack2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w161b_1:
-	.byte	KEYSH , se_w161b_key+0
-	.byte	TEMPO , 220*se_w161b_tbs/2
+se_m_tri_attack2_1:
+	.byte	KEYSH , se_m_tri_attack2_key+0
+	.byte	TEMPO , 220*se_m_tri_attack2_tbs/2
 	.byte		VOICE , 18
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w161b_mvl/mxv
+	.byte		VOL   , 110*se_m_tri_attack2_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N09   , An3 , v127
 	.byte	W03
@@ -65,28 +65,28 @@ se_w161b_1:
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-22
 	.byte	W06
-	.byte		VOL   , 103*se_w161b_mvl/mxv
+	.byte		VOL   , 103*se_m_tri_attack2_mvl/mxv
 	.byte		PAN   , c_v+10
 	.byte	W03
 	.byte		BEND  , c_v-32
 	.byte	W03
 	.byte		PAN   , c_v+0
 	.byte	W03
-	.byte		VOL   , 95*se_w161b_mvl/mxv
+	.byte		VOL   , 95*se_m_tri_attack2_mvl/mxv
 	.byte		BEND  , c_v-38
 	.byte	W03
 	.byte		PAN   , c_v-9
 	.byte	W05
 	.byte		BEND  , c_v-45
 	.byte	W01
-	.byte		VOL   , 66*se_w161b_mvl/mxv
+	.byte		VOL   , 66*se_m_tri_attack2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W05
 	.byte		        c_v+10
 	.byte	W01
 	.byte		BEND  , c_v-52
 	.byte	W03
-	.byte		VOL   , 21*se_w161b_mvl/mxv
+	.byte		VOL   , 21*se_m_tri_attack2_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte	W04
@@ -94,10 +94,10 @@ se_w161b_1:
 
 @********************** Track  2 **********************@
 
-se_w161b_2:
-	.byte	KEYSH , se_w161b_key+0
+se_m_tri_attack2_2:
+	.byte	KEYSH , se_m_tri_attack2_key+0
 	.byte		VOICE , 4
-	.byte		VOL   , 110*se_w161b_mvl/mxv
+	.byte		VOL   , 110*se_m_tri_attack2_mvl/mxv
 	.byte		N06   , Cn3 , v060
 	.byte	W09
 	.byte		N15   
@@ -110,15 +110,15 @@ se_w161b_2:
 @******************************************************@
 	.align	2
 
-se_w161b:
+se_m_tri_attack2:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w161b_pri	@ Priority
-	.byte	se_w161b_rev	@ Reverb.
+	.byte	se_m_tri_attack2_pri	@ Priority
+	.byte	se_m_tri_attack2_rev	@ Reverb.
 
-	.word	se_w161b_grp
+	.word	se_m_tri_attack2_grp
 
-	.word	se_w161b_1
-	.word	se_w161b_2
+	.word	se_m_tri_attack2_1
+	.word	se_m_tri_attack2_2
 
 	.end
diff --git a/sound/songs/se_w239.s b/sound/songs/se_m_twister.s
index fc18c1d5c..e95e9b322 100644
--- a/sound/songs/se_w239.s
+++ b/sound/songs/se_m_twister.s
@@ -1,44 +1,44 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w239_grp, voicegroup128
-	.equ	se_w239_pri, 4
-	.equ	se_w239_rev, reverb_set+50
-	.equ	se_w239_mvl, 127
-	.equ	se_w239_key, 0
-	.equ	se_w239_tbs, 1
-	.equ	se_w239_exg, 0
-	.equ	se_w239_cmp, 1
+	.equ	se_m_twister_grp, voicegroup128
+	.equ	se_m_twister_pri, 4
+	.equ	se_m_twister_rev, reverb_set+50
+	.equ	se_m_twister_mvl, 127
+	.equ	se_m_twister_key, 0
+	.equ	se_m_twister_tbs, 1
+	.equ	se_m_twister_exg, 0
+	.equ	se_m_twister_cmp, 1
 
 	.section .rodata
-	.global	se_w239
+	.global	se_m_twister
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w239_1:
-	.byte	KEYSH , se_w239_key+0
-	.byte	TEMPO , 150*se_w239_tbs/2
+se_m_twister_1:
+	.byte	KEYSH , se_m_twister_key+0
+	.byte	TEMPO , 150*se_m_twister_tbs/2
 	.byte		VOICE , 22
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 67*se_w239_mvl/mxv
+	.byte		VOL   , 67*se_m_twister_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		TIE   , Dn2 , v127
 	.byte	W03
-	.byte		VOL   , 83*se_w239_mvl/mxv
+	.byte		VOL   , 83*se_m_twister_mvl/mxv
 	.byte		BEND  , c_v+22
 	.byte	W03
-	.byte		VOL   , 88*se_w239_mvl/mxv
+	.byte		VOL   , 88*se_m_twister_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte	W03
-	.byte		VOL   , 95*se_w239_mvl/mxv
+	.byte		VOL   , 95*se_m_twister_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v+8
 	.byte	W01
-	.byte		VOL   , 105*se_w239_mvl/mxv
+	.byte		VOL   , 105*se_m_twister_mvl/mxv
 	.byte		PAN   , c_v-8
 	.byte	W03
-	.byte		VOL   , 115*se_w239_mvl/mxv
+	.byte		VOL   , 115*se_m_twister_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v+0
 	.byte	W01
@@ -101,7 +101,7 @@ se_w239_1:
 	.byte		PAN   , c_v-8
 	.byte	W03
 	.byte		        c_v-11
-	.byte		VOL   , 103*se_w239_mvl/mxv
+	.byte		VOL   , 103*se_m_twister_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-17
 	.byte	W01
@@ -109,41 +109,41 @@ se_w239_1:
 	.byte	W05
 	.byte		PAN   , c_v-9
 	.byte	W01
-	.byte		VOL   , 97*se_w239_mvl/mxv
+	.byte		VOL   , 97*se_m_twister_mvl/mxv
 	.byte	W05
 	.byte		PAN   , c_v-3
 	.byte	W01
 	.byte		BEND  , c_v+12
 	.byte	W02
 	.byte		PAN   , c_v+6
-	.byte		VOL   , 88*se_w239_mvl/mxv
+	.byte		VOL   , 88*se_m_twister_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v+10
 	.byte	W02
 	.byte		BEND  , c_v+7
 	.byte	W02
-	.byte		VOL   , 79*se_w239_mvl/mxv
+	.byte		VOL   , 79*se_m_twister_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+16
 	.byte	W04
-	.byte		VOL   , 62*se_w239_mvl/mxv
+	.byte		VOL   , 62*se_m_twister_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte	W02
 	.byte		PAN   , c_v+13
 	.byte	W04
-	.byte		VOL   , 45*se_w239_mvl/mxv
+	.byte		VOL   , 45*se_m_twister_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+8
 	.byte	W01
 	.byte		BEND  , c_v-7
 	.byte	W01
-	.byte		VOL   , 33*se_w239_mvl/mxv
+	.byte		VOL   , 33*se_m_twister_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte	W03
 	.byte		        c_v-8
 	.byte	W01
-	.byte		VOL   , 18*se_w239_mvl/mxv
+	.byte		VOL   , 18*se_m_twister_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-11
 	.byte	W03
@@ -152,43 +152,43 @@ se_w239_1:
 
 @********************** Track  2 **********************@
 
-se_w239_2:
-	.byte	KEYSH , se_w239_key+0
+se_m_twister_2:
+	.byte	KEYSH , se_m_twister_key+0
 	.byte		VOICE , 25
-	.byte		VOL   , 67*se_w239_mvl/mxv
+	.byte		VOL   , 67*se_m_twister_mvl/mxv
 	.byte		TIE   , Gs4 , v012
 	.byte	W03
-	.byte		VOL   , 83*se_w239_mvl/mxv
+	.byte		VOL   , 83*se_m_twister_mvl/mxv
 	.byte	W03
-	.byte		        88*se_w239_mvl/mxv
+	.byte		        88*se_m_twister_mvl/mxv
 	.byte	W03
-	.byte		        95*se_w239_mvl/mxv
+	.byte		        95*se_m_twister_mvl/mxv
 	.byte	W03
-	.byte		        105*se_w239_mvl/mxv
+	.byte		        105*se_m_twister_mvl/mxv
 	.byte	W03
-	.byte		        115*se_w239_mvl/mxv
+	.byte		        115*se_m_twister_mvl/mxv
 	.byte	W09
 	.byte	W24
 	.byte	W24
 	.byte	W24
 	.byte	W21
-	.byte		        103*se_w239_mvl/mxv
+	.byte		        103*se_m_twister_mvl/mxv
 	.byte	W03
 	.byte	W07
-	.byte		        97*se_w239_mvl/mxv
+	.byte		        97*se_m_twister_mvl/mxv
 	.byte	W08
-	.byte		        88*se_w239_mvl/mxv
+	.byte		        88*se_m_twister_mvl/mxv
 	.byte	W07
-	.byte		        79*se_w239_mvl/mxv
+	.byte		        79*se_m_twister_mvl/mxv
 	.byte	W02
 	.byte	W04
-	.byte		        62*se_w239_mvl/mxv
+	.byte		        62*se_m_twister_mvl/mxv
 	.byte	W06
-	.byte		        45*se_w239_mvl/mxv
+	.byte		        45*se_m_twister_mvl/mxv
 	.byte	W04
-	.byte		        33*se_w239_mvl/mxv
+	.byte		        33*se_m_twister_mvl/mxv
 	.byte	W05
-	.byte		        18*se_w239_mvl/mxv
+	.byte		        18*se_m_twister_mvl/mxv
 	.byte	W05
 	.byte		EOT   
 	.byte	FINE
@@ -196,15 +196,15 @@ se_w239_2:
 @******************************************************@
 	.align	2
 
-se_w239:
+se_m_twister:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w239_pri	@ Priority
-	.byte	se_w239_rev	@ Reverb.
+	.byte	se_m_twister_pri	@ Priority
+	.byte	se_m_twister_rev	@ Reverb.
 
-	.word	se_w239_grp
+	.word	se_m_twister_grp
 
-	.word	se_w239_1
-	.word	se_w239_2
+	.word	se_m_twister_1
+	.word	se_m_twister_2
 
 	.end
diff --git a/sound/songs/se_w253.s b/sound/songs/se_m_uproar.s
index e33de4550..c60cccee4 100644
--- a/sound/songs/se_w253.s
+++ b/sound/songs/se_m_uproar.s
@@ -1,41 +1,41 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w253_grp, voicegroup128
-	.equ	se_w253_pri, 4
-	.equ	se_w253_rev, reverb_set+50
-	.equ	se_w253_mvl, 127
-	.equ	se_w253_key, 0
-	.equ	se_w253_tbs, 1
-	.equ	se_w253_exg, 0
-	.equ	se_w253_cmp, 1
+	.equ	se_m_uproar_grp, voicegroup128
+	.equ	se_m_uproar_pri, 4
+	.equ	se_m_uproar_rev, reverb_set+50
+	.equ	se_m_uproar_mvl, 127
+	.equ	se_m_uproar_key, 0
+	.equ	se_m_uproar_tbs, 1
+	.equ	se_m_uproar_exg, 0
+	.equ	se_m_uproar_cmp, 1
 
 	.section .rodata
-	.global	se_w253
+	.global	se_m_uproar
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w253_1:
-	.byte	KEYSH , se_w253_key+0
-	.byte	TEMPO , 150*se_w253_tbs/2
+se_m_uproar_1:
+	.byte	KEYSH , se_m_uproar_key+0
+	.byte	TEMPO , 150*se_m_uproar_tbs/2
 	.byte		VOICE , 60
 	.byte		BENDR , 12
-	.byte		VOL   , 25*se_w253_mvl/mxv
+	.byte		VOL   , 25*se_m_uproar_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte		N24   , Gs2 , v127
 	.byte	W01
 	.byte		PAN   , c_v+2
-	.byte		VOL   , 51*se_w253_mvl/mxv
+	.byte		VOL   , 51*se_m_uproar_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 74*se_w253_mvl/mxv
+	.byte		VOL   , 74*se_m_uproar_mvl/mxv
 	.byte	W01
-	.byte		        89*se_w253_mvl/mxv
+	.byte		        89*se_m_uproar_mvl/mxv
 	.byte		BEND  , c_v+1
 	.byte	W01
 	.byte		PAN   , c_v+2
-	.byte		VOL   , 100*se_w253_mvl/mxv
+	.byte		VOL   , 100*se_m_uproar_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte	W01
@@ -57,30 +57,30 @@ se_w253_1:
 	.byte	W02
 	.byte		        c_v+0
 	.byte	W01
-	.byte		VOL   , 85*se_w253_mvl/mxv
+	.byte		VOL   , 85*se_m_uproar_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W01
 	.byte		        c_v-4
-	.byte		VOL   , 62*se_w253_mvl/mxv
+	.byte		VOL   , 62*se_m_uproar_mvl/mxv
 	.byte	W01
-	.byte		        33*se_w253_mvl/mxv
+	.byte		        33*se_m_uproar_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v-2
-	.byte		VOL   , 11*se_w253_mvl/mxv
+	.byte		VOL   , 11*se_m_uproar_mvl/mxv
 	.byte	W02
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w253:
+se_m_uproar:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w253_pri	@ Priority
-	.byte	se_w253_rev	@ Reverb.
+	.byte	se_m_uproar_pri	@ Priority
+	.byte	se_m_uproar_rev	@ Reverb.
 
-	.word	se_w253_grp
+	.word	se_m_uproar_grp
 
-	.word	se_w253_1
+	.word	se_m_uproar_1
 
 	.end
diff --git a/sound/songs/se_m_vital_throw.s b/sound/songs/se_m_vital_throw.s
new file mode 100644
index 000000000..c89d003b6
--- /dev/null
+++ b/sound/songs/se_m_vital_throw.s
@@ -0,0 +1,75 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_vital_throw_grp, voicegroup128
+	.equ	se_m_vital_throw_pri, 4
+	.equ	se_m_vital_throw_rev, reverb_set+50
+	.equ	se_m_vital_throw_mvl, 127
+	.equ	se_m_vital_throw_key, 0
+	.equ	se_m_vital_throw_tbs, 1
+	.equ	se_m_vital_throw_exg, 0
+	.equ	se_m_vital_throw_cmp, 1
+
+	.section .rodata
+	.global	se_m_vital_throw
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_vital_throw_1:
+	.byte	KEYSH , se_m_vital_throw_key+0
+	.byte	TEMPO , 220*se_m_vital_throw_tbs/2
+	.byte		VOICE , 22
+	.byte		VOL   , 110*se_m_vital_throw_mvl/mxv
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+16
+	.byte		BEND  , c_v+46
+	.byte		N09   , Cn3 , v127
+	.byte	W03
+	.byte		VOL   , 104*se_m_vital_throw_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+23
+	.byte	W03
+	.byte		VOL   , 93*se_m_vital_throw_mvl/mxv
+	.byte		PAN   , c_v-16
+	.byte		BEND  , c_v-15
+	.byte	W03
+	.byte		VOICE , 21
+	.byte		VOL   , 110*se_m_vital_throw_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N03   , Gn4 
+	.byte	W06
+	.byte		PAN   , c_v+16
+	.byte		N03   , Cn5 
+	.byte	W09
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_vital_throw_2:
+	.byte	KEYSH , se_m_vital_throw_key+0
+	.byte		VOICE , 4
+	.byte		VOL   , 110*se_m_vital_throw_mvl/mxv
+	.byte	W09
+	.byte		PAN   , c_v+8
+	.byte		N03   , Cn3 , v052
+	.byte	W06
+	.byte		PAN   , c_v-7
+	.byte		N03   
+	.byte	W09
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_vital_throw:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_vital_throw_pri	@ Priority
+	.byte	se_m_vital_throw_rev	@ Reverb.
+
+	.word	se_m_vital_throw_grp
+
+	.word	se_m_vital_throw_1
+	.word	se_m_vital_throw_2
+
+	.end
diff --git a/sound/songs/se_w233b.s b/sound/songs/se_m_vital_throw2.s
index 65d256d9a..3bffdeb25 100644
--- a/sound/songs/se_w233b.s
+++ b/sound/songs/se_m_vital_throw2.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w233b_grp, voicegroup128
-	.equ	se_w233b_pri, 4
-	.equ	se_w233b_rev, reverb_set+50
-	.equ	se_w233b_mvl, 127
-	.equ	se_w233b_key, 0
-	.equ	se_w233b_tbs, 1
-	.equ	se_w233b_exg, 0
-	.equ	se_w233b_cmp, 1
+	.equ	se_m_vital_throw2_grp, voicegroup128
+	.equ	se_m_vital_throw2_pri, 4
+	.equ	se_m_vital_throw2_rev, reverb_set+50
+	.equ	se_m_vital_throw2_mvl, 127
+	.equ	se_m_vital_throw2_key, 0
+	.equ	se_m_vital_throw2_tbs, 1
+	.equ	se_m_vital_throw2_exg, 0
+	.equ	se_m_vital_throw2_cmp, 1
 
 	.section .rodata
-	.global	se_w233b
+	.global	se_m_vital_throw2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w233b_1:
-	.byte	KEYSH , se_w233b_key+0
-	.byte	TEMPO , 220*se_w233b_tbs/2
+se_m_vital_throw2_1:
+	.byte	KEYSH , se_m_vital_throw2_key+0
+	.byte	TEMPO , 220*se_m_vital_throw2_tbs/2
 	.byte		VOICE , 6
-	.byte		VOL   , 110*se_w233b_mvl/mxv
+	.byte		VOL   , 110*se_m_vital_throw2_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -57,16 +57,16 @@ se_w233b_1:
 	.byte	W01
 	.byte		        c_v-29
 	.byte	W01
-	.byte		VOL   , 86*se_w233b_mvl/mxv
+	.byte		VOL   , 86*se_m_vital_throw2_mvl/mxv
 	.byte		BEND  , c_v-39
 	.byte	W02
-	.byte		VOL   , 69*se_w233b_mvl/mxv
+	.byte		VOL   , 69*se_m_vital_throw2_mvl/mxv
 	.byte		BEND  , c_v-45
 	.byte	W01
-	.byte		VOL   , 53*se_w233b_mvl/mxv
+	.byte		VOL   , 53*se_m_vital_throw2_mvl/mxv
 	.byte		BEND  , c_v-56
 	.byte	W01
-	.byte		VOL   , 20*se_w233b_mvl/mxv
+	.byte		VOL   , 20*se_m_vital_throw2_mvl/mxv
 	.byte		BEND  , c_v-64
 	.byte	W04
 	.byte		        c_v-64
@@ -74,12 +74,12 @@ se_w233b_1:
 
 @********************** Track  2 **********************@
 
-se_w233b_2:
-	.byte	KEYSH , se_w233b_key+0
+se_m_vital_throw2_2:
+	.byte	KEYSH , se_m_vital_throw2_key+0
 	.byte		VOICE , 5
 	.byte		XCMD  , xIECV , 10
 	.byte		        xIECL , 8
-	.byte		VOL   , 110*se_w233b_mvl/mxv
+	.byte		VOL   , 110*se_m_vital_throw2_mvl/mxv
 	.byte		PAN   , c_v+9
 	.byte		N03   , Gs2 , v052
 	.byte	W06
@@ -94,15 +94,15 @@ se_w233b_2:
 @******************************************************@
 	.align	2
 
-se_w233b:
+se_m_vital_throw2:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w233b_pri	@ Priority
-	.byte	se_w233b_rev	@ Reverb.
+	.byte	se_m_vital_throw2_pri	@ Priority
+	.byte	se_m_vital_throw2_rev	@ Reverb.
 
-	.word	se_w233b_grp
+	.word	se_m_vital_throw2_grp
 
-	.word	se_w233b_1
-	.word	se_w233b_2
+	.word	se_m_vital_throw2_1
+	.word	se_m_vital_throw2_2
 
 	.end
diff --git a/sound/songs/se_w127.s b/sound/songs/se_m_waterfall.s
index 695697698..a07e7e971 100644
--- a/sound/songs/se_w127.s
+++ b/sound/songs/se_m_waterfall.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w127_grp, voicegroup128
-	.equ	se_w127_pri, 4
-	.equ	se_w127_rev, reverb_set+50
-	.equ	se_w127_mvl, 127
-	.equ	se_w127_key, 0
-	.equ	se_w127_tbs, 1
-	.equ	se_w127_exg, 0
-	.equ	se_w127_cmp, 1
+	.equ	se_m_waterfall_grp, voicegroup128
+	.equ	se_m_waterfall_pri, 4
+	.equ	se_m_waterfall_rev, reverb_set+50
+	.equ	se_m_waterfall_mvl, 127
+	.equ	se_m_waterfall_key, 0
+	.equ	se_m_waterfall_tbs, 1
+	.equ	se_m_waterfall_exg, 0
+	.equ	se_m_waterfall_cmp, 1
 
 	.section .rodata
-	.global	se_w127
+	.global	se_m_waterfall
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w127_1:
-	.byte	KEYSH , se_w127_key+0
-	.byte	TEMPO , 150*se_w127_tbs/2
+se_m_waterfall_1:
+	.byte	KEYSH , se_m_waterfall_key+0
+	.byte	TEMPO , 150*se_m_waterfall_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 115*se_w127_mvl/mxv
+	.byte		VOL   , 115*se_m_waterfall_mvl/mxv
 	.byte		BEND  , c_v-18
 	.byte		N60   , Gn2 , v127
 	.byte	W03
@@ -54,62 +54,62 @@ se_w127_1:
 	.byte		PAN   , c_v+3
 	.byte		BEND  , c_v+7
 	.byte	W02
-	.byte		VOL   , 109*se_w127_mvl/mxv
+	.byte		VOL   , 109*se_m_waterfall_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+10
 	.byte	W02
-	.byte		VOL   , 103*se_w127_mvl/mxv
+	.byte		VOL   , 103*se_m_waterfall_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+3
 	.byte		BEND  , c_v+13
 	.byte	W03
-	.byte		VOL   , 92*se_w127_mvl/mxv
+	.byte		VOL   , 92*se_m_waterfall_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+16
 	.byte	W03
-	.byte		VOL   , 79*se_w127_mvl/mxv
+	.byte		VOL   , 79*se_m_waterfall_mvl/mxv
 	.byte		PAN   , c_v-3
 	.byte		BEND  , c_v+18
 	.byte	W02
 	.byte	W02
-	.byte		VOL   , 62*se_w127_mvl/mxv
+	.byte		VOL   , 62*se_m_waterfall_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+21
 	.byte	W04
-	.byte		VOL   , 40*se_w127_mvl/mxv
+	.byte		VOL   , 40*se_m_waterfall_mvl/mxv
 	.byte		PAN   , c_v-3
 	.byte		BEND  , c_v+26
 	.byte	W02
-	.byte		VOL   , 22*se_w127_mvl/mxv
+	.byte		VOL   , 22*se_m_waterfall_mvl/mxv
 	.byte		BEND  , c_v+33
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 8*se_w127_mvl/mxv
+	.byte		VOL   , 8*se_m_waterfall_mvl/mxv
 	.byte		BEND  , c_v+43
 	.byte	W02
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w127_2:
-	.byte	KEYSH , se_w127_key+0
+se_m_waterfall_2:
+	.byte	KEYSH , se_m_waterfall_key+0
 	.byte		VOICE , 25
-	.byte		VOL   , 115*se_w127_mvl/mxv
+	.byte		VOL   , 115*se_m_waterfall_mvl/mxv
 	.byte		N06   , Cn3 , v040
 	.byte	W06
 	.byte		        Gn2 
 	.byte	W06
-se_w127_2_000:
+se_m_waterfall_2_000:
 	.byte		N06   , Cn3 , v040
 	.byte	W06
 	.byte		        Gn2 
 	.byte	W06
 	.byte	PEND
 	.byte	PATT
-	 .word	se_w127_2_000
+	 .word	se_m_waterfall_2_000
 	.byte		N06   , Cn3 , v032
 	.byte	W06
 	.byte		        Gn2 
@@ -123,15 +123,15 @@ se_w127_2_000:
 @******************************************************@
 	.align	2
 
-se_w127:
+se_m_waterfall:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w127_pri	@ Priority
-	.byte	se_w127_rev	@ Reverb.
+	.byte	se_m_waterfall_pri	@ Priority
+	.byte	se_m_waterfall_rev	@ Reverb.
 
-	.word	se_w127_grp
+	.word	se_m_waterfall_grp
 
-	.word	se_w127_1
-	.word	se_w127_2
+	.word	se_m_waterfall_1
+	.word	se_m_waterfall_2
 
 	.end
diff --git a/sound/songs/se_w250.s b/sound/songs/se_m_whirlpool.s
index 20a660411..bac3fa5bc 100644
--- a/sound/songs/se_w250.s
+++ b/sound/songs/se_m_whirlpool.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w250_grp, voicegroup128
-	.equ	se_w250_pri, 4
-	.equ	se_w250_rev, reverb_set+50
-	.equ	se_w250_mvl, 127
-	.equ	se_w250_key, 0
-	.equ	se_w250_tbs, 1
-	.equ	se_w250_exg, 0
-	.equ	se_w250_cmp, 1
+	.equ	se_m_whirlpool_grp, voicegroup128
+	.equ	se_m_whirlpool_pri, 4
+	.equ	se_m_whirlpool_rev, reverb_set+50
+	.equ	se_m_whirlpool_mvl, 127
+	.equ	se_m_whirlpool_key, 0
+	.equ	se_m_whirlpool_tbs, 1
+	.equ	se_m_whirlpool_exg, 0
+	.equ	se_m_whirlpool_cmp, 1
 
 	.section .rodata
-	.global	se_w250
+	.global	se_m_whirlpool
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w250_1:
-	.byte	KEYSH , se_w250_key+0
-	.byte	TEMPO , 150*se_w250_tbs/2
+se_m_whirlpool_1:
+	.byte	KEYSH , se_m_whirlpool_key+0
+	.byte	TEMPO , 150*se_m_whirlpool_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 115*se_w250_mvl/mxv
+	.byte		VOL   , 115*se_m_whirlpool_mvl/mxv
 	.byte		BEND  , c_v-18
 	.byte		TIE   , Dn2 , v127
 	.byte	W03
@@ -72,37 +72,37 @@ se_w250_1:
 	.byte	W05
 	.byte		PAN   , c_v+6
 	.byte	W02
-	.byte		VOL   , 103*se_w250_mvl/mxv
+	.byte		VOL   , 103*se_m_whirlpool_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W03
 	.byte		PAN   , c_v+4
 	.byte	W01
-	.byte		VOL   , 85*se_w250_mvl/mxv
+	.byte		VOL   , 85*se_m_whirlpool_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-5
 	.byte	W04
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 71*se_w250_mvl/mxv
+	.byte		VOL   , 71*se_m_whirlpool_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v-8
 	.byte	W03
-	.byte		VOL   , 52*se_w250_mvl/mxv
+	.byte		VOL   , 52*se_m_whirlpool_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte	W03
 	.byte		BEND  , c_v-12
 	.byte	W01
-	.byte		VOL   , 32*se_w250_mvl/mxv
+	.byte		VOL   , 32*se_m_whirlpool_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-10
 	.byte	W03
-	.byte		VOL   , 11*se_w250_mvl/mxv
+	.byte		VOL   , 11*se_m_whirlpool_mvl/mxv
 	.byte		BEND  , c_v-19
 	.byte	W03
 	.byte		PAN   , c_v-15
 	.byte	W01
-	.byte		VOL   , 6*se_w250_mvl/mxv
+	.byte		VOL   , 6*se_m_whirlpool_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-28
 	.byte	W04
@@ -112,14 +112,14 @@ se_w250_1:
 @******************************************************@
 	.align	2
 
-se_w250:
+se_m_whirlpool:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w250_pri	@ Priority
-	.byte	se_w250_rev	@ Reverb.
+	.byte	se_m_whirlpool_pri	@ Priority
+	.byte	se_m_whirlpool_rev	@ Reverb.
 
-	.word	se_w250_grp
+	.word	se_m_whirlpool_grp
 
-	.word	se_w250_1
+	.word	se_m_whirlpool_1
 
 	.end
diff --git a/sound/songs/se_w281.s b/sound/songs/se_m_yawn.s
index 21f27203d..c6af1f361 100644
--- a/sound/songs/se_w281.s
+++ b/sound/songs/se_m_yawn.s
@@ -1,24 +1,24 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w281_grp, voicegroup128
-	.equ	se_w281_pri, 4
-	.equ	se_w281_rev, reverb_set+50
-	.equ	se_w281_mvl, 127
-	.equ	se_w281_key, 0
-	.equ	se_w281_tbs, 1
-	.equ	se_w281_exg, 0
-	.equ	se_w281_cmp, 1
+	.equ	se_m_yawn_grp, voicegroup128
+	.equ	se_m_yawn_pri, 4
+	.equ	se_m_yawn_rev, reverb_set+50
+	.equ	se_m_yawn_mvl, 127
+	.equ	se_m_yawn_key, 0
+	.equ	se_m_yawn_tbs, 1
+	.equ	se_m_yawn_exg, 0
+	.equ	se_m_yawn_cmp, 1
 
 	.section .rodata
-	.global	se_w281
+	.global	se_m_yawn
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w281_1:
-	.byte		VOL   , 110*se_w281_mvl/mxv
-	.byte	KEYSH , se_w281_key+0
-	.byte	TEMPO , 150*se_w281_tbs/2
+se_m_yawn_1:
+	.byte		VOL   , 110*se_m_yawn_mvl/mxv
+	.byte	KEYSH , se_m_yawn_key+0
+	.byte	TEMPO , 150*se_m_yawn_tbs/2
 	.byte		VOICE , 61
 	.byte		BENDR , 44
 	.byte		PAN   , c_v+0
@@ -87,41 +87,41 @@ se_w281_1:
 
 @********************** Track  2 **********************@
 
-se_w281_2:
-	.byte	KEYSH , se_w281_key+0
+se_m_yawn_2:
+	.byte	KEYSH , se_m_yawn_key+0
 	.byte		VOICE , 66
 	.byte		BENDR , 44
 	.byte		PAN   , c_v+1
-	.byte		VOL   , 110*se_w281_mvl/mxv
+	.byte		VOL   , 110*se_m_yawn_mvl/mxv
 	.byte		N48   , Dn3 , v020
 	.byte	W24
 	.byte	W03
-	.byte		VOL   , 103*se_w281_mvl/mxv
+	.byte		VOL   , 103*se_m_yawn_mvl/mxv
 	.byte	W04
-	.byte		        96*se_w281_mvl/mxv
+	.byte		        96*se_m_yawn_mvl/mxv
 	.byte	W03
-	.byte		        83*se_w281_mvl/mxv
+	.byte		        83*se_m_yawn_mvl/mxv
 	.byte	W04
-	.byte		        67*se_w281_mvl/mxv
+	.byte		        67*se_m_yawn_mvl/mxv
 	.byte	W04
-	.byte		        49*se_w281_mvl/mxv
+	.byte		        49*se_m_yawn_mvl/mxv
 	.byte	W03
-	.byte		        23*se_w281_mvl/mxv
+	.byte		        23*se_m_yawn_mvl/mxv
 	.byte	W03
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w281:
+se_m_yawn:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w281_pri	@ Priority
-	.byte	se_w281_rev	@ Reverb.
+	.byte	se_m_yawn_pri	@ Priority
+	.byte	se_m_yawn_rev	@ Reverb.
 
-	.word	se_w281_grp
+	.word	se_m_yawn_grp
 
-	.word	se_w281_1
-	.word	se_w281_2
+	.word	se_m_yawn_1
+	.word	se_m_yawn_2
 
 	.end
diff --git a/sound/songs/se_w052.s b/sound/songs/se_w052.s
deleted file mode 100644
index 50529af91..000000000
--- a/sound/songs/se_w052.s
+++ /dev/null
@@ -1,61 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w052_grp, voicegroup128
-	.equ	se_w052_pri, 4
-	.equ	se_w052_rev, reverb_set+50
-	.equ	se_w052_mvl, 127
-	.equ	se_w052_key, 0
-	.equ	se_w052_tbs, 1
-	.equ	se_w052_exg, 0
-	.equ	se_w052_cmp, 1
-
-	.section .rodata
-	.global	se_w052
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w052_1:
-	.byte	KEYSH , se_w052_key+0
-	.byte	TEMPO , 150*se_w052_tbs/2
-	.byte		VOICE , 29
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 61*se_w052_mvl/mxv
-	.byte		BEND  , c_v+8
-	.byte		N10   , Gn3 , v127
-	.byte	W01
-	.byte		VOL   , 84*se_w052_mvl/mxv
-	.byte	W01
-	.byte		        97*se_w052_mvl/mxv
-	.byte		BEND  , c_v+16
-	.byte	W01
-	.byte		VOL   , 110*se_w052_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+7
-	.byte	W02
-	.byte		        c_v-12
-	.byte	W01
-	.byte		VOL   , 89*se_w052_mvl/mxv
-	.byte	W01
-	.byte		        64*se_w052_mvl/mxv
-	.byte		BEND  , c_v-42
-	.byte	W01
-	.byte		VOL   , 34*se_w052_mvl/mxv
-	.byte	W15
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w052:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w052_pri	@ Priority
-	.byte	se_w052_rev	@ Reverb.
-
-	.word	se_w052_grp
-
-	.word	se_w052_1
-
-	.end
diff --git a/sound/songs/se_w059b.s b/sound/songs/se_w059b.s
deleted file mode 100644
index f12762957..000000000
--- a/sound/songs/se_w059b.s
+++ /dev/null
@@ -1,72 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w059b_grp, voicegroup128
-	.equ	se_w059b_pri, 4
-	.equ	se_w059b_rev, reverb_set+50
-	.equ	se_w059b_mvl, 127
-	.equ	se_w059b_key, 0
-	.equ	se_w059b_tbs, 1
-	.equ	se_w059b_exg, 0
-	.equ	se_w059b_cmp, 1
-
-	.section .rodata
-	.global	se_w059b
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w059b_1:
-	.byte	KEYSH , se_w059b_key+0
-	.byte	TEMPO , 150*se_w059b_tbs/2
-	.byte		VOICE , 22
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w059b_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Gn3 , v108
-	.byte	W02
-	.byte		PAN   , c_v-19
-	.byte	W04
-	.byte		        c_v+0
-	.byte	W01
-	.byte		VOL   , 97*se_w059b_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+16
-	.byte	W01
-	.byte		VOL   , 84*se_w059b_mvl/mxv
-	.byte	W03
-	.byte		        76*se_w059b_mvl/mxv
-	.byte		PAN   , c_v+2
-	.byte	W02
-	.byte		VOL   , 55*se_w059b_mvl/mxv
-	.byte		PAN   , c_v-8
-	.byte	W02
-	.byte		VOL   , 39*se_w059b_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 25*se_w059b_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+8
-	.byte	W01
-	.byte		VOL   , 13*se_w059b_mvl/mxv
-	.byte	W03
-	.byte		        7*se_w059b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w059b:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w059b_pri	@ Priority
-	.byte	se_w059b_rev	@ Reverb.
-
-	.word	se_w059b_grp
-
-	.word	se_w059b_1
-
-	.end
diff --git a/sound/songs/se_w062b.s b/sound/songs/se_w062b.s
deleted file mode 100644
index 75a04e448..000000000
--- a/sound/songs/se_w062b.s
+++ /dev/null
@@ -1,131 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w062b_grp, voicegroup128
-	.equ	se_w062b_pri, 4
-	.equ	se_w062b_rev, reverb_set+50
-	.equ	se_w062b_mvl, 127
-	.equ	se_w062b_key, 0
-	.equ	se_w062b_tbs, 1
-	.equ	se_w062b_exg, 0
-	.equ	se_w062b_cmp, 1
-
-	.section .rodata
-	.global	se_w062b
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w062b_1:
-	.byte	KEYSH , se_w062b_key+0
-	.byte	TEMPO , 150*se_w062b_tbs/2
-	.byte		VOICE , 9
-	.byte		BENDR , 2
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 26*se_w062b_mvl/mxv
-	.byte		BEND  , c_v-23
-	.byte		N09   , Dn5 , v127
-	.byte	W01
-	.byte		VOL   , 34*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte		BEND  , c_v-20
-	.byte	W01
-	.byte		VOL   , 42*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-7
-	.byte		BEND  , c_v-16
-	.byte	W01
-	.byte		VOL   , 52*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+9
-	.byte	W01
-	.byte		VOL   , 72*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-13
-	.byte		BEND  , c_v-18
-	.byte	W02
-	.byte		VOL   , 85*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte		BEND  , c_v-21
-	.byte	W01
-	.byte		VOL   , 102*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-6
-	.byte		BEND  , c_v-23
-	.byte	W01
-	.byte		VOL   , 120*se_w062b_mvl/mxv
-	.byte		BEND  , c_v-24
-	.byte	W02
-	.byte		VOL   , 26*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-23
-	.byte		N09   , Dn5 , v100
-	.byte	W02
-	.byte		VOL   , 34*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte		BEND  , c_v-20
-	.byte	W01
-	.byte		VOL   , 42*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-7
-	.byte		BEND  , c_v-16
-	.byte	W01
-	.byte		VOL   , 52*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+9
-	.byte	W01
-	.byte		VOL   , 72*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-13
-	.byte		BEND  , c_v-18
-	.byte	W01
-	.byte		VOL   , 85*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte		BEND  , c_v-21
-	.byte	W02
-	.byte		VOL   , 102*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-6
-	.byte		BEND  , c_v-23
-	.byte	W01
-	.byte		VOL   , 120*se_w062b_mvl/mxv
-	.byte		BEND  , c_v-24
-	.byte	W02
-	.byte		VOL   , 26*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-23
-	.byte		N09   , Dn5 , v080
-	.byte	W01
-	.byte		VOL   , 34*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte		BEND  , c_v-20
-	.byte	W02
-	.byte		VOL   , 42*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-7
-	.byte		BEND  , c_v-16
-	.byte	W01
-	.byte		VOL   , 52*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+9
-	.byte	W01
-	.byte		VOL   , 72*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-13
-	.byte		BEND  , c_v-18
-	.byte	W01
-	.byte		VOL   , 85*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte		BEND  , c_v-21
-	.byte	W01
-	.byte		VOL   , 102*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-6
-	.byte		BEND  , c_v-23
-	.byte	W02
-	.byte		VOL   , 120*se_w062b_mvl/mxv
-	.byte		BEND  , c_v-24
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w062b:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w062b_pri	@ Priority
-	.byte	se_w062b_rev	@ Reverb.
-
-	.word	se_w062b_grp
-
-	.word	se_w062b_1
-
-	.end
diff --git a/sound/songs/se_w077.s b/sound/songs/se_w077.s
deleted file mode 100644
index 8dd93481a..000000000
--- a/sound/songs/se_w077.s
+++ /dev/null
@@ -1,58 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w077_grp, voicegroup128
-	.equ	se_w077_pri, 4
-	.equ	se_w077_rev, reverb_set+50
-	.equ	se_w077_mvl, 127
-	.equ	se_w077_key, 0
-	.equ	se_w077_tbs, 1
-	.equ	se_w077_exg, 0
-	.equ	se_w077_cmp, 1
-
-	.section .rodata
-	.global	se_w077
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w077_1:
-	.byte	KEYSH , se_w077_key+0
-	.byte	TEMPO , 150*se_w077_tbs/2
-	.byte		VOICE , 18
-	.byte		BENDR , 12
-	.byte		VOL   , 55*se_w077_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+1
-	.byte		N01   , Cn6 , v100
-	.byte	W01
-	.byte		VOL   , 110*se_w077_mvl/mxv
-	.byte	W01
-	.byte		VOICE , 36
-	.byte		VOL   , 55*se_w077_mvl/mxv
-	.byte		N02   , Gn6 , v080
-	.byte	W01
-	.byte		VOL   , 110*se_w077_mvl/mxv
-	.byte	W04
-	.byte		PAN   , c_v+20
-	.byte		N01   , Gn6 , v024
-	.byte	W03
-	.byte		        Gn6 , v016
-	.byte	W02
-	.byte		PAN   , c_v-21
-	.byte	W12
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w077:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w077_pri	@ Priority
-	.byte	se_w077_rev	@ Reverb.
-
-	.word	se_w077_grp
-
-	.word	se_w077_1
-
-	.end
diff --git a/sound/songs/se_w082.s b/sound/songs/se_w082.s
deleted file mode 100644
index 460cdd977..000000000
--- a/sound/songs/se_w082.s
+++ /dev/null
@@ -1,150 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w082_grp, voicegroup128
-	.equ	se_w082_pri, 4
-	.equ	se_w082_rev, reverb_set+50
-	.equ	se_w082_mvl, 127
-	.equ	se_w082_key, 0
-	.equ	se_w082_tbs, 1
-	.equ	se_w082_exg, 0
-	.equ	se_w082_cmp, 1
-
-	.section .rodata
-	.global	se_w082
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w082_1:
-	.byte	KEYSH , se_w082_key+0
-	.byte	TEMPO , 150*se_w082_tbs/2
-	.byte		VOICE , 29
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 21*se_w082_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N10   , An2 , v127
-	.byte	W02
-	.byte		VOL   , 47*se_w082_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 88*se_w082_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v-5
-	.byte	W01
-	.byte		VOL   , 120*se_w082_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 21*se_w082_mvl/mxv
-	.byte		BEND  , c_v+10
-	.byte		N10   , Bn2 
-	.byte	W02
-	.byte		PAN   , c_v+5
-	.byte	W01
-	.byte		VOL   , 47*se_w082_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 88*se_w082_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v-5
-	.byte		VOL   , 120*se_w082_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v-2
-	.byte		VOL   , 21*se_w082_mvl/mxv
-	.byte		BEND  , c_v+18
-	.byte		N10   , Cs3 
-	.byte	W03
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 47*se_w082_mvl/mxv
-	.byte	W02
-	.byte		        88*se_w082_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 120*se_w082_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v-5
-	.byte	W02
-	.byte		VOL   , 20*se_w082_mvl/mxv
-	.byte		BEND  , c_v+29
-	.byte		N10   , Dn3 
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 47*se_w082_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+5
-	.byte	W01
-	.byte		VOL   , 88*se_w082_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 120*se_w082_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v-5
-	.byte	W01
-	.byte		VOL   , 21*se_w082_mvl/mxv
-	.byte		BEND  , c_v+37
-	.byte		N10   , En3 
-	.byte	W02
-	.byte		PAN   , c_v-2
-	.byte		VOL   , 46*se_w082_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 102*se_w082_mvl/mxv
-	.byte	W02
-	.byte		        120*se_w082_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		        c_v-5
-	.byte		VOL   , 20*se_w082_mvl/mxv
-	.byte		BEND  , c_v+42
-	.byte		N20   , Fs3 
-	.byte	W02
-	.byte		VOL   , 47*se_w082_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 88*se_w082_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+5
-	.byte	W01
-	.byte		VOL   , 120*se_w082_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 99*se_w082_mvl/mxv
-	.byte		BEND  , c_v+50
-	.byte	W02
-	.byte		PAN   , c_v-5
-	.byte	W01
-	.byte		VOL   , 74*se_w082_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+56
-	.byte	W01
-	.byte		PAN   , c_v-2
-	.byte		VOL   , 53*se_w082_mvl/mxv
-	.byte	W03
-	.byte		        34*se_w082_mvl/mxv
-	.byte		BEND  , c_v+63
-	.byte	W01
-	.byte		VOL   , 15*se_w082_mvl/mxv
-	.byte	W23
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w082:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w082_pri	@ Priority
-	.byte	se_w082_rev	@ Reverb.
-
-	.word	se_w082_grp
-
-	.word	se_w082_1
-
-	.end
diff --git a/sound/songs/se_w104.s b/sound/songs/se_w104.s
deleted file mode 100644
index a93b52abe..000000000
--- a/sound/songs/se_w104.s
+++ /dev/null
@@ -1,71 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w104_grp, voicegroup128
-	.equ	se_w104_pri, 4
-	.equ	se_w104_rev, reverb_set+50
-	.equ	se_w104_mvl, 127
-	.equ	se_w104_key, 0
-	.equ	se_w104_tbs, 1
-	.equ	se_w104_exg, 0
-	.equ	se_w104_cmp, 1
-
-	.section .rodata
-	.global	se_w104
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w104_1:
-	.byte	KEYSH , se_w104_key+0
-	.byte	TEMPO , 150*se_w104_tbs/2
-	.byte		VOICE , 22
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w104_mvl/mxv
-	.byte		BEND  , c_v-18
-	.byte		N19   , Dn3 , v108
-	.byte	W02
-	.byte		BEND  , c_v-7
-	.byte	W01
-	.byte		VOL   , 101*se_w104_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v-9
-	.byte		BEND  , c_v+8
-	.byte	W02
-	.byte		VOL   , 84*se_w104_mvl/mxv
-	.byte		BEND  , c_v+4
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 64*se_w104_mvl/mxv
-	.byte		BEND  , c_v-13
-	.byte	W01
-	.byte		PAN   , c_v+8
-	.byte	W02
-	.byte		VOL   , 45*se_w104_mvl/mxv
-	.byte		BEND  , c_v-31
-	.byte	W02
-	.byte		VOL   , 32*se_w104_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOICE , 2
-	.byte	W01
-	.byte		VOL   , 13*se_w104_mvl/mxv
-	.byte		BEND  , c_v-52
-	.byte	W08
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w104:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w104_pri	@ Priority
-	.byte	se_w104_rev	@ Reverb.
-
-	.word	se_w104_grp
-
-	.word	se_w104_1
-
-	.end
diff --git a/sound/songs/se_w112.s b/sound/songs/se_w112.s
deleted file mode 100644
index 3b741aa41..000000000
--- a/sound/songs/se_w112.s
+++ /dev/null
@@ -1,276 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w112_grp, voicegroup128
-	.equ	se_w112_pri, 4
-	.equ	se_w112_rev, reverb_set+50
-	.equ	se_w112_mvl, 127
-	.equ	se_w112_key, 0
-	.equ	se_w112_tbs, 1
-	.equ	se_w112_exg, 0
-	.equ	se_w112_cmp, 1
-
-	.section .rodata
-	.global	se_w112
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w112_1:
-	.byte	KEYSH , se_w112_key+0
-	.byte	TEMPO , 150*se_w112_tbs/2
-	.byte		VOICE , 19
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v+3
-	.byte		N06   , Cn6 , v088
-	.byte	W01
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte		BEND  , c_v-8
-	.byte	W01
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte		BEND  , c_v-17
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		VOL   , 24*se_w112_mvl/mxv
-	.byte		BEND  , c_v-34
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 11*se_w112_mvl/mxv
-	.byte		BEND  , c_v-45
-	.byte	W02
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N06   , Cn6 , v084
-	.byte	W01
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte		BEND  , c_v-11
-	.byte	W01
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte		BEND  , c_v-20
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		VOL   , 24*se_w112_mvl/mxv
-	.byte		BEND  , c_v-37
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 11*se_w112_mvl/mxv
-	.byte		BEND  , c_v-47
-	.byte	W02
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v-1
-	.byte		N06   , Cn6 , v076
-	.byte	W01
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte		BEND  , c_v-11
-	.byte	W01
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte		BEND  , c_v-21
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		VOL   , 24*se_w112_mvl/mxv
-	.byte		BEND  , c_v-38
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 11*se_w112_mvl/mxv
-	.byte		BEND  , c_v-48
-	.byte	W02
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v-1
-	.byte		N06   , Cn6 , v064
-	.byte	W01
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte		BEND  , c_v-11
-	.byte	W01
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte		BEND  , c_v-21
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		VOL   , 24*se_w112_mvl/mxv
-	.byte		BEND  , c_v-38
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 11*se_w112_mvl/mxv
-	.byte		BEND  , c_v-48
-	.byte	W02
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v-2
-	.byte		N06   , Cn6 , v056
-	.byte	W01
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte		BEND  , c_v-12
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte		BEND  , c_v-22
-	.byte	W01
-	.byte		PAN   , c_v+8
-	.byte		VOL   , 24*se_w112_mvl/mxv
-	.byte		BEND  , c_v-39
-	.byte	W01
-	.byte		PAN   , c_v-10
-	.byte		VOL   , 11*se_w112_mvl/mxv
-	.byte		BEND  , c_v-49
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v-2
-	.byte		N06   , Cn6 , v044
-	.byte	W01
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte		BEND  , c_v-12
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte		BEND  , c_v-22
-	.byte	W01
-	.byte		PAN   , c_v+8
-	.byte		VOL   , 24*se_w112_mvl/mxv
-	.byte		BEND  , c_v-39
-	.byte	W01
-	.byte		PAN   , c_v-10
-	.byte		VOL   , 11*se_w112_mvl/mxv
-	.byte		BEND  , c_v-49
-	.byte	W02
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v-2
-	.byte		N06   , Cn6 , v036
-	.byte	W01
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte		BEND  , c_v-13
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte		BEND  , c_v-22
-	.byte	W01
-	.byte		PAN   , c_v+8
-	.byte		VOL   , 24*se_w112_mvl/mxv
-	.byte		BEND  , c_v-39
-	.byte	W01
-	.byte		PAN   , c_v-10
-	.byte		VOL   , 11*se_w112_mvl/mxv
-	.byte		BEND  , c_v-49
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v-2
-	.byte		N06   , Cn6 , v028
-	.byte	W01
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte		BEND  , c_v-13
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte		BEND  , c_v-22
-	.byte	W01
-	.byte		PAN   , c_v+8
-	.byte		VOL   , 24*se_w112_mvl/mxv
-	.byte		BEND  , c_v-39
-	.byte	W01
-	.byte		PAN   , c_v-10
-	.byte		VOL   , 11*se_w112_mvl/mxv
-	.byte		BEND  , c_v-49
-	.byte	W02
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w112_2:
-	.byte	KEYSH , se_w112_key+0
-	.byte		VOICE , 53
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v-5
-	.byte	W02
-	.byte		N06   , An5 , v064
-	.byte	W02
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte	W02
-	.byte		        56*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        24*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w112_mvl/mxv
-	.byte		N06   , An5 , v056
-	.byte	W02
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte	W02
-se_w112_2_000:
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        24*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w112_mvl/mxv
-	.byte		N06   , An5 , v052
-	.byte	W02
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte	W02
-	.byte	PEND
-	.byte	PATT
-	 .word	se_w112_2_000
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        24*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w112_mvl/mxv
-	.byte		N06   , An5 , v048
-	.byte	W02
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte	W02
-	.byte		        56*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        24*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w112_mvl/mxv
-	.byte		N06   , An5 , v044
-	.byte	W02
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte	W02
-	.byte		        56*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        24*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w112_mvl/mxv
-	.byte		N06   , An5 , v040
-	.byte	W02
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte	W02
-	.byte		        56*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        24*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w112_mvl/mxv
-	.byte		N06   , An5 , v036
-	.byte	W02
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte	W02
-	.byte		        56*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        24*se_w112_mvl/mxv
-	.byte	W05
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w112:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w112_pri	@ Priority
-	.byte	se_w112_rev	@ Reverb.
-
-	.word	se_w112_grp
-
-	.word	se_w112_1
-	.word	se_w112_2
-
-	.end
diff --git a/sound/songs/se_w120.s b/sound/songs/se_w120.s
deleted file mode 100644
index e86fac991..000000000
--- a/sound/songs/se_w120.s
+++ /dev/null
@@ -1,74 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w120_grp, voicegroup128
-	.equ	se_w120_pri, 4
-	.equ	se_w120_rev, reverb_set+50
-	.equ	se_w120_mvl, 127
-	.equ	se_w120_key, 0
-	.equ	se_w120_tbs, 1
-	.equ	se_w120_exg, 0
-	.equ	se_w120_cmp, 1
-
-	.section .rodata
-	.global	se_w120
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w120_1:
-	.byte	KEYSH , se_w120_key+0
-	.byte	TEMPO , 150*se_w120_tbs/2
-	.byte		VOICE , 41
-	.byte		VOL   , 115*se_w120_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N01   , Gn3 , v127
-	.byte	W01
-	.byte		        Cn3 
-	.byte	W01
-	.byte		N24   , An3 
-	.byte	W06
-	.byte		PAN   , c_v+6
-	.byte	W04
-	.byte		        c_v+0
-	.byte	W01
-	.byte		VOL   , 102*se_w120_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v-8
-	.byte		VOL   , 88*se_w120_mvl/mxv
-	.byte	W03
-	.byte		        78*se_w120_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 67*se_w120_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v-2
-	.byte	W01
-	.byte		PAN   , c_v+7
-	.byte		VOL   , 45*se_w120_mvl/mxv
-	.byte	W02
-	.byte		BEND  , c_v-8
-	.byte	W01
-	.byte		VOL   , 13*se_w120_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-15
-	.byte	W22
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w120:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w120_pri	@ Priority
-	.byte	se_w120_rev	@ Reverb.
-
-	.word	se_w120_grp
-
-	.word	se_w120_1
-
-	.end
diff --git a/sound/songs/se_w145b.s b/sound/songs/se_w145b.s
deleted file mode 100644
index d076bd331..000000000
--- a/sound/songs/se_w145b.s
+++ /dev/null
@@ -1,60 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w145b_grp, voicegroup128
-	.equ	se_w145b_pri, 4
-	.equ	se_w145b_rev, reverb_set+50
-	.equ	se_w145b_mvl, 127
-	.equ	se_w145b_key, 0
-	.equ	se_w145b_tbs, 1
-	.equ	se_w145b_exg, 0
-	.equ	se_w145b_cmp, 1
-
-	.section .rodata
-	.global	se_w145b
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w145b_1:
-	.byte	KEYSH , se_w145b_key+0
-	.byte	TEMPO , 220*se_w145b_tbs/2
-	.byte		VOICE , 24
-	.byte		VOL   , 110*se_w145b_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte	W03
-	.byte		N09   , Gn4 , v127
-	.byte	W02
-	.byte		BEND  , c_v+31
-	.byte	W02
-	.byte		        c_v-34
-	.byte	W17
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w145b_2:
-	.byte	KEYSH , se_w145b_key+0
-	.byte		VOICE , 4
-	.byte		VOL   , 110*se_w145b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		N01   , Cn4 , v044
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w145b:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w145b_pri	@ Priority
-	.byte	se_w145b_rev	@ Reverb.
-
-	.word	se_w145b_grp
-
-	.word	se_w145b_1
-	.word	se_w145b_2
-
-	.end
diff --git a/sound/songs/se_w146.s b/sound/songs/se_w146.s
deleted file mode 100644
index 824c66ac3..000000000
--- a/sound/songs/se_w146.s
+++ /dev/null
@@ -1,79 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w146_grp, voicegroup128
-	.equ	se_w146_pri, 4
-	.equ	se_w146_rev, reverb_set+50
-	.equ	se_w146_mvl, 127
-	.equ	se_w146_key, 0
-	.equ	se_w146_tbs, 1
-	.equ	se_w146_exg, 0
-	.equ	se_w146_cmp, 1
-
-	.section .rodata
-	.global	se_w146
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w146_1:
-	.byte	KEYSH , se_w146_key+0
-	.byte	TEMPO , 150*se_w146_tbs/2
-	.byte		VOICE , 19
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 5*se_w146_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N07   , Bn5 , v080
-	.byte	W01
-	.byte		VOL   , 55*se_w146_mvl/mxv
-	.byte		PAN   , c_v+11
-	.byte		BEND  , c_v+3
-	.byte	W01
-	.byte		VOL   , 67*se_w146_mvl/mxv
-	.byte		PAN   , c_v+22
-	.byte		BEND  , c_v+0
-	.byte	W01
-	.byte		VOL   , 90*se_w146_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-6
-	.byte	W01
-	.byte		PAN   , c_v-12
-	.byte		BEND  , c_v-14
-	.byte	W02
-	.byte		VOL   , 4*se_w146_mvl/mxv
-	.byte		PAN   , c_v-22
-	.byte		BEND  , c_v-23
-	.byte	W01
-	.byte		PAN   , c_v-13
-	.byte		BEND  , c_v+0
-	.byte		N04   , Cn6 
-	.byte	W01
-	.byte		VOL   , 66*se_w146_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+1
-	.byte	W01
-	.byte		VOL   , 90*se_w146_mvl/mxv
-	.byte		PAN   , c_v+11
-	.byte		BEND  , c_v+3
-	.byte	W01
-	.byte		VOL   , 4*se_w146_mvl/mxv
-	.byte		PAN   , c_v+21
-	.byte		BEND  , c_v+5
-	.byte	W14
-	.byte		VOL   , 90*se_w146_mvl/mxv
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w146:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w146_pri	@ Priority
-	.byte	se_w146_rev	@ Reverb.
-
-	.word	se_w146_grp
-
-	.word	se_w146_1
-
-	.end
diff --git a/sound/songs/se_w166.s b/sound/songs/se_w166.s
deleted file mode 100644
index afbe08f08..000000000
--- a/sound/songs/se_w166.s
+++ /dev/null
@@ -1,68 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w166_grp, voicegroup128
-	.equ	se_w166_pri, 4
-	.equ	se_w166_rev, reverb_set+50
-	.equ	se_w166_mvl, 127
-	.equ	se_w166_key, 0
-	.equ	se_w166_tbs, 1
-	.equ	se_w166_exg, 0
-	.equ	se_w166_cmp, 1
-
-	.section .rodata
-	.global	se_w166
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w166_1:
-	.byte	KEYSH , se_w166_key+0
-	.byte	TEMPO , 180*se_w166_tbs/2
-	.byte		VOICE , 38
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w166_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N02   , Gn4 , v127
-	.byte	W01
-	.byte		VOL   , 74*se_w166_mvl/mxv
-	.byte		BEND  , c_v-11
-	.byte	W01
-	.byte		VOICE , 31
-	.byte		VOL   , 40*se_w166_mvl/mxv
-	.byte		BEND  , c_v-1
-	.byte		N03   , Cs5 
-	.byte	W01
-	.byte		VOL   , 64*se_w166_mvl/mxv
-	.byte		PAN   , c_v-6
-	.byte		BEND  , c_v-12
-	.byte	W01
-	.byte		VOL   , 86*se_w166_mvl/mxv
-	.byte		PAN   , c_v+4
-	.byte		BEND  , c_v-16
-	.byte	W02
-	.byte		VOL   , 110*se_w166_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N02   , As5 
-	.byte	W01
-	.byte		BEND  , c_v+12
-	.byte	W01
-	.byte		VOL   , 0*se_w166_mvl/mxv
-	.byte	W04
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w166:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w166_pri	@ Priority
-	.byte	se_w166_rev	@ Reverb.
-
-	.word	se_w166_grp
-
-	.word	se_w166_1
-
-	.end
diff --git a/sound/songs/se_w172.s b/sound/songs/se_w172.s
deleted file mode 100644
index 0c5ae6754..000000000
--- a/sound/songs/se_w172.s
+++ /dev/null
@@ -1,124 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w172_grp, voicegroup128
-	.equ	se_w172_pri, 4
-	.equ	se_w172_rev, reverb_set+50
-	.equ	se_w172_mvl, 127
-	.equ	se_w172_key, 0
-	.equ	se_w172_tbs, 1
-	.equ	se_w172_exg, 0
-	.equ	se_w172_cmp, 1
-
-	.section .rodata
-	.global	se_w172
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w172_1:
-	.byte	KEYSH , se_w172_key+0
-	.byte	TEMPO , 150*se_w172_tbs/2
-	.byte		VOICE , 29
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 22*se_w172_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N30   , Dn4 , v127
-	.byte	W01
-	.byte		VOL   , 49*se_w172_mvl/mxv
-	.byte	W01
-	.byte		        71*se_w172_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w172_mvl/mxv
-	.byte		BEND  , c_v+8
-	.byte	W01
-	.byte		VOL   , 110*se_w172_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+5
-	.byte		BEND  , c_v+16
-	.byte	W01
-	.byte		VOL   , 95*se_w172_mvl/mxv
-	.byte	W02
-	.byte		        88*se_w172_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+7
-	.byte	W01
-	.byte		VOL   , 93*se_w172_mvl/mxv
-	.byte	W02
-	.byte		        110*se_w172_mvl/mxv
-	.byte		PAN   , c_v-5
-	.byte		BEND  , c_v+0
-	.byte	W02
-	.byte		VOL   , 86*se_w172_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-9
-	.byte	W01
-	.byte		VOL   , 63*se_w172_mvl/mxv
-	.byte	W02
-	.byte		        37*se_w172_mvl/mxv
-	.byte		BEND  , c_v-24
-	.byte	W03
-	.byte		VOL   , 13*se_w172_mvl/mxv
-	.byte		BEND  , c_v-46
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w172_2:
-	.byte	KEYSH , se_w172_key+0
-	.byte		VOICE , 27
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 22*se_w172_mvl/mxv
-	.byte		N30   , Gn2 , v032
-	.byte	W01
-	.byte		VOL   , 49*se_w172_mvl/mxv
-	.byte	W01
-	.byte		        71*se_w172_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w172_mvl/mxv
-	.byte	W01
-	.byte		        110*se_w172_mvl/mxv
-	.byte	W02
-	.byte	W01
-	.byte		        95*se_w172_mvl/mxv
-	.byte	W02
-	.byte		        88*se_w172_mvl/mxv
-	.byte	W01
-	.byte		        93*se_w172_mvl/mxv
-	.byte	W02
-	.byte		        110*se_w172_mvl/mxv
-	.byte	W02
-	.byte		        86*se_w172_mvl/mxv
-	.byte	W01
-	.byte	W01
-	.byte		        63*se_w172_mvl/mxv
-	.byte	W02
-	.byte		        37*se_w172_mvl/mxv
-	.byte	W03
-	.byte		        13*se_w172_mvl/mxv
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w172:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w172_pri	@ Priority
-	.byte	se_w172_rev	@ Reverb.
-
-	.word	se_w172_grp
-
-	.word	se_w172_1
-	.word	se_w172_2
-
-	.end
diff --git a/sound/songs/se_w172b.s b/sound/songs/se_w172b.s
deleted file mode 100644
index 1d4369b00..000000000
--- a/sound/songs/se_w172b.s
+++ /dev/null
@@ -1,99 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w172b_grp, voicegroup128
-	.equ	se_w172b_pri, 4
-	.equ	se_w172b_rev, reverb_set+50
-	.equ	se_w172b_mvl, 127
-	.equ	se_w172b_key, 0
-	.equ	se_w172b_tbs, 1
-	.equ	se_w172b_exg, 0
-	.equ	se_w172b_cmp, 1
-
-	.section .rodata
-	.global	se_w172b
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w172b_1:
-	.byte	KEYSH , se_w172b_key+0
-	.byte	TEMPO , 150*se_w172b_tbs/2
-	.byte		VOICE , 29
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w172b_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N48   , Cn4 , v127
-	.byte	W06
-	.byte		PAN   , c_v+4
-	.byte	W03
-	.byte		BEND  , c_v+2
-	.byte	W03
-	.byte		PAN   , c_v+10
-	.byte	W03
-	.byte		BEND  , c_v+5
-	.byte	W03
-	.byte		VOL   , 98*se_w172b_mvl/mxv
-	.byte		PAN   , c_v+4
-	.byte	W03
-	.byte		BEND  , c_v+3
-	.byte	W03
-	.byte		VOL   , 88*se_w172b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		BEND  , c_v-5
-	.byte	W03
-	.byte		VOL   , 68*se_w172b_mvl/mxv
-	.byte		PAN   , c_v-5
-	.byte	W03
-	.byte		        c_v+7
-	.byte		BEND  , c_v-9
-	.byte	W03
-	.byte		VOL   , 44*se_w172b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		BEND  , c_v-15
-	.byte	W03
-	.byte		VOL   , 13*se_w172b_mvl/mxv
-	.byte		BEND  , c_v-24
-	.byte	W03
-	.byte		        c_v-40
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w172b_2:
-	.byte	KEYSH , se_w172b_key+0
-	.byte		VOICE , 27
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w172b_mvl/mxv
-	.byte		N48   , Gn2 , v032
-	.byte	W18
-	.byte		VOL   , 98*se_w172b_mvl/mxv
-	.byte	W06
-	.byte		        88*se_w172b_mvl/mxv
-	.byte	W06
-	.byte		        68*se_w172b_mvl/mxv
-	.byte	W06
-	.byte		        44*se_w172b_mvl/mxv
-	.byte	W06
-	.byte		        13*se_w172b_mvl/mxv
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w172b:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w172b_pri	@ Priority
-	.byte	se_w172b_rev	@ Reverb.
-
-	.word	se_w172b_grp
-
-	.word	se_w172b_1
-	.word	se_w172b_2
-
-	.end
diff --git a/sound/songs/se_w187.s b/sound/songs/se_w187.s
deleted file mode 100644
index d6c27b89c..000000000
--- a/sound/songs/se_w187.s
+++ /dev/null
@@ -1,72 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w187_grp, voicegroup128
-	.equ	se_w187_pri, 4
-	.equ	se_w187_rev, reverb_set+50
-	.equ	se_w187_mvl, 127
-	.equ	se_w187_key, 0
-	.equ	se_w187_tbs, 1
-	.equ	se_w187_exg, 0
-	.equ	se_w187_cmp, 1
-
-	.section .rodata
-	.global	se_w187
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w187_1:
-	.byte	KEYSH , se_w187_key+0
-	.byte	TEMPO , 150*se_w187_tbs/2
-	.byte		VOICE , 6
-	.byte		BENDR , 12
-	.byte		VOL   , 115*se_w187_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N19   , An2 , v127
-	.byte	W01
-	.byte		BEND  , c_v-6
-	.byte	W01
-	.byte		        c_v-10
-	.byte	W01
-	.byte		        c_v-14
-	.byte	W01
-	.byte		        c_v-12
-	.byte	W02
-	.byte		        c_v-14
-	.byte	W01
-	.byte		        c_v-18
-	.byte	W01
-	.byte		VOL   , 108*se_w187_mvl/mxv
-	.byte		BEND  , c_v-20
-	.byte	W01
-	.byte		        c_v-22
-	.byte	W01
-	.byte		VOL   , 94*se_w187_mvl/mxv
-	.byte	W03
-	.byte		        78*se_w187_mvl/mxv
-	.byte	W01
-	.byte		        62*se_w187_mvl/mxv
-	.byte	W01
-	.byte		        40*se_w187_mvl/mxv
-	.byte	W01
-	.byte		        27*se_w187_mvl/mxv
-	.byte	W02
-	.byte		        12*se_w187_mvl/mxv
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w187:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w187_pri	@ Priority
-	.byte	se_w187_rev	@ Reverb.
-
-	.word	se_w187_grp
-
-	.word	se_w187_1
-
-	.end
diff --git a/sound/songs/se_w195.s b/sound/songs/se_w195.s
deleted file mode 100644
index b78095248..000000000
--- a/sound/songs/se_w195.s
+++ /dev/null
@@ -1,221 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w195_grp, voicegroup128
-	.equ	se_w195_pri, 4
-	.equ	se_w195_rev, reverb_set+50
-	.equ	se_w195_mvl, 127
-	.equ	se_w195_key, 0
-	.equ	se_w195_tbs, 1
-	.equ	se_w195_exg, 0
-	.equ	se_w195_cmp, 1
-
-	.section .rodata
-	.global	se_w195
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w195_1:
-	.byte	KEYSH , se_w195_key+0
-	.byte	TEMPO , 100*se_w195_tbs/2
-	.byte		VOICE , 73
-	.byte		BENDR , 12
-	.byte		LFOS  , 40
-	.byte		PAN   , c_v+7
-	.byte		VOL   , 25*se_w195_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte	W03
-	.byte		VOL   , 29*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        33*se_w195_mvl/mxv
-	.byte		N48   , An3 , v112
-	.byte	W03
-	.byte		VOL   , 40*se_w195_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+4
-	.byte	W02
-se_w195_1_000:
-	.byte		VOL   , 45*se_w195_mvl/mxv
-	.byte		MOD   , 8
-	.byte	W03
-	.byte		VOL   , 51*se_w195_mvl/mxv
-	.byte	W03
-	.byte	PEND
-se_w195_1_001:
-	.byte		VOL   , 56*se_w195_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		VOL   , 62*se_w195_mvl/mxv
-	.byte	W03
-	.byte	PEND
-se_w195_1_002:
-	.byte		VOL   , 72*se_w195_mvl/mxv
-	.byte		PAN   , c_v-4
-	.byte	W03
-	.byte		VOL   , 81*se_w195_mvl/mxv
-	.byte	W03
-	.byte	PEND
-se_w195_1_003:
-	.byte		VOL   , 92*se_w195_mvl/mxv
-	.byte		PAN   , c_v-8
-	.byte	W03
-	.byte		VOL   , 100*se_w195_mvl/mxv
-	.byte	W03
-	.byte	PEND
-	.byte		PAN   , c_v-4
-	.byte	W06
-	.byte		VOL   , 82*se_w195_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		VOL   , 52*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        25*se_w195_mvl/mxv
-	.byte		MOD   , 0
-	.byte		PAN   , c_v+4
-	.byte	W03
-	.byte		VOL   , 29*se_w195_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+7
-	.byte	W02
-	.byte		VOL   , 33*se_w195_mvl/mxv
-	.byte		N72   , Gs3 , v112
-	.byte	W03
-	.byte		VOL   , 40*se_w195_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+4
-	.byte	W02
-	.byte	PATT
-	 .word	se_w195_1_000
-	.byte	PATT
-	 .word	se_w195_1_001
-	.byte	PATT
-	 .word	se_w195_1_002
-	.byte	PATT
-	 .word	se_w195_1_003
-	.byte		PAN   , c_v-4
-	.byte	W06
-	.byte		        c_v+0
-	.byte	W06
-	.byte		        c_v+4
-	.byte	W03
-	.byte		VOL   , 87*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        75*se_w195_mvl/mxv
-	.byte		PAN   , c_v+7
-	.byte	W03
-	.byte		VOL   , 62*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        48*se_w195_mvl/mxv
-	.byte		PAN   , c_v+4
-	.byte	W03
-	.byte		VOL   , 33*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        25*se_w195_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W02
-	.byte		VOL   , 10*se_w195_mvl/mxv
-	.byte	W03
-	.byte	W01
-	.byte		PAN   , c_v-4
-	.byte	W05
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w195_2:
-	.byte	KEYSH , se_w195_key+0
-	.byte		VOICE , 73
-	.byte		VOL   , 25*se_w195_mvl/mxv
-	.byte		PAN   , c_v-17
-	.byte		N48   , Cn4 , v100
-	.byte	W03
-	.byte		VOL   , 29*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        33*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        40*se_w195_mvl/mxv
-	.byte	W03
-se_w195_2_000:
-	.byte		VOL   , 45*se_w195_mvl/mxv
-	.byte		MOD   , 8
-	.byte	W03
-	.byte		VOL   , 51*se_w195_mvl/mxv
-	.byte	W03
-	.byte	PEND
-	.byte		        56*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        62*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        72*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        81*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        92*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        100*se_w195_mvl/mxv
-	.byte	W03
-	.byte	W06
-	.byte		        82*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        52*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        25*se_w195_mvl/mxv
-	.byte		MOD   , 0
-	.byte		N72   , Bn3 , v100
-	.byte	W03
-	.byte		VOL   , 29*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        33*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        40*se_w195_mvl/mxv
-	.byte	W03
-	.byte	PATT
-	 .word	se_w195_2_000
-	.byte		VOL   , 56*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        62*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        72*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        81*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        92*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        100*se_w195_mvl/mxv
-	.byte	W03
-	.byte	W06
-	.byte	W06
-	.byte	W03
-	.byte		        87*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        75*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        62*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        48*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        33*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        25*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        10*se_w195_mvl/mxv
-	.byte	W03
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w195:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w195_pri	@ Priority
-	.byte	se_w195_rev	@ Reverb.
-
-	.word	se_w195_grp
-
-	.word	se_w195_1
-	.word	se_w195_2
-
-	.end
diff --git a/sound/songs/se_w207.s b/sound/songs/se_w207.s
deleted file mode 100644
index 1c0d0475b..000000000
--- a/sound/songs/se_w207.s
+++ /dev/null
@@ -1,77 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w207_grp, voicegroup128
-	.equ	se_w207_pri, 4
-	.equ	se_w207_rev, reverb_set+50
-	.equ	se_w207_mvl, 127
-	.equ	se_w207_key, 0
-	.equ	se_w207_tbs, 1
-	.equ	se_w207_exg, 0
-	.equ	se_w207_cmp, 1
-
-	.section .rodata
-	.global	se_w207
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w207_1:
-	.byte	KEYSH , se_w207_key+0
-	.byte	TEMPO , 190*se_w207_tbs/2
-	.byte		VOICE , 2
-	.byte		BENDR , 8
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 28*se_w207_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N15   , An1 , v127
-	.byte	W01
-	.byte		VOL   , 60*se_w207_mvl/mxv
-	.byte	W01
-	.byte		        111*se_w207_mvl/mxv
-	.byte	W01
-	.byte		        120*se_w207_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v-3
-	.byte	W02
-	.byte		PAN   , c_v+5
-	.byte		BEND  , c_v-6
-	.byte	W01
-	.byte		PAN   , c_v-4
-	.byte		BEND  , c_v-8
-	.byte	W01
-	.byte		VOL   , 109*se_w207_mvl/mxv
-	.byte		PAN   , c_v+9
-	.byte		BEND  , c_v-10
-	.byte	W01
-	.byte		PAN   , c_v-9
-	.byte		BEND  , c_v-14
-	.byte	W01
-	.byte		VOL   , 95*se_w207_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-19
-	.byte	W02
-	.byte		VOL   , 71*se_w207_mvl/mxv
-	.byte		BEND  , c_v-29
-	.byte	W01
-	.byte		VOL   , 41*se_w207_mvl/mxv
-	.byte		BEND  , c_v-38
-	.byte	W01
-	.byte		VOL   , 15*se_w207_mvl/mxv
-	.byte		BEND  , c_v-52
-	.byte	W04
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w207:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w207_pri	@ Priority
-	.byte	se_w207_rev	@ Reverb.
-
-	.word	se_w207_grp
-
-	.word	se_w207_1
-
-	.end
diff --git a/sound/songs/se_w221.s b/sound/songs/se_w221.s
deleted file mode 100644
index 68e9d0957..000000000
--- a/sound/songs/se_w221.s
+++ /dev/null
@@ -1,105 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w221_grp, voicegroup128
-	.equ	se_w221_pri, 4
-	.equ	se_w221_rev, reverb_set+50
-	.equ	se_w221_mvl, 127
-	.equ	se_w221_key, 0
-	.equ	se_w221_tbs, 1
-	.equ	se_w221_exg, 0
-	.equ	se_w221_cmp, 1
-
-	.section .rodata
-	.global	se_w221
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w221_1:
-	.byte	KEYSH , se_w221_key+0
-	.byte	TEMPO , 150*se_w221_tbs/2
-	.byte		VOICE , 29
-	.byte		BENDR , 12
-	.byte		VOL   , 110*se_w221_mvl/mxv
-	.byte		PAN   , c_v+5
-	.byte		BEND  , c_v+0
-	.byte		N04   , Cn3 , v127
-	.byte	W03
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		N18   , Gn4 
-	.byte	W02
-	.byte		PAN   , c_v-5
-	.byte	W01
-	.byte		VOL   , 98*se_w221_mvl/mxv
-	.byte		BEND  , c_v+2
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 83*se_w221_mvl/mxv
-	.byte		BEND  , c_v+6
-	.byte	W02
-	.byte		PAN   , c_v+5
-	.byte	W01
-	.byte		BEND  , c_v+9
-	.byte	W01
-	.byte		VOL   , 63*se_w221_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		BEND  , c_v+13
-	.byte	W02
-	.byte		VOL   , 44*se_w221_mvl/mxv
-	.byte		PAN   , c_v-5
-	.byte	W02
-	.byte		VOL   , 28*se_w221_mvl/mxv
-	.byte		BEND  , c_v+20
-	.byte	W01
-	.byte		PAN   , c_v-2
-	.byte	W01
-	.byte		VOL   , 12*se_w221_mvl/mxv
-	.byte	W02
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w221_2:
-	.byte	KEYSH , se_w221_key+0
-	.byte		VOICE , 27
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w221_mvl/mxv
-	.byte		N01   , Gn2 , v032
-	.byte	W02
-	.byte		N01   
-	.byte	W02
-	.byte		N18   
-	.byte	W03
-	.byte		VOL   , 98*se_w221_mvl/mxv
-	.byte	W03
-	.byte		        83*se_w221_mvl/mxv
-	.byte	W04
-	.byte		        63*se_w221_mvl/mxv
-	.byte	W04
-	.byte		        44*se_w221_mvl/mxv
-	.byte	W02
-	.byte		        28*se_w221_mvl/mxv
-	.byte	W02
-	.byte		        12*se_w221_mvl/mxv
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w221:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w221_pri	@ Priority
-	.byte	se_w221_rev	@ Reverb.
-
-	.word	se_w221_grp
-
-	.word	se_w221_1
-	.word	se_w221_2
-
-	.end
diff --git a/sound/songs/se_w221b.s b/sound/songs/se_w221b.s
deleted file mode 100644
index ed0120acf..000000000
--- a/sound/songs/se_w221b.s
+++ /dev/null
@@ -1,180 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w221b_grp, voicegroup128
-	.equ	se_w221b_pri, 4
-	.equ	se_w221b_rev, reverb_set+50
-	.equ	se_w221b_mvl, 127
-	.equ	se_w221b_key, 0
-	.equ	se_w221b_tbs, 1
-	.equ	se_w221b_exg, 0
-	.equ	se_w221b_cmp, 1
-
-	.section .rodata
-	.global	se_w221b
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w221b_1:
-	.byte	KEYSH , se_w221b_key+0
-	.byte	TEMPO , 150*se_w221b_tbs/2
-	.byte		VOICE , 29
-	.byte		BENDR , 12
-	.byte		VOL   , 22*se_w221b_mvl/mxv
-	.byte		PAN   , c_v+5
-	.byte		BEND  , c_v+0
-	.byte		N96   , Gn3 , v127
-	.byte	W01
-	.byte		VOL   , 49*se_w221b_mvl/mxv
-	.byte	W01
-	.byte		        71*se_w221b_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 95*se_w221b_mvl/mxv
-	.byte		BEND  , c_v+8
-	.byte	W01
-	.byte		VOL   , 110*se_w221b_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v-5
-	.byte		BEND  , c_v+16
-	.byte	W03
-	.byte		VOL   , 97*se_w221b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+7
-	.byte	W03
-	.byte		PAN   , c_v+5
-	.byte		BEND  , c_v+0
-	.byte	W01
-	.byte		VOL   , 84*se_w221b_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-9
-	.byte	W03
-	.byte		VOL   , 76*se_w221b_mvl/mxv
-	.byte		PAN   , c_v-5
-	.byte		BEND  , c_v-24
-	.byte	W03
-	.byte		PAN   , c_v-2
-	.byte		BEND  , c_v-46
-	.byte	W03
-	.byte		VOL   , 84*se_w221b_mvl/mxv
-	.byte		PAN   , c_v+5
-	.byte	W03
-	.byte		        c_v+0
-	.byte	W01
-	.byte		VOL   , 92*se_w221b_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v-5
-	.byte	W01
-	.byte		BEND  , c_v-32
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 86*se_w221b_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+5
-	.byte	W02
-	.byte		BEND  , c_v-18
-	.byte	W01
-	.byte		VOL   , 78*se_w221b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		        c_v-5
-	.byte	W02
-	.byte		VOL   , 71*se_w221b_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v-2
-	.byte	W03
-	.byte		        c_v+5
-	.byte	W03
-	.byte		        c_v+0
-	.byte		VOL   , 78*se_w221b_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v-5
-	.byte	W02
-	.byte		VOL   , 86*se_w221b_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		        c_v+5
-	.byte	W02
-	.byte		VOL   , 90*se_w221b_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		        c_v-5
-	.byte	W03
-	.byte		        c_v-2
-	.byte	W01
-	.byte		VOL   , 80*se_w221b_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+5
-	.byte	W03
-	.byte		        c_v+0
-	.byte	W01
-	.byte		VOL   , 86*se_w221b_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v-5
-	.byte	W03
-	.byte		        c_v+0
-	.byte		VOL   , 83*se_w221b_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 63*se_w221b_mvl/mxv
-	.byte	W03
-	.byte		        37*se_w221b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		        c_v-5
-	.byte		VOL   , 13*se_w221b_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v-2
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w221b_2:
-	.byte	KEYSH , se_w221b_key+0
-	.byte		VOICE , 27
-	.byte		VOL   , 22*se_w221b_mvl/mxv
-	.byte		N96   , Gn2 , v032
-	.byte	W01
-	.byte		VOL   , 49*se_w221b_mvl/mxv
-	.byte	W01
-	.byte		        71*se_w221b_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w221b_mvl/mxv
-	.byte	W01
-	.byte		        110*se_w221b_mvl/mxv
-	.byte	W05
-	.byte		        97*se_w221b_mvl/mxv
-	.byte	W15
-	.byte	W24
-	.byte	W24
-	.byte	W09
-	.byte		        83*se_w221b_mvl/mxv
-	.byte	W03
-	.byte		        63*se_w221b_mvl/mxv
-	.byte	W03
-	.byte		        37*se_w221b_mvl/mxv
-	.byte	W03
-	.byte		        13*se_w221b_mvl/mxv
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w221b:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w221b_pri	@ Priority
-	.byte	se_w221b_rev	@ Reverb.
-
-	.word	se_w221b_grp
-
-	.word	se_w221b_1
-	.word	se_w221b_2
-
-	.end
diff --git a/sound/songs/se_w233.s b/sound/songs/se_w233.s
deleted file mode 100644
index 84381fc0e..000000000
--- a/sound/songs/se_w233.s
+++ /dev/null
@@ -1,75 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w233_grp, voicegroup128
-	.equ	se_w233_pri, 4
-	.equ	se_w233_rev, reverb_set+50
-	.equ	se_w233_mvl, 127
-	.equ	se_w233_key, 0
-	.equ	se_w233_tbs, 1
-	.equ	se_w233_exg, 0
-	.equ	se_w233_cmp, 1
-
-	.section .rodata
-	.global	se_w233
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w233_1:
-	.byte	KEYSH , se_w233_key+0
-	.byte	TEMPO , 220*se_w233_tbs/2
-	.byte		VOICE , 22
-	.byte		VOL   , 110*se_w233_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+16
-	.byte		BEND  , c_v+46
-	.byte		N09   , Cn3 , v127
-	.byte	W03
-	.byte		VOL   , 104*se_w233_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+23
-	.byte	W03
-	.byte		VOL   , 93*se_w233_mvl/mxv
-	.byte		PAN   , c_v-16
-	.byte		BEND  , c_v-15
-	.byte	W03
-	.byte		VOICE , 21
-	.byte		VOL   , 110*se_w233_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N03   , Gn4 
-	.byte	W06
-	.byte		PAN   , c_v+16
-	.byte		N03   , Cn5 
-	.byte	W09
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w233_2:
-	.byte	KEYSH , se_w233_key+0
-	.byte		VOICE , 4
-	.byte		VOL   , 110*se_w233_mvl/mxv
-	.byte	W09
-	.byte		PAN   , c_v+8
-	.byte		N03   , Cn3 , v052
-	.byte	W06
-	.byte		PAN   , c_v-7
-	.byte		N03   
-	.byte	W09
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w233:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w233_pri	@ Priority
-	.byte	se_w233_rev	@ Reverb.
-
-	.word	se_w233_grp
-
-	.word	se_w233_1
-	.word	se_w233_2
-
-	.end
diff --git a/sound/songs/se_w240.s b/sound/songs/se_w240.s
deleted file mode 100644
index 744cc3b88..000000000
--- a/sound/songs/se_w240.s
+++ /dev/null
@@ -1,116 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w240_grp, voicegroup128
-	.equ	se_w240_pri, 4
-	.equ	se_w240_rev, reverb_set+50
-	.equ	se_w240_mvl, 127
-	.equ	se_w240_key, 0
-	.equ	se_w240_tbs, 1
-	.equ	se_w240_exg, 0
-	.equ	se_w240_cmp, 1
-
-	.section .rodata
-	.global	se_w240
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w240_1:
-	.byte	KEYSH , se_w240_key+0
-	.byte	TEMPO , 220*se_w240_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 20*se_w240_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		TIE   , Gn3 , v064
-	.byte	W03
-	.byte		VOL   , 37*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        53*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        60*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        71*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        81*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        93*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        110*se_w240_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v+3
-	.byte	W06
-	.byte		        c_v+11
-	.byte	W12
-	.byte		        c_v+20
-	.byte	W06
-	.byte		        c_v+25
-	.byte	W12
-	.byte		        c_v+14
-	.byte	W06
-	.byte		        c_v+8
-	.byte	W06
-	.byte	W06
-	.byte		        c_v-3
-	.byte	W12
-	.byte		        c_v-16
-	.byte	W06
-	.byte	W06
-	.byte		        c_v-26
-	.byte	W12
-	.byte		        c_v-16
-	.byte	W06
-	.byte		VOL   , 104*se_w240_mvl/mxv
-	.byte		PAN   , c_v-5
-	.byte	W03
-	.byte		VOL   , 101*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        98*se_w240_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte	W03
-	.byte		VOL   , 93*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        90*se_w240_mvl/mxv
-	.byte		PAN   , c_v+14
-	.byte	W03
-	.byte		VOL   , 86*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        83*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        77*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        73*se_w240_mvl/mxv
-	.byte		PAN   , c_v+24
-	.byte	W03
-	.byte		VOL   , 66*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        58*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        44*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        32*se_w240_mvl/mxv
-	.byte		PAN   , c_v+15
-	.byte	W03
-	.byte		VOL   , 16*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        1*se_w240_mvl/mxv
-	.byte		PAN   , c_v+4
-	.byte	W06
-	.byte		EOT   
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w240:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w240_pri	@ Priority
-	.byte	se_w240_rev	@ Reverb.
-
-	.word	se_w240_grp
-
-	.word	se_w240_1
-
-	.end
diff --git a/sound/songs/se_w260.s b/sound/songs/se_w260.s
deleted file mode 100644
index 70e58fda1..000000000
--- a/sound/songs/se_w260.s
+++ /dev/null
@@ -1,67 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w260_grp, voicegroup128
-	.equ	se_w260_pri, 4
-	.equ	se_w260_rev, reverb_set+50
-	.equ	se_w260_mvl, 127
-	.equ	se_w260_key, 0
-	.equ	se_w260_tbs, 1
-	.equ	se_w260_exg, 0
-	.equ	se_w260_cmp, 1
-
-	.section .rodata
-	.global	se_w260
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w260_1:
-	.byte	KEYSH , se_w260_key+0
-	.byte	TEMPO , 150*se_w260_tbs/2
-	.byte		VOICE , 41
-	.byte		VOL   , 100*se_w260_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N01   , Dn5 , v127
-	.byte	W01
-	.byte		        Gn4 
-	.byte	W01
-	.byte		N09   , En5 
-	.byte	W02
-	.byte		PAN   , c_v+6
-	.byte	W02
-	.byte		VOL   , 92*se_w260_mvl/mxv
-	.byte		PAN   , c_v-8
-	.byte	W01
-	.byte		VOL   , 83*se_w260_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte	W01
-	.byte		VOL   , 71*se_w260_mvl/mxv
-	.byte		PAN   , c_v-8
-	.byte		BEND  , c_v-4
-	.byte	W01
-	.byte		VOL   , 46*se_w260_mvl/mxv
-	.byte		PAN   , c_v+11
-	.byte		BEND  , c_v-8
-	.byte	W01
-	.byte		VOL   , 22*se_w260_mvl/mxv
-	.byte		PAN   , c_v-12
-	.byte		BEND  , c_v-15
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w260:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w260_pri	@ Priority
-	.byte	se_w260_rev	@ Reverb.
-
-	.word	se_w260_grp
-
-	.word	se_w260_1
-
-	.end
diff --git a/sound/songs/se_w327.s b/sound/songs/se_w327.s
deleted file mode 100644
index 1efa6c33f..000000000
--- a/sound/songs/se_w327.s
+++ /dev/null
@@ -1,103 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w327_grp, voicegroup128
-	.equ	se_w327_pri, 4
-	.equ	se_w327_rev, reverb_set+50
-	.equ	se_w327_mvl, 127
-	.equ	se_w327_key, 0
-	.equ	se_w327_tbs, 1
-	.equ	se_w327_exg, 0
-	.equ	se_w327_cmp, 1
-
-	.section .rodata
-	.global	se_w327
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w327_1:
-	.byte	KEYSH , se_w327_key+0
-	.byte	TEMPO , 220*se_w327_tbs/2
-	.byte		VOICE , 41
-	.byte		VOL   , 110*se_w327_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+6
-	.byte		BEND  , c_v+0
-	.byte		N02   , Cn4 , v127
-	.byte	W03
-	.byte		VOL   , 104*se_w327_mvl/mxv
-	.byte	W03
-	.byte		        93*se_w327_mvl/mxv
-	.byte		PAN   , c_v-6
-	.byte		N02   , Cn5 
-	.byte	W03
-	.byte		VOL   , 110*se_w327_mvl/mxv
-	.byte	W01
-	.byte		VOICE , 22
-	.byte		PAN   , c_v+0
-	.byte		N24   , Cn4 , v060
-	.byte	W02
-	.byte	W02
-	.byte		BEND  , c_v+0
-	.byte	W04
-	.byte		        c_v+1
-	.byte	W03
-	.byte		        c_v+1
-	.byte	W01
-	.byte		VOL   , 105*se_w327_mvl/mxv
-	.byte	W02
-	.byte		BEND  , c_v+0
-	.byte	W01
-	.byte		VOL   , 103*se_w327_mvl/mxv
-	.byte	W02
-	.byte		        91*se_w327_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte	W03
-	.byte		VOL   , 77*se_w327_mvl/mxv
-	.byte		BEND  , c_v-1
-	.byte	W02
-	.byte		VOL   , 61*se_w327_mvl/mxv
-	.byte		BEND  , c_v-2
-	.byte	W01
-	.byte		VOL   , 38*se_w327_mvl/mxv
-	.byte	W01
-	.byte		        15*se_w327_mvl/mxv
-	.byte		BEND  , c_v-3
-	.byte	W02
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w327_2:
-	.byte	KEYSH , se_w327_key+0
-	.byte		VOICE , 4
-	.byte		VOL   , 110*se_w327_mvl/mxv
-	.byte		N02   , Cn3 , v060
-	.byte	W03
-	.byte		        Gn2 
-	.byte	W03
-	.byte		        Gs4 
-	.byte	W04
-	.byte		        Gs4 , v020
-	.byte	W02
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w327:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w327_pri	@ Priority
-	.byte	se_w327_rev	@ Reverb.
-
-	.word	se_w327_grp
-
-	.word	se_w327_1
-	.word	se_w327_2
-
-	.end
diff --git a/sound/songs/se_z_scroll.s b/sound/songs/se_z_scroll.s
deleted file mode 100644
index d8c792b17..000000000
--- a/sound/songs/se_z_scroll.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_z_scroll_grp, voicegroup127
-	.equ	se_z_scroll_pri, 5
-	.equ	se_z_scroll_rev, reverb_set+50
-	.equ	se_z_scroll_mvl, 127
-	.equ	se_z_scroll_key, 0
-	.equ	se_z_scroll_tbs, 1
-	.equ	se_z_scroll_exg, 0
-	.equ	se_z_scroll_cmp, 1
-
-	.section .rodata
-	.global	se_z_scroll
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_z_scroll_1:
-	.byte	KEYSH , se_z_scroll_key+0
-	.byte	TEMPO , 100*se_z_scroll_tbs/2
-	.byte		VOICE , 4
-	.byte		BENDR , 12
-	.byte		XCMD  , xIECV , 10
-	.byte		        xIECL , 8
-	.byte		VOL   , 40*se_z_scroll_mvl/mxv
-	.byte		BEND  , c_v+4
-	.byte		N01   , Gn4 , v127
-	.byte	W01
-	.byte		        Gn4 , v020
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_z_scroll:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_z_scroll_pri	@ Priority
-	.byte	se_z_scroll_rev	@ Reverb.
-
-	.word	se_z_scroll_grp
-
-	.word	se_z_scroll_1
-
-	.end