diff --git a/VoiceDef.s b/VoiceDef.s
new file mode 100644
index 000000000..bb147ce4a
--- /dev/null
+++ b/VoiceDef.s
@@ -0,0 +1,8 @@
+.include "MPlayDef.s"
+
+.equ	DirectSound, 	0x00
+.equ	SquareWave1, 	0x01
+.equ 	AProgNoise, 	0x0C
+
+.equ 	FineNoise,	0x00
+.equ 	WaveDuty50, 0x02
diff --git a/data/sound_data.s b/data/sound_data.s
index d4cf735a2..fa38d58bd 100644
--- a/data/sound_data.s
+++ b/data/sound_data.s
@@ -3265,111 +3265,24 @@ drums_001:
 .incbin "baserom.gba", 0x1E84C6C, 0x8
 .4byte wave_077
 .incbin "baserom.gba", 0x1E84C78, 0x4
-.global bank_004
-bank_004:
-.incbin "baserom.gba", 0x1E84C7C, 0x4
-.4byte wave_016
-.incbin "baserom.gba", 0x1E84C84, 0x8
-.4byte wave_017
-.incbin "baserom.gba", 0x1E84C90, 0x4
-.global bank_006
-bank_006:
-.incbin "baserom.gba", 0x1E84C94, 0x4
-.4byte wave_016
-.incbin "baserom.gba", 0x1E84C9C, 0x8
-.4byte wave_017
-.incbin "baserom.gba", 0x1E84CA8, 0x4
-.global bank_008
-bank_008:
-.incbin "baserom.gba", 0x1E84CAC, 0x4
-.4byte wave_021
-.incbin "baserom.gba", 0x1E84CB4, 0x8
-.4byte wave_022
-.incbin "baserom.gba", 0x1E84CC0, 0x8
-.4byte wave_023
-.incbin "baserom.gba", 0x1E84CCC, 0x4
-.global bank_009
-bank_009:
-.incbin "baserom.gba", 0x1E84CD0, 0x4
-.4byte wave_045
-.incbin "baserom.gba", 0x1E84CD8, 0x8
-.4byte wave_046
-.incbin "baserom.gba", 0x1E84CE4, 0x8
-.4byte wave_047
-.incbin "baserom.gba", 0x1E84CF0, 0x4
-.global bank_012
-bank_012:
-.incbin "baserom.gba", 0x1E84CF4, 0x4
-.4byte wave_048
-.incbin "baserom.gba", 0x1E84CFC, 0x8
-.4byte wave_049
-.incbin "baserom.gba", 0x1E84D08, 0x8
-.4byte wave_050
-.incbin "baserom.gba", 0x1E84D14, 0x4
-.global bank_002
-bank_002:
-.incbin "baserom.gba", 0x1E84D18, 0x4
-.4byte wave_010
-.incbin "baserom.gba", 0x1E84D20, 0x8
-.4byte wave_011
-.incbin "baserom.gba", 0x1E84D2C, 0x4
-.global bank_001
-bank_001:
-.incbin "baserom.gba", 0x1E84D30, 0x4
-.4byte wave_007
-.incbin "baserom.gba", 0x1E84D38, 0x8
-.4byte wave_008
-.incbin "baserom.gba", 0x1E84D44, 0x4
-.global bank_005
-bank_005:
-.incbin "baserom.gba", 0x1E84D48, 0x4
-.4byte wave_018
-.incbin "baserom.gba", 0x1E84D50, 0x8
-.4byte wave_019
-.incbin "baserom.gba", 0x1E84D5C, 0x8
-.4byte wave_020
-.incbin "baserom.gba", 0x1E84D68, 0x4
-.global bank_010
-bank_010:
-.incbin "baserom.gba", 0x1E84D6C, 0x4
-.4byte wave_010
-.incbin "baserom.gba", 0x1E84D74, 0x8
-.4byte wave_011
-.incbin "baserom.gba", 0x1E84D80, 0x4
-.global bank_003
-bank_003:
-.incbin "baserom.gba", 0x1E84D84, 0x4
-.4byte wave_007
-.incbin "baserom.gba", 0x1E84D8C, 0x8
-.4byte wave_008
-.incbin "baserom.gba", 0x1E84D98, 0x4
-.global bank_013
-bank_013:
-.incbin "baserom.gba", 0x1E84D9C, 0x4
-.4byte wave_021
-.incbin "baserom.gba", 0x1E84DA4, 0x8
-.4byte wave_022
-.incbin "baserom.gba", 0x1E84DB0, 0x8
-.4byte wave_023
-.incbin "baserom.gba", 0x1E84DBC, 0x4
-.global bank_007
-bank_007:
-.incbin "baserom.gba", 0x1E84DC0, 0x4
-.4byte wave_024
-.incbin "baserom.gba", 0x1E84DC8, 0x8
-.4byte wave_025
-.incbin "baserom.gba", 0x1E84DD4, 0x8
-.4byte wave_026
-.incbin "baserom.gba", 0x1E84DE0, 0x4
-.global bank_011
-bank_011:
-.incbin "baserom.gba", 0x1E84DE4, 0x4
-.4byte wave_021
-.incbin "baserom.gba", 0x1E84DEC, 0x8
-.4byte wave_022
-.incbin "baserom.gba", 0x1E84DF8, 0x8
-.4byte wave_023
-.incbin "baserom.gba", 0x1E84E04, 0x4
+
+	.include "sound/voicegroups/bank_004.s"
+	.include "sound/voicegroups/bank_006.s"
+	.include "sound/voicegroups/bank_008.s"
+	.include "sound/voicegroups/bank_009.s"
+	.include "sound/voicegroups/bank_012.s"
+	.include "sound/voicegroups/bank_002.s"
+	.include "sound/voicegroups/bank_001.s"
+	.include "sound/voicegroups/bank_005.s"
+	.include "sound/voicegroups/bank_010.s"
+	.include "sound/voicegroups/bank_003.s"
+	.include "sound/voicegroups/bank_013.s"
+	.include "sound/voicegroups/bank_007.s"
+	.include "sound/voicegroups/bank_011.s"
+
+.align 2
+
+
 .global bank_014
 bank_014:
 .incbin "baserom.gba", 0x1E84E08, 0x4
