Merge pull request #43 from yenatch/master

Build Sapphire.

8 files changed, 2594 insertions, 140 deletions

diff --git a/INSTALL.md b/INSTALL.md
index bced4e182..3e0f9d68a 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -23,6 +23,6 @@ Finally, build the rom.
 
 Install [**devkitARM**](http://devkitpro.org/wiki/Getting_Started/devkitARM).
 
-Then get the compiled tools from https://github.com/YamaArashi/pokeruby-tools. Copy the "tools" folder over the "tools" folder in your pokeruby directory.
+Then get the compiled tools from https://github.com/YamaArashi/pokeruby-tools. Copy the `tools/` folder over the `tools/` folder in your pokeruby directory.
 
-You can then build pokeruby using "make" in the MSYS environment provided with devkitARM.
+You can then build pokeruby using `make` in the MSYS environment provided with devkitARM.
diff --git a/Makefile b/Makefile
index ab535acec..f6f30cd6d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,9 @@ LIBGCC := tools/agbcc/lib/libgcc.a
 
 SHA1 := sha1sum -c
 
-GFX := @tools/gbagfx/gbagfx
+GFX := tools/gbagfx/gbagfx
 
-AIF := @tools/aif2pcm/aif2pcm
+AIF := tools/aif2pcm/aif2pcm
 
 SCANINC := tools/scaninc/scaninc
 
@@ -57,9 +57,7 @@ pokesapphire_OBJS := $(OBJS:.o=_sapphire.o)
 ROM := pokeruby.gba pokesapphire.gba
 ELF := $(ROM:.gba=.elf)
 
-all: ruby
-	@:
-both: ruby sapphire
+all: ruby sapphire
 	@:
 ruby: pokeruby.gba
 	@:
diff --git a/README.md b/README.md
index 18994ea9d..66bbc932a 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,11 @@
-# Pokémon Ruby
+# Pokémon Ruby and Sapphire
 
-This is a disassembly of Pokémon Ruby.
+This is a disassembly of Pokémon Ruby and Sapphire.
 
-It builds the following rom:
+It builds the following roms:
 
 * pokeruby.gba `sha1: f28b6ffc97847e94a6c21a63cacf633ee5c8df1e`
+* pokesapphire.gba `sha1: 3ccbbd45f8553c36463f13b938e833f652b793e4`
 
 To set up the repository, see [INSTALL.md](INSTALL.md).
 
diff --git a/asm/macros/music_voice.s b/asm/macros/music_voice.s
index 9a95d69f4..b7a9e7f8d 100644
--- a/asm/macros/music_voice.s
+++ b/asm/macros/music_voice.s
@@ -111,3 +111,15 @@
 	.4byte \voice_group_pointer
 	.4byte 0
 	.endm
+
+	.macro cry sample
+	.byte 0x20, 60, 0, 0
+	.4byte \sample
+	.byte 0xff, 0, 0xff, 0
+	.endm
+
+	.macro cry2 sample
+	.byte 0x30, 60, 0, 0
+	.4byte \sample
+	.byte 0xff, 0, 0xff, 0
+	.endm
diff --git a/build_tools.sh b/build_tools.sh
index 7d99d5d90..12d0f149d 100755
--- a/build_tools.sh
+++ b/build_tools.sh
@@ -4,3 +4,4 @@ make -C tools/scaninc
 make -C tools/preproc
 make -C tools/bin2c
 make -C tools/rsfont
+make -C tools/aif2pcm
diff --git a/sound/direct_sound_data.s b/sound/direct_sound_data.s
index fc322c491..7781e520c 100644
--- a/sound/direct_sound_data.s
+++ b/sound/direct_sound_data.s
@@ -1,709 +1,2261 @@
+	.align 2
 DirectSoundWaveData_8456330:: @ 8456330
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8456330.bin"
 	.incbin "sound/direct_sound_samples/8456330.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84569D4:: @ 84569D4
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84569D4.bin"
 	.incbin "sound/direct_sound_samples/84569D4.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84571CC:: @ 84571CC
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84571CC.bin"
 	.incbin "sound/direct_sound_samples/84571CC.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8457D98:: @ 8457D98
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8457D98.bin"
 	.incbin "sound/direct_sound_samples/8457D98.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8458CD0:: @ 8458CD0
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8458CD0.bin"
 	.incbin "sound/direct_sound_samples/8458CD0.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8459944:: @ 8459944
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8459944.bin"
 	.incbin "sound/direct_sound_samples/8459944.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_845AE14:: @ 845AE14
 	.4byte 0
 	.incbin "sound/direct_sound_samples/845AE14.bin"
 	.incbin "sound/direct_sound_samples/845AE14.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_845B2B4:: @ 845B2B4
 	.4byte 0
 	.incbin "sound/direct_sound_samples/845B2B4.bin"
 	.incbin "sound/direct_sound_samples/845B2B4.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_845B9A8:: @ 845B9A8
 	.4byte 0
 	.incbin "sound/direct_sound_samples/845B9A8.bin"
 	.incbin "sound/direct_sound_samples/845B9A8.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_845C238:: @ 845C238
 	.4byte 0
 	.incbin "sound/direct_sound_samples/845C238.bin"
 	.incbin "sound/direct_sound_samples/845C238.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_845CAB0:: @ 845CAB0
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/845CAB0.bin"
 	.incbin "sound/direct_sound_samples/845CAB0.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_845DAF0:: @ 845DAF0
 	.4byte 0
 	.incbin "sound/direct_sound_samples/845DAF0.bin"
 	.incbin "sound/direct_sound_samples/845DAF0.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_845DF04:: @ 845DF04
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/845DF04.bin"
 	.incbin "sound/direct_sound_samples/845DF04.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_845ED34:: @ 845ED34
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/845ED34.bin"
 	.incbin "sound/direct_sound_samples/845ED34.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_845FCC8:: @ 845FCC8
 	.4byte 0
 	.incbin "sound/direct_sound_samples/845FCC8.bin"
 	.incbin "sound/direct_sound_samples/845FCC8.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_846057C:: @ 846057C
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/846057C.bin"
 	.incbin "sound/direct_sound_samples/846057C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8460E60:: @ 8460E60
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8460E60.bin"
 	.incbin "sound/direct_sound_samples/8460E60.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8461D8C:: @ 8461D8C
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8461D8C.bin"
 	.incbin "sound/direct_sound_samples/8461D8C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84622A4:: @ 84622A4
 	.4byte 0
 	.incbin "sound/direct_sound_samples/84622A4.bin"
 	.incbin "sound/direct_sound_samples/84622A4.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_846286C:: @ 846286C
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/846286C.bin"
 	.incbin "sound/direct_sound_samples/846286C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84637CC:: @ 84637CC
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84637CC.bin"
 	.incbin "sound/direct_sound_samples/84637CC.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8464E2C:: @ 8464E2C
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8464E2C.bin"
 	.incbin "sound/direct_sound_samples/8464E2C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8466388:: @ 8466388
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8466388.bin"
 	.incbin "sound/direct_sound_samples/8466388.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8466F14:: @ 8466F14
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8466F14.bin"
 	.incbin "sound/direct_sound_samples/8466F14.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_846A4B8:: @ 846A4B8
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/846A4B8.bin"
 	.incbin "sound/direct_sound_samples/846A4B8.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_846C7D4:: @ 846C7D4
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/846C7D4.bin"
 	.incbin "sound/direct_sound_samples/846C7D4.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_846FEA0:: @ 846FEA0
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/846FEA0.bin"
 	.incbin "sound/direct_sound_samples/846FEA0.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84711F0:: @ 84711F0
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84711F0.bin"
 	.incbin "sound/direct_sound_samples/84711F0.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8472700:: @ 8472700
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8472700.bin"
 	.incbin "sound/direct_sound_samples/8472700.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8473B20:: @ 8473B20
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8473B20.bin"
 	.incbin "sound/direct_sound_samples/8473B20.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8474BBC:: @ 8474BBC
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8474BBC.bin"
 	.incbin "sound/direct_sound_samples/8474BBC.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8475C18:: @ 8475C18
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8475C18.bin"
 	.incbin "sound/direct_sound_samples/8475C18.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_847CBAC:: @ 847CBAC
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/847CBAC.bin"
 	.incbin "sound/direct_sound_samples/847CBAC.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8481130:: @ 8481130
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8481130.bin"
 	.incbin "sound/direct_sound_samples/8481130.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84830A0:: @ 84830A0
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84830A0.bin"
 	.incbin "sound/direct_sound_samples/84830A0.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8483804:: @ 8483804
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8483804.bin"
 	.incbin "sound/direct_sound_samples/8483804.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8485454:: @ 8485454
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8485454.bin"
 	.incbin "sound/direct_sound_samples/8485454.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8486924:: @ 8486924
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8486924.bin"
 	.incbin "sound/direct_sound_samples/8486924.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8487330:: @ 8487330
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8487330.bin"
 	.incbin "sound/direct_sound_samples/8487330.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8488F44:: @ 8488F44
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8488F44.bin"
 	.incbin "sound/direct_sound_samples/8488F44.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_848A8A4:: @ 848A8A4
 	.4byte 0
 	.incbin "sound/direct_sound_samples/848A8A4.bin"
 	.incbin "sound/direct_sound_samples/848A8A4.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_848BD68:: @ 848BD68
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/848BD68.bin"
 	.incbin "sound/direct_sound_samples/848BD68.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_848C4A4:: @ 848C4A4
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/848C4A4.bin"
 	.incbin "sound/direct_sound_samples/848C4A4.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_848E094:: @ 848E094
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/848E094.bin"
 	.incbin "sound/direct_sound_samples/848E094.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_848F448:: @ 848F448
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/848F448.bin"
 	.incbin "sound/direct_sound_samples/848F448.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8491ACC:: @ 8491ACC
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8491ACC.bin"
 	.incbin "sound/direct_sound_samples/8491ACC.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8492D10:: @ 8492D10
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8492D10.bin"
 	.incbin "sound/direct_sound_samples/8492D10.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8493D20:: @ 8493D20
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8493D20.bin"
 	.incbin "sound/direct_sound_samples/8493D20.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8495028:: @ 8495028
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8495028.bin"
 	.incbin "sound/direct_sound_samples/8495028.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8497134:: @ 8497134
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8497134.bin"
 	.incbin "sound/direct_sound_samples/8497134.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8499110:: @ 8499110
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8499110.bin"
 	.incbin "sound/direct_sound_samples/8499110.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_849B320:: @ 849B320
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/849B320.bin"
 	.incbin "sound/direct_sound_samples/849B320.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_849BAEC:: @ 849BAEC
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/849BAEC.bin"
 	.incbin "sound/direct_sound_samples/849BAEC.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_849D45C:: @ 849D45C
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/849D45C.bin"
 	.incbin "sound/direct_sound_samples/849D45C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_849F40C:: @ 849F40C
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/849F40C.bin"
 	.incbin "sound/direct_sound_samples/849F40C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84A26EC:: @ 84A26EC
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A26EC.bin"
 	.incbin "sound/direct_sound_samples/84A26EC.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84A311C:: @ 84A311C
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A311C.bin"
 	.incbin "sound/direct_sound_samples/84A311C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84A3B50:: @ 84A3B50
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A3B50.bin"
 	.incbin "sound/direct_sound_samples/84A3B50.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84A5690:: @ 84A5690
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A5690.bin"
 	.incbin "sound/direct_sound_samples/84A5690.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84A5F58:: @ 84A5F58
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A5F58.bin"
 	.incbin "sound/direct_sound_samples/84A5F58.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84A7328:: @ 84A7328
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A7328.bin"
 	.incbin "sound/direct_sound_samples/84A7328.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84A7F38:: @ 84A7F38
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A7F38.bin"
 	.incbin "sound/direct_sound_samples/84A7F38.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84A8AC8:: @ 84A8AC8
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A8AC8.bin"
 	.incbin "sound/direct_sound_samples/84A8AC8.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84A9564:: @ 84A9564
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A9564.bin"
 	.incbin "sound/direct_sound_samples/84A9564.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84A9EAC:: @ 84A9EAC
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84A9EAC.bin"
 	.incbin "sound/direct_sound_samples/84A9EAC.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_84AA8F4:: @ 84AA8F4
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/84AA8F4.bin"
 	.incbin "sound/direct_sound_samples/84AA8F4.pcm"
+
+	.align 2
+CryDirectSound_4AB57C:: @ 84AB57C
+	.incbin "baserom.gba", 0x4ab57c, 0x108c
+
+	.align 2
+CryDirectSound_4AC608:: @ 84AC608
+	.incbin "baserom.gba", 0x4ac608, 0x1090
+
+	.align 2
+CryDirectSound_4AD698:: @ 84AD698
+	.incbin "baserom.gba", 0x4ad698, 0x1358
+
+	.align 2
+CryDirectSound_4AE9F0:: @ 84AE9F0
+	.incbin "baserom.gba", 0x4ae9f0, 0xe70
+
+	.align 2
+CryDirectSound_4AF860:: @ 84AF860
+	.incbin "baserom.gba", 0x4af860, 0xe80
+
+	.align 2
+CryDirectSound_4B06E0:: @ 84B06E0
+	.incbin "baserom.gba", 0x4b06e0, 0x1348
+
+	.align 2
+CryDirectSound_4B1A28:: @ 84B1A28
+	.incbin "baserom.gba", 0x4b1a28, 0xe74
+
+	.align 2
+CryDirectSound_4B289C:: @ 84B289C
+	.incbin "baserom.gba", 0x4b289c, 0x1140
+
+	.align 2
+CryDirectSound_4B39DC:: @ 84B39DC
+	.incbin "baserom.gba", 0x4b39dc, 0x1348
+
+	.align 2
+CryDirectSound_4B4D24:: @ 84B4D24
+	.incbin "baserom.gba", 0x4b4d24, 0x858
+
+	.align 2
+CryDirectSound_4B557C:: @ 84B557C
+	.incbin "baserom.gba", 0x4b557c, 0x1750
+
+	.align 2
+CryDirectSound_4B6CCC:: @ 84B6CCC
+	.incbin "baserom.gba", 0x4b6ccc, 0xa08
+
+	.align 2
+CryDirectSound_4B76D4:: @ 84B76D4
+	.incbin "baserom.gba", 0x4b76d4, 0x1044
+
+	.align 2
+CryDirectSound_4B8718:: @ 84B8718
+	.incbin "baserom.gba", 0x4b8718, 0x123c
+
+	.align 2
+CryDirectSound_4B9954:: @ 84B9954
+	.incbin "baserom.gba", 0x4b9954, 0x135c
+
+	.align 2
+CryDirectSound_4BACB0:: @ 84BACB0
+	.incbin "baserom.gba", 0x4bacb0, 0x3e8
+
+	.align 2
+CryDirectSound_4BB098:: @ 84BB098
+	.incbin "baserom.gba", 0x4bb098, 0xf08
+
+	.align 2
+CryDirectSound_4BBFA0:: @ 84BBFA0
+	.incbin "baserom.gba", 0x4bbfa0, 0x1134
+
+	.align 2
+CryDirectSound_4BD0D4:: @ 84BD0D4
+	.incbin "baserom.gba", 0x4bd0d4, 0x7e0
+
+	.align 2
+CryDirectSound_4BD8B4:: @ 84BD8B4
+	.incbin "baserom.gba", 0x4bd8b4, 0x984
+
+	.align 2
+CryDirectSound_4BE238:: @ 84BE238
+	.incbin "baserom.gba", 0x4be238, 0x11a4
+
+	.align 2
+CryDirectSound_4BF3DC:: @ 84BF3DC
+	.incbin "baserom.gba", 0x4bf3dc, 0x113c
+
+	.align 2
+CryDirectSound_4C0518:: @ 84C0518
+	.incbin "baserom.gba", 0x4c0518, 0x134c
+
+	.align 2
+CryDirectSound_4C1864:: @ 84C1864
+	.incbin "baserom.gba", 0x4c1864, 0x1358
+
+	.align 2
+CryDirectSound_4C2BBC:: @ 84C2BBC
+	.incbin "baserom.gba", 0x4c2bbc, 0x10a8
+
+	.align 2
+CryDirectSound_4C3C64:: @ 84C3C64
+	.incbin "baserom.gba", 0x4c3c64, 0x17c0
+
+	.align 2
+CryDirectSound_4C5424:: @ 84C5424
+	.incbin "baserom.gba", 0x4c5424, 0x954
+
+	.align 2
+CryDirectSound_4C5D78:: @ 84C5D78
+	.incbin "baserom.gba", 0x4c5d78, 0xd90
+
+	.align 2
+CryDirectSound_4C6B08:: @ 84C6B08
+	.incbin "baserom.gba", 0x4c6b08, 0x9b0
+
 	.align 2
+CryDirectSound_4C74B8:: @ 84C74B8
+	.incbin "baserom.gba", 0x4c74b8, 0xcc8
 
-	.incbin "baserom.gba", 0x004ab57c, 0x18e31c
+	.align 2
+CryDirectSound_4C8180:: @ 84C8180
+	.incbin "baserom.gba", 0x4c8180, 0x10e0
+
+	.align 2
+CryDirectSound_4C9260:: @ 84C9260
+	.incbin "baserom.gba", 0x4c9260, 0xa68
+
+	.align 2
+CryDirectSound_4C9CC8:: @ 84C9CC8
+	.incbin "baserom.gba", 0x4c9cc8, 0xc14
+
+	.align 2
+CryDirectSound_4CA8DC:: @ 84CA8DC
+	.incbin "baserom.gba", 0x4ca8dc, 0x186c
+
+	.align 2
+CryDirectSound_4CC148:: @ 84CC148
+	.incbin "baserom.gba", 0x4cc148, 0x870
+
+	.align 2
+CryDirectSound_4CC9B8:: @ 84CC9B8
+	.incbin "baserom.gba", 0x4cc9b8, 0xa90
+
+	.align 2
+CryDirectSound_4CD448:: @ 84CD448
+	.incbin "baserom.gba", 0x4cd448, 0x17d0
+
+	.align 2
+CryDirectSound_4CEC18:: @ 84CEC18
+	.incbin "baserom.gba", 0x4cec18, 0x186c
+
+	.align 2
+CryDirectSound_4D0484:: @ 84D0484
+	.incbin "baserom.gba", 0x4d0484, 0x564
+
+	.align 2
+CryDirectSound_4D09E8:: @ 84D09E8
+	.incbin "baserom.gba", 0x4d09e8, 0x6c8
+
+	.align 2
+CryDirectSound_4D10B0:: @ 84D10B0
+	.incbin "baserom.gba", 0x4d10b0, 0x136c
+
+	.align 2
+CryDirectSound_4D241C:: @ 84D241C
+	.incbin "baserom.gba", 0x4d241c, 0x1364
+
+	.align 2
+CryDirectSound_4D3780:: @ 84D3780
+	.incbin "baserom.gba", 0x4d3780, 0xe9c
+
+	.align 2
+CryDirectSound_4D461C:: @ 84D461C
+	.incbin "baserom.gba", 0x4d461c, 0xc7c
+
+	.align 2
+CryDirectSound_4D5298:: @ 84D5298
+	.incbin "baserom.gba", 0x4d5298, 0x199c
+
+	.align 2
+CryDirectSound_4D6C34:: @ 84D6C34
+	.incbin "baserom.gba", 0x4d6c34, 0x1bf4
+
+	.align 2
+CryDirectSound_4D8828:: @ 84D8828
+	.incbin "baserom.gba", 0x4d8828, 0x1e68
+
+	.align 2
+CryDirectSound_4DA690:: @ 84DA690
+	.incbin "baserom.gba", 0x4da690, 0xf80
+
+	.align 2
+CryDirectSound_4DB610:: @ 84DB610
+	.incbin "baserom.gba", 0x4db610, 0x1004
+
+	.align 2
+CryDirectSound_4DC614:: @ 84DC614
+	.incbin "baserom.gba", 0x4dc614, 0x1370
+
+	.align 2
+CryDirectSound_4DD984:: @ 84DD984
+	.incbin "baserom.gba", 0x4dd984, 0x136c
+
+	.align 2
+CryDirectSound_4DECF0:: @ 84DECF0
+	.incbin "baserom.gba", 0x4decf0, 0x990
+
+	.align 2
+CryDirectSound_4DF680:: @ 84DF680
+	.incbin "baserom.gba", 0x4df680, 0x12dc
+
+	.align 2
+CryDirectSound_4E095C:: @ 84E095C
+	.incbin "baserom.gba", 0x4e095c, 0xd28
+
+	.align 2
+CryDirectSound_4E1684:: @ 84E1684
+	.incbin "baserom.gba", 0x4e1684, 0xb48
+
+	.align 2
+CryDirectSound_4E21CC:: @ 84E21CC
+	.incbin "baserom.gba", 0x4e21cc, 0x1060
+
+	.align 2
+CryDirectSound_4E322C:: @ 84E322C
+	.incbin "baserom.gba", 0x4e322c, 0x1030
+
+	.align 2
+CryDirectSound_4E425C:: @ 84E425C
+	.incbin "baserom.gba", 0x4e425c, 0xd64
+
+	.align 2
+CryDirectSound_4E4FC0:: @ 84E4FC0
+	.incbin "baserom.gba", 0x4e4fc0, 0x113c
+
+	.align 2
+CryDirectSound_4E60FC:: @ 84E60FC
+	.incbin "baserom.gba", 0x4e60fc, 0xb1c
+
+	.align 2
+CryDirectSound_4E6C18:: @ 84E6C18
+	.incbin "baserom.gba", 0x4e6c18, 0x6a8
+
+	.align 2
+CryDirectSound_4E72C0:: @ 84E72C0
+	.incbin "baserom.gba", 0x4e72c0, 0xb24
+
+	.align 2
+CryDirectSound_4E7DE4:: @ 84E7DE4
+	.incbin "baserom.gba", 0x4e7de4, 0x1764
+
+	.align 2
+CryDirectSound_4E9548:: @ 84E9548
+	.incbin "baserom.gba", 0x4e9548, 0x1ae8
+
+	.align 2
+CryDirectSound_4EB030:: @ 84EB030
+	.incbin "baserom.gba", 0x4eb030, 0x1f9c
+
+	.align 2
+CryDirectSound_4ECFCC:: @ 84ECFCC
+	.incbin "baserom.gba", 0x4ecfcc, 0xd64
+
+	.align 2
+CryDirectSound_4EDD30:: @ 84EDD30
+	.incbin "baserom.gba", 0x4edd30, 0xd90
+
+	.align 2
+CryDirectSound_4EEAC0:: @ 84EEAC0
+	.incbin "baserom.gba", 0x4eeac0, 0x1088
+
+	.align 2
+CryDirectSound_4EFB48:: @ 84EFB48
+	.incbin "baserom.gba", 0x4efb48, 0x78c
+
+	.align 2
+CryDirectSound_4F02D4:: @ 84F02D4
+	.incbin "baserom.gba", 0x4f02d4, 0xea0
+
+	.align 2
+CryDirectSound_4F1174:: @ 84F1174
+	.incbin "baserom.gba", 0x4f1174, 0x134c
+
+	.align 2
+CryDirectSound_4F24C0:: @ 84F24C0
+	.incbin "baserom.gba", 0x4f24c0, 0xff0
+
+	.align 2
+CryDirectSound_4F34B0:: @ 84F34B0
+	.incbin "baserom.gba", 0x4f34b0, 0x16fc
+
+	.align 2
+CryDirectSound_4F4BAC:: @ 84F4BAC
+	.incbin "baserom.gba", 0x4f4bac, 0x17b4
+
+	.align 2
+CryDirectSound_4F6360:: @ 84F6360
+	.incbin "baserom.gba", 0x4f6360, 0x1be8
+
+	.align 2
+CryDirectSound_4F7F48:: @ 84F7F48
+	.incbin "baserom.gba", 0x4f7f48, 0xe2c
+
+	.align 2
+CryDirectSound_4F8D74:: @ 84F8D74
+	.incbin "baserom.gba", 0x4f8d74, 0xf10
+
+	.align 2
+CryDirectSound_4F9C84:: @ 84F9C84
+	.incbin "baserom.gba", 0x4f9c84, 0x12a0
+
+	.align 2
+CryDirectSound_4FAF24:: @ 84FAF24
+	.incbin "baserom.gba", 0x4faf24, 0x768
+
+	.align 2
+CryDirectSound_4FB68C:: @ 84FB68C
+	.incbin "baserom.gba", 0x4fb68c, 0xd70
+
+	.align 2
+CryDirectSound_4FC3FC:: @ 84FC3FC
+	.incbin "baserom.gba", 0x4fc3fc, 0x1344
+
+	.align 2
+CryDirectSound_4FD740:: @ 84FD740
+	.incbin "baserom.gba", 0x4fd740, 0x17e8
+
+	.align 2
+CryDirectSound_4FEF28:: @ 84FEF28
+	.incbin "baserom.gba", 0x4fef28, 0x77c
+
+	.align 2
+CryDirectSound_4FF6A4:: @ 84FF6A4
+	.incbin "baserom.gba", 0x4ff6a4, 0x1344
+
+	.align 2
+CryDirectSound_5009E8:: @ 85009E8
+	.incbin "baserom.gba", 0x5009e8, 0x1378
+
+	.align 2
+CryDirectSound_501D60:: @ 8501D60
+	.incbin "baserom.gba", 0x501d60, 0x11f0
+
+	.align 2
+CryDirectSound_502F50:: @ 8502F50
+	.incbin "baserom.gba", 0x502f50, 0x1524
+
+	.align 2
+CryDirectSound_504474:: @ 8504474
+	.incbin "baserom.gba", 0x504474, 0xa88
+
+	.align 2
+CryDirectSound_504EFC:: @ 8504EFC
+	.incbin "baserom.gba", 0x504efc, 0xec0
+
+	.align 2
+CryDirectSound_505DBC:: @ 8505DBC
+	.incbin "baserom.gba", 0x505dbc, 0xf74
+
+	.align 2
+CryDirectSound_506D30:: @ 8506D30
+	.incbin "baserom.gba", 0x506d30, 0x14c4
+
+	.align 2
+CryDirectSound_5081F4:: @ 85081F4
+	.incbin "baserom.gba", 0x5081f4, 0x1750
+
+	.align 2
+CryDirectSound_509944:: @ 8509944
+	.incbin "baserom.gba", 0x509944, 0x1780
+
+	.align 2
+CryDirectSound_50B0C4:: @ 850B0C4
+	.incbin "baserom.gba", 0x50b0c4, 0xec0
+
+	.align 2
+CryDirectSound_50BF84:: @ 850BF84
+	.incbin "baserom.gba", 0x50bf84, 0x18c4
+
+	.align 2
+CryDirectSound_50D848:: @ 850D848
+	.incbin "baserom.gba", 0x50d848, 0x1d18
+
+	.align 2
+CryDirectSound_50F560:: @ 850F560
+	.incbin "baserom.gba", 0x50f560, 0x1d04
+
+	.align 2
+CryDirectSound_511264:: @ 8511264
+	.incbin "baserom.gba", 0x511264, 0x184c
+
+	.align 2
+CryDirectSound_512AB0:: @ 8512AB0
+	.incbin "baserom.gba", 0x512ab0, 0x1858
+
+	.align 2
+CryDirectSound_514308:: @ 8514308
+	.incbin "baserom.gba", 0x514308, 0x18c4
+
+	.align 2
+CryDirectSound_515BCC:: @ 8515BCC
+	.incbin "baserom.gba", 0x515bcc, 0x1938
+
+	.align 2
+CryDirectSound_517504:: @ 8517504
+	.incbin "baserom.gba", 0x517504, 0x12e0
+
+	.align 2
+CryDirectSound_5187E4:: @ 85187E4
+	.incbin "baserom.gba", 0x5187e4, 0x1fe4
+
+	.align 2
+CryDirectSound_51A7C8:: @ 851A7C8
+	.incbin "baserom.gba", 0x51a7c8, 0xf20
+
+	.align 2
+CryDirectSound_51B6E8:: @ 851B6E8
+	.incbin "baserom.gba", 0x51b6e8, 0xe70
+
+	.align 2
+CryDirectSound_51C558:: @ 851C558
+	.incbin "baserom.gba", 0x51c558, 0x12ac
+
+	.align 2
+CryDirectSound_51D804:: @ 851D804
+	.incbin "baserom.gba", 0x51d804, 0x11d8
+
+	.align 2
+CryDirectSound_51E9DC:: @ 851E9DC
+	.incbin "baserom.gba", 0x51e9dc, 0xf28
+
+	.align 2
+CryDirectSound_51F904:: @ 851F904
+	.incbin "baserom.gba", 0x51f904, 0x145c
+
+	.align 2
+CryDirectSound_520D60:: @ 8520D60
+	.incbin "baserom.gba", 0x520d60, 0x15ac
+
+	.align 2
+CryDirectSound_52230C:: @ 852230C
+	.incbin "baserom.gba", 0x52230c, 0x136c
+
+	.align 2
+CryDirectSound_523678:: @ 8523678
+	.incbin "baserom.gba", 0x523678, 0x146c
+
+	.align 2
+CryDirectSound_524AE4:: @ 8524AE4
+	.incbin "baserom.gba", 0x524ae4, 0xecc
+
+	.align 2
+CryDirectSound_5259B0:: @ 85259B0
+	.incbin "baserom.gba", 0x5259b0, 0xf1c
+
+	.align 2
+CryDirectSound_5268CC:: @ 85268CC
+	.incbin "baserom.gba", 0x5268cc, 0x12b4
+
+	.align 2
+CryDirectSound_527B80:: @ 8527B80
+	.incbin "baserom.gba", 0x527b80, 0x97c
+
+	.align 2
+CryDirectSound_5284FC:: @ 85284FC
+	.incbin "baserom.gba", 0x5284fc, 0x86c
+
+	.align 2
+CryDirectSound_528D68:: @ 8528D68
+	.incbin "baserom.gba", 0x528d68, 0x9d8
+
+	.align 2
+CryDirectSound_529740:: @ 8529740
+	.incbin "baserom.gba", 0x529740, 0x1358
+
+	.align 2
+CryDirectSound_52AA98:: @ 852AA98
+	.incbin "baserom.gba", 0x52aa98, 0x13e8
+
+	.align 2
+CryDirectSound_52BE80:: @ 852BE80
+	.incbin "baserom.gba", 0x52be80, 0x14dc
+
+	.align 2
+CryDirectSound_52D35C:: @ 852D35C
+	.incbin "baserom.gba", 0x52d35c, 0x12f0
+
+	.align 2
+CryDirectSound_52E64C:: @ 852E64C
+	.incbin "baserom.gba", 0x52e64c, 0xd5c
+
+	.align 2
+CryDirectSound_52F3A8:: @ 852F3A8
+	.incbin "baserom.gba", 0x52f3a8, 0x2f74
+
+	.align 2
+CryDirectSound_53231C:: @ 853231C
+	.incbin "baserom.gba", 0x53231c, 0x1ee4
+
+	.align 2
+CryDirectSound_534200:: @ 8534200
+	.incbin "baserom.gba", 0x534200, 0xf7c
+
+	.align 2
+CryDirectSound_53517C:: @ 853517C
+	.incbin "baserom.gba", 0x53517c, 0xc5c
+
+	.align 2
+CryDirectSound_535DD8:: @ 8535DD8
+	.incbin "baserom.gba", 0x535dd8, 0x1254
+
+	.align 2
+CryDirectSound_53702C:: @ 853702C
+	.incbin "baserom.gba", 0x53702c, 0x1308
+
+	.align 2
+CryDirectSound_538334:: @ 8538334
+	.incbin "baserom.gba", 0x538334, 0x1434
+
+	.align 2
+CryDirectSound_539768:: @ 8539768
+	.incbin "baserom.gba", 0x539768, 0xed4
+
+	.align 2
+CryDirectSound_53A63C:: @ 853A63C
+	.incbin "baserom.gba", 0x53a63c, 0xb1c
+
+	.align 2
+CryDirectSound_53B158:: @ 853B158
+	.incbin "baserom.gba", 0x53b158, 0xe38
+
+	.align 2
+CryDirectSound_53BF90:: @ 853BF90
+	.incbin "baserom.gba", 0x53bf90, 0x1618
+
+	.align 2
+CryDirectSound_53D5A8:: @ 853D5A8
+	.incbin "baserom.gba", 0x53d5a8, 0xfd4
+
+	.align 2
+CryDirectSound_53E57C:: @ 853E57C
+	.incbin "baserom.gba", 0x53e57c, 0xf84
+
+	.align 2
+CryDirectSound_53F500:: @ 853F500
+	.incbin "baserom.gba", 0x53f500, 0x140c
+
+	.align 2
+CryDirectSound_54090C:: @ 854090C
+	.incbin "baserom.gba", 0x54090c, 0xd58
+
+	.align 2
+CryDirectSound_541664:: @ 8541664
+	.incbin "baserom.gba", 0x541664, 0xd54
+
+	.align 2
+CryDirectSound_5423B8:: @ 85423B8
+	.incbin "baserom.gba", 0x5423b8, 0xc54
+
+	.align 2
+CryDirectSound_54300C:: @ 854300C
+	.incbin "baserom.gba", 0x54300c, 0xdbc
+
+	.align 2
+CryDirectSound_543DC8:: @ 8543DC8
+	.incbin "baserom.gba", 0x543dc8, 0x185c
+
+	.align 2
+CryDirectSound_545624:: @ 8545624
+	.incbin "baserom.gba", 0x545624, 0x53c
+
+	.align 2
+CryDirectSound_545B60:: @ 8545B60
+	.incbin "baserom.gba", 0x545b60, 0x17a8
+
+	.align 2
+CryDirectSound_547308:: @ 8547308
+	.incbin "baserom.gba", 0x547308, 0xf78
+
+	.align 2
+CryDirectSound_548280:: @ 8548280
+	.incbin "baserom.gba", 0x548280, 0x17ac
+
+	.align 2
+CryDirectSound_549A2C:: @ 8549A2C
+	.incbin "baserom.gba", 0x549a2c, 0xb9c
+
+	.align 2
+CryDirectSound_54A5C8:: @ 854A5C8
+	.incbin "baserom.gba", 0x54a5c8, 0x10a8
+
+	.align 2
+CryDirectSound_54B670:: @ 854B670
+	.incbin "baserom.gba", 0x54b670, 0x130c
+
+	.align 2
+CryDirectSound_54C97C:: @ 854C97C
+	.incbin "baserom.gba", 0x54c97c, 0x1e68
+
+	.align 2
+CryDirectSound_54E7E4:: @ 854E7E4
+	.incbin "baserom.gba", 0x54e7e4, 0x1e68
+
+	.align 2
+CryDirectSound_55064C:: @ 855064C
+	.incbin "baserom.gba", 0x55064c, 0x540
+
+	.align 2
+CryDirectSound_550B8C:: @ 8550B8C
+	.incbin "baserom.gba", 0x550b8c, 0x8cc
+
+	.align 2
+CryDirectSound_551458:: @ 8551458
+	.incbin "baserom.gba", 0x551458, 0x1038
+
+	.align 2
+CryDirectSound_552490:: @ 8552490
+	.incbin "baserom.gba", 0x552490, 0x704
+
+	.align 2
+CryDirectSound_552B94:: @ 8552B94
+	.incbin "baserom.gba", 0x552b94, 0xbe8
+
+	.align 2
+CryDirectSound_55377C:: @ 855377C
+	.incbin "baserom.gba", 0x55377c, 0x2610
+
+	.align 2
+CryDirectSound_555D8C:: @ 8555D8C
+	.incbin "baserom.gba", 0x555d8c, 0x1258
+
+	.align 2
+CryDirectSound_556FE4:: @ 8556FE4
+	.incbin "baserom.gba", 0x556fe4, 0x143c
+
+	.align 2
+CryDirectSound_558420:: @ 8558420
+	.incbin "baserom.gba", 0x558420, 0x1984
+
+	.align 2
+CryDirectSound_559DA4:: @ 8559DA4
+	.incbin "baserom.gba", 0x559da4, 0x428
+
+	.align 2
+CryDirectSound_55A1CC:: @ 855A1CC
+	.incbin "baserom.gba", 0x55a1cc, 0x648
+
+	.align 2
+CryDirectSound_55A814:: @ 855A814
+	.incbin "baserom.gba", 0x55a814, 0xae4
+
+	.align 2
+CryDirectSound_55B2F8:: @ 855B2F8
+	.incbin "baserom.gba", 0x55b2f8, 0x1530
+
+	.align 2
+CryDirectSound_55C828:: @ 855C828
+	.incbin "baserom.gba", 0x55c828, 0x6f8
+
+	.align 2
+CryDirectSound_55CF20:: @ 855CF20
+	.incbin "baserom.gba", 0x55cf20, 0x864
+
+	.align 2
+CryDirectSound_55D784:: @ 855D784
+	.incbin "baserom.gba", 0x55d784, 0xd64
+
+	.align 2
+CryDirectSound_55E4E8:: @ 855E4E8
+	.incbin "baserom.gba", 0x55e4e8, 0xc54
+
+	.align 2
+CryDirectSound_55F13C:: @ 855F13C
+	.incbin "baserom.gba", 0x55f13c, 0x1730
+
+	.align 2
+CryDirectSound_56086C:: @ 856086C
+	.incbin "baserom.gba", 0x56086c, 0xcb0
+
+	.align 2
+CryDirectSound_56151C:: @ 856151C
+	.incbin "baserom.gba", 0x56151c, 0xa8c
+
+	.align 2
+CryDirectSound_561FA8:: @ 8561FA8
+	.incbin "baserom.gba", 0x561fa8, 0x754
+
+	.align 2
+CryDirectSound_5626FC:: @ 85626FC
+	.incbin "baserom.gba", 0x5626fc, 0x5f0
+
+	.align 2
+CryDirectSound_562CEC:: @ 8562CEC
+	.incbin "baserom.gba", 0x562cec, 0x6fc
+
+	.align 2
+CryDirectSound_5633E8:: @ 85633E8
+	.incbin "baserom.gba", 0x5633e8, 0xae8
+
+	.align 2
+CryDirectSound_563ED0:: @ 8563ED0
+	.incbin "baserom.gba", 0x563ed0, 0x700
+
+	.align 2
+CryDirectSound_5645D0:: @ 85645D0
+	.incbin "baserom.gba", 0x5645d0, 0xa90
+
+	.align 2
+CryDirectSound_565060:: @ 8565060
+	.incbin "baserom.gba", 0x565060, 0xecc
+
+	.align 2
+CryDirectSound_565F2C:: @ 8565F2C
+	.incbin "baserom.gba", 0x565f2c, 0x758
+
+	.align 2
+CryDirectSound_566684:: @ 8566684
+	.incbin "baserom.gba", 0x566684, 0xdb4
+
+	.align 2
+CryDirectSound_567438:: @ 8567438
+	.incbin "baserom.gba", 0x567438, 0x1080
+
+	.align 2
+CryDirectSound_5684B8:: @ 85684B8
+	.incbin "baserom.gba", 0x5684b8, 0xe18
+
+	.align 2
+CryDirectSound_5692D0:: @ 85692D0
+	.incbin "baserom.gba", 0x5692d0, 0xd14
+
+	.align 2
+CryDirectSound_569FE4:: @ 8569FE4
+	.incbin "baserom.gba", 0x569fe4, 0x10ec
+
+	.align 2
+CryDirectSound_56B0D0:: @ 856B0D0
+	.incbin "baserom.gba", 0x56b0d0, 0x1030
+
+	.align 2
+CryDirectSound_56C100:: @ 856C100
+	.incbin "baserom.gba", 0x56c100, 0x1244
+
+	.align 2
+CryDirectSound_56D344:: @ 856D344
+	.incbin "baserom.gba", 0x56d344, 0x86c
+
+	.align 2
+CryDirectSound_56DBB0:: @ 856DBB0
+	.incbin "baserom.gba", 0x56dbb0, 0xd08
 
+	.align 2
+CryDirectSound_56E8B8:: @ 856E8B8
+	.incbin "baserom.gba", 0x56e8b8, 0x103c
+
+	.align 2
+CryDirectSound_56F8F4:: @ 856F8F4
+	.incbin "baserom.gba", 0x56f8f4, 0xe20
+
+	.align 2
+CryDirectSound_570714:: @ 8570714
+	.incbin "baserom.gba", 0x570714, 0x814
+
+	.align 2
+CryDirectSound_570F28:: @ 8570F28
+	.incbin "baserom.gba", 0x570f28, 0xfe0
+
+	.align 2
+CryDirectSound_571F08:: @ 8571F08
+	.incbin "baserom.gba", 0x571f08, 0x1108
+
+	.align 2
+CryDirectSound_573010:: @ 8573010
+	.incbin "baserom.gba", 0x573010, 0x760
+
+	.align 2
+CryDirectSound_573770:: @ 8573770
+	.incbin "baserom.gba", 0x573770, 0xd60
+
+	.align 2
+CryDirectSound_5744D0:: @ 85744D0
+	.incbin "baserom.gba", 0x5744d0, 0x13b4
+
+	.align 2
+CryDirectSound_575884:: @ 8575884
+	.incbin "baserom.gba", 0x575884, 0xf80
+
+	.align 2
+CryDirectSound_576804:: @ 8576804
+	.incbin "baserom.gba", 0x576804, 0x10c4
+
+	.align 2
+CryDirectSound_5778C8:: @ 85778C8
+	.incbin "baserom.gba", 0x5778c8, 0x17e4
+
+	.align 2
+CryDirectSound_5790AC:: @ 85790AC
+	.incbin "baserom.gba", 0x5790ac, 0xba0
+
+	.align 2
+CryDirectSound_579C4C:: @ 8579C4C
+	.incbin "baserom.gba", 0x579c4c, 0xd28
+
+	.align 2
+CryDirectSound_57A974:: @ 857A974
+	.incbin "baserom.gba", 0x57a974, 0x149c
+
+	.align 2
+CryDirectSound_57BE10:: @ 857BE10
+	.incbin "baserom.gba", 0x57be10, 0xeb4
+
+	.align 2
+CryDirectSound_57CCC4:: @ 857CCC4
+	.incbin "baserom.gba", 0x57ccc4, 0xd60
+
+	.align 2
+CryDirectSound_57DA24:: @ 857DA24
+	.incbin "baserom.gba", 0x57da24, 0x1408
+
+	.align 2
+CryDirectSound_57EE2C:: @ 857EE2C
+	.incbin "baserom.gba", 0x57ee2c, 0xfe0
+
+	.align 2
+CryDirectSound_57FE0C:: @ 857FE0C
+	.incbin "baserom.gba", 0x57fe0c, 0xc20
+
+	.align 2
+CryDirectSound_580A2C:: @ 8580A2C
+	.incbin "baserom.gba", 0x580a2c, 0x2628
+
+	.align 2
+CryDirectSound_583054:: @ 8583054
+	.incbin "baserom.gba", 0x583054, 0xe74
+
+	.align 2
+CryDirectSound_583EC8:: @ 8583EC8
+	.incbin "baserom.gba", 0x583ec8, 0x17a4
+
+	.align 2
+CryDirectSound_58566C:: @ 858566C
+	.incbin "baserom.gba", 0x58566c, 0xb9c
+
+	.align 2
+CryDirectSound_586208:: @ 8586208
+	.incbin "baserom.gba", 0x586208, 0x16fc
+
+	.align 2
+CryDirectSound_587904:: @ 8587904
+	.incbin "baserom.gba", 0x587904, 0xa34
+
+	.align 2
+CryDirectSound_588338:: @ 8588338
+	.incbin "baserom.gba", 0x588338, 0x1254
+
+	.align 2
+CryDirectSound_58958C:: @ 858958C
+	.incbin "baserom.gba", 0x58958c, 0x924
+
+	.align 2
+CryDirectSound_589EB0:: @ 8589EB0
+	.incbin "baserom.gba", 0x589eb0, 0x108c
+
+	.align 2
+CryDirectSound_58AF3C:: @ 858AF3C
+	.incbin "baserom.gba", 0x58af3c, 0x1dd8
+
+	.align 2
+CryDirectSound_58CD14:: @ 858CD14
+	.incbin "baserom.gba", 0x58cd14, 0x1118
+
+	.align 2
+CryDirectSound_58DE2C:: @ 858DE2C
+	.incbin "baserom.gba", 0x58de2c, 0x1508
+
+	.align 2
+CryDirectSound_58F334:: @ 858F334
+	.incbin "baserom.gba", 0x58f334, 0xca8
+
+	.align 2
+CryDirectSound_58FFDC:: @ 858FFDC
+	.incbin "baserom.gba", 0x58ffdc, 0xcf4
+
+	.align 2
+CryDirectSound_590CD0:: @ 8590CD0
+	.incbin "baserom.gba", 0x590cd0, 0xce0
+
+	.align 2
+CryDirectSound_5919B0:: @ 85919B0
+	.incbin "baserom.gba", 0x5919b0, 0xa90
+
+	.align 2
+CryDirectSound_592440:: @ 8592440
+	.incbin "baserom.gba", 0x592440, 0x1a44
+
+	.align 2
+CryDirectSound_593E84:: @ 8593E84
+	.incbin "baserom.gba", 0x593e84, 0x1034
+
+	.align 2
+CryDirectSound_594EB8:: @ 8594EB8
+	.incbin "baserom.gba", 0x594eb8, 0xfc8
+
+	.align 2
+CryDirectSound_595E80:: @ 8595E80
+	.incbin "baserom.gba", 0x595e80, 0x1808
+
+	.align 2
+CryDirectSound_597688:: @ 8597688
+	.incbin "baserom.gba", 0x597688, 0xca8
+
+	.align 2
+CryDirectSound_598330:: @ 8598330
+	.incbin "baserom.gba", 0x598330, 0x13b0
+
+	.align 2
+CryDirectSound_5996E0:: @ 85996E0
+	.incbin "baserom.gba", 0x5996e0, 0xdd8
+
+	.align 2
+CryDirectSound_59A4B8:: @ 859A4B8
+	.incbin "baserom.gba", 0x59a4b8, 0xb50
+
+	.align 2
+CryDirectSound_59B008:: @ 859B008
+	.incbin "baserom.gba", 0x59b008, 0x1124
+
+	.align 2
+CryDirectSound_59C12C:: @ 859C12C
+	.incbin "baserom.gba", 0x59c12c, 0xfb8
+
+	.align 2
+CryDirectSound_59D0E4:: @ 859D0E4
+	.incbin "baserom.gba", 0x59d0e4, 0x167c
+
+	.align 2
+CryDirectSound_59E760:: @ 859E760
+	.incbin "baserom.gba", 0x59e760, 0xa34
+
+	.align 2
+CryDirectSound_59F194:: @ 859F194
+	.incbin "baserom.gba", 0x59f194, 0x1028
+
+	.align 2
+CryDirectSound_5A01BC:: @ 85A01BC
+	.incbin "baserom.gba", 0x5a01bc, 0xde0
+
+	.align 2
+CryDirectSound_5A0F9C:: @ 85A0F9C
+	.incbin "baserom.gba", 0x5a0f9c, 0xbb4
+
+	.align 2
+CryDirectSound_5A1B50:: @ 85A1B50
+	.incbin "baserom.gba", 0x5a1b50, 0xa8c
+
+	.align 2
+CryDirectSound_5A25DC:: @ 85A25DC
+	.incbin "baserom.gba", 0x5a25dc, 0xe70
+
+	.align 2
+CryDirectSound_5A344C:: @ 85A344C
+	.incbin "baserom.gba", 0x5a344c, 0xedc
+
+	.align 2
+CryDirectSound_5A4328:: @ 85A4328
+	.incbin "baserom.gba", 0x5a4328, 0x1094
+
+	.align 2
+CryDirectSound_5A53BC:: @ 85A53BC
+	.incbin "baserom.gba", 0x5a53bc, 0x1170
+
+	.align 2
+CryDirectSound_5A652C:: @ 85A652C
+	.incbin "baserom.gba", 0x5a652c, 0x1474
+
+	.align 2
+CryDirectSound_5A79A0:: @ 85A79A0
+	.incbin "baserom.gba", 0x5a79a0, 0x1248
+
+	.align 2
+CryDirectSound_5A8BE8:: @ 85A8BE8
+	.incbin "baserom.gba", 0x5a8be8, 0xcb0
+
+	.align 2
+CryDirectSound_5A9898:: @ 85A9898
+	.incbin "baserom.gba", 0x5a9898, 0x870
+
+	.align 2
+CryDirectSound_5AA108:: @ 85AA108
+	.incbin "baserom.gba", 0x5aa108, 0x1760
+
+	.align 2
+CryDirectSound_5AB868:: @ 85AB868
+	.incbin "baserom.gba", 0x5ab868, 0x25f8
+
+	.align 2
+CryDirectSound_5ADE60:: @ 85ADE60
+	.incbin "baserom.gba", 0x5ade60, 0x1694
+
+	.align 2
+CryDirectSound_5AF4F4:: @ 85AF4F4
+	.incbin "baserom.gba", 0x5af4f4, 0xe78
+
+	.align 2
+CryDirectSound_5B036C:: @ 85B036C
+	.incbin "baserom.gba", 0x5b036c, 0x860
+
+	.align 2
+CryDirectSound_5B0BCC:: @ 85B0BCC
+	.incbin "baserom.gba", 0x5b0bcc, 0xac0
+
+	.align 2
+CryDirectSound_5B168C:: @ 85B168C
+	.incbin "baserom.gba", 0x5b168c, 0x94c
+
+	.align 2
+CryDirectSound_5B1FD8:: @ 85B1FD8
+	.incbin "baserom.gba", 0x5b1fd8, 0xc5c
+
+	.align 2
+CryDirectSound_5B2C34:: @ 85B2C34
+	.incbin "baserom.gba", 0x5b2c34, 0x1508
+
+	.align 2
+CryDirectSound_5B413C:: @ 85B413C
+	.incbin "baserom.gba", 0x5b413c, 0xa98
+
+	.align 2
+CryDirectSound_5B4BD4:: @ 85B4BD4
+	.incbin "baserom.gba", 0x5b4bd4, 0xc30
+
+	.align 2
+CryDirectSound_5B5804:: @ 85B5804
+	.incbin "baserom.gba", 0x5b5804, 0xde0
+
+	.align 2
+CryDirectSound_5B65E4:: @ 85B65E4
+	.incbin "baserom.gba", 0x5b65e4, 0xba0
+
+	.align 2
+CryDirectSound_5B7184:: @ 85B7184
+	.incbin "baserom.gba", 0x5b7184, 0x170c
+
+	.align 2
+CryDirectSound_5B8890:: @ 85B8890
+	.incbin "baserom.gba", 0x5b8890, 0x990
+
+	.align 2
+CryDirectSound_5B9220:: @ 85B9220
+	.incbin "baserom.gba", 0x5b9220, 0xa68
+
+	.align 2
+CryDirectSound_5B9C88:: @ 85B9C88
+	.incbin "baserom.gba", 0x5b9c88, 0x598
+
+	.align 2
+CryDirectSound_5BA220:: @ 85BA220
+	.incbin "baserom.gba", 0x5ba220, 0xb1c
+
+	.align 2
+CryDirectSound_5BAD3C:: @ 85BAD3C
+	.incbin "baserom.gba", 0x5bad3c, 0x954
+
+	.align 2
+CryDirectSound_5BB690:: @ 85BB690
+	.incbin "baserom.gba", 0x5bb690, 0x600
+
+	.align 2
+CryDirectSound_5BBC90:: @ 85BBC90
+	.incbin "baserom.gba", 0x5bbc90, 0x904
+
+	.align 2
+CryDirectSound_5BC594:: @ 85BC594
+	.incbin "baserom.gba", 0x5bc594, 0x11b0
+
+	.align 2
+CryDirectSound_5BD744:: @ 85BD744
+	.incbin "baserom.gba", 0x5bd744, 0xc6c
+
+	.align 2
+CryDirectSound_5BE3B0:: @ 85BE3B0
+	.incbin "baserom.gba", 0x5be3b0, 0x9a8
+
+	.align 2
+CryDirectSound_5BED58:: @ 85BED58
+	.incbin "baserom.gba", 0x5bed58, 0x1cd4
+
+	.align 2
+CryDirectSound_5C0A2C:: @ 85C0A2C
+	.incbin "baserom.gba", 0x5c0a2c, 0x1f80
+
+	.align 2
+CryDirectSound_5C29AC:: @ 85C29AC
+	.incbin "baserom.gba", 0x5c29ac, 0xba8
+
+	.align 2
+CryDirectSound_5C3554:: @ 85C3554
+	.incbin "baserom.gba", 0x5c3554, 0x1474
+
+	.align 2
+CryDirectSound_5C49C8:: @ 85C49C8
+	.incbin "baserom.gba", 0x5c49c8, 0x1a1c
+
+	.align 2
+CryDirectSound_5C63E4:: @ 85C63E4
+	.incbin "baserom.gba", 0x5c63e4, 0x784
+
+	.align 2
+CryDirectSound_5C6B68:: @ 85C6B68
+	.incbin "baserom.gba", 0x5c6b68, 0x1104
+
+	.align 2
+CryDirectSound_5C7C6C:: @ 85C7C6C
+	.incbin "baserom.gba", 0x5c7c6c, 0x1680
+
+	.align 2
+CryDirectSound_5C92EC:: @ 85C92EC
+	.incbin "baserom.gba", 0x5c92ec, 0xbc8
+
+	.align 2
+CryDirectSound_5C9EB4:: @ 85C9EB4
+	.incbin "baserom.gba", 0x5c9eb4, 0xc40
+
+	.align 2
+CryDirectSound_5CAAF4:: @ 85CAAF4
+	.incbin "baserom.gba", 0x5caaf4, 0xca8
+
+	.align 2
+CryDirectSound_5CB79C:: @ 85CB79C
+	.incbin "baserom.gba", 0x5cb79c, 0x840
+
+	.align 2
+CryDirectSound_5CBFDC:: @ 85CBFDC
+	.incbin "baserom.gba", 0x5cbfdc, 0x468
+
+	.align 2
+CryDirectSound_5CC444:: @ 85CC444
+	.incbin "baserom.gba", 0x5cc444, 0xe94
+
+	.align 2
+CryDirectSound_5CD2D8:: @ 85CD2D8
+	.incbin "baserom.gba", 0x5cd2d8, 0x10d0
+
+	.align 2
+CryDirectSound_5CE3A8:: @ 85CE3A8
+	.incbin "baserom.gba", 0x5ce3a8, 0x82c
+
+	.align 2
+CryDirectSound_5CEBD4:: @ 85CEBD4
+	.incbin "baserom.gba", 0x5cebd4, 0xb68
+
+	.align 2
+CryDirectSound_5CF73C:: @ 85CF73C
+	.incbin "baserom.gba", 0x5cf73c, 0x13c4
+
+	.align 2
+CryDirectSound_5D0B00:: @ 85D0B00
+	.incbin "baserom.gba", 0x5d0b00, 0xa14
+
+	.align 2
+CryDirectSound_5D1514:: @ 85D1514
+	.incbin "baserom.gba", 0x5d1514, 0x8cc
+
+	.align 2
+CryDirectSound_5D1DE0:: @ 85D1DE0
+	.incbin "baserom.gba", 0x5d1de0, 0x102c
+
+	.align 2
+CryDirectSound_5D2E0C:: @ 85D2E0C
+	.incbin "baserom.gba", 0x5d2e0c, 0x838
+
+	.align 2
+CryDirectSound_5D3644:: @ 85D3644
+	.incbin "baserom.gba", 0x5d3644, 0x1044
+
+	.align 2
+CryDirectSound_5D4688:: @ 85D4688
+	.incbin "baserom.gba", 0x5d4688, 0xcac
+
+	.align 2
+CryDirectSound_5D5334:: @ 85D5334
+	.incbin "baserom.gba", 0x5d5334, 0xa1c
+
+	.align 2
+CryDirectSound_5D5D50:: @ 85D5D50
+	.incbin "baserom.gba", 0x5d5d50, 0xc30
+
+	.align 2
+CryDirectSound_5D6980:: @ 85D6980
+	.incbin "baserom.gba", 0x5d6980, 0x1864
+
+	.align 2
+CryDirectSound_5D81E4:: @ 85D81E4
+	.incbin "baserom.gba", 0x5d81e4, 0x884
+
+	.align 2
+CryDirectSound_5D8A68:: @ 85D8A68
+	.incbin "baserom.gba", 0x5d8a68, 0xe58
+
+	.align 2
+CryDirectSound_5D98C0:: @ 85D98C0
+	.incbin "baserom.gba", 0x5d98c0, 0x9ec
+
+	.align 2
+CryDirectSound_5DA2AC:: @ 85DA2AC
+	.incbin "baserom.gba", 0x5da2ac, 0x670
+
+	.align 2
+CryDirectSound_5DA91C:: @ 85DA91C
+	.incbin "baserom.gba", 0x5da91c, 0xc28
+
+	.align 2
+CryDirectSound_5DB544:: @ 85DB544
+	.incbin "baserom.gba", 0x5db544, 0x7b8
+
+	.align 2
+CryDirectSound_5DBCFC:: @ 85DBCFC
+	.incbin "baserom.gba", 0x5dbcfc, 0x75c
+
+	.align 2
+CryDirectSound_5DC458:: @ 85DC458
+	.incbin "baserom.gba", 0x5dc458, 0x10b8
+
+	.align 2
+CryDirectSound_5DD510:: @ 85DD510
+	.incbin "baserom.gba", 0x5dd510, 0xd64
+
+	.align 2
+CryDirectSound_5DE274:: @ 85DE274
+	.incbin "baserom.gba", 0x5de274, 0x14e4
+
+	.align 2
+CryDirectSound_5DF758:: @ 85DF758
+	.incbin "baserom.gba", 0x5df758, 0x8fc
+
+	.align 2
+CryDirectSound_5E0054:: @ 85E0054
+	.incbin "baserom.gba", 0x5e0054, 0x1008
+
+	.align 2
+CryDirectSound_5E105C:: @ 85E105C
+	.incbin "baserom.gba", 0x5e105c, 0xa80
+
+	.align 2
+CryDirectSound_5E1ADC:: @ 85E1ADC
+	.incbin "baserom.gba", 0x5e1adc, 0x13b4
+
+	.align 2
+CryDirectSound_5E2E90:: @ 85E2E90
+	.incbin "baserom.gba", 0x5e2e90, 0x714
+
+	.align 2
+CryDirectSound_5E35A4:: @ 85E35A4
+	.incbin "baserom.gba", 0x5e35a4, 0x1518
+
+	.align 2
+CryDirectSound_5E4ABC:: @ 85E4ABC
+	.incbin "baserom.gba", 0x5e4abc, 0x804
+
+	.align 2
+CryDirectSound_5E52C0:: @ 85E52C0
+	.incbin "baserom.gba", 0x5e52c0, 0x1160
+
+	.align 2
+CryDirectSound_5E6420:: @ 85E6420
+	.incbin "baserom.gba", 0x5e6420, 0x94c
+
+	.align 2
+CryDirectSound_5E6D6C:: @ 85E6D6C
+	.incbin "baserom.gba", 0x5e6d6c, 0x1720
+
+	.align 2
+CryDirectSound_5E848C:: @ 85E848C
+	.incbin "baserom.gba", 0x5e848c, 0x93c
+
+	.align 2
+CryDirectSound_5E8DC8:: @ 85E8DC8
+	.incbin "baserom.gba", 0x5e8dc8, 0x10fc
+
+	.align 2
+CryDirectSound_5E9EC4:: @ 85E9EC4
+	.incbin "baserom.gba", 0x5e9ec4, 0xc04
+
+	.align 2
+CryDirectSound_5EAAC8:: @ 85EAAC8
+	.incbin "baserom.gba", 0x5eaac8, 0x18b8
+
+	.align 2
+CryDirectSound_5EC380:: @ 85EC380
+	.incbin "baserom.gba", 0x5ec380, 0x740
+
+	.align 2
+CryDirectSound_5ECAC0:: @ 85ECAC0
+	.incbin "baserom.gba", 0x5ecac0, 0xca0
+
+	.align 2
+CryDirectSound_5ED760:: @ 85ED760
+	.incbin "baserom.gba", 0x5ed760, 0xa24
+
+	.align 2
+CryDirectSound_5EE184:: @ 85EE184
+	.incbin "baserom.gba", 0x5ee184, 0xe04
+
+	.align 2
+CryDirectSound_5EEF88:: @ 85EEF88
+	.incbin "baserom.gba", 0x5eef88, 0x1a08
+
+	.align 2
+CryDirectSound_5F0990:: @ 85F0990
+	.incbin "baserom.gba", 0x5f0990, 0x8f0
+
+	.align 2
+CryDirectSound_5F1280:: @ 85F1280
+	.incbin "baserom.gba", 0x5f1280, 0x16b0
+
+	.align 2
+CryDirectSound_5F2930:: @ 85F2930
+	.incbin "baserom.gba", 0x5f2930, 0xc84
+
+	.align 2
+CryDirectSound_5F35B4:: @ 85F35B4
+	.incbin "baserom.gba", 0x5f35b4, 0x1360
+
+	.align 2
+CryDirectSound_5F4914:: @ 85F4914
+	.incbin "baserom.gba", 0x5f4914, 0x17fc
+
+	.align 2
+CryDirectSound_5F6110:: @ 85F6110
+	.incbin "baserom.gba", 0x5f6110, 0x102c
+
+	.align 2
+CryDirectSound_5F713C:: @ 85F713C
+	.incbin "baserom.gba", 0x5f713c, 0x7d4
+
+	.align 2
+CryDirectSound_5F7910:: @ 85F7910
+	.incbin "baserom.gba", 0x5f7910, 0x2744
+
+	.align 2
+CryDirectSound_5FA054:: @ 85FA054
+	.incbin "baserom.gba", 0x5fa054, 0xa7c
+
+	.align 2
+CryDirectSound_5FAAD0:: @ 85FAAD0
+	.incbin "baserom.gba", 0x5faad0, 0x820
+
+	.align 2
+CryDirectSound_5FB2F0:: @ 85FB2F0
+	.incbin "baserom.gba", 0x5fb2f0, 0x1084
+
+	.align 2
+CryDirectSound_5FC374:: @ 85FC374
+	.incbin "baserom.gba", 0x5fc374, 0x5b4
+
+	.align 2
+CryDirectSound_5FC928:: @ 85FC928
+	.incbin "baserom.gba", 0x5fc928, 0xbd8
+
+	.align 2
+CryDirectSound_5FD500:: @ 85FD500
+	.incbin "baserom.gba", 0x5fd500, 0x244c
+
+	.align 2
+CryDirectSound_5FF94C:: @ 85FF94C
+	.incbin "baserom.gba", 0x5ff94c, 0x1250
+
+	.align 2
+CryDirectSound_600B9C:: @ 8600B9C
+	.incbin "baserom.gba", 0x600b9c, 0xfe8
+
+	.align 2
+CryDirectSound_601B84:: @ 8601B84
+	.incbin "baserom.gba", 0x601b84, 0x166c
+
+	.align 2
+CryDirectSound_6031F0:: @ 86031F0
+	.incbin "baserom.gba", 0x6031f0, 0x9a8
+
+	.align 2
+CryDirectSound_603B98:: @ 8603B98
+	.incbin "baserom.gba", 0x603b98, 0x1d30
+
+	.align 2
+CryDirectSound_6058C8:: @ 86058C8
+	.incbin "baserom.gba", 0x6058c8, 0xbb8
+
+	.align 2
+CryDirectSound_606480:: @ 8606480
+	.incbin "baserom.gba", 0x606480, 0x16d4
+
+	.align 2
+CryDirectSound_607B54:: @ 8607B54
+	.incbin "baserom.gba", 0x607b54, 0x9a0
+
+	.align 2
+CryDirectSound_6084F4:: @ 86084F4
+	.incbin "baserom.gba", 0x6084f4, 0x12d4
+
+	.align 2
+CryDirectSound_6097C8:: @ 86097C8
+	.incbin "baserom.gba", 0x6097c8, 0x2778
+
+	.align 2
+CryDirectSound_60BF40:: @ 860BF40
+	.incbin "baserom.gba", 0x60bf40, 0x7d4
+
+	.align 2
+CryDirectSound_60C714:: @ 860C714
+	.incbin "baserom.gba", 0x60c714, 0x1408
+
+	.align 2
+CryDirectSound_60DB1C:: @ 860DB1C
+	.incbin "baserom.gba", 0x60db1c, 0x1fdc
+
+	.align 2
+CryDirectSound_60FAF8:: @ 860FAF8
+	.incbin "baserom.gba", 0x60faf8, 0x2000
+
+	.align 2
+CryDirectSound_611AF8:: @ 8611AF8
+	.incbin "baserom.gba", 0x611af8, 0x1704
+
+	.align 2
+CryDirectSound_6131FC:: @ 86131FC
+	.incbin "baserom.gba", 0x6131fc, 0xc98
+
+	.align 2
+CryDirectSound_613E94:: @ 8613E94
+	.incbin "baserom.gba", 0x613e94, 0xb88
+
+	.align 2
+CryDirectSound_614A1C:: @ 8614A1C
+	.incbin "baserom.gba", 0x614a1c, 0x1118
+
+	.align 2
+CryDirectSound_615B34:: @ 8615B34
+	.incbin "baserom.gba", 0x615b34, 0x948
+
+	.align 2
+CryDirectSound_61647C:: @ 861647C
+	.incbin "baserom.gba", 0x61647c, 0x138c
+
+	.align 2
+CryDirectSound_617808:: @ 8617808
+	.incbin "baserom.gba", 0x617808, 0xdb8
+
+	.align 2
+CryDirectSound_6185C0:: @ 86185C0
+	.incbin "baserom.gba", 0x6185c0, 0xba4
+
+	.align 2
+CryDirectSound_619164:: @ 8619164
+	.incbin "baserom.gba", 0x619164, 0xb80
+
+	.align 2
+CryDirectSound_619CE4:: @ 8619CE4
+	.incbin "baserom.gba", 0x619ce4, 0x92c
+
+	.align 2
+CryDirectSound_61A610:: @ 861A610
+	.incbin "baserom.gba", 0x61a610, 0x14d8
+
+	.align 2
+CryDirectSound_61BAE8:: @ 861BAE8
+	.incbin "baserom.gba", 0x61bae8, 0x19a4
+
+	.align 2
+CryDirectSound_61D48C:: @ 861D48C
+	.incbin "baserom.gba", 0x61d48c, 0x1430
+
+	.align 2
+CryDirectSound_61E8BC:: @ 861E8BC
+	.incbin "baserom.gba", 0x61e8bc, 0x4dc
+
+	.align 2
+CryDirectSound_61ED98:: @ 861ED98
+	.incbin "baserom.gba", 0x61ed98, 0x250c
+
+	.align 2
+CryDirectSound_6212A4:: @ 86212A4
+	.incbin "baserom.gba", 0x6212a4, 0x23b8
+
+	.align 2
+CryDirectSound_62365C:: @ 862365C
+	.incbin "baserom.gba", 0x62365c, 0x1d2c
+
+	.align 2
+CryDirectSound_625388:: @ 8625388
+	.incbin "baserom.gba", 0x625388, 0x191c
+
+	.align 2
+CryDirectSound_626CA4:: @ 8626CA4
+	.incbin "baserom.gba", 0x626ca4, 0xcc0
+
+	.align 2
+CryDirectSound_627964:: @ 8627964
+	.incbin "baserom.gba", 0x627964, 0x8d8
+
+	.align 2
+CryDirectSound_62823C:: @ 862823C
+	.incbin "baserom.gba", 0x62823c, 0x1e9c
+
+	.align 2
+CryDirectSound_62A0D8:: @ 862A0D8
+	.incbin "baserom.gba", 0x62a0d8, 0x20c4
+
+	.align 2
+CryDirectSound_62C19C:: @ 862C19C
+	.incbin "baserom.gba", 0x62c19c, 0x1c60
+
+	.align 2
+CryDirectSound_62DDFC:: @ 862DDFC
+	.incbin "baserom.gba", 0x62ddfc, 0xb90
+
+	.align 2
+CryDirectSound_62E98C:: @ 862E98C
+	.incbin "baserom.gba", 0x62e98c, 0x1c48
+
+	.align 2
+CryDirectSound_6305D4:: @ 86305D4
+	.incbin "baserom.gba", 0x6305d4, 0xd28
+
+	.align 2
+CryDirectSound_6312FC:: @ 86312FC
+	.incbin "baserom.gba", 0x6312fc, 0x2a10
+
+	.align 2
+CryDirectSound_633D0C:: @ 8633D0C
+	.incbin "baserom.gba", 0x633d0c, 0x824
+
+	.align 2
+CryDirectSound_634530:: @ 8634530
+	.incbin "baserom.gba", 0x634530, 0x1108
+
+	.align 2
+CryDirectSound_635638:: @ 8635638
+	.incbin "baserom.gba", 0x635638, 0x15f8
+
+	.align 2
+CryDirectSound_636C30:: @ 8636C30
+	.incbin "baserom.gba", 0x636c30, 0xd84
+
+	.align 2
+CryDirectSound_6379B4:: @ 86379B4
+	.incbin "baserom.gba", 0x6379b4, 0x14d4
+
+	.align 2
+CryDirectSound_638E88:: @ 8638E88
+	.incbin "baserom.gba", 0x638e88, 0xa10
+
+	.align 2
 DirectSoundWaveData_8639898:: @ 8639898
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8639898.bin"
 	.incbin "sound/direct_sound_samples/8639898.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8639EF8:: @ 8639EF8
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8639EF8.bin"
 	.incbin "sound/direct_sound_samples/8639EF8.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_863A3DC:: @ 863A3DC
 	.4byte 0
 	.incbin "sound/direct_sound_samples/863A3DC.bin"
 	.incbin "sound/direct_sound_samples/863A3DC.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_863AD2C:: @ 863AD2C
 	.4byte 0
 	.incbin "sound/direct_sound_samples/863AD2C.bin"
 	.incbin "sound/direct_sound_samples/863AD2C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_863B79C:: @ 863B79C
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/863B79C.bin"
 	.incbin "sound/direct_sound_samples/863B79C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_863BABC:: @ 863BABC
 	.4byte 0
 	.incbin "sound/direct_sound_samples/863BABC.bin"
 	.incbin "sound/direct_sound_samples/863BABC.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_863C744:: @ 863C744
 	.4byte 0
 	.incbin "sound/direct_sound_samples/863C744.bin"
 	.incbin "sound/direct_sound_samples/863C744.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_863CD64:: @ 863CD64
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/863CD64.bin"
 	.incbin "sound/direct_sound_samples/863CD64.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_863D0EC:: @ 863D0EC
 	.4byte 0
 	.incbin "sound/direct_sound_samples/863D0EC.bin"
 	.incbin "sound/direct_sound_samples/863D0EC.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_863DED0:: @ 863DED0
 	.4byte 0
 	.incbin "sound/direct_sound_samples/863DED0.bin"
 	.incbin "sound/direct_sound_samples/863DED0.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_863E840:: @ 863E840
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/863E840.bin"
 	.incbin "sound/direct_sound_samples/863E840.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_863EBDC:: @ 863EBDC
 	.4byte 0
 	.incbin "sound/direct_sound_samples/863EBDC.bin"
 	.incbin "sound/direct_sound_samples/863EBDC.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_863F390:: @ 863F390
 	.4byte 0
 	.incbin "sound/direct_sound_samples/863F390.bin"
 	.incbin "sound/direct_sound_samples/863F390.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_86400EC:: @ 86400EC
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/86400EC.bin"
 	.incbin "sound/direct_sound_samples/86400EC.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8640330:: @ 8640330
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8640330.bin"
 	.incbin "sound/direct_sound_samples/8640330.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8641170:: @ 8641170
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8641170.bin"
 	.incbin "sound/direct_sound_samples/8641170.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8641AC4:: @ 8641AC4
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8641AC4.bin"
 	.incbin "sound/direct_sound_samples/8641AC4.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8641E18:: @ 8641E18
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8641E18.bin"
 	.incbin "sound/direct_sound_samples/8641E18.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_864244C:: @ 864244C
 	.4byte 0
 	.incbin "sound/direct_sound_samples/864244C.bin"
 	.incbin "sound/direct_sound_samples/864244C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_86430B8:: @ 86430B8
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/86430B8.bin"
 	.incbin "sound/direct_sound_samples/86430B8.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8643650:: @ 8643650
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8643650.bin"
 	.incbin "sound/direct_sound_samples/8643650.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8644154:: @ 8644154
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8644154.bin"
 	.incbin "sound/direct_sound_samples/8644154.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8644758:: @ 8644758
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8644758.bin"
 	.incbin "sound/direct_sound_samples/8644758.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8644950:: @ 8644950
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8644950.bin"
 	.incbin "sound/direct_sound_samples/8644950.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_86452B4:: @ 86452B4
 	.4byte 0
 	.incbin "sound/direct_sound_samples/86452B4.bin"
 	.incbin "sound/direct_sound_samples/86452B4.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8646240:: @ 8646240
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8646240.bin"
 	.incbin "sound/direct_sound_samples/8646240.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8646878:: @ 8646878
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8646878.bin"
 	.incbin "sound/direct_sound_samples/8646878.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_864734C:: @ 864734C
 	.4byte 0
 	.incbin "sound/direct_sound_samples/864734C.bin"
 	.incbin "sound/direct_sound_samples/864734C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8648290:: @ 8648290
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8648290.bin"
 	.incbin "sound/direct_sound_samples/8648290.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8648808:: @ 8648808
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8648808.bin"
 	.incbin "sound/direct_sound_samples/8648808.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8649654:: @ 8649654
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8649654.bin"
 	.incbin "sound/direct_sound_samples/8649654.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_864A55C:: @ 864A55C
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/864A55C.bin"
 	.incbin "sound/direct_sound_samples/864A55C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_864B030:: @ 864B030
 	.4byte 0
 	.incbin "sound/direct_sound_samples/864B030.bin"
 	.incbin "sound/direct_sound_samples/864B030.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_864BBC4:: @ 864BBC4
 	.4byte 0
 	.incbin "sound/direct_sound_samples/864BBC4.bin"
 	.incbin "sound/direct_sound_samples/864BBC4.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_864C59C:: @ 864C59C
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/864C59C.bin"
 	.incbin "sound/direct_sound_samples/864C59C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_864CBDC:: @ 864CBDC
 	.4byte 0
 	.incbin "sound/direct_sound_samples/864CBDC.bin"
 	.incbin "sound/direct_sound_samples/864CBDC.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_864D6BC:: @ 864D6BC
 	.4byte 0
 	.incbin "sound/direct_sound_samples/864D6BC.bin"
 	.incbin "sound/direct_sound_samples/864D6BC.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_864DCF8:: @ 864DCF8
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/864DCF8.bin"
 	.incbin "sound/direct_sound_samples/864DCF8.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_864E410:: @ 864E410
 	.4byte 0
 	.incbin "sound/direct_sound_samples/864E410.bin"
 	.incbin "sound/direct_sound_samples/864E410.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_864ED4C:: @ 864ED4C
 	.4byte 0
 	.incbin "sound/direct_sound_samples/864ED4C.bin"
 	.incbin "sound/direct_sound_samples/864ED4C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_864F508:: @ 864F508
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/864F508.bin"
 	.incbin "sound/direct_sound_samples/864F508.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_864FA6C:: @ 864FA6C
 	.4byte 0
 	.incbin "sound/direct_sound_samples/864FA6C.bin"
 	.incbin "sound/direct_sound_samples/864FA6C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_86507E0:: @ 86507E0
 	.4byte 0
 	.incbin "sound/direct_sound_samples/86507E0.bin"
 	.incbin "sound/direct_sound_samples/86507E0.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8650C5C:: @ 8650C5C
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8650C5C.bin"
 	.incbin "sound/direct_sound_samples/8650C5C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8651148:: @ 8651148
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8651148.bin"
 	.incbin "sound/direct_sound_samples/8651148.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8651910:: @ 8651910
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8651910.bin"
 	.incbin "sound/direct_sound_samples/8651910.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_865250C:: @ 865250C
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/865250C.bin"
 	.incbin "sound/direct_sound_samples/865250C.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8652884:: @ 8652884
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8652884.bin"
 	.incbin "sound/direct_sound_samples/8652884.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8653040:: @ 8653040
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8653040.bin"
 	.incbin "sound/direct_sound_samples/8653040.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8653CA4:: @ 8653CA4
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8653CA4.bin"
 	.incbin "sound/direct_sound_samples/8653CA4.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8654170:: @ 8654170
 	.4byte 0
 	.incbin "sound/direct_sound_samples/8654170.bin"
 	.incbin "sound/direct_sound_samples/8654170.pcm"
-	.align 2
 
+	.align 2
 DirectSoundWaveData_8654C20:: @ 8654C20
 	.4byte 0x40000000  @ looped directsound
 	.incbin "sound/direct_sound_samples/8654C20.bin"
 	.incbin "sound/direct_sound_samples/8654C20.pcm"
+
 	.align 2
diff --git a/sound/voice_groups.s b/sound/voice_groups.s
index 2aaf8a3db..f250a394c 100644
--- a/sound/voice_groups.s
+++ b/sound/voice_groups.s
@@ -1,3 +1,4 @@
+	.align 2
 voicegroup_842FC88:: @ 842FC8
 	voice_keysplit_all voicegroup_842FEF8  @ 842FC88
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 842FC94
@@ -52,6 +53,7 @@ voicegroup_842FC88:: @ 842FC8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FEE0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FEEC
 
+	.align 2
 voicegroup_842FEF8:: @ 842FEF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FEF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FF04
@@ -119,17 +121,20 @@ voicegroup_842FEF8:: @ 842FEF8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84301EC
 	voice_directsound_no_resample 72, 222, DirectSoundWaveData_84622A4, 255, 0, 255, 0  @ 84301F8
 
+	.align 2
 voicegroup_8430204:: @ 8430204
 	voice_directsound 60, 0, DirectSoundWaveData_846286C, 255, 252, 0, 239  @ 8430204
 	voice_directsound 60, 0, DirectSoundWaveData_84637CC, 255, 250, 0, 221  @ 8430210
 	voice_directsound 60, 0, DirectSoundWaveData_8464E2C, 255, 250, 0, 221  @ 843021C
 	voice_directsound 60, 0, DirectSoundWaveData_8466388, 255, 247, 0, 221  @ 8430228
 
+	.align 2
 voicegroup_8430234:: @ 8430234
 	voice_directsound 60, 0, DirectSoundWaveData_8466F14, 255, 0, 255, 196  @ 8430234
 	voice_directsound 60, 0, DirectSoundWaveData_846A4B8, 255, 0, 255, 196  @ 8430240
 	voice_directsound 60, 0, DirectSoundWaveData_846C7D4, 255, 0, 255, 196  @ 843024C
 
+	.align 2
 voicegroup_8430258:: @ 8430258
 	voice_directsound 60, 0, DirectSoundWaveData_846FEA0, 255, 0, 193, 127  @ 8430258
 	voice_directsound 60, 0, DirectSoundWaveData_84711F0, 255, 0, 193, 127  @ 8430264
@@ -263,14 +268,17 @@ voicegroup_8430258:: @ 8430258
 	voice_square_1_alt 36, 2, 0, 1, 4, 2  @ 8430864
 	voice_square_1_alt 21, 2, 0, 0, 15, 2  @ 8430870
 
+	.align 2
 voicegroup_843087C:: @ 843087
 	voice_directsound 60, 0, DirectSoundWaveData_8473B20, 255, 0, 255, 165  @ 843087C
 	voice_directsound 60, 0, DirectSoundWaveData_8474BBC, 255, 0, 255, 165  @ 8430888
 
+	.align 2
 voicegroup_8430894:: @ 8430894
 	voice_directsound 60, 0, DirectSoundWaveData_8475C18, 255, 0, 224, 165  @ 8430894
 	voice_directsound 60, 0, DirectSoundWaveData_847CBAC, 255, 0, 218, 165  @ 84308A0
 
+	.align 2
 voicegroup_84308AC:: @ 84308AC
 	voice_keysplit_all voicegroup_8435FAC  @ 84308AC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84308B8
@@ -357,6 +365,7 @@ voicegroup_84308AC:: @ 84308AC
 	voice_square_1 0, 3, 0, 1, 7, 1  @ 8430C84
 	voice_square_1 0, 3, 0, 0, 7, 1  @ 8430C90
 
+	.align 2
 voicegroup_8430C9C:: @ 8430C9C
 	voice_keysplit_all voicegroup_8433BAC  @ 8430C9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8430CA8
@@ -487,6 +496,7 @@ voicegroup_8430C9C:: @ 8430C9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431284
 	voice_noise_alt 0, 0, 1, 0, 0  @ 8431290
 
+	.align 2
 voicegroup_843129C:: @ 843129C
 	voice_keysplit_all voicegroup_842FEF8  @ 843129C
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 84312A8
@@ -591,6 +601,7 @@ voicegroup_843129C:: @ 843129C
 	voice_square_1_alt 29, 2, 0, 2, 0, 0  @ 843174C
 	voice_square_1_alt 22, 2, 0, 2, 0, 0  @ 8431758
 
+	.align 2
 voicegroup_8431764:: @ 8431764
 	voice_keysplit_all voicegroup_842FEF8  @ 8431764
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431770
@@ -683,6 +694,7 @@ voicegroup_8431764:: @ 8431764
 	voice_square_1_alt 0, 1, 0, 0, 7, 1  @ 8431B84
 	voice_square_1_alt 0, 3, 0, 0, 7, 1  @ 8431B90
 
+	.align 2
 voicegroup_8431B9C:: @ 8431B9C
 	voice_keysplit_all voicegroup_842FEF8  @ 8431B9C
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 8431BA8
@@ -770,6 +782,7 @@ voicegroup_8431B9C:: @ 8431B9C
 	voice_programmable_wave_alt ProgrammableWaveData_845541C, 0, 7, 15, 0  @ 8431F80
 	voice_square_1_alt 0, 3, 0, 0, 7, 0  @ 8431F8C
 
+	.align 2
 voicegroup_8431F98:: @ 8431F98
 	voice_keysplit_all voicegroup_84323E8  @ 8431F98
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 8431FA4
@@ -864,6 +877,7 @@ voicegroup_8431F98:: @ 8431F98
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84323D0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84323DC
 
+	.align 2
 voicegroup_84323E8:: @ 84323E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84323E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84323F4
@@ -931,6 +945,7 @@ voicegroup_84323E8:: @ 84323E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84326DC
 	voice_directsound_no_resample 72, 190, DirectSoundWaveData_84622A4, 255, 0, 255, 0  @ 84326E8
 
+	.align 2
 voicegroup_84326F4:: @ 84326F4
 	voice_keysplit_all voicegroup_842FEF8  @ 84326F4
 	voice_square_2_alt 2, 0, 3, 3, 1  @ 8432700
@@ -1024,6 +1039,7 @@ voicegroup_84326F4:: @ 84326F4
 	voice_square_1_alt 0, 1, 1, 2, 6, 2  @ 8432B20
 	voice_square_1_alt 0, 1, 0, 0, 6, 2  @ 8432B2C
 
+	.align 2
 voicegroup_8432B38:: @ 8432B38
 	voice_keysplit_all voicegroup_842FEF8  @ 8432B38
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 8432B44
@@ -1154,6 +1170,7 @@ voicegroup_8432B38:: @ 8432B38
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433120
 	voice_noise_alt 1, 0, 1, 0, 3  @ 843312C
 
+	.align 2
 voicegroup_8433138:: @ 8433138
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433138
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433144
@@ -1241,6 +1258,7 @@ voicegroup_8433138:: @ 8433138
 	voice_square_1_alt 0, 2, 0, 0, 7, 1  @ 843351C
 	voice_square_1_alt 0, 1, 0, 0, 7, 1  @ 8433528
 
+	.align 2
 voicegroup_8433534:: @ 8433534
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 8433534
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433540
@@ -1330,6 +1348,7 @@ voicegroup_8433534:: @ 8433534
 	voice_square_1_alt 0, 1, 0, 0, 6, 2  @ 8433930
 	voice_square_1 0, 2, 0, 0, 7, 1  @ 843393C
 
+	.align 2
 voicegroup_8433948:: @ 8433948
 	voice_keysplit_all voicegroup_842FEF8  @ 8433948
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433954
@@ -1383,6 +1402,7 @@ voicegroup_8433948:: @ 8433948
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433B94
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433BA0
 
+	.align 2
 voicegroup_8433BAC:: @ 8433BAC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433BAC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433BB8
@@ -1450,6 +1470,7 @@ voicegroup_8433BAC:: @ 8433BAC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8433EA0
 	voice_directsound_no_resample 72, 189, DirectSoundWaveData_84622A4, 255, 0, 255, 0  @ 8433EAC
 
+	.align 2
 voicegroup_8433EB8:: @ 8433EB8
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 8433EB8
 	voice_keysplit_all voicegroup_842FEF8  @ 8433EC4
@@ -1541,6 +1562,7 @@ voicegroup_8433EB8:: @ 8433EB8
 	voice_square_1_alt 0, 2, 0, 0, 7, 0  @ 84342CC
 	voice_square_1_alt 0, 3, 0, 0, 7, 0  @ 84342D8
 
+	.align 2
 voicegroup_84342E4:: @ 84342E4
 	voice_keysplit_all voicegroup_842FEF8  @ 84342E4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84342F0
@@ -1634,6 +1656,7 @@ voicegroup_84342E4:: @ 84342E4
 	voice_programmable_wave_alt ProgrammableWaveData_845541C, 0, 7, 15, 0  @ 8434710
 	voice_programmable_wave_alt ProgrammableWaveData_845541C, 0, 7, 15, 1  @ 843471C
 
+	.align 2
 voicegroup_8434728:: @ 8434728
 	voice_keysplit_all voicegroup_842FEF8  @ 8434728
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434734
@@ -1720,6 +1743,7 @@ voicegroup_8434728:: @ 8434728
 	voice_square_1_alt 0, 1, 0, 1, 7, 1  @ 8434B00
 	voice_square_2_alt 2, 0, 1, 0, 0  @ 8434B0C
 
+	.align 2
 voicegroup_8434B18:: @ 8434B18
 	voice_keysplit_all voicegroup_842FEF8  @ 8434B18
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8434B24
@@ -1807,6 +1831,7 @@ voicegroup_8434B18:: @ 8434B18
 	voice_square_2_alt 3, 0, 1, 7, 0  @ 8434EFC
 	voice_square_1_alt 0, 3, 0, 1, 7, 0  @ 8434F08
 
+	.align 2
 voicegroup_8434F14:: @ 8434F14
 	voice_keysplit_all voicegroup_842FEF8  @ 8434F14
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 8434F20
@@ -1937,6 +1962,7 @@ voicegroup_8434F14:: @ 8434F14
 	voice_noise_alt 0, 0, 4, 1, 4  @ 84354FC
 	voice_noise_alt 0, 0, 1, 0, 2  @ 8435508
 
+	.align 2
 voicegroup_8435514:: @ 8435514
 	voice_keysplit_all voicegroup_842FEF8  @ 8435514
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435520
@@ -2022,6 +2048,7 @@ voicegroup_8435514:: @ 8435514
 	voice_programmable_wave_alt ProgrammableWaveData_845540C, 0, 7, 15, 0  @ 84358E0
 	voice_square_2 3, 0, 4, 0, 0  @ 84358EC
 
+	.align 2
 voicegroup_84358F8:: @ 84358F8
 	voice_keysplit_all voicegroup_842FEF8  @ 84358F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435904
@@ -2112,6 +2139,7 @@ voicegroup_84358F8:: @ 84358F8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435D00
 	voice_square_1_alt 0, 0, 0, 1, 7, 0  @ 8435D0C
 
+	.align 2
 voicegroup_8435D18:: @ 8435D18
 	voice_keysplit_all voicegroup_8435FAC  @ 8435D18
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 8435D24
@@ -2169,6 +2197,7 @@ voicegroup_8435D18:: @ 8435D18
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435F94
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435FA0
 
+	.align 2
 voicegroup_8435FAC:: @ 8435FAC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435FAC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8435FB8
@@ -2236,6 +2265,7 @@ voicegroup_8435FAC:: @ 8435FAC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84362A0
 	voice_directsound_no_resample 72, 202, DirectSoundWaveData_84622A4, 255, 0, 255, 0  @ 84362AC
 
+	.align 2
 voicegroup_84362B8:: @ 84362B8
 	voice_keysplit_all voicegroup_84323E8  @ 84362B8
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 84362C4
@@ -2366,6 +2396,7 @@ voicegroup_84362B8:: @ 84362B8
 	voice_noise_alt 0, 0, 4, 1, 4  @ 84368A0
 	voice_noise_alt 0, 0, 1, 0, 2  @ 84368AC
 
+	.align 2
 voicegroup_84368B8:: @ 84368B8
 	voice_keysplit_all voicegroup_842FEF8  @ 84368B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84368C4
@@ -2451,6 +2482,7 @@ voicegroup_84368B8:: @ 84368B8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8436C84
 	voice_square_1_alt 0, 2, 0, 1, 4, 1  @ 8436C90
 
+	.align 2
 voicegroup_8436C9C:: @ 8436C9C
 	voice_keysplit_all voicegroup_842FEF8  @ 8436C9C
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 8436CA8
@@ -2537,6 +2569,7 @@ voicegroup_8436C9C:: @ 8436C9C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437074
 	voice_programmable_wave ProgrammableWaveData_845544C, 0, 7, 15, 2  @ 8437080
 
+	.align 2
 voicegroup_843708C:: @ 843708C
 	voice_keysplit_all voicegroup_8435FAC  @ 843708C
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 8437098
@@ -2624,6 +2657,7 @@ voicegroup_843708C:: @ 843708C
 	voice_programmable_wave_alt ProgrammableWaveData_845541C, 0, 7, 15, 0  @ 8437470
 	voice_square_1_alt 0, 3, 0, 0, 6, 1  @ 843747C
 
+	.align 2
 voicegroup_8437488:: @ 8437488
 	voice_keysplit_all voicegroup_842FEF8  @ 8437488
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437494
@@ -2754,6 +2788,7 @@ voicegroup_8437488:: @ 8437488
 	voice_noise_alt 0, 0, 4, 1, 4  @ 8437A70
 	voice_noise_alt 0, 0, 1, 0, 2  @ 8437A7C
 
+	.align 2
 voicegroup_8437A88:: @ 8437A88
 	voice_keysplit_all voicegroup_8435FAC  @ 8437A88
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437A94
@@ -2845,6 +2880,7 @@ voicegroup_8437A88:: @ 8437A88
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437E9C
 	voice_programmable_wave_alt ProgrammableWaveData_845541C, 0, 7, 15, 2  @ 8437EA8
 
+	.align 2
 voicegroup_8437EB4:: @ 8437EB4
 	voice_keysplit_all voicegroup_842FEF8  @ 8437EB4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8437EC0
@@ -2929,6 +2965,7 @@ voicegroup_8437EB4:: @ 8437EB4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438274
 	voice_programmable_wave_alt ProgrammableWaveData_84553DC, 0, 7, 15, 0  @ 8438280
 
+	.align 2
 voicegroup_843828C:: @ 843828C
 	voice_keysplit_all voicegroup_842FEF8  @ 843828C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438298
@@ -3059,6 +3096,7 @@ voicegroup_843828C:: @ 843828C
 	voice_noise_alt 0, 0, 1, 7, 1  @ 8438874
 	voice_noise_alt 0, 0, 1, 0, 0  @ 8438880
 
+	.align 2
 voicegroup_843888C:: @ 843888C
 	voice_keysplit_all voicegroup_842FEF8  @ 843888C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438898
@@ -3189,6 +3227,7 @@ voicegroup_843888C:: @ 843888C
 	voice_noise_alt 0, 0, 1, 7, 1  @ 8438E74
 	voice_noise_alt 0, 0, 1, 0, 0  @ 8438E80
 
+	.align 2
 voicegroup_8438E8C:: @ 8438E8C
 	voice_keysplit_all voicegroup_842FEF8  @ 8438E8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8438E98
@@ -3319,6 +3358,7 @@ voicegroup_8438E8C:: @ 8438E8C
 	voice_noise_alt 0, 0, 1, 7, 1  @ 8439474
 	voice_noise_alt 0, 0, 1, 0, 0  @ 8439480
 
+	.align 2
 voicegroup_843948C:: @ 843948C
 	voice_keysplit_all voicegroup_842FEF8  @ 843948C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439498
@@ -3449,6 +3489,7 @@ voicegroup_843948C:: @ 843948C
 	voice_noise_alt 0, 0, 1, 7, 1  @ 8439A74
 	voice_noise_alt 0, 0, 1, 0, 0  @ 8439A80
 
+	.align 2
 voicegroup_8439A8C:: @ 8439A8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439A8C
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 8439A98
@@ -3532,6 +3573,7 @@ voicegroup_8439A8C:: @ 8439A8C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439E40
 	voice_square_2_alt 1, 0, 2, 4, 0  @ 8439E4C
 
+	.align 2
 voicegroup_8439E58:: @ 8439E58
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 8439E58
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8439E64
@@ -3615,6 +3657,7 @@ voicegroup_8439E58:: @ 8439E58
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A20C
 	voice_programmable_wave_alt ProgrammableWaveData_845540C, 0, 7, 15, 1  @ 843A218
 
+	.align 2
 voicegroup_843A224:: @ 843A224
 	voice_keysplit_all voicegroup_842FEF8  @ 843A224
 	voice_square_1_alt 0, 1, 0, 2, 0, 1  @ 843A230
@@ -3745,6 +3788,7 @@ voicegroup_843A224:: @ 843A224
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843A80C
 	voice_noise_alt 0, 0, 1, 0, 0  @ 843A818
 
+	.align 2
 voicegroup_843A824:: @ 843A824
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 843A824
 	voice_programmable_wave_alt ProgrammableWaveData_845542C, 0, 1, 12, 0  @ 843A830
@@ -3875,6 +3919,7 @@ voicegroup_843A824:: @ 843A824
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843AE0C
 	voice_noise_alt 0, 0, 1, 0, 0  @ 843AE18
 
+	.align 2
 voicegroup_843AE24:: @ 843AE24
 	voice_keysplit_all voicegroup_842FEF8  @ 843AE24
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843AE30
@@ -4005,6 +4050,7 @@ voicegroup_843AE24:: @ 843AE24
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B40C
 	voice_noise_alt 0, 0, 1, 0, 0  @ 843B418
 
+	.align 2
 voicegroup_843B424:: @ 843B424
 	voice_keysplit_all voicegroup_842FEF8  @ 843B424
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B430
@@ -4095,6 +4141,7 @@ voicegroup_843B424:: @ 843B424
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B82C
 	voice_square_2_alt 0, 0, 2, 4, 0  @ 843B838
 
+	.align 2
 voicegroup_843B844:: @ 843B844
 	voice_keysplit_all voicegroup_842FEF8  @ 843B844
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 843B850
@@ -4225,6 +4272,7 @@ voicegroup_843B844:: @ 843B844
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843BE2C
 	voice_noise_alt 0, 0, 1, 0, 0  @ 843BE38
 
+	.align 2
 voicegroup_843BE44:: @ 843BE44
 	voice_keysplit_all voicegroup_842FEF8  @ 843BE44
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 843BE50
@@ -4355,6 +4403,7 @@ voicegroup_843BE44:: @ 843BE44
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C42C
 	voice_noise_alt 0, 0, 1, 0, 0  @ 843C438
 
+	.align 2
 voicegroup_843C444:: @ 843C444
 	voice_keysplit_all voicegroup_842FEF8  @ 843C444
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 843C450
@@ -4431,6 +4480,7 @@ voicegroup_843C444:: @ 843C444
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C7A4
 	voice_directsound 60, 0, DirectSoundWaveData_84830A0, 255, 0, 255, 165  @ 843C7B0
 
+	.align 2
 voicegroup_843C7BC:: @ 843C7BC
 	voice_keysplit_all voicegroup_842FEF8  @ 843C7BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843C7C8
@@ -4561,6 +4611,7 @@ voicegroup_843C7BC:: @ 843C7BC
 	voice_noise_alt 0, 3, 1, 10, 0  @ 843CDA4
 	voice_noise_alt 0, 0, 2, 0, 0  @ 843CDB0
 
+	.align 2
 voicegroup_843CDBC:: @ 843CDBC
 	voice_keysplit_all voicegroup_842FEF8  @ 843CDBC
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 843CDC8
@@ -4691,6 +4742,7 @@ voicegroup_843CDBC:: @ 843CDBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D3A4
 	voice_noise_alt 0, 0, 1, 0, 0  @ 843D3B0
 
+	.align 2
 voicegroup_843D3BC:: @ 843D3BC
 	voice_keysplit_all voicegroup_842FEF8  @ 843D3BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D3C8
@@ -4821,6 +4873,7 @@ voicegroup_843D3BC:: @ 843D3BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D9A4
 	voice_noise_alt 0, 0, 1, 0, 0  @ 843D9B0
 
+	.align 2
 voicegroup_843D9BC:: @ 843D9BC
 	voice_keysplit_all voicegroup_842FEF8  @ 843D9BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843D9C8
@@ -4951,6 +5004,7 @@ voicegroup_843D9BC:: @ 843D9BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843DFA4
 	voice_noise_alt 0, 0, 1, 0, 0  @ 843DFB0
 
+	.align 2
 voicegroup_843DFBC:: @ 843DFBC
 	voice_keysplit_all voicegroup_842FEF8  @ 843DFBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843DFC8
@@ -5081,6 +5135,7 @@ voicegroup_843DFBC:: @ 843DFBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E5A4
 	voice_noise_alt 0, 0, 1, 0, 0  @ 843E5B0
 
+	.align 2
 voicegroup_843E5BC:: @ 843E5BC
 	voice_keysplit_all voicegroup_842FEF8  @ 843E5BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E5C8
@@ -5211,6 +5266,7 @@ voicegroup_843E5BC:: @ 843E5BC
 	voice_noise_alt 0, 0, 1, 7, 1  @ 843EBA4
 	voice_noise_alt 0, 0, 1, 0, 0  @ 843EBB0
 
+	.align 2
 voicegroup_843EBBC:: @ 843EBBC
 	voice_keysplit_all voicegroup_842FEF8  @ 843EBBC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843EBC8
@@ -5341,6 +5397,7 @@ voicegroup_843EBBC:: @ 843EBBC
 	voice_noise_alt 0, 0, 2, 4, 0  @ 843F1A4
 	voice_noise_alt 0, 0, 1, 0, 0  @ 843F1B0
 
+	.align 2
 voicegroup_843F1BC:: @ 843F1BC
 	voice_keysplit_all voicegroup_842FEF8  @ 843F1BC
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 843F1C8
@@ -5432,6 +5489,7 @@ voicegroup_843F1BC:: @ 843F1BC
 	voice_programmable_wave_alt ProgrammableWaveData_845540C, 0, 7, 15, 0  @ 843F5D0
 	voice_square_2_alt 3, 0, 1, 6, 2  @ 843F5DC
 
+	.align 2
 voicegroup_843F5E8:: @ 843F5E8
 	voice_keysplit_all voicegroup_842FEF8  @ 843F5E8
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 843F5F4
@@ -5562,6 +5620,7 @@ voicegroup_843F5E8:: @ 843F5E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FBD0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 843FBDC
 
+	.align 2
 voicegroup_843FBE8:: @ 843FBE8
 	voice_keysplit_all voicegroup_842FEF8  @ 843FBE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843FBF4
@@ -5692,6 +5751,7 @@ voicegroup_843FBE8:: @ 843FBE8
 	voice_noise_alt 0, 0, 1, 7, 1  @ 84401D0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 84401DC
 
+	.align 2
 voicegroup_84401E8:: @ 84401E8
 	voice_keysplit_all voicegroup_842FEF8  @ 84401E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84401F4
@@ -5822,6 +5882,7 @@ voicegroup_84401E8:: @ 84401E8
 	voice_noise_alt 0, 0, 1, 7, 1  @ 84407D0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 84407DC
 
+	.align 2
 voicegroup_84407E8:: @ 84407E8
 	voice_keysplit_all voicegroup_842FEF8  @ 84407E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84407F4
@@ -5952,6 +6013,7 @@ voicegroup_84407E8:: @ 84407E8
 	voice_noise_alt 0, 0, 1, 7, 1  @ 8440DD0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 8440DDC
 
+	.align 2
 voicegroup_8440DE8:: @ 8440DE8
 	voice_keysplit_all voicegroup_842FEF8  @ 8440DE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8440DF4
@@ -6082,6 +6144,7 @@ voicegroup_8440DE8:: @ 8440DE8
 	voice_noise_alt 0, 0, 1, 7, 1  @ 84413D0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 84413DC
 
+	.align 2
 voicegroup_84413E8:: @ 84413E8
 	voice_keysplit_all voicegroup_842FEF8  @ 84413E8
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 84413F4
@@ -6212,6 +6275,7 @@ voicegroup_84413E8:: @ 84413E8
 	voice_noise_alt 0, 0, 1, 7, 1  @ 84419D0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 84419DC
 
+	.align 2
 voicegroup_84419E8:: @ 84419E8
 	voice_keysplit_all voicegroup_842FEF8  @ 84419E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84419F4
@@ -6342,6 +6406,7 @@ voicegroup_84419E8:: @ 84419E8
 	voice_noise_alt 0, 0, 1, 7, 1  @ 8441FD0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 8441FDC
 
+	.align 2
 voicegroup_8441FE8:: @ 8441FE8
 	voice_keysplit_all voicegroup_842FEF8  @ 8441FE8
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 8441FF4
@@ -6472,6 +6537,7 @@ voicegroup_8441FE8:: @ 8441FE8
 	voice_noise_alt 0, 0, 1, 7, 1  @ 84425D0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 84425DC
 
+	.align 2
 voicegroup_84425E8:: @ 84425E8
 	voice_keysplit_all voicegroup_842FEF8  @ 84425E8
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 84425F4
@@ -6602,6 +6668,7 @@ voicegroup_84425E8:: @ 84425E8
 	voice_noise_alt 0, 0, 1, 7, 1  @ 8442BD0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 8442BDC
 
+	.align 2
 voicegroup_8442BE8:: @ 8442BE8
 	voice_keysplit_all voicegroup_842FEF8  @ 8442BE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8442BF4
@@ -6732,6 +6799,7 @@ voicegroup_8442BE8:: @ 8442BE8
 	voice_noise_alt 0, 0, 1, 7, 1  @ 84431D0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 84431DC
 
+	.align 2
 voicegroup_84431E8:: @ 84431E8
 	voice_keysplit_all voicegroup_842FEF8  @ 84431E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84431F4
@@ -6862,6 +6930,7 @@ voicegroup_84431E8:: @ 84431E8
 	voice_noise_alt 0, 0, 2, 4, 0  @ 84437D0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 84437DC
 
+	.align 2
 voicegroup_84437E8:: @ 84437E8
 	voice_keysplit_all voicegroup_842FEF8  @ 84437E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84437F4
@@ -6992,6 +7061,7 @@ voicegroup_84437E8:: @ 84437E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8443DD0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 8443DDC
 
+	.align 2
 voicegroup_8443DE8:: @ 8443DE8
 	voice_keysplit_all voicegroup_842FEF8  @ 8443DE8
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 8443DF4
@@ -7122,6 +7192,7 @@ voicegroup_8443DE8:: @ 8443DE8
 	voice_noise_alt 0, 0, 2, 4, 0  @ 84443D0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 84443DC
 
+	.align 2
 voicegroup_84443E8:: @ 84443E8
 	voice_keysplit_all voicegroup_842FEF8  @ 84443E8
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 84443F4
@@ -7252,6 +7323,7 @@ voicegroup_84443E8:: @ 84443E8
 	voice_noise_alt 0, 0, 2, 4, 0  @ 84449D0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 84449DC
 
+	.align 2
 voicegroup_84449E8:: @ 84449E8
 	voice_keysplit_all voicegroup_842FEF8  @ 84449E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84449F4
@@ -7382,6 +7454,7 @@ voicegroup_84449E8:: @ 84449E8
 	voice_noise_alt 0, 0, 2, 4, 0  @ 8444FD0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 8444FDC
 
+	.align 2
 voicegroup_8444FE8:: @ 8444FE8
 	voice_keysplit_all voicegroup_842FEF8  @ 8444FE8
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 8444FF4
@@ -7512,6 +7585,7 @@ voicegroup_8444FE8:: @ 8444FE8
 	voice_noise_alt 0, 0, 3, 4, 0  @ 84455D0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 84455DC
 
+	.align 2
 voicegroup_84455E8:: @ 84455E8
 	voice_keysplit_all voicegroup_842FEF8  @ 84455E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84455F4
@@ -7642,6 +7716,7 @@ voicegroup_84455E8:: @ 84455E8
 	voice_noise_alt 0, 0, 1, 7, 1  @ 8445BD0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 8445BDC
 
+	.align 2
 voicegroup_8445BE8:: @ 8445BE8
 	voice_keysplit_all voicegroup_842FEF8  @ 8445BE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8445BF4
@@ -7772,6 +7847,7 @@ voicegroup_8445BE8:: @ 8445BE8
 	voice_noise_alt 0, 0, 2, 4, 0  @ 84461D0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 84461DC
 
+	.align 2
 voicegroup_84461E8:: @ 84461E8
 	voice_keysplit_all voicegroup_842FEF8  @ 84461E8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84461F4
@@ -7902,6 +7978,7 @@ voicegroup_84461E8:: @ 84461E8
 	voice_noise_alt 0, 0, 2, 4, 0  @ 84467D0
 	voice_noise_alt 0, 0, 2, 0, 2  @ 84467DC
 
+	.align 2
 voicegroup_84467E8:: @ 84467E8
 	voice_keysplit_all voicegroup_842FEF8  @ 84467E8
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 84467F4
@@ -8032,6 +8109,7 @@ voicegroup_84467E8:: @ 84467E8
 	voice_noise_alt 0, 0, 1, 7, 1  @ 8446DD0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 8446DDC
 
+	.align 2
 voicegroup_8446DE8:: @ 8446DE8
 	voice_keysplit_all voicegroup_842FEF8  @ 8446DE8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8446DF4
@@ -8162,10 +8240,12 @@ voicegroup_8446DE8:: @ 8446DE8
 	voice_noise_alt 0, 0, 1, 7, 1  @ 84473D0
 	voice_noise_alt 0, 0, 1, 0, 0  @ 84473DC
 
+	.align 2
 voicegroup_84473E8:: @ 84473E8
 	voice_square_1 0, 2, 0,  0, 15, 0 @ 84473E8
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 84473F4
 
+	.align 2
 voicegroup_8447400:: @ 8447400
 	voice_keysplit_all voicegroup_842FEF8  @ 8447400
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 844740C
@@ -8296,6 +8376,7 @@ voicegroup_8447400:: @ 8447400
 	voice_noise_alt 0, 0, 1, 7, 1  @ 84479E8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 84479F4
 
+	.align 2
 voicegroup_8447A00:: @ 8447A00
 	voice_keysplit_all voicegroup_842FEF8  @ 8447A00
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 8447A0C
@@ -8382,6 +8463,7 @@ voicegroup_8447A00:: @ 8447A00
 	voice_programmable_wave_alt ProgrammableWaveData_84553BC, 0, 7, 6, 4  @ 8447DD8
 	voice_programmable_wave_alt ProgrammableWaveData_84553BC, 0, 2, 6, 1  @ 8447DE4
 
+	.align 2
 voicegroup_8447DF0:: @ 8447DF0
 	voice_keysplit_all voicegroup_842FEF8  @ 8447DF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447DFC
@@ -8512,6 +8594,7 @@ voicegroup_8447DF0:: @ 8447DF0
 	voice_noise_alt 0, 0, 1, 7, 1  @ 84483D8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 84483E4
 
+	.align 2
 voicegroup_84483F0:: @ 84483F0
 	voice_keysplit_all voicegroup_842FEF8  @ 84483F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84483FC
@@ -8642,6 +8725,7 @@ voicegroup_84483F0:: @ 84483F0
 	voice_noise_alt 0, 0, 1, 7, 1  @ 84489D8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 84489E4
 
+	.align 2
 voicegroup_84489F0:: @ 84489F0
 	voice_keysplit_all voicegroup_842FEF8  @ 84489F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84489FC
@@ -8772,6 +8856,7 @@ voicegroup_84489F0:: @ 84489F0
 	voice_noise_alt 0, 0, 1, 7, 1  @ 8448FD8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 8448FE4
 
+	.align 2
 voicegroup_8448FF0:: @ 8448FF0
 	voice_keysplit_all voicegroup_842FEF8  @ 8448FF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8448FFC
@@ -8902,6 +8987,7 @@ voicegroup_8448FF0:: @ 8448FF0
 	voice_noise_alt 0, 0, 1, 7, 1  @ 84495D8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 84495E4
 
+	.align 2
 voicegroup_84495F0:: @ 84495F0
 	voice_keysplit_all voicegroup_842FEF8  @ 84495F0
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 84495FC
@@ -9032,6 +9118,7 @@ voicegroup_84495F0:: @ 84495F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449BD8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 8449BE4
 
+	.align 2
 voicegroup_8449BF0:: @ 8449BF0
 	voice_keysplit_all voicegroup_842FEF8  @ 8449BF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8449BFC
@@ -9162,6 +9249,7 @@ voicegroup_8449BF0:: @ 8449BF0
 	voice_noise_alt 0, 0, 1, 7, 1  @ 844A1D8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 844A1E4
 
+	.align 2
 voicegroup_844A1F0:: @ 844A1F0
 	voice_keysplit_all voicegroup_842FEF8  @ 844A1F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A1FC
@@ -9292,6 +9380,7 @@ voicegroup_844A1F0:: @ 844A1F0
 	voice_noise_alt 0, 0, 1, 7, 1  @ 844A7D8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 844A7E4
 
+	.align 2
 voicegroup_844A7F0:: @ 844A7F0
 	voice_keysplit_all voicegroup_842FEF8  @ 844A7F0
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 844A7FC
@@ -9422,6 +9511,7 @@ voicegroup_844A7F0:: @ 844A7F0
 	voice_noise_alt 0, 0, 1, 7, 1  @ 844ADD8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 844ADE4
 
+	.align 2
 voicegroup_844ADF0:: @ 844ADF0
 	voice_keysplit_all voicegroup_842FEF8  @ 844ADF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844ADFC
@@ -9552,6 +9642,7 @@ voicegroup_844ADF0:: @ 844ADF0
 	voice_noise_alt 0, 0, 1, 7, 1  @ 844B3D8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 844B3E4
 
+	.align 2
 voicegroup_844B3F0:: @ 844B3F0
 	voice_keysplit_all voicegroup_842FEF8  @ 844B3F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B3FC
@@ -9682,6 +9773,7 @@ voicegroup_844B3F0:: @ 844B3F0
 	voice_noise_alt 0, 0, 1, 7, 1  @ 844B9D8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 844B9E4
 
+	.align 2
 voicegroup_844B9F0:: @ 844B9F0
 	voice_keysplit_all voicegroup_842FEF8  @ 844B9F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844B9FC
@@ -9812,6 +9904,7 @@ voicegroup_844B9F0:: @ 844B9F0
 	voice_noise_alt 0, 0, 1, 7, 1  @ 844BFD8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 844BFE4
 
+	.align 2
 voicegroup_844BFF0:: @ 844BFF0
 	voice_keysplit_all voicegroup_842FEF8  @ 844BFF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BFFC
@@ -9942,6 +10035,7 @@ voicegroup_844BFF0:: @ 844BFF0
 	voice_noise_alt 0, 0, 1, 7, 1  @ 844C5D8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 844C5E4
 
+	.align 2
 voicegroup_844C5F0:: @ 844C5F0
 	voice_keysplit_all voicegroup_842FEF8  @ 844C5F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844C5FC
@@ -10072,6 +10166,7 @@ voicegroup_844C5F0:: @ 844C5F0
 	voice_noise_alt 0, 0, 1, 7, 1  @ 844CBD8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 844CBE4
 
+	.align 2
 voicegroup_844CBF0:: @ 844CBF0
 	voice_keysplit_all voicegroup_842FEF8  @ 844CBF0
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 844CBFC
@@ -10202,6 +10297,7 @@ voicegroup_844CBF0:: @ 844CBF0
 	voice_noise_alt 0, 0, 1, 7, 1  @ 844D1D8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 844D1E4
 
+	.align 2
 voicegroup_844D1F0:: @ 844D1F0
 	voice_keysplit_all voicegroup_842FEF8  @ 844D1F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D1FC
@@ -10332,6 +10428,7 @@ voicegroup_844D1F0:: @ 844D1F0
 	voice_directsound 60, 0, DirectSoundWaveData_845B9A8, 255, 255, 255, 127  @ 844D7D8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 844D7E4
 
+	.align 2
 voicegroup_844D7F0:: @ 844D7F0
 	voice_keysplit_all voicegroup_842FEF8  @ 844D7F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844D7FC
@@ -10462,6 +10559,7 @@ voicegroup_844D7F0:: @ 844D7F0
 	voice_noise_alt 0, 0, 1, 7, 1  @ 844DDD8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 844DDE4
 
+	.align 2
 voicegroup_844DDF0:: @ 844DDF0
 	voice_keysplit_all voicegroup_842FEF8  @ 844DDF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844DDFC
@@ -10592,6 +10690,7 @@ voicegroup_844DDF0:: @ 844DDF0
 	voice_noise_alt 0, 0, 1, 7, 1  @ 844E3D8
 	voice_noise_alt 0, 0, 1, 0, 0  @ 844E3E4
 
+	.align 2
 voicegroup_844E3F0:: @ 844E3F0
 	voice_keysplit_all voicegroup_842FEF8  @ 844E3F0
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 844E3FC
@@ -10704,6 +10803,7 @@ voicegroup_844E3F0:: @ 844E3F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E900
 	voice_square_2_alt 0, 1, 1, 6, 1  @ 844E90C
 
+	.align 2
 voicegroup_844E918:: @ 844E918
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E918
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844E924
@@ -10788,6 +10888,7 @@ voicegroup_844E918:: @ 844E918
 	voice_square_1_alt 0, 2, 0, 6, 0, 6  @ 844ECD8
 	voice_square_2_alt 2, 0, 6, 0, 6  @ 844ECE4
 
+	.align 2
 voicegroup_844ECF0:: @ 844ECF0
 	voice_keysplit_all voicegroup_842FEF8  @ 844ECF0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844ECFC
@@ -10872,6 +10973,7 @@ voicegroup_844ECF0:: @ 844ECF0
 	voice_square_2 3, 0, 1, 7, 1  @ 844F0B0
 	voice_programmable_wave_alt ProgrammableWaveData_84553DC, 0, 7, 15, 2  @ 844F0BC
 
+	.align 2
 voicegroup_844F0C8:: @ 844F0C8
 	voice_keysplit_all voicegroup_842FEF8  @ 844F0C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F0D4
@@ -10965,6 +11067,7 @@ voicegroup_844F0C8:: @ 844F0C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F4F4
 	voice_directsound 60, 0, DirectSoundWaveData_849F40C, 255, 0, 255, 127  @ 844F500
 
+	.align 2
 voicegroup_844F50C:: @ 844F50C
 	voice_keysplit_all voicegroup_842FEF8  @ 844F50C
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 844F518
@@ -11058,6 +11161,7 @@ voicegroup_844F50C:: @ 844F50C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844F938
 	voice_programmable_wave_alt ProgrammableWaveData_845541C, 0, 7, 15, 2  @ 844F944
 
+	.align 2
 voicegroup_844F950:: @ 844F950
 	voice_keysplit_all voicegroup_842FEF8  @ 844F950
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 844F95C
@@ -11151,6 +11255,7 @@ voicegroup_844F950:: @ 844F950
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844FD7C
 	voice_programmable_wave_alt ProgrammableWaveData_845541C, 0, 7, 15, 2  @ 844FD88
 
+	.align 2
 voicegroup_844FD94:: @ 844FD94
 	voice_keysplit_all voicegroup_842FEF8  @ 844FD94
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 844FDA0
@@ -11239,6 +11344,7 @@ voicegroup_844FD94:: @ 844FD94
 	voice_square_1 0, 0, 0, 1, 7, 1  @ 8450184
 	voice_square_1 0, 0, 0, 0, 7, 1  @ 8450190
 
+	.align 2
 voicegroup_845019C:: @ 845019C
 	voice_keysplit_all voicegroup_842FEF8  @ 845019C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84501A8
@@ -11325,6 +11431,7 @@ voicegroup_845019C:: @ 845019C
 	voice_square_1 0, 3, 0, 1, 9, 1  @ 8450574
 	voice_square_1 0, 3, 0, 0, 9, 1  @ 8450580
 
+	.align 2
 voicegroup_845058C:: @ 845058C
 	voice_keysplit_all voicegroup_842FEF8  @ 845058C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450598
@@ -11455,6 +11562,7 @@ voicegroup_845058C:: @ 845058C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450B74
 	voice_directsound 60, 0, DirectSoundWaveData_8460E60, 255, 246, 0, 216  @ 8450B80
 
+	.align 2
 voicegroup_8450B8C:: @ 8450B8C
 	voice_keysplit_all voicegroup_842FEF8  @ 8450B8C
 	voice_keysplit voicegroup_8430204, KeySplitTable_8455224  @ 8450B98
@@ -11544,6 +11652,7 @@ voicegroup_8450B8C:: @ 8450B8C
 	voice_square_1 0, 2, 0, 1, 7, 1  @ 8450F88
 	voice_square_2 3, 0, 2, 7, 1  @ 8450F94
 
+	.align 2
 voicegroup_8450FA0:: @ 8450FA0
 	voice_keysplit_all voicegroup_842FEF8  @ 8450FA0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8450FAC
@@ -11630,6 +11739,7 @@ voicegroup_8450FA0:: @ 8450FA0
 	voice_square_1 0, 3, 0, 1, 7, 1  @ 8451378
 	voice_square_1 0, 3, 0, 0, 7, 1  @ 8451384
 
+	.align 2
 voicegroup_8451390:: @ 8451390
 	voice_keysplit_all voicegroup_842FEF8  @ 8451390
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 845139C
@@ -11760,6 +11870,7 @@ voicegroup_8451390:: @ 8451390
 	voice_directsound 60, 0, DirectSoundWaveData_8460E60, 255, 235, 0, 216  @ 8451978
 	voice_directsound 60, 0, DirectSoundWaveData_8460E60, 255, 246, 0, 216  @ 8451984
 
+	.align 2
 voicegroup_8451990:: @ 8451990
 	voice_directsound 60, 0, DirectSoundWaveData_8486924, 255, 249, 103, 165  @ 8451990
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 845199C
@@ -11890,6 +12001,7 @@ voicegroup_8451990:: @ 8451990
 	voice_noise_alt 0, 0, 1, 0, 0  @ 8451F78
 	voice_noise_alt 0, 0, 1, 0, 1  @ 8451F84
 
+	.align 2
 voicegroup_8451F90:: @ 8451F90
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_8488F44, 255, 249, 0, 165  @ 8451F90
 	voice_directsound_alt 60, 0, DirectSoundWaveData_8488F44, 255, 0, 255, 165  @ 8451F9C
@@ -12020,30 +12132,807 @@ voicegroup_8451F90:: @ 8451F90
 	voice_directsound 60, 0, DirectSoundWaveData_84A9EAC, 255, 0, 255, 165  @ 8452578
 	voice_directsound 60, 0, DirectSoundWaveData_84AA8F4, 255, 0, 255, 165  @ 8452584
 
+	.align 2
 voicegroup_8452590:: @ 8452590
-	.incbin "baserom.gba", 0x00452590, 0x600
+	cry CryDirectSound_4AB57C
+	cry CryDirectSound_4AC608
+	cry CryDirectSound_4AD698
+	cry CryDirectSound_4AE9F0
+	cry CryDirectSound_4AF860
+	cry CryDirectSound_4B06E0
+	cry CryDirectSound_4B1A28
+	cry CryDirectSound_4B289C
+	cry CryDirectSound_4B39DC
+	cry CryDirectSound_4B4D24
+	cry CryDirectSound_4B557C
+	cry CryDirectSound_4B6CCC
+	cry CryDirectSound_4B76D4
+	cry CryDirectSound_4B8718
+	cry CryDirectSound_4B9954
+	cry CryDirectSound_4BACB0
+	cry CryDirectSound_4BB098
+	cry CryDirectSound_4BBFA0
+	cry CryDirectSound_4BD0D4
+	cry CryDirectSound_4BD8B4
+	cry CryDirectSound_4BE238
+	cry CryDirectSound_4BF3DC
+	cry CryDirectSound_4C0518
+	cry CryDirectSound_4C1864
+	cry CryDirectSound_4C2BBC
+	cry CryDirectSound_4C3C64
+	cry CryDirectSound_4C5424
+	cry CryDirectSound_4C5D78
+	cry CryDirectSound_4C6B08
+	cry CryDirectSound_4C74B8
+	cry CryDirectSound_4C8180
+	cry CryDirectSound_4C9260
+	cry CryDirectSound_4C9CC8
+	cry CryDirectSound_4CA8DC
+	cry CryDirectSound_4CC148
+	cry CryDirectSound_4CC9B8
+	cry CryDirectSound_4CD448
+	cry CryDirectSound_4CEC18
+	cry CryDirectSound_4D0484
+	cry CryDirectSound_4D09E8
+	cry CryDirectSound_4D10B0
+	cry CryDirectSound_4D241C
+	cry CryDirectSound_4D3780
+	cry CryDirectSound_4D461C
+	cry CryDirectSound_4D5298
+	cry CryDirectSound_4D6C34
+	cry CryDirectSound_4D8828
+	cry CryDirectSound_4DA690
+	cry CryDirectSound_4DB610
+	cry CryDirectSound_4DC614
+	cry CryDirectSound_4DD984
+	cry CryDirectSound_4DECF0
+	cry CryDirectSound_4DF680
+	cry CryDirectSound_4E095C
+	cry CryDirectSound_4E1684
+	cry CryDirectSound_4E21CC
+	cry CryDirectSound_4E322C
+	cry CryDirectSound_4E425C
+	cry CryDirectSound_4E4FC0
+	cry CryDirectSound_4E60FC
+	cry CryDirectSound_4E6C18
+	cry CryDirectSound_4E72C0
+	cry CryDirectSound_4E7DE4
+	cry CryDirectSound_4E9548
+	cry CryDirectSound_4EB030
+	cry CryDirectSound_4ECFCC
+	cry CryDirectSound_4EDD30
+	cry CryDirectSound_4EEAC0
+	cry CryDirectSound_4EFB48
+	cry CryDirectSound_4F02D4
+	cry CryDirectSound_4F1174
+	cry CryDirectSound_4F24C0
+	cry CryDirectSound_4F34B0
+	cry CryDirectSound_4F4BAC
+	cry CryDirectSound_4F6360
+	cry CryDirectSound_4F7F48
+	cry CryDirectSound_4F8D74
+	cry CryDirectSound_4F9C84
+	cry CryDirectSound_4FAF24
+	cry CryDirectSound_4FB68C
+	cry CryDirectSound_4FC3FC
+	cry CryDirectSound_4FD740
+	cry CryDirectSound_4FEF28
+	cry CryDirectSound_4FF6A4
+	cry CryDirectSound_5009E8
+	cry CryDirectSound_501D60
+	cry CryDirectSound_502F50
+	cry CryDirectSound_504474
+	cry CryDirectSound_504EFC
+	cry CryDirectSound_505DBC
+	cry CryDirectSound_506D30
+	cry CryDirectSound_5081F4
+	cry CryDirectSound_509944
+	cry CryDirectSound_50B0C4
+	cry CryDirectSound_50BF84
+	cry CryDirectSound_50D848
+	cry CryDirectSound_50F560
+	cry CryDirectSound_511264
+	cry CryDirectSound_512AB0
+	cry CryDirectSound_514308
+	cry CryDirectSound_515BCC
+	cry CryDirectSound_517504
+	cry CryDirectSound_5187E4
+	cry CryDirectSound_51A7C8
+	cry CryDirectSound_51B6E8
+	cry CryDirectSound_51C558
+	cry CryDirectSound_51D804
+	cry CryDirectSound_51E9DC
+	cry CryDirectSound_51F904
+	cry CryDirectSound_520D60
+	cry CryDirectSound_52230C
+	cry CryDirectSound_523678
+	cry CryDirectSound_524AE4
+	cry CryDirectSound_5259B0
+	cry CryDirectSound_5268CC
+	cry CryDirectSound_527B80
+	cry CryDirectSound_5284FC
+	cry CryDirectSound_528D68
+	cry CryDirectSound_529740
+	cry CryDirectSound_52AA98
+	cry CryDirectSound_52BE80
+	cry CryDirectSound_52D35C
+	cry CryDirectSound_52E64C
+	cry CryDirectSound_52F3A8
+	cry CryDirectSound_53231C
+	cry CryDirectSound_534200
+	cry CryDirectSound_53517C
+	cry CryDirectSound_535DD8
 
+	.align 2
 voicegroup_8452B90:: @ 8452B90
-	.incbin "baserom.gba", 0x00452b90, 0x600
+	cry CryDirectSound_53702C
+	cry CryDirectSound_538334
+	cry CryDirectSound_539768
+	cry CryDirectSound_53A63C
+	cry CryDirectSound_53B158
+	cry CryDirectSound_53BF90
+	cry CryDirectSound_53D5A8
+	cry CryDirectSound_53E57C
+	cry CryDirectSound_53F500
+	cry CryDirectSound_54090C
+	cry CryDirectSound_541664
+	cry CryDirectSound_5423B8
+	cry CryDirectSound_54300C
+	cry CryDirectSound_543DC8
+	cry CryDirectSound_545624
+	cry CryDirectSound_545B60
+	cry CryDirectSound_547308
+	cry CryDirectSound_548280
+	cry CryDirectSound_549A2C
+	cry CryDirectSound_54A5C8
+	cry CryDirectSound_54B670
+	cry CryDirectSound_54C97C
+	cry CryDirectSound_54E7E4
+	cry CryDirectSound_55064C
+	cry CryDirectSound_550B8C
+	cry CryDirectSound_551458
+	cry CryDirectSound_552490
+	cry CryDirectSound_552B94
+	cry CryDirectSound_55377C
+	cry CryDirectSound_555D8C
+	cry CryDirectSound_556FE4
+	cry CryDirectSound_558420
+	cry CryDirectSound_559DA4
+	cry CryDirectSound_55A1CC
+	cry CryDirectSound_55A814
+	cry CryDirectSound_55B2F8
+	cry CryDirectSound_55C828
+	cry CryDirectSound_55CF20
+	cry CryDirectSound_55D784
+	cry CryDirectSound_55E4E8
+	cry CryDirectSound_55F13C
+	cry CryDirectSound_56086C
+	cry CryDirectSound_56151C
+	cry CryDirectSound_561FA8
+	cry CryDirectSound_5626FC
+	cry CryDirectSound_562CEC
+	cry CryDirectSound_5633E8
+	cry CryDirectSound_563ED0
+	cry CryDirectSound_5645D0
+	cry CryDirectSound_565060
+	cry CryDirectSound_565F2C
+	cry CryDirectSound_566684
+	cry CryDirectSound_567438
+	cry CryDirectSound_5684B8
+	cry CryDirectSound_5692D0
+	cry CryDirectSound_569FE4
+	cry CryDirectSound_56B0D0
+	cry CryDirectSound_56C100
+	cry CryDirectSound_56D344
+	cry CryDirectSound_56DBB0
+	cry CryDirectSound_56E8B8
+	cry CryDirectSound_56F8F4
+	cry CryDirectSound_570714
+	cry CryDirectSound_570F28
+	cry CryDirectSound_571F08
+	cry CryDirectSound_573010
+	cry CryDirectSound_573770
+	cry CryDirectSound_5744D0
+	cry CryDirectSound_575884
+	cry CryDirectSound_576804
+	cry CryDirectSound_5778C8
+	cry CryDirectSound_5790AC
+	cry CryDirectSound_579C4C
+	cry CryDirectSound_57A974
+	cry CryDirectSound_57BE10
+	cry CryDirectSound_57CCC4
+	cry CryDirectSound_57DA24
+	cry CryDirectSound_57EE2C
+	cry CryDirectSound_57FE0C
+	cry CryDirectSound_580A2C
+	cry CryDirectSound_583054
+	cry CryDirectSound_583EC8
+	cry CryDirectSound_58566C
+	cry CryDirectSound_586208
+	cry CryDirectSound_587904
+	cry CryDirectSound_588338
+	cry CryDirectSound_58958C
+	cry CryDirectSound_589EB0
+	cry CryDirectSound_58AF3C
+	cry CryDirectSound_58CD14
+	cry CryDirectSound_58DE2C
+	cry CryDirectSound_58F334
+	cry CryDirectSound_58FFDC
+	cry CryDirectSound_590CD0
+	cry CryDirectSound_5919B0
+	cry CryDirectSound_592440
+	cry CryDirectSound_593E84
+	cry CryDirectSound_594EB8
+	cry CryDirectSound_595E80
+	cry CryDirectSound_597688
+	cry CryDirectSound_598330
+	cry CryDirectSound_5996E0
+	cry CryDirectSound_59A4B8
+	cry CryDirectSound_59B008
+	cry CryDirectSound_59C12C
+	cry CryDirectSound_59D0E4
+	cry CryDirectSound_59E760
+	cry CryDirectSound_59F194
+	cry CryDirectSound_5A01BC
+	cry CryDirectSound_5A0F9C
+	cry CryDirectSound_5A1B50
+	cry CryDirectSound_5A25DC
+	cry CryDirectSound_5A344C
+	cry CryDirectSound_5A4328
+	cry CryDirectSound_5A53BC
+	cry CryDirectSound_5A652C
+	cry CryDirectSound_5A79A0
+	cry CryDirectSound_5A8BE8
+	cry CryDirectSound_5A9898
+	cry CryDirectSound_5AA108
+	cry CryDirectSound_5AB868
+	cry CryDirectSound_5ADE60
+	cry CryDirectSound_5AF4F4
+	cry CryDirectSound_5B036C
+	cry CryDirectSound_5B0BCC
+	cry CryDirectSound_5B168C
+	cry CryDirectSound_5B1FD8
+	cry CryDirectSound_5B2C34
 
+	.align 2
 voicegroup_8453190:: @ 8453190
-	.incbin "baserom.gba", 0x00453190, 0x600
+	cry CryDirectSound_5B413C
+	cry CryDirectSound_5B4BD4
+	cry CryDirectSound_5B5804
+	cry CryDirectSound_5B65E4
+	cry CryDirectSound_5B7184
+	cry CryDirectSound_5B8890
+	cry CryDirectSound_5B9220
+	cry CryDirectSound_5B9C88
+	cry CryDirectSound_5BA220
+	cry CryDirectSound_5BAD3C
+	cry CryDirectSound_5BB690
+	cry CryDirectSound_5BBC90
+	cry CryDirectSound_5BC594
+	cry CryDirectSound_5BD744
+	cry CryDirectSound_5BE3B0
+	cry CryDirectSound_5BED58
+	cry CryDirectSound_5C0A2C
+	cry CryDirectSound_5C29AC
+	cry CryDirectSound_5C3554
+	cry CryDirectSound_5C49C8
+	cry CryDirectSound_5C63E4
+	cry CryDirectSound_5C6B68
+	cry CryDirectSound_5C7C6C
+	cry CryDirectSound_5C92EC
+	cry CryDirectSound_5C9EB4
+	cry CryDirectSound_5CAAF4
+	cry CryDirectSound_5CB79C
+	cry CryDirectSound_5CBFDC
+	cry CryDirectSound_5CC444
+	cry CryDirectSound_5CD2D8
+	cry CryDirectSound_5CE3A8
+	cry CryDirectSound_5CEBD4
+	cry CryDirectSound_5CF73C
+	cry CryDirectSound_5D0B00
+	cry CryDirectSound_5D1514
+	cry CryDirectSound_5D1DE0
+	cry CryDirectSound_5D2E0C
+	cry CryDirectSound_5D3644
+	cry CryDirectSound_5D4688
+	cry CryDirectSound_5D5334
+	cry CryDirectSound_5D5D50
+	cry CryDirectSound_5D6980
+	cry CryDirectSound_5D81E4
+	cry CryDirectSound_5D8A68
+	cry CryDirectSound_5D98C0
+	cry CryDirectSound_5DA2AC
+	cry CryDirectSound_5DA91C
+	cry CryDirectSound_5DB544
+	cry CryDirectSound_5DBCFC
+	cry CryDirectSound_5DC458
+	cry CryDirectSound_5DD510
+	cry CryDirectSound_5DE274
+	cry CryDirectSound_5DF758
+	cry CryDirectSound_5E0054
+	cry CryDirectSound_5E105C
+	cry CryDirectSound_5E1ADC
+	cry CryDirectSound_5E2E90
+	cry CryDirectSound_5E35A4
+	cry CryDirectSound_5E4ABC
+	cry CryDirectSound_5E52C0
+	cry CryDirectSound_5E6420
+	cry CryDirectSound_5E6D6C
+	cry CryDirectSound_5E848C
+	cry CryDirectSound_5E8DC8
+	cry CryDirectSound_5E9EC4
+	cry CryDirectSound_5EAAC8
+	cry CryDirectSound_5EC380
+	cry CryDirectSound_5ECAC0
+	cry CryDirectSound_5ED760
+	cry CryDirectSound_5EE184
+	cry CryDirectSound_5EEF88
+	cry CryDirectSound_5F0990
+	cry CryDirectSound_5F1280
+	cry CryDirectSound_5F2930
+	cry CryDirectSound_5F35B4
+	cry CryDirectSound_5F4914
+	cry CryDirectSound_5F6110
+	cry CryDirectSound_5F713C
+	cry CryDirectSound_5F7910
+	cry CryDirectSound_5FA054
+	cry CryDirectSound_5FAAD0
+	cry CryDirectSound_5FB2F0
+	cry CryDirectSound_5FC374
+	cry CryDirectSound_5FC928
+	cry CryDirectSound_5FD500
+	cry CryDirectSound_5FF94C
+	cry CryDirectSound_600B9C
+	cry CryDirectSound_601B84
+	cry CryDirectSound_6031F0
+	cry CryDirectSound_603B98
+	cry CryDirectSound_6058C8
+	cry CryDirectSound_606480
+	cry CryDirectSound_607B54
+	cry CryDirectSound_6084F4
+	cry CryDirectSound_6097C8
+	cry CryDirectSound_60BF40
+	cry CryDirectSound_60C714
+	cry CryDirectSound_60DB1C
+	cry CryDirectSound_60FAF8
+	cry CryDirectSound_611AF8
+	cry CryDirectSound_6131FC
+	cry CryDirectSound_613E94
+	cry CryDirectSound_614A1C
+	cry CryDirectSound_615B34
+	cry CryDirectSound_61647C
+	cry CryDirectSound_617808
+	cry CryDirectSound_6185C0
+	cry CryDirectSound_619164
+	cry CryDirectSound_619CE4
+	cry CryDirectSound_61A610
+	cry CryDirectSound_61BAE8
+	cry CryDirectSound_61D48C
+	cry CryDirectSound_61E8BC
+	cry CryDirectSound_61ED98
+	cry CryDirectSound_6212A4
+	cry CryDirectSound_62365C
+	cry CryDirectSound_625388
+	cry CryDirectSound_626CA4
+	cry CryDirectSound_627964
+	cry CryDirectSound_62823C
+	cry CryDirectSound_62A0D8
+	cry CryDirectSound_62C19C
+	cry CryDirectSound_62DDFC
+	cry CryDirectSound_62E98C
+	cry CryDirectSound_6305D4
+	cry CryDirectSound_6312FC
+	cry CryDirectSound_633D0C
+	cry CryDirectSound_634530
 
+	.align 2
 voicegroup_8453790:: @ 8453790
-	.incbin "baserom.gba", 0x00453790, 0x30
+	cry CryDirectSound_635638
+	cry CryDirectSound_636C30
+	cry CryDirectSound_6379B4
+	cry CryDirectSound_638E88
 
+	.align 2
 voicegroup_84537C0:: @ 84537C0
-	.incbin "baserom.gba", 0x004537c0, 0x600
+	cry2 CryDirectSound_4AB57C
+	cry2 CryDirectSound_4AC608
+	cry2 CryDirectSound_4AD698
+	cry2 CryDirectSound_4AE9F0
+	cry2 CryDirectSound_4AF860
+	cry2 CryDirectSound_4B06E0
+	cry2 CryDirectSound_4B1A28
+	cry2 CryDirectSound_4B289C
+	cry2 CryDirectSound_4B39DC
+	cry2 CryDirectSound_4B4D24
+	cry2 CryDirectSound_4B557C
+	cry2 CryDirectSound_4B6CCC
+	cry2 CryDirectSound_4B76D4
+	cry2 CryDirectSound_4B8718
+	cry2 CryDirectSound_4B9954
+	cry2 CryDirectSound_4BACB0
+	cry2 CryDirectSound_4BB098
+	cry2 CryDirectSound_4BBFA0
+	cry2 CryDirectSound_4BD0D4
+	cry2 CryDirectSound_4BD8B4
+	cry2 CryDirectSound_4BE238
+	cry2 CryDirectSound_4BF3DC
+	cry2 CryDirectSound_4C0518
+	cry2 CryDirectSound_4C1864
+	cry2 CryDirectSound_4C2BBC
+	cry2 CryDirectSound_4C3C64
+	cry2 CryDirectSound_4C5424
+	cry2 CryDirectSound_4C5D78
+	cry2 CryDirectSound_4C6B08
+	cry2 CryDirectSound_4C74B8
+	cry2 CryDirectSound_4C8180
+	cry2 CryDirectSound_4C9260
+	cry2 CryDirectSound_4C9CC8
+	cry2 CryDirectSound_4CA8DC
+	cry2 CryDirectSound_4CC148
+	cry2 CryDirectSound_4CC9B8
+	cry2 CryDirectSound_4CD448
+	cry2 CryDirectSound_4CEC18
+	cry2 CryDirectSound_4D0484
+	cry2 CryDirectSound_4D09E8
+	cry2 CryDirectSound_4D10B0
+	cry2 CryDirectSound_4D241C
+	cry2 CryDirectSound_4D3780
+	cry2 CryDirectSound_4D461C
+	cry2 CryDirectSound_4D5298
+	cry2 CryDirectSound_4D6C34
+	cry2 CryDirectSound_4D8828
+	cry2 CryDirectSound_4DA690
+	cry2 CryDirectSound_4DB610
+	cry2 CryDirectSound_4DC614
+	cry2 CryDirectSound_4DD984
+	cry2 CryDirectSound_4DECF0
+	cry2 CryDirectSound_4DF680
+	cry2 CryDirectSound_4E095C
+	cry2 CryDirectSound_4E1684
+	cry2 CryDirectSound_4E21CC
+	cry2 CryDirectSound_4E322C
+	cry2 CryDirectSound_4E425C
+	cry2 CryDirectSound_4E4FC0
+	cry2 CryDirectSound_4E60FC
+	cry2 CryDirectSound_4E6C18
+	cry2 CryDirectSound_4E72C0
+	cry2 CryDirectSound_4E7DE4
+	cry2 CryDirectSound_4E9548
+	cry2 CryDirectSound_4EB030
+	cry2 CryDirectSound_4ECFCC
+	cry2 CryDirectSound_4EDD30
+	cry2 CryDirectSound_4EEAC0
+	cry2 CryDirectSound_4EFB48
+	cry2 CryDirectSound_4F02D4
+	cry2 CryDirectSound_4F1174
+	cry2 CryDirectSound_4F24C0
+	cry2 CryDirectSound_4F34B0
+	cry2 CryDirectSound_4F4BAC
+	cry2 CryDirectSound_4F6360
+	cry2 CryDirectSound_4F7F48
+	cry2 CryDirectSound_4F8D74
+	cry2 CryDirectSound_4F9C84
+	cry2 CryDirectSound_4FAF24
+	cry2 CryDirectSound_4FB68C
+	cry2 CryDirectSound_4FC3FC
+	cry2 CryDirectSound_4FD740
+	cry2 CryDirectSound_4FEF28
+	cry2 CryDirectSound_4FF6A4
+	cry2 CryDirectSound_5009E8
+	cry2 CryDirectSound_501D60
+	cry2 CryDirectSound_502F50
+	cry2 CryDirectSound_504474
+	cry2 CryDirectSound_504EFC
+	cry2 CryDirectSound_505DBC
+	cry2 CryDirectSound_506D30
+	cry2 CryDirectSound_5081F4
+	cry2 CryDirectSound_509944
+	cry2 CryDirectSound_50B0C4
+	cry2 CryDirectSound_50BF84
+	cry2 CryDirectSound_50D848
+	cry2 CryDirectSound_50F560
+	cry2 CryDirectSound_511264
+	cry2 CryDirectSound_512AB0
+	cry2 CryDirectSound_514308
+	cry2 CryDirectSound_515BCC
+	cry2 CryDirectSound_517504
+	cry2 CryDirectSound_5187E4
+	cry2 CryDirectSound_51A7C8
+	cry2 CryDirectSound_51B6E8
+	cry2 CryDirectSound_51C558
+	cry2 CryDirectSound_51D804
+	cry2 CryDirectSound_51E9DC
+	cry2 CryDirectSound_51F904
+	cry2 CryDirectSound_520D60
+	cry2 CryDirectSound_52230C
+	cry2 CryDirectSound_523678
+	cry2 CryDirectSound_524AE4
+	cry2 CryDirectSound_5259B0
+	cry2 CryDirectSound_5268CC
+	cry2 CryDirectSound_527B80
+	cry2 CryDirectSound_5284FC
+	cry2 CryDirectSound_528D68
+	cry2 CryDirectSound_529740
+	cry2 CryDirectSound_52AA98
+	cry2 CryDirectSound_52BE80
+	cry2 CryDirectSound_52D35C
+	cry2 CryDirectSound_52E64C
+	cry2 CryDirectSound_52F3A8
+	cry2 CryDirectSound_53231C
+	cry2 CryDirectSound_534200
+	cry2 CryDirectSound_53517C
+	cry2 CryDirectSound_535DD8
 
+	.align 2
 voicegroup_8453DC0:: @ 8453DC0
-	.incbin "baserom.gba", 0x00453dc0, 0x600
+	cry2 CryDirectSound_53702C
+	cry2 CryDirectSound_538334
+	cry2 CryDirectSound_539768
+	cry2 CryDirectSound_53A63C
+	cry2 CryDirectSound_53B158
+	cry2 CryDirectSound_53BF90
+	cry2 CryDirectSound_53D5A8
+	cry2 CryDirectSound_53E57C
+	cry2 CryDirectSound_53F500
+	cry2 CryDirectSound_54090C
+	cry2 CryDirectSound_541664
+	cry2 CryDirectSound_5423B8
+	cry2 CryDirectSound_54300C
+	cry2 CryDirectSound_543DC8
+	cry2 CryDirectSound_545624
+	cry2 CryDirectSound_545B60
+	cry2 CryDirectSound_547308
+	cry2 CryDirectSound_548280
+	cry2 CryDirectSound_549A2C
+	cry2 CryDirectSound_54A5C8
+	cry2 CryDirectSound_54B670
+	cry2 CryDirectSound_54C97C
+	cry2 CryDirectSound_54E7E4
+	cry2 CryDirectSound_55064C
+	cry2 CryDirectSound_550B8C
+	cry2 CryDirectSound_551458
+	cry2 CryDirectSound_552490
+	cry2 CryDirectSound_552B94
+	cry2 CryDirectSound_55377C
+	cry2 CryDirectSound_555D8C
+	cry2 CryDirectSound_556FE4
+	cry2 CryDirectSound_558420
+	cry2 CryDirectSound_559DA4
+	cry2 CryDirectSound_55A1CC
+	cry2 CryDirectSound_55A814
+	cry2 CryDirectSound_55B2F8
+	cry2 CryDirectSound_55C828
+	cry2 CryDirectSound_55CF20
+	cry2 CryDirectSound_55D784
+	cry2 CryDirectSound_55E4E8
+	cry2 CryDirectSound_55F13C
+	cry2 CryDirectSound_56086C
+	cry2 CryDirectSound_56151C
+	cry2 CryDirectSound_561FA8
+	cry2 CryDirectSound_5626FC
+	cry2 CryDirectSound_562CEC
+	cry2 CryDirectSound_5633E8
+	cry2 CryDirectSound_563ED0
+	cry2 CryDirectSound_5645D0
+	cry2 CryDirectSound_565060
+	cry2 CryDirectSound_565F2C
+	cry2 CryDirectSound_566684
+	cry2 CryDirectSound_567438
+	cry2 CryDirectSound_5684B8
+	cry2 CryDirectSound_5692D0
+	cry2 CryDirectSound_569FE4
+	cry2 CryDirectSound_56B0D0
+	cry2 CryDirectSound_56C100
+	cry2 CryDirectSound_56D344
+	cry2 CryDirectSound_56DBB0
+	cry2 CryDirectSound_56E8B8
+	cry2 CryDirectSound_56F8F4
+	cry2 CryDirectSound_570714
+	cry2 CryDirectSound_570F28
+	cry2 CryDirectSound_571F08
+	cry2 CryDirectSound_573010
+	cry2 CryDirectSound_573770
+	cry2 CryDirectSound_5744D0
+	cry2 CryDirectSound_575884
+	cry2 CryDirectSound_576804
+	cry2 CryDirectSound_5778C8
+	cry2 CryDirectSound_5790AC
+	cry2 CryDirectSound_579C4C
+	cry2 CryDirectSound_57A974
+	cry2 CryDirectSound_57BE10
+	cry2 CryDirectSound_57CCC4
+	cry2 CryDirectSound_57DA24
+	cry2 CryDirectSound_57EE2C
+	cry2 CryDirectSound_57FE0C
+	cry2 CryDirectSound_580A2C
+	cry2 CryDirectSound_583054
+	cry2 CryDirectSound_583EC8
+	cry2 CryDirectSound_58566C
+	cry2 CryDirectSound_586208
+	cry2 CryDirectSound_587904
+	cry2 CryDirectSound_588338
+	cry2 CryDirectSound_58958C
+	cry2 CryDirectSound_589EB0
+	cry2 CryDirectSound_58AF3C
+	cry2 CryDirectSound_58CD14
+	cry2 CryDirectSound_58DE2C
+	cry2 CryDirectSound_58F334
+	cry2 CryDirectSound_58FFDC
+	cry2 CryDirectSound_590CD0
+	cry2 CryDirectSound_5919B0
+	cry2 CryDirectSound_592440
+	cry2 CryDirectSound_593E84
+	cry2 CryDirectSound_594EB8
+	cry2 CryDirectSound_595E80
+	cry2 CryDirectSound_597688
+	cry2 CryDirectSound_598330
+	cry2 CryDirectSound_5996E0
+	cry2 CryDirectSound_59A4B8
+	cry2 CryDirectSound_59B008
+	cry2 CryDirectSound_59C12C
+	cry2 CryDirectSound_59D0E4
+	cry2 CryDirectSound_59E760
+	cry2 CryDirectSound_59F194
+	cry2 CryDirectSound_5A01BC
+	cry2 CryDirectSound_5A0F9C
+	cry2 CryDirectSound_5A1B50
+	cry2 CryDirectSound_5A25DC
+	cry2 CryDirectSound_5A344C
+	cry2 CryDirectSound_5A4328
+	cry2 CryDirectSound_5A53BC
+	cry2 CryDirectSound_5A652C
+	cry2 CryDirectSound_5A79A0
+	cry2 CryDirectSound_5A8BE8
+	cry2 CryDirectSound_5A9898
+	cry2 CryDirectSound_5AA108
+	cry2 CryDirectSound_5AB868
+	cry2 CryDirectSound_5ADE60
+	cry2 CryDirectSound_5AF4F4
+	cry2 CryDirectSound_5B036C
+	cry2 CryDirectSound_5B0BCC
+	cry2 CryDirectSound_5B168C
+	cry2 CryDirectSound_5B1FD8
+	cry2 CryDirectSound_5B2C34
 
+	.align 2
 voicegroup_84543C0:: @ 84543C0
-	.incbin "baserom.gba", 0x004543c0, 0x600
+	cry2 CryDirectSound_5B413C
+	cry2 CryDirectSound_5B4BD4
+	cry2 CryDirectSound_5B5804
+	cry2 CryDirectSound_5B65E4
+	cry2 CryDirectSound_5B7184
+	cry2 CryDirectSound_5B8890
+	cry2 CryDirectSound_5B9220
+	cry2 CryDirectSound_5B9C88
+	cry2 CryDirectSound_5BA220
+	cry2 CryDirectSound_5BAD3C
+	cry2 CryDirectSound_5BB690
+	cry2 CryDirectSound_5BBC90
+	cry2 CryDirectSound_5BC594
+	cry2 CryDirectSound_5BD744
+	cry2 CryDirectSound_5BE3B0
+	cry2 CryDirectSound_5BED58
+	cry2 CryDirectSound_5C0A2C
+	cry2 CryDirectSound_5C29AC
+	cry2 CryDirectSound_5C3554
+	cry2 CryDirectSound_5C49C8
+	cry2 CryDirectSound_5C63E4
+	cry2 CryDirectSound_5C6B68
+	cry2 CryDirectSound_5C7C6C
+	cry2 CryDirectSound_5C92EC
+	cry2 CryDirectSound_5C9EB4
+	cry2 CryDirectSound_5CAAF4
+	cry2 CryDirectSound_5CB79C
+	cry2 CryDirectSound_5CBFDC
+	cry2 CryDirectSound_5CC444
+	cry2 CryDirectSound_5CD2D8
+	cry2 CryDirectSound_5CE3A8
+	cry2 CryDirectSound_5CEBD4
+	cry2 CryDirectSound_5CF73C
+	cry2 CryDirectSound_5D0B00
+	cry2 CryDirectSound_5D1514
+	cry2 CryDirectSound_5D1DE0
+	cry2 CryDirectSound_5D2E0C
+	cry2 CryDirectSound_5D3644
+	cry2 CryDirectSound_5D4688
+	cry2 CryDirectSound_5D5334
+	cry2 CryDirectSound_5D5D50
+	cry2 CryDirectSound_5D6980
+	cry2 CryDirectSound_5D81E4
+	cry2 CryDirectSound_5D8A68
+	cry2 CryDirectSound_5D98C0
+	cry2 CryDirectSound_5DA2AC
+	cry2 CryDirectSound_5DA91C
+	cry2 CryDirectSound_5DB544
+	cry2 CryDirectSound_5DBCFC
+	cry2 CryDirectSound_5DC458
+	cry2 CryDirectSound_5DD510
+	cry2 CryDirectSound_5DE274
+	cry2 CryDirectSound_5DF758
+	cry2 CryDirectSound_5E0054
+	cry2 CryDirectSound_5E105C
+	cry2 CryDirectSound_5E1ADC
+	cry2 CryDirectSound_5E2E90
+	cry2 CryDirectSound_5E35A4
+	cry2 CryDirectSound_5E4ABC
+	cry2 CryDirectSound_5E52C0
+	cry2 CryDirectSound_5E6420
+	cry2 CryDirectSound_5E6D6C
+	cry2 CryDirectSound_5E848C
+	cry2 CryDirectSound_5E8DC8
+	cry2 CryDirectSound_5E9EC4
+	cry2 CryDirectSound_5EAAC8
+	cry2 CryDirectSound_5EC380
+	cry2 CryDirectSound_5ECAC0
+	cry2 CryDirectSound_5ED760
+	cry2 CryDirectSound_5EE184
+	cry2 CryDirectSound_5EEF88
+	cry2 CryDirectSound_5F0990
+	cry2 CryDirectSound_5F1280
+	cry2 CryDirectSound_5F2930
+	cry2 CryDirectSound_5F35B4
+	cry2 CryDirectSound_5F4914
+	cry2 CryDirectSound_5F6110
+	cry2 CryDirectSound_5F713C
+	cry2 CryDirectSound_5F7910
+	cry2 CryDirectSound_5FA054
+	cry2 CryDirectSound_5FAAD0
+	cry2 CryDirectSound_5FB2F0
+	cry2 CryDirectSound_5FC374
+	cry2 CryDirectSound_5FC928
+	cry2 CryDirectSound_5FD500
+	cry2 CryDirectSound_5FF94C
+	cry2 CryDirectSound_600B9C
+	cry2 CryDirectSound_601B84
+	cry2 CryDirectSound_6031F0
+	cry2 CryDirectSound_603B98
+	cry2 CryDirectSound_6058C8
+	cry2 CryDirectSound_606480
+	cry2 CryDirectSound_607B54
+	cry2 CryDirectSound_6084F4
+	cry2 CryDirectSound_6097C8
+	cry2 CryDirectSound_60BF40
+	cry2 CryDirectSound_60C714
+	cry2 CryDirectSound_60DB1C
+	cry2 CryDirectSound_60FAF8
+	cry2 CryDirectSound_611AF8
+	cry2 CryDirectSound_6131FC
+	cry2 CryDirectSound_613E94
+	cry2 CryDirectSound_614A1C
+	cry2 CryDirectSound_615B34
+	cry2 CryDirectSound_61647C
+	cry2 CryDirectSound_617808
+	cry2 CryDirectSound_6185C0
+	cry2 CryDirectSound_619164
+	cry2 CryDirectSound_619CE4
+	cry2 CryDirectSound_61A610
+	cry2 CryDirectSound_61BAE8
+	cry2 CryDirectSound_61D48C
+	cry2 CryDirectSound_61E8BC
+	cry2 CryDirectSound_61ED98
+	cry2 CryDirectSound_6212A4
+	cry2 CryDirectSound_62365C
+	cry2 CryDirectSound_625388
+	cry2 CryDirectSound_626CA4
+	cry2 CryDirectSound_627964
+	cry2 CryDirectSound_62823C
+	cry2 CryDirectSound_62A0D8
+	cry2 CryDirectSound_62C19C
+	cry2 CryDirectSound_62DDFC
+	cry2 CryDirectSound_62E98C
+	cry2 CryDirectSound_6305D4
+	cry2 CryDirectSound_6312FC
+	cry2 CryDirectSound_633D0C
+	cry2 CryDirectSound_634530
 
+	.align 2
 voicegroup_84549C0:: @ 84549C0
-	.incbin "baserom.gba", 0x004549c0, 0x30
+	cry2 CryDirectSound_635638
+	cry2 CryDirectSound_636C30
+	cry2 CryDirectSound_6379B4
+	cry2 CryDirectSound_638E88
 
+	.align 2
 voicegroup_84549F0:: @ 84549F0
 	voice_directsound 60, 0, DirectSoundWaveData_8639898, 255, 0, 255, 0  @ 84549F0
 	voice_directsound 60, 0, DirectSoundWaveData_8639EF8, 255, 0, 255, 0  @ 84549FC
@@ -12097,6 +12986,7 @@ voicegroup_84549F0:: @ 84549F0
 	voice_directsound 60, 0, DirectSoundWaveData_8653CA4, 255, 0, 255, 0  @ 8454C3C
 	voice_directsound 60, 0, DirectSoundWaveData_8654170, 255, 0, 255, 0  @ 8454C48
 
+	.align 2
 voicegroup_8454C54:: @ 8454C54
 	voice_keysplit_all voicegroup_842FEF8  @ 8454C54
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8454C60
diff --git a/tools/aif2pcm/main.c b/tools/aif2pcm/main.c
index 1258cf3fa..2c95c62d8 100644
--- a/tools/aif2pcm/main.c
+++ b/tools/aif2pcm/main.c
@@ -287,11 +287,11 @@ void aif2pcm(const char *aif_filename)
 	// Write the output .bin file containing .aif metadata.
 	FILE *metadata_file;
 	metadata_file = fopen(metadata_filename, "wb");
-	unsigned long pitch_adjust = (unsigned long)(aif_data->sample_rate * 1024);
-	fwrite(&pitch_adjust, sizeof(unsigned long), 1, metadata_file);
-	fwrite(&(aif_data->loop_offset), sizeof(unsigned long), 1, metadata_file);
-	unsigned long adjusted_num_samples = aif_data->num_samples - 1;
-	fwrite(&adjusted_num_samples, sizeof(unsigned long), 1, metadata_file);
+	uint32_t pitch_adjust = (uint32_t)(aif_data->sample_rate * 1024);
+	fwrite(&pitch_adjust, sizeof(uint32_t), 1, metadata_file);
+	fwrite(&(aif_data->loop_offset), sizeof(uint32_t), 1, metadata_file);
+	uint32_t adjusted_num_samples = (uint32_t)(aif_data->num_samples - 1);
+	fwrite(&adjusted_num_samples, sizeof(uint32_t), 1, metadata_file);
 	fclose(metadata_file);
 
 	free(aif_data->samples);