Implement m4a for PC (#166)

* Refactor m4a for better names
* Bring in m4a PC backend code
* Update songs data to work on 64bit
* Move m4a to it's own folder
* Add linker map to sdl build

---------

Co-authored-by: Oliver Bell <freshollie@gmail.com>

.vscode/c_cpp_properties.json

@@ -12,6 +12,20 @@
             "intelliSenseMode": "linux-gcc-x64",
             "configurationProvider": "ms-vscode.makefile-tools"
         },
+        {
+            "name": "Linux portable",
+            "includePath": [
+                "${workspaceFolder}/include/**"
+            ],
+            "defines": [
+                "PORTABLE=1"
+            ],
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "gnu17",
+            "cppStandard": "gnu++17",
+            "intelliSenseMode": "linux-gcc-x64",
+            "configurationProvider": "ms-vscode.makefile-tools"
+        },
         {
             "name": "Linux-chao_garden",
             "includePath": [

.vscode/launch.json

@@ -12,5 +12,13 @@
       "cwd": "${workspaceFolder}",
       "MIMode": "lldb",
     },
+    {
+      "name": "SDL Debug Linux",
+      "type": "cppdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/sa2_debug.sdl",
+      "cwd": "${workspaceFolder}",
+      "MIMode": "gdb",
+    },
   ]
 }

.vscode/settings.json

@@ -345,7 +345,13 @@
     "iron_ball.h": "c",
     "char_states.h": "c",
     "course_select.h": "c",
-    "level_endings.h": "c"
+    "level_endings.h": "c",
+    "music_player.h": "c",
+    "sound_mixer.h": "c",
+    "cgb_audio.h": "c",
+    "shared.h": "c",
+    "mp2k_common.h": "c",
+    "cgb_tables.h": "c"
   },
   "asm-code-lens.donated": true,
   "editor.formatOnSave": true,

Makefile

@@ -4,6 +4,7 @@
 include config.mk
 
 ROOT_DIR := $(realpath $(dir $(realpath $(lastword $(MAKEFILE_LIST)))))
+OS       := $(shell uname)
 
 ifeq ($(PLATFORM),gba)
   TOOLCHAIN := $(DEVKITARM)
@@ -164,6 +165,20 @@ else
   CPPFLAGS += -D ENABLE_DECOMP_CREDITS=1
 endif
 
+# TODO: compile songs to C so that we can work around this
+# MacOS refuses to link the songs data because some pointers
+# are not aligned. This is a simple work around which tells
+# the compiler not to care. Once we are compiling the songs
+# to C, we can cast the pointers to integers to make the linker
+# care less
+ifeq ($(OS), Darwin)
+  LINKER_MAP_FLAGS = -Wl,-map, "$(ROOT_DIR)/$(MAP)"
+  ifneq ($(PLATFORM), gba)
+   export MACOSX_DEPLOYMENT_TARGET := 11
+  endif
+else
+  LINKER_MAP_FLAGS = -Xlinker -Map="$(ROOT_DIR)/$(MAP)"
+endif
 
 # Clear the default suffixes
 .SUFFIXES:
@@ -284,12 +299,12 @@ OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
 
 # Use the old compiler for m4a, as it was prebuilt and statically linked
 # to the original codebase
-$(C_BUILDDIR)/lib/m4a.o: CC1 := $(CC1_OLD)
+$(C_BUILDDIR)/lib/m4a/m4a.o: CC1 := $(CC1_OLD)
 
 # Use `-O1` for agb_flash libs, as these were also prebuilt
 ifeq ($(PLATFORM),gba)
-$(C_BUILDDIR)/lib/agb_flash.o: CC1FLAGS := -O1 -mthumb-interwork -Werror
-$(C_BUILDDIR)/lib/agb_flash%.o: CC1FLAGS := -O1 -mthumb-interwork -Werror
+$(C_BUILDDIR)/lib/agb_flash/agb_flash.o: CC1FLAGS := -O1 -mthumb-interwork -Werror
+$(C_BUILDDIR)/lib/agb_flash/agb_flash%.o: CC1FLAGS := -O1 -mthumb-interwork -Werror
 endif
 
 MAKEFLAGS += --no-print-directory
@@ -416,7 +431,7 @@ else
 	@echo Outputting $(ROOT_DIR)/$@
 	@touch $(ROOT_DIR)/$(MAP)
 ifeq ($(PLATFORM),sdl)
-	@cd $(OBJ_DIR) && $(CC1) $(OBJS_REL) $(shell sdl2-config --cflags --libs) -o $(ROOT_DIR)/$@
+	@cd $(OBJ_DIR) && $(CC1) $(OBJS_REL) $(shell sdl2-config --cflags --libs) $(LINKER_MAP_FLAGS) -o $(ROOT_DIR)/$@
 else ifeq ($(PLATFORM),sdl_win32)
 	@cd $(OBJ_DIR) && $(CC1) -mwin32 $(OBJS_REL) -lmingw32 -L$(ROOT_DIR)/$(SDL_MINGW_LIB) -lSDL2main -lSDL2.dll -lwinmm -lkernel32 -lxinput -o $(ROOT_DIR)/$@ -Xlinker -Map "$(ROOT_DIR)/$(MAP)"
 else

asm/macros/music_voice.inc

@@ -21,6 +21,7 @@
 	.else
 	.byte 0
 	.endif
+mAlignWord
 	mPtr \sample_data_pointer
 	.byte \attack
 	.byte \decay
@@ -39,8 +40,10 @@
 	.macro _voice_square_1 type, sweep, duty_cycle, attack, decay, sustain, release
 	.byte \type, 60, 0
 	.byte \sweep
+mAlignWord
 	.byte (\duty_cycle & 0x3)
 	.byte 0, 0, 0
+mAlignWord
 	.byte (\attack  & 0x7)
 	.byte (\decay   & 0x7)
 	.byte (\sustain & 0xF)
@@ -57,8 +60,10 @@
 
 	.macro _voice_square_2 type, duty_cycle, attack, decay, sustain, release
 	.byte \type, 60, 0, 0
+mAlignWord
 	.byte (\duty_cycle & 0x3)
 	.byte 0, 0, 0
+mAlignWord
 	.byte (\attack  & 0x7)
 	.byte (\decay   & 0x7)
 	.byte (\sustain & 0xF)
@@ -75,6 +80,7 @@
 
 	.macro _voice_programmable_wave type, wave_samples_pointer, attack, decay, sustain, release
 	.byte \type, 60, 0, 0
+mAlignWord
 	mPtr \wave_samples_pointer
 	.byte (\attack  & 0x7)
 	.byte (\decay   & 0x7)
@@ -92,8 +98,10 @@
 
 	.macro _voice_noise type, unk1, unk2, unk3, period, attack, decay, sustain, release
 	.byte \type, \unk1, \unk2, \unk3
+mAlignWord
 	.byte (\period & 0x1)
 	.byte 0, 0, 0
+mAlignWord
 	.byte (\attack  & 0x7)
 	.byte (\decay   & 0x7)
 	.byte (\sustain & 0xF)
@@ -102,24 +110,14 @@
 
 	.macro voice_keysplit voice_group_pointer, keysplit_table_pointer
 	.byte 0x40, 0, 0, 0
+mAlignWord
 	mPtr \voice_group_pointer
 	mPtr \keysplit_table_pointer
 	.endm
 
 	.macro voice_keysplit_all voice_group_pointer
 	.byte 0x80, 0, 0, 0
+mAlignWord
 	mPtr \voice_group_pointer
 	.int 0
 	.endm
-
-	.macro cry sample
-	.byte 0x20, 60, 0, 0
-	.int \sample
-	.byte 0xff, 0, 0xff, 0
-	.endm
-
-	.macro cry2 sample
-	.byte 0x30, 60, 0, 0
-	.int \sample
-	.byte 0xff, 0, 0xff, 0
-	.endm

asm/macros/portable.inc

@@ -9,7 +9,6 @@
 // Used so that we can have cross platform (32bit or 64bit) pointers
 .macro mPtr value
 #if defined(__aarch64__) || defined(__x86_64__)
-    .align 4
     .quad \value
 #else
     .int \value
@@ -18,9 +17,13 @@
 
 // Used for cross platform aligning of labels
 .macro mAlignWord
-#if defined(__aarch64__) || defined(__x86_64__)
-    .align 4
+#if defined(__APPLE__) && (defined(__aarch64__) || defined(__x86_64__))
+    .align 3       // Align to 8 bytes on macOS (2^3 = 8)
+#elif defined(__aarch64__) || defined(__x86_64__)
+    .align 8       // Align to 8 bytes on other platforms
+#elif defined(PLATFORM_GBA)
+    .align 2       // Align to 4 bytes on GBA
 #else
-    .align 2
+    .align 4       // Default alignment to 4 bytes
 #endif
 .endm

chao_garden/sound/voicegroups/voicegroup000.inc

@@ -3,95 +3,187 @@
 
 	.global voicegroup000
 voicegroup000:	@ 0x02019D30
+mAlignWord
 	voice_square_1_alt 0, 0, 0, 0, 15, 0	@02019D30
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 0, 15, 0	@02019D3C
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 15, 0	@02019D48
+mAlignWord
 	voice_square_1_alt 0, 3, 0, 0, 15, 0	@02019D54
+mAlignWord
 	voice_square_1_alt 0, 2, 2, 0, 15, 0	@02019D60
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019D6C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019D78
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019D84
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019D90
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019D9C
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 0	@02019DA8
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@02019DB4
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@02019DC0
+mAlignWord
 	voice_square_2_alt 3, 0, 0, 15, 0	@02019DCC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019DD8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019DE4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019DF0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019DFC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019E08
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019E14
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019E20
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019E2C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019E38
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019E44
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019E50
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019E5C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019E68
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019E74
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019E80
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019E8C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019E98
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019EA4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019EB0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019EBC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019EC8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019ED4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019EE0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019EEC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019EF8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019F04
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_201A3E4, 0, 4, 4, 0	@02019F10
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_201A3F4, 0, 0, 15, 0	@02019F1C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_201A404, 0, 0, 15, 0	@02019F28
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_201A414, 0, 0, 15, 0	@02019F34
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_201A424, 0, 0, 15, 0	@02019F40
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_201A434, 0, 0, 15, 0	@02019F4C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_201A444, 0, 0, 15, 0	@02019F58
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_201A454, 0, 0, 15, 0	@02019F64
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_201A464, 0, 3, 0, 2	@02019F70
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_201A3E4, 0, 5, 0, 2	@02019F7C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@02019F88
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@02019F94
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 4	@02019FA0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_201A3F4, 0, 6, 1, 0	@02019FAC
+mAlignWord
 	voice_square_2_alt 2, 0, 4, 1, 0	@02019FB8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundData_roland_sr_jv80_02__186_harp_1, 255, 242, 25, 0	@02019FC4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019FD0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019FDC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019FE8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@02019FF4
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 3, 3, 0	@0201A000
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 2, 3, 0	@0201A00C
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 2, 3, 0	@0201A018
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 5, 1, 0	@0201A024
+mAlignWord
 	voice_square_1_alt 0, 0, 1, 0, 15, 0	@0201A030
+mAlignWord
 	voice_square_1_alt 0, 0, 1, 5, 1, 0	@0201A03C
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 4, 1, 0	@0201A048
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A054
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A060
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A06C
+mAlignWord
 	voice_square_2_alt 2, 1, 5, 7, 0	@0201A078
+mAlignWord
 	voice_directsound 60, 0, DirectSoundData_roland_jv2080__pr_d__banjo, 255, 246, 51, 127	@0201A084
+mAlignWord
 	voice_directsound 60, 0, DirectSoundData_roland_jv2080__pr_d__harmonica, 255, 246, 128, 127	@0201A090
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A09C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A0A8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A0B4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A0C0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A0CC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A0D8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A0E4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A0F0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A0FC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A108
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A114
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A120
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A12C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A138
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A144
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A150
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A15C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A168
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A174

chao_garden/sound/voicegroups/voicegroup001.inc

@@ -3,54 +3,105 @@
 
 	.global voicegroup001
 voicegroup001:	@ 0x0201A180
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A180
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A18C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A198
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A1A4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A1B0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A1BC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A1C8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A1D4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A1E0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundData_roland_jv2080__pr_d__019_organ_3__5, 255, 0, 255, 127	@0201A1EC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A1F8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A204
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A210
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A21C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A228
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A234
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A240
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A24C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A258
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A264
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A270
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A27C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A288
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A294
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A2A0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A2AC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A2B8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A2C4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A2D0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A2DC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A2E8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A2F4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A300
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A30C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A318
+mAlignWord
 	voice_keysplit_all voicegroup001	@0201A324
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundData_korg_trinity__standard_kit__1__shortened, 255, 255, 255, 0	@0201A330
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundData_korg_trinity__standard_kit__2__shortened, 255, 0, 255, 0	@0201A33C
+mAlignWord
 	voice_noise 84, 0, 192, 0, 0, 1, 0, 0	@0201A348
+mAlignWord
 	voice_noise 84, 0, 192, 0, 0, 2, 0, 0	@0201A354
+mAlignWord
 	voice_noise 84, 0, 192, 0, 0, 3, 7, 0	@0201A360
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A36C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A378
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A384
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A390
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A39C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A3A8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A3B4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A3C0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@0201A3CC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundData_roland_jv2080__pr_e__jazz_drum_set1__2, 255, 0, 255, 0	@0201A3D8

constants/m4a_constants.inc

@@ -0,0 +1,257 @@
+#ifndef GUARD_CONSTANTS_M4A_CONSTANTS_INC
+#define GUARD_CONSTANTS_M4A_CONSTANTS_INC
+
+	.equiv ID_NUMBER, 0x68736d53
+
+	.equiv PCM_DMA_BUF_SIZE, 1584
+	.equiv MAX_DIRECTSOUND_CHANNELS, 12
+
+	.equiv C_V, 0x40
+
+	.equiv TONEDATA_TYPE_CGB, 0x07
+	.equiv TONEDATA_TYPE_FIX, 0x08
+	.equiv TONEDATA_TYPE_REV, 0x10
+	.equiv TONEDATA_TYPE_CMP, 0x20
+	.equiv TONEDATA_TYPE_SPL, 0x40 /* key split*/
+	.equiv TONEDATA_TYPE_RHY, 0x80 /* rhythm*/
+
+	.equiv TONEDATA_P_S_PAN,  0xc0
+
+	.equiv SOUND_CHANNEL_SF_START,       0x80
+	.equiv SOUND_CHANNEL_SF_STOP,        0x40
+	.equiv SOUND_CHANNEL_SF_SPECIAL,     0x20
+	.equiv SOUND_CHANNEL_SF_LOOP,        0x10
+	.equiv SOUND_CHANNEL_SF_IEC,         0x04
+	.equiv SOUND_CHANNEL_SF_ENV,         0x03
+	.equiv SOUND_CHANNEL_SF_ENV_ATTACK,  0x03
+	.equiv SOUND_CHANNEL_SF_ENV_DECAY,   0x02
+	.equiv SOUND_CHANNEL_SF_ENV_SUSTAIN, 0x01
+	.equiv SOUND_CHANNEL_SF_ENV_RELEASE, 0x00
+	.equiv SOUND_CHANNEL_SF_ON, (SOUND_CHANNEL_SF_START | SOUND_CHANNEL_SF_STOP | SOUND_CHANNEL_SF_IEC | SOUND_CHANNEL_SF_ENV)
+
+	.equiv CGB_CHANNEL_MO_PIT, 0x02
+	.equiv CGB_CHANNEL_MO_VOL, 0x01
+
+	.equiv WAVE_DATA_FLAG_LOOP, 0xC0
+
+	.equiv MPT_FLG_VOLSET, 0x01
+	.equiv MPT_FLG_VOLCHG, 0x03
+	.equiv MPT_FLG_PITSET, 0x04
+	.equiv MPT_FLG_PITCHG, 0x0C
+	.equiv MPT_FLG_START,  0x40
+	.equiv MPT_FLG_EXIST,  0x80
+
+	.macro struct_begin
+	.struct 0
+	.endm
+
+	.macro struct_field name, size
+\name:
+	.struct \name + \size
+	.endm
+
+	struct_begin
+	struct_field o_WaveData_type, 2
+	struct_field o_WaveData_d1, 1
+	struct_field o_WaveData_flags, 1
+	struct_field o_WaveData_freq, 4
+	struct_field o_WaveData_loopStart, 4
+	struct_field o_WaveData_size, 4
+	struct_field o_WaveData_data, 0
+	struct_field WaveData_size, 0
+
+	struct_begin
+	struct_field o_ToneData_type, 1
+	struct_field o_ToneData_key, 1
+	struct_field o_ToneData_length, 1
+	struct_field o_ToneData_pan_sweep, 1
+	struct_field o_ToneData_wav, 4
+	struct_field o_ToneData_attack, 1
+	struct_field o_ToneData_decay, 1
+	struct_field o_ToneData_sustain, 1
+	struct_field o_ToneData_release, 1
+	struct_field ToneData_size, 0
+
+	struct_begin
+	struct_field o_SoundInfo_ident, 4
+	struct_field o_SoundInfo_pcmDmaCounter, 1
+	struct_field o_SoundInfo_reverb, 1
+	struct_field o_SoundInfo_maxChans, 1
+	struct_field o_SoundInfo_masterVolume, 1
+	struct_field o_SoundInfo_freq, 1
+	struct_field o_SoundInfo_mode, 1
+	struct_field o_SoundInfo_c15, 1
+	struct_field o_SoundInfo_pcmDmaPeriod, 1
+	struct_field o_SoundInfo_maxLines, 1
+	struct_field o_SoundInfo_gap, 3
+	struct_field o_SoundInfo_pcmSamplesPerVBlank, 4
+	struct_field o_SoundInfo_pcmFreq, 4
+	struct_field o_SoundInfo_divFreq, 4
+	struct_field o_SoundInfo_cgbChans, 4
+	struct_field o_SoundInfo_MPlayMainHead, 4
+	struct_field o_SoundInfo_musicPlayerHead, 4
+	struct_field o_SoundInfo_CgbSound, 4
+	struct_field o_SoundInfo_CgbOscOff, 4
+	struct_field o_SoundInfo_MidiKeyToCgbFreq, 4
+	struct_field o_SoundInfo_MPlayJumpTable, 4
+	struct_field o_SoundInfo_plynote, 4
+	struct_field o_SoundInfo_ExtVolPit, 4
+	struct_field o_SoundInfo_gap2, 16
+	struct_field o_SoundInfo_chans, MAX_DIRECTSOUND_CHANNELS * 64
+	struct_field o_SoundInfo_pcmBuffer, PCM_DMA_BUF_SIZE * 2
+	struct_field SoundInfo_size, 0
+
+	struct_begin
+	struct_field o_SoundChannel_statusFlags, 1
+	struct_field o_SoundChannel_type, 1
+	struct_field o_SoundChannel_rightVolume, 1
+	struct_field o_SoundChannel_leftVolume, 1
+	struct_field o_SoundChannel_attack, 1
+	struct_field o_SoundChannel_decay, 1
+	struct_field o_SoundChannel_sustain, 1
+	struct_field o_SoundChannel_release, 1
+	struct_field o_SoundChannel_key, 1
+	struct_field o_SoundChannel_envelopeVolume, 1
+	struct_field o_SoundChannel_envelopeVolumeRight, 1
+	struct_field o_SoundChannel_envelopeVolumeLeft, 1
+	struct_field o_SoundChannel_pseudoEchoVolume, 1
+	struct_field o_SoundChannel_pseudoEchoLength, 1
+	struct_field o_SoundChannel_dummy1, 1
+	struct_field o_SoundChannel_dummy2, 1
+	struct_field o_SoundChannel_gateTime, 1
+	struct_field o_SoundChannel_midiKey, 1
+	struct_field o_SoundChannel_velocity, 1
+	struct_field o_SoundChannel_priority, 1
+	struct_field o_SoundChannel_rhythmPan, 1
+	struct_field o_SoundChannel_dummy3, 3
+	struct_field o_SoundChannel_count, 4
+	struct_field o_SoundChannel_fw, 4
+	struct_field o_SoundChannel_frequency, 4
+	struct_field o_SoundChannel_wav, 4
+	struct_field o_SoundChannel_currentPointer, 4
+	struct_field o_SoundChannel_track, 4
+	struct_field o_SoundChannel_prevChannelPointer, 4
+	struct_field o_SoundChannel_nextChannelPointer, 4
+	struct_field o_SoundChannel_dummy4, 4
+	struct_field o_SoundChannel_xpi, 2
+	struct_field o_SoundChannel_xpc, 2
+	struct_field SoundChannel_size, 0
+
+	struct_begin
+	struct_field o_MusicPlayerTrack_flags, 1
+	struct_field o_MusicPlayerTrack_wait, 1
+	struct_field o_MusicPlayerTrack_patternLevel, 1
+	struct_field o_MusicPlayerTrack_repN, 1
+	struct_field o_MusicPlayerTrack_gateTime, 1
+	struct_field o_MusicPlayerTrack_key, 1
+	struct_field o_MusicPlayerTrack_velocity, 1
+	struct_field o_MusicPlayerTrack_runningStatus, 1
+	struct_field o_MusicPlayerTrack_keyM, 1
+	struct_field o_MusicPlayerTrack_pitM, 1
+	struct_field o_MusicPlayerTrack_keyShift, 1
+	struct_field o_MusicPlayerTrack_keyShiftX, 1
+	struct_field o_MusicPlayerTrack_tune, 1
+	struct_field o_MusicPlayerTrack_pitX, 1
+	struct_field o_MusicPlayerTrack_bend, 1
+	struct_field o_MusicPlayerTrack_bendRange, 1
+	struct_field o_MusicPlayerTrack_volMR, 1
+	struct_field o_MusicPlayerTrack_volML, 1
+	struct_field o_MusicPlayerTrack_vol, 1
+	struct_field o_MusicPlayerTrack_volX, 1
+	struct_field o_MusicPlayerTrack_pan, 1
+	struct_field o_MusicPlayerTrack_panX, 1
+	struct_field o_MusicPlayerTrack_modM, 1
+	struct_field o_MusicPlayerTrack_mod, 1
+	struct_field o_MusicPlayerTrack_modT, 1
+	struct_field o_MusicPlayerTrack_lfoSpeed, 1
+	struct_field o_MusicPlayerTrack_lfoSpeedC, 1
+	struct_field o_MusicPlayerTrack_lfoDelay, 1
+	struct_field o_MusicPlayerTrack_lfoDelayC, 1
+	struct_field o_MusicPlayerTrack_priority, 1
+	struct_field o_MusicPlayerTrack_pseudoEchoVolume, 1
+	struct_field o_MusicPlayerTrack_pseudoEchoLength, 1
+	struct_field o_MusicPlayerTrack_chan, 4
+	struct_field o_MusicPlayerTrack_ToneData_type, 1
+	struct_field o_MusicPlayerTrack_ToneData_key, 1
+	struct_field o_MusicPlayerTrack_ToneData_length, 1
+	struct_field o_MusicPlayerTrack_ToneData_pan_sweep, 1
+	struct_field o_MusicPlayerTrack_ToneData_wav, 4
+	struct_field o_MusicPlayerTrack_ToneData_attack, 1
+	struct_field o_MusicPlayerTrack_ToneData_decay, 1
+	struct_field o_MusicPlayerTrack_ToneData_sustain, 1
+	struct_field o_MusicPlayerTrack_ToneData_release, 1
+	struct_field o_MusicPlayerTrack_gap, 10
+	struct_field o_MusicPlayerTrack_unk_3A, 2
+	struct_field o_MusicPlayerTrack_unk_3C, 4
+	struct_field o_MusicPlayerTrack_cmdPtr, 4
+	struct_field o_MusicPlayerTrack_patternStack, 12
+	struct_field MusicPlayerTrack_size, 0
+
+	.equiv o_MusicPlayerTrack_ToneData_keySplitTable, o_MusicPlayerTrack_ToneData_attack
+
+	struct_begin
+	struct_field o_MusicPlayerInfo_songHeader, 4
+	struct_field o_MusicPlayerInfo_status, 4
+	struct_field o_MusicPlayerInfo_trackCount, 1
+	struct_field o_MusicPlayerInfo_priority, 1
+	struct_field o_MusicPlayerInfo_cmd, 1
+	struct_field o_MusicPlayerInfo_unk_B, 1
+	struct_field o_MusicPlayerInfo_clock, 4
+	struct_field o_MusicPlayerInfo_gap, 8
+	struct_field o_MusicPlayerInfo_memAccArea, 4
+	struct_field o_MusicPlayerInfo_tempoD, 2
+	struct_field o_MusicPlayerInfo_tempoU, 2
+	struct_field o_MusicPlayerInfo_tempoI, 2
+	struct_field o_MusicPlayerInfo_tempoC, 2
+	struct_field o_MusicPlayerInfo_fadeOI, 2
+	struct_field o_MusicPlayerInfo_fadeOC, 2
+	struct_field o_MusicPlayerInfo_fadeOV, 2
+	struct_field o_MusicPlayerInfo_padding, 2
+	struct_field o_MusicPlayerInfo_tracks, 4
+	struct_field o_MusicPlayerInfo_tone, 4
+	struct_field o_MusicPlayerInfo_ident, 4
+	struct_field o_MusicPlayerInfo_func, 4
+	struct_field o_MusicPlayerInfo_intp, 4
+	struct_field MusicPlayerInfo_size, 0
+
+	struct_begin
+	struct_field o_CgbChannel_statusFlags, 1
+	struct_field o_CgbChannel_type, 1
+	struct_field o_CgbChannel_rightVolume, 1
+	struct_field o_CgbChannel_leftVolume, 1
+	struct_field o_CgbChannel_attack, 1
+	struct_field o_CgbChannel_decay, 1
+	struct_field o_CgbChannel_sustain, 1
+	struct_field o_CgbChannel_release, 1
+	struct_field o_CgbChannel_key, 1
+	struct_field o_CgbChannel_envelopeVolume, 1
+	struct_field o_CgbChannel_envelopeGoal, 1
+	struct_field o_CgbChannel_envelopeCounter, 1
+	struct_field o_CgbChannel_pseudoEchoVolume, 1
+	struct_field o_CgbChannel_pseudoEchoLength, 1
+	struct_field o_CgbChannel_dummy1, 1
+	struct_field o_CgbChannel_dummy2, 1
+	struct_field o_CgbChannel_gateTime, 1
+	struct_field o_CgbChannel_midiKey, 1
+	struct_field o_CgbChannel_velocity, 1
+	struct_field o_CgbChannel_priority, 1
+	struct_field o_CgbChannel_rhythmPan, 1
+	struct_field o_CgbChannel_dummy3, 3
+	struct_field o_CgbChannel_dummy5, 1
+	struct_field o_CgbChannel_sustainGoal, 1
+	struct_field o_CgbChannel_n4, 1
+	struct_field o_CgbChannel_pan, 1
+	struct_field o_CgbChannel_panMask, 1
+	struct_field o_CgbChannel_modify, 1
+	struct_field o_CgbChannel_length, 1
+	struct_field o_CgbChannel_sweep, 1
+	struct_field o_CgbChannel_frequency, 4
+	struct_field o_CgbChannel_wavePointer, 4
+	struct_field o_CgbChannel_currentPointer, 4
+	struct_field o_CgbChannel_track, 4
+	struct_field o_CgbChannel_prevChannelPointer, 4
+	struct_field o_CgbChannel_nextChannelPointer, 4
+	struct_field o_CgbChannel_dummy4, 8
+	struct_field CgbChannel_size, 0
+
+#endif  @ GUARD_CONSTANTS_M4A_CONSTANTS_INC