@@ -3536,88 +3449,24 @@ bank_014:
 .incbin "baserom.gba", 0x1E853F8, 0x8
 .4byte drums_001
 .incbin "baserom.gba", 0x1E85404, 0x4
-.global bank_015
-bank_015:
-.incbin "baserom.gba", 0x1E85408, 0x4
-.4byte wave_007
-.incbin "baserom.gba", 0x1E85410, 0x8
-.4byte wave_008
-.incbin "baserom.gba", 0x1E8541C, 0x4
-.global bank_016
-bank_016:
-.incbin "baserom.gba", 0x1E85420, 0x4
-.4byte wave_010
-.incbin "baserom.gba", 0x1E85428, 0x8
-.4byte wave_010
-.incbin "baserom.gba", 0x1E85434, 0x4
-.global bank_017
-bank_017:
-.incbin "baserom.gba", 0x1E85438, 0x4
-.4byte wave_048
-.incbin "baserom.gba", 0x1E85440, 0x8
-.4byte wave_049
-.incbin "baserom.gba", 0x1E8544C, 0x8
-.4byte wave_050
-.incbin "baserom.gba", 0x1E85458, 0x4
-.global bank_018
-bank_018:
-.incbin "baserom.gba", 0x1E8545C, 0x4
-.4byte wave_045
-.incbin "baserom.gba", 0x1E85464, 0x8
-.4byte wave_046
-.incbin "baserom.gba", 0x1E85470, 0x8
-.4byte wave_047
-.incbin "baserom.gba", 0x1E8547C, 0x4
-.global bank_019
-bank_019:
-.incbin "baserom.gba", 0x1E85480, 0x4
-.4byte wave_010
-.incbin "baserom.gba", 0x1E85488, 0x8
-.4byte wave_011
-.incbin "baserom.gba", 0x1E85494, 0x4
-.global bank_020
-bank_020:
-.incbin "baserom.gba", 0x1E85498, 0x4
-.4byte wave_021
-.incbin "baserom.gba", 0x1E854A0, 0x8
-.4byte wave_022
-.incbin "baserom.gba", 0x1E854AC, 0x8
-.4byte wave_023
-.incbin "baserom.gba", 0x1E854B8, 0x4
-.global bank_021
-bank_021:
-.incbin "baserom.gba", 0x1E854BC, 0x4
-.4byte wave_016
-.incbin "baserom.gba", 0x1E854C4, 0x8
-.4byte wave_017
-.incbin "baserom.gba", 0x1E854D0, 0x4
-.global bank_022
-bank_022:
-.incbin "baserom.gba", 0x1E854D4, 0x4
-.4byte wave_016
-.incbin "baserom.gba", 0x1E854DC, 0x8
-.4byte wave_017
-.incbin "baserom.gba", 0x1E854E8, 0x4
-.global bank_023
-bank_023:
-.incbin "baserom.gba", 0x1E854EC, 0x4
-.4byte wave_018
-.global gUnknown_9E854F4
-gUnknown_9E854F4:
-.incbin "baserom.gba", 0x1E854F4, 0x8
-.4byte wave_019
-.incbin "baserom.gba", 0x1E85500, 0x8
-.4byte wave_020
-.incbin "baserom.gba", 0x1E8550C, 0x4
-.global bank_024
-bank_024:
-.incbin "baserom.gba", 0x1E85510, 0x4
-.4byte wave_024
-.incbin "baserom.gba", 0x1E85518, 0x8
-.4byte wave_025
-.incbin "baserom.gba", 0x1E85524, 0x8
-.4byte wave_026
-.incbin "baserom.gba", 0x1E85530, 0x4
+
+
+	.include "sound/voicegroups/bank_015.s"
+	.include "sound/voicegroups/bank_016.s"
+	.include "sound/voicegroups/bank_017.s"
+	.include "sound/voicegroups/bank_018.s"
+	.include "sound/voicegroups/bank_019.s"
+	.include "sound/voicegroups/bank_020.s"
+	.include "sound/voicegroups/bank_021.s"
+	.include "sound/voicegroups/bank_022.s"
+	.include "sound/voicegroups/bank_023.s"
+	.include "sound/voicegroups/bank_024.s"
+
+.align 2
+
+
+
+
 .global bank_025
 bank_025:
 .incbin "baserom.gba", 0x1E85534, 0x58
