diff --git a/include/text.h b/include/text.h
index 476dbe9560..61d1c039d0 100644
--- a/include/text.h
+++ b/include/text.h
@@ -110,7 +110,8 @@
 
 #define TEXT_SPEED_FF 0xFF
 
-enum {
+enum
+{
     FONTATTR_MAX_LETTER_WIDTH,
     FONTATTR_MAX_LETTER_HEIGHT,
     FONTATTR_LETTER_SPACING,
@@ -206,21 +207,16 @@ typedef struct {
 
 struct Struct_03002F90
 {
-    u8 unk0[0x20];
-    u8 unk20[0x20];
-    u8 unk40[0x20];
-    u8 unk60[0x20];
+    u32 unk0[8];
+    u32 unk20[8];
+    u32 unk40[8];
+    u32 unk60[8];
     u8 unk80;
     u8 unk81;
 };
 
 extern TextFlags gTextFlags;
 
-extern u8 gStringVar1[];
-extern u8 gStringVar2[];
-extern u8 gStringVar3[];
-extern u8 gStringVar4[];
-
 extern u8 gUnknown_03002F84;
 extern struct Struct_03002F90 gUnknown_03002F90;
 
@@ -234,7 +230,7 @@ u32 RenderFont(struct TextPrinter *textPrinter);
 void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor);
 void SaveTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor);
 void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor);
-void DecompressGlyphTile(const u16 *src, u16 *dest);
+void DecompressGlyphTile(const void *src_, void *dest_);
 u8 GetLastTextColor(u8 colorType);
 void CopyGlyphToWindow(struct TextPrinter *x);
 void ClearTextSpan(struct TextPrinter *textPrinter, u32 width);
