Rename voicegroups to numerical order

Sunnhild · Oct 17, 2019 · ce25774 · ce25774
1 parent 47b550b
commit ce25774
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/songs.mk b/songs.mk
@@ -10,10 +10,10 @@ $(MID_SUBDIR)/mus_annai.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G131 -V068
 
 $(MID_SUBDIR)/mus_battle20.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G119 -V080 -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G011 -V080 -P1
 
 $(MID_SUBDIR)/mus_battle32.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G120 -V080
+	$(MID) $< $@ -E -R$(STD_REVERB) -G010 -V080
 
 $(MID_SUBDIR)/mus_champ_r.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G154 -V090
@@ -49,13 +49,13 @@ $(MID_SUBDIR)/mus_fan6.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G179 -V094 -P5
 
 $(MID_SUBDIR)/mus_fanfa1.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_fanfa4.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_fanfa5.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_get_yasei.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G170 -V100
@@ -97,34 +97,34 @@ $(MID_SUBDIR)/mus_masara.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G159 -V100
 
 $(MID_SUBDIR)/mus_me_asa.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_b_big.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_b_small.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_bachi.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_kinomi.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_photo.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G180 -V100 -P5
 
 $(MID_SUBDIR)/mus_me_shinka.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G026 -V080 -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G009 -V080 -P1
 
 $(MID_SUBDIR)/mus_me_wasure.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_waza.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_me_zannen.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
+	$(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5
 
 $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G164 -V071
@@ -169,7 +169,7 @@ $(MID_SUBDIR)/mus_otsukimi.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G147 -V090
 
 $(MID_SUBDIR)/mus_p_school.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G081 -V100 -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V100 -P1
 
 $(MID_SUBDIR)/mus_p_tower.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G165 -V090
@@ -205,7 +205,7 @@ $(MID_SUBDIR)/mus_sekaikan.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G182 -V088
 
 $(MID_SUBDIR)/mus_shinka.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G026 -V080 -P1
+	$(MID) $< $@ -E -R$(STD_REVERB) -G009 -V080 -P1
 
 $(MID_SUBDIR)/mus_shion.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G139 -V090

diff --git a/sound/songs/mus_fanfa1.s b/sound/songs/mus_fanfa1.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	mus_fanfa1_grp, voicegroup012
+	.equ	mus_fanfa1_grp, voicegroup008
 	.equ	mus_fanfa1_pri, 5
 	.equ	mus_fanfa1_rev, reverb_set+50
 	.equ	mus_fanfa1_mvl, 127

diff --git a/sound/songs/mus_fanfa4.s b/sound/songs/mus_fanfa4.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	mus_fanfa4_grp, voicegroup012
+	.equ	mus_fanfa4_grp, voicegroup008
 	.equ	mus_fanfa4_pri, 5
 	.equ	mus_fanfa4_rev, reverb_set+50
 	.equ	mus_fanfa4_mvl, 127

diff --git a/sound/songs/mus_fanfa5.s b/sound/songs/mus_fanfa5.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	mus_fanfa5_grp, voicegroup012
+	.equ	mus_fanfa5_grp, voicegroup008
 	.equ	mus_fanfa5_pri, 5
 	.equ	mus_fanfa5_rev, reverb_set+50
 	.equ	mus_fanfa5_mvl, 127

diff --git a/sound/songs/mus_me_b_big.s b/sound/songs/mus_me_b_big.s
@@ -2,7 +2,7 @@
 	.section .rodata
 	.global mus_me_b_big
 	.align 2
-	.equ mus_me_b_big_grp, voicegroup012
+	.equ mus_me_b_big_grp, voicegroup008
 	.equ mus_me_b_big_pri, 5
 	.equ mus_me_b_big_rev, reverb_set+50
 

diff --git a/sound/songs/mus_me_b_small.s b/sound/songs/mus_me_b_small.s
@@ -2,7 +2,7 @@
 	.section .rodata
 	.global mus_me_b_small
 	.align 2
-	.equ mus_me_b_small_grp, voicegroup012
+	.equ mus_me_b_small_grp, voicegroup008
 	.equ mus_me_b_small_pri, 5
 	.equ mus_me_b_small_rev, reverb_set+50
 

diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc
@@ -338,7 +338,7 @@ voicegroup007:: @ 848AB98
 	voice_directsound 60, 0, gDirectSoundWaveData_46, 255, 0, 224, 165 @ 848AB98
 	voice_directsound 60, 0, gDirectSoundWaveData_47, 255, 0, 218, 165 @ 848ABA4
 
-voicegroup012:: @ 848ABB0
+voicegroup008:: @ 848ABB0
 	voice_keysplit_all voicegroup001 @ 848ABB0
 	voice_keysplit voicegroup003, KeySplitTable1 @ 848ABBC
 	voice_directsound 60, 0, gDirectSoundWaveData_63, 255, 178, 180, 165 @ 848ABC8
@@ -442,7 +442,7 @@ voicegroup012:: @ 848ABB0
 	voice_square_1_alt 29, 2, 0, 2, 0, 0 @ 848B060
 	voice_square_1_alt 22, 2, 0, 2, 0, 0 @ 848B06C
 
-voicegroup026:: @ 848B078
+voicegroup009:: @ 848B078
 	voice_keysplit_all voicegroup001 @ 848B078
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B084
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B090
@@ -529,7 +529,7 @@ voicegroup026:: @ 848B078
 	voice_square_2_alt 3, 0, 1, 7, 0 @ 848B45C
 	voice_square_1_alt 0, 3, 0, 1, 7, 0 @ 848B468
 
-voicegroup120:: @ 848B474
+voicegroup010:: @ 848B474
 	voice_keysplit_all voicegroup001 @ 848B474
 	voice_keysplit voicegroup003, KeySplitTable1 @ 848B480
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B48C
@@ -622,7 +622,7 @@ voicegroup120:: @ 848B474
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B8A0
 	voice_programmable_wave_alt gProgrammableWaveData_84A324C, 0, 7, 15, 2 @ 848B8AC
 
-voicegroup119:: @ 848B8B8
+voicegroup011:: @ 848B8B8
 	voice_keysplit_all voicegroup001 @ 848B8B8
 	voice_keysplit voicegroup003, KeySplitTable1 @ 848B8C4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B8D0
@@ -715,7 +715,7 @@ voicegroup119:: @ 848B8B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BCE4
 	voice_programmable_wave_alt gProgrammableWaveData_84A324C, 0, 7, 15, 2 @ 848BCF0
 
-voicegroup081:: @ 848BCFC
+voicegroup012:: @ 848BCFC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BCFC
 	voice_keysplit voicegroup003, KeySplitTable1 @ 848BD08