@@ -3643,6 +3492,7 @@ bank_025:
 .incbin "baserom.gba", 0x1E85998, 0x140
 .4byte wave_089
 .incbin "baserom.gba", 0x1E85ADC, 0x4
+
 .global bank_028
 bank_028:
 .incbin "baserom.gba", 0x1E85AE0, 0x4
@@ -3719,109 +3569,8 @@ bank_028:
 .global bank_027
 bank_027:
 .incbin "baserom.gba", 0x1E85C84, 0x3CC
-.global bank_026
-bank_026:
-.incbin "baserom.gba", 0x1E86050, 0x4
-.4byte wave_095
-.incbin "baserom.gba", 0x1E86058, 0x8
-.4byte wave_096
-.incbin "baserom.gba", 0x1E86064, 0x8
-.4byte wave_097
-.incbin "baserom.gba", 0x1E86070, 0x8
-.4byte wave_098
-.incbin "baserom.gba", 0x1E8607C, 0x8
-.4byte wave_099
-.incbin "baserom.gba", 0x1E86088, 0x8
-.4byte wave_100
-.incbin "baserom.gba", 0x1E86094, 0x8
-.4byte wave_101
-.incbin "baserom.gba", 0x1E860A0, 0x8
-.4byte wave_102
-.incbin "baserom.gba", 0x1E860AC, 0x8
-.4byte wave_103
-.incbin "baserom.gba", 0x1E860B8, 0x8
-.4byte wave_104
-.incbin "baserom.gba", 0x1E860C4, 0x8
-.4byte wave_105
-.incbin "baserom.gba", 0x1E860D0, 0x8
-.4byte wave_086
-.incbin "baserom.gba", 0x1E860DC, 0x8
-.4byte wave_106
-.incbin "baserom.gba", 0x1E860E8, 0x8
-.4byte wave_107
-.incbin "baserom.gba", 0x1E860F4, 0x8
-.4byte wave_108
-.incbin "baserom.gba", 0x1E86100, 0x8
-.4byte wave_109
-.incbin "baserom.gba", 0x1E8610C, 0x8
-.4byte wave_110
-.incbin "baserom.gba", 0x1E86118, 0x8
-.4byte wave_111
-.incbin "baserom.gba", 0x1E86124, 0x8
-.4byte wave_112
-.incbin "baserom.gba", 0x1E86130, 0x8
-.4byte wave_113
-.incbin "baserom.gba", 0x1E8613C, 0x8
-.4byte wave_114
-.incbin "baserom.gba", 0x1E86148, 0x8
-.4byte wave_115
-.incbin "baserom.gba", 0x1E86154, 0x8
-.4byte wave_116
-.incbin "baserom.gba", 0x1E86160, 0x8
-.4byte wave_117
-.incbin "baserom.gba", 0x1E8616C, 0x8
-.4byte wave_094
-.incbin "baserom.gba", 0x1E86178, 0x8
-.4byte wave_092
-.incbin "baserom.gba", 0x1E86184, 0x8
-.4byte wave_118
-.incbin "baserom.gba", 0x1E86190, 0x8
-.4byte wave_119
-.incbin "baserom.gba", 0x1E8619C, 0x8
-.4byte wave_095
-.incbin "baserom.gba", 0x1E861A8, 0x8
-.4byte wave_120
-.incbin "baserom.gba", 0x1E861B4, 0x8
-.4byte wave_121
-.incbin "baserom.gba", 0x1E861C0, 0x8
-.4byte wave_122
-.incbin "baserom.gba", 0x1E861CC, 0x8
-.4byte wave_123
-.incbin "baserom.gba", 0x1E861D8, 0x8
-.4byte wave_124
-.incbin "baserom.gba", 0x1E861E4, 0x8
-.4byte wave_125
-.incbin "baserom.gba", 0x1E861F0, 0x8
-.4byte wave_126
-.incbin "baserom.gba", 0x1E861FC, 0x8
-.4byte wave_127
-.incbin "baserom.gba", 0x1E86208, 0x8
-.4byte wave_128
-.incbin "baserom.gba", 0x1E86214, 0x8
-.4byte wave_129
-.incbin "baserom.gba", 0x1E86220, 0x8
-.4byte wave_130
-.incbin "baserom.gba", 0x1E8622C, 0x8
-.4byte wave_131
-.incbin "baserom.gba", 0x1E86238, 0x8
-.4byte wave_132
-.incbin "baserom.gba", 0x1E86244, 0x8
-.4byte wave_131
-.incbin "baserom.gba", 0x1E86250, 0x8
-.4byte wave_133
-.incbin "baserom.gba", 0x1E8625C, 0x8
-.4byte wave_134
-.incbin "baserom.gba", 0x1E86268, 0x8
-.4byte wave_135
-.incbin "baserom.gba", 0x1E86274, 0x8
-.4byte wave_136
-.incbin "baserom.gba", 0x1E86280, 0x8
-.4byte wave_137
-.incbin "baserom.gba", 0x1E8628C, 0x8
-.4byte wave_138
-.incbin "baserom.gba", 0x1E86298, 0x4
 