diff --git a/ld_script.txt b/ld_script.txt
index 989c2d740f..528924e53a 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -619,10 +619,10 @@ SECTIONS {
     {
         sound/songs/midi/mus_dummy.o(.rodata);
         sound/songs/midi/se_kaifuku.o(.rodata);
-        sound/songs/se_pc_login.o(.rodata);
-        sound/songs/se_pc_off.o(.rodata);
-        sound/songs/se_pc_on.o(.rodata);
-        sound/songs/se_select.o(.rodata);
+        sound/songs/midi/se_pc_login.o(.rodata);
+        sound/songs/midi/se_pc_off.o(.rodata);
+        sound/songs/midi/se_pc_on.o(.rodata);
+        sound/songs/midi/se_select.o(.rodata);
         sound/songs/se_win_open.o(.rodata);
         sound/songs/se_wall_hit.o(.rodata);
         sound/songs/midi/se_door.o(.rodata);
@@ -633,12 +633,12 @@ SECTIONS {
         sound/songs/midi/se_kouka_m.o(.rodata);
         sound/songs/midi/se_kouka_h.o(.rodata);
         sound/songs/midi/se_bowa2.o(.rodata);
-        sound/songs/se_poke_dead.o(.rodata);
-        sound/songs/se_nigeru.o(.rodata);
+        sound/songs/midi/se_poke_dead.o(.rodata);
+        sound/songs/midi/se_nigeru.o(.rodata);
         sound/songs/midi/se_jido_doa.o(.rodata);
-        sound/songs/se_naminori.o(.rodata);
+        sound/songs/midi/se_naminori.o(.rodata);
         sound/songs/midi/se_ban.o(.rodata);
-        sound/songs/se_pin.o(.rodata);
+        sound/songs/midi/se_pin.o(.rodata);
         sound/songs/midi/se_boo.o(.rodata);
         sound/songs/midi/se_bowa.o(.rodata);
         sound/songs/midi/se_jyuni.o(.rodata);
@@ -646,21 +646,21 @@ SECTIONS {
         sound/songs/midi/se_i.o(.rodata);
         sound/songs/se_u.o(.rodata);
         sound/songs/midi/se_e.o(.rodata);
-        sound/songs/se_o.o(.rodata);
-        sound/songs/se_n.o(.rodata);
-        sound/songs/se_seikai.o(.rodata);
+        sound/songs/midi/se_o.o(.rodata);
+        sound/songs/midi/se_n.o(.rodata);
+        sound/songs/midi/se_seikai.o(.rodata);
         sound/songs/midi/se_hazure.o(.rodata);
         sound/songs/midi/se_exp.o(.rodata);
         sound/songs/midi/se_jite_pyoko.o(.rodata);
-        sound/songs/se_mu_pachi.o(.rodata);
+        sound/songs/midi/se_mu_pachi.o(.rodata);
         sound/songs/se_tk_kasya.o(.rodata);
         sound/songs/midi/se_fu_zaku.o(.rodata);
         sound/songs/midi/se_fu_zaku2.o(.rodata);
         sound/songs/midi/se_fu_zuzuzu.o(.rodata);
-        sound/songs/se_ru_gashin.o(.rodata);
-        sound/songs/se_ru_gasyan.o(.rodata);
-        sound/songs/se_ru_bari.o(.rodata);
-        sound/songs/se_ru_hyuu.o(.rodata);
+        sound/songs/midi/se_ru_gashin.o(.rodata);
+        sound/songs/midi/se_ru_gasyan.o(.rodata);
+        sound/songs/midi/se_ru_bari.o(.rodata);
+        sound/songs/midi/se_ru_hyuu.o(.rodata);
         sound/songs/midi/se_ki_gasyan.o(.rodata);
         sound/songs/se_tk_warpin.o(.rodata);
         sound/songs/se_tk_warpout.o(.rodata);
@@ -670,15 +670,15 @@ SECTIONS {
         sound/songs/se_track_stop.o(.rodata);
         sound/songs/se_track_haiki.o(.rodata);
         sound/songs/se_track_door.o(.rodata);
-        sound/songs/se_moter.o(.rodata);
+        sound/songs/midi/se_moter.o(.rodata);
         sound/songs/midi/se_card.o(.rodata);
-        sound/songs/se_save.o(.rodata);
+        sound/songs/midi/se_save.o(.rodata);
         sound/songs/midi/se_kon.o(.rodata);
         sound/songs/midi/se_kon2.o(.rodata);
         sound/songs/midi/se_kon3.o(.rodata);
         sound/songs/midi/se_kon4.o(.rodata);
-        sound/songs/se_suikomu.o(.rodata);
-        sound/songs/se_nageru.o(.rodata);
+        sound/songs/midi/se_suikomu.o(.rodata);
+        sound/songs/midi/se_nageru.o(.rodata);
         sound/songs/se_toy_c.o(.rodata);
         sound/songs/se_toy_d.o(.rodata);
         sound/songs/se_toy_e.o(.rodata);
@@ -687,10 +687,10 @@ SECTIONS {
         sound/songs/se_toy_a.o(.rodata);
         sound/songs/se_toy_b.o(.rodata);
         sound/songs/se_toy_c1.o(.rodata);
-        sound/songs/se_mizu.o(.rodata);
+        sound/songs/midi/se_mizu.o(.rodata);
         sound/songs/midi/se_hashi.o(.rodata);
         sound/songs/midi/se_daugi.o(.rodata);
-        sound/songs/se_pinpon.o(.rodata);
+        sound/songs/midi/se_pinpon.o(.rodata);
         sound/songs/midi/se_fuusen1.o(.rodata);
         sound/songs/midi/se_fuusen2.o(.rodata);
         sound/songs/midi/se_fuusen3.o(.rodata);
@@ -698,37 +698,37 @@ SECTIONS {
         sound/songs/se_toy_dango.o(.rodata);
         sound/songs/midi/se_doku.o(.rodata);
         sound/songs/midi/se_esuka.o(.rodata);
-        sound/songs/se_t_ame.o(.rodata);
-        sound/songs/se_t_ame_e.o(.rodata);
-        sound/songs/se_t_ooame.o(.rodata);
-        sound/songs/se_t_ooame_e.o(.rodata);
-        sound/songs/se_t_koame.o(.rodata);
-        sound/songs/se_t_koame_e.o(.rodata);
-        sound/songs/se_t_kami.o(.rodata);
-        sound/songs/se_t_kami2.o(.rodata);
+        sound/songs/midi/se_t_ame.o(.rodata);
+        sound/songs/midi/se_t_ame_e.o(.rodata);
+        sound/songs/midi/se_t_ooame.o(.rodata);
+        sound/songs/midi/se_t_ooame_e.o(.rodata);
+        sound/songs/midi/se_t_koame.o(.rodata);
+        sound/songs/midi/se_t_koame_e.o(.rodata);
+        sound/songs/midi/se_t_kami.o(.rodata);
+        sound/songs/midi/se_t_kami2.o(.rodata);
         sound/songs/midi/se_elebeta.o(.rodata);
         sound/songs/midi/se_hinsi.o(.rodata);
         sound/songs/midi/se_expmax.o(.rodata);
         sound/songs/se_tamakoro.o(.rodata);
         sound/songs/se_tamakoro_e.o(.rodata);
         sound/songs/midi/se_basabasa.o(.rodata);
-        sound/songs/se_regi.o(.rodata);
+        sound/songs/midi/se_regi.o(.rodata);
         sound/songs/midi/se_c_gaji.o(.rodata);
         sound/songs/midi/se_c_maku_u.o(.rodata);
         sound/songs/midi/se_c_maku_d.o(.rodata);
         sound/songs/midi/se_c_pasi.o(.rodata);
         sound/songs/midi/se_c_syu.o(.rodata);
         sound/songs/midi/se_c_pikon.o(.rodata);
-        sound/songs/se_reapoke.o(.rodata);
-        sound/songs/se_op_basyu.o(.rodata);
+        sound/songs/midi/se_reapoke.o(.rodata);
+        sound/songs/midi/se_op_basyu.o(.rodata);
         sound/songs/midi/se_bt_start.o(.rodata);
         sound/songs/midi/se_dendou.o(.rodata);
         sound/songs/midi/se_jihanki.o(.rodata);
         sound/songs/se_tama.o(.rodata);
         sound/songs/se_z_scroll.o(.rodata);
         sound/songs/se_z_page.o(.rodata);
-        sound/songs/se_pn_on.o(.rodata);
-        sound/songs/se_pn_off.o(.rodata);
+        sound/songs/midi/se_pn_on.o(.rodata);
+        sound/songs/midi/se_pn_off.o(.rodata);
         sound/songs/midi/se_z_search.o(.rodata);
         sound/songs/se_tamago.o(.rodata);
         sound/songs/se_tb_start.o(.rodata);
@@ -865,21 +865,21 @@ SECTIONS {
         sound/songs/se_w287b.o(.rodata);
         sound/songs/se_w114.o(.rodata);
         sound/songs/se_w063b.o(.rodata);
-        sound/songs/se_rg_w_door.o(.rodata);
-        sound/songs/se_rg_card1.o(.rodata);
-        sound/songs/se_rg_card2.o(.rodata);
-        sound/songs/se_rg_card3.o(.rodata);
-        sound/songs/se_rg_bag1.o(.rodata);
-        sound/songs/se_rg_bag2.o(.rodata);
-        sound/songs/se_rg_getting.o(.rodata);
-        sound/songs/se_rg_shop.o(.rodata);
-        sound/songs/se_rg_kiteki.o(.rodata);
-        sound/songs/se_rg_help_op.o(.rodata);
-        sound/songs/se_rg_help_cl.o(.rodata);
-        sound/songs/se_rg_help_ng.o(.rodata);
-        sound/songs/se_rg_deomov.o(.rodata);
-        sound/songs/se_rg_excellent.o(.rodata);
-        sound/songs/se_rg_nawamiss.o(.rodata);
+        sound/songs/midi/se_rg_w_door.o(.rodata);
+        sound/songs/midi/se_rg_card1.o(.rodata);
+        sound/songs/midi/se_rg_card2.o(.rodata);
+        sound/songs/midi/se_rg_card3.o(.rodata);
+        sound/songs/midi/se_rg_bag1.o(.rodata);
+        sound/songs/midi/se_rg_bag2.o(.rodata);
+        sound/songs/midi/se_rg_getting.o(.rodata);
+        sound/songs/midi/se_rg_shop.o(.rodata);
+        sound/songs/midi/se_rg_kiteki.o(.rodata);
+        sound/songs/midi/se_rg_help_op.o(.rodata);
+        sound/songs/midi/se_rg_help_cl.o(.rodata);
+        sound/songs/midi/se_rg_help_ng.o(.rodata);
+        sound/songs/midi/se_rg_deomov.o(.rodata);
+        sound/songs/midi/se_rg_excellent.o(.rodata);
+        sound/songs/midi/se_rg_nawamiss.o(.rodata);
         sound/songs/se_toreeye.o(.rodata);
         sound/songs/se_toreoff.o(.rodata);
         sound/songs/midi/se_hantei1.o(.rodata);
diff --git a/songs.mk b/songs.mk
index dd65ffce7c..3520e5c052 100644
--- a/songs.mk
+++ b/songs.mk
@@ -951,5 +951,155 @@ $(MID_SUBDIR)/se_kouka_l.s: %.s: %.mid
 $(MID_SUBDIR)/se_kouka_m.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
 
+$(MID_SUBDIR)/se_mizu.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V020 -P4
+
+$(MID_SUBDIR)/se_moter.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
+
+$(MID_SUBDIR)/se_mu_pachi.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
+
+$(MID_SUBDIR)/se_n.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4
+
+$(MID_SUBDIR)/se_nageru.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P5
+
+$(MID_SUBDIR)/se_naminori.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V075 -P4
+
+$(MID_SUBDIR)/se_nigeru.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
+
+$(MID_SUBDIR)/se_o.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4
+
+$(MID_SUBDIR)/se_op_basyu.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
+$(MID_SUBDIR)/se_pc_login.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
+$(MID_SUBDIR)/se_pc_off.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
+$(MID_SUBDIR)/se_pc_on.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
+$(MID_SUBDIR)/se_pin.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V060 -P4
+
+$(MID_SUBDIR)/se_pinpon.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
+
+$(MID_SUBDIR)/se_pn_off.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
+$(MID_SUBDIR)/se_pn_on.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
+$(MID_SUBDIR)/se_poke_dead.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
+
+$(MID_SUBDIR)/se_reapoke.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P5
+
+$(MID_SUBDIR)/se_regi.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
+
+$(MID_SUBDIR)/se_rg_bag1.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
+
+$(MID_SUBDIR)/se_rg_bag2.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
+
+$(MID_SUBDIR)/se_rg_card1.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
+
+$(MID_SUBDIR)/se_rg_card2.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
+
+$(MID_SUBDIR)/se_rg_card3.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V112 -P5
+
+$(MID_SUBDIR)/se_rg_deomov.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5
+
+$(MID_SUBDIR)/se_rg_excellent.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5
+
+$(MID_SUBDIR)/se_rg_getting.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5
+
+$(MID_SUBDIR)/se_rg_help_cl.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V095 -P5
+
+$(MID_SUBDIR)/se_rg_help_ng.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V125 -P5
+
+$(MID_SUBDIR)/se_rg_help_op.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V096 -P5
+
+$(MID_SUBDIR)/se_rg_kiteki.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V096 -P5
+
+$(MID_SUBDIR)/se_rg_nawamiss.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
+
+$(MID_SUBDIR)/se_rg_shop.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5
+
+$(MID_SUBDIR)/se_rg_w_door.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5
+
+$(MID_SUBDIR)/se_ru_bari.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
+
+$(MID_SUBDIR)/se_ru_gashin.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
+
+$(MID_SUBDIR)/se_ru_gasyan.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
+
+$(MID_SUBDIR)/se_ru_hyuu.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
+
+$(MID_SUBDIR)/se_save.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P5
+
+$(MID_SUBDIR)/se_seikai.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P4
+
+$(MID_SUBDIR)/se_select.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5
+
+$(MID_SUBDIR)/se_suikomu.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
+$(MID_SUBDIR)/se_t_ame.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
+
+$(MID_SUBDIR)/se_t_ame_e.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
+
+$(MID_SUBDIR)/se_t_kami.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P3
+
+$(MID_SUBDIR)/se_t_kami2.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P3
+
+$(MID_SUBDIR)/se_t_koame.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
+
+$(MID_SUBDIR)/se_t_koame_e.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
+
+$(MID_SUBDIR)/se_t_ooame.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2
+
+$(MID_SUBDIR)/se_t_ooame_e.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/song_table.inc b/sound/song_table.inc
index 5b5813ab24..42e62b832f 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -3,7 +3,7 @@
 gSongTable:: @ 86B49F0
 	song mus_dummy, 0, 0
 	song se_kaifuku, 1, 1           @ Healing Item
-	song se_pc_login, 1, 1          @ PC Logon
+	song se_pc_login, 1, 1          @ PC Login
 	song se_pc_off, 1, 1            @ PC Shutdown
 	song se_pc_on, 1, 1             @ PC Startup
 	song se_select, 2, 2            @ Cursor Selection
@@ -36,7 +36,7 @@ gSongTable:: @ 86B49F0
 	song se_hazure, 1, 1            @ Failure
 	song se_exp, 1, 1               @ Exp. Bar
 	song se_jite_pyoko, 1, 1        @ Bunny Hop
-	song se_mu_pachi, 1, 1
+	song se_mu_pachi, 1, 1          @ Toggle Switch
 	song se_tk_kasya, 1, 1          @ Mossdeep Gym/Trick House Switch
 	song se_fu_zaku, 1, 1
 	song se_fu_zaku2, 1, 1
@@ -44,7 +44,7 @@ gSongTable:: @ 86B49F0
 	song se_ru_gashin, 1, 1         @ Sootopolis Gym - Stairs Appear
 	song se_ru_gasyan, 1, 1         @ Sootopolis Gym - Ice Breaking
 	song se_ru_bari, 1, 1           @ Sootopolis Gym - Walking on Ice
-	song se_ru_hyuu, 1, 1           @ Falling Down
+	song se_ru_hyuu, 1, 1           @ Falling Down a Hole
 	song se_ki_gasyan, 2, 2
 	song se_tk_warpin, 1, 1         @ Warp In
 	song se_tk_warpout, 1, 1        @ Warp Out
@@ -74,7 +74,7 @@ gSongTable:: @ 86B49F0
 	song se_mizu, 2, 2              @ Puddle
 	song se_hashi, 2, 2             @ Fortree Walkways
 	song se_daugi, 1, 1             @ Slots - Credits
-	song se_pinpon, 1, 1            @ Ding-dong!
+	song se_pinpon, 1, 1            @ Elevator - Reached Destination
 	song se_fuusen1, 2, 2           @ Red Balloon
 	song se_fuusen2, 2, 2           @ Blue Balloon
 	song se_fuusen3, 2, 2           @ Yellow Balloon
@@ -104,7 +104,7 @@ gSongTable:: @ 86B49F0
 	song se_c_syu, 1, 1             @ Contest - Pokémon Switches Out
 	song se_c_pikon, 1, 1           @ Contest - Pokémon Switches In
 	song se_reapoke, 1, 1           @ Shiny Pokémon
-	song se_op_basyu, 1, 1          @ Opening Movie -> Title Screen whoosh
+	song se_op_basyu, 1, 1          @ Opening Movie -> Title Screen Transition
 	song se_bt_start, 1, 1          @ Battle Mugshot whoosh
 	song se_dendou, 1, 1            @ Audience Cheering
 	song se_jihanki, 1, 1           @ Vending Machine
@@ -255,14 +255,14 @@ gSongTable:: @ 86B49F0
 	song se_rg_card3, 1, 1          @ Trainer Card 3 (FRLG)
 	song se_rg_bag1, 1, 1           @ Bag Scroll (FRLG)
 	song se_rg_bag2, 1, 1           @ Bag Pocket Change (FRLG)
-	song se_rg_getting, 1, 1        
+	song se_rg_getting, 1, 1
 	song se_rg_shop, 1, 1           @ Cash Register (FRLG)
 	song se_rg_kiteki, 1, 1         @ S.S. Anne Horn (FRLG)
 	song se_rg_help_op, 1, 1        @ Help Menu Open (FRLG)
 	song se_rg_help_cl, 1, 1        @ Help Menu Close (FRLG)
 	song se_rg_help_ng, 1, 1        @ Help Menu Error (FRLG)
 	song se_rg_deomov, 1, 1         @ Deoxys Moves
-	song se_rg_excellent, 1, 1
+	song se_rg_excellent, 1, 1      @ HP Restored (FRLG)
 	song se_rg_nawamiss, 1, 1
 	song se_toreeye, 1, 1           @ Trainer's Eye Call
 	song se_toreoff, 1, 1           @ Trainer's Eye Hang Up
diff --git a/sound/songs/midi/se_mizu.mid b/sound/songs/midi/se_mizu.mid
new file mode 100644
index 0000000000..dfdc85619c
Binary files /dev/null and b/sound/songs/midi/se_mizu.mid differ
diff --git a/sound/songs/midi/se_moter.mid b/sound/songs/midi/se_moter.mid
new file mode 100644
index 0000000000..8203333e54
Binary files /dev/null and b/sound/songs/midi/se_moter.mid differ
diff --git a/sound/songs/midi/se_mu_pachi.mid b/sound/songs/midi/se_mu_pachi.mid
new file mode 100644
index 0000000000..3d909dadb3
Binary files /dev/null and b/sound/songs/midi/se_mu_pachi.mid differ
diff --git a/sound/songs/midi/se_n.mid b/sound/songs/midi/se_n.mid
new file mode 100644
index 0000000000..282bdf216a
Binary files /dev/null and b/sound/songs/midi/se_n.mid differ
diff --git a/sound/songs/midi/se_nageru.mid b/sound/songs/midi/se_nageru.mid
new file mode 100644
index 0000000000..171f45a5ac
Binary files /dev/null and b/sound/songs/midi/se_nageru.mid differ
diff --git a/sound/songs/midi/se_naminori.mid b/sound/songs/midi/se_naminori.mid
new file mode 100644
index 0000000000..ba2aa49316
Binary files /dev/null and b/sound/songs/midi/se_naminori.mid differ
diff --git a/sound/songs/midi/se_nigeru.mid b/sound/songs/midi/se_nigeru.mid
new file mode 100644
index 0000000000..faf37d5294
Binary files /dev/null and b/sound/songs/midi/se_nigeru.mid differ
diff --git a/sound/songs/midi/se_o.mid b/sound/songs/midi/se_o.mid
new file mode 100644
index 0000000000..5dfc32727f
Binary files /dev/null and b/sound/songs/midi/se_o.mid differ
diff --git a/sound/songs/midi/se_op_basyu.mid b/sound/songs/midi/se_op_basyu.mid
new file mode 100644
index 0000000000..4648741c23
Binary files /dev/null and b/sound/songs/midi/se_op_basyu.mid differ
diff --git a/sound/songs/midi/se_pc_login.mid b/sound/songs/midi/se_pc_login.mid
new file mode 100644
index 0000000000..f46a52e7a9
Binary files /dev/null and b/sound/songs/midi/se_pc_login.mid differ
diff --git a/sound/songs/midi/se_pc_off.mid b/sound/songs/midi/se_pc_off.mid
new file mode 100644
index 0000000000..acb0960ff0
Binary files /dev/null and b/sound/songs/midi/se_pc_off.mid differ
diff --git a/sound/songs/midi/se_pc_on.mid b/sound/songs/midi/se_pc_on.mid
new file mode 100644
index 0000000000..86c0fa1c66
Binary files /dev/null and b/sound/songs/midi/se_pc_on.mid differ
diff --git a/sound/songs/midi/se_pin.mid b/sound/songs/midi/se_pin.mid
new file mode 100644
index 0000000000..fe59c2f977
Binary files /dev/null and b/sound/songs/midi/se_pin.mid differ
diff --git a/sound/songs/midi/se_pinpon.mid b/sound/songs/midi/se_pinpon.mid
new file mode 100644
index 0000000000..924dafda5e
Binary files /dev/null and b/sound/songs/midi/se_pinpon.mid differ
diff --git a/sound/songs/midi/se_pn_off.mid b/sound/songs/midi/se_pn_off.mid
new file mode 100644
index 0000000000..2fba0d159c
Binary files /dev/null and b/sound/songs/midi/se_pn_off.mid differ
diff --git a/sound/songs/midi/se_pn_on.mid b/sound/songs/midi/se_pn_on.mid
new file mode 100644
index 0000000000..dfe850794f
Binary files /dev/null and b/sound/songs/midi/se_pn_on.mid differ
diff --git a/sound/songs/midi/se_poke_dead.mid b/sound/songs/midi/se_poke_dead.mid
new file mode 100644
index 0000000000..b6a0df4c8c
Binary files /dev/null and b/sound/songs/midi/se_poke_dead.mid differ
diff --git a/sound/songs/midi/se_reapoke.mid b/sound/songs/midi/se_reapoke.mid
new file mode 100644
index 0000000000..b9a4fe8101
Binary files /dev/null and b/sound/songs/midi/se_reapoke.mid differ
diff --git a/sound/songs/midi/se_regi.mid b/sound/songs/midi/se_regi.mid
new file mode 100644
index 0000000000..28b727cb5e
Binary files /dev/null and b/sound/songs/midi/se_regi.mid differ
diff --git a/sound/songs/midi/se_rg_bag1.mid b/sound/songs/midi/se_rg_bag1.mid
new file mode 100644
index 0000000000..ac783bd382
Binary files /dev/null and b/sound/songs/midi/se_rg_bag1.mid differ
diff --git a/sound/songs/midi/se_rg_bag2.mid b/sound/songs/midi/se_rg_bag2.mid
new file mode 100644
index 0000000000..97a5b32df7
Binary files /dev/null and b/sound/songs/midi/se_rg_bag2.mid differ
diff --git a/sound/songs/midi/se_rg_card1.mid b/sound/songs/midi/se_rg_card1.mid
new file mode 100644
index 0000000000..22a50e6dfc
Binary files /dev/null and b/sound/songs/midi/se_rg_card1.mid differ
diff --git a/sound/songs/midi/se_rg_card2.mid b/sound/songs/midi/se_rg_card2.mid
new file mode 100644
index 0000000000..02276b2ad0
Binary files /dev/null and b/sound/songs/midi/se_rg_card2.mid differ
diff --git a/sound/songs/midi/se_rg_card3.mid b/sound/songs/midi/se_rg_card3.mid
new file mode 100644
index 0000000000..47cc451d0d
Binary files /dev/null and b/sound/songs/midi/se_rg_card3.mid differ
diff --git a/sound/songs/midi/se_rg_deomov.mid b/sound/songs/midi/se_rg_deomov.mid
new file mode 100644
index 0000000000..0149d29dbb
Binary files /dev/null and b/sound/songs/midi/se_rg_deomov.mid differ
diff --git a/sound/songs/midi/se_rg_excellent.mid b/sound/songs/midi/se_rg_excellent.mid
new file mode 100644
index 0000000000..8f7c267c4b
Binary files /dev/null and b/sound/songs/midi/se_rg_excellent.mid differ
diff --git a/sound/songs/midi/se_rg_getting.mid b/sound/songs/midi/se_rg_getting.mid
new file mode 100644
index 0000000000..f8bf4b38fd
Binary files /dev/null and b/sound/songs/midi/se_rg_getting.mid differ
diff --git a/sound/songs/midi/se_rg_help_cl.mid b/sound/songs/midi/se_rg_help_cl.mid
new file mode 100644
index 0000000000..09b151631c
Binary files /dev/null and b/sound/songs/midi/se_rg_help_cl.mid differ
diff --git a/sound/songs/midi/se_rg_help_ng.mid b/sound/songs/midi/se_rg_help_ng.mid
new file mode 100644
index 0000000000..f9597632aa
Binary files /dev/null and b/sound/songs/midi/se_rg_help_ng.mid differ
diff --git a/sound/songs/midi/se_rg_help_op.mid b/sound/songs/midi/se_rg_help_op.mid
new file mode 100644
index 0000000000..79b6c53a83
Binary files /dev/null and b/sound/songs/midi/se_rg_help_op.mid differ
diff --git a/sound/songs/midi/se_rg_kiteki.mid b/sound/songs/midi/se_rg_kiteki.mid
new file mode 100644
index 0000000000..07e19663ab
Binary files /dev/null and b/sound/songs/midi/se_rg_kiteki.mid differ
diff --git a/sound/songs/midi/se_rg_nawamiss.mid b/sound/songs/midi/se_rg_nawamiss.mid
new file mode 100644
index 0000000000..c3c52f88fa
Binary files /dev/null and b/sound/songs/midi/se_rg_nawamiss.mid differ
diff --git a/sound/songs/midi/se_rg_shop.mid b/sound/songs/midi/se_rg_shop.mid
new file mode 100644
index 0000000000..81ade1a636
Binary files /dev/null and b/sound/songs/midi/se_rg_shop.mid differ
diff --git a/sound/songs/midi/se_rg_w_door.mid b/sound/songs/midi/se_rg_w_door.mid
new file mode 100644
index 0000000000..e0b6ba957c
Binary files /dev/null and b/sound/songs/midi/se_rg_w_door.mid differ
diff --git a/sound/songs/midi/se_ru_bari.mid b/sound/songs/midi/se_ru_bari.mid
new file mode 100644
index 0000000000..14b1991e65
Binary files /dev/null and b/sound/songs/midi/se_ru_bari.mid differ
diff --git a/sound/songs/midi/se_ru_gashin.mid b/sound/songs/midi/se_ru_gashin.mid
new file mode 100644
index 0000000000..ae29a385b6
Binary files /dev/null and b/sound/songs/midi/se_ru_gashin.mid differ
diff --git a/sound/songs/midi/se_ru_gasyan.mid b/sound/songs/midi/se_ru_gasyan.mid
new file mode 100644
index 0000000000..486eabb9be
Binary files /dev/null and b/sound/songs/midi/se_ru_gasyan.mid differ
diff --git a/sound/songs/midi/se_ru_hyuu.mid b/sound/songs/midi/se_ru_hyuu.mid
new file mode 100644
index 0000000000..1adfc92681
Binary files /dev/null and b/sound/songs/midi/se_ru_hyuu.mid differ
diff --git a/sound/songs/midi/se_save.mid b/sound/songs/midi/se_save.mid
new file mode 100644
index 0000000000..5c4b90697b
Binary files /dev/null and b/sound/songs/midi/se_save.mid differ
diff --git a/sound/songs/midi/se_seikai.mid b/sound/songs/midi/se_seikai.mid
new file mode 100644
index 0000000000..32bfa07a87
Binary files /dev/null and b/sound/songs/midi/se_seikai.mid differ
diff --git a/sound/songs/midi/se_select.mid b/sound/songs/midi/se_select.mid
new file mode 100644
index 0000000000..5f38c82d72
Binary files /dev/null and b/sound/songs/midi/se_select.mid differ
diff --git a/sound/songs/midi/se_suikomu.mid b/sound/songs/midi/se_suikomu.mid
new file mode 100644
index 0000000000..871c8e5d3e
Binary files /dev/null and b/sound/songs/midi/se_suikomu.mid differ
diff --git a/sound/songs/midi/se_t_ame.mid b/sound/songs/midi/se_t_ame.mid
new file mode 100644
index 0000000000..9e15434cde
Binary files /dev/null and b/sound/songs/midi/se_t_ame.mid differ
diff --git a/sound/songs/midi/se_t_ame_e.mid b/sound/songs/midi/se_t_ame_e.mid
new file mode 100644
index 0000000000..2397eea648
Binary files /dev/null and b/sound/songs/midi/se_t_ame_e.mid differ
diff --git a/sound/songs/midi/se_t_kami.mid b/sound/songs/midi/se_t_kami.mid
new file mode 100644
index 0000000000..71d8163bda
Binary files /dev/null and b/sound/songs/midi/se_t_kami.mid differ
diff --git a/sound/songs/midi/se_t_kami2.mid b/sound/songs/midi/se_t_kami2.mid
new file mode 100644
index 0000000000..c47731b945
Binary files /dev/null and b/sound/songs/midi/se_t_kami2.mid differ
diff --git a/sound/songs/midi/se_t_koame.mid b/sound/songs/midi/se_t_koame.mid
new file mode 100644
index 0000000000..d8491b2936
Binary files /dev/null and b/sound/songs/midi/se_t_koame.mid differ
diff --git a/sound/songs/midi/se_t_koame_e.mid b/sound/songs/midi/se_t_koame_e.mid
new file mode 100644
index 0000000000..4a04f73f9e
Binary files /dev/null and b/sound/songs/midi/se_t_koame_e.mid differ
diff --git a/sound/songs/midi/se_t_ooame.mid b/sound/songs/midi/se_t_ooame.mid
new file mode 100644
index 0000000000..3aedd44044
Binary files /dev/null and b/sound/songs/midi/se_t_ooame.mid differ
diff --git a/sound/songs/midi/se_t_ooame_e.mid b/sound/songs/midi/se_t_ooame_e.mid
new file mode 100644
index 0000000000..b73010142d
Binary files /dev/null and b/sound/songs/midi/se_t_ooame_e.mid differ
diff --git a/sound/songs/se_mizu.s b/sound/songs/se_mizu.s
deleted file mode 100644
index f1c0d5e860..0000000000
--- a/sound/songs/se_mizu.s
+++ /dev/null
@@ -1,54 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_mizu_grp, voicegroup128
-	.equ	se_mizu_pri, 4
-	.equ	se_mizu_rev, reverb_set+50
-	.equ	se_mizu_mvl, 127
-	.equ	se_mizu_key, 0
-	.equ	se_mizu_tbs, 1
-	.equ	se_mizu_exg, 0
-	.equ	se_mizu_cmp, 1
-
-	.section .rodata
-	.global	se_mizu
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_mizu_1:
-	.byte	KEYSH , se_mizu_key+0
-	.byte	TEMPO , 150*se_mizu_tbs/2
-	.byte		VOICE , 23
-	.byte		VOL   , 20*se_mizu_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-25
-	.byte		N03   , Gs4 , v112
-	.byte	W01
-	.byte		BEND  , c_v-9
-	.byte	W01
-	.byte		        c_v+9
-	.byte	W04
-	.byte	W02
-	.byte		VOL   , 17*se_mizu_mvl/mxv
-	.byte		BEND  , c_v+18
-	.byte		N02   , Gs4 , v127
-	.byte	W01
-	.byte		BEND  , c_v+34
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_mizu:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_mizu_pri	@ Priority
-	.byte	se_mizu_rev	@ Reverb.
-
-	.word	se_mizu_grp
-
-	.word	se_mizu_1
-
-	.end
diff --git a/sound/songs/se_moter.s b/sound/songs/se_moter.s
deleted file mode 100644
index 390835125b..0000000000
--- a/sound/songs/se_moter.s
+++ /dev/null
@@ -1,49 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_moter_grp, voicegroup128
-	.equ	se_moter_pri, 4
-	.equ	se_moter_rev, reverb_set+50
-	.equ	se_moter_mvl, 127
-	.equ	se_moter_key, 0
-	.equ	se_moter_tbs, 1
-	.equ	se_moter_exg, 0
-	.equ	se_moter_cmp, 1
-
-	.section .rodata
-	.global	se_moter
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_moter_1:
-	.byte	KEYSH , se_moter_key+0
-se_moter_1_B1:
-	.byte	TEMPO , 150*se_moter_tbs/2
-	.byte		VOICE , 15
-	.byte		VOL   , 90*se_moter_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		TIE   , Gn2 , v100
-	.byte	W96
-	.byte	W96
-	.byte	W48
-	.byte		EOT   
-	.byte	GOTO
-	 .word	se_moter_1_B1
-	.byte	W48
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_moter:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_moter_pri	@ Priority
-	.byte	se_moter_rev	@ Reverb.
-
-	.word	se_moter_grp
-
-	.word	se_moter_1
-
-	.end
diff --git a/sound/songs/se_mu_pachi.s b/sound/songs/se_mu_pachi.s
deleted file mode 100644
index dbea6603a8..0000000000
--- a/sound/songs/se_mu_pachi.s
+++ /dev/null
@@ -1,47 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_mu_pachi_grp, voicegroup127
-	.equ	se_mu_pachi_pri, 4
-	.equ	se_mu_pachi_rev, reverb_set+50
-	.equ	se_mu_pachi_mvl, 127
-	.equ	se_mu_pachi_key, 0
-	.equ	se_mu_pachi_tbs, 1
-	.equ	se_mu_pachi_exg, 0
-	.equ	se_mu_pachi_cmp, 1
-
-	.section .rodata
-	.global	se_mu_pachi
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_mu_pachi_1:
-	.byte	KEYSH , se_mu_pachi_key+0
-	.byte	TEMPO , 150*se_mu_pachi_tbs/2
-	.byte		VOICE , 122
-	.byte		VOL   , 100*se_mu_pachi_mvl/mxv
-	.byte		N01   , Ds3 , v127
-	.byte	W02
-	.byte		VOICE , 126
-	.byte		N01   , Gs4 
-	.byte	W01
-	.byte	W03
-	.byte	W01
-	.byte		        Gs4 , v088
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_mu_pachi:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_mu_pachi_pri	@ Priority
-	.byte	se_mu_pachi_rev	@ Reverb.
-
-	.word	se_mu_pachi_grp
-
-	.word	se_mu_pachi_1
-
-	.end
diff --git a/sound/songs/se_n.s b/sound/songs/se_n.s
deleted file mode 100644
index dc1938b057..0000000000
--- a/sound/songs/se_n.s
+++ /dev/null
@@ -1,45 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_n_grp, voicegroup128
-	.equ	se_n_pri, 4
-	.equ	se_n_rev, reverb_set+50
-	.equ	se_n_mvl, 127
-	.equ	se_n_key, 0
-	.equ	se_n_tbs, 1
-	.equ	se_n_exg, 0
-	.equ	se_n_cmp, 1
-
-	.section .rodata
-	.global	se_n
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_n_1:
-	.byte	KEYSH , se_n_key+0
-	.byte	TEMPO , 240*se_n_tbs/2
-	.byte		VOICE , 127
-	.byte		BENDR , 12
-	.byte		VOL   , 127*se_n_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N72   , Cn3 , v127
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_n:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_n_pri	@ Priority
-	.byte	se_n_rev	@ Reverb.
-
-	.word	se_n_grp
-
-	.word	se_n_1
-
-	.end
diff --git a/sound/songs/se_nageru.s b/sound/songs/se_nageru.s
deleted file mode 100644
index 379b790bdc..0000000000
--- a/sound/songs/se_nageru.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_nageru_grp, voicegroup128
-	.equ	se_nageru_pri, 5
-	.equ	se_nageru_rev, reverb_set+50
-	.equ	se_nageru_mvl, 127
-	.equ	se_nageru_key, 0
-	.equ	se_nageru_tbs, 1
-	.equ	se_nageru_exg, 0
-	.equ	se_nageru_cmp, 1
-
-	.section .rodata
-	.global	se_nageru
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_nageru_1:
-	.byte	KEYSH , se_nageru_key+0
-	.byte	TEMPO , 150*se_nageru_tbs/2
-	.byte		VOICE , 22
-	.byte		BENDR , 12
-	.byte		VOL   , 120*se_nageru_mvl/mxv
-	.byte		BEND  , c_v+12
-	.byte		N06   , An2 , v127
-	.byte	W03
-	.byte		VOL   , 78*se_nageru_mvl/mxv
-	.byte		BEND  , c_v+20
-	.byte	W03
-	.byte		VOL   , 120*se_nageru_mvl/mxv
-	.byte		BEND  , c_v+36
-	.byte		N18   , Cn3 
-	.byte	W02
-	.byte		BEND  , c_v+35
-	.byte	W03
-	.byte		        c_v+32
-	.byte	W02
-	.byte		        c_v+26
-	.byte	W03
-	.byte		VOL   , 102*se_nageru_mvl/mxv
-	.byte		BEND  , c_v+18
-	.byte	W02
-	.byte		VOL   , 68*se_nageru_mvl/mxv
-	.byte		BEND  , c_v+7
-	.byte	W03
-	.byte		VOL   , 34*se_nageru_mvl/mxv
-	.byte		BEND  , c_v-9
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_nageru:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_nageru_pri	@ Priority
-	.byte	se_nageru_rev	@ Reverb.
-
-	.word	se_nageru_grp
-
-	.word	se_nageru_1
-
-	.end
diff --git a/sound/songs/se_naminori.s b/sound/songs/se_naminori.s
deleted file mode 100644
index 7d3c3a6376..0000000000
--- a/sound/songs/se_naminori.s
+++ /dev/null
@@ -1,94 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_naminori_grp, voicegroup127
-	.equ	se_naminori_pri, 4
-	.equ	se_naminori_rev, reverb_set+50
-	.equ	se_naminori_mvl, 127
-	.equ	se_naminori_key, 0
-	.equ	se_naminori_tbs, 1
-	.equ	se_naminori_exg, 0
-	.equ	se_naminori_cmp, 1
-
-	.section .rodata
-	.global	se_naminori
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_naminori_1:
-	.byte	KEYSH , se_naminori_key+0
-	.byte	TEMPO , 220*se_naminori_tbs/2
-	.byte		VOICE , 123
-	.byte		VOL   , 75*se_naminori_mvl/mxv
-	.byte		N03   , Ds3 , v127
-	.byte	W03
-	.byte		TIE   , Cn4 
-	.byte	W21
-	.byte	W24
-	.byte	W18
-	.byte		VOL   , 75*se_naminori_mvl/mxv
-	.byte	W06
-	.byte		        71*se_naminori_mvl/mxv
-	.byte	W05
-	.byte		        67*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        62*se_naminori_mvl/mxv
-	.byte	W04
-	.byte		        59*se_naminori_mvl/mxv
-	.byte	W05
-	.byte		        57*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        54*se_naminori_mvl/mxv
-	.byte	W04
-	.byte	W02
-	.byte		        50*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        49*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        44*se_naminori_mvl/mxv
-	.byte	W04
-	.byte		        41*se_naminori_mvl/mxv
-	.byte	W02
-	.byte		        38*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        35*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        32*se_naminori_mvl/mxv
-	.byte	W04
-	.byte		        28*se_naminori_mvl/mxv
-	.byte	W02
-	.byte		        24*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        21*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        18*se_naminori_mvl/mxv
-	.byte	W04
-	.byte		        14*se_naminori_mvl/mxv
-	.byte	W02
-	.byte		        11*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        9*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        6*se_naminori_mvl/mxv
-	.byte	W04
-	.byte		        3*se_naminori_mvl/mxv
-	.byte	W02
-	.byte		        1*se_naminori_mvl/mxv
-	.byte	W22
-	.byte		EOT   
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_naminori:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_naminori_pri	@ Priority
-	.byte	se_naminori_rev	@ Reverb.
-
-	.word	se_naminori_grp
-
-	.word	se_naminori_1
-
-	.end
diff --git a/sound/songs/se_nigeru.s b/sound/songs/se_nigeru.s
deleted file mode 100644
index babc7868d2..0000000000
--- a/sound/songs/se_nigeru.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_nigeru_grp, voicegroup127
-	.equ	se_nigeru_pri, 5
-	.equ	se_nigeru_rev, reverb_set+50
-	.equ	se_nigeru_mvl, 127
-	.equ	se_nigeru_key, 0
-	.equ	se_nigeru_tbs, 1
-	.equ	se_nigeru_exg, 0
-	.equ	se_nigeru_cmp, 1
-
-	.section .rodata
-	.global	se_nigeru
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_nigeru_1:
-	.byte	KEYSH , se_nigeru_key+0
-	.byte	TEMPO , 150*se_nigeru_tbs/2
-	.byte		VOICE , 126
-	.byte		VOL   , 90*se_nigeru_mvl/mxv
-	.byte		N03   , Fn4 , v120
-	.byte	W03
-	.byte		        Gs4 , v112
-	.byte	W03
-	.byte		N02   , Fs3 
-	.byte	W03
-	.byte		N03   , Gs4 , v072
-	.byte	W03
-	.byte		N02   , Fs3 , v096
-	.byte	W03
-	.byte		N03   , Gs4 , v056
-	.byte	W03
-	.byte		N02   , Fs3 , v080
-	.byte	W03
-	.byte		N03   , Gs4 , v040
-	.byte	W03
-	.byte		N02   , Fs3 , v064
-	.byte	W03
-	.byte		N03   , Gs4 , v024
-	.byte	W03
-	.byte		N02   , Fs3 , v048
-	.byte	W03
-	.byte		N03   , Gs4 , v020
-	.byte	W03
-	.byte		        Fs3 , v028
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_nigeru:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_nigeru_pri	@ Priority
-	.byte	se_nigeru_rev	@ Reverb.
-
-	.word	se_nigeru_grp
-
-	.word	se_nigeru_1
-
-	.end
diff --git a/sound/songs/se_o.s b/sound/songs/se_o.s
deleted file mode 100644
index a9c294f663..0000000000
--- a/sound/songs/se_o.s
+++ /dev/null
@@ -1,45 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_o_grp, voicegroup128
-	.equ	se_o_pri, 4
-	.equ	se_o_rev, reverb_set+50
-	.equ	se_o_mvl, 127
-	.equ	se_o_key, 0
-	.equ	se_o_tbs, 1
-	.equ	se_o_exg, 0
-	.equ	se_o_cmp, 1
-
-	.section .rodata
-	.global	se_o
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_o_1:
-	.byte	KEYSH , se_o_key+0
-	.byte	TEMPO , 240*se_o_tbs/2
-	.byte		VOICE , 126
-	.byte		BENDR , 12
-	.byte		VOL   , 120*se_o_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N72   , Cn3 , v127
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_o:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_o_pri	@ Priority
-	.byte	se_o_rev	@ Reverb.
-
-	.word	se_o_grp
-
-	.word	se_o_1
-
-	.end
diff --git a/sound/songs/se_op_basyu.s b/sound/songs/se_op_basyu.s
deleted file mode 100644
index 70377b9e34..0000000000
--- a/sound/songs/se_op_basyu.s
+++ /dev/null
@@ -1,174 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_op_basyu_grp, voicegroup127
-	.equ	se_op_basyu_pri, 5
-	.equ	se_op_basyu_rev, reverb_set+50
-	.equ	se_op_basyu_mvl, 127
-	.equ	se_op_basyu_key, 0
-	.equ	se_op_basyu_tbs, 1
-	.equ	se_op_basyu_exg, 0
-	.equ	se_op_basyu_cmp, 1
-
-	.section .rodata
-	.global	se_op_basyu
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_op_basyu_1:
-	.byte	KEYSH , se_op_basyu_key+0
-	.byte	TEMPO , 110*se_op_basyu_tbs/2
-	.byte		VOICE , 123
-	.byte		BENDR , 12
-	.byte		VOL   , 100*se_op_basyu_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N60   , Gs2 , v052
-	.byte	W06
-	.byte	W06
-	.byte		BEND  , c_v+0
-	.byte	W02
-	.byte		        c_v+1
-	.byte	W04
-	.byte		        c_v+2
-	.byte	W02
-	.byte		        c_v+3
-	.byte	W02
-	.byte		        c_v+5
-	.byte	W02
-	.byte	W01
-	.byte		        c_v+6
-	.byte	W02
-	.byte		        c_v+8
-	.byte	W03
-	.byte		        c_v+9
-	.byte	W02
-	.byte		        c_v+11
-	.byte	W02
-	.byte		        c_v+13
-	.byte	W02
-	.byte	W01
-	.byte		        c_v+15
-	.byte	W02
-	.byte		        c_v+17
-	.byte	W03
-	.byte		        c_v+19
-	.byte	W02
-	.byte		        c_v+24
-	.byte	W02
-	.byte		        c_v+27
-	.byte	W02
-	.byte	W01
-	.byte		        c_v+30
-	.byte	W02
-	.byte		        c_v+38
-	.byte	W03
-	.byte		        c_v+43
-	.byte	W02
-	.byte		        c_v+56
-	.byte	W02
-	.byte		        c_v+63
-	.byte	W02
-	.byte		        c_v+0
-	.byte		N72   , Gs3 
-	.byte	W04
-	.byte		BEND  , c_v+0
-	.byte	W02
-	.byte	W01
-	.byte		        c_v+1
-	.byte	W03
-	.byte		        c_v+2
-	.byte	W02
-	.byte	W01
-	.byte		        c_v+3
-	.byte	W02
-	.byte		        c_v+5
-	.byte	W03
-	.byte		        c_v+6
-	.byte	W02
-	.byte		        c_v+8
-	.byte	W02
-	.byte		        c_v+9
-	.byte	W02
-	.byte		VOL   , 98*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+11
-	.byte	W01
-	.byte		VOL   , 96*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+13
-	.byte	W01
-	.byte		VOL   , 92*se_op_basyu_mvl/mxv
-	.byte	W02
-	.byte		BEND  , c_v+15
-	.byte	W01
-	.byte		VOL   , 92*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+17
-	.byte	W01
-	.byte		VOL   , 85*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+19
-	.byte	W02
-	.byte		VOL   , 81*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+24
-	.byte	W01
-	.byte		VOL   , 74*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+27
-	.byte	W01
-	.byte		VOL   , 66*se_op_basyu_mvl/mxv
-	.byte	W02
-	.byte		BEND  , c_v+30
-	.byte	W01
-	.byte		VOL   , 62*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+38
-	.byte	W01
-	.byte		VOL   , 56*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+43
-	.byte	W02
-	.byte		VOL   , 50*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+56
-	.byte	W01
-	.byte		VOL   , 42*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+63
-	.byte	W01
-	.byte		VOL   , 34*se_op_basyu_mvl/mxv
-	.byte	W02
-	.byte	W01
-	.byte		        29*se_op_basyu_mvl/mxv
-	.byte	W02
-	.byte		        25*se_op_basyu_mvl/mxv
-	.byte	W03
-	.byte		        23*se_op_basyu_mvl/mxv
-	.byte	W02
-	.byte		        19*se_op_basyu_mvl/mxv
-	.byte	W02
-	.byte		        14*se_op_basyu_mvl/mxv
-	.byte	W02
-	.byte	W01
-	.byte		        11*se_op_basyu_mvl/mxv
-	.byte	W02
-	.byte		        5*se_op_basyu_mvl/mxv
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_op_basyu:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_op_basyu_pri	@ Priority
-	.byte	se_op_basyu_rev	@ Reverb.
-
-	.word	se_op_basyu_grp
-
-	.word	se_op_basyu_1
-
-	.end
diff --git a/sound/songs/se_pc_login.s b/sound/songs/se_pc_login.s
deleted file mode 100644
index 19efbc0a1b..0000000000
--- a/sound/songs/se_pc_login.s
+++ /dev/null
@@ -1,49 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_pc_login_grp, voicegroup127
-	.equ	se_pc_login_pri, 5
-	.equ	se_pc_login_rev, reverb_set+50
-	.equ	se_pc_login_mvl, 127
-	.equ	se_pc_login_key, 0
-	.equ	se_pc_login_tbs, 1
-	.equ	se_pc_login_exg, 0
-	.equ	se_pc_login_cmp, 1
-
-	.section .rodata
-	.global	se_pc_login
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_pc_login_1:
-	.byte	KEYSH , se_pc_login_key+0
-	.byte	TEMPO , 144*se_pc_login_tbs/2
-	.byte		VOICE , 4
-	.byte		XCMD  , xIECV , 10
-	.byte		        xIECL , 8
-	.byte		VOL   , 100*se_pc_login_mvl/mxv
-	.byte		BEND  , c_v-6
-	.byte		N08   , Cn4 , v112
-	.byte	W08
-	.byte		N04   , Cn4 , v028
-	.byte	W04
-	.byte		N08   , Cn4 , v112
-	.byte	W08
-	.byte		N04   , Cn4 , v024
-	.byte	W04
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_pc_login:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_pc_login_pri	@ Priority
-	.byte	se_pc_login_rev	@ Reverb.
-
-	.word	se_pc_login_grp
-
-	.word	se_pc_login_1
-
-	.end
diff --git a/sound/songs/se_pc_off.s b/sound/songs/se_pc_off.s
deleted file mode 100644
index 1d372f92f3..0000000000
--- a/sound/songs/se_pc_off.s
+++ /dev/null
@@ -1,48 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_pc_off_grp, voicegroup127
-	.equ	se_pc_off_pri, 5
-	.equ	se_pc_off_rev, reverb_set+50
-	.equ	se_pc_off_mvl, 127
-	.equ	se_pc_off_key, 0
-	.equ	se_pc_off_tbs, 1
-	.equ	se_pc_off_exg, 0
-	.equ	se_pc_off_cmp, 1
-
-	.section .rodata
-	.global	se_pc_off
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_pc_off_1:
-	.byte	KEYSH , se_pc_off_key+0
-	.byte	TEMPO , 120*se_pc_off_tbs/2
-	.byte		VOICE , 6
-	.byte		VOL   , 100*se_pc_off_mvl/mxv
-	.byte		BEND  , c_v-8
-	.byte		N04   , Cn3 , v112
-	.byte	W04
-	.byte		        Cn2 
-	.byte	W02
-	.byte	W02
-	.byte		        Cn1 
-	.byte	W04
-	.byte		        Cn1 , v024
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_pc_off:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_pc_off_pri	@ Priority
-	.byte	se_pc_off_rev	@ Reverb.
-
-	.word	se_pc_off_grp
-
-	.word	se_pc_off_1
-
-	.end
diff --git a/sound/songs/se_pc_on.s b/sound/songs/se_pc_on.s
deleted file mode 100644
index d46ced4a6c..0000000000
--- a/sound/songs/se_pc_on.s
+++ /dev/null
@@ -1,74 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_pc_on_grp, voicegroup127
-	.equ	se_pc_on_pri, 5
-	.equ	se_pc_on_rev, reverb_set+50
-	.equ	se_pc_on_mvl, 127
-	.equ	se_pc_on_key, 0
-	.equ	se_pc_on_tbs, 1
-	.equ	se_pc_on_exg, 0
-	.equ	se_pc_on_cmp, 1
-
-	.section .rodata
-	.global	se_pc_on
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_pc_on_1:
-	.byte	KEYSH , se_pc_on_key+0
-	.byte	TEMPO , 144*se_pc_on_tbs/2
-	.byte		VOICE , 4
-	.byte		XCMD  , xIECV , 10
-	.byte		        xIECL , 8
-	.byte		VOL   , 100*se_pc_on_mvl/mxv
-	.byte		BEND  , c_v-11
-	.byte		N12   , Cn6 , v112
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte		N04   , Cn5 , v080
-	.byte	W03
-	.byte	W01
-	.byte		        Cn4 
-	.byte	W02
-	.byte	W02
-	.byte		        Gn4 
-	.byte	W01
-	.byte	W03
-	.byte		        Cn4 
-	.byte	W03
-	.byte	W01
-	.byte		        Cn5 
-	.byte	W02
-	.byte	W02
-	.byte		        Cn4 
-	.byte	W01
-	.byte	W03
-	.byte		        Cn6 , v100
-	.byte	W03
-	.byte	W01
-	.byte		        Cn4 , v080
-	.byte	W02
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_pc_on:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_pc_on_pri	@ Priority
-	.byte	se_pc_on_rev	@ Reverb.
-
-	.word	se_pc_on_grp
-
-	.word	se_pc_on_1
-
-	.end
diff --git a/sound/songs/se_pin.s b/sound/songs/se_pin.s
deleted file mode 100644
index 29d87b749d..0000000000
--- a/sound/songs/se_pin.s
+++ /dev/null
@@ -1,50 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_pin_grp, voicegroup127
-	.equ	se_pin_pri, 4
-	.equ	se_pin_rev, reverb_set+50
-	.equ	se_pin_mvl, 127
-	.equ	se_pin_key, 0
-	.equ	se_pin_tbs, 1
-	.equ	se_pin_exg, 0
-	.equ	se_pin_cmp, 1
-
-	.section .rodata
-	.global	se_pin
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_pin_1:
-	.byte	KEYSH , se_pin_key+0
-	.byte	TEMPO , 100*se_pin_tbs/2
-	.byte		VOICE , 5
-	.byte		BENDR , 12
-	.byte		VOL   , 60*se_pin_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N03   , Gn5 , v127
-	.byte	W03
-	.byte		        Gn6 , v112
-	.byte	W03
-	.byte		        Gn6 , v024
-	.byte	W03
-	.byte		        Gn6 , v068
-	.byte	W03
-	.byte		        Gn6 , v024
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_pin:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_pin_pri	@ Priority
-	.byte	se_pin_rev	@ Reverb.
-
-	.word	se_pin_grp
-
-	.word	se_pin_1
-
-	.end
diff --git a/sound/songs/se_pinpon.s b/sound/songs/se_pinpon.s
deleted file mode 100644
index 55145fe3b5..0000000000
--- a/sound/songs/se_pinpon.s
+++ /dev/null
@@ -1,98 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_pinpon_grp, voicegroup127
-	.equ	se_pinpon_pri, 5
-	.equ	se_pinpon_rev, reverb_set+50
-	.equ	se_pinpon_mvl, 127
-	.equ	se_pinpon_key, 0
-	.equ	se_pinpon_tbs, 1
-	.equ	se_pinpon_exg, 0
-	.equ	se_pinpon_cmp, 1
-
-	.section .rodata
-	.global	se_pinpon
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_pinpon_1:
-	.byte	KEYSH , se_pinpon_key+0
-	.byte	TEMPO , 150*se_pinpon_tbs/2
-	.byte		VOICE , 15
-	.byte		BENDR , 2
-	.byte		VOL   , 90*se_pinpon_mvl/mxv
-	.byte		BEND  , c_v+1
-	.byte		N24   , Ds4 , v092
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte		BEND  , c_v+15
-	.byte		N36   , Bn3 
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_pinpon_2:
-	.byte	KEYSH , se_pinpon_key+0
-	.byte		VOICE , 14
-	.byte		VOL   , 90*se_pinpon_mvl/mxv
-	.byte		BEND  , c_v+1
-	.byte		N24   , Ds4 , v072
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte		BEND  , c_v+15
-	.byte		N36   , Bn3 
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_pinpon:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_pinpon_pri	@ Priority
-	.byte	se_pinpon_rev	@ Reverb.
-
-	.word	se_pinpon_grp
-
-	.word	se_pinpon_1
-	.word	se_pinpon_2
-
-	.end
diff --git a/sound/songs/se_pn_off.s b/sound/songs/se_pn_off.s
deleted file mode 100644
index b77a55fc7f..0000000000
--- a/sound/songs/se_pn_off.s
+++ /dev/null
@@ -1,86 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_pn_off_grp, voicegroup127
-	.equ	se_pn_off_pri, 5
-	.equ	se_pn_off_rev, reverb_set+50
-	.equ	se_pn_off_mvl, 127
-	.equ	se_pn_off_key, 0
-	.equ	se_pn_off_tbs, 1
-	.equ	se_pn_off_exg, 0
-	.equ	se_pn_off_cmp, 1
-
-	.section .rodata
-	.global	se_pn_off
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_pn_off_1:
-	.byte	KEYSH , se_pn_off_key+0
-	.byte	TEMPO , 144*se_pn_off_tbs/2
-	.byte		VOICE , 4
-	.byte		XCMD  , xIECV , 10
-	.byte		        xIECL , 8
-	.byte		VOL   , 100*se_pn_off_mvl/mxv
-	.byte		BEND  , c_v-6
-	.byte		N02   , Gn4 , v060
-	.byte	W02
-	.byte		N01   , Gn4 , v032
-	.byte	W01
-	.byte		N02   , Dn4 , v060
-	.byte	W03
-	.byte		N01   , Dn4 , v032
-	.byte	W01
-	.byte		N02   , Gn4 , v060
-	.byte	W02
-	.byte		        Gn4 , v032
-	.byte	W03
-	.byte		        Gn3 , v060
-	.byte	W02
-	.byte		        Gn3 , v032
-	.byte	W04
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_pn_off_2:
-	.byte	KEYSH , se_pn_off_key+0
-	.byte		VOICE , 14
-	.byte		VOL   , 50*se_pn_off_mvl/mxv
-	.byte		BEND  , c_v-2
-	.byte	W01
-	.byte		N02   , Gn4 , v060
-	.byte	W02
-	.byte		N01   , Gn4 , v032
-	.byte	W01
-	.byte		N02   , Dn4 , v060
-	.byte	W02
-	.byte	W01
-	.byte		N01   , Dn4 , v032
-	.byte	W01
-	.byte		N02   , Gn4 , v060
-	.byte	W02
-	.byte		        Gn4 , v032
-	.byte	W02
-	.byte	W01
-	.byte		        Gn3 , v060
-	.byte	W02
-	.byte		        Gn3 , v032
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_pn_off:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_pn_off_pri	@ Priority
-	.byte	se_pn_off_rev	@ Reverb.
-
-	.word	se_pn_off_grp
-
-	.word	se_pn_off_1
-	.word	se_pn_off_2
-
-	.end
diff --git a/sound/songs/se_pn_on.s b/sound/songs/se_pn_on.s
deleted file mode 100644
index 9c6186399c..0000000000
--- a/sound/songs/se_pn_on.s
+++ /dev/null
@@ -1,86 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_pn_on_grp, voicegroup127
-	.equ	se_pn_on_pri, 5
-	.equ	se_pn_on_rev, reverb_set+50
-	.equ	se_pn_on_mvl, 127
-	.equ	se_pn_on_key, 0
-	.equ	se_pn_on_tbs, 1
-	.equ	se_pn_on_exg, 0
-	.equ	se_pn_on_cmp, 1
-
-	.section .rodata
-	.global	se_pn_on
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_pn_on_1:
-	.byte	KEYSH , se_pn_on_key+0
-	.byte	TEMPO , 144*se_pn_on_tbs/2
-	.byte		VOICE , 4
-	.byte		XCMD  , xIECV , 10
-	.byte		        xIECL , 8
-	.byte		VOL   , 100*se_pn_on_mvl/mxv
-	.byte		BEND  , c_v-6
-	.byte		N02   , Cn4 , v060
-	.byte	W02
-	.byte		N01   , Cn4 , v032
-	.byte	W01
-	.byte		N02   , Gn4 , v060
-	.byte	W03
-	.byte		N01   , Gn4 , v032
-	.byte	W01
-	.byte		N02   , Cn4 , v060
-	.byte	W02
-	.byte		        Cn4 , v032
-	.byte	W03
-	.byte		        Cn5 , v060
-	.byte	W02
-	.byte		        Cn5 , v032
-	.byte	W04
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_pn_on_2:
-	.byte	KEYSH , se_pn_on_key+0
-	.byte		VOICE , 14
-	.byte		VOL   , 50*se_pn_on_mvl/mxv
-	.byte		BEND  , c_v-2
-	.byte	W01
-	.byte		N02   , Cn4 , v060
-	.byte	W02
-	.byte		N01   , Cn4 , v032
-	.byte	W01
-	.byte		N02   , Gn4 , v060
-	.byte	W02
-	.byte	W01
-	.byte		N01   , Gn4 , v032
-	.byte	W01
-	.byte		N02   , Cn4 , v060
-	.byte	W02
-	.byte		        Cn4 , v032
-	.byte	W02
-	.byte	W01
-	.byte		        Cn5 , v060
-	.byte	W02
-	.byte		        Cn5 , v032
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_pn_on:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_pn_on_pri	@ Priority
-	.byte	se_pn_on_rev	@ Reverb.
-
-	.word	se_pn_on_grp
-
-	.word	se_pn_on_1
-	.word	se_pn_on_2
-
-	.end
diff --git a/sound/songs/se_poke_dead.s b/sound/songs/se_poke_dead.s
deleted file mode 100644
index 0d66039a2c..0000000000
--- a/sound/songs/se_poke_dead.s
+++ /dev/null
@@ -1,84 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_poke_dead_grp, voicegroup127
-	.equ	se_poke_dead_pri, 5
-	.equ	se_poke_dead_rev, reverb_set+50
-	.equ	se_poke_dead_mvl, 127
-	.equ	se_poke_dead_key, 0
-	.equ	se_poke_dead_tbs, 1
-	.equ	se_poke_dead_exg, 0
-	.equ	se_poke_dead_cmp, 1
-
-	.section .rodata
-	.global	se_poke_dead
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_poke_dead_1:
-	.byte	KEYSH , se_poke_dead_key+0
-	.byte	TEMPO , 90*se_poke_dead_tbs/2
-	.byte		VOICE , 90
-	.byte		VOL   , 110*se_poke_dead_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N09   , Cn4 , v100
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_poke_dead_2:
-	.byte	KEYSH , se_poke_dead_key+0
-	.byte		VOICE , 124
-	.byte		BENDR , 12
-	.byte		VOL   , 82*se_poke_dead_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N05   , Gs4 , v060
-	.byte	W03
-	.byte		VOL   , 94*se_poke_dead_mvl/mxv
-	.byte	W03
-	.byte		        103*se_poke_dead_mvl/mxv
-	.byte		N22   
-	.byte	W03
-	.byte		VOL   , 110*se_poke_dead_mvl/mxv
-	.byte	W03
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  3 **********************@
-
-se_poke_dead_3:
-	.byte	KEYSH , se_poke_dead_key+0
-	.byte		VOICE , 0
-	.byte		VOL   , 110*se_poke_dead_mvl/mxv
-	.byte		N06   , Cn3 , v080
-	.byte	W06
-	.byte		N18   , Cn3 , v092
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_poke_dead:
-	.byte	3	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_poke_dead_pri	@ Priority
-	.byte	se_poke_dead_rev	@ Reverb.
-
-	.word	se_poke_dead_grp
-
-	.word	se_poke_dead_1
-	.word	se_poke_dead_2
-	.word	se_poke_dead_3
-
-	.end
diff --git a/sound/songs/se_reapoke.s b/sound/songs/se_reapoke.s
deleted file mode 100644
index 11415920b3..0000000000
--- a/sound/songs/se_reapoke.s
+++ /dev/null
@@ -1,106 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_reapoke_grp, voicegroup128
-	.equ	se_reapoke_pri, 5
-	.equ	se_reapoke_rev, reverb_set+50
-	.equ	se_reapoke_mvl, 127
-	.equ	se_reapoke_key, 0
-	.equ	se_reapoke_tbs, 1
-	.equ	se_reapoke_exg, 0
-	.equ	se_reapoke_cmp, 1
-
-	.section .rodata
-	.global	se_reapoke
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_reapoke_1:
-	.byte	KEYSH , se_reapoke_key+0
-	.byte	TEMPO , 220*se_reapoke_tbs/2
-	.byte		VOICE , 46
-	.byte		VOL   , 95*se_reapoke_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+1
-	.byte		N03   , Cn6 , v127
-	.byte	W01
-	.byte		PAN   , c_v+2
-	.byte		BEND  , c_v+2
-	.byte	W01
-	.byte		        c_v+4
-	.byte	W01
-	.byte		        c_v+1
-	.byte		N06   , Gn6 
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W02
-	.byte	W03
-	.byte		BEND  , c_v+1
-	.byte		N03   , Cn6 , v104
-	.byte	W01
-	.byte		PAN   , c_v-2
-	.byte		BEND  , c_v+2
-	.byte	W02
-	.byte		        c_v+4
-	.byte	W01
-	.byte		        c_v+1
-	.byte		N06   , Gn6 
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W04
-	.byte	W01
-	.byte		BEND  , c_v+1
-	.byte		N03   , Cs6 , v080
-	.byte	W01
-	.byte		PAN   , c_v+4
-	.byte		BEND  , c_v+2
-	.byte	W01
-	.byte		        c_v+4
-	.byte	W01
-	.byte		        c_v+1
-	.byte		N06   , Gs6 
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W04
-	.byte		BEND  , c_v+1
-	.byte		N03   , Cs6 , v048
-	.byte	W02
-	.byte		PAN   , c_v-5
-	.byte		BEND  , c_v+2
-	.byte	W01
-	.byte		        c_v+4
-	.byte	W01
-	.byte		        c_v+1
-	.byte		N06   , Gs6 
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte	W02
-	.byte		        c_v+4
-	.byte		BEND  , c_v+1
-	.byte		N03   , Cs6 , v032
-	.byte	W01
-	.byte		BEND  , c_v+2
-	.byte	W01
-	.byte		        c_v+4
-	.byte	W02
-	.byte		        c_v+0
-	.byte		N06   , Gs6 
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_reapoke:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_reapoke_pri	@ Priority
-	.byte	se_reapoke_rev	@ Reverb.
-
-	.word	se_reapoke_grp
-
-	.word	se_reapoke_1
-
-	.end
diff --git a/sound/songs/se_regi.s b/sound/songs/se_regi.s
deleted file mode 100644
index 2bc43c5159..0000000000
--- a/sound/songs/se_regi.s
+++ /dev/null
@@ -1,63 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_regi_grp, voicegroup127
-	.equ	se_regi_pri, 5
-	.equ	se_regi_rev, reverb_set+50
-	.equ	se_regi_mvl, 127
-	.equ	se_regi_key, 0
-	.equ	se_regi_tbs, 1
-	.equ	se_regi_exg, 0
-	.equ	se_regi_cmp, 1
-
-	.section .rodata
-	.global	se_regi
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_regi_1:
-	.byte	KEYSH , se_regi_key+0
-	.byte	TEMPO , 128*se_regi_tbs/2
-	.byte		VOICE , 6
-	.byte		BENDR , 12
-	.byte		VOL   , 90*se_regi_mvl/mxv
-	.byte		BEND  , c_v-1
-	.byte		N01   , Ds3 , v127
-	.byte	W02
-	.byte		N03   , Gs3 , v100
-	.byte	W05
-	.byte		N16   , Fn5 , v072
-	.byte	W05
-	.byte	W12
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_regi_2:
-	.byte	KEYSH , se_regi_key+0
-	.byte		VOICE , 14
-	.byte		VOL   , 90*se_regi_mvl/mxv
-	.byte		BEND  , c_v-8
-	.byte	W02
-	.byte		N03   , Gs3 , v060
-	.byte	W05
-	.byte		N16   , Fn5 
-	.byte	W05
-	.byte	W12
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_regi:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_regi_pri	@ Priority
-	.byte	se_regi_rev	@ Reverb.
-
-	.word	se_regi_grp
-
-	.word	se_regi_1
-	.word	se_regi_2
-
-	.end
diff --git a/sound/songs/se_rg_bag1.s b/sound/songs/se_rg_bag1.s
deleted file mode 100644
index d2dd38ed5c..0000000000
--- a/sound/songs/se_rg_bag1.s
+++ /dev/null
@@ -1,60 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_bag1_grp, voicegroup129
-	.equ	se_rg_bag1_pri, 5
-	.equ	se_rg_bag1_rev, reverb_set+50
-	.equ	se_rg_bag1_mvl, 127
-	.equ	se_rg_bag1_key, 0
-	.equ	se_rg_bag1_tbs, 1
-	.equ	se_rg_bag1_exg, 0
-	.equ	se_rg_bag1_cmp, 1
-
-	.section .rodata
-	.global	se_rg_bag1
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_bag1_1:
-	.byte	KEYSH , se_rg_bag1_key+0
-	.byte	TEMPO , 310*se_rg_bag1_tbs/2
-	.byte		VOICE , 10
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		VOL   , 127*se_rg_bag1_mvl/mxv
-	.byte		BEND  , c_v+2
-	.byte		N01   , Cs4 , v072
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_bag1_2:
-	.byte		VOL   , 127*se_rg_bag1_mvl/mxv
-	.byte	KEYSH , se_rg_bag1_key+0
-	.byte		VOICE , 124
-	.byte		N01   , Cs5 , v072
-	.byte	W01
-	.byte		        Ds5 , v104
-	.byte	W02
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_bag1:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_bag1_pri	@ Priority
-	.byte	se_rg_bag1_rev	@ Reverb.
-
-	.word	se_rg_bag1_grp
-
-	.word	se_rg_bag1_1
-	.word	se_rg_bag1_2
-
-	.end
diff --git a/sound/songs/se_rg_bag2.s b/sound/songs/se_rg_bag2.s
deleted file mode 100644
index 7d4f338c55..0000000000
--- a/sound/songs/se_rg_bag2.s
+++ /dev/null
@@ -1,65 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_bag2_grp, voicegroup129
-	.equ	se_rg_bag2_pri, 5
-	.equ	se_rg_bag2_rev, reverb_set+50
-	.equ	se_rg_bag2_mvl, 127
-	.equ	se_rg_bag2_key, 0
-	.equ	se_rg_bag2_tbs, 1
-	.equ	se_rg_bag2_exg, 0
-	.equ	se_rg_bag2_cmp, 1
-
-	.section .rodata
-	.global	se_rg_bag2
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_bag2_1:
-	.byte	KEYSH , se_rg_bag2_key+0
-	.byte	TEMPO , 422*se_rg_bag2_tbs/2
-	.byte		VOICE , 80
-	.byte		VOL   , 64*se_rg_bag2_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N02   , Dn4 , v084
-	.byte	W02
-	.byte		BEND  , c_v+17
-	.byte		N03   , Fs4 , v080
-	.byte	W01
-	.byte		BEND  , c_v-40
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_bag2_2:
-	.byte	KEYSH , se_rg_bag2_key+0
-	.byte		VOICE , 2
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		VOL   , 127*se_rg_bag2_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N04   , En3 , v127
-	.byte	W03
-	.byte	W01
-	.byte		VOICE , 2
-	.byte		N02   , Bn3 
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_bag2:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_bag2_pri	@ Priority
-	.byte	se_rg_bag2_rev	@ Reverb.
-
-	.word	se_rg_bag2_grp
-
-	.word	se_rg_bag2_1
-	.word	se_rg_bag2_2
-
-	.end
diff --git a/sound/songs/se_rg_card1.s b/sound/songs/se_rg_card1.s
deleted file mode 100644
index 1f2d72c3e3..0000000000
--- a/sound/songs/se_rg_card1.s
+++ /dev/null
@@ -1,48 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_card1_grp, voicegroup129
-	.equ	se_rg_card1_pri, 5
-	.equ	se_rg_card1_rev, reverb_set+50
-	.equ	se_rg_card1_mvl, 127
-	.equ	se_rg_card1_key, 0
-	.equ	se_rg_card1_tbs, 1
-	.equ	se_rg_card1_exg, 0
-	.equ	se_rg_card1_cmp, 1
-
-	.section .rodata
-	.global	se_rg_card1
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_card1_1:
-	.byte	KEYSH , se_rg_card1_key+0
-	.byte	TEMPO , 182*se_rg_card1_tbs/2
-	.byte		VOICE , 125
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 127*se_rg_card1_mvl/mxv
-	.byte		BEND  , c_v+2
-	.byte		N01   , Cn4 , v127
-	.byte	W03
-	.byte		VOICE , 124
-	.byte		N01   , Cn5 , v064
-	.byte	W21
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_card1:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_card1_pri	@ Priority
-	.byte	se_rg_card1_rev	@ Reverb.
-
-	.word	se_rg_card1_grp
-
-	.word	se_rg_card1_1
-
-	.end
diff --git a/sound/songs/se_rg_card2.s b/sound/songs/se_rg_card2.s
deleted file mode 100644
index 7f83de0970..0000000000
--- a/sound/songs/se_rg_card2.s
+++ /dev/null
@@ -1,62 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_card2_grp, voicegroup129
-	.equ	se_rg_card2_pri, 5
-	.equ	se_rg_card2_rev, reverb_set+50
-	.equ	se_rg_card2_mvl, 127
-	.equ	se_rg_card2_key, 0
-	.equ	se_rg_card2_tbs, 1
-	.equ	se_rg_card2_exg, 0
-	.equ	se_rg_card2_cmp, 1
-
-	.section .rodata
-	.global	se_rg_card2
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_card2_1:
-	.byte	KEYSH , se_rg_card2_key+0
-	.byte	TEMPO , 182*se_rg_card2_tbs/2
-	.byte		VOICE , 125
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 16*se_rg_card2_mvl/mxv
-	.byte		BEND  , c_v+2
-	.byte		N24   , Gn5 , v088
-	.byte	W03
-	.byte		VOL   , 32*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        48*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        64*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        80*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        96*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        112*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        127*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_card2:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_card2_pri	@ Priority
-	.byte	se_rg_card2_rev	@ Reverb.
-
-	.word	se_rg_card2_grp
-
-	.word	se_rg_card2_1
-
-	.end
diff --git a/sound/songs/se_rg_card3.s b/sound/songs/se_rg_card3.s
deleted file mode 100644
index e456c6bbe4..0000000000
--- a/sound/songs/se_rg_card3.s
+++ /dev/null
@@ -1,110 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_card3_grp, voicegroup129
-	.equ	se_rg_card3_pri, 5
-	.equ	se_rg_card3_rev, reverb_set+50
-	.equ	se_rg_card3_mvl, 127
-	.equ	se_rg_card3_key, 0
-	.equ	se_rg_card3_tbs, 1
-	.equ	se_rg_card3_exg, 0
-	.equ	se_rg_card3_cmp, 1
-
-	.section .rodata
-	.global	se_rg_card3
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_card3_1:
-	.byte	KEYSH , se_rg_card3_key+0
-	.byte	TEMPO , 174*se_rg_card3_tbs/2
-	.byte		VOICE , 46
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		VOL   , 112*se_rg_card3_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 112*se_rg_card3_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N03   , An5 , v112
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte		N03   , Bn5 
-	.byte	W03
-	.byte		VOL   , 112*se_rg_card3_mvl/mxv
-	.byte		PAN   , c_v-48
-	.byte		N06   , En6 
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		        112*se_rg_card3_mvl/mxv
-	.byte		PAN   , c_v+48
-	.byte		N06   , En6 , v040
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v-48
-	.byte		VOL   , 97*se_rg_card3_mvl/mxv
-	.byte		N06   , En6 , v032
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v+48
-	.byte		VOL   , 96*se_rg_card3_mvl/mxv
-	.byte		N06   , En6 , v024
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v-48
-	.byte		VOL   , 80*se_rg_card3_mvl/mxv
-	.byte		N06   , En6 , v016
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v+48
-	.byte		VOL   , 80*se_rg_card3_mvl/mxv
-	.byte		N06   , En6 , v012
-	.byte	W03
-	.byte		VOL   , 48*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		N06   , En6 , v008
-	.byte	W03
-	.byte		VOL   , 2*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_card3_2:
-	.byte	KEYSH , se_rg_card3_key+0
-	.byte		VOICE , 124
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte		N03   , Cn5 , v092
-	.byte	W06
-	.byte		        Cn5 , v032
-	.byte	W18
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_card3:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_card3_pri	@ Priority
-	.byte	se_rg_card3_rev	@ Reverb.
-
-	.word	se_rg_card3_grp
-
-	.word	se_rg_card3_1
-	.word	se_rg_card3_2
-
-	.end
diff --git a/sound/songs/se_rg_deomov.s b/sound/songs/se_rg_deomov.s
deleted file mode 100644
index 7c2e691bf9..0000000000
--- a/sound/songs/se_rg_deomov.s
+++ /dev/null
@@ -1,204 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_deomov_grp, voicegroup129
-	.equ	se_rg_deomov_pri, 5
-	.equ	se_rg_deomov_rev, reverb_set+50
-	.equ	se_rg_deomov_mvl, 127
-	.equ	se_rg_deomov_key, 0
-	.equ	se_rg_deomov_tbs, 1
-	.equ	se_rg_deomov_exg, 0
-	.equ	se_rg_deomov_cmp, 1
-
-	.section .rodata
-	.global	se_rg_deomov
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_deomov_1:
-	.byte	KEYSH , se_rg_deomov_key+0
-	.byte	TEMPO , 262*se_rg_deomov_tbs/2
-	.byte		VOICE , 123
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 40*se_rg_deomov_mvl/mxv
-	.byte		BEND  , c_v+2
-	.byte		N02   , Cn2 , v120
-	.byte	W08
-	.byte		N04   , Cn5 
-	.byte	W16
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_deomov_2:
-	.byte	KEYSH , se_rg_deomov_key+0
-	.byte		VOICE , 31
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		VOL   , 80*se_rg_deomov_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-64
-	.byte		TIE   , En4 , v032
-	.byte	W24
-	.byte	W04
-	.byte		BEND  , c_v-55
-	.byte	W02
-	.byte		        c_v-50
-	.byte	W02
-	.byte		        c_v-39
-	.byte	W02
-	.byte		        c_v-32
-	.byte	W02
-	.byte		        c_v-23
-	.byte	W02
-	.byte		        c_v-18
-	.byte	W02
-	.byte		        c_v-9
-	.byte	W02
-	.byte		        c_v-2
-	.byte	W02
-	.byte		        c_v+16
-	.byte	W02
-	.byte		        c_v+23
-	.byte	W02
-	.byte		        c_v+32
-	.byte	W02
-	.byte		        c_v+39
-	.byte	W02
-	.byte		        c_v+48
-	.byte	W02
-	.byte		        c_v+56
-	.byte	W02
-	.byte		        c_v+63
-	.byte	W16
-	.byte	W24
-	.byte	W24
-	.byte		VOL   , 70*se_rg_deomov_mvl/mxv
-	.byte	W04
-	.byte		        66*se_rg_deomov_mvl/mxv
-	.byte	W06
-	.byte		        60*se_rg_deomov_mvl/mxv
-	.byte	W06
-	.byte		        55*se_rg_deomov_mvl/mxv
-	.byte	W08
-	.byte		        49*se_rg_deomov_mvl/mxv
-	.byte	W06
-	.byte		        44*se_rg_deomov_mvl/mxv
-	.byte	W06
-	.byte		        40*se_rg_deomov_mvl/mxv
-	.byte	W06
-	.byte		        35*se_rg_deomov_mvl/mxv
-	.byte	W06
-	.byte		        30*se_rg_deomov_mvl/mxv
-	.byte	W04
-	.byte		        24*se_rg_deomov_mvl/mxv
-	.byte	W02
-	.byte		        20*se_rg_deomov_mvl/mxv
-	.byte	W02
-	.byte		        15*se_rg_deomov_mvl/mxv
-	.byte	W04
-	.byte		        10*se_rg_deomov_mvl/mxv
-	.byte	W06
-	.byte		        0*se_rg_deomov_mvl/mxv
-	.byte	W06
-	.byte		EOT   
-	.byte	FINE
-
-@********************** Track  3 **********************@
-
-se_rg_deomov_3:
-	.byte	KEYSH , se_rg_deomov_key+0
-	.byte		VOICE , 50
-	.byte		VOL   , 69*se_rg_deomov_mvl/mxv
-	.byte		PAN   , c_v-64
-	.byte	W24
-	.byte		        c_v+63
-	.byte		N01   , Fs4 , v064
-	.byte	W06
-	.byte		        Gs4 
-	.byte	W03
-	.byte		PAN   , c_v-64
-	.byte	W07
-	.byte		N01   , En5 
-	.byte	W05
-	.byte		        Fs5 
-	.byte	W03
-	.byte		PAN   , c_v+63
-	.byte	W10
-	.byte		N01   , Dn5 
-	.byte	W03
-	.byte		        Cn5 
-	.byte	W07
-	.byte		PAN   , c_v-64
-	.byte	W04
-	.byte		N01   , Fs3 
-	.byte	W03
-	.byte		        Gs3 
-	.byte	W09
-	.byte		PAN   , c_v+63
-	.byte	W04
-	.byte		N01   , Bn4 
-	.byte	W04
-	.byte		        Dn5 
-	.byte	W04
-	.byte		PAN   , c_v-64
-	.byte	W09
-	.byte		N01   , Fs5 
-	.byte	W09
-	.byte		        Cs5 
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte	W02
-	.byte		N01   , Cs4 , v036
-	.byte	W02
-	.byte		        As3 
-	.byte	W08
-	.byte		        Fs3 
-	.byte	W03
-	.byte		        Gs3 
-	.byte	W09
-	.byte		PAN   , c_v-64
-	.byte	W03
-	.byte		N01   , Dn5 , v028
-	.byte	W03
-	.byte		        Cn5 
-	.byte	W06
-	.byte		        Fs4 
-	.byte	W03
-	.byte		        Cn4 
-	.byte	W04
-	.byte		        Gn3 
-	.byte	W05
-	.byte		PAN   , c_v+63
-	.byte	W06
-	.byte		N01   , Gn4 , v020
-	.byte	W02
-	.byte		        An4 
-	.byte	W16
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_deomov:
-	.byte	3	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_deomov_pri	@ Priority
-	.byte	se_rg_deomov_rev	@ Reverb.
-
-	.word	se_rg_deomov_grp
-
-	.word	se_rg_deomov_1
-	.word	se_rg_deomov_2
-	.word	se_rg_deomov_3
-
-	.end
diff --git a/sound/songs/se_rg_excellent.s b/sound/songs/se_rg_excellent.s
deleted file mode 100644
index 63c0eae194..0000000000
--- a/sound/songs/se_rg_excellent.s
+++ /dev/null
@@ -1,155 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_excellent_grp, voicegroup128
-	.equ	se_rg_excellent_pri, 5
-	.equ	se_rg_excellent_rev, reverb_set+50
-	.equ	se_rg_excellent_mvl, 127
-	.equ	se_rg_excellent_key, 0
-	.equ	se_rg_excellent_tbs, 1
-	.equ	se_rg_excellent_exg, 0
-	.equ	se_rg_excellent_cmp, 1
-
-	.section .rodata
-	.global	se_rg_excellent
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_excellent_1:
-	.byte	KEYSH , se_rg_excellent_key+0
-	.byte	TEMPO , 150*se_rg_excellent_tbs/2
-	.byte		VOICE , 46
-	.byte		VOL   , 110*se_rg_excellent_mvl/mxv
-	.byte		BENDR , 2
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+15
-	.byte	W01
-	.byte		N02   , Dn6 , v112
-	.byte	W02
-	.byte		        Cs6 
-	.byte	W03
-	.byte		PAN   , c_v+8
-	.byte		N02   , An5 
-	.byte	W02
-	.byte		        Fs5 
-	.byte	W01
-	.byte	W01
-	.byte		        Dn5 
-	.byte	W02
-	.byte		PAN   , c_v-7
-	.byte	W01
-	.byte		N02   , Dn5 , v104
-	.byte	W02
-	.byte		        Cs5 , v100
-	.byte	W03
-	.byte		PAN   , c_v+0
-	.byte		N02   , An4 , v096
-	.byte	W02
-	.byte		        Fs4 , v092
-	.byte	W01
-	.byte	W01
-	.byte		        Dn4 , v088
-	.byte	W02
-	.byte		PAN   , c_v+15
-	.byte	W01
-	.byte		N02   , Dn6 
-	.byte	W02
-	.byte		        Cs6 , v084
-	.byte	W03
-	.byte		        An5 , v080
-	.byte	W02
-	.byte		        Fs5 , v076
-	.byte	W01
-	.byte	W01
-	.byte		        Dn5 , v072
-	.byte	W02
-	.byte		PAN   , c_v-16
-	.byte	W01
-	.byte		N02   , Dn6 , v068
-	.byte	W02
-	.byte		        Cs6 , v064
-	.byte	W03
-	.byte		        An5 , v060
-	.byte	W02
-	.byte		        Fs5 , v056
-	.byte	W01
-	.byte	W01
-	.byte		        Dn5 , v052
-	.byte	W02
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_excellent_2:
-	.byte	KEYSH , se_rg_excellent_key+0
-	.byte		VOICE , 53
-	.byte		BENDR , 2
-	.byte		VOL   , 43*se_rg_excellent_mvl/mxv
-	.byte		BEND  , c_v+15
-	.byte		N02   , An6 , v112
-	.byte	W02
-	.byte		        Fs6 
-	.byte	W01
-	.byte	W01
-	.byte		        Dn6 
-	.byte	W02
-	.byte	W01
-	.byte		        Cs6 
-	.byte	W02
-	.byte		        An5 
-	.byte	W03
-	.byte		N02   
-	.byte	W02
-	.byte		        Fs5 , v104
-	.byte	W01
-	.byte	W01
-	.byte		        Dn5 , v100
-	.byte	W02
-	.byte	W01
-	.byte		        Cs5 , v096
-	.byte	W02
-	.byte		        An4 , v092
-	.byte	W03
-	.byte		        An6 , v088
-	.byte	W02
-	.byte		        Fs6 , v084
-	.byte	W01
-	.byte	W01
-	.byte		        Dn6 , v080
-	.byte	W02
-	.byte	W01
-	.byte		        Cs6 , v076
-	.byte	W02
-	.byte		        An5 , v072
-	.byte	W03
-	.byte		        An6 , v068
-	.byte	W02
-	.byte		        Fs6 , v064
-	.byte	W01
-	.byte	W01
-	.byte		        Dn6 , v060
-	.byte	W02
-	.byte	W01
-	.byte		        Cs6 , v056
-	.byte	W02
-	.byte		        An5 , v052
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_excellent:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_excellent_pri	@ Priority
-	.byte	se_rg_excellent_rev	@ Reverb.
-
-	.word	se_rg_excellent_grp
-
-	.word	se_rg_excellent_1
-	.word	se_rg_excellent_2
-
-	.end
diff --git a/sound/songs/se_rg_getting.s b/sound/songs/se_rg_getting.s
deleted file mode 100644
index 2c632f399c..0000000000
--- a/sound/songs/se_rg_getting.s
+++ /dev/null
@@ -1,69 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_getting_grp, voicegroup129
-	.equ	se_rg_getting_pri, 5
-	.equ	se_rg_getting_rev, reverb_set+50
-	.equ	se_rg_getting_mvl, 127
-	.equ	se_rg_getting_key, 0
-	.equ	se_rg_getting_tbs, 1
-	.equ	se_rg_getting_exg, 0
-	.equ	se_rg_getting_cmp, 1
-
-	.section .rodata
-	.global	se_rg_getting
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_getting_1:
-	.byte	KEYSH , se_rg_getting_key+0
-	.byte	TEMPO , 310*se_rg_getting_tbs/2
-	.byte		VOICE , 3
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		VOL   , 100*se_rg_getting_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N02   , Bn3 , v120
-	.byte	W03
-	.byte	W03
-	.byte	W02
-	.byte		        En4 , v127
-	.byte	W01
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_getting_2:
-	.byte	KEYSH , se_rg_getting_key+0
-	.byte		VOICE , 126
-	.byte		VOL   , 100*se_rg_getting_mvl/mxv
-	.byte	W03
-	.byte	W01
-	.byte		N01   , Cn2 , v120
-	.byte	W02
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_getting:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_getting_pri	@ Priority
-	.byte	se_rg_getting_rev	@ Reverb.
-
-	.word	se_rg_getting_grp
-
-	.word	se_rg_getting_1
-	.word	se_rg_getting_2
-
-	.end
diff --git a/sound/songs/se_rg_help_cl.s b/sound/songs/se_rg_help_cl.s
deleted file mode 100644
index 8daa70ae9b..0000000000
--- a/sound/songs/se_rg_help_cl.s
+++ /dev/null
@@ -1,82 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_help_cl_grp, voicegroup129
-	.equ	se_rg_help_cl_pri, 5
-	.equ	se_rg_help_cl_rev, reverb_set+50
-	.equ	se_rg_help_cl_mvl, 127
-	.equ	se_rg_help_cl_key, 0
-	.equ	se_rg_help_cl_tbs, 1
-	.equ	se_rg_help_cl_exg, 0
-	.equ	se_rg_help_cl_cmp, 1
-
-	.section .rodata
-	.global	se_rg_help_cl
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_help_cl_1:
-	.byte	KEYSH , se_rg_help_cl_key+0
-	.byte	TEMPO , 420*se_rg_help_cl_tbs/2
-	.byte		VOICE , 24
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		VOL   , 95*se_rg_help_cl_mvl/mxv
-	.byte		PAN   , c_v+48
-	.byte		N04   , Dn5 , v092
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn5 , v032
-	.byte	W06
-	.byte		PAN   , c_v+32
-	.byte		N04   , An4 , v096
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , An4 , v032
-	.byte	W06
-	.byte		PAN   , c_v+32
-	.byte		N04   , Fs4 , v092
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Fs4 , v032
-	.byte	W06
-	.byte		PAN   , c_v+16
-	.byte		N04   , En4 , v092
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , En4 , v032
-	.byte	W06
-	.byte		PAN   , c_v-39
-	.byte		N04   , Dn4 , v096
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Dn4 , v032
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Dn4 , v016
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn4 , v012
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Dn4 , v004
-	.byte	W18
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_help_cl:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_help_cl_pri	@ Priority
-	.byte	se_rg_help_cl_rev	@ Reverb.
-
-	.word	se_rg_help_cl_grp
-
-	.word	se_rg_help_cl_1
-
-	.end
diff --git a/sound/songs/se_rg_help_ng.s b/sound/songs/se_rg_help_ng.s
deleted file mode 100644
index f430c245ab..0000000000
--- a/sound/songs/se_rg_help_ng.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_help_ng_grp, voicegroup129
-	.equ	se_rg_help_ng_pri, 5
-	.equ	se_rg_help_ng_rev, reverb_set+50
-	.equ	se_rg_help_ng_mvl, 127
-	.equ	se_rg_help_ng_key, 0
-	.equ	se_rg_help_ng_tbs, 1
-	.equ	se_rg_help_ng_exg, 0
-	.equ	se_rg_help_ng_cmp, 1
-
-	.section .rodata
-	.global	se_rg_help_ng
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_help_ng_1:
-	.byte	KEYSH , se_rg_help_ng_key+0
-	.byte	TEMPO , 420*se_rg_help_ng_tbs/2
-	.byte		VOICE , 24
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 96*se_rg_help_ng_mvl/mxv
-	.byte		N04   , Dn4 , v120
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn4 , v032
-	.byte	W06
-	.byte		PAN   , c_v-1
-	.byte		N04   , Fs4 , v096
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Fs4 , v032
-	.byte	W06
-	.byte		VOICE , 92
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 125*se_rg_help_ng_mvl/mxv
-	.byte		N04   , An1 , v112
-	.byte	W10
-	.byte		MOD   , 8
-	.byte	W02
-	.byte		N06   , An1 , v088
-	.byte	W06
-	.byte		        An1 , v024
-	.byte	W06
-	.byte		MOD   , 0
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_help_ng:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_help_ng_pri	@ Priority
-	.byte	se_rg_help_ng_rev	@ Reverb.
-
-	.word	se_rg_help_ng_grp
-
-	.word	se_rg_help_ng_1
-
-	.end
diff --git a/sound/songs/se_rg_help_op.s b/sound/songs/se_rg_help_op.s
deleted file mode 100644
index 8bffb79385..0000000000
--- a/sound/songs/se_rg_help_op.s
+++ /dev/null
@@ -1,82 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_help_op_grp, voicegroup129
-	.equ	se_rg_help_op_pri, 5
-	.equ	se_rg_help_op_rev, reverb_set+50
-	.equ	se_rg_help_op_mvl, 127
-	.equ	se_rg_help_op_key, 0
-	.equ	se_rg_help_op_tbs, 1
-	.equ	se_rg_help_op_exg, 0
-	.equ	se_rg_help_op_cmp, 1
-
-	.section .rodata
-	.global	se_rg_help_op
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_help_op_1:
-	.byte	KEYSH , se_rg_help_op_key+0
-	.byte	TEMPO , 420*se_rg_help_op_tbs/2
-	.byte		VOICE , 24
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		VOL   , 96*se_rg_help_op_mvl/mxv
-	.byte		PAN   , c_v-48
-	.byte		N04   , Dn4 , v096
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn4 , v032
-	.byte	W06
-	.byte		PAN   , c_v-32
-	.byte		N04   , Fs4 , v096
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Fs4 , v032
-	.byte	W06
-	.byte		PAN   , c_v-32
-	.byte		N04   , An4 , v096
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , An4 , v032
-	.byte	W06
-	.byte		PAN   , c_v-16
-	.byte		N04   , Cs5 , v096
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Cs5 , v032
-	.byte	W06
-	.byte		PAN   , c_v+32
-	.byte		N04   , Dn5 , v076
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn5 , v032
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Dn5 , v024
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn5 , v016
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Dn5 , v008
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn5 , v004
-	.byte	W18
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_help_op:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_help_op_pri	@ Priority
-	.byte	se_rg_help_op_rev	@ Reverb.
-
-	.word	se_rg_help_op_grp
-
-	.word	se_rg_help_op_1
-
-	.end
diff --git a/sound/songs/se_rg_kiteki.s b/sound/songs/se_rg_kiteki.s
deleted file mode 100644
index 248ddc3030..0000000000
--- a/sound/songs/se_rg_kiteki.s
+++ /dev/null
@@ -1,161 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_kiteki_grp, voicegroup129
-	.equ	se_rg_kiteki_pri, 5
-	.equ	se_rg_kiteki_rev, reverb_set+50
-	.equ	se_rg_kiteki_mvl, 127
-	.equ	se_rg_kiteki_key, 0
-	.equ	se_rg_kiteki_tbs, 1
-	.equ	se_rg_kiteki_exg, 0
-	.equ	se_rg_kiteki_cmp, 1
-
-	.section .rodata
-	.global	se_rg_kiteki
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_kiteki_1:
-	.byte	KEYSH , se_rg_kiteki_key+0
-	.byte	TEMPO , 164*se_rg_kiteki_tbs/2
-	.byte		VOICE , 9
-	.byte		BENDR , 12
-	.byte		LFOS  , 44
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 96*se_rg_kiteki_mvl/mxv
-	.byte		MOD   , 1
-	.byte		N04   , En2 , v127
-	.byte	W04
-	.byte		N10   , En2 , v104
-	.byte	W20
-	.byte	W10
-	.byte		PAN   , c_v-64
-	.byte		TIE   , En2 , v127
-	.byte	W08
-	.byte		PAN   , c_v-48
-	.byte	W06
-	.byte	W02
-	.byte		        c_v-32
-	.byte	W08
-	.byte		        c_v-16
-	.byte	W08
-	.byte		        c_v+0
-	.byte	W06
-	.byte		        c_v+16
-	.byte	W06
-	.byte		        c_v+31
-	.byte	W06
-	.byte		        c_v+48
-	.byte	W06
-	.byte		        c_v+63
-	.byte	W06
-	.byte	W18
-	.byte		        c_v+47
-	.byte	W06
-	.byte		        c_v+40
-	.byte	W06
-	.byte		        c_v+30
-	.byte	W06
-	.byte		        c_v+10
-	.byte	W06
-	.byte		        c_v-11
-	.byte	W06
-	.byte		        c_v-25
-	.byte	W06
-	.byte		        c_v-34
-	.byte	W06
-	.byte		        c_v-50
-	.byte	W06
-	.byte		        c_v-64
-	.byte	W06
-	.byte	W18
-	.byte		VOL   , 80*se_rg_kiteki_mvl/mxv
-	.byte		PAN   , c_v-52
-	.byte	W06
-	.byte		VOL   , 72*se_rg_kiteki_mvl/mxv
-	.byte		PAN   , c_v-41
-	.byte	W06
-	.byte		VOL   , 64*se_rg_kiteki_mvl/mxv
-	.byte		PAN   , c_v-29
-	.byte	W06
-	.byte		VOL   , 53*se_rg_kiteki_mvl/mxv
-	.byte		PAN   , c_v-18
-	.byte	W06
-	.byte		VOL   , 48*se_rg_kiteki_mvl/mxv
-	.byte		PAN   , c_v+15
-	.byte	W06
-	.byte		VOL   , 42*se_rg_kiteki_mvl/mxv
-	.byte		PAN   , c_v+25
-	.byte	W06
-	.byte		VOL   , 32*se_rg_kiteki_mvl/mxv
-	.byte		PAN   , c_v+40
-	.byte	W02
-	.byte		VOL   , 24*se_rg_kiteki_mvl/mxv
-	.byte	W04
-	.byte		        16*se_rg_kiteki_mvl/mxv
-	.byte		PAN   , c_v+47
-	.byte	W04
-	.byte		VOL   , 8*se_rg_kiteki_mvl/mxv
-	.byte	W02
-	.byte		EOT   
-	.byte		VOL   , 0*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_kiteki_2:
-	.byte	KEYSH , se_rg_kiteki_key+0
-	.byte		VOICE , 81
-	.byte		PAN   , c_v+0
-	.byte		MOD   , 15
-	.byte		VOL   , 48*se_rg_kiteki_mvl/mxv
-	.byte		N04   , En1 , v127
-	.byte	W04
-	.byte		N10   , En1 , v104
-	.byte	W20
-	.byte	W10
-	.byte		TIE   , En1 , v127
-	.byte	W14
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W18
-	.byte		VOL   , 42*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte		        36*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte		        32*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte		        26*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte		        23*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte		        15*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte		        13*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte		        8*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte		EOT   
-	.byte		VOL   , 0*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_kiteki:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_kiteki_pri	@ Priority
-	.byte	se_rg_kiteki_rev	@ Reverb.
-
-	.word	se_rg_kiteki_grp
-
-	.word	se_rg_kiteki_1
-	.word	se_rg_kiteki_2
-
-	.end
diff --git a/sound/songs/se_rg_nawamiss.s b/sound/songs/se_rg_nawamiss.s
deleted file mode 100644
index db24cf5f42..0000000000
--- a/sound/songs/se_rg_nawamiss.s
+++ /dev/null
@@ -1,55 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_nawamiss_grp, voicegroup127
-	.equ	se_rg_nawamiss_pri, 5
-	.equ	se_rg_nawamiss_rev, reverb_set+50
-	.equ	se_rg_nawamiss_mvl, 127
-	.equ	se_rg_nawamiss_key, 0
-	.equ	se_rg_nawamiss_tbs, 1
-	.equ	se_rg_nawamiss_exg, 0
-	.equ	se_rg_nawamiss_cmp, 1
-
-	.section .rodata
-	.global	se_rg_nawamiss
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_nawamiss_1:
-	.byte	KEYSH , se_rg_nawamiss_key+0
-	.byte	TEMPO , 240*se_rg_nawamiss_tbs/2
-	.byte		VOICE , 92
-	.byte		BENDR , 12
-	.byte		VOL   , 127*se_rg_nawamiss_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N03   , Cn2 , v127
-	.byte	W03
-	.byte		        Cn2 , v020
-	.byte	W03
-	.byte		N18   , Cn2 , v127
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte		N09   , Cn2 , v020
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_nawamiss:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_nawamiss_pri	@ Priority
-	.byte	se_rg_nawamiss_rev	@ Reverb.
-
-	.word	se_rg_nawamiss_grp
-
-	.word	se_rg_nawamiss_1
-
-	.end
diff --git a/sound/songs/se_rg_shop.s b/sound/songs/se_rg_shop.s
deleted file mode 100644
index d184e1e5d7..0000000000
--- a/sound/songs/se_rg_shop.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_shop_grp, voicegroup129
-	.equ	se_rg_shop_pri, 5
-	.equ	se_rg_shop_rev, reverb_set+50
-	.equ	se_rg_shop_mvl, 127
-	.equ	se_rg_shop_key, 0
-	.equ	se_rg_shop_tbs, 1
-	.equ	se_rg_shop_exg, 0
-	.equ	se_rg_shop_cmp, 1
-
-	.section .rodata
-	.global	se_rg_shop
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_shop_1:
-	.byte	KEYSH , se_rg_shop_key+0
-	.byte	TEMPO , 124*se_rg_shop_tbs/2
-	.byte		VOICE , 8
-	.byte		VOL   , 80*se_rg_shop_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N30   , Cn3 , v120
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_shop:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_shop_pri	@ Priority
-	.byte	se_rg_shop_rev	@ Reverb.
-
-	.word	se_rg_shop_grp
-
-	.word	se_rg_shop_1
-
-	.end
diff --git a/sound/songs/se_rg_w_door.s b/sound/songs/se_rg_w_door.s
deleted file mode 100644
index 9c23490188..0000000000
--- a/sound/songs/se_rg_w_door.s
+++ /dev/null
@@ -1,84 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_w_door_grp, voicegroup129
-	.equ	se_rg_w_door_pri, 5
-	.equ	se_rg_w_door_rev, reverb_set+50
-	.equ	se_rg_w_door_mvl, 127
-	.equ	se_rg_w_door_key, 0
-	.equ	se_rg_w_door_tbs, 1
-	.equ	se_rg_w_door_exg, 0
-	.equ	se_rg_w_door_cmp, 1
-
-	.section .rodata
-	.global	se_rg_w_door
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_w_door_1:
-	.byte	KEYSH , se_rg_w_door_key+0
-	.byte	TEMPO , 110*se_rg_w_door_tbs/2
-	.byte		VOICE , 127
-	.byte		VOL   , 100*se_rg_w_door_mvl/mxv
-	.byte		N03   , Fn2 , v100
-	.byte		N03   , As2 , v127
-	.byte	W06
-	.byte		N08   , Fs3 , v096
-	.byte	W06
-	.byte		VOL   , 88*se_rg_w_door_mvl/mxv
-	.byte	W03
-	.byte		        54*se_rg_w_door_mvl/mxv
-	.byte	W03
-	.byte		        68*se_rg_w_door_mvl/mxv
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_w_door_2:
-	.byte	KEYSH , se_rg_w_door_key+0
-	.byte		VOICE , 92
-	.byte		BENDR , 12
-	.byte		VOL   , 43*se_rg_w_door_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte	W04
-	.byte		        c_v-50
-	.byte		N10   , Bn5 , v052
-	.byte	W02
-	.byte		BEND  , c_v-45
-	.byte	W01
-	.byte		        c_v-23
-	.byte	W01
-	.byte		        c_v-2
-	.byte	W01
-	.byte		        c_v+22
-	.byte	W01
-	.byte		        c_v+28
-	.byte	W01
-	.byte		        c_v+41
-	.byte	W01
-	.byte		VOL   , 29*se_rg_w_door_mvl/mxv
-	.byte		BEND  , c_v+53
-	.byte	W01
-	.byte		        c_v+60
-	.byte	W02
-	.byte		VOL   , 18*se_rg_w_door_mvl/mxv
-	.byte		BEND  , c_v+63
-	.byte	W09
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_w_door:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_w_door_pri	@ Priority
-	.byte	se_rg_w_door_rev	@ Reverb.
-
-	.word	se_rg_w_door_grp
-
-	.word	se_rg_w_door_1
-	.word	se_rg_w_door_2
-
-	.end
diff --git a/sound/songs/se_ru_bari.s b/sound/songs/se_ru_bari.s
deleted file mode 100644
index ffff1b406d..0000000000
--- a/sound/songs/se_ru_bari.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_ru_bari_grp, voicegroup127
-	.equ	se_ru_bari_pri, 4
-	.equ	se_ru_bari_rev, reverb_set+50
-	.equ	se_ru_bari_mvl, 127
-	.equ	se_ru_bari_key, 0
-	.equ	se_ru_bari_tbs, 1
-	.equ	se_ru_bari_exg, 0
-	.equ	se_ru_bari_cmp, 1
-
-	.section .rodata
-	.global	se_ru_bari
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_ru_bari_1:
-	.byte	KEYSH , se_ru_bari_key+0
-	.byte	TEMPO , 150*se_ru_bari_tbs/2
-	.byte		VOICE , 9
-	.byte		VOL   , 100*se_ru_bari_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N01   , Gn5 , v088
-	.byte	W01
-	.byte		N01   
-	.byte	W02
-	.byte		        Cn6 , v072
-	.byte	W03
-	.byte		        Cn6 , v056
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_ru_bari_2:
-	.byte	KEYSH , se_ru_bari_key+0
-	.byte		VOICE , 122
-	.byte		VOL   , 100*se_ru_bari_mvl/mxv
-	.byte		N01   , Gn2 , v112
-	.byte	W02
-	.byte		VOICE , 123
-	.byte	W01
-	.byte		N01   , Gs4 , v096
-	.byte	W03
-	.byte		        Gs4 , v112
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_ru_bari:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_ru_bari_pri	@ Priority
-	.byte	se_ru_bari_rev	@ Reverb.
-
-	.word	se_ru_bari_grp
-
-	.word	se_ru_bari_1
-	.word	se_ru_bari_2
-
-	.end
diff --git a/sound/songs/se_ru_gashin.s b/sound/songs/se_ru_gashin.s
deleted file mode 100644
index 1c9158cbd0..0000000000
--- a/sound/songs/se_ru_gashin.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_ru_gashin_grp, voicegroup128
-	.equ	se_ru_gashin_pri, 4
-	.equ	se_ru_gashin_rev, reverb_set+50
-	.equ	se_ru_gashin_mvl, 127
-	.equ	se_ru_gashin_key, 0
-	.equ	se_ru_gashin_tbs, 1
-	.equ	se_ru_gashin_exg, 0
-	.equ	se_ru_gashin_cmp, 1
-
-	.section .rodata
-	.global	se_ru_gashin
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_ru_gashin_1:
-	.byte	KEYSH , se_ru_gashin_key+0
-	.byte	TEMPO , 150*se_ru_gashin_tbs/2
-	.byte		VOICE , 3
-	.byte		VOL   , 90*se_ru_gashin_mvl/mxv
-	.byte		BEND  , c_v+16
-	.byte		N03   , En3 , v112
-	.byte	W01
-	.byte		BEND  , c_v+38
-	.byte	W01
-	.byte		        c_v+62
-	.byte	W02
-	.byte		N12   , En4 
-	.byte	W02
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_ru_gashin_2:
-	.byte	KEYSH , se_ru_gashin_key+0
-	.byte		VOICE , 4
-	.byte		VOL   , 90*se_ru_gashin_mvl/mxv
-	.byte		N03   , Gs3 , v096
-	.byte	W04
-	.byte		N12   , Gs4 
-	.byte	W02
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_ru_gashin:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_ru_gashin_pri	@ Priority
-	.byte	se_ru_gashin_rev	@ Reverb.
-
-	.word	se_ru_gashin_grp
-
-	.word	se_ru_gashin_1
-	.word	se_ru_gashin_2
-
-	.end
diff --git a/sound/songs/se_ru_gasyan.s b/sound/songs/se_ru_gasyan.s
deleted file mode 100644
index 8cf3f12eaf..0000000000
--- a/sound/songs/se_ru_gasyan.s
+++ /dev/null
@@ -1,83 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_ru_gasyan_grp, voicegroup128
-	.equ	se_ru_gasyan_pri, 4
-	.equ	se_ru_gasyan_rev, reverb_set+50
-	.equ	se_ru_gasyan_mvl, 127
-	.equ	se_ru_gasyan_key, 0
-	.equ	se_ru_gasyan_tbs, 1
-	.equ	se_ru_gasyan_exg, 0
-	.equ	se_ru_gasyan_cmp, 1
-
-	.section .rodata
-	.global	se_ru_gasyan
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_ru_gasyan_1:
-	.byte	KEYSH , se_ru_gasyan_key+0
-	.byte	TEMPO , 120*se_ru_gasyan_tbs/2
-	.byte		VOICE , 3
-	.byte		VOL   , 100*se_ru_gasyan_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N01   , Gn3 , v120
-	.byte	W03
-	.byte	W01
-	.byte		        Cn4 
-	.byte	W01
-	.byte		BEND  , c_v+12
-	.byte	W01
-	.byte		        c_v+22
-	.byte	W01
-	.byte		N01   , Cn5 , v112
-	.byte	W01
-	.byte		BEND  , c_v+35
-	.byte	W01
-	.byte	W01
-	.byte		        c_v+46
-	.byte	W01
-	.byte		        c_v+54
-	.byte		N01   , Cn4 , v104
-	.byte	W01
-	.byte	W01
-	.byte		BEND  , c_v+63
-	.byte	W01
-	.byte		N01   , Cn5 , v096
-	.byte	W01
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_ru_gasyan_2:
-	.byte	KEYSH , se_ru_gasyan_key+0
-	.byte		VOICE , 4
-	.byte		VOL   , 100*se_ru_gasyan_mvl/mxv
-	.byte		N01   , Gs3 , v064
-	.byte	W03
-	.byte	W01
-	.byte		N01   
-	.byte	W02
-	.byte		        Fn4 
-	.byte	W03
-	.byte		        Gs3 
-	.byte	W03
-	.byte		        Fn4 
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_ru_gasyan:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_ru_gasyan_pri	@ Priority
-	.byte	se_ru_gasyan_rev	@ Reverb.
-
-	.word	se_ru_gasyan_grp
-
-	.word	se_ru_gasyan_1
-	.word	se_ru_gasyan_2
-
-	.end
diff --git a/sound/songs/se_ru_hyuu.s b/sound/songs/se_ru_hyuu.s
deleted file mode 100644
index cf495141c0..0000000000
--- a/sound/songs/se_ru_hyuu.s
+++ /dev/null
@@ -1,80 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_ru_hyuu_grp, voicegroup128
-	.equ	se_ru_hyuu_pri, 4
-	.equ	se_ru_hyuu_rev, reverb_set+50
-	.equ	se_ru_hyuu_mvl, 127
-	.equ	se_ru_hyuu_key, 0
-	.equ	se_ru_hyuu_tbs, 1
-	.equ	se_ru_hyuu_exg, 0
-	.equ	se_ru_hyuu_cmp, 1
-
-	.section .rodata
-	.global	se_ru_hyuu
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_ru_hyuu_1:
-	.byte	KEYSH , se_ru_hyuu_key+0
-	.byte	TEMPO , 170*se_ru_hyuu_tbs/2
-	.byte		VOICE , 22
-	.byte		VOL   , 110*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v+60
-	.byte		N44   , Gn3 , v080
-	.byte	W03
-	.byte		BEND  , c_v+57
-	.byte	W03
-	.byte		        c_v+52
-	.byte	W03
-	.byte		        c_v+43
-	.byte	W03
-	.byte		        c_v+36
-	.byte	W03
-	.byte		        c_v+30
-	.byte	W03
-	.byte		        c_v+22
-	.byte	W03
-	.byte		        c_v+16
-	.byte	W03
-	.byte		VOL   , 104*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v+11
-	.byte	W03
-	.byte		VOL   , 90*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v+3
-	.byte	W03
-	.byte		VOL   , 82*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v-8
-	.byte	W03
-	.byte		VOL   , 71*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v-16
-	.byte	W03
-	.byte		VOL   , 58*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v-24
-	.byte	W03
-	.byte		VOL   , 45*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v-36
-	.byte	W03
-	.byte		VOL   , 36*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v-50
-	.byte	W03
-	.byte		VOL   , 11*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v-63
-	.byte	W03
-	.byte		VOL   , 3*se_ru_hyuu_mvl/mxv
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_ru_hyuu:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_ru_hyuu_pri	@ Priority
-	.byte	se_ru_hyuu_rev	@ Reverb.
-
-	.word	se_ru_hyuu_grp
-
-	.word	se_ru_hyuu_1
-
-	.end
diff --git a/sound/songs/se_save.s b/sound/songs/se_save.s
deleted file mode 100644
index eaedd3e7b8..0000000000
--- a/sound/songs/se_save.s
+++ /dev/null
@@ -1,78 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_save_grp, voicegroup128
-	.equ	se_save_pri, 5
-	.equ	se_save_rev, reverb_set+50
-	.equ	se_save_mvl, 127
-	.equ	se_save_key, 0
-	.equ	se_save_tbs, 1
-	.equ	se_save_exg, 0
-	.equ	se_save_cmp, 1
-
-	.section .rodata
-	.global	se_save
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_save_1:
-	.byte	KEYSH , se_save_key+0
-	.byte	TEMPO , 150*se_save_tbs/2
-	.byte		VOICE , 14
-	.byte		VOL   , 80*se_save_mvl/mxv
-	.byte		BEND  , c_v+17
-	.byte		N03   , En3 , v096
-	.byte	W03
-	.byte		        Bn2 
-	.byte	W03
-	.byte		        En3 
-	.byte	W03
-	.byte		        Bn3 
-	.byte	W03
-	.byte		N06   , Cn5 
-	.byte	W06
-	.byte		N24   , Cn6 
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_save_2:
-	.byte	KEYSH , se_save_key+0
-	.byte		VOICE , 17
-	.byte		VOL   , 80*se_save_mvl/mxv
-	.byte		N03   , En3 , v100
-	.byte	W03
-	.byte		        Bn2 
-	.byte	W03
-	.byte		        En3 
-	.byte	W03
-	.byte		        Bn3 
-	.byte	W03
-	.byte		N06   , Cn5 
-	.byte	W06
-	.byte		N24   , Cn6 
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_save:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_save_pri	@ Priority
-	.byte	se_save_rev	@ Reverb.
-
-	.word	se_save_grp
-
-	.word	se_save_1
-	.word	se_save_2
-
-	.end
diff --git a/sound/songs/se_seikai.s b/sound/songs/se_seikai.s
deleted file mode 100644
index a3f27b6cd7..0000000000
--- a/sound/songs/se_seikai.s
+++ /dev/null
@@ -1,44 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_seikai_grp, voicegroup127
-	.equ	se_seikai_pri, 4
-	.equ	se_seikai_rev, reverb_set+50
-	.equ	se_seikai_mvl, 127
-	.equ	se_seikai_key, 0
-	.equ	se_seikai_tbs, 1
-	.equ	se_seikai_exg, 0
-	.equ	se_seikai_cmp, 1
-
-	.section .rodata
-	.global	se_seikai
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_seikai_1:
-	.byte	KEYSH , se_seikai_key+0
-	.byte	TEMPO , 240*se_seikai_tbs/2
-	.byte		VOICE , 5
-	.byte		BENDR , 12
-	.byte		VOL   , 80*se_seikai_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N06   , Gn5 , v127
-	.byte	W06
-	.byte		N18   , Ds5 
-	.byte	W18
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_seikai:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_seikai_pri	@ Priority
-	.byte	se_seikai_rev	@ Reverb.
-
-	.word	se_seikai_grp
-
-	.word	se_seikai_1
-
-	.end
diff --git a/sound/songs/se_select.s b/sound/songs/se_select.s
deleted file mode 100644
index a20e089569..0000000000
--- a/sound/songs/se_select.s
+++ /dev/null
@@ -1,50 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_select_grp, voicegroup127
-	.equ	se_select_pri, 5
-	.equ	se_select_rev, reverb_set+50
-	.equ	se_select_mvl, 127
-	.equ	se_select_key, 0
-	.equ	se_select_tbs, 1
-	.equ	se_select_exg, 0
-	.equ	se_select_cmp, 1
-
-	.section .rodata
-	.global	se_select
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_select_1:
-	.byte	KEYSH , se_select_key+0
-	.byte	TEMPO , 300*se_select_tbs/2
-	.byte		VOICE , 87
-	.byte		VOL   , 80*se_select_mvl/mxv
-	.byte		BEND  , c_v+13
-	.byte		N03   , As5 , v068
-	.byte	W03
-	.byte		        Gn6 , v127
-	.byte	W03
-	.byte		        Gn6 , v068
-	.byte	W03
-	.byte		        Gn6 , v127
-	.byte	W03
-	.byte		VOICE , 88
-	.byte		N06   , Gn6 , v068
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_select:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_select_pri	@ Priority
-	.byte	se_select_rev	@ Reverb.
-
-	.word	se_select_grp
-
-	.word	se_select_1
-
-	.end
diff --git a/sound/songs/se_suikomu.s b/sound/songs/se_suikomu.s
deleted file mode 100644
index eff89df3a0..0000000000
--- a/sound/songs/se_suikomu.s
+++ /dev/null
@@ -1,78 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_suikomu_grp, voicegroup127
-	.equ	se_suikomu_pri, 5
-	.equ	se_suikomu_rev, reverb_set+50
-	.equ	se_suikomu_mvl, 127
-	.equ	se_suikomu_key, 0
-	.equ	se_suikomu_tbs, 1
-	.equ	se_suikomu_exg, 0
-	.equ	se_suikomu_cmp, 1
-
-	.section .rodata
-	.global	se_suikomu
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_suikomu_1:
-	.byte	KEYSH , se_suikomu_key+0
-	.byte		VOICE , 13
-	.byte		BENDR , 12
-	.byte		VOL   , 12*se_suikomu_mvl/mxv
-	.byte		BEND  , c_v+49
-	.byte		N06   , Gn4 , v080
-	.byte	W01
-	.byte		VOL   , 44*se_suikomu_mvl/mxv
-	.byte		BEND  , c_v+22
-	.byte	W01
-	.byte		VOL   , 75*se_suikomu_mvl/mxv
-	.byte		BEND  , c_v+20
-	.byte	W01
-	.byte		VOL   , 87*se_suikomu_mvl/mxv
-	.byte		BEND  , c_v+33
-	.byte	W01
-	.byte		VOL   , 100*se_suikomu_mvl/mxv
-	.byte		BEND  , c_v+54
-	.byte	W01
-	.byte		        c_v+63
-	.byte	W01
-	.byte	W03
-	.byte		N03   , Gn4 , v040
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_suikomu_2:
-	.byte	KEYSH , se_suikomu_key+0
-	.byte		VOICE , 123
-	.byte		VOL   , 59*se_suikomu_mvl/mxv
-	.byte		N06   , Gs4 , v052
-	.byte	W01
-	.byte		VOL   , 72*se_suikomu_mvl/mxv
-	.byte	W01
-	.byte		        90*se_suikomu_mvl/mxv
-	.byte	W01
-	.byte		        100*se_suikomu_mvl/mxv
-	.byte	W03
-	.byte	W03
-	.byte		N03   , Gs4 , v024
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_suikomu:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_suikomu_pri	@ Priority
-	.byte	se_suikomu_rev	@ Reverb.
-
-	.word	se_suikomu_grp
-
-	.word	se_suikomu_1
-	.word	se_suikomu_2
-
-	.end
diff --git a/sound/songs/se_t_ame.s b/sound/songs/se_t_ame.s
deleted file mode 100644
index 78db57968e..0000000000
--- a/sound/songs/se_t_ame.s
+++ /dev/null
@@ -1,65 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_ame_grp, voicegroup128
-	.equ	se_t_ame_pri, 2
-	.equ	se_t_ame_rev, reverb_set+50
-	.equ	se_t_ame_mvl, 127
-	.equ	se_t_ame_key, 0
-	.equ	se_t_ame_tbs, 1
-	.equ	se_t_ame_exg, 0
-	.equ	se_t_ame_cmp, 1
-
-	.section .rodata
-	.global	se_t_ame
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_ame_1:
-	.byte	KEYSH , se_t_ame_key+0
-	.byte	TEMPO , 220*se_t_ame_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 15*se_t_ame_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Gn3 , v060
-	.byte	W03
-	.byte		VOL   , 27*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        39*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        44*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        52*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        59*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        68*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        80*se_t_ame_mvl/mxv
-	.byte	W03
-se_t_ame_1_B1:
-	.byte		N60   , Gn3 , v060
-	.byte	W24
-	.byte	W24
-	.byte	W12
-	.byte	GOTO
-	 .word	se_t_ame_1_B1
-	.byte	W12
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_ame:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_ame_pri	@ Priority
-	.byte	se_t_ame_rev	@ Reverb.
-
-	.word	se_t_ame_grp
-
-	.word	se_t_ame_1
-
-	.end
diff --git a/sound/songs/se_t_ame_e.s b/sound/songs/se_t_ame_e.s
deleted file mode 100644
index 5558a5118c..0000000000
--- a/sound/songs/se_t_ame_e.s
+++ /dev/null
@@ -1,74 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_ame_e_grp, voicegroup128
-	.equ	se_t_ame_e_pri, 2
-	.equ	se_t_ame_e_rev, reverb_set+50
-	.equ	se_t_ame_e_mvl, 127
-	.equ	se_t_ame_e_key, 0
-	.equ	se_t_ame_e_tbs, 1
-	.equ	se_t_ame_e_exg, 0
-	.equ	se_t_ame_e_cmp, 1
-
-	.section .rodata
-	.global	se_t_ame_e
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_ame_e_1:
-	.byte	KEYSH , se_t_ame_e_key+0
-	.byte	TEMPO , 220*se_t_ame_e_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 80*se_t_ame_e_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Gn3 , v060
-	.byte	W03
-	.byte		VOL   , 76*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        74*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        72*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        68*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        64*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        58*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        50*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        44*se_t_ame_e_mvl/mxv
-	.byte		N24   
-	.byte	W03
-	.byte		VOL   , 38*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        34*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        27*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        20*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        15*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        10*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        6*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_ame_e:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_ame_e_pri	@ Priority
-	.byte	se_t_ame_e_rev	@ Reverb.
-
-	.word	se_t_ame_e_grp
-
-	.word	se_t_ame_e_1
-
-	.end
diff --git a/sound/songs/se_t_kami.s b/sound/songs/se_t_kami.s
deleted file mode 100644
index 6ac8ae06f4..0000000000
--- a/sound/songs/se_t_kami.s
+++ /dev/null
@@ -1,98 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_kami_grp, voicegroup128
-	.equ	se_t_kami_pri, 3
-	.equ	se_t_kami_rev, reverb_set+50
-	.equ	se_t_kami_mvl, 127
-	.equ	se_t_kami_key, 0
-	.equ	se_t_kami_tbs, 1
-	.equ	se_t_kami_exg, 0
-	.equ	se_t_kami_cmp, 1
-
-	.section .rodata
-	.global	se_t_kami
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_kami_1:
-	.byte	KEYSH , se_t_kami_key+0
-	.byte	TEMPO , 220*se_t_kami_tbs/2
-	.byte		VOICE , 18
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_t_kami_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N09   , En3 , v112
-	.byte	W03
-	.byte		BEND  , c_v+21
-	.byte	W03
-	.byte		        c_v+0
-	.byte	W03
-	.byte		        c_v+6
-	.byte		N15   , En3 , v120
-	.byte	W03
-	.byte		BEND  , c_v+2
-	.byte	W03
-	.byte		        c_v-9
-	.byte	W03
-	.byte		        c_v-29
-	.byte	W06
-	.byte		        c_v+0
-	.byte		N09   , Gn2 
-	.byte	W06
-	.byte		BEND  , c_v-8
-	.byte	W03
-	.byte		        c_v-15
-	.byte		TIE   , Gs2 , v112
-	.byte	W03
-	.byte		BEND  , c_v-4
-	.byte	W09
-	.byte		        c_v-8
-	.byte	W03
-	.byte	W06
-	.byte		        c_v-13
-	.byte	W03
-	.byte		        c_v-22
-	.byte	W09
-	.byte		        c_v-32
-	.byte	W06
-	.byte		VOL   , 102*se_t_kami_mvl/mxv
-	.byte		BEND  , c_v-38
-	.byte	W09
-	.byte		VOL   , 97*se_t_kami_mvl/mxv
-	.byte	W09
-	.byte		        92*se_t_kami_mvl/mxv
-	.byte		BEND  , c_v-45
-	.byte	W06
-	.byte	W03
-	.byte		VOL   , 83*se_t_kami_mvl/mxv
-	.byte	W06
-	.byte		BEND  , c_v-52
-	.byte	W03
-	.byte		VOL   , 72*se_t_kami_mvl/mxv
-	.byte	W09
-	.byte		        63*se_t_kami_mvl/mxv
-	.byte	W03
-	.byte	W06
-	.byte		        57*se_t_kami_mvl/mxv
-	.byte	W06
-	.byte		        46*se_t_kami_mvl/mxv
-	.byte	W12
-	.byte		EOT   
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_kami:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_kami_pri	@ Priority
-	.byte	se_t_kami_rev	@ Reverb.
-
-	.word	se_t_kami_grp
-
-	.word	se_t_kami_1
-
-	.end
diff --git a/sound/songs/se_t_kami2.s b/sound/songs/se_t_kami2.s
deleted file mode 100644
index 1c400fe6a8..0000000000
--- a/sound/songs/se_t_kami2.s
+++ /dev/null
@@ -1,80 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_kami2_grp, voicegroup128
-	.equ	se_t_kami2_pri, 3
-	.equ	se_t_kami2_rev, reverb_set+50
-	.equ	se_t_kami2_mvl, 127
-	.equ	se_t_kami2_key, 0
-	.equ	se_t_kami2_tbs, 1
-	.equ	se_t_kami2_exg, 0
-	.equ	se_t_kami2_cmp, 1
-
-	.section .rodata
-	.global	se_t_kami2
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_kami2_1:
-	.byte	KEYSH , se_t_kami2_key+0
-	.byte	TEMPO , 220*se_t_kami2_tbs/2
-	.byte		VOICE , 18
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_t_kami2_mvl/mxv
-	.byte		BEND  , c_v+35
-	.byte		TIE   , Dn2 , v112
-	.byte	W03
-	.byte		BEND  , c_v+11
-	.byte	W03
-	.byte		        c_v+0
-	.byte	W03
-	.byte		        c_v+6
-	.byte	W06
-	.byte		        c_v+0
-	.byte	W09
-	.byte	W15
-	.byte		        c_v+0
-	.byte	W06
-	.byte		        c_v-4
-	.byte	W03
-	.byte	W06
-	.byte		        c_v-13
-	.byte	W09
-	.byte		        c_v-18
-	.byte	W09
-	.byte		VOL   , 102*se_t_kami2_mvl/mxv
-	.byte		BEND  , c_v-25
-	.byte	W09
-	.byte		VOL   , 97*se_t_kami2_mvl/mxv
-	.byte		BEND  , c_v-38
-	.byte	W09
-	.byte		VOL   , 92*se_t_kami2_mvl/mxv
-	.byte		BEND  , c_v-45
-	.byte	W06
-	.byte	W03
-	.byte		VOL   , 83*se_t_kami2_mvl/mxv
-	.byte	W06
-	.byte		BEND  , c_v-52
-	.byte	W03
-	.byte		VOL   , 64*se_t_kami2_mvl/mxv
-	.byte	W06
-	.byte		        47*se_t_kami2_mvl/mxv
-	.byte	W06
-	.byte		EOT   
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_kami2:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_kami2_pri	@ Priority
-	.byte	se_t_kami2_rev	@ Reverb.
-
-	.word	se_t_kami2_grp
-
-	.word	se_t_kami2_1
-
-	.end
diff --git a/sound/songs/se_t_koame.s b/sound/songs/se_t_koame.s
deleted file mode 100644
index 6a7acdbf56..0000000000
--- a/sound/songs/se_t_koame.s
+++ /dev/null
@@ -1,65 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_koame_grp, voicegroup128
-	.equ	se_t_koame_pri, 2
-	.equ	se_t_koame_rev, reverb_set+50
-	.equ	se_t_koame_mvl, 127
-	.equ	se_t_koame_key, 0
-	.equ	se_t_koame_tbs, 1
-	.equ	se_t_koame_exg, 0
-	.equ	se_t_koame_cmp, 1
-
-	.section .rodata
-	.global	se_t_koame
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_koame_1:
-	.byte	KEYSH , se_t_koame_key+0
-	.byte	TEMPO , 220*se_t_koame_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 15*se_t_koame_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Bn3 , v052
-	.byte	W03
-	.byte		VOL   , 27*se_t_koame_mvl/mxv
-	.byte	W03
-	.byte		        39*se_t_koame_mvl/mxv
-	.byte	W03
-	.byte		        44*se_t_koame_mvl/mxv
-	.byte	W03
-	.byte		        52*se_t_koame_mvl/mxv
-	.byte	W03
-	.byte		        59*se_t_koame_mvl/mxv
-	.byte	W03
-	.byte		        68*se_t_koame_mvl/mxv
-	.byte	W03
-	.byte		        80*se_t_koame_mvl/mxv
-	.byte	W03
-se_t_koame_1_B1:
-	.byte		N60   , Bn3 , v052
-	.byte	W24
-	.byte	W24
-	.byte	W12
-	.byte	GOTO
-	 .word	se_t_koame_1_B1
-	.byte	W12
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_koame:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_koame_pri	@ Priority
-	.byte	se_t_koame_rev	@ Reverb.
-
-	.word	se_t_koame_grp
-
-	.word	se_t_koame_1
-
-	.end
diff --git a/sound/songs/se_t_koame_e.s b/sound/songs/se_t_koame_e.s
deleted file mode 100644
index 7570d98cd2..0000000000
--- a/sound/songs/se_t_koame_e.s
+++ /dev/null
@@ -1,74 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_koame_e_grp, voicegroup128
-	.equ	se_t_koame_e_pri, 2
-	.equ	se_t_koame_e_rev, reverb_set+50
-	.equ	se_t_koame_e_mvl, 127
-	.equ	se_t_koame_e_key, 0
-	.equ	se_t_koame_e_tbs, 1
-	.equ	se_t_koame_e_exg, 0
-	.equ	se_t_koame_e_cmp, 1
-
-	.section .rodata
-	.global	se_t_koame_e
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_koame_e_1:
-	.byte	KEYSH , se_t_koame_e_key+0
-	.byte	TEMPO , 220*se_t_koame_e_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 80*se_t_koame_e_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Bn3 , v052
-	.byte	W03
-	.byte		VOL   , 76*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        74*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        72*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        68*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        64*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        58*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        50*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        44*se_t_koame_e_mvl/mxv
-	.byte		N24   
-	.byte	W03
-	.byte		VOL   , 38*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        34*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        27*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        20*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        15*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        10*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        6*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_koame_e:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_koame_e_pri	@ Priority
-	.byte	se_t_koame_e_rev	@ Reverb.
-
-	.word	se_t_koame_e_grp
-
-	.word	se_t_koame_e_1
-
-	.end
diff --git a/sound/songs/se_t_ooame.s b/sound/songs/se_t_ooame.s
deleted file mode 100644
index 434f207798..0000000000
--- a/sound/songs/se_t_ooame.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_ooame_grp, voicegroup128
-	.equ	se_t_ooame_pri, 2
-	.equ	se_t_ooame_rev, reverb_set+50
-	.equ	se_t_ooame_mvl, 127
-	.equ	se_t_ooame_key, 0
-	.equ	se_t_ooame_tbs, 1
-	.equ	se_t_ooame_exg, 0
-	.equ	se_t_ooame_cmp, 1
-
-	.section .rodata
-	.global	se_t_ooame
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_ooame_1:
-	.byte	KEYSH , se_t_ooame_key+0
-	.byte	TEMPO , 220*se_t_ooame_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 18*se_t_ooame_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Cn3 , v060
-	.byte	W03
-	.byte		VOL   , 33*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        48*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        55*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        65*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        74*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        85*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        100*se_t_ooame_mvl/mxv
-	.byte	W03
-se_t_ooame_1_B1:
-	.byte		N36   , Cn3 , v060
-	.byte	W24
-	.byte	W12
-	.byte	GOTO
-	 .word	se_t_ooame_1_B1
-	.byte	W12
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_ooame:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_ooame_pri	@ Priority
-	.byte	se_t_ooame_rev	@ Reverb.
-
-	.word	se_t_ooame_grp
-
-	.word	se_t_ooame_1
-
-	.end
diff --git a/sound/songs/se_t_ooame_e.s b/sound/songs/se_t_ooame_e.s
deleted file mode 100644
index 329cd37025..0000000000
--- a/sound/songs/se_t_ooame_e.s
+++ /dev/null
@@ -1,74 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_ooame_e_grp, voicegroup128
-	.equ	se_t_ooame_e_pri, 2
-	.equ	se_t_ooame_e_rev, reverb_set+50
-	.equ	se_t_ooame_e_mvl, 127
-	.equ	se_t_ooame_e_key, 0
-	.equ	se_t_ooame_e_tbs, 1
-	.equ	se_t_ooame_e_exg, 0
-	.equ	se_t_ooame_e_cmp, 1
-
-	.section .rodata
-	.global	se_t_ooame_e
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_ooame_e_1:
-	.byte	KEYSH , se_t_ooame_e_key+0
-	.byte	TEMPO , 220*se_t_ooame_e_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 100*se_t_ooame_e_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Cn3 , v060
-	.byte	W03
-	.byte		VOL   , 96*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        93*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        90*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        85*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        81*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        73*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        62*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        55*se_t_ooame_e_mvl/mxv
-	.byte		N24   
-	.byte	W03
-	.byte		VOL   , 48*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        42*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        33*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        25*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        18*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        12*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        7*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_ooame_e:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_ooame_e_pri	@ Priority
-	.byte	se_t_ooame_e_rev	@ Reverb.
-
-	.word	se_t_ooame_e_grp
-
-	.word	se_t_ooame_e_1
-
-	.end
diff --git a/src/battle_arena.c b/src/battle_arena.c
index c686ed7919..cd2c976da0 100644
--- a/src/battle_arena.c
+++ b/src/battle_arena.c
@@ -15,6 +15,7 @@
 #include "palette.h"
 #include "random.h"
 #include "sound.h"
+#include "string_util.h"
 #include "text.h"
 #include "util.h"
 #include "constants/songs.h"
diff --git a/src/berry.c b/src/berry.c
index 7cd28d69f4..9f08165b88 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -1,10 +1,13 @@
 #include "global.h"
 #include "berry.h"
 #include "event_data.h"
+#include "field_control_avatar.h"
 #include "fieldmap.h"
 #include "item.h"
+#include "item_menu.h"
 #include "main.h"
 #include "random.h"
+#include "string_util.h"
 #include "text.h"
 #include "constants/event_object_movement_constants.h"
 #include "constants/items.h"
@@ -12,11 +15,8 @@
 extern u8 EventObjectGetBerryTreeId(u8 eventObjectId);
 extern void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup);
 extern void CB2_ChooseBerry(void);
-extern const u8* GetEventObjectScriptPointerPlayerFacing(void);
 extern bool8 IsBerryTreeSparkling(u8, u8, u8);
 
-extern u16 gSpecialVar_ItemId;
-
 extern const u8 BerryTreeScript[];
 
 static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry);
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index 44b42c123d..3050ebecf4 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -1,13 +1,14 @@
 #include "global.h"
 #include "dewford_trend.h"
 #include "easy_chat.h"
-#include "constants/easy_chat.h"
 #include "event_data.h"
 #include "link.h"
 #include "malloc.h"
 #include "random.h"
 #include "text.h"
 #include "tv.h"
+#include "string_util.h"
+#include "constants/easy_chat.h"
 
 // static functions
 static void sub_8122804(struct EasyChatPair *s, u16 b, u8 c);
diff --git a/src/text.c b/src/text.c
index b134bcacde..2380e31917 100644
--- a/src/text.c
+++ b/src/text.c
@@ -29,7 +29,8 @@ u8 gUnknown_03002F84;
 struct Struct_03002F90 gUnknown_03002F90;
 TextFlags gTextFlags;
 
-const u8 gFontHalfRowOffsets[] = {
+const u8 gFontHalfRowOffsets[] =
+{
     0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x05, 0x03, 0x06, 0x07, 0x08, 0x06, 0x00, 0x01, 0x02, 0x00,
     0x09, 0x0A, 0x0B, 0x09, 0x0C, 0x0D, 0x0E, 0x0C, 0x0F, 0x10, 0x11, 0x0F, 0x09, 0x0A, 0x0B, 0x09,
     0x12, 0x13, 0x14, 0x12, 0x15, 0x16, 0x17, 0x15, 0x18, 0x19, 0x1A, 0x18, 0x12, 0x13, 0x14, 0x12,
@@ -55,7 +56,8 @@ const u8 gUnusedFRLGDownArrow[] = INCBIN_U8("data/graphics/fonts/unused_frlg_dow
 const u8 gDownArrowYCoords[] = { 0x0, 0x1, 0x2, 0x1 };
 const u8 gWindowVerticalScrollSpeeds[] = { 0x1, 0x2, 0x4, 0x0 };
 
-const struct GlyphWidthFunc gGlyphWidthFuncs[] = {
+const struct GlyphWidthFunc gGlyphWidthFuncs[] =
+{
     { 0x0, GetGlyphWidthFont0 },
     { 0x1, GetGlyphWidthFont1 },
     { 0x2, GetGlyphWidthFont2 },
@@ -67,7 +69,8 @@ const struct GlyphWidthFunc gGlyphWidthFuncs[] = {
     { 0x8, GetGlyphWidthFont8 }
 };
 
-const struct KeypadIcon gKeypadIcons[] = {
+const struct KeypadIcon gKeypadIcons[] =
+{
     {  0x0,  0x8, 0xC },
     {  0x1,  0x8, 0xC },
     {  0x2, 0x10, 0xC },
@@ -85,7 +88,8 @@ const struct KeypadIcon gKeypadIcons[] = {
 
 const u8 gKeypadIconTiles[] = INCBIN_U8("data/graphics/fonts/keypad_icons.4bpp");
 
-const struct FontInfo gFontInfos[] = {
+const struct FontInfo gFontInfos[] =
+{
     { Font0Func, 0x5,  0xC, 0x0, 0x0, 0x0, 0x2, 0x1, 0x3 },
     { Font1Func, 0x6, 0x10, 0x0, 0x0, 0x0, 0x2, 0x1, 0x3 },
     { Font2Func, 0x6,  0xE, 0x0, 0x0, 0x0, 0x2, 0x1, 0x3 },
@@ -98,7 +102,8 @@ const struct FontInfo gFontInfos[] = {
     { NULL,      0x8,  0x8, 0x0, 0x0, 0x0, 0x1, 0x2, 0xF }
 };
 
-const u8 gMenuCursorDimensions[][2] = {
+const u8 gMenuCursorDimensions[][2] =
+{
     { 0x8,  0xC },
     { 0x8,  0xF },
     { 0x8,  0xE },
@@ -211,25 +216,25 @@ bool16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u8 speed, voi
 void RunTextPrinters(void)
 {
     int i;
-    u16 temp;
 
     if (gUnknown_03002F84 == 0)
     {
         for (i = 0; i < 0x20; ++i)
         {
-            if (gTextPrinters[i].active != 0)
+            if (gTextPrinters[i].active)
             {
-                temp = RenderFont(&gTextPrinters[i]);
-                switch (temp) {
-                    case 0:
-                        CopyWindowToVram(gTextPrinters[i].printerTemplate.windowId, 2);
-                    case 3:
-                        if (gTextPrinters[i].callback != 0)
-                            gTextPrinters[i].callback(&gTextPrinters[i].printerTemplate, temp);
-                        break;
-                    case 1:
-                        gTextPrinters[i].active = 0;
-                        break;
+                u16 temp = RenderFont(&gTextPrinters[i]);
+                switch (temp)
+                {
+                case 0:
+                    CopyWindowToVram(gTextPrinters[i].printerTemplate.windowId, 2);
+                case 3:
+                    if (gTextPrinters[i].callback != 0)
+                        gTextPrinters[i].callback(&gTextPrinters[i].printerTemplate, temp);
+                    break;
+                case 1:
+                    gTextPrinters[i].active = 0;
+                    break;
                 }
             }
         }
@@ -843,207 +848,49 @@ void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor)
     GenerateFontHalfRowLookupTable(*fgColor, *bgColor, *shadowColor);
 }
 
-#ifdef NONMATCHING
-void DecompressGlyphTile(const u16 *src, u16 *dest)
+void DecompressGlyphTile(const void *src_, void *dest_)
 {
     u32 temp;
+    const u16 *src = src_;
+    u32 *dest = dest_;
 
-    temp = src[0];
-    *(dest++) = (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]];
-    temp = src[1];
-    src += 2;
-    dest[1] = (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]];
-    dest++;
     temp = *(src++);
-    *(dest++) = (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]];
+    *(dest)++ = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
+
     temp = *(src++);
-    *(dest++) = (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]];
+    *(dest++) = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
+
     temp = *(src++);
-    *(dest++) = (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]];
+    *(dest++) = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
+
     temp = *(src++);
-    *(dest++) = (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]];
-    *(dest++) = (gFontHalfRowLookupTable[gFontHalfRowOffsets[src[0] & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[src[0] >> 8]];
-    *(dest) = (gFontHalfRowLookupTable[gFontHalfRowOffsets[src[1] & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[src[1] >> 8]];
+    *(dest++) = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
+
+    temp = *(src++);
+    *(dest++) = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
+
+    temp = *(src++);
+    *(dest++) = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
+
+    temp = *(src++);
+    *(dest++) = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
+
+    temp = *(src++);
+    *(dest++) = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
 }
-#else
-NAKED
-void DecompressGlyphTile(const u16 *src, u16 *dest)
-{
-    asm("push {r4-r7,lr}\n\
-    mov r7, r8\n\
-    push {r7}\n\
-    ldrh r7, [r0]\n\
-    ldr r5, =gFontHalfRowLookupTable\n\
-    ldr r4, =gFontHalfRowOffsets\n\
-    mov r2, #0xFF\n\
-    mov r8, r2\n\
-    add r2, r7, #0\n\
-    mov r3, r8\n\
-    and r2, r3\n\
-    add r2, r4\n\
-    ldrb r2, [r2]\n\
-    lsl r2, #1\n\
-    add r2, r5\n\
-    ldrh r3, [r2]\n\
-    lsl r3, #16\n\
-    lsr r2, r7, #8\n\
-    add r2, r4\n\
-    ldrb r2, [r2]\n\
-    lsl r2, #1\n\
-    add r2, r5\n\
-    ldrh r2, [r2]\n\
-    orr r3, r2\n\
-    add r6, r1, #0\n\
-    stmia r6!, {r3}\n\
-    ldrh r7, [r0, #0x2]\n\
-    add r0, #0x4\n\
-    add r2, r7, #0\n\
-    mov r3, r8\n\
-    and r2, r3\n\
-    add r2, r4\n\
-    ldrb r2, [r2]\n\
-    lsl r2, #1\n\
-    add r2, r5\n\
-    ldrh r3, [r2]\n\
-    lsl r3, #16\n\
-    lsr r2, r7, #8\n\
-    add r2, r4\n\
-    ldrb r2, [r2]\n\
-    lsl r2, #1\n\
-    add r2, r5\n\
-    ldrh r2, [r2]\n\
-    orr r3, r2\n\
-    str r3, [r1, #0x4]\n\
-    add r6, #0x4\n\
-    ldrh r7, [r0]\n\
-    add r0, #0x2\n\
-    add r1, r7, #0\n\
-    mov r2, r8\n\
-    and r1, r2\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r2, [r1]\n\
-    lsl r2, #16\n\
-    lsr r1, r7, #8\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r1, [r1]\n\
-    orr r2, r1\n\
-    stmia r6!, {r2}\n\
-    ldrh r7, [r0]\n\
-    add r0, #0x2\n\
-    add r1, r7, #0\n\
-    mov r3, r8\n\
-    and r1, r3\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r2, [r1]\n\
-    lsl r2, #16\n\
-    lsr r1, r7, #8\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r1, [r1]\n\
-    orr r2, r1\n\
-    stmia r6!, {r2}\n\
-    ldrh r7, [r0]\n\
-    add r0, #0x2\n\
-    add r1, r7, #0\n\
-    and r1, r3\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r2, [r1]\n\
-    lsl r2, #16\n\
-    lsr r1, r7, #8\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r1, [r1]\n\
-    orr r2, r1\n\
-    stmia r6!, {r2}\n\
-    ldrh r7, [r0]\n\
-    add r0, #0x2\n\
-    add r1, r7, #0\n\
-    and r1, r3\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r2, [r1]\n\
-    lsl r2, #16\n\
-    lsr r1, r7, #8\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r1, [r1]\n\
-    orr r2, r1\n\
-    stmia r6!, {r2}\n\
-    ldrh r7, [r0]\n\
-    add r1, r7, #0\n\
-    and r1, r3\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r2, [r1]\n\
-    lsl r2, #16\n\
-    lsr r1, r7, #8\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r1, [r1]\n\
-    orr r2, r1\n\
-    stmia r6!, {r2}\n\
-    ldrh r7, [r0, #0x2]\n\
-    add r0, r7, #0\n\
-    and r0, r3\n\
-    add r0, r4\n\
-    ldrb r0, [r0]\n\
-    lsl r0, #1\n\
-    add r0, r5\n\
-    ldrh r1, [r0]\n\
-    lsl r1, #16\n\
-    lsr r0, r7, #8\n\
-    add r0, r4\n\
-    ldrb r0, [r0]\n\
-    lsl r0, #1\n\
-    add r0, r5\n\
-    ldrh r0, [r0]\n\
-    orr r1, r0\n\
-    str r1, [r6]\n\
-    pop {r3}\n\
-    mov r8, r3\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .pool");
-}
-#endif
 
 u8 GetLastTextColor(u8 colorType)
 {
     switch (colorType)
     {
-        case 0:
-            return gLastTextFgColor;
-        case 2:
-            return gLastTextBgColor;
-        case 1:
-            return gLastTextShadowColor;
-        default:
-            return 0;
+    case 0:
+        return gLastTextFgColor;
+    case 2:
+        return gLastTextBgColor;
+    case 1:
+        return gLastTextShadowColor;
+    default:
+        return 0;
     }
 }
 
@@ -2802,8 +2649,8 @@ void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese)
     if (isJapanese == 1)
     {
         glyphs = gFont0JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF));
-        DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-        DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90.unk40));    // gUnknown_03002F90 + 0x40
+        DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+        DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40);    // gUnknown_03002F90 + 0x40
         gUnknown_03002F90.unk80 = 8;     // gGlyphWidth
         gUnknown_03002F90.unk81 = 12;    // gGlyphHeight
     }
@@ -2814,15 +2661,15 @@ void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese)
 
         if (gUnknown_03002F90.unk80 <= 8)
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
         }
         else
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90.unk20));
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
-            DecompressGlyphTile(glyphs + 0x18, (u16 *)(gUnknown_03002F90.unk60));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
+            DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60);
         }
 
         gUnknown_03002F90.unk81 = 13;
@@ -2845,8 +2692,8 @@ void DecompressGlyphFont7(u16 glyphId, bool32 isJapanese)
     {
         int eff;
         glyphs = gFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF)));  // shh, no questions, only matching now
-        DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-        DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90.unk40));    // gUnknown_03002F90 + 0x40
+        DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+        DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40);    // gUnknown_03002F90 + 0x40
         gUnknown_03002F90.unk80 = 8;     // gGlyphWidth
         gUnknown_03002F90.unk81 = 15;    // gGlyphHeight
     }
