Merge pull request #342 from Kermalis/master

Volume stuff

75 files changed, 150 insertions, 145 deletions

diff --git a/songs.mk b/songs.mk
index 0c7162c81..c67aa6392 100644
--- a/songs.mk
+++ b/songs.mk
@@ -4,409 +4,409 @@ $(MID_BUILDDIR)/%.o: $(MID_SUBDIR)/%.s
 	$(AS) $(ASFLAGS) -I sound -o $@ $<
 
 $(MID_SUBDIR)/mus_ajito.s: %.s: %.mid
-	$(MID) $< $@ -G076 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G076 -V084
 
 $(MID_SUBDIR)/mus_aqa_0.s: %.s: %.mid
-	$(MID) $< $@ -G065 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G065 -V086
 
 $(MID_SUBDIR)/mus_ashroad.s: %.s: %.mid
-	$(MID) $< $@ -G055 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G055 -V076
 
 $(MID_SUBDIR)/mus_ayasii.s: %.s: %.mid
-	$(MID) $< $@ -G069 -R$(STD_REVERB) -V078
+	$(MID) $< $@ -E -R$(STD_REVERB) -G069 -V078
 
 $(MID_SUBDIR)/mus_b_arena.s: %.s: %.mid
-	$(MID) $< $@ -G104 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G104 -V090
 
 $(MID_SUBDIR)/mus_b_dome.s: %.s: %.mid
-	$(MID) $< $@ -G111 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G111 -V090
 
 $(MID_SUBDIR)/mus_b_dome1.s: %.s: %.mid
-	$(MID) $< $@ -G111 -R$(STD_REVERB)
-
-$(MID_SUBDIR)/mus_b_frontier.s: %.s: %.mid
-	$(MID) $< $@ -G103 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G111 -V056
 
 $(MID_SUBDIR)/mus_b_factory.s: %.s: %.mid
-	$(MID) $< $@ -G113 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G113 -V100
+
+$(MID_SUBDIR)/mus_b_frontier.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G103 -V094
 
 $(MID_SUBDIR)/mus_b_palace.s: %.s: %.mid
-	$(MID) $< $@ -G108 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G108 -V105
 
 $(MID_SUBDIR)/mus_b_tower.s: %.s: %.mid
-	$(MID) $< $@ -G035 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G035 -V080
 
 $(MID_SUBDIR)/mus_b_tube.s: %.s: %.mid
-	$(MID) $< $@ -G112 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G112 -V092
 
 $(MID_SUBDIR)/mus_battle20.s: %.s: %.mid
-	$(MID) $< $@ -G119 -R$(STD_REVERB) -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G119 -V080 -P1
 
 $(MID_SUBDIR)/mus_battle27.s: %.s: %.mid
-	$(MID) $< $@ -G117 -R$(STD_REVERB) -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G117 -V080 -P1
 
 $(MID_SUBDIR)/mus_battle30.s: %.s: %.mid
-	$(MID) $< $@ -G126 -R$(STD_REVERB) -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G126 -V080 -P1
 
 $(MID_SUBDIR)/mus_battle31.s: %.s: %.mid
-	$(MID) $< $@ -G118 -R$(STD_REVERB) -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G118 -V080 -P1
 
 $(MID_SUBDIR)/mus_battle32.s: %.s: %.mid
-	$(MID) $< $@ -G120 -R$(STD_REVERB) -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G120 -V080 -P1
 
 $(MID_SUBDIR)/mus_battle33.s: %.s: %.mid
-	$(MID) $< $@ -G121 -R$(STD_REVERB) -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G121 -V080 -P1
 
 $(MID_SUBDIR)/mus_battle34.s: %.s: %.mid
-	$(MID) $< $@ -G123 -R$(STD_REVERB) -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G123 -V080 -P1
 
 $(MID_SUBDIR)/mus_battle35.s: %.s: %.mid
-	$(MID) $< $@ -G124 -R$(STD_REVERB) -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G124 -V080 -P1
 
 $(MID_SUBDIR)/mus_battle36.s: %.s: %.mid
-	$(MID) $< $@ -G122 -R$(STD_REVERB) -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G122 -V080 -P1
 
 $(MID_SUBDIR)/mus_battle38.s: %.s: %.mid
-	$(MID) $< $@ -G125 -R$(STD_REVERB) -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G125 -V080 -P1
 
 $(MID_SUBDIR)/mus_bd_time.s: %.s: %.mid
-	$(MID) $< $@ -G038 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G038 -V080
 
 $(MID_SUBDIR)/mus_bijyutu.s: %.s: %.mid
-	$(MID) $< $@ -G020 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G020 -V080
 
 $(MID_SUBDIR)/mus_boy_sup.s: %.s: %.mid
-	$(MID) $< $@ -G067 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G067 -V078
 
 $(MID_SUBDIR)/mus_boyeye.s: %.s: %.mid
-	$(MID) $< $@ -G028 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G028 -V080
 
 $(MID_SUBDIR)/mus_c_road.s: %.s: %.mid
-	$(MID) $< $@ -G075 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G075 -V076
 
 $(MID_SUBDIR)/mus_casino.s: %.s: %.mid
-	$(MID) $< $@ -G072 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G072 -V072
 
 $(MID_SUBDIR)/mus_con_fan.s: %.s: %.mid
-	$(MID) $< $@ -G085 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G085 -V100
 
 $(MID_SUBDIR)/mus_con_k.s: %.s: %.mid
-	$(MID) $< $@ -G092 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G092 -V080
 
 $(MID_SUBDIR)/mus_conlobby.s: %.s: %.mid
-	$(MID) $< $@ -G098 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G098 -V060
 
 $(MID_SUBDIR)/mus_contest0.s: %.s: %.mid
-	$(MID) $< $@ -G086 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G086 -V088
 
 $(MID_SUBDIR)/mus_cycling.s: %.s: %.mid