-	.include "sound/voicegroups/map_003.s"
+	.include "sound/voicegroups/bank_026.s"
 	.include "sound/voicegroups/map_002.s"
 	.include "sound/voicegroups/map_005.s"
 	.include "sound/voicegroups/map_006.s"
diff --git a/sound/voicegroups/bank_002.s b/sound/voicegroups/bank_002.s
index fe3f1beb6..f6c253df2 100644
--- a/sound/voicegroups/bank_002.s
+++ b/sound/voicegroups/bank_002.s
@@ -25,14 +25,4 @@ bank_002:
 	.word	wave_011
 	.byte	255, 249, 0, 221
 
-@**************** Voice 002 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_007
-	.byte	255, 242, 51, 231
-
-
 
diff --git a/sound/voicegroups/bank_004.s b/sound/voicegroups/bank_004.s
index fa86155bb..b10f86a0e 100644
--- a/sound/voicegroups/bank_004.s
+++ b/sound/voicegroups/bank_004.s
@@ -24,15 +24,3 @@ bank_004:
 	.byte	0x00
 	.word	wave_017
 	.byte	51, 0, 103, 127
-
-@**************** Voice 002 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_016
-	.byte	51, 0, 255, 127
-
-
-
diff --git a/sound/voicegroups/bank_005.s b/sound/voicegroups/bank_005.s
index f7494e617..081cf8065 100644
--- a/sound/voicegroups/bank_005.s
+++ b/sound/voicegroups/bank_005.s
@@ -34,527 +34,3 @@ bank_005:
 	.word	wave_020
 	.byte	128, 0, 255, 127
 