@@ -2857,15 +2704,15 @@ void DecompressGlyphFont7(u16 glyphId, bool32 isJapanese)
 
         if (gUnknown_03002F90.unk80 <= 8)
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
         }
         else
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90.unk20));
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
-            DecompressGlyphTile(glyphs + 0x18, (u16 *)(gUnknown_03002F90.unk60));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
+            DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60);
         }
 
         gUnknown_03002F90.unk81 = 15;
@@ -2887,8 +2734,8 @@ void DecompressGlyphFont8(u16 glyphId, bool32 isJapanese)
     if (isJapanese == TRUE)
     {
         glyphs = gFont0JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF));
-        DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-        DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90.unk40));    // gUnknown_03002F90 + 0x40
+        DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+        DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40);    // gUnknown_03002F90 + 0x40
         gUnknown_03002F90.unk80 = 8;     // gGlyphWidth
         gUnknown_03002F90.unk81 = 12;    // gGlyphHeight
     }
@@ -2899,15 +2746,15 @@ void DecompressGlyphFont8(u16 glyphId, bool32 isJapanese)
 
         if (gUnknown_03002F90.unk80 <= 8)
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
         }
         else
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90.unk20));
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
-            DecompressGlyphTile(glyphs + 0x18, (u16 *)(gUnknown_03002F90.unk60));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
+            DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60);
         }
 
         gUnknown_03002F90.unk81 = 12;