data/sound_data.s

@@ -3,6 +3,7 @@
 	.include "asm/macros/music_voice.inc"
 	.include "asm/macros/c_decl.inc"
 
+@; TODO: Convert this all to C
 mSectionRodata
 	.include "sound/voice_groups.inc"
 	.include "sound/keysplit_tables.inc"

include/gba/defines.h

@@ -40,9 +40,10 @@
 #define DISPLAY_WIDTH  240
 #define DISPLAY_HEIGHT 160
 
-#include "gba/types.h"
-#define OAM_SIZE (OAM_ENTRY_COUNT*sizeof(OamData))
-extern struct SoundInfo *SOUND_INFO_PTR;
+//#include "gba/types.h"
+// TODO: Fix #define OAM_SIZE (OAM_ENTRY_COUNT*sizeof(OamData))
+#define OAM_SIZE (OAM_ENTRY_COUNT*8)
+extern struct SoundMixerState *SOUND_INFO_PTR;
 extern uint16_t INTR_CHECK;
 extern void (*INTR_VECTOR)(void);
 
@@ -80,7 +81,7 @@ extern uint8_t VRAM[VRAM_SIZE];
 // NOTE(Jace): I tried replacing these altogether,
 //             but that resulted in a nonmatching ROM
 //             (see notes above)
-#define SOUND_INFO_PTR (*(struct SoundInfo **)0x3007FF0)
+#define SOUND_INFO_PTR (*(struct SoundMixerState **)0x3007FF0)
 #define INTR_CHECK     (*(u16 *)0x3007FF8)
 #define INTR_VECTOR    (*(void **)0x3007FFC)
 

include/gba/m4a_internal.h