-@**************** Voice 003 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_010
-	.byte	255, 249, 0, 127
-
-@**************** Voice 004 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_011
-	.byte	255, 249, 0, 188
-
-@**************** Voice 005 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_007
-	.byte	128, 242, 51, 221
-
-@**************** Voice 006 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_008
-	.byte	128, 242, 51, 221
-
-@**************** Voice 007 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_021
-	.byte	19, 0, 255, 149
-
-@**************** Voice 008 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_022
-	.byte	19, 0, 255, 149
-
-@**************** Voice 009 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_023
-	.byte	19, 0, 255, 149
-
-@**************** Voice 010 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_024
-	.byte	64, 235, 51, 165
-
-@**************** Voice 011 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_025
-	.byte	64, 235, 51, 165
-
-@**************** Voice 012 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_026
-	.byte	64, 235, 51, 165
-
-@**************** Voice 013 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_021
-	.byte	255, 0, 255, 149
-
-@**************** Voice 014 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_022
-	.byte	255, 0, 255, 149
-
-@**************** Voice 015 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_023
-	.byte	255, 0, 255, 149
-
-@**************** Voice 016 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_012
-	.byte	255, 0, 255, 0
-
-@**************** Voice 017 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_009
-	.byte	255, 0, 255, 0
-
-@**************** Voice 018 ****************@
-
-	.byte	KeySplit
-	.byte	0x0
-	.byte	0x0
-	.byte	0x0
-	.word	bank_015
-	.word	map_000
-
-@**************** Voice 019 ****************@
-
-	.byte	KeySplit
-	.byte	0x0
-	.byte	0x0
-	.byte	0x0
-	.word	bank_016
-	.word	map_001
-
-@**************** Voice 020 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_027
-	.byte	255, 188, 206, 188
-
-@**************** Voice 021 ****************@
-
-	.byte	KeySplit
-	.byte	0x0
-	.byte	0x0
-	.byte	0x0
-	.word	bank_017
-	.word	map_007
-
-@**************** Voice 022 ****************@
-
-	.byte	KeySplit
-	.byte	0x0
-	.byte	0x0
-	.byte	0x0
-	.word	bank_018
-	.word	map_006
-
-@**************** Voice 023 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_005
-	.byte	255, 165, 154, 165
-
-@**************** Voice 024 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_014
-	.byte	255, 0, 255, 0
-
-@**************** Voice 025 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_014
-	.byte	255, 165, 0, 127
-
-@**************** Voice 026 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_028
-	.byte	255, 226, 0, 127
-
-@**************** Voice 027 ****************@
-
-	.byte	KeySplit
-	.byte	0x0
-	.byte	0x0
-	.byte	0x0
-	.word	bank_019
-	.word	map_001
-
-@**************** Voice 028 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_027
-	.byte	255, 188, 180, 127
-
-@**************** Voice 029 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_029
-	.byte	255, 188, 180, 127
-
-@**************** Voice 030 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_006
-	.byte	255, 249, 25, 204
-
-@**************** Voice 031 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_030
-	.byte	13, 0, 255, 127
-
-@**************** Voice 032 ****************@
-
-	.byte	KeySplit
-	.byte	0x0
-	.byte	0x0
-	.byte	0x0
-	.word	bank_020
-	.word	map_008
-
-@**************** Voice 033 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_004
-	.byte	255, 0, 255, 149
-
-@**************** Voice 034 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_015
-	.byte	255, 0, 255, 127
-
-@**************** Voice 035 ****************@
-
-	.byte	KeySplit
-	.byte	0x0
-	.byte	0x0
-	.byte	0x0
-	.word	bank_021
-	.word	map_002
-
-@**************** Voice 036 ****************@
-
-	.byte	KeySplit
-	.byte	0x0
-	.byte	0x0
-	.byte	0x0
-	.word	bank_022
-	.word	map_002
-
-@**************** Voice 037 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_031
-	.byte	255, 0, 255, 0
-
-@**************** Voice 038 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_032
-	.byte	37, 0, 255, 0
-
-@**************** Voice 039 ****************@
-
-	.byte	KeySplit
-	.byte	0x0
-	.byte	0x0
-	.byte	0x0
-	.word	bank_023
-	.word	map_003
-
-@**************** Voice 040 ****************@
-
-	.byte	KeySplit
-	.byte	0x0
-	.byte	0x0
-	.byte	0x0
-	.word	bank_024
-	.word	map_004
-
-@**************** Voice 041 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_033
-	.byte	255, 188, 103, 165
-
-@**************** Voice 042 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_034
-	.byte	64, 249, 0, 165
-
-@**************** Voice 043 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_001
-	.byte	64, 204, 103, 188
-
-@**************** Voice 044 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_013
-	.byte	64, 235, 255, 0
-
-@**************** Voice 045 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_035
-	.byte	255, 235, 255, 188
-
-@**************** Voice 046 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_033
-	.byte	64, 0, 103, 0
-
-@**************** Voice 047 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_012
-	.byte	64, 0, 255, 0
-
-@**************** Voice 048 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_036
-	.byte	255, 204, 51, 165
-
-@**************** Voice 049 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_037
-	.byte	255, 0, 255, 127
-
-@**************** Voice 050 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_006
-	.byte	255, 204, 51, 0
-
-@**************** Voice 051 ****************@
-
-	.byte	KeySplit
-	.byte	0x0
-	.byte	0x0
-	.byte	0x0
-	.word	bank_020
-	.word	map_009
-
-@**************** Voice 052 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 053 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 054 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 055 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 056 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_038
-	.byte	64, 255, 0, 0
-
-@**************** Voice 057 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_039
-	.byte	37, 0, 255, 0
-
-@**************** Voice 058 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_040
-	.byte	37, 0, 255, 0
-
-@**************** Voice 059 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_041
-	.byte	37, 0, 255, 0
-
-@**************** Voice 060 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_042
-	.byte	37, 0, 255, 0
-
-
-
diff --git a/sound/voicegroups/bank_006.s b/sound/voicegroups/bank_006.s
index 4d88badb3..bda2048a9 100644
--- a/sound/voicegroups/bank_006.s
+++ b/sound/voicegroups/bank_006.s
@@ -25,14 +25,3 @@ bank_006:
 	.word	wave_017
 	.byte	51, 0, 255, 127
 
