Allow names for voicegroups and use a macro for use with drumsets (#2149)

mid2agb has been modified to allow more than just numbers when naming voicegroups and voicegroups have been renamed to match. A "voice_group" macro has been set up with a optional parameter for the starting note will shift the offset by the specified amount * 0xC which is the length of 1 voice in a voicegroup. All drumset voicegroups have a "starting_note" of 36.

Author: ShinyDragonHunter

asm/macros/m4a.inc

@@ -11,3 +11,13 @@
 	.space 1  @ Padding
 	.2byte \unknown
 	.endm
+
+	.macro voice_group label:req, starting_note
+	.align 2
+	.ifb \starting_note
+		.global voicegroup_\label 
+		voicegroup_\label:
+	.else
+		.set voicegroup_\label, . - \starting_note * 0xC
+	.endif
+	.endm

include/gba/m4a_internal.h

@@ -401,7 +401,7 @@ extern const u8 gNoiseTable[];
 
 extern const struct PokemonCrySong gPokemonCrySongTemplate;
 
-extern const struct ToneData voicegroup000;
+extern const struct ToneData voicegroup_dummy;
 
 extern char gNumMusicPlayers[];
 extern char gMaxLines[];

sound/songs/midi/midi.cfg

@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	se_dex_page_grp, voicegroup127
+	.equ	se_dex_page_grp, voicegroup_rs_sfx_1
 	.equ	se_dex_page_pri, 5
 	.equ	se_dex_page_rev, reverb_set+50
 	.equ	se_dex_page_mvl, 127

sound/songs/se_dex_page.s

@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	se_dex_scroll_grp, voicegroup127
+	.equ	se_dex_scroll_grp, voicegroup_rs_sfx_1
 	.equ	se_dex_scroll_pri, 5
 	.equ	se_dex_scroll_rev, reverb_set+50
 	.equ	se_dex_scroll_mvl, 127

sound/songs/se_dex_scroll.s

@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	se_m_absorb_grp, voicegroup128
+	.equ	se_m_absorb_grp, voicegroup_rs_sfx_2
 	.equ	se_m_absorb_pri, 4
 	.equ	se_m_absorb_rev, reverb_set+50
 	.equ	se_m_absorb_mvl, 127

sound/songs/se_m_absorb.s

@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	se_m_absorb_2_grp, voicegroup128
+	.equ	se_m_absorb_2_grp, voicegroup_rs_sfx_2
 	.equ	se_m_absorb_2_pri, 4
 	.equ	se_m_absorb_2_rev, reverb_set+50
 	.equ	se_m_absorb_2_mvl, 127

sound/songs/se_m_absorb_2.s

@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	se_m_acid_armor_grp, voicegroup128
+	.equ	se_m_acid_armor_grp, voicegroup_rs_sfx_2
 	.equ	se_m_acid_armor_pri, 4
 	.equ	se_m_acid_armor_rev, reverb_set+50
 	.equ	se_m_acid_armor_mvl, 127

sound/songs/se_m_acid_armor.s

@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	se_m_attract_grp, voicegroup128
+	.equ	se_m_attract_grp, voicegroup_rs_sfx_2
 	.equ	se_m_attract_pri, 4
 	.equ	se_m_attract_rev, reverb_set+50
 	.equ	se_m_attract_mvl, 127

sound/songs/se_m_attract.s

@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	se_m_attract2_grp, voicegroup128
+	.equ	se_m_attract2_grp, voicegroup_rs_sfx_2
 	.equ	se_m_attract2_pri, 4
 	.equ	se_m_attract2_rev, reverb_set+50
 	.equ	se_m_attract2_mvl, 127