-	$(MID) $< $@ -G049 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G049 -V083
+
+$(MID_SUBDIR)/mus_daigo.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G100 -V076
 
 $(MID_SUBDIR)/mus_dan01.s: %.s: %.mid
-	$(MID) $< $@ -G018 -R$(STD_REVERB) -V080 -E
+	$(MID) $< $@ -E -R$(STD_REVERB) -G018 -V080
 
 $(MID_SUBDIR)/mus_dan02.s: %.s: %.mid
-	$(MID) $< $@ -G030 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G030 -V080
 
 $(MID_SUBDIR)/mus_dan03.s: %.s: %.mid
-	$(MID) $< $@ -G037 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G037 -V080
 
 $(MID_SUBDIR)/mus_deepdeep.s: %.s: %.mid
-	$(MID) $< $@ -G057 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G057 -V094
 
 $(MID_SUBDIR)/mus_demo1.s: %.s: %.mid
-	$(MID) $< $@ -G060 -R$(STD_REVERB)
-
-$(MID_SUBDIR)/mus_daigo.s: %.s: %.mid
-	$(MID) $< $@ -G100 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G060 -V090
 
 $(MID_SUBDIR)/mus_dendou.s: %.s: %.mid
-	$(MID) $< $@ -G082 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G082 -V078
 
 $(MID_SUBDIR)/mus_dooro_x1.s: %.s: %.mid
-	$(MID) $< $@ -G010 -R$(STD_REVERB) -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -G010 -V080
 
 $(MID_SUBDIR)/mus_dooro_x3.s: %.s: %.mid
-	$(MID) $< $@ -G014 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G014 -V080
 
 $(MID_SUBDIR)/mus_dooro_x4.s: %.s: %.mid
-	$(MID) $< $@ -G021 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G021 -V080
 
 $(MID_SUBDIR)/mus_dooro1.s: %.s: %.mid
-	$(MID) $< $@ -G011 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G011 -V080
 
 $(MID_SUBDIR)/mus_dummy.s: %.s: %.mid
-	$(MID) $< $@ -R40
+	$(MID) $< $@ -E -R40
 
 $(MID_SUBDIR)/mus_eikou_r.s: %.s: %.mid
-	$(MID) $< $@ -G093 -R$(STD_REVERB) -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -G093 -V080
 
 $(MID_SUBDIR)/mus_end.s: %.s: %.mid
-	$(MID) $< $@ -G102 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G102 -V036
 
 $(MID_SUBDIR)/mus_event0.s: %.s: %.mid
-	$(MID) $< $@ -G056 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G056 -V078
 
 $(MID_SUBDIR)/mus_fanfa1.s: %.s: %.mid
-	$(MID) $< $@ -G012 -R$(STD_REVERB) -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
 $(MID_SUBDIR)/mus_fanfa4.s: %.s: %.mid
-	$(MID) $< $@ -G012 -R$(STD_REVERB) -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
 $(MID_SUBDIR)/mus_fanfa5.s: %.s: %.mid
-	$(MID) $< $@ -G012 -R$(STD_REVERB) -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
 $(MID_SUBDIR)/mus_field13.s: %.s: %.mid
-	$(MID) $< $@ -G000 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -V080
 
 $(MID_SUBDIR)/mus_finecity.s: %.s: %.mid
-	$(MID) $< $@ -G079 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G079 -V070
 
 $(MID_SUBDIR)/mus_friendly.s: %.s: %.mid
-	$(MID) $< $@ -G050 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G050 -V085
 
 $(MID_SUBDIR)/mus_fune_kan.s: %.s: %.mid
-	$(MID) $< $@ -G023 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G023 -V080
 
 $(MID_SUBDIR)/mus_gim.s: %.s: %.mid
-	$(MID) $< $@ -G013 -R$(STD_REVERB) -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -G013 -V080
 
 $(MID_SUBDIR)/mus_girl_sup.s: %.s: %.mid
-	$(MID) $< $@ -G061 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G061 -V078
 
 $(MID_SUBDIR)/mus_girleye.s: %.s: %.mid
-	$(MID) $< $@ -G053 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G053 -V072
 
 $(MID_SUBDIR)/mus_gomachi0.s: %.s: %.mid
-	$(MID) $< $@ -G044 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G044 -V090
 
 $(MID_SUBDIR)/mus_gotown.s: %.s: %.mid
-	$(MID) $< $@ -G045 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G045 -V085
 
 $(MID_SUBDIR)/mus_granroad.s: %.s: %.mid
-	$(MID) $< $@ -G048 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G048 -V096
 
 $(MID_SUBDIR)/mus_hageshii.s: %.s: %.mid
-	$(MID) $< $@ -G062 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G062 -V078
 
 $(MID_SUBDIR)/mus_hideri.s: %.s: %.mid
-	$(MID) $< $@ -G090 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G090 -V050
 
 $(MID_SUBDIR)/mus_hightown.s: %.s: %.mid
-	$(MID) $< $@ -G073 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G073 -V078
 
 $(MID_SUBDIR)/mus_hutago.s: %.s: %.mid
-	$(MID) $< $@ -G095 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G095 -V075
 
 $(MID_SUBDIR)/mus_inter_v.s: %.s: %.mid
-	$(MID) $< $@ -G099 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G099 -V062
 
 $(MID_SUBDIR)/mus_kachi1.s: %.s: %.mid
-	$(MID) $< $@ -G058 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G058 -V091
 
 $(MID_SUBDIR)/mus_kachi2.s: %.s: %.mid
-	$(MID) $< $@ -G025 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G025 -V080
 
 $(MID_SUBDIR)/mus_kachi3.s: %.s: %.mid
-	$(MID) $< $@ -G024 -R$(STD_REVERB) -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -G024 -V080
 
 $(MID_SUBDIR)/mus_kachi4.s: %.s: %.mid