-@**************** Voice 002 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_021
-	.byte	64, 0, 255, 149
-
-
-
diff --git a/sound/voicegroups/bank_010.s b/sound/voicegroups/bank_010.s
index e2f0818e2..591417311 100644
--- a/sound/voicegroups/bank_010.s
+++ b/sound/voicegroups/bank_010.s
@@ -25,14 +25,4 @@ bank_010:
 	.word	wave_011
 	.byte	255, 249, 0, 188
 
-@**************** Voice 002 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_007
-	.byte	128, 242, 51, 221
-
-
 
diff --git a/sound/voicegroups/bank_016.s b/sound/voicegroups/bank_016.s
index 61def4fe4..87a59e65c 100644
--- a/sound/voicegroups/bank_016.s
+++ b/sound/voicegroups/bank_016.s
@@ -25,14 +25,4 @@ bank_016:
 	.word	wave_010
 	.byte	255, 216, 0, 216
 
-@**************** Voice 002 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_048
-	.byte	255, 0, 255, 188
-
-
 
diff --git a/sound/voicegroups/bank_019.s b/sound/voicegroups/bank_019.s
index 14cc23fc4..5246a26f2 100644
--- a/sound/voicegroups/bank_019.s
+++ b/sound/voicegroups/bank_019.s
@@ -25,14 +25,3 @@ bank_019:
 	.word	wave_011
 	.byte	255, 204, 0, 165
 
-@**************** Voice 002 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_021
-	.byte	64, 0, 255, 149
-
-
-
diff --git a/sound/voicegroups/bank_021.s b/sound/voicegroups/bank_021.s
index c0d220cd9..e3d708d1f 100644
--- a/sound/voicegroups/bank_021.s
+++ b/sound/voicegroups/bank_021.s
@@ -25,14 +25,3 @@ bank_021:
 	.word	wave_017
 	.byte	51, 0, 103, 127
 