@@ -2929,10 +2776,10 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese)
     if (isJapanese == TRUE)
     {
         glyphs = gFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
-        DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-        DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90.unk20));    // gUnknown_03002F90 + 0x40
-        DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90.unk40));    // gUnknown_03002F90 + 0x20
-        DecompressGlyphTile(glyphs + 0x88, (u16 *)(gUnknown_03002F90.unk60));    // gUnknown_03002F90 + 0x60
+        DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+        DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);    // gUnknown_03002F90 + 0x40
+        DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40);    // gUnknown_03002F90 + 0x20
+        DecompressGlyphTile(glyphs + 0x88, gUnknown_03002F90.unk60);    // gUnknown_03002F90 + 0x60
         gUnknown_03002F90.unk80 = gFont2JapaneseGlyphWidths[glyphId];     // gGlyphWidth
         gUnknown_03002F90.unk81 = 14;    // gGlyphHeight
     }
@@ -2943,15 +2790,15 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese)
 
         if (gUnknown_03002F90.unk80 <= 8)
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
         }
         else
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90.unk20));
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
-            DecompressGlyphTile(glyphs + 0x18, (u16 *)(gUnknown_03002F90.unk60));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
+            DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60);
         }
 
         gUnknown_03002F90.unk81 = 14;
@@ -2974,8 +2821,8 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese)
     {
         int eff;
         glyphs = gFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF)));  // shh, no questions, only matching now
-        DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-        DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90.unk40));    // gUnknown_03002F90 + 0x40
+        DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+        DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40);    // gUnknown_03002F90 + 0x40
         gUnknown_03002F90.unk80 = 8;     // gGlyphWidth
         gUnknown_03002F90.unk81 = 15;    // gGlyphHeight
     }
@@ -2986,15 +2833,15 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese)
 
         if (gUnknown_03002F90.unk80 <= 8)
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
         }
         else
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90.unk20));
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
-            DecompressGlyphTile(glyphs + 0x18, (u16 *)(gUnknown_03002F90.unk60));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
+            DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60);
         }
 
         gUnknown_03002F90.unk81 = 15;
@@ -3014,8 +2861,8 @@ void DecompressGlyphFont9(u16 glyphId)
     const u16* glyphs;
 
     glyphs = gFont9JapaneseGlyphs + (0x100 * (glyphId >> 4)) + (0x8 * (glyphId & 0xF));
-    DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-    DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90.unk40));
+    DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+    DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40);
     gUnknown_03002F90.unk80 = 8;
     gUnknown_03002F90.unk81 = 12;
 }