-	$(MID) $< $@ -G070 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G070 -V088
 
 $(MID_SUBDIR)/mus_kachi5.s: %.s: %.mid
-	$(MID) $< $@ -G029 -R$(STD_REVERB) -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -G029 -V080
 
 $(MID_SUBDIR)/mus_kachi22.s: %.s: %.mid
-	$(MID) $< $@ -G025 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G025 -V080
 
 $(MID_SUBDIR)/mus_kakkoii.s: %.s: %.mid
-	$(MID) $< $@ -G063 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G063 -V086
 
 $(MID_SUBDIR)/mus_karakuri.s: %.s: %.mid
-	$(MID) $< $@ -G094 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G094 -V070
 
 $(MID_SUBDIR)/mus_kazanbai.s: %.s: %.mid
-	$(MID) $< $@ -G064 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G064 -V084
 
 $(MID_SUBDIR)/mus_m_boat.s: %.s: %.mid
-	$(MID) $< $@ -G077 -R$(STD_REVERB) -V086
+	$(MID) $< $@ -E -R$(STD_REVERB) -G077 -V086
 
 $(MID_SUBDIR)/mus_m_dungon.s: %.s: %.mid
-	$(MID) $< $@ -G078 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G078 -V088
 
 $(MID_SUBDIR)/mus_maborosi.s: %.s: %.mid
-	$(MID) $< $@ -G084 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G084 -V100
 
 $(MID_SUBDIR)/mus_machi_s2.s: %.s: %.mid
-	$(MID) $< $@ -G015 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G015 -V080
 
 $(MID_SUBDIR)/mus_machi_s3.s: %.s: %.mid
-	$(MID) $< $@ -G032 -R$(STD_REVERB) -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -G032 -V080
 
 $(MID_SUBDIR)/mus_machi_s4.s: %.s: %.mid
-	$(MID) $< $@ -G019 -R$(STD_REVERB) -E
+	$(MID) $< $@ -E -R$(STD_REVERB) -G019 -V080
 
 $(MID_SUBDIR)/mus_machupi.s: %.s: %.mid
-	$(MID) $< $@ -G080 -R$(STD_REVERB)
+	$(MID) $< $@ -E -R$(STD_REVERB) -G080 -V080
 
 $(MID_SUBDIR)/mus_me_asa.s: %.s: %.mid