-@**************** Voice 002 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_016
-	.byte	51, 0, 255, 127
-
-
-
diff --git a/sound/voicegroups/bank_022.s b/sound/voicegroups/bank_022.s
index 79d5bef0b..6038f15ca 100644
--- a/sound/voicegroups/bank_022.s
+++ b/sound/voicegroups/bank_022.s
@@ -25,14 +25,3 @@ bank_022:
 	.word	wave_017
 	.byte	51, 0, 255, 127
 
-@**************** Voice 002 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_018
-	.byte	64, 0, 255, 0
-
-
-
diff --git a/sound/voicegroups/bank_023.s b/sound/voicegroups/bank_023.s
index 595504fb9..468734f41 100644
--- a/sound/voicegroups/bank_023.s
+++ b/sound/voicegroups/bank_023.s
@@ -34,527 +34,3 @@ bank_023:
 	.word	wave_020
 	.byte	64, 0, 255, 0
 
-@**************** Voice 003 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_024
-	.byte	64, 235, 51, 165
-
-@**************** Voice 004 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_025
-	.byte	64, 235, 51, 165
-
-@**************** Voice 005 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_026
-	.byte	64, 235, 51, 165
-
-@**************** Voice 006 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 007 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 008 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 009 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 010 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 011 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 012 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 013 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_005
-	.byte	255, 165, 154, 165
-
-@**************** Voice 014 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 015 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 016 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 017 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 018 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 019 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 020 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 021 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 022 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 023 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 024 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 025 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 026 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 027 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 028 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 029 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 030 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 031 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 032 ****************@
-
-	.byte	AProgWave
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	gbwave_001
-	.byte	0, 0, 15, 0
-
-@**************** Voice 033 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 034 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 035 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 036 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 037 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 038 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 039 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 040 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 041 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 042 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 043 ****************@
-
-	.byte	AProgWave
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	gbwave_012
-	.byte	0, 0, 15, 0
-
-@**************** Voice 044 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 045 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 046 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 047 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 048 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_031
-	.byte	255, 216, 128, 165
-
-@**************** Voice 049 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 050 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 051 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 052 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_033
-	.byte	64, 188, 103, 0
-
-@**************** Voice 053 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_033
-	.byte	255, 188, 103, 0
-
-@**************** Voice 054 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_033
-	.byte	255, 188, 103, 165
-
-@**************** Voice 055 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_033
-	.byte	255, 188, 103, 216
-
-@**************** Voice 056 ****************@
-
-	.byte	DirectSound
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	wave_033
-	.byte	64, 188, 103, 216
-
-@**************** Voice 057 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 058 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 059 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-@**************** Voice 060 ****************@
-
-	.byte	SquareWave1
-	.byte	Cn3 
-	.byte	0x00
-	.byte	0x00
-	.word	WaveDuty50
-	.byte	0, 0, 15, 0
-
-
-
diff --git a/sound/voicegroups/bank_026.s b/sound/voicegroups/bank_026.s
index 911954cbe..9e7b9b3ed 100644
--- a/sound/voicegroups/bank_026.s
+++ b/sound/voicegroups/bank_026.s
@@ -448,6 +448,8 @@ bank_026:
 	.word	wave_138
 	.byte	255, 249, 0, 0
 
+.global	map_003
+map_003:
 @**************** Voice 049 ****************@
 
 	.byte	DirectSound
@@ -456,6 +458,15 @@ bank_026:
 	.byte	0x00
 	.word	wave_097
 	.byte	19, 188, 154, 226
+	
+	.byte	0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01
+	.byte	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02
+	.byte	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02
 
 
 
diff --git a/sound/voicegroups/map_003.s b/sound/voicegroups/map_003.s
deleted file mode 100644
index 2b8dd0575..000000000
--- a/sound/voicegroups/map_003.s
+++ /dev/null
@@ -1,17 +0,0 @@
-@ File generated by m4a2s Voicegroup-Module
-	.section .rodata
-.global	map_003
-	.align	2
-
-map_003:
-
-	.byte	0x00, 0x3C, 0x00, 0x00
-	.word wave_097
-	.byte	0x13, 0xBC, 0x9A, 0xE2, 0x00, 0x00, 0x00, 0x00
-	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01
-	.byte	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02
-	.byte	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02