@@ -1,455 +0,0 @@
-#ifndef GUARD_M4A_INTERNAL_H
-#define GUARD_M4A_INTERNAL_H
-
-#include "gba/gba.h"
-
-// ASCII encoding of 'Smsh' in reverse
-// This is presumably short for SMASH, the developer of MKS4AGB.
-#define ID_NUMBER 0x68736D53
-
-#define C_V 0x40 // center value for PAN, BEND, and TUNE
-
-#define SOUND_MODE_REVERB_VAL   0x0000007F
-#define SOUND_MODE_REVERB_SET   0x00000080
-#define SOUND_MODE_MAXCHN       0x00000F00
-#define SOUND_MODE_MAXCHN_SHIFT 8
-#define SOUND_MODE_MASVOL       0x0000F000
-#define SOUND_MODE_MASVOL_SHIFT 12
-#define SOUND_MODE_FREQ_05734   0x00010000
-#define SOUND_MODE_FREQ_07884   0x00020000
-#define SOUND_MODE_FREQ_10512   0x00030000
-#define SOUND_MODE_FREQ_13379   0x00040000
-#define SOUND_MODE_FREQ_15768   0x00050000
-#define SOUND_MODE_FREQ_18157   0x00060000
-#define SOUND_MODE_FREQ_21024   0x00070000
-#define SOUND_MODE_FREQ_26758   0x00080000
-#define SOUND_MODE_FREQ_31536   0x00090000
-#define SOUND_MODE_FREQ_36314   0x000A0000
-#define SOUND_MODE_FREQ_40137   0x000B0000
-#define SOUND_MODE_FREQ_42048   0x000C0000
-#define SOUND_MODE_FREQ         0x000F0000
-#define SOUND_MODE_FREQ_SHIFT   16
-#define SOUND_MODE_DA_BIT_9     0x00800000
-#define SOUND_MODE_DA_BIT_8     0x00900000
-#define SOUND_MODE_DA_BIT_7     0x00A00000
-#define SOUND_MODE_DA_BIT_6     0x00B00000
-#define SOUND_MODE_DA_BIT       0x00B00000
-#define SOUND_MODE_DA_BIT_SHIFT 20
-
-struct WaveData
-{
-    u16 type;
-    u16 status;
-    u32 freq;
-    u32 loopStart;
-    u32 size; // number of samples
-    s8 data[1]; // samples
-};
-
-#define TONEDATA_TYPE_CGB    0x07
-#define TONEDATA_TYPE_FIX    0x08
-#define TONEDATA_TYPE_SPL    0x40 // key split
-#define TONEDATA_TYPE_RHY    0x80 // rhythm
-
-#define TONEDATA_P_S_PAN    0xc0
-#define TONEDATA_P_S_PAM    TONEDATA_P_S_PAN
-
-struct ToneData
-{
-    u8 type;
-    u8 key;
-    u8 length; // sound length (compatible sound)
-    u8 pan_sweep; // pan or sweep (compatible sound ch. 1)
-    struct WaveData *wav;
-    u8 attack;
-    u8 decay;
-    u8 sustain;
-    u8 release;
-};
-
-struct CgbChannel
-{
-    u8 sf;
-    u8 ty;
-    u8 rightVolume;
-    u8 leftVolume;
-    u8 at;
-    u8 de;
-    u8 su;
-    u8 re;
-    u8 ky;
-    u8 ev;
-    u8 eg;
-    u8 ec;
-    u8 echoVolume;
-    u8 echoLength;
-    u8 d1;
-    u8 d2;
-    u8 gt;
-    u8 mk;
-    u8 ve;
-    u8 pr;
-    u8 rp;
-    u8 d3[3];
-    u8 d5;
-    u8 sg;
-    u8 n4;
-    u8 pan;
-    u8 panMask;
-    u8 mo;
-    u8 le;
-    u8 sw;
-    u32 fr;
-    u32 *wp;
-    u32 cp;
-    u32 tp;
-    u32 pp;
-    u32 np;
-    u8 d4[8];
-};
-
-struct MusicPlayerTrack;
-
-struct SoundChannel
-{
-    u8 status;
-    u8 type;
-    u8 rightVolume;
-    u8 leftVolume;
-    u8 attack;
-    u8 decay;
-    u8 sustain;
-    u8 release;
-    u8 ky;
-    u8 ev;
-    u8 er;
-    u8 el;
-    u8 echoVolume;
-    u8 echoLength;
-    u8 d1;
-    u8 d2;
-    u8 gt;
-    u8 mk;
-    u8 ve;
-    u8 pr;
-    u8 rp;
-    u8 d3[3];
-    u32 ct;
-    u32 fw;
-    u32 freq;
-    struct WaveData *wav;
-    u32 cp;
-    struct MusicPlayerTrack *track;
-    u32 pp;
-    u32 np;
-    u32 d4;
-    u16 xpi;
-    u16 xpc;
-};
-
-#define MAX_DIRECTSOUND_CHANNELS 12
-
-#define PCM_DMA_BUF_SIZE 1584 // size of Direct Sound buffer
-
-struct MusicPlayerInfo;
-
-typedef void (*MPlayFunc)();
-typedef void (*PlyNoteFunc)(u32, struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-typedef void (*CgbSoundFunc)(void);
-typedef void (*CgbOscOffFunc)(u8);
-typedef u32 (*MidiKeyToCgbFreqFunc)(u8, u8, u8);
-typedef void (*ExtVolPitFunc)(void);
-typedef void (*MPlayMainFunc)(struct MusicPlayerInfo *);
-
-// TODO: update this struct with better names from pret
-struct SoundInfo
-{
-    // This field is normally equal to ID_NUMBER but it is set to other
-    // values during sensitive operations for locking purposes.
-    // This field should be volatile but isn't. This could potentially cause
-    // race conditions.
-    u32 ident;
-
-    vu8 pcmDmaCounter;
-
-    // Direct Sound
-    u8 reverb;
-    u8 maxChans;
-    u8 masterVolume;
-    u8 freq;
-
-    u8 mode;
-    u8 c15;          // periodically counts from 14 down to 0 (15 states)
-    u8 pcmDmaPeriod; // number of V-blanks per PCM DMA
-    u8 maxLines;
-    u8 gap[3];
-    s32 pcmSamplesPerVBlank;
-    s32 pcmFreq;
-    s32 divFreq;
-    struct CgbChannel *cgbChans;
-    u32 func;
-    u32 intp;
-    void (*CgbSound)(void);
-    void (*CgbOscOff)(u8);
-    u32 (*MidiKeyToCgbFreq)(u8, u8, u8);
-    u32 MPlayJumpTable;
-    u32 plynote;
-    u32 ExtVolPit;
-    u8 gap2[16];
-    struct SoundChannel chans[MAX_DIRECTSOUND_CHANNELS];
-    s8 pcmBuffer[PCM_DMA_BUF_SIZE * 2];
-};
-
-struct SongHeader
-{
-    u8 trackCount;
-    u8 blockCount;
-    u8 priority;
-    u8 reverb;
-    struct ToneData *tone;
-    u8 *part[1];
-};
-
-struct PokemonCrySong
-{
-    u8 trackCount;
-    u8 blockCount;
-    u8 priority;
-    u8 reverb;
-    struct ToneData *tone;
-    u8 *part[2];
-    u8 gap;
-    u8 part0; // 0x11
-    u8 tuneValue; // 0x12
-    u8 gotoCmd; // 0x13
-    u32 gotoTarget; // 0x14
-    u8 part1; // 0x18
-    u8 tuneValue2; // 0x19
-    u8 cont[2]; // 0x1A
-    u8 volCmd; // 0x1C
-    u8 volumeValue; // 0x1D
-    u8 unkCmd0D[2]; // 0x1E
-    u32 unkCmd0DParam; // 0x20
-    u8 xreleCmd[2]; // 0x24
-    u8 releaseValue; // 0x26
-    u8 panCmd;
-    u8 panValue; // 0x28
-    u8 tieCmd; // 0x29
-    u8 tieKeyValue; // 0x2A
-    u8 tieVelocityValue; // 0x2B
-    u8 unkCmd0C[2]; // 0x2C
-    u16 unkCmd0CParam; // 0x2E
-    u8 end[2]; // 0x30
-};
-
-#define MPT_FLG_VOLSET 0x01
-#define MPT_FLG_VOLCHG 0x03
-#define MPT_FLG_PITSET 0x04
-#define MPT_FLG_PITCHG 0x0C
-#define MPT_FLG_START  0x40
-#define MPT_FLG_EXIST  0x80
-
-struct MusicPlayerTrack
-{
-    u8 flags;
-    u8 wait;
-    u8 patternLevel;
-    u8 repN;
-    u8 gateTime;
-    u8 key;
-    u8 velocity;
-    u8 runningStatus;
-    u8 keyM;
-    u8 pitM;
-    s8 keyShift;
-    s8 keyShiftX;
-    s8 tune;
-    u8 pitX;
-    s8 bend;
-    u8 bendRange;
-    u8 volMR;
-    u8 volML;
-    u8 vol;
-    u8 volX;
-    s8 pan;
-    s8 panX;
-    s8 modM;
-    u8 mod;
-    u8 modT;
-    u8 lfoSpeed;
-    u8 lfoSpeedC;
-    u8 lfoDelay;
-    u8 lfoDelayC;
-    u8 priority;
-    u8 echoVolume;
-    u8 echoLength;
-    struct SoundChannel *chan;
-    struct ToneData tone;
-    u8 gap[10];
-    u16 unk_3A;
-    u32 unk_3C;
-    u8 *cmdPtr;
-    u8 *patternStack[3];
-};
-
-#define MUSICPLAYER_STATUS_TRACK 0x0000ffff
-#define MUSICPLAYER_STATUS_PAUSE 0x80000000
-
-#define MAX_MUSICPLAYER_TRACKS 16
-
-#define TEMPORARY_FADE  0x0001
-#define FADE_IN         0x0002
-#define FADE_VOL_MAX    64
-#define FADE_VOL_SHIFT  2
-
-struct MusicPlayerInfo
-{
-    struct SongHeader *songHeader;
-    u32 status;
-    u8 trackCount;
-    u8 priority;
-    u8 cmd;
-    u8 unk_B;
-    u32 clock;
-    u8 gap[8];
-    u8 *memAccArea;
-    u16 tempoD;
-    u16 tempoU;
-    u16 tempoI;
-    u16 tempoC;
-    u16 fadeOI;
-    u16 fadeOC;
-    u16 fadeOV;
-    struct MusicPlayerTrack *tracks;
-    struct ToneData *tone;
-    u32 ident;
-    u32 func;
-    u32 intp;
-};
-
-struct MusicPlayer
-{
-    struct MusicPlayerInfo *info;
-    struct MusicPlayerTrack *track;
-    u8 unk_8;
-    u16 unk_A;
-};
-
-struct Song
-{
-    struct SongHeader *header;
-    u16 ms;
-    u16 me;
-};
-
-extern const struct MusicPlayer gMPlayTable[];
-extern const struct Song gSongTable[];
-
-
-
-extern u8 gMPlayMemAccArea[];
-
-extern char SoundMainRAM[];
-
-extern MPlayFunc gMPlayJumpTable[];
-
-typedef void (*XcmdFunc)(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-extern const XcmdFunc gXcmdTable[];
-
-extern struct CgbChannel gCgbChans[];
-extern const u8 gCgb3Vol[];
-
-extern const u8 gScaleTable[];
-extern const u32 gFreqTable[];
-extern const u16 gPcmSamplesPerVBlankTable[];
-
-extern const u8 gCgbScaleTable[];
-extern const s16 gCgbFreqTable[];
-extern const u8 gNoiseTable[];
-
-extern const struct PokemonCrySong gPokemonCrySongTemplate;
-
-extern const struct ToneData voicegroup_pokemon_cry;
-
-extern char gNumMusicPlayers[];
-extern char gMaxLines[];
-
-#if PLATFORM_GBA
-#define NUM_MUSIC_PLAYERS ((u16)(uintptr_t)gNumMusicPlayers)
-#else
-#define NUM_MUSIC_PLAYERS 4
-#endif
-#define MAX_LINES ((uintptr_t)gMaxLines)
-
-u32 umul3232H32(u32 multiplier, u32 multiplicand);
-void SoundMain(void);
-void SoundMainBTM(void);
-void TrackStop(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void MPlayMain(void);
-void RealClearChain(void *x);
-
-void MPlayContinue(struct MusicPlayerInfo *mplayInfo);
-void MPlayStart(struct MusicPlayerInfo *mplayInfo, struct SongHeader *songHeader);
-void MPlayStop(struct MusicPlayerInfo *mplayInfo);
-void FadeOutBody(struct MusicPlayerInfo *mplayInfo);
-void TrkVolPitSet(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
-void MPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed);
-void ClearChain(void *x);
-void Clear64byte(void *addr);
-void SoundInit(struct SoundInfo *soundInfo);
-void MPlayExtender(struct CgbChannel *cgbChans);
-void m4aSoundMode(u32 mode);
-void MPlayOpen(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track, u8 a3);
-void CgbSound(void);
-void CgbOscOff(u8);
-u32 MidiKeyToCgbFreq(u8, u8, u8);
-void MPlayJumpTableCopy(MPlayFunc *mplayJumpTable);
-void SampleFreqSet(u32 freq);
-void m4aSoundVSyncOn(void);
-void m4aSoundVSyncOff(void);
-
-void ClearModM(struct MusicPlayerTrack *track);
-void m4aMPlayModDepthSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 modDepth);
-void m4aMPlayLFOSpeedSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 lfoSpeed);
-
-// sound command handler functions
-void ply_fine(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_goto(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_patt(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_pend(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_rept(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_memacc(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_prio(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_tempo(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_keysh(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_voice(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_vol(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_pan(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_bend(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_bendr(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_lfos(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_lfodl(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_mod(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_modt(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_tune(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_port(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_xcmd(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_endtie(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_note(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-
-// extended sound command handler functions
-void ply_xxx(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_xwave(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_xtype(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_xatta(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_xdeca(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_xsust(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_xrele(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_xiecv(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_xiecl(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_xleng(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_xswee(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_xcmd_0C(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-void ply_xcmd_0D(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
-
-#endif // GUARD_M4A_INTERNAL_H

include/global.h

@@ -7,7 +7,7 @@
 #if PLATFORM_GBA
 #define ENABLE_AUDIO TRUE
 #else
-#define ENABLE_AUDIO     !TRUE
+#define ENABLE_AUDIO     TRUE
 #define ENABLE_VRAM_VIEW !TRUE
 #endif
 

include/lib/agb_flash/flash_internal.h

@@ -2,7 +2,7 @@
 #define GUARD_GBA_FLASH_INTERNAL_H
 
 #define FLASH_ROM_SIZE_1M 131072 // 1 megabit ROM
-#define SECTORS_PER_BANK 16
+#define SECTORS_PER_BANK  16
 
 #if !PORTABLE
 #define FLASH_BASE ((u8 *)0xE000000)
@@ -12,9 +12,7 @@ extern u8 FLASH_BASE[FLASH_ROM_SIZE_1M * SECTORS_PER_BANK];
 
 #define FLASH_WRITE(addr, data) ((*(vu8 *)(FLASH_BASE + (addr))) = (data))
 
-
-struct FlashSector
-{
+struct FlashSector {
     u32 size;
     u8 shift;
     u16 count;
@@ -29,15 +27,14 @@ struct FlashType {
     // TODO: add support for anonymous unions/structs if possible
     union {
         struct {
-        u8 makerId;
-        u8 deviceId;
+            u8 makerId;
+            u8 deviceId;
         } separate;
         u16 joined;
     } ids;
 };
 
-struct FlashSetupInfo
-{
+struct FlashSetupInfo {
     u16 (*programFlashSector)(u16, void *);
     u16 (*eraseFlashChip)(void);
     u16 (*eraseFlashSector)(u16);
@@ -54,14 +51,13 @@ extern u16 (*EraseFlashSector)(u16);
 extern const u16 *gFlashMaxTime;
 extern const struct FlashType *gFlash;
 
-
 extern u8 gFlashTimeoutFlag;
 extern u8 (*PollFlashStatus)(u8 *);
 
 extern u16 (*WaitForFlashWrite)(u8, u8 *, u8);
 
 extern const struct FlashSetupInfo LE39FW512;
-//extern const struct FlashSetupInfo AT29LV512;
+// extern const struct FlashSetupInfo AT29LV512;
 extern const struct FlashSetupInfo MN63F805MNP;
 extern const struct FlashSetupInfo MX29L512;
 extern const struct FlashSetupInfo DefaultFlash512K;

include/lib/m4a.h

@@ -1,36 +0,0 @@
-#ifndef GUARD_M4A_H
-#define GUARD_M4A_H
-
-#include "gba/m4a_internal.h"
-
-extern struct SoundInfo gSoundInfo;
-
-extern struct MusicPlayerInfo gMPlayInfo_BGM;
-extern struct MusicPlayerInfo gMPlayInfo_SE1;
-extern struct MusicPlayerInfo gMPlayInfo_SE2;
-extern struct MusicPlayerInfo gMPlayInfo_SE3;
-
-void m4aSoundVSync(void);
-
-void m4aSoundInit(void);
-void m4aSoundMain(void);
-void m4aSongNumStart(u16);
-void m4aSongNumStartOrChange(u16);
-void m4aSongNumStartOrContinue(u16);
-void m4aSongNumStop(u16 n);
-void m4aMPlayAllStop(void);
-void m4aMPlayAllContinue(void);
-void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo);
-void m4aMPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed);
-void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed);
-void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed);
-void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo);
-
-void m4aMPlayTempoControl(struct MusicPlayerInfo *mplayInfo, u16 tempo);
-void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume);
-void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s16 pitch);
-void m4aMPlayPanpotControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s8 pan);
-
-#define DEFAULT_SOUND_MODE (SOUND_MODE_DA_BIT_8 | SOUND_MODE_FREQ_10512 | (15 << SOUND_MODE_MASVOL_SHIFT) | (5 << SOUND_MODE_MAXCHN_SHIFT))
-
-#endif // GUARD_M4A_H

include/lib/m4a/m4a.h

@@ -0,0 +1,34 @@
+#ifndef GUARD_M4A_H
+#define GUARD_M4A_H
+
+#include "lib/m4a/m4a_internal.h"
+
+extern struct SoundMixerState gSoundInfo;
+
+extern struct MP2KPlayerState gMPlayInfo_BGM;
+extern struct MP2KPlayerState gMPlayInfo_SE1;
+extern struct MP2KPlayerState gMPlayInfo_SE2;
+extern struct MP2KPlayerState gMPlayInfo_SE3;
+
+void m4aSoundVSync(void);
+
+void m4aSoundInit(void);
+void m4aSoundMain(void);
+void m4aSongNumStart(u16);
+void m4aSongNumStartOrChange(u16);
+void m4aSongNumStartOrContinue(u16);
+void m4aSongNumStop(u16 n);
+void m4aMPlayAllStop(void);
+void m4aMPlayAllContinue(void);
+void m4aMPlayContinue(struct MP2KPlayerState *mplayInfo);
+void m4aMPlayFadeOut(struct MP2KPlayerState *mplayInfo, u16 speed);
+void m4aMPlayFadeOutTemporarily(struct MP2KPlayerState *mplayInfo, u16 speed);
+void m4aMPlayFadeIn(struct MP2KPlayerState *mplayInfo, u16 speed);
+void m4aMPlayImmInit(struct MP2KPlayerState *mplayInfo);
+
+void m4aMPlayTempoControl(struct MP2KPlayerState *mplayInfo, u16 tempo);
+void m4aMPlayVolumeControl(struct MP2KPlayerState *mplayInfo, u16 trackBits, u16 volume);
+void m4aMPlayPitchControl(struct MP2KPlayerState *mplayInfo, u16 trackBits, s16 pitch);
+void m4aMPlayPanpotControl(struct MP2KPlayerState *mplayInfo, u16 trackBits, s8 pan);
+
+#endif // GUARD_M4A_H

include/lib/m4a/m4a_internal.h

@@ -0,0 +1,468 @@
+#ifndef GUARD_GBA_M4A_INTERNAL_H
+#define GUARD_GBA_M4A_INTERNAL_H
+
+#include "gba/gba.h"
+
+// ASCII encoding of 'Smsh' in reverse
+// This is presumably short for SMASH, the developer of MKS4AGB.
+#define ID_NUMBER 0x68736D53
+
+#define C_V 0x40 // center value for PAN, BEND, and TUNE
+
+#define SOUND_MODE_REVERB_VAL   0x0000007F
+#define SOUND_MODE_REVERB_SET   0x00000080
+#define SOUND_MODE_MAXCHN       0x00000F00
+#define SOUND_MODE_MAXCHN_SHIFT 8
+#define SOUND_MODE_MASVOL       0x0000F000
+#define SOUND_MODE_MASVOL_SHIFT 12
+#define SOUND_MODE_FREQ_05734   0x00010000
+#define SOUND_MODE_FREQ_07884   0x00020000
+#define SOUND_MODE_FREQ_10512   0x00030000
+#define SOUND_MODE_FREQ_13379   0x00040000
+#define SOUND_MODE_FREQ_15768   0x00050000
+#define SOUND_MODE_FREQ_18157   0x00060000
+#define SOUND_MODE_FREQ_21024   0x00070000
+#define SOUND_MODE_FREQ_26758   0x00080000
+#define SOUND_MODE_FREQ_31536   0x00090000
+#define SOUND_MODE_FREQ_36314   0x000A0000
+#define SOUND_MODE_FREQ_40137   0x000B0000
+#define SOUND_MODE_FREQ_42048   0x000C0000
+#define SOUND_MODE_FREQ         0x000F0000
+#define SOUND_MODE_FREQ_SHIFT   16
+#define SOUND_MODE_DA_BIT_9     0x00800000
+#define SOUND_MODE_DA_BIT_8     0x00900000
+#define SOUND_MODE_DA_BIT_7     0x00A00000
+#define SOUND_MODE_DA_BIT_6     0x00B00000
+#define SOUND_MODE_DA_BIT       0x00B00000
+#define SOUND_MODE_DA_BIT_SHIFT 20
+
+#define DEFAULT_SOUND_MODE (SOUND_MODE_DA_BIT_8 | SOUND_MODE_FREQ_10512 | (15 << SOUND_MODE_MASVOL_SHIFT) | (5 << SOUND_MODE_MAXCHN_SHIFT))
+
+#define TONEDATA_TYPE_CGB 0x07
+#define TONEDATA_TYPE_FIX 0x08
+#define TONEDATA_TYPE_SPL 0x40 // key split
+#define TONEDATA_TYPE_RHY 0x80 // rhythm
+
+#define TONEDATA_P_S_PAN 0xc0
+#define TONEDATA_P_S_PAM TONEDATA_P_S_PAN
+
+#define SOUND_CHANNEL_SF_START       0x80
+#define SOUND_CHANNEL_SF_STOP        0x40
+#define SOUND_CHANNEL_SF_LOOP        0x10
+#define SOUND_CHANNEL_SF_IEC         0x04
+#define SOUND_CHANNEL_SF_ENV         0x03
+#define SOUND_CHANNEL_SF_ENV_ATTACK  0x03
+#define SOUND_CHANNEL_SF_ENV_DECAY   0x02
+#define SOUND_CHANNEL_SF_ENV_SUSTAIN 0x01
+#define SOUND_CHANNEL_SF_ENV_RELEASE 0x00
+#define SOUND_CHANNEL_SF_ON          (SOUND_CHANNEL_SF_START | SOUND_CHANNEL_SF_STOP | SOUND_CHANNEL_SF_IEC | SOUND_CHANNEL_SF_ENV)
+
+#define CGB_CHANNEL_MO_PIT 0x02
+#define CGB_CHANNEL_MO_VOL 0x01
+
+#define CGB_NRx2_ENV_DIR_DEC 0x00
+#define CGB_NRx2_ENV_DIR_INC 0x08
+
+#define MPT_FLG_VOLSET 0x01
+#define MPT_FLG_VOLCHG 0x03
+#define MPT_FLG_PITSET 0x04
+#define MPT_FLG_PITCHG 0x0C
+#define MPT_FLG_START  0x40
+#define MPT_FLG_EXIST  0x80
+
+#define MUSICPLAYER_STATUS_TRACK 0x0000ffff
+#define MUSICPLAYER_STATUS_PAUSE 0x80000000
+
+#define MAX_MUSICPLAYER_TRACKS 16
+
+#define TRACKS_ALL 0xFFFF
+
+#define TEMPORARY_FADE 0x0001
+#define FADE_IN        0x0002
+#define FADE_VOL_MAX   64
+#define FADE_VOL_SHIFT 2
+
+#define MAX_DIRECTSOUND_CHANNELS 12
+
+#if PLATFORM_GBA
+#define PCM_DMA_BUF_SIZE 1584 // size of Direct Sound buffer
+#else
+#define PCM_DMA_BUF_SIZE 4907 // size of Direct Sound buffer
+#endif
+
+#if PLATFORM_GBA
+#define NUM_MUSIC_PLAYERS ((u16)gNumMusicPlayers)
+#define MAX_LINES         ((u32)gMaxLines)
+#else
+#define NUM_MUSIC_PLAYERS 4
+#define MAX_LINES         0
+#endif
+
+struct MP2KTrack;
+struct MP2KPlayerState;
+
+typedef void (*MPlayFunc)();
+typedef void (*MP2KEventNoteFunc)(u8, struct MP2KPlayerState *, struct MP2KTrack *);
+typedef void (*MP2KEventFunc)(struct MP2KPlayerState *, struct MP2KTrack *);
+typedef void (*CgbSoundFunc)(void);
+typedef void (*CgbOscOffFunc)(u8);
+typedef u32 (*MidiKeyToCgbFreqFunc)(u8, u8, u8);
+typedef void (*ExtVolPitFunc)(void);
+typedef void (*MPlayMainFunc)(struct MP2KPlayerState *);
+
+struct MixerSource {
+    u8 status;
+    u8 type;
+    u8 rightVol;
+    u8 leftVol;
+
+    union {
+        struct {
+            u8 attack;
+            u8 decay;
+            u8 sustain;
+            u8 release;
+            u8 key;
+            u8 envelopeVol;
+
+            u8 envelopeGoal;
+            u8 envelopeCtr;
+
+            u8 echoVol;
+            u8 echoLen;
+            u8 padding1;
+            u8 padding2;
+            u8 gateTime;
+            u8 untransposedKey;
+            u8 velocity;
+            u8 priority;
+            u8 rhythmPan;
+            u8 padding3;
+            u8 padding4;
+            u8 padding5;
+
+            u8 padding6;
+            u8 sustainGoal;
+            u8 nrx4;
+            u8 pan;
+
+            u8 panMask;
+            u8 cgbStatus;
+            u8 length;
+            u8 sweep;
+
+            u32 freq;
+        } cgb;
+        struct {
+            u8 attack;
+            u8 decay;
+            u8 sustain;
+            u8 release;
+            u8 key;
+            u8 envelopeVol;
+
+            u8 envelopeVolR;
+            u8 envelopeVolL;
+
+            u8 echoVol;
+            u8 echoLen;
+            u8 padding1;
+            u8 padding2;
+            u8 gateTime;
+            u8 untransposedKey;
+            u8 velocity;
+            u8 priority;
+            u8 rhythmPan;
+            u8 padding3;
+            u8 padding4;
+            u8 padding5;
+
+            u32 ct;
+            float fw;
+
+            u32 freq;
+        } sound;
+    } data;
+
+    void *wav; // The next peice of data to be loading
+    void *current; // The working pointer from wav
+
+    struct MP2KTrack *track;
+    struct MixerSource *prev;
+    struct MixerSource *next;
+    u32 padding7; // d4
+    u32 blockCount; // bdpcm block count
+};
+
+struct SoundMixerState {
+    // This field is normally equal to ID_NUMBER but it is set to other
+    // values during sensitive operations for locking purposes.
+    u32 lockStatus;
+
+    vu8 dmaCounter;
+
+    // Direct Sound
+    u8 reverb;
+    u8 numChans;
+    u8 masterVol;
+    u8 freqOption;
+
+    u8 extensionFlags;
+    u8 cgbCounter15; // periodically counts from 14 down to 0 (15 states)
+    u8 framesPerDmaCycle; // number of V-blanks per PCM DMA
+    u8 maxScanlines;
+    u8 gap[3];
+    s32 samplesPerFrame;
+    s32 sampleRate;
+#if PLATFORM_GBA
+    s32 sampleRateReciprocal;
+#else
+    float sampleRateReciprocal;
+#endif
+    struct MixerSource *cgbChans;
+    MPlayMainFunc MPlayMainHead;
+    struct MP2KPlayerState *musicPlayerHead;
+    CgbSoundFunc CgbSound;
+    CgbOscOffFunc CgbOscOff;
+    MidiKeyToCgbFreqFunc MidiKeyToCgbFreq;
+    MPlayFunc *MPlayJumpTable;
+    MP2KEventNoteFunc plynote;
+    ExtVolPitFunc ExtVolPit;
+    void *reserved2;
+    void *reserved3;
+    void *reversed4;
+    void *reserved5;
+    struct MixerSource chans[MAX_DIRECTSOUND_CHANNELS];
+#if PLATFORM_GBA
+    s8 pcmBuffer[PCM_DMA_BUF_SIZE * 2];
+#else
+    float pcmBuffer[PCM_DMA_BUF_SIZE * 2];
+#endif
+};
+
+struct MP2KVoiceGroup {
+    u8 type;
+    u8 drumKey;
+    u8 cgbLength;
+    u8 pan_sweep; // pan or sweep (compatible sound ch. 1)
+    union {
+        struct {
+            struct WaveData *wav;
+            u8 attack;
+            u8 decay;
+            u8 sustain;
+            u8 release;
+        } sound;
+        struct {
+            struct MP2KVoiceGroup *group;
+            u8 *keySplitTable;
+        } keySplit;
+    } data;
+};
+
+struct WaveData {
+    u16 type;
+    u16 status;
+
+    u32 freq;
+    u32 loopStart;
+    u32 size; // number of samples
+    s8 data[1]; // samples
+};
+
+struct MP2KSongHeader {
+    u8 trackCount;
+    u8 blockCount;
+    u8 priority;
+    u8 reverb;
+    struct MP2KVoiceGroup *voicegroup;
+    u8 *part[1];
+};
+
+struct MP2KTrack {
+    u8 status;
+    u8 wait;
+    u8 patternLevel;
+    u8 repeatCount;
+    u8 gateTime; // 0 if TIE
+    u8 key;
+    u8 velocity;
+    u8 runningStatus;
+    s8 keyShiftCalculated; // Calculated by TrkVolPitSet using fields below. Units: semitones
+    u8 pitchCalculated; // Calculated by TrkVolPitSet using fields below. Units: 256ths of a semitone
+    s8 keyShift; // Units: semitones
+    s8 keyShiftPublic; // Units: semitones
+    s8 tune; // Units: 64ths of a semitone
+    u8 pitchPublic; // Units: 256ths of a semitone
+    s8 bend; // Units: (bendRange / 64)ths of a semitone
+    u8 bendRange;
+    u8 volRightCalculated;
+    u8 volLeftCalculated;
+    u8 vol;
+    u8 volPublic; // Used both for fades and MPlayVolumeControl
+    s8 pan;
+    s8 panPublic;
+    s8 modCalculated; // Pitch units: 16ths of a semitone
+    u8 modDepth;
+    u8 modType;
+    u8 lfoSpeed;
+    u8 lfoSpeedCounter;
+    u8 lfoDelay;
+    u8 lfoDelayCounter;
+    u8 priority;
+    u8 echoVolume;
+    u8 echoLength;
+
+    struct MixerSource *chan;
+    struct MP2KVoiceGroup voicegroup;
+
+    u8 gap[10];
+    u16 unk_3A;
+    u32 unk_3C;
+    u8 *cmdPtr;
+    u8 *patternStack[3];
+};
+
+struct MP2KPlayerState {
+    struct MP2KSongHeader *songHeader;
+    u32 status;
+    u8 trackCount;
+    u8 priority;
+    u8 cmd;
+    bool8 checkSongPriority;
+    u32 clock;
+    u8 padding[8];
+    u8 *memAccArea;
+    u16 tempoRawBPM; // 150 initially... this doesn't seem right but whatever
+    u16 tempoScale; // 0x100 initially
+    u16 tempoInterval; // 150 initially
+    u16 tempoCounter;
+    u16 fadeInterval;
+    u16 fadeCounter;
+    u16 fadeOV;
+    struct MP2KTrack *tracks;
+    struct MP2KVoiceGroup *voicegroup;
+    u32 lockStatus;
+    MPlayMainFunc nextPlayerFunc;
+    struct MP2KPlayerState *nextPlayer;
+};
+
+struct MusicPlayer {
+    struct MP2KPlayerState *info;
+    struct MP2KTrack *track;
+    u8 numTracks;
+    u16 unk_A;
+};
+
+struct Song {
+    struct MP2KSongHeader *header;
+    u16 ms;
+    u16 me;
+};
+
+typedef void (*XcmdFunc)(struct MP2KPlayerState *, struct MP2KTrack *);
+
+extern char SoundMainRAM[];
+extern u8 gMPlayMemAccArea[];
+extern MPlayFunc gMPlayJumpTable[];
+extern struct MixerSource gCgbChans[];
+
+extern const struct MusicPlayer gMPlayTable[];
+extern const struct Song gSongTable[];
+extern const XcmdFunc gXcmdTable[];
+
+extern const u8 gClockTable[];
+extern const u8 gScaleTable[];
+extern const u32 gFreqTable[];
+extern const u16 gPcmSamplesPerVBlankTable[];
+extern void *const gMPlayJumpTableTemplate[];
+
+extern const u8 gCgbScaleTable[];
+extern const s16 gCgbFreqTable[];
+extern const u8 gNoiseTable[];
+extern const u8 gCgb3Vol[];
+
+#if PLATFORM_GBA
+extern char gNumMusicPlayers[];
+extern char gMaxLines[];
+#endif
+
+u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust);
+u32 umul3232H32(u32 multiplier, u32 multiplicand);
+void SoundMain(void);
+void SoundMainBTM(void *ptr);
+void TrackStop(struct MP2KPlayerState *player, struct MP2KTrack *track);
+void MP2KPlayerMain(struct MP2KPlayerState *);
+
+void ClearChain(struct MixerSource *chan);
+void MP2KClearChain(struct MixerSource *chan);
+
+void MPlayContinue(struct MP2KPlayerState *mplayInfo);
+void MPlayStart(struct MP2KPlayerState *mplayInfo, struct MP2KSongHeader *songHeader);
+void MPlayStop(struct MP2KPlayerState *mplayInfo);
+void FadeOutBody(struct MP2KPlayerState *mplayInfo);
+void TrkVolPitSet(struct MP2KPlayerState *mplayInfo, struct MP2KTrack *track);
+void MPlayFadeOut(struct MP2KPlayerState *mplayInfo, u16 speed);
+void Clear64byte(void *addr);
+void SoundInit(struct SoundMixerState *soundInfo);
+void MPlayExtender(struct MixerSource *cgbChans);
+void m4aSoundMode(u32 mode);
+void MPlayOpen(struct MP2KPlayerState *mplayInfo, struct MP2KTrack *tracks, u8 trackCount);
+void CgbSound(void);
+void CgbOscOff(u8);
+void CgbModVol(struct MixerSource *chan);
+u32 MidiKeyToCgbFreq(u8, u8, u8);
+void MPlayJumpTableCopy(void **mplayJumpTable);
+void SampleFreqSet(u32 freq);
+void m4aSoundVSyncOn(void);
+void m4aSoundVSyncOff(void);
+
+void m4aMPlayTempoControl(struct MP2KPlayerState *mplayInfo, u16 tempo);
+void m4aMPlayVolumeControl(struct MP2KPlayerState *mplayInfo, u16 trackBits, u16 volume);
+void m4aMPlayPitchControl(struct MP2KPlayerState *mplayInfo, u16 trackBits, s16 pitch);
+void m4aMPlayPanpotControl(struct MP2KPlayerState *mplayInfo, u16 trackBits, s8 pan);
+void ClearModM(struct MP2KTrack *track);
+void m4aMPlayModDepthSet(struct MP2KPlayerState *mplayInfo, u16 trackBits, u8 modDepth);
+void m4aMPlayLFOSpeedSet(struct MP2KPlayerState *mplayInfo, u16 trackBits, u8 lfoSpeed);
+
+// sound command handler functions
+void MP2K_event_fine(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_goto(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_patt(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_pend(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_rept(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_memacc(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_prio(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_tempo(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_keysh(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_voice(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_vol(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_pan(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_bend(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_bendr(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_lfos(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_lfodl(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_mod(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_modt(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_tune(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_port(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_xcmd(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_endtie(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_nxx(u8 clock, struct MP2KPlayerState *, struct MP2KTrack *);
+
+// extended sound command handler functions
+void MP2K_event_xxx(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_xwave(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_xtype(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_xatta(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_xdeca(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_xsust(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_xrele(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_xiecv(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_xiecl(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_xleng(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_xswee(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_xcmd_0C(struct MP2KPlayerState *, struct MP2KTrack *);
+void MP2K_event_xcmd_0D(struct MP2KPlayerState *, struct MP2KTrack *);
+
+#endif // GUARD_GBA_M4A_INTERNAL_H

include/platform/platform.h

@@ -1,6 +1,8 @@
 #ifndef GUARD_SA2_PLATFORM_H
 #define GUARD_SA2_PLATFORM_H
 
+#include "gba/types.h"
+
 /* NOTE:
  * "Unsafe" versions included for compatibility.
  * This is just here so if someone accidentally calls
@@ -12,11 +14,13 @@
  * anymore.
  */
 #define ENABLE_RL_LZ_LOGGING 1
-unsigned char *Platform_LZDecompress(unsigned char *src, int srcSize);
-unsigned char *Platform_RLDecompress(unsigned char *src, int srcSize);
-void Platform_LZFree(unsigned char *dest);
-void Platform_RLFree(unsigned char *dest);
-void Platform_LZDecompressUnsafe(unsigned char *src, unsigned char *dest);
-void Platform_RLDecompressUnsafe(unsigned char *src, unsigned char *dest);
+extern unsigned char *Platform_LZDecompress(unsigned char *src, int srcSize);
+extern unsigned char *Platform_RLDecompress(unsigned char *src, int srcSize);
+extern void Platform_LZFree(unsigned char *dest);
+extern void Platform_RLFree(unsigned char *dest);
+extern void Platform_LZDecompressUnsafe(unsigned char *src, unsigned char *dest);
+extern void Platform_RLDecompressUnsafe(unsigned char *src, unsigned char *dest);
+
+extern void Platform_QueueAudio(const void *data, u32 numBytes);
 
 #endif // GUARD_SA2_PLATFORM_H

include/platform/shared/audio/README.txt

@@ -0,0 +1,4 @@
+The source code in this folder is from:
+https://github.com/Kurausukun/pokeemerald/tree/pc_port
+
+Thanks to camthesaxman, Kurausukun, Pidgey and NT_x86 for allowing us to use the code!

include/platform/shared/audio/cgb_audio.h

@@ -0,0 +1,36 @@
+#ifndef CGB_AUDIO_H
+#define CGB_AUDIO_H
+
+#include "lib/m4a/m4a_internal.h"
+
+struct AudioCGB {
+    u16 ch1Freq;
+    u8 ch1SweepCounter;
+    u8 ch1SweepCounterI;
+    bool8 ch1SweepDir;
+    u8 ch1SweepShift;
+    u8 Vol[4];
+    u8 VolI[4];
+    u8 Len[4];
+    u8 LenI[4];
+    bool8 LenOn[4];
+    u8 EnvCounter[4];
+    u8 EnvCounterI[4];
+    bool8 EnvDir[4];
+    bool8 DAC[4];
+    float WAVRAM[32];
+    u16 ch4LFSR[2];
+    float outBuffer[PCM_DMA_BUF_SIZE * 2];
+};
+
+void cgb_audio_init(u32 rate);
+void cgb_set_sweep(u8 sweep);
+void cgb_set_wavram();
+void cgb_toggle_length(u8 channel, bool8 state);
+void cgb_set_length(u8 channel, u8 length);
+void cgb_set_envelope(u8 channel, u8 envelope);
+void cgb_trigger_note(u8 channel);
+void cgb_audio_generate(u16 samplesPerFrame);
+float *cgb_get_buffer();
+
+#endif

ldscript.txt

@@ -8,7 +8,7 @@ SECTIONS
     ALIGN(4)
     {
         data/sound_data.o(ewram_data); 
-        src/lib/m4a.o(ewram_data);
+        src/lib/m4a/m4a.o(ewram_data);
         src/core.o(ewram_data);
         ewram_end = .;
     }
@@ -18,7 +18,7 @@ SECTIONS
     ALIGN(4)
     {
         /**** bss ****/
-        src/lib/m4a.o(.bss.code);
+        src/lib/m4a/m4a.o(.bss.code);
         src/multi_boot.o(.bss);
         
         . = 0x00000408;
@@ -30,7 +30,7 @@ SECTIONS
         . = 0x00000410;
         src/game/stage/collision.o(.bss);
 
-        src/lib/agb_flash.o(.bss);
+        src/lib/agb_flash/agb_flash.o(.bss);
 
         /**** common ****/
         . = ALIGN(16); 
@@ -72,7 +72,7 @@ SECTIONS
 
         /* libs */
         . = ALIGN(16);
-        src/lib/agb_flash.o(.data);
+        src/lib/agb_flash/agb_flash.o(.data);
 
         iwram_end = .;
     }
@@ -363,13 +363,13 @@ SECTIONS
 
         /* libs */
 #if (CPU_ARCH_ARM == 1)
-        src/lib/m4a0.o(.text);
+        src/lib/m4a/m4a0.o(.text);
 #endif
-        src/lib/m4a.o(.text);
-        src/lib/agb_flash.o(.text);
-        src/lib/agb_flash_512k.o(.text);
-        src/lib/agb_flash_le_512k.o(.text);
-        src/lib/agb_flash_mx_512k.o(.text);
+        src/lib/m4a/m4a.o(.text);
+        src/lib/agb_flash/agb_flash.o(.text);
+        src/lib/agb_flash/agb_flash_512k.o(.text);
+        src/lib/agb_flash/agb_flash_le_512k.o(.text);
+        src/lib/agb_flash/agb_flash_mx_512k.o(.text);
 #if (PLATFORM_GBA == 1)
         *libagbsyscall.a:ArcTan2.o(.text);
         *libagbsyscall.a:CpuFastSet.o(.text);
@@ -550,7 +550,7 @@ SECTIONS
         src/data/tileset_debug_text.o(.rodata);
         src/data/tilemap_data.o(.rodata);
 
-        src/lib/m4a_tables.o(.rodata);
+        src/lib/m4a/m4a_tables.o(.rodata);
         data/sound_data.o(.rodata);
 
         /* Songs */
@@ -814,10 +814,10 @@ SECTIONS
         sound/songs/midi/mus_506.o(.rodata);
 
         /* Lib data */
-        src/lib/agb_flash.o(.rodata);
-        src/lib/agb_flash_512k.o(.rodata);
-        src/lib/agb_flash_le_512k.o(.rodata);
-        src/lib/agb_flash_mx_512k.o(.rodata);
+        src/lib/agb_flash/agb_flash.o(.rodata);
+        src/lib/agb_flash/agb_flash_512k.o(.rodata);
+        src/lib/agb_flash/agb_flash_le_512k.o(.rodata);
+        src/lib/agb_flash/agb_flash_mx_512k.o(.rodata);
         *libgcc.a:_divdi3.o(.rodata);
 
         /* Asset data */

sound/music_player_table.inc

@@ -1,31 +1,17 @@
-.equiv TRACK_SIZE, 0x50
 .equiv NUM_TRACKS_BGM, 16
 .equiv NUM_TRACKS_SE1, 16
 .equiv NUM_TRACKS_SE2, 16
 .equiv NUM_TRACKS_SE3, 16
 
-#if !PORTABLE
-.section ewram_data
-#endif
-
-gMPlayTrack_BGM:
-    .space TRACK_SIZE * NUM_TRACKS_BGM
-
-gMPlayTrack_SE1:
-    .space TRACK_SIZE * NUM_TRACKS_SE1
-
-gMPlayTrack_SE2:
-    .space TRACK_SIZE * NUM_TRACKS_SE2
-
-gMPlayTrack_SE3:
-    .space TRACK_SIZE * NUM_TRACKS_SE3
-
 	mSectionRodata
 
 	mAlignWord
 	.global C_DECL(gMPlayTable)
 C_DECL(gMPlayTable):
-	music_player C_DECL(gMPlayInfo_BGM), gMPlayTrack_BGM, NUM_TRACKS_BGM, 0
-	music_player C_DECL(gMPlayInfo_SE1), gMPlayTrack_SE1, NUM_TRACKS_SE1, 0
-	music_player C_DECL(gMPlayInfo_SE2), gMPlayTrack_SE2, NUM_TRACKS_SE2, 0
-	music_player C_DECL(gMPlayInfo_SE3), gMPlayTrack_SE3, NUM_TRACKS_SE3, 0
+	music_player C_DECL(gMPlayInfo_BGM), C_DECL(gMPlayTrack_BGM), NUM_TRACKS_BGM, 0
+mAlignWord
+	music_player C_DECL(gMPlayInfo_SE1), C_DECL(gMPlayTrack_SE1), NUM_TRACKS_SE1, 0
+mAlignWord
+	music_player C_DECL(gMPlayInfo_SE2), C_DECL(gMPlayTrack_SE2), NUM_TRACKS_SE2, 0
+mAlignWord
+	music_player C_DECL(gMPlayInfo_SE3), C_DECL(gMPlayTrack_SE3), NUM_TRACKS_SE3, 0

sound/songs/se_291.s

@@ -88,6 +88,7 @@ C_DECL(se_291):
 	.byte	20
 	.byte	128
 
+mAlignWord
 	mPtr	voicegroup005
 
 	mPtr  song0291_1

sound/voicegroups/voicegroup000.inc

@@ -1,95 +1,187 @@
 	mAlignWord
 	.global voicegroup000
 voicegroup000:	@ 0x08ACDF50
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 0	@08ACDF50
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08ACDF5C
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACDF68
+mAlignWord
 	voice_square_2_alt 3, 0, 0, 15, 0	@08ACDF74
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08ACDF80
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACDF8C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACDF98
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACDFA4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACDFB0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACDFBC
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 0	@08ACDFC8
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08ACDFD4
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACDFE0
+mAlignWord
 	voice_square_2_alt 3, 0, 0, 15, 0	@08ACDFEC
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08ACDFF8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE004
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE010
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE01C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE028
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE034
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE040
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE04C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE058
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE064
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE070
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE07C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE088
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE094
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE0A0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE0AC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE0B8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE0C4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE0D0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE0DC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE0E8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE0F4
+mAlignWord
 	voice_square_2_alt 1, 1, 0, 15, 0	@08ACE100
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE10C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE118
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE124
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 4, 4, 0	@08ACE130
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_3, 0, 0, 15, 0	@08ACE13C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_4, 0, 0, 15, 0	@08ACE148
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_5, 0, 0, 15, 0	@08ACE154
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 0, 15, 0	@08ACE160
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08ACE16C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08ACE178
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 0, 15, 0	@08ACE184
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 3, 0, 2	@08ACE190
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE19C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACE1A8
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08ACE1B4
+mAlignWord
 	voice_square_2_alt 2, 0, 3, 0, 0	@08ACE1C0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 0, 15, 0	@08ACE1CC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 3, 0, 2	@08ACE1D8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 0, 15, 0	@08ACE1E4
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 5	@08ACE1F0
+mAlignWord
 	voice_noise 60, 0, 0, 0, 1, 0, 15, 0	@08ACE1FC
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08ACE208
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08ACE214
+mAlignWord
 	voice_square_2_alt 0, 0, 4, 0, 0	@08ACE220
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 4, 0, 0	@08ACE22C
+mAlignWord
 	voice_square_2_alt 0, 0, 4, 4, 0	@08ACE238
+mAlignWord
 	voice_square_2_alt 1, 0, 3, 0, 0	@08ACE244
+mAlignWord
 	voice_square_2_alt 1, 0, 2, 0, 0	@08ACE250
+mAlignWord
 	voice_square_2_alt 3, 0, 1, 0, 1	@08ACE25C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 0, 15, 0	@08ACE268
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08ACE274
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08ACE280
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 0, 15, 0	@08ACE28C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_1, 255, 0, 255, 0	@08ACE298
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_2, 255, 0, 255, 0	@08ACE2A4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_3, 255, 0, 255, 0	@08ACE2B0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_4, 255, 0, 255, 0	@08ACE2BC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08ACE2C8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_6, 255, 0, 255, 127	@08ACE2D4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_7, 255, 0, 255, 0	@08ACE2E0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_8, 255, 235, 38, 165	@08ACE2EC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_9, 255, 0, 255, 127	@08ACE2F8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_10, 255, 0, 255, 0	@08ACE304
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_11, 255, 0, 255, 0	@08ACE310
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_12, 255, 0, 255, 127	@08ACE31C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_13, 255, 0, 255, 127	@08ACE328
+mAlignWord
 	voice_keysplit voicegroup002, KeySplitTable1	@08ACE334
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_14, 255, 246, 64, 149	@08ACE340
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_15, 255, 0, 255, 127	@08ACE34C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_16, 255, 0, 255, 127	@08ACE358
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_17, 255, 0, 255, 127	@08ACE364
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_18, 255, 0, 255, 127	@08ACE370
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08ACE37C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_19, 255, 0, 255, 127	@08ACE388
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_20, 255, 231, 0, 188	@08ACE394

sound/voicegroups/voicegroup001.inc

@@ -1,39 +1,75 @@
 	mAlignWord
 	.global voicegroup001
 voicegroup001:	@ 0x08ACE3A0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_21, 255, 0, 255, 0	@08ACE3A0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_22, 255, 0, 255, 149	@08ACE3AC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_23, 255, 235, 25, 165	@08ACE3B8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_24, 255, 0, 255, 149	@08ACE3C4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_25, 255, 0, 255, 0	@08ACE3D0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_26, 37, 0, 255, 165	@08ACE3DC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_26, 255, 0, 255, 165	@08ACE3E8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_27, 255, 252, 0, 149	@08ACE3F4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE400
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE40C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE418
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE424
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE430
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE43C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE448
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE454
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE460
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE46C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE478
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE484
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE490
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE49C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE4A8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE4B4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_28, 255, 0, 255, 0	@08ACE4C0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_29, 255, 250, 18, 250	@08ACE4CC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_30, 255, 216, 25, 0	@08ACE4D8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_31, 37, 0, 255, 149	@08ACE4E4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_32, 255, 0, 255, 0	@08ACE4F0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_33, 255, 0, 255, 0	@08ACE4FC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_34, 255, 0, 255, 149	@08ACE508
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 5, 1, 0	@08ACE514
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_35, 255, 216, 25, 0	@08ACE520
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 4, 4, 0	@08ACE52C
+mAlignWord
 	voice_keysplit_all voicegroup004	@08ACE538
+mAlignWord
 	voice_keysplit_all voicegroup001	@08ACE544

sound/voicegroups/voicegroup002.inc

@@ -1,50 +1,97 @@
 	mAlignWord
 	.global voicegroup002
 voicegroup002:	@ 0x08ACE550
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_36, 255, 255, 255, 0	@08ACE550
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_37, 255, 0, 255, 0	@08ACE55C
+mAlignWord
 	voice_noise 84, 0, 192, 0, 0, 1, 0, 0	@08ACE568
+mAlignWord
 	voice_noise 84, 0, 192, 0, 0, 2, 0, 0	@08ACE574
+mAlignWord
 	voice_noise 84, 0, 192, 0, 0, 3, 7, 0	@08ACE580
+mAlignWord
 	voice_directsound 45, 0, DirectSoundWaveData_38, 255, 0, 255, 0	@08ACE58C
+mAlignWord
 	voice_directsound 50, 0, DirectSoundWaveData_38, 255, 0, 255, 0	@08ACE598
+mAlignWord
 	voice_directsound 55, 0, DirectSoundWaveData_38, 255, 0, 255, 0	@08ACE5A4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_38, 255, 0, 255, 0	@08ACE5B0
+mAlignWord
 	voice_directsound 65, 0, DirectSoundWaveData_38, 255, 0, 255, 0	@08ACE5BC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_39, 255, 0, 255, 0	@08ACE5C8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_40, 255, 0, 255, 0	@08ACE5D4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_41, 255, 0, 255, 0	@08ACE5E0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_42, 255, 0, 255, 0	@08ACE5EC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_43, 255, 0, 255, 0	@08ACE5F8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_44, 255, 0, 255, 0	@08ACE604
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_45, 255, 0, 255, 0	@08ACE610
+mAlignWord
 	voice_directsound 57, 0, DirectSoundWaveData_42, 255, 0, 255, 0	@08ACE61C
+mAlignWord
 	voice_directsound 59, 0, DirectSoundWaveData_42, 255, 0, 255, 0	@08ACE628
+mAlignWord
 	voice_directsound 61, 0, DirectSoundWaveData_42, 255, 0, 255, 0	@08ACE634
+mAlignWord
 	voice_directsound 45, 0, DirectSoundWaveData_46, 255, 0, 255, 0	@08ACE640
+mAlignWord
 	voice_directsound 50, 0, DirectSoundWaveData_46, 255, 0, 255, 0	@08ACE64C
+mAlignWord
 	voice_directsound 55, 0, DirectSoundWaveData_46, 255, 0, 255, 0	@08ACE658
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_46, 255, 0, 255, 0	@08ACE664
+mAlignWord
 	voice_directsound 65, 0, DirectSoundWaveData_46, 255, 0, 255, 0	@08ACE670
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE67C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE688
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE694
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE6A0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE6AC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE6B8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE6C4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE6D0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE6DC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE6E8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE6F4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE700
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE70C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE718
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE724
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE730
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE73C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE748
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE754
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE760
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE76C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_47, 255, 0, 255, 0	@08ACE778

sound/voicegroups/voicegroup003.inc

@@ -1,95 +1,187 @@
 	mAlignWord
 	.global voicegroup003
 voicegroup003:	@ 0x08ACE784
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_48, 255, 0, 255, 0	@08ACE784
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_49, 255, 0, 255, 0	@08ACE790
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_50, 255, 0, 255, 0	@08ACE79C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_51, 255, 0, 255, 0	@08ACE7A8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_52, 255, 0, 255, 0	@08ACE7B4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE7C0
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACE7CC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE7D8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE7E4
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACE7F0
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 0	@08ACE7FC
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08ACE808
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACE814
+mAlignWord
 	voice_square_2_alt 3, 0, 0, 15, 0	@08ACE820
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08ACE82C
+mAlignWord
 	voice_noise 60, 0, 0, 1, 1, 0, 12, 2	@08ACE838
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 12, 2	@08ACE844
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08ACE850
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 5, 3	@08ACE85C
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 12, 2	@08ACE868
+mAlignWord
 	voice_noise 60, 0, 0, 1, 1, 0, 12, 2	@08ACE874
+mAlignWord
 	voice_noise 60, 0, 0, 1, 4, 0, 12, 2	@08ACE880
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08ACE88C
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 5, 4	@08ACE898
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 5	@08ACE8A4
+mAlignWord
 	voice_square_2_alt 2, 0, 2, 0, 0	@08ACE8B0
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08ACE8BC
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 2	@08ACE8C8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE8D4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE8E0
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08ACE8EC
+mAlignWord
 	voice_noise 60, 0, 0, 0, 3, 0, 15, 4	@08ACE8F8
+mAlignWord
 	voice_square_2_alt 1, 0, 2, 0, 0	@08ACE904
+mAlignWord
 	voice_square_2_alt 1, 0, 2, 0, 0	@08ACE910
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08ACE91C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 1, 0, 15, 0	@08ACE928
+mAlignWord
 	voice_square_2_alt 1, 1, 0, 15, 0	@08ACE934
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08ACE940
+mAlignWord
 	voice_square_2_alt 1, 0, 2, 0, 0	@08ACE94C
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 1	@08ACE958
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 4, 4, 0	@08ACE964
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_3, 0, 0, 15, 0	@08ACE970
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_4, 0, 0, 15, 0	@08ACE97C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_5, 0, 0, 15, 0	@08ACE988
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 0, 15, 0	@08ACE994
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08ACE9A0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08ACE9AC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 0, 15, 0	@08ACE9B8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 3, 0, 2	@08ACE9C4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACE9D0
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACE9DC
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACE9E8
+mAlignWord
 	voice_square_2_alt 2, 0, 3, 0, 0	@08ACE9F4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 0, 15, 0	@08ACEA00
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 3, 0, 2	@08ACEA0C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 0, 15, 0	@08ACEA18
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 5	@08ACEA24
+mAlignWord
 	voice_noise 60, 0, 0, 0, 1, 0, 15, 0	@08ACEA30
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08ACEA3C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08ACEA48
+mAlignWord
 	voice_square_2_alt 0, 0, 4, 0, 0	@08ACEA54
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 4, 0, 0	@08ACEA60
+mAlignWord
 	voice_square_2_alt 0, 0, 4, 4, 0	@08ACEA6C
+mAlignWord
 	voice_square_2_alt 1, 0, 3, 0, 0	@08ACEA78
+mAlignWord
 	voice_square_2_alt 1, 0, 2, 0, 0	@08ACEA84
+mAlignWord
 	voice_square_2_alt 3, 0, 1, 0, 1	@08ACEA90
+mAlignWord
 	voice_square_2_alt 2, 0, 2, 2, 2	@08ACEA9C
+mAlignWord
 	voice_square_2_alt 2, 1, 0, 10, 3	@08ACEAA8
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08ACEAB4
+mAlignWord
 	voice_square_2_alt 1, 0, 2, 0, 0	@08ACEAC0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_1, 255, 0, 255, 0	@08ACEACC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_2, 255, 0, 255, 0	@08ACEAD8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_3, 255, 0, 255, 0	@08ACEAE4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_4, 255, 0, 255, 0	@08ACEAF0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08ACEAFC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_6, 255, 0, 255, 127	@08ACEB08
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_7, 255, 0, 255, 0	@08ACEB14
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_8, 255, 235, 38, 165	@08ACEB20
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_9, 255, 0, 255, 127	@08ACEB2C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_10, 255, 0, 255, 0	@08ACEB38
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_11, 255, 0, 255, 0	@08ACEB44
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_12, 255, 0, 255, 127	@08ACEB50
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_13, 255, 0, 255, 127	@08ACEB5C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 3, 0, 15, 4	@08ACEB68
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACEB74
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08ACEB80
+mAlignWord
 	voice_square_2_alt 2, 0, 2, 0, 0	@08ACEB8C
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 1	@08ACEB98
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACEBA4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACEBB0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_19, 255, 0, 255, 0	@08ACEBBC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_20, 255, 0, 255, 0	@08ACEBC8

sound/voicegroups/voicegroup004.inc

@@ -1,40 +1,77 @@
 	mAlignWord
 	.global voicegroup004
 voicegroup004:	@ 0x08ACEBD4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_21, 255, 0, 255, 0	@08ACEBD4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 3, 0, 2	@08ACEBE0
+mAlignWord
 	voice_noise 60, 0, 0, 1, 1, 0, 12, 2	@08ACEBEC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACEBF8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACEC04
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACEC10
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACEC1C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACEC28
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_53, 255, 0, 255, 0	@08ACEC34
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_54, 255, 0, 255, 0	@08ACEC40
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_55, 255, 0, 255, 0	@08ACEC4C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_56, 255, 0, 255, 0	@08ACEC58
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_57, 255, 0, 255, 0	@08ACEC64
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_58, 255, 0, 255, 0	@08ACEC70
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_59, 255, 0, 255, 0	@08ACEC7C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACEC88
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACEC94
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACECA0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACECAC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACECB8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACECC4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACECD0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACECDC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACECE8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_60, 255, 0, 255, 0	@08ACECF4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_61, 255, 0, 255, 0	@08ACED00
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACED0C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 1, 0, 15, 2	@08ACED18
+mAlignWord
 	voice_noise 60, 0, 0, 1, 1, 0, 12, 2	@08ACED24
+mAlignWord
 	voice_square_1_alt 0, 2, 2, 0, 15, 0	@08ACED30
+mAlignWord
 	voice_noise 60, 0, 0, 0, 1, 0, 15, 2	@08ACED3C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08ACED48
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 2	@08ACED54
+mAlignWord
 	voice_square_2_alt 2, 3, 0, 10, 3	@08ACED60
+mAlignWord
 	voice_square_2_alt 1, 0, 2, 0, 0	@08ACED6C
+mAlignWord
 	voice_keysplit_all voicegroup001	@08ACED78
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_32, 255, 0, 255, 0	@08ACED84

sound/voicegroups/voicegroup005.inc

@@ -1,130 +1,257 @@
 	mAlignWord
 	.global voicegroup005
 voicegroup005:	@ 0x08ACED90
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACED90
+mAlignWord
 	voice_directsound 65, 0, DirectSoundWaveData_voice__announcer__sonic_advance_2, 255, 0, 255, 0	@08ACED9C
+mAlignWord
 	voice_directsound 65, 0, DirectSoundWaveData_voice__announcer__sonic, 255, 0, 255, 0	@08ACEDA8
+mAlignWord
 	voice_directsound 65, 0, DirectSoundWaveData_62, 255, 0, 255, 0	@08ACEDB4
+mAlignWord
 	voice_directsound 65, 0, DirectSoundWaveData_63, 255, 0, 255, 0	@08ACEDC0
+mAlignWord
 	voice_directsound 65, 0, DirectSoundWaveData_64, 255, 0, 255, 0	@08ACEDCC
+mAlignWord
 	voice_directsound 65, 0, DirectSoundWaveData_voice__announcer__cream, 255, 0, 255, 0	@08ACEDD8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACEDE4
+mAlignWord
 	voice_directsound 65, 0, DirectSoundWaveData_65, 255, 0, 255, 0	@08ACEDF0
+mAlignWord
 	voice_directsound 65, 0, DirectSoundWaveData_66, 255, 0, 255, 0	@08ACEDFC
+mAlignWord
 	voice_directsound 65, 0, DirectSoundWaveData_67, 255, 0, 255, 0	@08ACEE08
+mAlignWord
 	voice_directsound 65, 0, DirectSoundWaveData_68, 255, 0, 255, 0	@08ACEE14
+mAlignWord
 	voice_directsound 65, 0, DirectSoundWaveData_69, 255, 0, 255, 0	@08ACEE20
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACEE2C
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACEE38
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08ACEE44
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08ACEE50
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08ACEE5C
+mAlignWord
 	voice_square_2_alt 0, 2, 0, 15, 5	@08ACEE68
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08ACEE74
+mAlignWord
 	voice_square_2_alt 1, 2, 0, 3, 3	@08ACEE80
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACEE8C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 2, 0, 15, 0	@08ACEE98
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACEEA4
+mAlignWord
 	voice_noise 60, 0, 0, 0, 3, 0, 15, 2	@08ACEEB0
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 12, 2	@08ACEEBC
+mAlignWord
 	voice_noise 60, 0, 0, 1, 4, 0, 12, 2	@08ACEEC8
+mAlignWord
 	voice_noise 60, 0, 0, 1, 1, 0, 12, 2	@08ACEED4
+mAlignWord
 	voice_square_2_alt 2, 3, 0, 10, 4	@08ACEEE0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_56, 255, 0, 255, 0	@08ACEEEC
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 4	@08ACEEF8
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08ACEF04
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACEF10
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACEF1C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACEF28
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08ACEF34
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08ACEF40
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08ACEF4C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 4	@08ACEF58
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 12, 2	@08ACEF64
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08ACEF70
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 12, 2	@08ACEF7C
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08ACEF88
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 2	@08ACEF94
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 9, 6	@08ACEFA0
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 12, 2	@08ACEFAC
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACEFB8
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08ACEFC4
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08ACEFD0
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 2	@08ACEFDC
+mAlignWord
 	voice_noise 60, 0, 0, 1, 4, 0, 12, 2	@08ACEFE8
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 2	@08ACEFF4
+mAlignWord
 	voice_square_2_alt 0, 0, 3, 13, 0	@08ACF000
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 0	@08ACF00C
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08ACF018
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08ACF024
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08ACF030
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08ACF03C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACF048
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 2	@08ACF054
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08ACF060
+mAlignWord
 	voice_square_2_alt 0, 0, 3, 0, 2	@08ACF06C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACF078
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACF084
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACF090
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08ACF09C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACF0A8
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 2	@08ACF0B4
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACF0C0
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACF0CC
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACF0D8
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08ACF0E4
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08ACF0F0
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACF0FC
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 2, 0, 0	@08ACF108
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08ACF114
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACF120
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACF12C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACF138
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACF144
+mAlignWord
 	voice_noise 60, 0, 0, 0, 2, 0, 15, 0	@08ACF150
+mAlignWord
 	voice_noise 60, 0, 0, 0, 1, 0, 15, 0	@08ACF15C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 3, 0, 15, 4	@08ACF168
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACF174
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACF180
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACF18C
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACF198
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACF1A4
+mAlignWord
 	voice_square_1_alt 0, 2, 2, 0, 15, 0	@08ACF1B0
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08ACF1BC
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 10, 3	@08ACF1C8
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 12, 2	@08ACF1D4
+mAlignWord
 	voice_square_2_alt 2, 0, 2, 2, 0	@08ACF1E0
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08ACF1EC
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08ACF1F8
+mAlignWord
 	voice_square_2_alt 2, 0, 4, 13, 6	@08ACF204
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACF210
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 12, 2	@08ACF21C
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08ACF228
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACF234
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08ACF240
+mAlignWord
 	voice_noise 60, 0, 0, 0, 1, 0, 15, 2	@08ACF24C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_50, 255, 0, 255, 0	@08ACF258
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 0	@08ACF264
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF270
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08ACF27C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF288
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF294
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF2A0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF2AC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF2B8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF2C4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF2D0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF2DC
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 0	@08ACF2E8
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08ACF2F4
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACF300
+mAlignWord
 	voice_square_2_alt 3, 0, 0, 15, 0	@08ACF30C
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08ACF318
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 0	@08ACF324
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08ACF330
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACF33C
+mAlignWord
 	voice_square_2_alt 3, 0, 0, 15, 0	@08ACF348
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08ACF354
+mAlignWord
 	voice_square_2_alt 1, 1, 0, 15, 0	@08ACF360
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08ACF36C
+mAlignWord
 	voice_square_2_alt 0, 2, 0, 15, 0	@08ACF378

sound/voicegroups/voicegroup006.inc

@@ -1,36 +1,69 @@
 	mAlignWord
 	.global voicegroup006
 voicegroup006:	@ 0x08ACF384
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF384
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_70, 255, 0, 255, 0	@08ACF390
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF39C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF3A8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF3B4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_71, 255, 0, 255, 0	@08ACF3C0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_72, 255, 0, 255, 0	@08ACF3CC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF3D8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF3E4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF3F0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF3FC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF408
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF414
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF420
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_73, 255, 0, 255, 0	@08ACF42C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF438
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF444
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF450
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF45C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF468
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF474
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF480
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_74, 64, 0, 255, 0	@08ACF48C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF498
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF4A4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_75, 64, 0, 255, 0	@08ACF4B0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF4BC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF4C8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_76, 255, 0, 255, 0	@08ACF4D4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_77, 255, 0, 255, 0	@08ACF4E0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_22, 255, 0, 255, 149	@08ACF4EC
+mAlignWord
 	voice_square_2_alt 2, 0, 2, 1, 0	@08ACF4F8
+mAlignWord
 	voice_square_2_alt 2, 0, 2, 2, 6	@08ACF504

sound/voicegroups/voicegroup007.inc

@@ -1,131 +1,259 @@
 	mAlignWord
 	.global voicegroup007
 voicegroup007:	@ 0x08ACF510
+mAlignWord
 	voice_square_1_alt 0, 0, 0, 0, 15, 0	@08ACF510
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 0, 15, 0	@08ACF51C
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 15, 0	@08ACF528
+mAlignWord
 	voice_square_1_alt 0, 3, 0, 0, 15, 0	@08ACF534
+mAlignWord
 	voice_square_1_alt 0, 2, 2, 0, 15, 0	@08ACF540
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF54C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF558
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF564
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF570
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF57C
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 0	@08ACF588
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08ACF594
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACF5A0
+mAlignWord
 	voice_square_2_alt 3, 0, 0, 15, 0	@08ACF5AC
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08ACF5B8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF5C4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF5D0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF5DC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF5E8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF5F4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF600
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF60C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF618
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF624
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF630
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF63C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF648
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF654
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF660
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF66C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF678
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF684
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF690
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF69C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF6A8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF6B4
+mAlignWord
 	voice_square_1_alt 0, 1, 1, 0, 15, 0	@08ACF6C0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF6CC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF6D8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF6E4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 4, 4, 0	@08ACF6F0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_3, 0, 0, 15, 0	@08ACF6FC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_4, 0, 0, 15, 0	@08ACF708
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_5, 0, 0, 15, 0	@08ACF714
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 0, 15, 0	@08ACF720
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08ACF72C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08ACF738
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 0, 15, 0	@08ACF744
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 3, 0, 2	@08ACF750
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF75C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08ACF768
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08ACF774
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 3, 0, 0	@08ACF780
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 0, 15, 0	@08ACF78C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 3, 0, 2	@08ACF798
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 0, 15, 0	@08ACF7A4
+mAlignWord
 	voice_square_1_alt 0, 0, 0, 0, 15, 5	@08ACF7B0
+mAlignWord
 	voice_noise 60, 0, 0, 0, 1, 0, 15, 0	@08ACF7BC
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08ACF7C8
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08ACF7D4
+mAlignWord
 	voice_square_1_alt 0, 0, 0, 4, 0, 0	@08ACF7E0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 4, 0, 0	@08ACF7EC
+mAlignWord
 	voice_square_2_alt 0, 0, 4, 4, 0	@08ACF7F8
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 3, 0, 0	@08ACF804
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 2, 0, 0	@08ACF810
+mAlignWord
 	voice_square_1_alt 0, 3, 0, 1, 0, 1	@08ACF81C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 0, 15, 0	@08ACF828
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08ACF834
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08ACF840
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 0, 15, 0	@08ACF84C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_1, 255, 0, 255, 0	@08ACF858
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_2, 255, 0, 255, 0	@08ACF864
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_3, 255, 0, 255, 0	@08ACF870
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_4, 255, 0, 255, 0	@08ACF87C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08ACF888
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_6, 255, 0, 255, 127	@08ACF894
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_7, 255, 0, 255, 0	@08ACF8A0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_8, 255, 235, 38, 165	@08ACF8AC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_9, 255, 0, 255, 127	@08ACF8B8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_10, 255, 0, 255, 0	@08ACF8C4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_11, 255, 0, 255, 0	@08ACF8D0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_12, 255, 0, 255, 127	@08ACF8DC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_13, 255, 0, 255, 127	@08ACF8E8
+mAlignWord
 	voice_keysplit voicegroup002, KeySplitTable1	@08ACF8F4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_14, 255, 246, 64, 149	@08ACF900
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_15, 255, 0, 255, 127	@08ACF90C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_16, 255, 0, 255, 127	@08ACF918
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_17, 255, 0, 255, 127	@08ACF924
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_18, 255, 0, 255, 127	@08ACF930
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08ACF93C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_19, 255, 0, 255, 127	@08ACF948
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_20, 255, 231, 0, 188	@08ACF954
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_21, 255, 0, 255, 0	@08ACF960
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_22, 255, 0, 255, 149	@08ACF96C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_23, 255, 235, 25, 165	@08ACF978
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_24, 255, 0, 255, 149	@08ACF984
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_25, 255, 0, 255, 0	@08ACF990
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_26, 37, 0, 255, 165	@08ACF99C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_26, 255, 0, 255, 165	@08ACF9A8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_27, 255, 252, 0, 149	@08ACF9B4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF9C0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF9CC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF9D8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF9E4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF9F0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACF9FC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFA08
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFA14
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFA20
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFA2C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFA38
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFA44
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFA50
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFA5C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFA68
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFA74
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_28, 255, 0, 255, 0	@08ACFA80
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_29, 255, 250, 18, 250	@08ACFA8C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_30, 255, 216, 25, 0	@08ACFA98
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_31, 37, 0, 255, 149	@08ACFAA4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_32, 255, 0, 255, 0	@08ACFAB0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_33, 255, 0, 255, 0	@08ACFABC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_34, 255, 0, 255, 149	@08ACFAC8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 5, 1, 0	@08ACFAD4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_35, 255, 216, 25, 0	@08ACFAE0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 4, 4, 0	@08ACFAEC
+mAlignWord
 	voice_keysplit_all voicegroup004	@08ACFAF8
+mAlignWord
 	voice_keysplit_all voicegroup001	@08ACFB04

sound/voicegroups/voicegroup008.inc

@@ -1,131 +1,259 @@
 	mAlignWord
 	.global voicegroup008
 voicegroup008:	@ 0x08ACFB10
+mAlignWord
 	voice_square_1_alt 0, 0, 0, 0, 15, 0	@08ACFB10
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 0, 15, 0	@08ACFB1C
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 15, 0	@08ACFB28
+mAlignWord
 	voice_square_1_alt 0, 3, 0, 0, 15, 0	@08ACFB34
+mAlignWord
 	voice_square_1_alt 0, 2, 2, 0, 15, 0	@08ACFB40
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFB4C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFB58
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFB64
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFB70
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFB7C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFB88
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08ACFB94
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_13, 255, 0, 255, 127	@08ACFBA0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08ACFBAC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFBB8
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 0, 15, 0	@08ACFBC4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_7, 255, 0, 255, 0	@08ACFBD0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08ACFBDC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFBE8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_78, 255, 0, 255, 0	@08ACFBF4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_79, 255, 0, 255, 0	@08ACFC00
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACFC0C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_22, 255, 0, 255, 149	@08ACFC18
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 7, 0	@08ACFC24
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 15, 0	@08ACFC30
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_80, 255, 0, 255, 0	@08ACFC3C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFC48
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08ACFC54
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_6, 255, 0, 255, 127	@08ACFC60
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08ACFC6C
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08ACFC78
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 7, 0	@08ACFC84
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 3, 4, 0	@08ACFC90
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFC9C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFCA8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFCB4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFCC0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFCCC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFCD8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFCE4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFCF0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFCFC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFD08
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFD14
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFD20
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFD2C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFD38
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFD44
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFD50
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFD5C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFD68
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFD74
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFD80
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFD8C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFD98
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFDA4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFDB0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFDBC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFDC8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFDD4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFDE0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFDEC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFDF8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFE04
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFE10
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFE1C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFE28
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFE34
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFE40
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFE4C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFE58
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFE64
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFE70
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFE7C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFE88
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFE94
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFEA0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFEAC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFEB8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFEC4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFED0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFEDC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFEE8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFEF4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFF00
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFF0C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFF18
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFF24
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFF30
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFF3C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFF48
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFF54
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFF60
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFF6C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFF78
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFF84
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFF90
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFF9C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFFA8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFFB4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFFC0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFFCC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFFD8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFFE4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFFF0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08ACFFFC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0008
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0014
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0020
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD002C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0038
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0044
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0050
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD005C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0068
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0074
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0080
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD008C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0098
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD00A4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD00B0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD00BC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD00C8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD00D4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD00E0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD00EC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD00F8
+mAlignWord
 	voice_keysplit_all voicegroup012	@08AD0104

sound/voicegroups/voicegroup009.inc

@@ -1,131 +1,259 @@
 	mAlignWord
 	.global voicegroup009
 voicegroup009:	@ 0x08AD0110
+mAlignWord
 	voice_square_1_alt 0, 0, 0, 0, 15, 0	@08AD0110
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 0, 15, 0	@08AD011C
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 15, 0	@08AD0128
+mAlignWord
 	voice_square_1_alt 0, 3, 0, 0, 15, 0	@08AD0134
+mAlignWord
 	voice_square_1_alt 0, 2, 2, 0, 15, 0	@08AD0140
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD014C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0158
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0164
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0170
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD017C
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 0	@08AD0188
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08AD0194
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD01A0
+mAlignWord
 	voice_square_2_alt 3, 0, 0, 15, 0	@08AD01AC
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08AD01B8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD01C4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD01D0
+mAlignWord
 	voice_square_2_alt 0, 0, 3, 0, 2	@08AD01DC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 4, 0	@08AD01E8
+mAlignWord
 	voice_square_2_alt 2, 0, 2, 2, 0	@08AD01F4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_22, 255, 0, 255, 149	@08AD0200
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_81, 255, 0, 255, 149	@08AD020C
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 0, 10, 3	@08AD0218
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 7, 0	@08AD0224
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD0230
+mAlignWord
 	voice_square_1_alt 0, 2, 2, 0, 9, 6	@08AD023C
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08AD0248
+mAlignWord
 	voice_square_2_alt 2, 0, 4, 0, 6	@08AD0254
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08AD0260
+mAlignWord
 	voice_square_2_alt 2, 0, 4, 13, 6	@08AD026C
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 2, 0, 0	@08AD0278
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 0, 15, 0	@08AD0284
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08AD0290
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 4	@08AD029C
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08AD02A8
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 6, 0, 6	@08AD02B4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 2, 0, 15, 0	@08AD02C0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 2	@08AD02CC
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD02D8
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08AD02E4
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 6, 0, 6	@08AD02F0
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 6, 0, 6	@08AD02FC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08AD0308
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08AD0314
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 0, 10, 3	@08AD0320
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08AD032C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 4	@08AD0338
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 6, 0, 6	@08AD0344
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 6, 0, 6	@08AD0350
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 0, 10, 3	@08AD035C
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08AD0368
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 4	@08AD0374
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 0, 10, 3	@08AD0380
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08AD038C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 3	@08AD0398
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD03A4
+mAlignWord
 	voice_square_1_alt 0, 1, 2, 0, 10, 3	@08AD03B0
+mAlignWord
 	voice_noise 60, 0, 0, 0, 1, 0, 15, 0	@08AD03BC
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08AD03C8
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08AD03D4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_78, 255, 0, 255, 0	@08AD03E0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_79, 255, 0, 255, 0	@08AD03EC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_82, 255, 0, 255, 0	@08AD03F8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_83, 255, 0, 255, 0	@08AD0404
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_80, 255, 0, 255, 0	@08AD0410
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_78, 255, 0, 255, 0	@08AD041C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_79, 255, 0, 255, 0	@08AD0428
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_82, 255, 250, 18, 250	@08AD0434
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_83, 255, 250, 18, 250	@08AD0440
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_80, 255, 250, 18, 250	@08AD044C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_1, 255, 0, 255, 0	@08AD0458
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_2, 255, 0, 255, 0	@08AD0464
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_3, 255, 0, 255, 0	@08AD0470
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_4, 255, 0, 255, 0	@08AD047C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08AD0488
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_6, 255, 0, 255, 127	@08AD0494
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_7, 255, 0, 255, 0	@08AD04A0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_8, 255, 235, 38, 165	@08AD04AC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_9, 255, 0, 255, 127	@08AD04B8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_10, 255, 0, 255, 0	@08AD04C4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_11, 255, 0, 255, 0	@08AD04D0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_12, 255, 0, 255, 127	@08AD04DC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_13, 255, 0, 255, 127	@08AD04E8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD04F4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0500
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD050C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0518
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 1	@08AD0524
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0530
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD053C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_19, 255, 0, 255, 0	@08AD0548
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_20, 255, 0, 255, 0	@08AD0554
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_21, 255, 0, 255, 0	@08AD0560
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD056C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0578
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0584
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0590
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD059C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD05A8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD05B4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD05C0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD05CC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD05D8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD05E4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD05F0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD05FC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0608
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_84, 255, 0, 255, 0	@08AD0614
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_85, 255, 0, 255, 0	@08AD0620
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_86, 255, 0, 255, 0	@08AD062C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_87, 255, 0, 255, 0	@08AD0638
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_88, 255, 0, 255, 0	@08AD0644
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_89, 255, 0, 255, 0	@08AD0650
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_90, 255, 0, 255, 0	@08AD065C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_91, 255, 0, 255, 0	@08AD0668
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_92, 255, 0, 255, 0	@08AD0674
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_60, 255, 0, 255, 0	@08AD0680
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_61, 255, 0, 255, 0	@08AD068C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08AD0698
+mAlignWord
 	voice_noise 60, 0, 0, 0, 1, 0, 15, 2	@08AD06A4
+mAlignWord
 	voice_noise 60, 0, 0, 1, 1, 0, 12, 2	@08AD06B0
+mAlignWord
 	voice_square_1_alt 0, 2, 2, 0, 15, 0	@08AD06BC
+mAlignWord
 	voice_noise 60, 0, 0, 0, 1, 0, 15, 2	@08AD06C8
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08AD06D4
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 2	@08AD06E0
+mAlignWord
 	voice_square_1_alt 0, 2, 3, 0, 10, 3	@08AD06EC
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 2, 0, 0	@08AD06F8
+mAlignWord
 	voice_keysplit_all voicegroup012	@08AD0704

sound/voicegroups/voicegroup010.inc

@@ -1,131 +1,259 @@
 	mAlignWord
 	.global voicegroup010
 voicegroup010:	@ 0x08AD0710
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 3, 1, 3	@08AD0710
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD071C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 3, 0	@08AD0728
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08AD0734
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 15, 0	@08AD0740
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 4, 0	@08AD074C
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 0	@08AD0758
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 0, 10, 3	@08AD0764
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD0770
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 7, 0	@08AD077C
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 15, 0	@08AD0788
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 3, 4, 0	@08AD0794
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD07A0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 7, 0	@08AD07AC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 3, 0	@08AD07B8
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 0, 10, 3	@08AD07C4
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD07D0
+mAlignWord
 	voice_square_2_alt 2, 0, 3, 1, 2	@08AD07DC
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 0, 10, 3	@08AD07E8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 7, 0	@08AD07F4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_22, 255, 0, 255, 149	@08AD0800
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_81, 255, 0, 255, 149	@08AD080C
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 0, 10, 3	@08AD0818
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 0	@08AD0824
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 3	@08AD0830
+mAlignWord
 	voice_square_1_alt 0, 2, 2, 0, 9, 6	@08AD083C
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08AD0848
+mAlignWord
 	voice_square_2_alt 2, 0, 4, 0, 6	@08AD0854
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08AD0860
+mAlignWord
 	voice_square_2_alt 2, 0, 4, 13, 6	@08AD086C
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 2, 0, 0	@08AD0878
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 0, 15, 0	@08AD0884
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08AD0890
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 4	@08AD089C
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 6, 0, 6	@08AD08A8
+mAlignWord
 	voice_square_2_alt 1, 0, 6, 0, 6	@08AD08B4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 2, 0, 15, 0	@08AD08C0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 2	@08AD08CC
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD08D8
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08AD08E4
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 6, 0, 6	@08AD08F0
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 6, 0, 6	@08AD08FC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08AD0908
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08AD0914
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 0, 10, 3	@08AD0920
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08AD092C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 4	@08AD0938
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 6, 0, 6	@08AD0944
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 6, 0, 6	@08AD0950
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 0, 10, 3	@08AD095C
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08AD0968
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 4	@08AD0974
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 0, 10, 3	@08AD0980
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08AD098C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 3	@08AD0998
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD09A4
+mAlignWord
 	voice_square_1_alt 0, 1, 2, 0, 10, 3	@08AD09B0
+mAlignWord
 	voice_noise 60, 0, 0, 0, 1, 0, 15, 0	@08AD09BC
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08AD09C8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_93, 255, 0, 128, 235	@08AD09D4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_78, 255, 0, 255, 0	@08AD09E0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_79, 255, 0, 255, 0	@08AD09EC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_82, 255, 0, 255, 0	@08AD09F8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_83, 255, 0, 255, 0	@08AD0A04
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_80, 255, 0, 255, 0	@08AD0A10
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_78, 255, 0, 255, 0	@08AD0A1C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_79, 255, 0, 255, 0	@08AD0A28
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_82, 255, 250, 18, 250	@08AD0A34
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_83, 255, 250, 18, 250	@08AD0A40
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_80, 255, 250, 18, 250	@08AD0A4C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_1, 255, 0, 255, 0	@08AD0A58
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_2, 255, 0, 255, 0	@08AD0A64
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_3, 255, 0, 255, 0	@08AD0A70
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_4, 255, 0, 255, 0	@08AD0A7C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08AD0A88
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_6, 255, 0, 255, 127	@08AD0A94
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_7, 255, 0, 255, 0	@08AD0AA0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_8, 255, 235, 38, 165	@08AD0AAC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_9, 255, 0, 255, 127	@08AD0AB8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_10, 255, 0, 255, 0	@08AD0AC4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_11, 255, 0, 255, 0	@08AD0AD0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_12, 255, 0, 255, 127	@08AD0ADC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_13, 255, 0, 255, 127	@08AD0AE8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 3	@08AD0AF4
+mAlignWord
 	voice_square_2_alt 2, 0, 4, 10, 0	@08AD0B00
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 0, 10, 3	@08AD0B0C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0B18
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 1	@08AD0B24
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 6, 0, 2	@08AD0B30
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0B3C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_19, 255, 0, 255, 0	@08AD0B48
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_20, 255, 0, 255, 0	@08AD0B54
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_21, 255, 0, 255, 0	@08AD0B60
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 7, 2	@08AD0B6C
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 0, 10, 2	@08AD0B78
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 2	@08AD0B84
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 2, 9, 2	@08AD0B90
+mAlignWord
 	voice_square_2_alt 2, 1, 0, 10, 3	@08AD0B9C
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 4, 10, 0	@08AD0BA8
+mAlignWord
 	voice_square_2_alt 3, 1, 6, 0, 0	@08AD0BB4
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD0BC0
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 4, 0, 4	@08AD0BCC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 2, 9, 2	@08AD0BD8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 1, 2, 9, 2	@08AD0BE4
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 15, 0	@08AD0BF0
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD0BFC
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 4, 0, 4	@08AD0C08
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 2, 9, 2	@08AD0C14
+mAlignWord
 	voice_square_2_alt 2, 0, 4, 0, 4	@08AD0C20
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 4, 0, 4	@08AD0C2C
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD0C38
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 4, 0, 4	@08AD0C44
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 2, 9, 2	@08AD0C50
+mAlignWord
 	voice_square_2_alt 2, 1, 3, 3, 5	@08AD0C5C
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 3, 3, 5	@08AD0C68
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD0C74
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0C80
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0C8C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0C98
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0CA4
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 4, 0, 4	@08AD0CB0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 2, 9, 2	@08AD0CBC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 7, 2	@08AD0CC8
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 2	@08AD0CD4
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 0, 10, 2	@08AD0CE0
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08AD0CEC
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 0, 15, 0	@08AD0CF8
+mAlignWord
 	voice_keysplit_all voicegroup012	@08AD0D04

sound/voicegroups/voicegroup011.inc

@@ -1,95 +1,187 @@
 	mAlignWord
 	.global voicegroup011
 voicegroup011:	@ 0x08AD0D10
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08AD0D10
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 0, 15, 0	@08AD0D1C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08AD0D28
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_11, 255, 0, 255, 0	@08AD0D34
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_17, 255, 0, 255, 127	@08AD0D40
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 0, 15, 0	@08AD0D4C
+mAlignWord
 	voice_square_1_alt 0, 3, 0, 6, 1, 0	@08AD0D58
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_94, 255, 0, 255, 127	@08AD0D64
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_95, 255, 0, 255, 0	@08AD0D70
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_96, 255, 0, 255, 0	@08AD0D7C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_97, 255, 235, 25, 165	@08AD0D88
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 4, 3, 0	@08AD0D94
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0DA0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0DAC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0DB8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0DC4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0DD0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0DDC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0DE8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0DF4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0E00
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0E0C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0E18
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0E24
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0E30
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0E3C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0E48
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0E54
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0E60
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0E6C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0E78
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0E84
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0E90
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0E9C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0EA8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0EB4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0EC0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0ECC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0ED8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0EE4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0EF0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0EFC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0F08
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0F14
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0F20
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0F2C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0F38
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0F44
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0F50
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0F5C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0F68
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0F74
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0F80
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0F8C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0F98
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0FA4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0FB0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0FBC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0FC8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0FD4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0FE0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0FEC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD0FF8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1004
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1010
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD101C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1028
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1034
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1040
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD104C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1058
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1064
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1070
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD107C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1088
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1094
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD10A0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD10AC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD10B8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD10C4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD10D0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD10DC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD10E8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD10F4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1100
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD110C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1118
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1124
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1130
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD113C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1148
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1154

sound/voicegroups/voicegroup012.inc

@@ -1,86 +1,169 @@
 	mAlignWord
 	.global voicegroup012
 voicegroup012:	@ 0x08AD1160
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1160
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD116C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1178
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1184
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1190
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD119C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD11A8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD11B4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD11C0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD11CC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD11D8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD11E4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD11F0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD11FC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1208
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1214
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1220
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD122C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1238
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1244
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1250
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD125C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1268
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1274
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1280
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD128C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1298
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD12A4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD12B0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD12BC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD12C8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD12D4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD12E0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD12EC
+mAlignWord
 	voice_keysplit_all voicegroup004	@08AD12F8
+mAlignWord
 	voice_keysplit_all voicegroup012	@08AD1304
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_36, 255, 255, 255, 0	@08AD1310
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_37, 255, 0, 255, 0	@08AD131C
+mAlignWord
 	voice_noise 84, 0, 192, 0, 0, 1, 0, 0	@08AD1328
+mAlignWord
 	voice_noise 84, 0, 192, 0, 0, 2, 0, 0	@08AD1334
+mAlignWord
 	voice_noise 84, 0, 192, 0, 0, 3, 7, 0	@08AD1340
+mAlignWord
 	voice_directsound 45, 0, DirectSoundWaveData_38, 255, 0, 255, 0	@08AD134C
+mAlignWord
 	voice_directsound 50, 0, DirectSoundWaveData_38, 255, 0, 255, 0	@08AD1358
+mAlignWord
 	voice_directsound 55, 0, DirectSoundWaveData_38, 255, 0, 255, 0	@08AD1364
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_38, 255, 0, 255, 0	@08AD1370
+mAlignWord
 	voice_directsound 65, 0, DirectSoundWaveData_38, 255, 0, 255, 0	@08AD137C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_39, 255, 0, 255, 0	@08AD1388
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_40, 255, 0, 255, 0	@08AD1394
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_41, 255, 0, 255, 0	@08AD13A0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_42, 255, 0, 255, 0	@08AD13AC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_43, 255, 0, 255, 0	@08AD13B8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_44, 255, 0, 255, 0	@08AD13C4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_45, 255, 0, 255, 0	@08AD13D0
+mAlignWord
 	voice_directsound 57, 0, DirectSoundWaveData_42, 255, 0, 255, 0	@08AD13DC
+mAlignWord
 	voice_directsound 59, 0, DirectSoundWaveData_42, 255, 0, 255, 0	@08AD13E8
+mAlignWord
 	voice_directsound 61, 0, DirectSoundWaveData_42, 255, 0, 255, 0	@08AD13F4
+mAlignWord
 	voice_directsound 45, 0, DirectSoundWaveData_46, 255, 0, 255, 0	@08AD1400
+mAlignWord
 	voice_directsound 50, 0, DirectSoundWaveData_46, 255, 0, 255, 0	@08AD140C
+mAlignWord
 	voice_directsound 55, 0, DirectSoundWaveData_46, 255, 0, 255, 0	@08AD1418
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_46, 255, 0, 255, 0	@08AD1424
+mAlignWord
 	voice_directsound 65, 0, DirectSoundWaveData_46, 255, 0, 255, 0	@08AD1430
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD143C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1448
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1454
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1460
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD146C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1478
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1484
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1490
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD149C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD14A8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD14B4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD14C0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD14CC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD14D8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD14E4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD14F0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD14FC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1508
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1514
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1520
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD152C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_47, 255, 0, 255, 0	@08AD1538

sound/voicegroups/voicegroup013.inc

@@ -1,131 +1,259 @@
 	mAlignWord
 	.global voicegroup013
 voicegroup013:	@ 0x08AD1544
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 3, 1, 3	@08AD1544
+mAlignWord
 	voice_square_2_alt 2, 0, 4, 4, 6	@08AD1550
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 3, 0	@08AD155C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08AD1568
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_98, 255, 250, 18, 250	@08AD1574
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 15, 0	@08AD1580
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08AD158C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 3, 0	@08AD1598
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_26, 255, 0, 255, 165	@08AD15A4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_11, 255, 0, 255, 0	@08AD15B0
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 6, 0, 3	@08AD15BC
+mAlignWord
 	voice_square_2_alt 2, 1, 6, 0, 4	@08AD15C8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 13, 0	@08AD15D4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08AD15E0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_82, 255, 250, 18, 250	@08AD15EC
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 6, 7, 3	@08AD15F8
+mAlignWord
 	voice_square_2_alt 2, 1, 6, 7, 4	@08AD1604
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1610
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD161C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_99, 255, 0, 255, 127	@08AD1628
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 3, 0	@08AD1634
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 6, 0, 3	@08AD1640
+mAlignWord
 	voice_square_2_alt 2, 1, 6, 0, 4	@08AD164C
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 6, 7, 3	@08AD1658
+mAlignWord
 	voice_square_2_alt 2, 1, 6, 7, 4	@08AD1664
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_100, 255, 0, 255, 0	@08AD1670
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_20, 255, 0, 255, 0	@08AD167C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_78, 255, 0, 255, 0	@08AD1688
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08AD1694
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08AD16A0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_11, 255, 0, 255, 0	@08AD16AC
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 7, 0	@08AD16B8
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 7, 0	@08AD16C4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 1	@08AD16D0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08AD16DC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_20, 255, 0, 255, 0	@08AD16E8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_26, 255, 0, 255, 165	@08AD16F4
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 0, 13, 1	@08AD1700
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 13, 1	@08AD170C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_100, 255, 0, 255, 0	@08AD1718
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_11, 255, 0, 255, 0	@08AD1724
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 7, 0	@08AD1730
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 7, 0	@08AD173C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 3	@08AD1748
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_80, 255, 0, 255, 0	@08AD1754
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_26, 255, 0, 255, 165	@08AD1760
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_98, 255, 250, 18, 250	@08AD176C
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 3, 1, 3	@08AD1778
+mAlignWord
 	voice_square_2_alt 1, 0, 4, 4, 6	@08AD1784
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1790
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD179C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08AD17A8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 3	@08AD17B4
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 7, 0	@08AD17C0
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 7, 0	@08AD17CC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_11, 255, 0, 255, 0	@08AD17D8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_93, 255, 0, 128, 235	@08AD17E4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_12, 255, 0, 255, 127	@08AD17F0
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 3, 1, 3	@08AD17FC
+mAlignWord
 	voice_square_2_alt 2, 0, 3, 1, 3	@08AD1808
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1814
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 6, 7, 3	@08AD1820
+mAlignWord
 	voice_square_2_alt 2, 1, 6, 7, 4	@08AD182C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 3	@08AD1838
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_20, 255, 0, 255, 0	@08AD1844
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_78, 255, 0, 255, 0	@08AD1850
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_80, 255, 0, 255, 0	@08AD185C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_100, 255, 0, 255, 0	@08AD1868
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08AD1874
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_82, 255, 0, 255, 0	@08AD1880
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_11, 255, 0, 255, 0	@08AD188C
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 7, 0	@08AD1898
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 7, 0	@08AD18A4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 1	@08AD18B0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08AD18BC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_20, 255, 0, 255, 0	@08AD18C8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_26, 255, 0, 255, 165	@08AD18D4
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 0, 13, 1	@08AD18E0
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 13, 1	@08AD18EC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_100, 255, 0, 255, 0	@08AD18F8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_11, 255, 0, 255, 0	@08AD1904
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 7, 0	@08AD1910
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 7, 0	@08AD191C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 1, 1	@08AD1928
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08AD1934
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_20, 255, 0, 255, 0	@08AD1940
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_26, 255, 0, 255, 165	@08AD194C
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 0, 13, 1	@08AD1958
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 13, 1	@08AD1964
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_100, 255, 0, 255, 0	@08AD1970
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_19, 255, 0, 255, 127	@08AD197C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1988
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1994
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD19A0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD19AC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD19B8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD19C4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD19D0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD19DC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD19E8
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD19F4
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 4, 0, 4	@08AD1A00
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 2, 9, 2	@08AD1A0C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 1, 2, 9, 2	@08AD1A18
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 15, 0	@08AD1A24
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD1A30
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 4, 0, 4	@08AD1A3C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 2, 9, 2	@08AD1A48
+mAlignWord
 	voice_square_2_alt 2, 0, 4, 0, 4	@08AD1A54
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 4, 0, 4	@08AD1A60
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD1A6C
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 4, 0, 4	@08AD1A78
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 2, 9, 2	@08AD1A84
+mAlignWord
 	voice_square_2_alt 2, 1, 3, 3, 5	@08AD1A90
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 3, 3, 5	@08AD1A9C
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD1AA8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1AB4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1AC0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1ACC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1AD8
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 4, 0, 4	@08AD1AE4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 2, 9, 2	@08AD1AF0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 3, 7, 2	@08AD1AFC
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 2	@08AD1B08
+mAlignWord
 	voice_square_1_alt 0, 2, 1, 0, 10, 2	@08AD1B14
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 6	@08AD1B20
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 0, 15, 0	@08AD1B2C
+mAlignWord
 	voice_keysplit_all voicegroup012	@08AD1B38

sound/voicegroups/voicegroup014.inc

@@ -1,95 +1,187 @@
 	mAlignWord
 	.global voicegroup014
 voicegroup014:	@ 0x08AD1B44
+mAlignWord
 	voice_square_1_alt 0, 0, 0, 0, 15, 0	@08AD1B44
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 0, 15, 0	@08AD1B50
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 15, 0	@08AD1B5C
+mAlignWord
 	voice_square_1_alt 0, 3, 0, 0, 15, 0	@08AD1B68
+mAlignWord
 	voice_square_1_alt 0, 2, 2, 0, 15, 0	@08AD1B74
+mAlignWord
 	voice_noise_alt 60, 0, 0, 0, 0, 0, 15, 0	@08AD1B80
+mAlignWord
 	voice_noise_alt 60, 0, 0, 1, 0, 0, 15, 0	@08AD1B8C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1B98
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1BA4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1BB0
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 0	@08AD1BBC
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08AD1BC8
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD1BD4
+mAlignWord
 	voice_square_2_alt 3, 0, 0, 15, 0	@08AD1BE0
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08AD1BEC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1BF8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1C04
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1C10
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1C1C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1C28
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1C34
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1C40
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1C4C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1C58
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1C64
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1C70
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1C7C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1C88
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1C94
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1CA0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1CAC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1CB8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1CC4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1CD0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1CDC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1CE8
+mAlignWord
 	voice_square_1_alt 0, 1, 1, 0, 15, 0	@08AD1CF4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1D00
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1D0C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1D18
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 4, 4, 0	@08AD1D24
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_3, 0, 0, 15, 0	@08AD1D30
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_4, 0, 0, 15, 0	@08AD1D3C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_5, 0, 0, 15, 0	@08AD1D48
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 0, 15, 0	@08AD1D54
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08AD1D60
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08AD1D6C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 0, 15, 0	@08AD1D78
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 3, 0, 2	@08AD1D84
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 4, 3, 0	@08AD1D90
+mAlignWord
 	voice_square_1_alt 0, 3, 0, 6, 1, 0	@08AD1D9C
+mAlignWord
 	voice_square_1_alt 0, 2, 2, 0, 15, 2	@08AD1DA8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 2, 0, 15, 2	@08AD1DB4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_3, 0, 4, 3, 0	@08AD1DC0
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 6, 0, 0	@08AD1DCC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 3, 6, 4, 2	@08AD1DD8
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 6, 1, 0	@08AD1DE4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1DF0
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 0	@08AD1DFC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_101, 255, 0, 255, 127	@08AD1E08
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_102, 255, 0, 255, 127	@08AD1E14
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_103, 255, 0, 255, 127	@08AD1E20
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_104, 255, 0, 255, 127	@08AD1E2C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08AD1E38
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_9, 255, 0, 255, 127	@08AD1E44
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_105, 255, 249, 0, 127	@08AD1E50
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_95, 255, 0, 255, 127	@08AD1E5C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_96, 255, 0, 255, 127	@08AD1E68
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_106, 255, 0, 255, 127	@08AD1E74
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_105, 26, 0, 255, 188	@08AD1E80
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_107, 255, 235, 128, 127	@08AD1E8C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_108, 255, 249, 51, 127	@08AD1E98
+mAlignWord
 	voice_square_1_alt 0, 3, 0, 6, 6, 0	@08AD1EA4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_109, 26, 0, 255, 188	@08AD1EB0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 3, 3, 0	@08AD1EBC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 4, 7, 0	@08AD1EC8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_110, 255, 0, 255, 0	@08AD1ED4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_111, 255, 249, 25, 0	@08AD1EE0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_112, 255, 249, 25, 127	@08AD1EEC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_94, 255, 0, 255, 127	@08AD1EF8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1F04
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1F10
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_13, 255, 0, 255, 127	@08AD1F1C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1F28
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_14, 255, 246, 64, 149	@08AD1F34
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1F40
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1F4C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_17, 255, 0, 255, 127	@08AD1F58
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_113, 255, 0, 255, 127	@08AD1F64
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08AD1F70
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_19, 255, 0, 255, 127	@08AD1F7C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_20, 255, 231, 0, 188	@08AD1F88

sound/voicegroups/voicegroup015.inc

@@ -1,34 +1,65 @@
 	mAlignWord
 	.global voicegroup015
 voicegroup015:	@ 0x08AD1F94
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1F94
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_25, 255, 0, 255, 149	@08AD1FA0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD1FAC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_24, 255, 0, 255, 149	@08AD1FB8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_114, 255, 249, 90, 165	@08AD1FC4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_26, 19, 0, 255, 165	@08AD1FD0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_26, 255, 0, 255, 165	@08AD1FDC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_115, 255, 0, 255, 127	@08AD1FE8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_116, 255, 0, 255, 127	@08AD1FF4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_117, 255, 0, 255, 127	@08AD2000
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_97, 255, 235, 25, 165	@08AD200C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 4, 4, 0	@08AD2018
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2024
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2030
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD203C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2048
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2054
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2060
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_118, 255, 0, 255, 127	@08AD206C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_119, 255, 0, 255, 127	@08AD2078
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_120, 255, 0, 255, 127	@08AD2084
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_121, 255, 0, 255, 127	@08AD2090
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_122, 255, 0, 255, 127	@08AD209C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD20A8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD20B4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD20C0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD20CC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD20D8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD20E4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD20F0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD20FC

sound/voicegroups/voicegroup016.inc

@@ -1,95 +1,187 @@
 	mAlignWord
 	.global voicegroup016
 voicegroup016:	@ 0x08AD2108
+mAlignWord
 	voice_keysplit_all voicegroup019	@08AD2108
+mAlignWord
 	voice_keysplit_all voicegroup018	@08AD2114
+mAlignWord
 	voice_keysplit_all voicegroup017	@08AD2120
+mAlignWord
 	voice_keysplit_all voicegroup016	@08AD212C
+mAlignWord
 	voice_keysplit_all voicegroup015	@08AD2138
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_36, 255, 255, 255, 0	@08AD2144
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_37, 255, 0, 255, 0	@08AD2150
+mAlignWord
 	voice_noise 84, 0, 192, 0, 0, 1, 0, 0	@08AD215C
+mAlignWord
 	voice_noise 84, 0, 192, 0, 0, 2, 0, 0	@08AD2168
+mAlignWord
 	voice_noise 84, 0, 192, 0, 0, 3, 7, 0	@08AD2174
+mAlignWord
 	voice_directsound 45, 0, DirectSoundWaveData_38, 255, 0, 255, 0	@08AD2180
+mAlignWord
 	voice_directsound 50, 0, DirectSoundWaveData_38, 255, 0, 255, 0	@08AD218C
+mAlignWord
 	voice_directsound 55, 0, DirectSoundWaveData_38, 255, 0, 255, 0	@08AD2198
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_38, 255, 0, 255, 0	@08AD21A4
+mAlignWord
 	voice_directsound 65, 0, DirectSoundWaveData_38, 255, 0, 255, 0	@08AD21B0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_39, 255, 0, 255, 0	@08AD21BC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_40, 255, 0, 255, 0	@08AD21C8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_41, 255, 0, 255, 0	@08AD21D4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_42, 255, 0, 255, 0	@08AD21E0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_43, 255, 0, 255, 0	@08AD21EC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_44, 255, 0, 255, 0	@08AD21F8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_45, 255, 0, 255, 0	@08AD2204
+mAlignWord
 	voice_directsound 57, 0, DirectSoundWaveData_42, 255, 0, 255, 0	@08AD2210
+mAlignWord
 	voice_directsound 59, 0, DirectSoundWaveData_42, 255, 0, 255, 0	@08AD221C
+mAlignWord
 	voice_directsound 61, 0, DirectSoundWaveData_42, 255, 0, 255, 0	@08AD2228
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2234
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2240
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD224C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2258
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2264
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_123, 255, 0, 255, 0	@08AD2270
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_124, 255, 242, 51, 0	@08AD227C
+mAlignWord
 	voice_directsound 70, 0, DirectSoundWaveData_125, 255, 0, 255, 0	@08AD2288
+mAlignWord
 	voice_directsound 64, 0, DirectSoundWaveData_126, 255, 0, 255, 0	@08AD2294
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD22A0
+mAlignWord
 	voice_directsound 64, 0, DirectSoundWaveData_127, 255, 0, 255, 0	@08AD22AC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_128, 255, 0, 255, 0	@08AD22B8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_129, 255, 0, 255, 0	@08AD22C4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_130, 255, 0, 255, 0	@08AD22D0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_131, 255, 0, 255, 0	@08AD22DC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_132, 255, 0, 255, 0	@08AD22E8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD22F4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2300
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD230C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_133, 255, 0, 255, 0	@08AD2318
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_134, 255, 0, 255, 0	@08AD2324
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_135, 255, 0, 255, 0	@08AD2330
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_136, 255, 0, 255, 0	@08AD233C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_137, 255, 0, 255, 0	@08AD2348
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_138, 255, 0, 255, 0	@08AD2354
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_139, 255, 0, 255, 0	@08AD2360
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_140, 255, 0, 255, 0	@08AD236C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_141, 255, 0, 255, 0	@08AD2378
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_142, 255, 0, 255, 0	@08AD2384
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_143, 255, 0, 255, 0	@08AD2390
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_144, 255, 0, 255, 0	@08AD239C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_145, 255, 0, 255, 0	@08AD23A8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_146, 255, 0, 255, 0	@08AD23B4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_147, 255, 0, 255, 0	@08AD23C0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_148, 255, 0, 255, 0	@08AD23CC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_149, 255, 0, 255, 0	@08AD23D8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_150, 255, 0, 255, 0	@08AD23E4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_151, 255, 0, 255, 0	@08AD23F0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_152, 255, 0, 255, 0	@08AD23FC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_153, 255, 0, 255, 0	@08AD2408
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2414
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2420
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD242C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_154, 255, 0, 255, 0	@08AD2438
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_155, 255, 0, 255, 0	@08AD2444
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_156, 255, 0, 255, 0	@08AD2450
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_157, 255, 0, 255, 0	@08AD245C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_158, 255, 0, 255, 0	@08AD2468
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_159, 255, 0, 255, 0	@08AD2474
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_160, 255, 0, 255, 0	@08AD2480
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_161, 255, 0, 255, 0	@08AD248C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_162, 255, 0, 255, 0	@08AD2498
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_163, 255, 0, 255, 0	@08AD24A4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_164, 255, 0, 255, 0	@08AD24B0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_165, 255, 0, 255, 0	@08AD24BC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_166, 255, 0, 255, 0	@08AD24C8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_167, 255, 0, 255, 0	@08AD24D4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_168, 255, 0, 255, 0	@08AD24E0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD24EC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD24F8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2504
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2510
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD251C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2528
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2534
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2540
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD254C

sound/voicegroups/voicegroup017.inc

@@ -1,87 +1,171 @@
 	mAlignWord
 	.global voicegroup017
 voicegroup017:	@ 0x08AD2558
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2558
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2564
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2570
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD257C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2588
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2594
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD25A0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_169, 255, 0, 255, 0	@08AD25AC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_170, 255, 0, 255, 0	@08AD25B8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_171, 255, 0, 255, 0	@08AD25C4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_172, 255, 0, 255, 0	@08AD25D0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_173, 255, 0, 255, 0	@08AD25DC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_174, 255, 0, 255, 0	@08AD25E8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_175, 255, 0, 255, 0	@08AD25F4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_176, 255, 0, 255, 0	@08AD2600
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_177, 255, 0, 255, 0	@08AD260C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_178, 255, 0, 255, 0	@08AD2618
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_179, 255, 0, 255, 0	@08AD2624
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_180, 255, 0, 255, 0	@08AD2630
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_181, 255, 0, 255, 0	@08AD263C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_182, 255, 0, 255, 0	@08AD2648
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_183, 255, 0, 255, 0	@08AD2654
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_184, 255, 0, 255, 0	@08AD2660
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_185, 255, 0, 255, 0	@08AD266C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_186, 255, 0, 255, 0	@08AD2678
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_187, 255, 0, 255, 0	@08AD2684
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_188, 255, 0, 255, 0	@08AD2690
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_189, 255, 0, 255, 0	@08AD269C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_190, 255, 0, 255, 0	@08AD26A8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_191, 255, 0, 255, 0	@08AD26B4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_192, 255, 0, 255, 0	@08AD26C0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_193, 255, 0, 255, 0	@08AD26CC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_194, 255, 0, 255, 0	@08AD26D8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_195, 255, 0, 255, 0	@08AD26E4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_196, 255, 0, 255, 0	@08AD26F0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_197, 255, 0, 255, 0	@08AD26FC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_198, 255, 0, 255, 0	@08AD2708
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_199, 255, 0, 255, 0	@08AD2714
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_200, 255, 0, 255, 0	@08AD2720
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_201, 255, 0, 255, 0	@08AD272C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_202, 255, 0, 255, 0	@08AD2738
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_203, 255, 0, 255, 0	@08AD2744
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_204, 255, 0, 255, 0	@08AD2750
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_205, 255, 0, 255, 0	@08AD275C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_206, 255, 0, 255, 0	@08AD2768
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_207, 255, 0, 255, 0	@08AD2774
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_208, 255, 0, 255, 0	@08AD2780
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_209, 255, 0, 255, 0	@08AD278C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_210, 255, 0, 255, 0	@08AD2798
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_211, 255, 0, 255, 0	@08AD27A4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_212, 255, 0, 255, 0	@08AD27B0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_213, 255, 0, 255, 0	@08AD27BC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD27C8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD27D4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD27E0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD27EC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD27F8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2804
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2810
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD281C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2828
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2834
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2840
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_214, 255, 0, 255, 0	@08AD284C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_215, 255, 0, 255, 0	@08AD2858
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_216, 255, 0, 255, 0	@08AD2864
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_217, 255, 0, 255, 0	@08AD2870
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_218, 255, 0, 255, 0	@08AD287C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_219, 255, 0, 255, 0	@08AD2888
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_220, 255, 0, 255, 0	@08AD2894
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_221, 255, 0, 255, 0	@08AD28A0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_222, 255, 0, 255, 0	@08AD28AC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_223, 255, 0, 255, 0	@08AD28B8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_224, 255, 0, 255, 0	@08AD28C4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_225, 255, 0, 255, 0	@08AD28D0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_226, 255, 0, 255, 0	@08AD28DC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_227, 255, 0, 255, 0	@08AD28E8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_228, 255, 0, 255, 0	@08AD28F4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_229, 255, 0, 255, 0	@08AD2900
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_230, 255, 0, 255, 0	@08AD290C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_231, 255, 0, 255, 0	@08AD2918
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_232, 255, 0, 255, 0	@08AD2924
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_233, 255, 0, 255, 0	@08AD2930
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_234, 255, 0, 255, 0	@08AD293C

sound/voicegroups/voicegroup018.inc

@@ -1,34 +1,65 @@
 	mAlignWord
 	.global voicegroup018
 voicegroup018:	@ 0x08AD2948
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_235, 255, 0, 255, 0	@08AD2948
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_236, 255, 0, 255, 0	@08AD2954
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_237, 255, 0, 255, 0	@08AD2960
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_238, 255, 0, 255, 0	@08AD296C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_239, 255, 0, 255, 0	@08AD2978
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_240, 255, 0, 255, 0	@08AD2984
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_241, 255, 0, 255, 0	@08AD2990
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_242, 255, 0, 255, 0	@08AD299C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_243, 255, 0, 255, 0	@08AD29A8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_244, 255, 0, 255, 0	@08AD29B4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_245, 255, 0, 255, 0	@08AD29C0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_246, 255, 0, 255, 0	@08AD29CC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_247, 255, 0, 255, 0	@08AD29D8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_248, 255, 0, 255, 0	@08AD29E4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_249, 255, 0, 255, 0	@08AD29F0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_250, 255, 0, 255, 0	@08AD29FC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_251, 255, 0, 255, 0	@08AD2A08
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_252, 255, 0, 255, 0	@08AD2A14
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_253, 255, 0, 255, 0	@08AD2A20
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_254, 255, 0, 255, 0	@08AD2A2C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_255, 255, 0, 255, 0	@08AD2A38
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_256, 255, 0, 255, 0	@08AD2A44
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_257, 255, 0, 255, 0	@08AD2A50
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_258, 255, 0, 255, 0	@08AD2A5C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_259, 255, 0, 255, 0	@08AD2A68
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_260, 255, 0, 255, 0	@08AD2A74
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_261, 255, 0, 255, 0	@08AD2A80
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_262, 255, 0, 255, 0	@08AD2A8C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_263, 255, 0, 255, 0	@08AD2A98
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_264, 255, 0, 255, 0	@08AD2AA4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_265, 255, 0, 255, 0	@08AD2AB0

sound/voicegroups/voicegroup019.inc

@@ -1,131 +1,259 @@
 	mAlignWord
 	.global voicegroup019
 voicegroup019:	@ 0x08AD2ABC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_266, 255, 0, 255, 0	@08AD2ABC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_267, 255, 0, 255, 0	@08AD2AC8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_268, 255, 0, 255, 0	@08AD2AD4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_269, 255, 0, 255, 0	@08AD2AE0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_270, 255, 0, 255, 0	@08AD2AEC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_271, 255, 0, 255, 0	@08AD2AF8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_272, 255, 0, 255, 0	@08AD2B04
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_273, 255, 0, 255, 0	@08AD2B10
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_274, 255, 0, 255, 0	@08AD2B1C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_275, 255, 0, 255, 0	@08AD2B28
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_276, 255, 0, 255, 0	@08AD2B34
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_277, 255, 0, 255, 0	@08AD2B40
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_278, 255, 0, 255, 0	@08AD2B4C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_279, 255, 0, 255, 0	@08AD2B58
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_280, 255, 0, 255, 0	@08AD2B64
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_281, 255, 0, 255, 0	@08AD2B70
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_282, 255, 0, 255, 0	@08AD2B7C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_283, 255, 0, 255, 0	@08AD2B88
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_284, 255, 0, 255, 0	@08AD2B94
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_285, 255, 0, 255, 0	@08AD2BA0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_286, 255, 0, 255, 0	@08AD2BAC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_287, 255, 0, 255, 0	@08AD2BB8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_288, 255, 0, 255, 0	@08AD2BC4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_289, 255, 0, 255, 0	@08AD2BD0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_290, 255, 0, 255, 0	@08AD2BDC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_291, 255, 0, 255, 0	@08AD2BE8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_292, 255, 0, 255, 0	@08AD2BF4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_293, 255, 0, 255, 0	@08AD2C00
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_294, 255, 0, 255, 0	@08AD2C0C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_295, 255, 0, 255, 0	@08AD2C18
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_296, 255, 0, 255, 0	@08AD2C24
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_297, 255, 0, 255, 0	@08AD2C30
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_298, 255, 0, 255, 0	@08AD2C3C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_299, 255, 0, 255, 0	@08AD2C48
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_300, 255, 0, 255, 0	@08AD2C54
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_301, 255, 0, 255, 0	@08AD2C60
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_302, 255, 0, 255, 0	@08AD2C6C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_303, 255, 0, 255, 0	@08AD2C78
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_304, 255, 0, 255, 0	@08AD2C84
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_305, 255, 0, 255, 0	@08AD2C90
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_306, 255, 0, 255, 0	@08AD2C9C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_307, 255, 0, 255, 0	@08AD2CA8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_308, 255, 0, 255, 0	@08AD2CB4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_309, 255, 0, 255, 0	@08AD2CC0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_310, 255, 0, 255, 0	@08AD2CCC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_311, 255, 0, 255, 0	@08AD2CD8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_312, 255, 0, 255, 0	@08AD2CE4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_313, 255, 0, 255, 0	@08AD2CF0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_314, 255, 0, 255, 0	@08AD2CFC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_315, 255, 0, 255, 0	@08AD2D08
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_316, 255, 0, 255, 0	@08AD2D14
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_317, 255, 0, 255, 0	@08AD2D20
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_318, 255, 0, 255, 0	@08AD2D2C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_319, 255, 0, 255, 0	@08AD2D38
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_320, 255, 0, 255, 0	@08AD2D44
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_321, 255, 0, 255, 0	@08AD2D50
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_322, 255, 0, 255, 0	@08AD2D5C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_323, 255, 0, 255, 0	@08AD2D68
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_324, 255, 0, 255, 0	@08AD2D74
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_325, 255, 0, 255, 0	@08AD2D80
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_326, 255, 0, 255, 0	@08AD2D8C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_327, 255, 0, 255, 0	@08AD2D98
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_328, 255, 0, 255, 0	@08AD2DA4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_329, 255, 0, 255, 0	@08AD2DB0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_330, 255, 0, 255, 0	@08AD2DBC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_331, 255, 0, 255, 0	@08AD2DC8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_332, 255, 0, 255, 0	@08AD2DD4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_333, 255, 0, 255, 0	@08AD2DE0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_334, 255, 0, 255, 0	@08AD2DEC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_335, 255, 0, 255, 0	@08AD2DF8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_336, 255, 0, 255, 0	@08AD2E04
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_337, 255, 0, 255, 0	@08AD2E10
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_338, 255, 0, 255, 0	@08AD2E1C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_339, 255, 0, 255, 0	@08AD2E28
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_340, 255, 0, 255, 0	@08AD2E34
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_341, 255, 0, 255, 0	@08AD2E40
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_342, 255, 0, 255, 0	@08AD2E4C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_343, 255, 0, 255, 0	@08AD2E58
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_344, 255, 0, 255, 0	@08AD2E64
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_345, 255, 0, 255, 0	@08AD2E70
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_346, 255, 0, 255, 0	@08AD2E7C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_347, 255, 0, 255, 0	@08AD2E88
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_348, 255, 0, 255, 0	@08AD2E94
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_349, 255, 0, 255, 0	@08AD2EA0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_350, 255, 0, 255, 0	@08AD2EAC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_351, 255, 0, 255, 0	@08AD2EB8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_352, 255, 0, 255, 0	@08AD2EC4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_353, 255, 0, 255, 0	@08AD2ED0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_354, 255, 0, 255, 0	@08AD2EDC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2EE8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2EF4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2F00
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2F0C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2F18
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2F24
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2F30
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2F3C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2F48
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD2F54
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_169, 255, 0, 255, 0	@08AD2F60
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_170, 255, 0, 255, 0	@08AD2F6C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_171, 255, 0, 255, 0	@08AD2F78
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_172, 255, 0, 255, 0	@08AD2F84
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_173, 255, 0, 255, 0	@08AD2F90
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_174, 255, 0, 255, 0	@08AD2F9C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_175, 255, 0, 255, 0	@08AD2FA8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_176, 255, 0, 255, 0	@08AD2FB4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_177, 255, 0, 255, 0	@08AD2FC0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_178, 255, 0, 255, 0	@08AD2FCC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_179, 255, 0, 255, 0	@08AD2FD8
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_180, 255, 0, 255, 0	@08AD2FE4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_181, 255, 0, 255, 0	@08AD2FF0
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_182, 255, 0, 255, 0	@08AD2FFC
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_183, 255, 0, 255, 0	@08AD3008
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_184, 255, 0, 255, 0	@08AD3014
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_185, 255, 0, 255, 0	@08AD3020
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_186, 255, 0, 255, 0	@08AD302C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_187, 255, 0, 255, 0	@08AD3038
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_188, 255, 0, 255, 0	@08AD3044
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_189, 255, 0, 255, 0	@08AD3050
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_190, 255, 0, 255, 0	@08AD305C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_191, 255, 0, 255, 0	@08AD3068
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_192, 255, 0, 255, 0	@08AD3074
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_193, 255, 0, 255, 0	@08AD3080
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_194, 255, 0, 255, 0	@08AD308C
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_195, 255, 0, 255, 0	@08AD3098
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_196, 255, 0, 255, 0	@08AD30A4
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_197, 255, 0, 255, 0	@08AD30B0

sound/voicegroups/voicegroup020.inc

@@ -1,131 +1,259 @@
 	mAlignWord
 	.global voicegroup020
 voicegroup020:	@ 0x08AD30BC
+mAlignWord
 	voice_square_1_alt 0, 0, 0, 0, 15, 0	@08AD30BC
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 0, 15, 0	@08AD30C8
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 15, 0	@08AD30D4
+mAlignWord
 	voice_square_1_alt 0, 3, 0, 0, 15, 0	@08AD30E0
+mAlignWord
 	voice_square_1_alt 0, 2, 2, 0, 15, 0	@08AD30EC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD30F8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3104
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3110
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD311C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3128
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 0	@08AD3134
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08AD3140
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD314C
+mAlignWord
 	voice_square_2_alt 3, 0, 0, 15, 0	@08AD3158
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08AD3164
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3170
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD317C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3188
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3194
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD31A0
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08AD31AC
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 2	@08AD31B8
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 2	@08AD31C4
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 2	@08AD31D0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD31DC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD31E8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD31F4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3200
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD320C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3218
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3224
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3230
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD323C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3248
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3254
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3260
+mAlignWord
 	voice_square_1_alt 0, 1, 1, 0, 15, 0	@08AD326C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3278
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3284
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3290
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 4, 4, 0	@08AD329C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_3, 0, 0, 15, 0	@08AD32A8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_4, 0, 0, 15, 0	@08AD32B4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_5, 0, 0, 15, 0	@08AD32C0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 0, 15, 0	@08AD32CC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08AD32D8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08AD32E4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 0, 15, 0	@08AD32F0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 3, 0, 2	@08AD32FC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 4, 3, 0	@08AD3308
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08AD3314
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08AD3320
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 3, 0, 0	@08AD332C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 0, 15, 0	@08AD3338
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 3, 0, 2	@08AD3344
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 0, 15, 0	@08AD3350
+mAlignWord
 	voice_square_1_alt 0, 0, 0, 0, 15, 5	@08AD335C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 1, 0, 15, 0	@08AD3368
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08AD3374
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08AD3380
+mAlignWord
 	voice_square_1_alt 0, 0, 0, 4, 0, 0	@08AD338C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 4, 0, 0	@08AD3398
+mAlignWord
 	voice_square_2_alt 0, 0, 4, 4, 0	@08AD33A4
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 3, 0, 0	@08AD33B0
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 2, 0, 0	@08AD33BC
+mAlignWord
 	voice_square_1_alt 0, 3, 0, 1, 0, 1	@08AD33C8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 0, 15, 0	@08AD33D4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08AD33E0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08AD33EC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 0, 15, 0	@08AD33F8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_1, 255, 0, 255, 0	@08AD3404
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_2, 255, 0, 255, 0	@08AD3410
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_3, 255, 0, 255, 0	@08AD341C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_4, 255, 0, 255, 0	@08AD3428
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08AD3434
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_6, 255, 0, 255, 127	@08AD3440
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_7, 255, 0, 255, 0	@08AD344C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_8, 255, 235, 38, 165	@08AD3458
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_9, 255, 0, 255, 127	@08AD3464
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_10, 255, 0, 255, 0	@08AD3470
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_11, 255, 0, 255, 0	@08AD347C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_12, 255, 0, 255, 127	@08AD3488
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_13, 255, 0, 255, 127	@08AD3494
+mAlignWord
 	voice_keysplit voicegroup002, KeySplitTable1	@08AD34A0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_14, 255, 246, 64, 149	@08AD34AC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_15, 255, 0, 255, 127	@08AD34B8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_16, 255, 0, 255, 127	@08AD34C4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_17, 255, 0, 255, 127	@08AD34D0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_18, 255, 0, 255, 127	@08AD34DC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08AD34E8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_19, 255, 0, 255, 127	@08AD34F4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_20, 255, 231, 0, 188	@08AD3500
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_21, 255, 0, 255, 0	@08AD350C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_22, 255, 0, 255, 149	@08AD3518
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_23, 255, 235, 25, 165	@08AD3524
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_24, 255, 0, 255, 149	@08AD3530
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_25, 255, 0, 255, 0	@08AD353C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_26, 37, 0, 255, 165	@08AD3548
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_26, 255, 0, 255, 165	@08AD3554
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_27, 255, 252, 0, 149	@08AD3560
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_355, 255, 0, 255, 0	@08AD356C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_356, 255, 0, 255, 0	@08AD3578
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_357, 255, 0, 255, 0	@08AD3584
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_358, 255, 0, 255, 0	@08AD3590
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_359, 255, 0, 255, 0	@08AD359C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_360, 255, 0, 255, 0	@08AD35A8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_361, 255, 0, 255, 0	@08AD35B4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_24, 255, 0, 255, 149	@08AD35C0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_114, 255, 249, 90, 165	@08AD35CC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_26, 19, 0, 255, 165	@08AD35D8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_26, 255, 0, 255, 165	@08AD35E4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_95, 255, 0, 255, 127	@08AD35F0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_96, 255, 0, 255, 127	@08AD35FC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_106, 255, 0, 255, 127	@08AD3608
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3614
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3620
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_28, 255, 0, 255, 0	@08AD362C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_29, 255, 250, 18, 250	@08AD3638
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_30, 255, 216, 25, 0	@08AD3644
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_31, 37, 0, 255, 149	@08AD3650
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_32, 255, 0, 255, 0	@08AD365C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_33, 255, 0, 255, 0	@08AD3668
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_34, 255, 0, 255, 149	@08AD3674
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 5, 1, 0	@08AD3680
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_35, 255, 216, 25, 0	@08AD368C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 4, 4, 0	@08AD3698
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD36A4
+mAlignWord
 	voice_keysplit_all voicegroup001	@08AD36B0

sound/voicegroups/voicegroup021.inc

@@ -1,131 +1,259 @@
 	mAlignWord
 	.global voicegroup021
 voicegroup021:	@ 0x08AD36BC
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08AD36BC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 0, 15, 0	@08AD36C8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08AD36D4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_11, 255, 0, 255, 0	@08AD36E0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_17, 255, 0, 255, 127	@08AD36EC
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 0, 15, 0	@08AD36F8
+mAlignWord
 	voice_square_1_alt 0, 3, 0, 6, 1, 0	@08AD3704
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_94, 255, 0, 255, 127	@08AD3710
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_95, 255, 0, 255, 0	@08AD371C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_96, 255, 0, 255, 0	@08AD3728
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_97, 255, 235, 25, 165	@08AD3734
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 4, 3, 0	@08AD3740
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_24, 255, 0, 255, 149	@08AD374C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3758
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3764
+mAlignWord
 	voice_noise_alt 60, 0, 0, 0, 2, 6, 1, 0	@08AD3770
+mAlignWord
 	voice_noise_alt 60, 0, 0, 1, 0, 0, 15, 0	@08AD377C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3788
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3794
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD37A0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD37AC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD37B8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD37C4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD37D0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD37DC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD37E8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD37F4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3800
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD380C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3818
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3824
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3830
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD383C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3848
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3854
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3860
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD386C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3878
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3884
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3890
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD389C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD38A8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD38B4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD38C0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD38CC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD38D8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD38E4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD38F0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD38FC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3908
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3914
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3920
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD392C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3938
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3944
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3950
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD395C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3968
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3974
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3980
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD398C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3998
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD39A4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD39B0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD39BC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD39C8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD39D4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD39E0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD39EC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD39F8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3A04
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3A10
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3A1C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3A28
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3A34
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3A40
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3A4C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3A58
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3A64
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3A70
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3A7C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3A88
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3A94
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3AA0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3AAC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3AB8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3AC4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3AD0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3ADC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3AE8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3AF4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3B00
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3B0C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3B18
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3B24
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3B30
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3B3C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3B48
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3B54
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3B60
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3B6C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3B78
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3B84
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3B90
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3B9C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3BA8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3BB4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3BC0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3BCC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3BD8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3BE4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3BF0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3BFC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3C08
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3C14
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3C20
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3C2C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3C38
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3C44
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3C50
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3C5C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3C68
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3C74
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3C80
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3C8C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3C98
+mAlignWord
 	voice_keysplit_all voicegroup004	@08AD3CA4
+mAlignWord
 	voice_keysplit_all voicegroup012	@08AD3CB0

sound/voicegroups/voicegroup022.inc

@@ -2,130 +2,257 @@
 	.global voicegroup022
 voicegroup022:	@ 0x08AD3CBC
 	voice_square_1_alt 0, 0, 0, 0, 15, 0	@08AD3CBC
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 0, 15, 0	@08AD3CC8
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 15, 0	@08AD3CD4
+mAlignWord
 	voice_square_1_alt 0, 3, 0, 0, 15, 0	@08AD3CE0
+mAlignWord
 	voice_square_1_alt 0, 2, 2, 0, 15, 0	@08AD3CEC
+mAlignWord
 	voice_square_1_alt 0, 3, 2, 4, 1, 3	@08AD3CF8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3D04
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3D10
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3D1C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3D28
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 0	@08AD3D34
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08AD3D40
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD3D4C
+mAlignWord
 	voice_square_2_alt 3, 0, 0, 15, 0	@08AD3D58
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08AD3D64
+mAlignWord
 	voice_square_2_alt 1, 2, 4, 1, 3	@08AD3D70
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3D7C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3D88
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3D94
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3DA0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3DAC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3DB8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3DC4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3DD0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3DDC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3DE8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3DF4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3E00
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3E0C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3E18
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3E24
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3E30
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3E3C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3E48
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3E54
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3E60
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3E6C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3E78
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3E84
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3E90
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 4, 4, 0	@08AD3E9C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_3, 0, 0, 15, 0	@08AD3EA8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_4, 0, 0, 15, 0	@08AD3EB4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_5, 0, 0, 15, 0	@08AD3EC0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 0, 15, 0	@08AD3ECC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08AD3ED8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08AD3EE4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 0, 15, 0	@08AD3EF0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 3, 0, 2	@08AD3EFC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD3F08
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08AD3F14
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08AD3F20
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 3, 0, 0	@08AD3F2C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 0, 15, 0	@08AD3F38
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 3, 0, 2	@08AD3F44
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 0, 15, 0	@08AD3F50
+mAlignWord
 	voice_square_1_alt 0, 0, 0, 0, 15, 5	@08AD3F5C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 1, 0, 15, 0	@08AD3F68
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08AD3F74
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 2, 0, 3	@08AD3F80
+mAlignWord
 	voice_square_1_alt 0, 0, 0, 4, 0, 0	@08AD3F8C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 4, 0, 0	@08AD3F98
+mAlignWord
 	voice_square_2_alt 0, 0, 4, 4, 0	@08AD3FA4
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 3, 0, 0	@08AD3FB0
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 2, 0, 0	@08AD3FBC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 0, 15, 0	@08AD3FC8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 0, 15, 0	@08AD3FD4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08AD3FE0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08AD3FEC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 3, 7, 2	@08AD3FF8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_1, 255, 0, 255, 0	@08AD4004
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4010
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_362, 255, 0, 255, 0	@08AD401C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_363, 255, 0, 255, 0	@08AD4028
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_5, 255, 0, 255, 127	@08AD4034
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_6, 255, 0, 255, 127	@08AD4040
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_7, 255, 0, 255, 0	@08AD404C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_8, 255, 235, 38, 165	@08AD4058
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_9, 255, 0, 255, 127	@08AD4064
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_10, 255, 0, 255, 0	@08AD4070
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_11, 255, 0, 255, 0	@08AD407C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4088
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4094
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_364, 255, 0, 255, 127	@08AD40A0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD40AC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_15, 255, 0, 255, 127	@08AD40B8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_16, 255, 0, 255, 127	@08AD40C4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_17, 255, 0, 255, 127	@08AD40D0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_18, 255, 0, 255, 127	@08AD40DC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_365, 255, 0, 255, 149	@08AD40E8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD40F4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4100
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_21, 255, 0, 255, 0	@08AD410C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_22, 255, 0, 255, 149	@08AD4118
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_23, 255, 235, 25, 165	@08AD4124
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4130
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_25, 255, 0, 255, 0	@08AD413C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4148
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4154
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4160
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_355, 255, 0, 255, 0	@08AD416C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_356, 255, 0, 255, 0	@08AD4178
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_357, 255, 0, 255, 0	@08AD4184
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_358, 255, 0, 255, 0	@08AD4190
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_359, 255, 0, 255, 0	@08AD419C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD41A8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_361, 255, 0, 255, 0	@08AD41B4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_366, 255, 0, 255, 0	@08AD41C0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_367, 255, 0, 255, 0	@08AD41CC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD41D8
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_368, 255, 0, 255, 0	@08AD41E4
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_369, 255, 0, 255, 0	@08AD41F0
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_370, 255, 0, 255, 188	@08AD41FC
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_371, 255, 0, 255, 188	@08AD4208
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_372, 255, 0, 255, 188	@08AD4214
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_373, 255, 0, 255, 196	@08AD4220
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_374, 255, 0, 255, 0	@08AD422C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_100, 255, 0, 255, 0	@08AD4238
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_375, 255, 0, 255, 0	@08AD4244
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4250
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_376, 255, 0, 255, 188	@08AD425C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4268
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4274
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_370, 255, 235, 25, 204	@08AD4280
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_371, 255, 235, 25, 204	@08AD428C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_372, 255, 235, 25, 204	@08AD4298
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_374, 255, 235, 25, 204	@08AD42A4
+mAlignWord
 	voice_keysplit_all voicegroup001	@08AD42B0

sound/voicegroups/voicegroup023.inc

@@ -1,95 +1,187 @@
 	mAlignWord
 	.global voicegroup023
 voicegroup023:	@ 0x08AD42BC
+mAlignWord
 	voice_square_1_alt 0, 0, 0, 0, 15, 0	@08AD42BC
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 0, 15, 0	@08AD42C8
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 0, 15, 0	@08AD42D4
+mAlignWord
 	voice_square_1_alt 0, 3, 0, 0, 15, 0	@08AD42E0
+mAlignWord
 	voice_square_1_alt 0, 2, 2, 0, 15, 0	@08AD42EC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD42F8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4304
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4310
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD431C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4328
+mAlignWord
 	voice_square_2_alt 0, 0, 0, 15, 0	@08AD4334
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08AD4340
+mAlignWord
 	voice_square_2_alt 2, 0, 0, 15, 0	@08AD434C
+mAlignWord
 	voice_square_2_alt 3, 0, 0, 15, 0	@08AD4358
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 0	@08AD4364
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4370
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD437C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4388
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4394
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD43A0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD43AC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD43B8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD43C4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD43D0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD43DC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD43E8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD43F4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4400
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD440C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4418
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4424
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4430
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD443C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4448
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4454
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4460
+mAlignWord
 	voice_square_1_alt 0, 1, 1, 0, 15, 0	@08AD446C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4478
+mAlignWord
 	voice_square_2_alt 1, 0, 2, 0, 0	@08AD4484
+mAlignWord
 	voice_square_2_alt 2, 2, 0, 15, 1	@08AD4490
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 4, 4, 0	@08AD449C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_3, 0, 0, 15, 0	@08AD44A8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_4, 0, 0, 15, 0	@08AD44B4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_5, 0, 0, 15, 0	@08AD44C0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 0, 15, 0	@08AD44CC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08AD44D8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08AD44E4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 0, 15, 0	@08AD44F0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 3, 0, 2	@08AD44FC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4508
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08AD4514
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08AD4520
+mAlignWord
 	voice_square_2_alt 2, 0, 3, 0, 0	@08AD452C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 0, 15, 0	@08AD4538
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 3, 0, 2	@08AD4544
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_2, 0, 0, 15, 0	@08AD4550
+mAlignWord
 	voice_square_1_alt 0, 0, 0, 0, 15, 5	@08AD455C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 1, 0, 15, 0	@08AD4568
+mAlignWord
 	voice_noise 60, 0, 0, 1, 0, 0, 15, 0	@08AD4574
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08AD4580
+mAlignWord
 	voice_square_2_alt 0, 0, 4, 0, 0	@08AD458C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_10, 0, 4, 0, 0	@08AD4598
+mAlignWord
 	voice_square_2_alt 0, 0, 4, 4, 0	@08AD45A4
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 3, 0, 0	@08AD45B0
+mAlignWord
 	voice_square_1_alt 0, 1, 0, 2, 0, 0	@08AD45BC
+mAlignWord
 	voice_square_1_alt 0, 3, 0, 1, 0, 1	@08AD45C8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 0, 15, 0	@08AD45D4
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 0, 0, 15, 0	@08AD45E0
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_8, 0, 0, 15, 0	@08AD45EC
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 0, 0, 15, 0	@08AD45F8
+mAlignWord
 	voice_noise 60, 0, 0, 0, 1, 0, 15, 2	@08AD4604
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4610
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD461C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4628
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4634
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4640
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD464C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4658
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4664
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4670
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD467C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 5, 1, 0	@08AD4688
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4694
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 6, 0, 0	@08AD46A0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD46AC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD46B8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD46C4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD46D0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD46DC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD46E8
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_6, 0, 4, 3, 0	@08AD46F4
+mAlignWord
 	voice_square_1_alt 0, 3, 0, 6, 1, 0	@08AD4700

sound/voicegroups/voicegroup024.inc

@@ -1,154 +1,305 @@
 	mAlignWord
 	.global voicegroup024
 voicegroup024: @ 0x08AD470C
+mAlignWord
 	voice_square_1_alt 0, 2, 2, 0, 15, 2	@08AD470C
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_7, 2, 0, 15, 2	@08AD4718
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_3, 0, 4, 3, 0	@08AD4724
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 6, 0, 0	@08AD4730
+mAlignWord
 	voice_programmable_wave_alt ProgrammableWaveData_9, 3, 6, 4, 2	@08AD473C
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 6, 1, 0	@08AD4748
+mAlignWord
 	voice_square_1_alt 0, 2, 0, 6, 1, 0	@08AD4754
+mAlignWord
 	voice_square_2_alt 2, 0, 6, 0, 0	@08AD4760
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_377, 255, 0, 255, 127	@08AD476C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_378, 255, 0, 255, 127	@08AD4778
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_379, 255, 0, 255, 127	@08AD4784
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_377, 255, 249, 77, 127	@08AD4790
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_378, 255, 249, 77, 127	@08AD479C
+mAlignWord
 	voice_directsound 60, 0, DirectSoundWaveData_379, 255, 249, 77, 127	@08AD47A8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD47B4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD47C0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD47CC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD47D8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD47E4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD47F0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD47FC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4808
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4814
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4820
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD482C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4838
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4844
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4850
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD485C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4868
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4874
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4880
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD488C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4898
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD48A4
+mAlignWord
 	voice_keysplit_all voicegroup024	@08AD48B0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD48BC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD48C8
+mAlignWord
 	voice_noise 84, 0, 192, 0, 0, 1, 0, 0	@08AD48D4
+mAlignWord
 	voice_noise 84, 0, 192, 0, 0, 2, 0, 0	@08AD48E0
+mAlignWord
 	voice_noise 84, 0, 192, 0, 0, 3, 7, 0	@08AD48EC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD48F8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4904
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4910
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD491C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4928
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4934
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4940
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD494C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4958
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4964
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_44, 255, 0, 255, 0	@08AD4970
+mAlignWord
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_45, 255, 0, 255, 0	@08AD497C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4988
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4994
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD49A0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD49AC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD49B8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD49C4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD49D0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD49DC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD49E8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD49F4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4A00
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4A0C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4A18
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4A24
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4A30
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4A3C
+mAlignWord
 	voice_square_2_alt 1, 0, 0, 15, 0	@08AD4A48
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4A54
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4A60
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4A6C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4A78
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4A84
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4A90
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4A9C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4AA8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4AB4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4AC0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4ACC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4AD8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4AE4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4AF0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4AFC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4B08
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4B14
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4B20
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4B2C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4B38
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4B44
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4B50
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4B5C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4B68
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4B74
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4B80
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4B8C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4B98
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4BA4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4BB0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4BBC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4BC8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4BD4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4BE0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4BEC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4BF8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4C04
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4C10
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4C1C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4C28
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4C34
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4C40
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4C4C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4C58
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4C64
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4C70
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4C7C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4C88
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4C94
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4CA0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4CAC
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 2	@08AD4CB8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4CC4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4CD0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4CDC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4CE8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4CF4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4D00
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4D0C
+mAlignWord
 	voice_noise 60, 0, 0, 0, 0, 0, 15, 0	@08AD4D18
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4D24
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4D30
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4D3C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4D48
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4D54
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4D60
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4D6C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4D78
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4D84
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4D90
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4D9C
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4DA8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4DB4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4DC0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4DCC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4DD8
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4DE4
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4DF0
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4DFC
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4E08
+mAlignWord
 	voice_square_1 0, 2, 0, 0, 15, 0	@08AD4E14

src/background.c

@@ -3,7 +3,7 @@
 #include "flags.h"
 #include "sprite.h"
 #include "trig.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "animation_commands.h"
 

src/core.c

@@ -1,14 +1,14 @@
 #include "core.h"
 #include "global.h"
-#include "lib/m4a.h"
 #include "malloc_ewram.h"
+#include "malloc_vram.h"
 #include "multi_sio.h"
 #include "sprite.h"
 #include "task.h"
-#include "lib/agb_flash.h"
 #include "flags.h"
 #include "input_recorder.h"
-#include "malloc_vram.h"
+#include "lib/m4a/m4a.h"
+#include "lib/agb_flash/agb_flash.h"
 
 // TODO: the order of these vars has
 // been shuffled due to compilation losses.

src/game/bosses/boss_1.c

@@ -1,8 +1,10 @@
 #include "core.h"
+#include "flags.h"
 #include "sprite.h"
 #include "task.h"
 #include "malloc_vram.h"
 #include "trig.h"
+#include "lib/m4a/m4a.h"
 
 #include "game/sa1_leftovers/collision.h"
 
@@ -23,12 +25,10 @@
 #include "game/stage/screen_shake.h"
 #include "game/time_attack/results.h"
 
-#include "lib/m4a.h"
 #include "constants/animations.h"
 #include "constants/char_states.h"
 #include "constants/songs.h"
 #include "constants/zones.h"
-#include "flags.h"
 
 typedef struct {
     ScreenFade fade; /* 0xB4 */

src/game/bosses/boss_2.c

@@ -15,7 +15,7 @@
 #include "game/stage/boss_results_transition.h"
 #include "game/cheese.h"
 
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "constants/zones.h"
 #include "constants/animations.h"

src/game/bosses/boss_3.c

@@ -2,7 +2,7 @@
 #include "flags.h"
 #include "trig.h"
 #include "malloc_vram.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "game/sa1_leftovers/collision.h"
 #include "game/entity.h"
 #include "game/bosses/common.h"

src/game/bosses/boss_4.c

@@ -3,7 +3,7 @@
 #include "malloc_vram.h"
 #include "task.h"
 #include "trig.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "game/sa1_leftovers/camera.h"
 #include "game/sa1_leftovers/collision.h"
 

src/game/bosses/boss_5.c

@@ -20,7 +20,7 @@
 
 #include "game/stage/screen_fade.h"
 
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "constants/songs.h"
 #include "constants/zones.h"
 #include "constants/animations.h"

src/game/bosses/boss_6.c

@@ -3,7 +3,7 @@
 #include "sprite.h"
 #include "trig.h"
 
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "game/sa1_leftovers/globals.h"
 #include "game/sa1_leftovers/collision.h"

src/game/bosses/boss_7.c

@@ -18,7 +18,7 @@
 
 #include "game/math.h"
 
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "constants/animations.h"
 #include "constants/songs.h"

src/game/bosses/boss_8.c

@@ -5,7 +5,7 @@
 #include "trig.h"
 #include "bg_triangles.h"
 #include "malloc_vram.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "game/sa1_leftovers/globals.h"
 #include "game/sa1_leftovers/camera.h"
 #include "game/sa1_leftovers/collision.h"

src/game/bosses/boss_9.c

@@ -4,7 +4,7 @@
 #include "sprite.h"
 #include "task.h"
 #include "trig.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "game/math.h"
 #include "game/bosses/common.h"
 #include "game/bosses/boss_9.h"

src/game/bosses/eggmobile_escape_sequence.c

@@ -2,7 +2,7 @@
 #include "malloc_vram.h"
 #include "sprite.h"
 #include "task.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "constants/animations.h"
 #include "constants/songs.h"

src/game/bosses/final_intro.c

@@ -3,7 +3,7 @@
 #include "sprite.h"
 #include "trig.h"
 
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "game/sa1_leftovers/globals.h"
 

src/game/character_select.c

@@ -5,7 +5,7 @@
 #include "sprite.h"
 #include "game/character_select.h"
 #include "game/save.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "task.h"
 #include "malloc_vram.h"
 #include "flags.h"

src/game/cheese.c

@@ -7,7 +7,7 @@
 #include "game/stage/camera.h"
 #include "game/multiplayer/mp_player.h"
 
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "constants/zones.h"
 #include "constants/characters.h"

src/game/countdown.c

@@ -9,7 +9,7 @@
 #include "game/stage/player.h"
 #include "game/stage/camera.h"
 #include "game/multiplayer/mp_player.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "constants/animations.h"
 #include "constants/char_states.h"

src/game/course_select.c

@@ -6,7 +6,7 @@
 #include "game/save.h"
 #include "game/stage/stage.h"
 
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "game/character_select.h"
 #include "constants/songs.h"
 #include "constants/text.h"

src/game/cutscenes/credits.c

@@ -6,7 +6,7 @@
 #include "sprite.h"
 #include "game/stage/screen_fade.h"
 #include "task.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "game/save.h"
 
 #include "constants/tilemaps.h"

src/game/cutscenes/credits_end.c

@@ -3,7 +3,7 @@
 #include "sprite.h"
 #include "task.h"
 #include "animation_commands_bg.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "game/cutscenes/credits.h"
 #include "game/cutscenes/credits_end.h"
 #include "game/cutscenes/missing_emeralds.h"

src/game/cutscenes/credits_slides.c

@@ -5,7 +5,7 @@
 #include "sprite.h"
 #include "game/stage/screen_fade.h"
 #include "task.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "game/save.h"
 
 #include "constants/animations.h"

src/game/cutscenes/endings.c

@@ -7,7 +7,7 @@
 #include "game/cutscenes/extra_ending_fall.h"
 #include "game/cutscenes/final_ending_fall.h"
 #include "malloc_vram.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "trig.h"
 #include "game/save.h"
 

src/game/cutscenes/extra_ending_fall.c

@@ -5,7 +5,7 @@
 #include "sprite.h"
 #include "game/stage/screen_fade.h"
 #include "task.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "trig.h"
 #include "game/save.h"
 #include "game/math.h"

src/game/cutscenes/extra_ending_slides.c

@@ -4,7 +4,7 @@
 #include "sprite.h"
 #include "game/stage/screen_fade.h"
 #include "task.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "game/save.h"
 
 #include "constants/animations.h"

src/game/cutscenes/final_ending_fall.c

@@ -5,7 +5,7 @@
 #include "sprite.h"
 #include "game/stage/screen_fade.h"
 #include "task.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "game/save.h"
 #include "game/math.h"
 

src/game/cutscenes/final_ending_land.c

@@ -5,7 +5,7 @@
 #include "task.h"
 #include "game/cutscenes/credits.h"
 #include "game/cutscenes/missing_emeralds.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "trig.h"
 #include "game/save.h"
 #include "game/title_screen.h"

src/game/cutscenes/level_endings.c

@@ -5,7 +5,7 @@
 #include "game/stage/screen_fade.h"
 #include "task.h"
 #include "malloc_vram.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "trig.h"
 #include "game/course_select.h"
 #include "game/save.h"

src/game/cutscenes/missing_emeralds.c

@@ -4,7 +4,7 @@
 #include "game/stage/screen_fade.h"
 #include "sprite.h"
 #include "task.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "game/save.h"
 #include "game/title_screen.h"
 

src/game/decomp_credits.c

@@ -3,7 +3,7 @@
 #include "sprite.h"
 #include "task.h"
 #include "core.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "game/game.h"
 #include "game/save.h"
 #include "game/options_screen.h"

src/game/enemies/koura.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "malloc_vram.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "game/entity.h"
 #include "game/enemies/koura.h"

src/game/enemies/kubinaga.c

@@ -2,7 +2,7 @@
 #include "malloc_vram.h"
 #include "sprite.h"
 #include "trig.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "game/sa1_leftovers/entities_manager.h"
 

src/game/enemies/yado.c

@@ -8,7 +8,7 @@
 #include "game/enemies/projectiles.h"
 #include "game/stage/trapped_animals.h"
 #include "game/multiplayer/player_unk_1.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "constants/animations.h"
 #include "constants/char_states.h"

src/game/game_over.c

@@ -4,7 +4,7 @@
 #include "malloc_vram.h"
 #include "flags.h"
 #include "task.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "game/sa1_leftovers/globals.h"
 

src/game/interactables_1/booster.c

@@ -2,7 +2,7 @@
 #include "malloc_vram.h"
 #include "sprite.h"
 #include "task.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "game/sa1_leftovers/collision.h"
 #include "game/sa1_leftovers/entities_manager.h"

src/game/interactables_1/bouncy_bar.c

@@ -6,7 +6,7 @@
 #include "game/entity.h"
 #include "game/stage/player.h"
 #include "game/stage/camera.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "game/sa1_leftovers/collision.h"
 #include "game/sa1_leftovers/entities_manager.h"
 

src/game/interactables_1/checkpoint.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 #include "malloc_vram.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "flags.h"
 #include "sprite.h"

src/game/interactables_1/corkscrew.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "malloc_vram.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "task.h"
 #include "core.h"

src/game/interactables_1/corkscrew_3d.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "malloc_vram.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "game/stage/player.h"
 #include "game/stage/camera.h"

src/game/interactables_1/incline_ramp.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "gba/types.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "game/stage/player.h"
 #include "game/stage/camera.h"

src/game/interactables_1/rotating_handle.c

@@ -2,7 +2,7 @@
 
 #include "global.h"
 #include "gba/types.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "game/entity.h"
 #include "game/stage/player.h"

src/game/interactables_1/spikes.c

@@ -2,7 +2,7 @@
 
 #include "global.h"
 #include "task.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "malloc_vram.h"
 
 #include "game/sa1_leftovers/collision.h"

src/game/interactables_1/spring_bouncy.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "gba/syscall.h"
 
 #include "malloc_vram.h"

src/game/interactables_1/stage_goal.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "gba/syscall.h"
 
 #include "malloc_vram.h"

src/game/interactables_2/egg_utopia/cannon.c

@@ -7,7 +7,7 @@
 #include "game/stage/camera.h"
 #include "game/interactables_2/egg_utopia/cannon.h"
 
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "trig.h"
 #include "game/math.h"
 

src/game/interactables_2/egg_utopia/flying_handle.c

@@ -8,7 +8,7 @@
 #include "game/interactables_2/egg_utopia/flying_handle.h"
 #include "malloc_vram.h"
 #include "trig.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "constants/animations.h"
 #include "constants/char_states.h"

src/game/interactables_2/egg_utopia/launcher.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "gba/types.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "malloc_vram.h"
 

src/game/interactables_2/egg_utopia/pole.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "core.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "game/stage/player_controls.h"
 #include "game/entity.h"

src/game/interactables_2/egg_utopia/speeding_platform.c

@@ -3,7 +3,7 @@
 #include "malloc_vram.h"
 #include "task.h"
 #include "trig.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "game/sa1_leftovers/collision.h"
 #include "game/entity.h"

src/game/interactables_2/hot_crater/crane.c

@@ -5,7 +5,7 @@
 #include "task.h"
 #include "trig.h"
 
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 
 #include "game/entity.h"
 #include "game/stage/player.h"

src/game/interactables_2/hot_crater/dash_ring.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "malloc_vram.h"
-#include "lib/m4a.h"
+#include "lib/m4a/m4a.h"
 #include "trig.h"
 
 #include "game/stage/player.h"