-	$(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_b_big.s: %.s: %.mid
-	$(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_b_small.s: %.s: %.mid
-	$(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_bachi.s: %.s: %.mid
-	$(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_kinomi.s: %.s: %.mid
-	$(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_pointget.s: %.s: %.mid
-	$(MID) $< $@ -G103 -R$(STD_REVERB) -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G103 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_shinka.s: %.s: %.mid
-	$(MID) $< $@ -G026 -R$(STD_REVERB) -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -G026 -V080
 
 $(MID_SUBDIR)/mus_me_symbolget.s: %.s: %.mid
-	$(MID) $< $@ -G103 -R$(STD_REVERB) -V100 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G103 -V100 -P5
 
 $(MID_SUBDIR)/mus_me_tama.s: %.s: %.mid
-	$(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_tore_eye.s: %.s: %.mid
-	$(MID) $< $@ -G105 -R$(STD_REVERB) -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G105 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_wasure.s: %.s: %.mid
-	$(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_waza.s: %.s: %.mid
-	$(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_zannen.s: %.s: %.mid
-	$(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
 $(MID_SUBDIR)/mus_mgm0.s: %.s: %.mid
-	$(MID) $< $@ -G087 -R$(STD_REVERB) -V072
+	$(MID) $< $@ -E -R$(STD_REVERB) -G087 -V072
 
 $(MID_SUBDIR)/mus_minamo.s: %.s: %.mid
-	$(MID) $< $@ -G054 -R$(STD_REVERB) -V085
+	$(MID) $< $@ -E -R$(STD_REVERB) -G054 -V085
 
 $(MID_SUBDIR)/mus_mishiro.s: %.s: %.mid
-	$(MID) $< $@ -G051 -R$(STD_REVERB) -V100
+	$(MID) $< $@ -E -R$(STD_REVERB) -G051 -V100
+
+$(MID_SUBDIR)/mus_naminori.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G017 -V080
 
 $(MID_SUBDIR)/mus_nextroad.s: %.s: %.mid
-	$(MID) $< $@ -G047 -R$(STD_REVERB) -V097
+	$(MID) $< $@ -E -R$(STD_REVERB) -G047 -V097
 
 $(MID_SUBDIR)/mus_nibi.s: %.s: %.mid
-	$(MID) $< $@ -G000 -R$(STD_REVERB) -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -V080
 
 $(MID_SUBDIR)/mus_odamaki.s: %.s: %.mid
-	$(MID) $< $@ -G033 -R$(STD_REVERB) -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -G033 -V080
 
 $(MID_SUBDIR)/mus_ooame.s: %.s: %.mid
-	$(MID) $< $@ -G089 -R$(STD_REVERB) -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -G089 -V080
 
 $(MID_SUBDIR)/mus_p_school.s: %.s: %.mid
-	$(MID) $< $@ -G081 -R$(STD_REVERB) -V100
+	$(MID) $< $@ -E -R$(STD_REVERB) -G081 -V100
 
 $(MID_SUBDIR)/mus_pcc.s: %.s: %.mid
-	$(MID) $< $@ -G000 -R$(STD_REVERB) -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -V080
 
 $(MID_SUBDIR)/mus_pokecen.s: %.s: %.mid
-	$(MID) $< $@ -G046 -R$(STD_REVERB) -V092
+	$(MID) $< $@ -E -R$(STD_REVERB) -G046 -V092
 
 $(MID_SUBDIR)/mus_pyramid.s: %.s: %.mid
-	$(MID) $< $@ -G106 -R$(STD_REVERB) -V079
+	$(MID) $< $@ -E -R$(STD_REVERB) -G106 -V079
 
 $(MID_SUBDIR)/mus_pyramid_top.s: %.s: %.mid
-	$(MID) $< $@ -G107 -R$(STD_REVERB) -V077
+	$(MID) $< $@ -E -R$(STD_REVERB) -G107 -V077
 
 $(MID_SUBDIR)/mus_rainbow.s: %.s: %.mid
-	$(MID) $< $@ -G068 -R$(STD_REVERB) -V086
+	$(MID) $< $@ -E -R$(STD_REVERB) -G068 -V086
 
 $(MID_SUBDIR)/mus_rekkuu_kourin.s: %.s: %.mid
-	$(MID) $< $@ -G109 -R$(STD_REVERB) -V090
+	$(MID) $< $@ -E -R$(STD_REVERB) -G109 -V090
+
+$(MID_SUBDIR)/mus_ropeway.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G071 -V078
 
 $(MID_SUBDIR)/mus_runecity.s: %.s: %.mid
-	$(MID) $< $@ -G091 -R$(STD_REVERB) -V062
+	$(MID) $< $@ -E -R$(STD_REVERB) -G091 -V062
 
 $(MID_SUBDIR)/mus_safari.s: %.s: %.mid
-	$(MID) $< $@ -G074 -R$(STD_REVERB) -V082
+	$(MID) $< $@ -E -R$(STD_REVERB) -G074 -V082
 
 $(MID_SUBDIR)/mus_sattower.s: %.s: %.mid
-	$(MID) $< $@ -G110 -R$(STD_REVERB) -V100
+	$(MID) $< $@ -E -R$(STD_REVERB) -G110 -V100
 
 $(MID_SUBDIR)/mus_shinka.s: %.s: %.mid
-	$(MID) $< $@ -G026 -R$(STD_REVERB) -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -G026 -V080
 
 $(MID_SUBDIR)/mus_sitennou.s: %.s: %.mid
-	$(MID) $< $@ -G096 -R$(STD_REVERB) -V078
+	$(MID) $< $@ -E -R$(STD_REVERB) -G096 -V078
 
 $(MID_SUBDIR)/mus_suikun.s: %.s: %.mid
-	$(MID) $< $@ -G000 -R$(STD_REVERB) -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -V080
 
 $(MID_SUBDIR)/mus_swimeye.s: %.s: %.mid
-	$(MID) $< $@ -G036 -R$(STD_REVERB) -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -G036 -V080
 
 $(MID_SUBDIR)/mus_syoujoeye.s: %.s: %.mid
-	$(MID) $< $@ -G027 -R$(STD_REVERB) -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -G027 -V080
 
 $(MID_SUBDIR)/mus_t_battle.s: %.s: %.mid
-	$(MID) $< $@ -G088 -R$(STD_REVERB) -V088
+	$(MID) $< $@ -E -R$(STD_REVERB) -G088 -V088
 
 $(MID_SUBDIR)/mus_test.s: %.s: %.mid
-	$(MID) $< $@ -G043 -R$(STD_REVERB) -V094
+	$(MID) $< $@ -E -R$(STD_REVERB) -G043 -V094
 
 $(MID_SUBDIR)/mus_test1.s: %.s: %.mid
-	$(MID) $< $@ -G039 -R$(STD_REVERB) -V079
+	$(MID) $< $@ -E -R$(STD_REVERB) -G039 -V079
 
 $(MID_SUBDIR)/mus_test2.s: %.s: %.mid
-	$(MID) $< $@ -G040 -R$(STD_REVERB) -V090
+	$(MID) $< $@ -E -R$(STD_REVERB) -G040 -V090
 
 $(MID_SUBDIR)/mus_test3.s: %.s: %.mid
-	$(MID) $< $@ -G041 -R$(STD_REVERB) -V075
+	$(MID) $< $@ -E -R$(STD_REVERB) -G041 -V075
 
 $(MID_SUBDIR)/mus_test4.s: %.s: %.mid
-	$(MID) $< $@ -G042 -R$(STD_REVERB) -V090
+	$(MID) $< $@ -E -R$(STD_REVERB) -G042 -V090
 
 $(MID_SUBDIR)/mus_tetsuji.s: %.s: %.mid
-	$(MID) $< $@ -G034 -R$(STD_REVERB) -V099
+	$(MID) $< $@ -E -R$(STD_REVERB) -G034 -V099
 
 $(MID_SUBDIR)/mus_thankfor.s: %.s: %.mid
-	$(MID) $< $@ -G101 -R$(STD_REVERB) -V100
+	$(MID) $< $@ -E -R$(STD_REVERB) -G101 -V100
 
 $(MID_SUBDIR)/mus_title3.s: %.s: %.mid
-	$(MID) $< $@ -G059 -R$(STD_REVERB) -V090
+	$(MID) $< $@ -E -R$(STD_REVERB) -G059 -V090
 
 $(MID_SUBDIR)/mus_tonekusa.s: %.s: %.mid
-	$(MID) $< $@ -G083 -R$(STD_REVERB) -V100
+	$(MID) $< $@ -E -R$(STD_REVERB) -G083 -V100
 
 $(MID_SUBDIR)/mus_tozan.s: %.s: %.mid
-	$(MID) $< $@ -G052 -R$(STD_REVERB) -V078
+	$(MID) $< $@ -E -R$(STD_REVERB) -G052 -V078
 
 $(MID_SUBDIR)/mus_tsuretek.s: %.s: %.mid
-	$(MID) $< $@ -G066 -R$(STD_REVERB) -V074
+	$(MID) $< $@ -E -R$(STD_REVERB) -G066 -V074
 
 $(MID_SUBDIR)/mus_vs_front.s: %.s: %.mid
-	$(MID) $< $@ -G115 -R$(STD_REVERB) -V090 -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G115 -V090 -P1
 
 $(MID_SUBDIR)/mus_vs_mew.s: %.s: %.mid
-	$(MID) $< $@ -G116 -R$(STD_REVERB) -V090
+	$(MID) $< $@ -E -R$(STD_REVERB) -G116 -V090
 
 $(MID_SUBDIR)/mus_vs_rekku.s: %.s: %.mid
-	$(MID) $< $@ -G114 -R$(STD_REVERB) -V080 -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G114 -V080 -P1
 
 $(MID_SUBDIR)/mus_yama_eye.s: %.s: %.mid
-	$(MID) $< $@ -G097 -R$(STD_REVERB) -V076
-
-$(MID_SUBDIR)/mus_naminori.s: %.s: %.mid
-	$(MID) $< $@ -G017 -R$(STD_REVERB)
-
-$(MID_SUBDIR)/mus_ropeway.s: %.s: %.mid
-	$(MID) $< $@ -G071 -R$(STD_REVERB) -V078
+	$(MID) $< $@ -E -R$(STD_REVERB) -G097 -V076
 
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
-	$(MID) $< $@ -G127 -R$(STD_REVERB) -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/mus_ajito.mid b/sound/songs/midi/mus_ajito.mid
index b61ae28ba..200fa88dd 100644
--- a/sound/songs/midi/mus_ajito.mid
+++ b/sound/songs/midi/mus_ajito.mid
diff --git a/sound/songs/midi/mus_aqa_0.mid b/sound/songs/midi/mus_aqa_0.mid
index a2f4dfcc9..d5a2474bd 100644
--- a/sound/songs/midi/mus_aqa_0.mid
+++ b/sound/songs/midi/mus_aqa_0.mid
diff --git a/sound/songs/midi/mus_ashroad.mid b/sound/songs/midi/mus_ashroad.mid
index 83b83e025..4b7f71c09 100644
--- a/sound/songs/midi/mus_ashroad.mid
+++ b/sound/songs/midi/mus_ashroad.mid
diff --git a/sound/songs/midi/mus_b_arena.mid b/sound/songs/midi/mus_b_arena.mid
index 529203987..caaff1523 100644
--- a/sound/songs/midi/mus_b_arena.mid
+++ b/sound/songs/midi/mus_b_arena.mid
diff --git a/sound/songs/midi/mus_b_dome.mid b/sound/songs/midi/mus_b_dome.mid
index 532607fa9..cfa967236 100644
--- a/sound/songs/midi/mus_b_dome.mid
+++ b/sound/songs/midi/mus_b_dome.mid
diff --git a/sound/songs/midi/mus_b_dome1.mid b/sound/songs/midi/mus_b_dome1.mid
index 6da3c95ab..69aefab0a 100644
--- a/sound/songs/midi/mus_b_dome1.mid
+++ b/sound/songs/midi/mus_b_dome1.mid
diff --git a/sound/songs/midi/mus_b_factory.mid b/sound/songs/midi/mus_b_factory.mid
index 4602b6d46..e33928bfd 100644
--- a/sound/songs/midi/mus_b_factory.mid
+++ b/sound/songs/midi/mus_b_factory.mid
diff --git a/sound/songs/midi/mus_b_frontier.mid b/sound/songs/midi/mus_b_frontier.mid
index b3a1204c9..481308785 100644
--- a/sound/songs/midi/mus_b_frontier.mid
+++ b/sound/songs/midi/mus_b_frontier.mid
diff --git a/sound/songs/midi/mus_b_palace.mid b/sound/songs/midi/mus_b_palace.mid
index c53f379fc..fdd954fc1 100644
--- a/sound/songs/midi/mus_b_palace.mid
+++ b/sound/songs/midi/mus_b_palace.mid
diff --git a/sound/songs/midi/mus_b_tower.mid b/sound/songs/midi/mus_b_tower.mid
index 4c657cc88..8e0de8968 100644
--- a/sound/songs/midi/mus_b_tower.mid
+++ b/sound/songs/midi/mus_b_tower.mid
diff --git a/sound/songs/midi/mus_b_tube.mid b/sound/songs/midi/mus_b_tube.mid
index 6810fefab..1909543f3 100644
--- a/sound/songs/midi/mus_b_tube.mid
+++ b/sound/songs/midi/mus_b_tube.mid
diff --git a/sound/songs/midi/mus_battle20.mid b/sound/songs/midi/mus_battle20.mid
index 6c7496c86..a7140d984 100644
--- a/sound/songs/midi/mus_battle20.mid
+++ b/sound/songs/midi/mus_battle20.mid
diff --git a/sound/songs/midi/mus_battle27.mid b/sound/songs/midi/mus_battle27.mid
index 9b4ba5267..3d55c0181 100644
--- a/sound/songs/midi/mus_battle27.mid
+++ b/sound/songs/midi/mus_battle27.mid
diff --git a/sound/songs/midi/mus_battle30.mid b/sound/songs/midi/mus_battle30.mid
index 35c15e4ac..3bd5e9e11 100644
--- a/sound/songs/midi/mus_battle30.mid
+++ b/sound/songs/midi/mus_battle30.mid
diff --git a/sound/songs/midi/mus_battle31.mid b/sound/songs/midi/mus_battle31.mid
index 5fd13fb73..e38085793 100644
--- a/sound/songs/midi/mus_battle31.mid
+++ b/sound/songs/midi/mus_battle31.mid
diff --git a/sound/songs/midi/mus_battle32.mid b/sound/songs/midi/mus_battle32.mid
index 21e802b8e..a52fc6b37 100644
--- a/sound/songs/midi/mus_battle32.mid
+++ b/sound/songs/midi/mus_battle32.mid
diff --git a/sound/songs/midi/mus_battle33.mid b/sound/songs/midi/mus_battle33.mid
index 3661de38b..b16580d66 100644
--- a/sound/songs/midi/mus_battle33.mid
+++ b/sound/songs/midi/mus_battle33.mid
diff --git a/sound/songs/midi/mus_battle34.mid b/sound/songs/midi/mus_battle34.mid
index 373db2735..2b4aced44 100644
--- a/sound/songs/midi/mus_battle34.mid
+++ b/sound/songs/midi/mus_battle34.mid
diff --git a/sound/songs/midi/mus_battle35.mid b/sound/songs/midi/mus_battle35.mid
index 9a93594fd..2d34a08b9 100644
--- a/sound/songs/midi/mus_battle35.mid
+++ b/sound/songs/midi/mus_battle35.mid
diff --git a/sound/songs/midi/mus_battle36.mid b/sound/songs/midi/mus_battle36.mid
index 56d6a9559..2aab509a3 100644
--- a/sound/songs/midi/mus_battle36.mid
+++ b/sound/songs/midi/mus_battle36.mid
diff --git a/sound/songs/midi/mus_battle38.mid b/sound/songs/midi/mus_battle38.mid
index 7f3ed1d59..e4b1f34b9 100644
--- a/sound/songs/midi/mus_battle38.mid
+++ b/sound/songs/midi/mus_battle38.mid
diff --git a/sound/songs/midi/mus_bd_time.mid b/sound/songs/midi/mus_bd_time.mid
index c02396909..39fb08327 100644
--- a/sound/songs/midi/mus_bd_time.mid
+++ b/sound/songs/midi/mus_bd_time.mid
diff --git a/sound/songs/midi/mus_bijyutu.mid b/sound/songs/midi/mus_bijyutu.mid
index 98351369b..6aedd3b33 100644
--- a/sound/songs/midi/mus_bijyutu.mid
+++ b/sound/songs/midi/mus_bijyutu.mid
diff --git a/sound/songs/midi/mus_boy_sup.mid b/sound/songs/midi/mus_boy_sup.mid
index fce2cd8e4..366eb1db6 100644
--- a/sound/songs/midi/mus_boy_sup.mid
+++ b/sound/songs/midi/mus_boy_sup.mid
diff --git a/sound/songs/midi/mus_boyeye.mid b/sound/songs/midi/mus_boyeye.mid
index 26124d93c..bb6dcc0b9 100644
--- a/sound/songs/midi/mus_boyeye.mid
+++ b/sound/songs/midi/mus_boyeye.mid
diff --git a/sound/songs/midi/mus_c_road.mid b/sound/songs/midi/mus_c_road.mid
index e6117ddf6..f1dfc2a93 100644
--- a/sound/songs/midi/mus_c_road.mid
+++ b/sound/songs/midi/mus_c_road.mid
diff --git a/sound/songs/midi/mus_casino.mid b/sound/songs/midi/mus_casino.mid
index 5571a0afe..55548bf94 100644
--- a/sound/songs/midi/mus_casino.mid
+++ b/sound/songs/midi/mus_casino.mid
diff --git a/sound/songs/midi/mus_con_fan.mid b/sound/songs/midi/mus_con_fan.mid
index dfd889df9..1786fac50 100644
--- a/sound/songs/midi/mus_con_fan.mid
+++ b/sound/songs/midi/mus_con_fan.mid
diff --git a/sound/songs/midi/mus_con_k.mid b/sound/songs/midi/mus_con_k.mid
index 2d788dc0b..b45cd3ff5 100644
--- a/sound/songs/midi/mus_con_k.mid
+++ b/sound/songs/midi/mus_con_k.mid
diff --git a/sound/songs/midi/mus_conlobby.mid b/sound/songs/midi/mus_conlobby.mid
index f1e36e032..680482e0c 100644
--- a/sound/songs/midi/mus_conlobby.mid
+++ b/sound/songs/midi/mus_conlobby.mid
diff --git a/sound/songs/midi/mus_contest0.mid b/sound/songs/midi/mus_contest0.mid
index 2878b3995..b2946775b 100644
--- a/sound/songs/midi/mus_contest0.mid
+++ b/sound/songs/midi/mus_contest0.mid
diff --git a/sound/songs/midi/mus_cycling.mid b/sound/songs/midi/mus_cycling.mid
index 1417653cd..6fa24905e 100644
--- a/sound/songs/midi/mus_cycling.mid
+++ b/sound/songs/midi/mus_cycling.mid
diff --git a/sound/songs/midi/mus_daigo.mid b/sound/songs/midi/mus_daigo.mid
index 6e3a6f852..750a31fe7 100644
--- a/sound/songs/midi/mus_daigo.mid
+++ b/sound/songs/midi/mus_daigo.mid
diff --git a/sound/songs/midi/mus_dan02.mid b/sound/songs/midi/mus_dan02.mid
index 22706fec9..84d0cd199 100644
--- a/sound/songs/midi/mus_dan02.mid
+++ b/sound/songs/midi/mus_dan02.mid
diff --git a/sound/songs/midi/mus_dan03.mid b/sound/songs/midi/mus_dan03.mid
index 352fb06cd..e0dbcff4b 100644
--- a/sound/songs/midi/mus_dan03.mid
+++ b/sound/songs/midi/mus_dan03.mid
diff --git a/sound/songs/midi/mus_deepdeep.mid b/sound/songs/midi/mus_deepdeep.mid
index 3109f6806..352c80cd7 100644
--- a/sound/songs/midi/mus_deepdeep.mid
+++ b/sound/songs/midi/mus_deepdeep.mid
diff --git a/sound/songs/midi/mus_demo1.mid b/sound/songs/midi/mus_demo1.mid
index a75424379..66d4e112c 100644
--- a/sound/songs/midi/mus_demo1.mid
+++ b/sound/songs/midi/mus_demo1.mid
diff --git a/sound/songs/midi/mus_dendou.mid b/sound/songs/midi/mus_dendou.mid
index a1eac3109..d743efcfb 100644
--- a/sound/songs/midi/mus_dendou.mid
+++ b/sound/songs/midi/mus_dendou.mid
diff --git a/sound/songs/midi/mus_dooro1.mid b/sound/songs/midi/mus_dooro1.mid
index 9013bb627..5c4f5d76a 100644
--- a/sound/songs/midi/mus_dooro1.mid
+++ b/sound/songs/midi/mus_dooro1.mid
diff --git a/sound/songs/midi/mus_dooro_x3.mid b/sound/songs/midi/mus_dooro_x3.mid
index 7c5ce0186..ac1fef688 100644
--- a/sound/songs/midi/mus_dooro_x3.mid
+++ b/sound/songs/midi/mus_dooro_x3.mid
diff --git a/sound/songs/midi/mus_dooro_x4.mid b/sound/songs/midi/mus_dooro_x4.mid
index f82c7a30f..14e439359 100644
--- a/sound/songs/midi/mus_dooro_x4.mid
+++ b/sound/songs/midi/mus_dooro_x4.mid
diff --git a/sound/songs/midi/mus_end.mid b/sound/songs/midi/mus_end.mid
index 2936b38c4..e1d425c7f 100644
--- a/sound/songs/midi/mus_end.mid
+++ b/sound/songs/midi/mus_end.mid
diff --git a/sound/songs/midi/mus_event0.mid b/sound/songs/midi/mus_event0.mid
index daec1ebba..9292a4ba7 100644
--- a/sound/songs/midi/mus_event0.mid
+++ b/sound/songs/midi/mus_event0.mid
diff --git a/sound/songs/midi/mus_fanfa1.mid b/sound/songs/midi/mus_fanfa1.mid
index d9d495b68..54d014597 100644
--- a/sound/songs/midi/mus_fanfa1.mid
+++ b/sound/songs/midi/mus_fanfa1.mid
diff --git a/sound/songs/midi/mus_fanfa4.mid b/sound/songs/midi/mus_fanfa4.mid
index 78671f89c..42e617558 100644
--- a/sound/songs/midi/mus_fanfa4.mid
+++ b/sound/songs/midi/mus_fanfa4.mid
diff --git a/sound/songs/midi/mus_fanfa5.mid b/sound/songs/midi/mus_fanfa5.mid
index 96b3375d5..7232c57ab 100644
--- a/sound/songs/midi/mus_fanfa5.mid
+++ b/sound/songs/midi/mus_fanfa5.mid
diff --git a/sound/songs/midi/mus_field13.mid b/sound/songs/midi/mus_field13.mid
index 387ce6a42..8adfa4639 100644
--- a/sound/songs/midi/mus_field13.mid
+++ b/sound/songs/midi/mus_field13.mid
diff --git a/sound/songs/midi/mus_finecity.mid b/sound/songs/midi/mus_finecity.mid
index 414e690e8..f83647287 100644
--- a/sound/songs/midi/mus_finecity.mid
+++ b/sound/songs/midi/mus_finecity.mid
diff --git a/sound/songs/midi/mus_friendly.mid b/sound/songs/midi/mus_friendly.mid
index aec5c43af..38567b2bf 100644
--- a/sound/songs/midi/mus_friendly.mid
+++ b/sound/songs/midi/mus_friendly.mid
diff --git a/sound/songs/midi/mus_fune_kan.mid b/sound/songs/midi/mus_fune_kan.mid
index b9ecacc1f..c95ab1e8d 100644
--- a/sound/songs/midi/mus_fune_kan.mid
+++ b/sound/songs/midi/mus_fune_kan.mid
diff --git a/sound/songs/midi/mus_girl_sup.mid b/sound/songs/midi/mus_girl_sup.mid
index 6fea0ae1d..8f05b2b43 100644
--- a/sound/songs/midi/mus_girl_sup.mid
+++ b/sound/songs/midi/mus_girl_sup.mid
diff --git a/sound/songs/midi/mus_girleye.mid b/sound/songs/midi/mus_girleye.mid
index 7835f1efa..a4015e70d 100644
--- a/sound/songs/midi/mus_girleye.mid
+++ b/sound/songs/midi/mus_girleye.mid
diff --git a/sound/songs/midi/mus_gomachi0.mid b/sound/songs/midi/mus_gomachi0.mid
index 875b120d8..b41d157a3 100644
--- a/sound/songs/midi/mus_gomachi0.mid
+++ b/sound/songs/midi/mus_gomachi0.mid
diff --git a/sound/songs/midi/mus_gotown.mid b/sound/songs/midi/mus_gotown.mid
index f996eaddd..6a2ab5dea 100644
--- a/sound/songs/midi/mus_gotown.mid
+++ b/sound/songs/midi/mus_gotown.mid
diff --git a/sound/songs/midi/mus_granroad.mid b/sound/songs/midi/mus_granroad.mid
index 7d6981262..cb286982d 100644
--- a/sound/songs/midi/mus_granroad.mid
+++ b/sound/songs/midi/mus_granroad.mid
diff --git a/sound/songs/midi/mus_hageshii.mid b/sound/songs/midi/mus_hageshii.mid
index d1a47d81f..6b217a1fa 100644
--- a/sound/songs/midi/mus_hageshii.mid
+++ b/sound/songs/midi/mus_hageshii.mid
diff --git a/sound/songs/midi/mus_hideri.mid b/sound/songs/midi/mus_hideri.mid
index 7aefa3486..0ca75c2e9 100644
--- a/sound/songs/midi/mus_hideri.mid
+++ b/sound/songs/midi/mus_hideri.mid
diff --git a/sound/songs/midi/mus_hightown.mid b/sound/songs/midi/mus_hightown.mid
index 090779152..a437b3c34 100644
--- a/sound/songs/midi/mus_hightown.mid
+++ b/sound/songs/midi/mus_hightown.mid
diff --git a/sound/songs/midi/mus_hutago.mid b/sound/songs/midi/mus_hutago.mid
index 4786ebfb2..bc1b1da05 100644
--- a/sound/songs/midi/mus_hutago.mid
+++ b/sound/songs/midi/mus_hutago.mid
diff --git a/sound/songs/midi/mus_inter_v.mid b/sound/songs/midi/mus_inter_v.mid
index e05010135..504bf3df1 100644
--- a/sound/songs/midi/mus_inter_v.mid
+++ b/sound/songs/midi/mus_inter_v.mid
diff --git a/sound/songs/midi/mus_kachi1.mid b/sound/songs/midi/mus_kachi1.mid
index 0ce654a50..7d3f75009 100644
--- a/sound/songs/midi/mus_kachi1.mid
+++ b/sound/songs/midi/mus_kachi1.mid
diff --git a/sound/songs/midi/mus_kachi2.mid b/sound/songs/midi/mus_kachi2.mid
index 011c52606..6fc674510 100644
--- a/sound/songs/midi/mus_kachi2.mid
+++ b/sound/songs/midi/mus_kachi2.mid
diff --git a/sound/songs/midi/mus_kachi22.mid b/sound/songs/midi/mus_kachi22.mid
index 250038750..30b40c946 100644
--- a/sound/songs/midi/mus_kachi22.mid
+++ b/sound/songs/midi/mus_kachi22.mid
diff --git a/sound/songs/midi/mus_kachi4.mid b/sound/songs/midi/mus_kachi4.mid
index 022063d3d..3b8cc422e 100644
--- a/sound/songs/midi/mus_kachi4.mid
+++ b/sound/songs/midi/mus_kachi4.mid
diff --git a/sound/songs/midi/mus_kakkoii.mid b/sound/songs/midi/mus_kakkoii.mid
index 5d4e05dc7..c1a75663b 100644
--- a/sound/songs/midi/mus_kakkoii.mid
+++ b/sound/songs/midi/mus_kakkoii.mid
diff --git a/sound/songs/midi/mus_karakuri.mid b/sound/songs/midi/mus_karakuri.mid
index 414bfab13..d6c387ee3 100644
--- a/sound/songs/midi/mus_karakuri.mid
+++ b/sound/songs/midi/mus_karakuri.mid
diff --git a/sound/songs/midi/mus_kazanbai.mid b/sound/songs/midi/mus_kazanbai.mid
index a75e2f1a4..bddb3947c 100644
--- a/sound/songs/midi/mus_kazanbai.mid
+++ b/sound/songs/midi/mus_kazanbai.mid
diff --git a/sound/songs/midi/mus_m_dungon.mid b/sound/songs/midi/mus_m_dungon.mid
index 094a5948e..3de0494b3 100644
--- a/sound/songs/midi/mus_m_dungon.mid
+++ b/sound/songs/midi/mus_m_dungon.mid
diff --git a/sound/songs/midi/mus_maborosi.mid b/sound/songs/midi/mus_maborosi.mid
index 91bc507dd..c888c0d54 100644
--- a/sound/songs/midi/mus_maborosi.mid
+++ b/sound/songs/midi/mus_maborosi.mid
diff --git a/sound/songs/midi/mus_machi_s2.mid b/sound/songs/midi/mus_machi_s2.mid
index b6f989283..a3c4a0a6a 100644
--- a/sound/songs/midi/mus_machi_s2.mid
+++ b/sound/songs/midi/mus_machi_s2.mid
diff --git a/sound/songs/midi/mus_machi_s4.mid b/sound/songs/midi/mus_machi_s4.mid
index 1eebd383d..2ae43fe7e 100644
--- a/sound/songs/midi/mus_machi_s4.mid
+++ b/sound/songs/midi/mus_machi_s4.mid
diff --git a/sound/songs/midi/mus_machupi.mid b/sound/songs/midi/mus_machupi.mid
index a2d707f45..0232634af 100644
--- a/sound/songs/midi/mus_machupi.mid
+++ b/sound/songs/midi/mus_machupi.mid
diff --git a/sound/songs/midi/mus_naminori.mid b/sound/songs/midi/mus_naminori.mid
index 7a73e304e..70813e343 100644
--- a/sound/songs/midi/mus_naminori.mid
+++ b/sound/songs/midi/mus_naminori.mid
diff --git a/tools/mid2agb/main.cpp b/tools/mid2agb/main.cpp
index ece8e2556..ea2b294ac 100644
--- a/tools/mid2agb/main.cpp
+++ b/tools/mid2agb/main.cpp
@@ -138,7 +138,7 @@ int main(int argc, char** argv)
 
         if (option[0] == '-' && option[1] != '\0')
         {
-            const char *arg = GetArgument(argc, argv, i);
+            const char *arg;
 
             switch (std::toupper(option[1]))
             {
@@ -146,11 +146,13 @@ int main(int argc, char** argv)
                 g_exactGateTime = true;
                 break;
             case 'G':
+                arg = GetArgument(argc, argv, i);
                 if (arg == nullptr)
                     PrintUsage();
                 g_voiceGroup = std::stoi(arg);
                 break;
             case 'L':
+                arg = GetArgument(argc, argv, i);
                 if (arg == nullptr)
                     PrintUsage();
                 g_asmLabel = arg;
@@ -159,16 +161,19 @@ int main(int argc, char** argv)
                 g_compressionEnabled = false;
                 break;
             case 'P':
+                arg = GetArgument(argc, argv, i);
                 if (arg == nullptr)
                     PrintUsage();
                 g_priority = std::stoi(arg);
                 break;
             case 'R':
+                arg = GetArgument(argc, argv, i);
                 if (arg == nullptr)
                     PrintUsage();
                 g_reverb = std::stoi(arg);
                 break;
             case 'V':
+                arg = GetArgument(argc, argv, i);
                 if (arg == nullptr)
                     PrintUsage();
                 g_masterVolume = std::stoi(arg);