118 files changed, 1439 insertions, 1358 deletions

diff --git a/.gitignore b/.gitignore
index c0b0cb86c..e590e06f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,9 @@
 *.exe
 *.fwjpnfont
 *.gba
+*.sgm
+*.sa1
+*.sg1
 *.gbapal
 *.hwjpnfont
 *.i
diff --git a/.travis.yml b/.travis.yml
index 519ba1aca..e0608744a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: generic
-dist: trusty
+dist: bionic
 sudo: false
 addons:
   apt:
@@ -27,5 +27,6 @@ matrix:
       script:
         - make tools CXX=g++-7
         - make -j2 compare
+        - make -j2 compare_firered_rev1
 after_success:
   - .travis/calcrom/webhook.sh pokefirered
diff --git a/.travis/calcrom/calcrom.pl b/.travis/calcrom/calcrom.pl
index d252be996..603a727d9 100644..100755
--- a/.travis/calcrom/calcrom.pl
+++ b/.travis/calcrom/calcrom.pl
@@ -136,25 +136,10 @@ print "$documented symbols documented ($docPct%)\n";
 print "$partial_documented symbols partially documented ($partialPct%)\n";
 print "$undocumented symbols undocumented ($undocPct%)\n";
 
-my $foundLines = `git grep '\.incbin "baserom\.gba"' data/`;
-my @allLines = split('\n', $foundLines);
-my $incbinTotal = 0;
-my $incbinNum = 0;
-foreach my $line (@allLines)
-{
-    if ($line =~ /\.incbin\s+"baserom\.gba",\s*0x\w+,\s*(.+?)\s*(\@.*)?$/)
-    {
-        my $size = hex($1);
-        $incbinTotal += $size;
-        $incbinNum++;
-    }
-}
 print "\n";
 my $dataTotal = $srcdata + $data;
 my $srcDataPct = sprintf("%.4f", 100 * $srcdata / $dataTotal);
 my $dataPct = sprintf("%.4f", 100 * $data / $dataTotal);
-my $incbinTotalPct = sprintf("%.4f", 100 * $incbinTotal / $dataTotal);
 print "$dataTotal total bytes of data\n";
 print "$srcdata bytes of data in src ($srcDataPct%)\n";
 print "$data bytes of data in data ($dataPct%)\n";
-print "$incbinNum baserom incbins with a combined $incbinTotal bytes ($incbinTotalPct%)\n";
diff --git a/Makefile b/Makefile
index 0b27867b0..59aec0051 100644
--- a/Makefile
+++ b/Makefile
@@ -5,36 +5,7 @@ CPP := $(CC) -E
 LD := tools/binutils/bin/arm-none-eabi-ld
 OBJCOPY := tools/binutils/bin/arm-none-eabi-objcopy
 
-GAME_VERSION := FIRERED
-REVISION := 0
-GAME_LANGUAGE := ENGLISH
-
-# So long as baserom.gba is required, we error out if the
-# user tries to build any ROM other than FireRed.
-ifneq ($(GAME_VERSION),FIRERED)
-$(error We can only build English Pokemon FireRed v1.0 currently)
-else ifneq ($(REVISION),0)
-$(error We can only build English Pokemon FireRed v1.0 currently)
-else ifneq ($(GAME_LANGUAGE),ENGLISH)
-$(error We can only build English Pokemon FireRed v1.0 currently)
-endif
-
-ifeq ($(GAME_VERSION),FIRERED)
-TITLE       := POKEMON FIRE
-GAME_CODE   := BPR
-BUILD_NAME  := firered
-else
-TITLE       := POKEMON LEAF
-GAME_CODE   := BPL
-BUILD_NAME  := leafgreen
-endif
-ifeq ($(GAME_LANGUAGE),ENGLISH)
-GAME_CODE   := $(GAME_CODE)E
-endif
-ifneq ($(REVISION),0)
-BUILD_NAME  := $(BUILD_NAME)_rev$(REVISION)
-endif
-MAKER_CODE  := 01
+include config.mk
 
 SHELL := /bin/bash -o pipefail
 
@@ -57,12 +28,12 @@ DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR)
 SONG_BUILDDIR = $(OBJ_DIR)/$(SONG_SUBDIR)
 MID_BUILDDIR = $(OBJ_DIR)/$(MID_SUBDIR)
 
-ASFLAGS := -mcpu=arm7tdmi --defsym $(GAME_VERSION)=1 --defsym REVISION=$(REVISION) --defsym $(GAME_LANGUAGE)=1
+ASFLAGS := -mcpu=arm7tdmi --defsym $(GAME_VERSION)=1 --defsym REVISION=$(GAME_REVISION) --defsym $(GAME_LANGUAGE)=1
 
 CC1             := tools/agbcc/bin/agbcc
 override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
 
-CPPFLAGS := -I tools/agbcc -I tools/agbcc/include -iquote include -nostdinc -undef -D$(GAME_VERSION) -DREVISION=$(REVISION) -D$(GAME_LANGUAGE)
+CPPFLAGS := -I tools/agbcc -I tools/agbcc/include -iquote include -nostdinc -undef -D$(GAME_VERSION) -DREVISION=$(GAME_REVISION) -D$(GAME_LANGUAGE)
 
 LDFLAGS = -Map ../../$(MAP)
 
@@ -133,7 +104,7 @@ all: tools rom
 
 rom: $(ROM)
 ifeq ($(COMPARE),1)
-	@$(SHA1) rom.sha1
+	@$(SHA1) $(BUILD_NAME).sha1
 endif
 
 tools: $(TOOLDIRS)
@@ -252,8 +223,18 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm
 
 $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
 	cd $(OBJ_DIR) && ../../$(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(LIB)
-	$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
+	$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(GAME_REVISION) --silent
 
 $(ROM): $(ELF)
 	$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@
 
+# "friendly" target names for convenience sake
+firered:                ; @$(MAKE) GAME_VERSION=FIRERED
+firered_rev1:           ; @$(MAKE) GAME_VERSION=FIRERED GAME_REVISION=1
+leafgreen:              ; @$(MAKE) GAME_VERSION=LEAFGREEN
+leafgreen_rev1:         ; @$(MAKE) GAME_VERSION=LEAFGREEN GAME_REVISION=1
+
+compare_firered:        ; @$(MAKE) GAME_VERSION=FIRERED COMPARE=1
+compare_firered_rev1:   ; @$(MAKE) GAME_VERSION=FIRERED GAME_REVISION=1 COMPARE=1
+compare_leafgreen:      ; @$(MAKE) GAME_VERSION=LEAFGREEN COMPARE=1
+compare_leafgreen_rev1: ; @$(MAKE) GAME_VERSION=LEAFGREEN GAME_REVISION=1 COMPARE=1
diff --git a/asm/crt0.s b/asm/crt0.s
index f2e28c9e1..609845337 100644
--- a/asm/crt0.s
+++ b/asm/crt0.s
@@ -46,20 +46,29 @@ GPIOPortReadEnable: @ 80000C8
 	.4byte 0xFFFFFFFF
 	.4byte 0xFFFFFFFF
 	.4byte 0xFFFFFFFF
+	.ifdef FIRERED
 	.4byte          4
 	.4byte          2
 	.ascii "pokemon red version"
 	.space 13
-	.4byte  0x82350AC @ gMonFrontPicTable
-	.4byte  0x823654C @ gMonBackPicTable
-	.4byte  0x823730C @ gMonPaletteTable
-	.4byte  0x82380CC @ gMonShinyPaletteTable
-	.4byte  0x83D37A0 @ gMonIconTable
-	.4byte  0x83D3E80 @ gMonIconPaletteIndices
-	.4byte  0x83D4038 @ gMonIconPaletteTable
-	.4byte  0x8245EE0 @ gSpeciesNames
-	.4byte  0x8247094 @ gMoveNames
-	.4byte  0x84556F8 @ gDecorations
+	.else
+	.ifdef LEAFGREEN
+	.4byte          5
+	.4byte          2
+	.ascii "pokemon green version"
+	.space 11
+	.endif
+	.endif
+	.4byte  gMonFrontPicTable
+	.4byte  gMonBackPicTable
+	.4byte  gMonPaletteTable
+	.4byte  gMonShinyPaletteTable
+	.4byte  gMonIconTable
+	.4byte  gMonIconPaletteIndices
+	.4byte  gMonIconPaletteTable
+	.4byte  gSpeciesNames
+	.4byte  gMoveNames
+	.4byte  gDecorations
 	.4byte      0xEE0 @ offsetof(struct SaveBlock1, flags)
 	.4byte     0x1000 @ offsetof(struct SaveBlock1, vars)
 	.4byte       0x18 @ offsetof(struct SaveBlock2, pokedex)
@@ -88,13 +97,13 @@ GPIOPortReadEnable: @ 80000C8
 	.4byte     0x30BB
 	.4byte     0x30A7
 	.4byte          0
-	.4byte  0x8254784 @ gBaseStats
-	.4byte  0x824FC40 @ gAbilityNames
-	.4byte  0x824FB08 @ gAbilityDescriptionPointers
-	.4byte  0x83DB028 @ gItems
-	.4byte  0x8250C04 @ gBattleMoves
-	.4byte  0x826056C @ gBallSpriteSheets
-	.4byte  0x82605CC @ gBallSpritePalettes
+	.4byte  gBaseStats
+	.4byte  gAbilityNames
+	.4byte  gAbilityDescriptionPointers
+	.4byte  gItems
+	.4byte  gBattleMoves
+	.4byte  gBallSpriteSheets
+	.4byte  gBallSpritePalettes
 	.4byte       0xA8
 	.4byte      0x82C
 	.4byte      0x83B
diff --git a/asm/librfu.s b/asm/librfu.s
index bdf816bd8..a291fcad3 100644
--- a/asm/librfu.s
+++ b/asm/librfu.s
@@ -2363,7 +2363,7 @@ _081E0668:
 	lsrs r5, r0, 16
 	cmp r5, 0x3
 	bls _081E0668
-	ldr r1, _081E06E0 @ =0x081E1B25
+	ldr r1, _081E06E0 @ =sub_81E1B24
 	movs r5, 0x2
 	negs r5, r5
 	ands r5, r1
@@ -2371,7 +2371,7 @@ _081E0668:
 	ldr r0, [r2]
 	adds r4, r0, 0
 	adds r4, 0x8
-	ldr r0, _081E06E4 @ =0x081E1B55
+	ldr r0, _081E06E4 @ =rfu_REQ_changeMasterSlave
 	subs r0, r1
 	lsls r0, 15
 	lsrs r3, r0, 16
@@ -2408,8 +2408,8 @@ _081E06D0: .4byte gUnknown_3007464
 _081E06D4: .4byte gUnknown_3007468
 _081E06D8: .4byte gUnknown_3007450
 _081E06DC: .4byte gUnknown_3007440
-_081E06E0: .4byte 0x081E1B25
-_081E06E4: .4byte 0x081E1B55
+_081E06E0: .4byte sub_81E1B24
+_081E06E4: .4byte rfu_REQ_changeMasterSlave
 _081E06E8: .4byte 0x0000ffff
 	thumb_func_end sub_81E05B0
 
diff --git a/asm/macros.inc b/asm/macros.inc
index 3cc26c6f7..ffbe3db29 100644
--- a/asm/macros.inc
+++ b/asm/macros.inc
@@ -158,3 +158,12 @@
 	.byte \bg, \top, \left, \height, \width, \palno
 	.2byte \baseBlock
 	.endm
+
+	.macro abspath relative
+	.if REVISION == 0
+	.ascii "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/"
+	.else
+	.ascii "C:/WORK/POKeFRLG/Src/pm_lgfr_ose/source/"
+	.endif
+	.asciz "\relative"
+	.endm
diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s
index 4bd153c77..94107279e 100644
--- a/asm/pokedex_screen.s
+++ b/asm/pokedex_screen.s
@@ -337,7 +337,11 @@ sub_8105800: @ 8105800
 	cmp r0, 0
 	beq _08105864
 	ldrb r0, [r5]
+	.if REVISION == 0
 	cmp r0, 0
+	.else
+	cmp r0, 0xFF
+	.endif
 	beq _08105878
 _08105840:
 	mov r1, sp
@@ -351,7 +355,11 @@ _08105840:
 	lsrs r4, r0, 24
 	adds r0, r5, r4
 	ldrb r0, [r0]
+	.if REVISION == 0
 	cmp r0, 0
+	.else
+	cmp r0, 0xFF
+	.endif
 	beq _08105878
 	cmp r4, 0xA
 	bls _08105840
diff --git a/asmdiff.sh b/asmdiff.sh
index d4627c007..9e2bef55b 100755
--- a/asmdiff.sh
+++ b/asmdiff.sh
@@ -1,7 +1,27 @@
 #!/bin/bash
 
+if [ "$1" == "firered" ] || [ "$1" == "leafgreen" ] || [ "$1" == "firered_rev1" ] || [ "$1" == "leafgreen_rev1" ]; then
+  buildname="$1"
+  shift
+else
+  buildname=firered
+fi
+
+if [ "$buildname" == "firered" ]; then
+  baserom=baserom
+elif [ "$buildname" == "leafgreen" ]; then
+  baserom=baserom_lg
+elif [ "$buildname" == "firered_rev1" ]; then
+  baserom=baserom_fr_rev1
+elif [ "$buildname" == "leafgreen_rev1" ]; then
+  baserom=baserom_lg_rev1
+else
+  echo unknown buildname $buildname
+  exit 1
+fi
+
 OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
 OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
-$OBJDUMP $OPTIONS baserom.gba > baserom.dump
-$OBJDUMP $OPTIONS pokefirered.gba > pokefirered.dump
-diff -u baserom.dump pokefirered.dump
+$OBJDUMP $OPTIONS ${baserom}.gba > ${baserom}.dump || exit 1
+$OBJDUMP $OPTIONS poke${buildname}.gba > poke${buildname}.dump
+diff -u ${baserom}.dump poke${buildname}.dump
diff --git a/config.mk b/config.mk
new file mode 100644
index 000000000..bf8f2ce3f
--- /dev/null
+++ b/config.mk
@@ -0,0 +1,51 @@
+# Default variables
+
+GAME_VERSION  ?= FIRERED
+GAME_REVISION ?= 0
+GAME_LANGUAGE ?= ENGLISH
+MODERN        ?= 0
+COMPARE       ?= 0
+
+# For gbafix
+MAKER_CODE  := 01
+
+# Version
+ifeq ($(GAME_VERSION),FIRERED)
+TITLE       := POKEMON FIRE
+GAME_CODE   := BPR
+BUILD_NAME  := firered
+else
+ifeq ($(GAME_VERSION),LEAFGREEN)
+TITLE       := POKEMON LEAF
+GAME_CODE   := BPG
+BUILD_NAME  := leafgreen
+else
+$(error unknown version $(GAME_VERSION))
+endif
+endif
+
+# Revision
+ifeq ($(GAME_REVISION),0)
+BUILD_NAME  := $(BUILD_NAME)
+else
+ifeq ($(GAME_REVISION),1)
+BUILD_NAME  := $(BUILD_NAME)_rev1
+else
+$(error unknown revision $(GAME_REVISION))
+endif
+endif
+
+# Language
+ifeq ($(GAME_LANGUAGE),ENGLISH)
+BUILD_NAME  := $(BUILD_NAME)
+GAME_CODE   := $(GAME_CODE)E
+else
+$(error unknown language $(GAME_LANGUAGE))
+endif
+
+# Modern GCC
+ifeq ($(MODERN), 0)
+  BUILD_NAME := $(BUILD_NAME)
+else
+  BUILD_NAME := $(BUILD_NAME)_modern
+endif
diff --git a/data/event_object_80688E4.s b/data/event_object_80688E4.s
index 884bf379f..8d1917825 100644
--- a/data/event_object_80688E4.s
+++ b/data/event_object_80688E4.s
@@ -1,3 +1,5 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
 	.section .rodata
 	.align 2
 
@@ -88,7 +90,7 @@ gUnknown_83A7208:: @ 83A7208
 
 	.align 2
 gUnknown_83A720C:: @ 83A720C
-	.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/evobjmv.c"
+	abspath "evobjmv.c"
 
 	.align 2
 gUnknown_83A7240:: @ 83A7240
diff --git a/data/event_scripts.s b/data/event_scripts.s
index c2daa0031..21fdffe43 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -12361,9 +12361,8 @@ gUnknown_81C1300:: @ 81C1300
 	.string "It looks like it's having fun.$"
 
 EventScript_1C1338:: @ 81C1338
-	waitse
-	setdivewarp MAP_UNKNOWN_MAP_00_00, 72, 7187, 8
-	nop
+	map_script_2 VAR_0x4030, 0, EventScript_1C1348
+	.2byte 0
 	copyvar VAR_0x4030, 1
 	end
 
@@ -14474,8 +14473,9 @@ Text_1C55A4:: @ 81C55A4
 	.string "テストよう　メッセージです！\n"
 	.string "ざひょう　チェックの　イベントです$"
 
-Text_1C55C5:: @ 81C55C5
-	.string "   $"
+	.align 2
+Text_1C55C8:: @ 81C55C8
+	.string "$"
 
 gText_WouldYouLikeToSaveTheGame:: @ 81C55C9
 	.string "Would you like to save the game?$"
diff --git a/data/field_effect.s b/data/field_effect.s
index c6affccd2..7e797c560 100644
--- a/data/field_effect.s
+++ b/data/field_effect.s
@@ -45,6 +45,9 @@ gUnknown_83CBB10:: @ 83CBB10 gbapal gUnknown_83CBA90
 gUnknown_83CBB30:: @ 83CBB30 4bpp
 	.incbin "graphics/field_effects/unk_83CBB30.bin"
 
+gUnknown_83CBDB0::
+	.incbin "graphics/field_effects/unk_83CBDB0.4bpp"
+
 	.align 2
 gUnknown_83CBE30:: @ 83CBE30 dataptr
 	.4byte FieldEffectCmd_loadtiles
@@ -398,10 +401,10 @@ gUnknown_83CC244:: @ 83CC244 dataptr
 	.4byte sub_8087CB4
 
 gUnknown_83CC250:: @ 83CC250 sprite_frames
-	obj_frame_tiles 0x083cbdb0, 0x0020
-	obj_frame_tiles 0x083cbdd0, 0x0020
-	obj_frame_tiles 0x083cbdf0, 0x0020
-	obj_frame_tiles 0x083cbe10, 0x0020
+	obj_frame_tiles gUnknown_83CBDB0 + 0x00, 0x0020
+	obj_frame_tiles gUnknown_83CBDB0 + 0x20, 0x0020
+	obj_frame_tiles gUnknown_83CBDB0 + 0x40, 0x0020
+	obj_frame_tiles gUnknown_83CBDB0 + 0x60, 0x0020
 
 gUnknown_83CC270:: @ 83CC270 animcmd
 	obj_image_anim_frame 0x0000, 0
diff --git a/data/link_rfu.s b/data/link_rfu.s
index 8e9abd3f0..79be01714 100644
--- a/data/link_rfu.s
+++ b/data/link_rfu.s
@@ -221,10 +221,10 @@ gUnknown_843F9A0::
 	obj_image_anim_end
 
 gUnknown_843F9A8::
-	.4byte 0x843f988
-	.4byte 0x843f990
-	.4byte 0x843f998
-	.4byte 0x843f9a0
+	.4byte gUnknown_843F988
+	.4byte gUnknown_843F990
+	.4byte gUnknown_843F998
+	.4byte gUnknown_843F9A0
 
 gUnknown_843F9B8:: @ 843F9B8 sprite_template
 	spr_template 1, 1, gUnknown_843F980, gUnknown_843F9A8, NULL, gDummySpriteAffineAnimTable, sub_8101B20
diff --git a/data/link_rfu_2.s b/data/link_rfu_2.s
index 5285ac578..4f88177aa 100644
--- a/data/link_rfu_2.s
+++ b/data/link_rfu_2.s
@@ -95,7 +95,7 @@ gUnknown_843ED88:: @ 843ED88
 
 	.align 2
 gUnknown_843ED94:: @ 843ED94
-	.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu.c"
+	abspath "rfu.c"
 
 	.align 2
 gUnknown_843EDC4:: @ 843EDC4
diff --git a/data/link_rfu_3.s b/data/link_rfu_3.s
index 2effddd97..6cd65b04d 100644
--- a/data/link_rfu_3.s
+++ b/data/link_rfu_3.s
@@ -315,7 +315,7 @@ gUnknown_8457120:: @ 8457120
 
 	.align 2
 gUnknown_8457138:: @ 8457138
-	.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c"
+	abspath "rfu_union_tool.c"
 
 	.align 2
 gUnknown_8457174:: @ 8457174
diff --git a/data/text/help_system.inc b/data/text/help_system.inc
index 7a74de349..ccc57332b 100644
--- a/data/text/help_system.inc
+++ b/data/text/help_system.inc
@@ -980,8 +980,13 @@ gUnknown_81B752C:: @ 81B752C
 	.string "   the POKéDEX list.\n"
 	.string "{CIRCLE_2} A caught POKéMON will provide a\n"
 	.string "   large amount of data.\n"
+	.if REVISION < 1
 	.string "{CIRCLE_3} Select “AREA” to display the TOWN\n"
 	.string "   MAP with the POKéMON's habitat(s).$"
+	.else
+	.string "{CIRCLE_3} Select “NEXT DATA” to display the\n"
+	.string "   TOWN MAP with its habitat(s).$"
+	.endif
 
 gUnknown_81B7611:: @ 81B7611
 	.string "{CIRCLE_1} Go up to the PC at home, then press\n"
diff --git a/rom.sha1 b/firered.sha1
index a4d3b2fe2..a4d3b2fe2 100644
--- a/rom.sha1
+++ b/firered.sha1
diff --git a/firered_rev1.sha1 b/firered_rev1.sha1
new file mode 100644
index 000000000..2cb2ef855
--- /dev/null
+++ b/firered_rev1.sha1
@@ -0,0 +1 @@
+dd5945db9b930750cb39d00c84da8571feebf417  pokefirered_rev1.gba
diff --git a/graphics/field_effects/unk_83CBB30.bin b/graphics/field_effects/unk_83CBB30.bin
index 9543a056e..f7c2f2142 100644
--- a/graphics/field_effects/unk_83CBB30.bin
+++ b/graphics/field_effects/unk_83CBB30.bin
diff --git a/graphics/field_effects/unk_83CBDB0.png b/graphics/field_effects/unk_83CBDB0.png
new file mode 100644
index 000000000..5a84d2e06
--- /dev/null
+++ b/graphics/field_effects/unk_83CBDB0.png
diff --git a/include/config.h b/include/config.h
index 491eadf13..67dc38a2b 100644
--- a/include/config.h
+++ b/include/config.h
@@ -11,9 +11,15 @@
 // #define NDEBUG
 
 // Fire Red likely forgot to define NDEBUG/NOAGBPRN before release, leading
-// to the inclusion of asserts in the retail ROM. Don't try to re-enable this yet
-// since not all baseroms and pointers have been dumped yet and will result in
-// a broken ROM.
+// to the inclusion of asserts in the retail ROM.
+
+#if REVISION == 0
+#define CODE_ROOT "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/"
+#else
+#define CODE_ROOT "C:/WORK/POKeFRLG/Src/pm_lgfr_ose/source/"
+#endif
+
+#define ABSPATH(x) (CODE_ROOT x)
 
 #ifdef ENGLISH
 #define UNITS_IMPERIAL
diff --git a/leafgreen.sha1 b/leafgreen.sha1
new file mode 100644
index 000000000..3cb75847e
--- /dev/null
+++ b/leafgreen.sha1
@@ -0,0 +1 @@
+574fa542ffebb14be69902d1d36f1ec0a4afd71e  pokeleafgreen.gba
diff --git a/leafgreen_rev1.sha1 b/leafgreen_rev1.sha1
new file mode 100644
index 000000000..94c865e70
--- /dev/null
+++ b/leafgreen_rev1.sha1
@@ -0,0 +1 @@
+7862c67bdecbe21d1d69ce082ce34327e1c6ed5e  pokeleafgreen_rev1.gba
diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc
index e95ba843c..282c137b2 100644
--- a/sound/direct_sound_data.inc
+++ b/sound/direct_sound_data.inc
@@ -1,1822 +1,1821 @@
-
 	.align 2
-gDirectSoundWaveData_0:: @ 84A3DA8
-	.incbin "sound/direct_sound_samples/wave_0.bin"
+DirectSoundWaveData_sc88_glockenspiel::
+	.incbin "sound/direct_sound_samples/sc88_glockenspiel.bin"
 
-gDirectSoundWaveData_1:: @ 84A444C
-	.incbin "sound/direct_sound_samples/wave_1.bin"
+DirectSoundWaveData_sc88_organ2::
+	.incbin "sound/direct_sound_samples/sc88_organ2.bin"
 
-gDirectSoundWaveData_2:: @ 84A4C44
-	.incbin "sound/direct_sound_samples/wave_2.bin"
+DirectSoundWaveData_sc88_fretless_bass::
+	.incbin "sound/direct_sound_samples/sc88_fretless_bass.bin"
 
-gDirectSoundWaveData_3:: @ 84A5810
-	.incbin "sound/direct_sound_samples/wave_3.bin"
+DirectSoundWaveData_jv1080_slap_bass::
+	.incbin "sound/direct_sound_samples/jv1080_slap_bass.bin"
 
-gDirectSoundWaveData_4:: @ 84A6748
-	.incbin "sound/direct_sound_samples/wave_4.bin"
+DirectSoundWaveData_sc88_synth_bass::
+	.incbin "sound/direct_sound_samples/sc88_synth_bass.bin"
 
-gDirectSoundWaveData_5:: @ 84A73BC
-	.incbin "sound/direct_sound_samples/wave_5.bin"
+DirectSoundWaveData_sc88_timpani::
+	.incbin "sound/direct_sound_samples/sc88_timpani.bin"
 
-gDirectSoundWaveData_6:: @ 84A888C
-	.incbin "sound/direct_sound_samples/wave_6.bin"
+DirectSoundWaveData_classical_choir_voice_ahhs::
+	.incbin "sound/direct_sound_samples/classical_choir_voice_ahhs.bin"
 
-gDirectSoundWaveData_7:: @ 84A9F3C
-	.incbin "sound/direct_sound_samples/wave_7.bin"
+DirectSoundWaveData_sd90_classical_oboe::
+	.incbin "sound/direct_sound_samples/sd90_classical_oboe.bin"
 
-gDirectSoundWaveData_8:: @ 84AB280
-	.incbin "sound/direct_sound_samples/wave_8.bin"
+DirectSoundWaveData_unused_sd90_oboe::
+	.incbin "sound/direct_sound_samples/unused_sd90_oboe.bin"
 
-gDirectSoundWaveData_9:: @ 84ABD24
-	.incbin "sound/direct_sound_samples/wave_9.bin"
+DirectSoundWaveData_unused_electric_guitar::
+	.incbin "sound/direct_sound_samples/unused_electric_guitar.bin"
 
-gDirectSoundWaveData_10:: @ 84AD038
-	.incbin "sound/direct_sound_samples/wave_10.bin"
+DirectSoundWaveData_unused_sc88_unison_slap::
+	.incbin "sound/direct_sound_samples/unused_sc88_unison_slap.bin"
 
-gDirectSoundWaveData_11:: @ 84B0634
-	.incbin "sound/direct_sound_samples/wave_11.bin"
+DirectSoundWaveData_unknown_snare::
+	.incbin "sound/direct_sound_samples/unknown_snare.bin"
 
-gDirectSoundWaveData_12:: @ 84B0B0C
-	.incbin "sound/direct_sound_samples/wave_12.bin"
+DirectSoundWaveData_unknown_wood_block_low::
+	.incbin "sound/direct_sound_samples/unknown_wood_block_low.bin"
 
-gDirectSoundWaveData_13:: @ 84B23E8
-	.incbin "sound/direct_sound_samples/wave_13.bin"
+DirectSoundWaveData_unknown_wood_block_high::
+	.incbin "sound/direct_sound_samples/unknown_wood_block_high.bin"
 
-gDirectSoundWaveData_14:: @ 84B3710
-	.incbin "sound/direct_sound_samples/wave_14.bin"
+DirectSoundWaveData_sc88_standard_kick::
+	.incbin "sound/direct_sound_samples/sc88_standard_kick.bin"
 
-gDirectSoundWaveData_15:: @ 84B3BB0
-	.incbin "sound/direct_sound_samples/wave_15.bin"
+DirectSoundWaveData_sc88_standard3_snare::
+	.incbin "sound/direct_sound_samples/sc88_standard3_snare.bin"
 
-gDirectSoundWaveData_16:: @ 84B42A4
-	.incbin "sound/direct_sound_samples/wave_16.bin"
+DirectSoundWaveData_sc88_standard_hand_clap::
+	.incbin "sound/direct_sound_samples/sc88_standard_hand_clap.bin"
 
-gDirectSoundWaveData_17:: @ 84B4B34
-	.incbin "sound/direct_sound_samples/wave_17.bin"
+DirectSoundWaveData_sc88_orchestra_snare::
+	.incbin "sound/direct_sound_samples/sc88_orchestra_snare.bin"
 
-gDirectSoundWaveData_18:: @ 84B53AC
-	.incbin "sound/direct_sound_samples/wave_18.bin"
+DirectSoundWaveData_unknown_tambourine::
+	.incbin "sound/direct_sound_samples/unknown_tambourine.bin"
 
-gDirectSoundWaveData_19:: @ 84B5C60
-	.incbin "sound/direct_sound_samples/wave_19.bin"
+DirectSoundWaveData_trinity_cymbal_crash::
+	.incbin "sound/direct_sound_samples/trinity_cymbal_crash.bin"
 
-gDirectSoundWaveData_20:: @ 84B6544
-	.incbin "sound/direct_sound_samples/wave_20.bin"
+DirectSoundWaveData_sc88_orchestra_cymbal_crash::
+	.incbin "sound/direct_sound_samples/sc88_orchestra_cymbal_crash.bin"
 
-gDirectSoundWaveData_21:: @ 84B7470
-	.incbin "sound/direct_sound_samples/wave_21.bin"
+DirectSoundWaveData_sc88_bongo::
+	.incbin "sound/direct_sound_samples/sc88_bongo.bin"
 
-gDirectSoundWaveData_22:: @ 84B7988
-	.incbin "sound/direct_sound_samples/wave_22.bin"
+DirectSoundWaveData_sc88_bongo_low::
+	.incbin "sound/direct_sound_samples/sc88_bongo_low.bin"
 
-gDirectSoundWaveData_23:: @ 84B7F50
-	.incbin "sound/direct_sound_samples/wave_23.bin"
+DirectSoundWaveData_drum_and_percussion_kick::
+	.incbin "sound/direct_sound_samples/drum_and_percussion_kick.bin"
 
-gDirectSoundWaveData_24:: @ 84B8E68
-	.incbin "sound/direct_sound_samples/wave_24.bin"
+DirectSoundWaveData_sd90_solo_snare::
+	.incbin "sound/direct_sound_samples/sd90_solo_snare.bin"
 
-gDirectSoundWaveData_25:: @ 84BA7DC
-	.incbin "sound/direct_sound_samples/wave_25.bin"
+DirectSoundWaveData_sd90_ambient_tom::
+	.incbin "sound/direct_sound_samples/sd90_ambient_tom.bin"
 
-gDirectSoundWaveData_26:: @ 84BC8B8
-	.incbin "sound/direct_sound_samples/wave_26.bin"
+DirectSoundWaveData_dance_drums_ride_bell::
+	.incbin "sound/direct_sound_samples/dance_drums_ride_bell.bin"
 
-gDirectSoundWaveData_27:: @ 84C40E8
-	.incbin "sound/direct_sound_samples/wave_27.bin"
+DirectSoundWaveData_unknown_cowbell::
+	.incbin "sound/direct_sound_samples/unknown_cowbell.bin"
 
-gDirectSoundWaveData_28:: @ 84C4AA0
-	.incbin "sound/direct_sound_samples/wave_28.bin"
+DirectSoundWaveData_unknown_djembe::
+	.incbin "sound/direct_sound_samples/unknown_djembe.bin"
 
-gDirectSoundWaveData_29:: @ 84C5920
-	.incbin "sound/direct_sound_samples/wave_29.bin"
+DirectSoundWaveData_unknown_anvil_high::
+	.incbin "sound/direct_sound_samples/unknown_anvil_high.bin"
 
-gDirectSoundWaveData_30:: @ 84C6794
-	.incbin "sound/direct_sound_samples/wave_30.bin"
+DirectSoundWaveData_sc88_standard_bells::
+	.incbin "sound/direct_sound_samples/sc88_standard_bells.bin"
 
-gDirectSoundWaveData_31:: @ 84C7FA8
-	.incbin "sound/direct_sound_samples/wave_31.bin"
+DirectSoundWaveData_unknown_anvil_low::
+	.incbin "sound/direct_sound_samples/unknown_anvil_low.bin"
 
-gDirectSoundWaveData_32:: @ 84C954C
-	.incbin "sound/direct_sound_samples/wave_32.bin"
+DirectSoundWaveData_unknown_ethnic_drum::
+	.incbin "sound/direct_sound_samples/unknown_ethnic_drum.bin"
 
-gDirectSoundWaveData_33:: @ 84CAB30
-	.incbin "sound/direct_sound_samples/wave_33.bin"
+DirectSoundWaveData_unknown_tsuzumi::
+	.incbin "sound/direct_sound_samples/unknown_tsuzumi.bin"
 
-gDirectSoundWaveData_34:: @ 84CBC24
-	.incbin "sound/direct_sound_samples/wave_34.bin"
+DirectSoundWaveData_sc88_piano1_48::
+	.incbin "sound/direct_sound_samples/sc88_piano1_48.bin"
 
-gDirectSoundWaveData_35:: @ 84CCB84
-	.incbin "sound/direct_sound_samples/wave_35.bin"
+DirectSoundWaveData_sc88_piano1_60::
+	.incbin "sound/direct_sound_samples/sc88_piano1_60.bin"
 
-gDirectSoundWaveData_36:: @ 84CE1E4
-	.incbin "sound/direct_sound_samples/wave_36.bin"
+DirectSoundWaveData_sc88_piano1_72::
+	.incbin "sound/direct_sound_samples/sc88_piano1_72.bin"
 
-gDirectSoundWaveData_37:: @ 84CF740
-	.incbin "sound/direct_sound_samples/wave_37.bin"
+DirectSoundWaveData_sc88_piano1_84::
+	.incbin "sound/direct_sound_samples/sc88_piano1_84.bin"
 
-gDirectSoundWaveData_38:: @ 84D02CC
-	.incbin "sound/direct_sound_samples/wave_38.bin"
+DirectSoundWaveData_sc88_string_ensemble_60::
+	.incbin "sound/direct_sound_samples/sc88_string_ensemble_60.bin"
 
-gDirectSoundWaveData_39:: @ 84D3870
-	.incbin "sound/direct_sound_samples/wave_39.bin"
+DirectSoundWaveData_sc88_string_ensemble_72::
+	.incbin "sound/direct_sound_samples/sc88_string_ensemble_72.bin"
 
-gDirectSoundWaveData_40:: @ 84D5B8C
-	.incbin "sound/direct_sound_samples/wave_40.bin"
+DirectSoundWaveData_sc88_string_ensemble_84::
+	.incbin "sound/direct_sound_samples/sc88_string_ensemble_84.bin"
 
-gDirectSoundWaveData_41:: @ 84D9258
-	.incbin "sound/direct_sound_samples/wave_41.bin"
+DirectSoundWaveData_sc88_trumpet_60::
+	.incbin "sound/direct_sound_samples/sc88_trumpet_60.bin"
 
-gDirectSoundWaveData_42:: @ 84DA5A8
-	.incbin "sound/direct_sound_samples/wave_42.bin"
+DirectSoundWaveData_sc88_trumpet_72::
+	.incbin "sound/direct_sound_samples/sc88_trumpet_72.bin"
 
-gDirectSoundWaveData_43:: @ 84DBAB8
-	.incbin "sound/direct_sound_samples/wave_43.bin"
+DirectSoundWaveData_sc88_trumpet_84::
+	.incbin "sound/direct_sound_samples/sc88_trumpet_84.bin"
 
-gDirectSoundWaveData_44:: @ 84DCED8
-	.incbin "sound/direct_sound_samples/wave_44.bin"
+DirectSoundWaveData_unknown_trombone_39::
+	.incbin "sound/direct_sound_samples/unknown_trombone_39.bin"
 
-gDirectSoundWaveData_45:: @ 84DDF74
-	.incbin "sound/direct_sound_samples/wave_45.bin"
+DirectSoundWaveData_unknown_trombone_51::
+	.incbin "sound/direct_sound_samples/unknown_trombone_51.bin"
 
-gDirectSoundWaveData_46:: @ 84DEFD0
-	.incbin "sound/direct_sound_samples/wave_46.bin"
+DirectSoundWaveData_sc88_french_horn_60::
+	.incbin "sound/direct_sound_samples/sc88_french_horn_60.bin"
 
-gDirectSoundWaveData_47:: @ 84E5F64
-	.incbin "sound/direct_sound_samples/wave_47.bin"
+DirectSoundWaveData_sc88_french_horn_72::
+	.incbin "sound/direct_sound_samples/sc88_french_horn_72.bin"
 
-gDirectSoundWaveData_48:: @ 84EA4E8
-	.incbin "sound/direct_sound_samples/wave_48.bin"
+DirectSoundWaveData_sc88_flute::
+	.incbin "sound/direct_sound_samples/sc88_flute.bin"
 
-gDirectSoundWaveData_49:: @ 84EAC4C
-	.incbin "sound/direct_sound_samples/wave_49.bin"
+DirectSoundWaveData_sc88_pick_bass::
+	.incbin "sound/direct_sound_samples/sc88_pick_bass.bin"
 
-gDirectSoundWaveData_50:: @ 84EC89C
-	.incbin "sound/direct_sound_samples/wave_50.bin"
+DirectSoundWaveData_sc88_timpani_with_snare::
+	.incbin "sound/direct_sound_samples/sc88_timpani_with_snare.bin"
 
-gDirectSoundWaveData_51:: @ 84EDD6C
-	.incbin "sound/direct_sound_samples/wave_51.bin"
+DirectSoundWaveData_unknown_synth_snare::
+	.incbin "sound/direct_sound_samples/unknown_synth_snare.bin"
 
-gDirectSoundWaveData_52:: @ 84EE778
-	.incbin "sound/direct_sound_samples/wave_52.bin"
+DirectSoundWaveData_sc88_square_wave::
+	.incbin "sound/direct_sound_samples/sc88_square_wave.bin"
 
-gDirectSoundWaveData_53:: @ 84F038C
-	.incbin "sound/direct_sound_samples/wave_53.bin"
+DirectSoundWaveData_bicycle_bell::
+	.incbin "sound/direct_sound_samples/bicycle_bell.bin"
 
-gDirectSoundWaveData_54:: @ 84F1CEC
+DirectSoundWaveData_wave_54::
 	.incbin "sound/direct_sound_samples/wave_54.bin"
 
-gDirectSoundWaveData_55:: @ 84F31B0
-	.incbin "sound/direct_sound_samples/wave_55.bin"
+DirectSoundWaveData_sc88_pizzicato_strings::
+	.incbin "sound/direct_sound_samples/sc88_pizzicato_strings.bin"
 
-gDirectSoundWaveData_56:: @ 84F38EC
+DirectSoundWaveData_wave_56::
 	.incbin "sound/direct_sound_samples/wave_56.bin"
 
-gDirectSoundWaveData_57:: @ 84F54DC
+DirectSoundWaveData_wave_57::
 	.incbin "sound/direct_sound_samples/wave_57.bin"
 
-gDirectSoundWaveData_58:: @ 84F6890
+DirectSoundWaveData_wave_58::
 	.incbin "sound/direct_sound_samples/wave_58.bin"
 
-gDirectSoundWaveData_59:: @ 84F8F14
-	.incbin "sound/direct_sound_samples/wave_59.bin"
+DirectSoundWaveData_sc88_wind::
+	.incbin "sound/direct_sound_samples/sc88_wind.bin"
 
-gDirectSoundWaveData_60:: @ 84FA158
-	.incbin "sound/direct_sound_samples/wave_60.bin"
+DirectSoundWaveData_sc88_bubbles::
+	.incbin "sound/direct_sound_samples/sc88_bubbles.bin"
 
-gDirectSoundWaveData_61:: @ 84FB168
+DirectSoundWaveData_wave_61::
 	.incbin "sound/direct_sound_samples/wave_61.bin"
 
-gDirectSoundWaveData_62:: @ 84FC470
+DirectSoundWaveData_wave_62::
 	.incbin "sound/direct_sound_samples/wave_62.bin"
 
-gDirectSoundWaveData_63:: @ 84FE57C
-	.incbin "sound/direct_sound_samples/wave_63.bin"
+DirectSoundWaveData_unused_acid_bass::
+	.incbin "sound/direct_sound_samples/unused_acid_bass.bin"
 
-gDirectSoundWaveData_64:: @ 8500558
+DirectSoundWaveData_wave_64::
 	.incbin "sound/direct_sound_samples/wave_64.bin"
 
-gDirectSoundWaveData_65:: @ 8502768
+DirectSoundWaveData_wave_65::
 	.incbin "sound/direct_sound_samples/wave_65.bin"
 
-gDirectSoundWaveData_66:: @ 8502F34
-	.incbin "sound/direct_sound_samples/wave_66.bin"
+DirectSoundWaveData_sc88_tubular_bell::
+	.incbin "sound/direct_sound_samples/sc88_tubular_bell.bin"
 
-gDirectSoundWaveData_67:: @ 85048A4
-	.incbin "sound/direct_sound_samples/wave_67.bin"
+DirectSoundWaveData_unknown_close_hihat::
+	.incbin "sound/direct_sound_samples/unknown_close_hihat.bin"
 
-gDirectSoundWaveData_68:: @ 8504CB8
+DirectSoundWaveData_wave_68::
 	.incbin "sound/direct_sound_samples/wave_68.bin"
 
-gDirectSoundWaveData_69:: @ 8506C68
-	.incbin "sound/direct_sound_samples/wave_69.bin"
+DirectSoundWaveData_unknown_polysynth::
+	.incbin "sound/direct_sound_samples/unknown_polysynth.bin"
 
-gDirectSoundWaveData_70:: @ 8509F48
-	.incbin "sound/direct_sound_samples/wave_70.bin"
+DirectSoundWaveData_sc88_harp::
+	.incbin "sound/direct_sound_samples/sc88_harp.bin"
 
-gDirectSoundWaveData_71:: @ 850A978
-	.incbin "sound/direct_sound_samples/wave_71.bin"
+DirectSoundWaveData_sc88_xylophone::
+	.incbin "sound/direct_sound_samples/sc88_xylophone.bin"
 
-gDirectSoundWaveData_72:: @ 850B3AC
+DirectSoundWaveData_wave_72::
 	.incbin "sound/direct_sound_samples/wave_72.bin"
 
-gDirectSoundWaveData_73:: @ 850CEEC
+DirectSoundWaveData_wave_73::
 	.incbin "sound/direct_sound_samples/wave_73.bin"
 
-gDirectSoundWaveData_74:: @ 850D7B4
-	.incbin "sound/direct_sound_samples/wave_74.bin"
+DirectSoundWaveData_sc88_accordion::
+	.incbin "sound/direct_sound_samples/sc88_accordion.bin"
 
-gDirectSoundWaveData_75:: @ 850EB84
-	.incbin "sound/direct_sound_samples/wave_75.bin"
+DirectSoundWaveData_unknown_tom::
+	.incbin "sound/direct_sound_samples/unknown_tom.bin"
 
 	.align 2
-Cry_Bulbasaur:: @ 850FBC4
+Cry_Bulbasaur::
 	.incbin "sound/direct_sound_samples/cry_bulbasaur.bin"
 
 	.align 2
-Cry_Ivysaur:: @ 8510C50
+Cry_Ivysaur::
 	.incbin "sound/direct_sound_samples/cry_ivysaur.bin"
 
 	.align 2
-Cry_Venusaur:: @ 8511CE0
+Cry_Venusaur::
 	.incbin "sound/direct_sound_samples/cry_venusaur.bin"
 
 	.align 2
-Cry_Charmander:: @ 8513038
+Cry_Charmander::
 	.incbin "sound/direct_sound_samples/cry_charmander.bin"
 
 	.align 2
-Cry_Charmeleon:: @ 8513EA8
+Cry_Charmeleon::
 	.incbin "sound/direct_sound_samples/cry_charmeleon.bin"
 
 	.align 2
-Cry_Charizard:: @ 8514D28
+Cry_Charizard::
 	.incbin "sound/direct_sound_samples/cry_charizard.bin"
 
 	.align 2
-Cry_Squirtle:: @ 8516070
+Cry_Squirtle::
 	.incbin "sound/direct_sound_samples/cry_squirtle.bin"
 
 	.align 2
-Cry_Wartortle:: @ 8516EE4
+Cry_Wartortle::
 	.incbin "sound/direct_sound_samples/cry_wartortle.bin"
 
 	.align 2
-Cry_Blastoise:: @ 8518024
+Cry_Blastoise::
 	.incbin "sound/direct_sound_samples/cry_blastoise.bin"
 
 	.align 2
-Cry_Caterpie:: @ 851936C
+Cry_Caterpie::
 	.incbin "sound/direct_sound_samples/cry_caterpie.bin"
 
 	.align 2
-Cry_Metapod:: @ 8519BC4
+Cry_Metapod::
 	.incbin "sound/direct_sound_samples/cry_metapod.bin"
 
 	.align 2
-Cry_Butterfree:: @ 851B314
+Cry_Butterfree::
 	.incbin "sound/direct_sound_samples/cry_butterfree.bin"
 
 	.align 2
-Cry_Weedle:: @ 851BD1C
+Cry_Weedle::
 	.incbin "sound/direct_sound_samples/cry_weedle.bin"
 
 	.align 2
-Cry_Kakuna:: @ 851CD60
+Cry_Kakuna::
 	.incbin "sound/direct_sound_samples/cry_kakuna.bin"
 
 	.align 2
-Cry_Beedrill:: @ 851DF9C
+Cry_Beedrill::
 	.incbin "sound/direct_sound_samples/cry_beedrill.bin"
 
 	.align 2
-Cry_Pidgey:: @ 851F2F8
+Cry_Pidgey::
 	.incbin "sound/direct_sound_samples/cry_pidgey.bin"
 
 	.align 2
-Cry_Pidgeotto:: @ 851F6E0
+Cry_Pidgeotto::
 	.incbin "sound/direct_sound_samples/cry_pidgeotto.bin"
 
 	.align 2
-Cry_Pidgeot:: @ 85205E8
+Cry_Pidgeot::
 	.incbin "sound/direct_sound_samples/cry_pidgeot.bin"
 
 	.align 2
-Cry_Rattata:: @ 852171C
+Cry_Rattata::
 	.incbin "sound/direct_sound_samples/cry_rattata.bin"
 
 	.align 2
-Cry_Raticate:: @ 8521EFC
+Cry_Raticate::
 	.incbin "sound/direct_sound_samples/cry_raticate.bin"
 
 	.align 2
-Cry_Spearow:: @ 8522880
+Cry_Spearow::
 	.incbin "sound/direct_sound_samples/cry_spearow.bin"
 
 	.align 2
-Cry_Fearow:: @ 8523A24
+Cry_Fearow::
 	.incbin "sound/direct_sound_samples/cry_fearow.bin"
 
 	.align 2
-Cry_Ekans:: @ 8524B60
+Cry_Ekans::
 	.incbin "sound/direct_sound_samples/cry_ekans.bin"
 
 	.align 2
-Cry_Arbok:: @ 8525EAC
+Cry_Arbok::
 	.incbin "sound/direct_sound_samples/cry_arbok.bin"
 
 	.align 2
-Cry_Pikachu:: @ 8527204
+Cry_Pikachu::
 	.incbin "sound/direct_sound_samples/cry_pikachu.bin"
 
 	.align 2
-Cry_Raichu:: @ 85282AC
+Cry_Raichu::
 	.incbin "sound/direct_sound_samples/cry_raichu.bin"
 
 	.align 2
-Cry_Sandshrew:: @ 8529A6C
+Cry_Sandshrew::
 	.incbin "sound/direct_sound_samples/cry_sandshrew.bin"
 
 	.align 2
-Cry_Sandslash:: @ 852A3C0
+Cry_Sandslash::
 	.incbin "sound/direct_sound_samples/cry_sandslash.bin"
 
 	.align 2
-Cry_NidoranF:: @ 852B150
+Cry_NidoranF::
 	.incbin "sound/direct_sound_samples/cry_nidoran_f.bin"
 
 	.align 2
-Cry_Nidorina:: @ 852BB00
+Cry_Nidorina::
 	.incbin "sound/direct_sound_samples/cry_nidorina.bin"
 
 	.align 2
-Cry_Nidoqueen:: @ 852C7C8
+Cry_Nidoqueen::
 	.incbin "sound/direct_sound_samples/cry_nidoqueen.bin"
 
 	.align 2
-Cry_NidoranM:: @ 852D8A8
+Cry_NidoranM::
 	.incbin "sound/direct_sound_samples/cry_nidoran_m.bin"
 
 	.align 2
-Cry_Nidorino:: @ 852E310
+Cry_Nidorino::
 	.incbin "sound/direct_sound_samples/cry_nidorino.bin"
 
 	.align 2
-Cry_Nidoking:: @ 852EF24
+Cry_Nidoking::
 	.incbin "sound/direct_sound_samples/cry_nidoking.bin"
 
 	.align 2
-Cry_Clefairy:: @ 8530790
+Cry_Clefairy::
 	.incbin "sound/direct_sound_samples/cry_clefairy.bin"
 
 	.align 2
-Cry_Clefable:: @ 8531000
+Cry_Clefable::
 	.incbin "sound/direct_sound_samples/cry_clefable.bin"
 
 	.align 2
-Cry_Vulpix:: @ 8531A90
+Cry_Vulpix::
 	.incbin "sound/direct_sound_samples/cry_vulpix.bin"
 
 	.align 2
-Cry_Ninetales:: @ 8533260
+Cry_Ninetales::
 	.incbin "sound/direct_sound_samples/cry_ninetales.bin"
 
 	.align 2
-Cry_Jigglypuff:: @ 8534ACC
+Cry_Jigglypuff::
 	.incbin "sound/direct_sound_samples/cry_jigglypuff.bin"
 
 	.align 2
-Cry_Wigglytuff:: @ 8535030
+Cry_Wigglytuff::
 	.incbin "sound/direct_sound_samples/cry_wigglytuff.bin"
 
 	.align 2
-Cry_Zubat:: @ 85356F8
+Cry_Zubat::
 	.incbin "sound/direct_sound_samples/cry_zubat.bin"
 
 	.align 2
-Cry_Golbat:: @ 8536A64
+Cry_Golbat::
 	.incbin "sound/direct_sound_samples/cry_golbat.bin"
 
 	.align 2
-Cry_Oddish:: @ 8537DC8
+Cry_Oddish::
 	.incbin "sound/direct_sound_samples/cry_oddish.bin"
 
 	.align 2
-Cry_Gloom:: @ 8538C64
+Cry_Gloom::
 	.incbin "sound/direct_sound_samples/cry_gloom.bin"
 
 	.align 2
-Cry_Vileplume:: @ 85398E0
+Cry_Vileplume::
 	.incbin "sound/direct_sound_samples/cry_vileplume.bin"
 
 	.align 2
-Cry_Paras:: @ 853B27C
+Cry_Paras::
 	.incbin "sound/direct_sound_samples/cry_paras.bin"
 
 	.align 2
-Cry_Parasect:: @ 853CE70
+Cry_Parasect::
 	.incbin "sound/direct_sound_samples/cry_parasect.bin"
 
 	.align 2
-Cry_Venonat:: @ 853ECD8
+Cry_Venonat::
 	.incbin "sound/direct_sound_samples/cry_venonat.bin"
 
 	.align 2
-Cry_Venomoth:: @ 853FC58
+Cry_Venomoth::
 	.incbin "sound/direct_sound_samples/cry_venomoth.bin"
 
 	.align 2
-Cry_Diglett:: @ 8540C5C
+Cry_Diglett::
 	.incbin "sound/direct_sound_samples/cry_diglett.bin"
 
 	.align 2
-Cry_Dugtrio:: @ 8541FCC
+Cry_Dugtrio::
 	.incbin "sound/direct_sound_samples/cry_dugtrio.bin"
 
 	.align 2
-Cry_Meowth:: @ 8543338
+Cry_Meowth::
 	.incbin "sound/direct_sound_samples/cry_meowth.bin"
 
 	.align 2
-Cry_Persian:: @ 8543CC8
+Cry_Persian::
 	.incbin "sound/direct_sound_samples/cry_persian.bin"
 
 	.align 2
-Cry_Psyduck:: @ 8544FA4
+Cry_Psyduck::
 	.incbin "sound/direct_sound_samples/cry_psyduck.bin"
 
 	.align 2
-Cry_Golduck:: @ 8545CCC
+Cry_Golduck::
 	.incbin "sound/direct_sound_samples/cry_golduck.bin"
 
 	.align 2
-Cry_Mankey:: @ 8546814
+Cry_Mankey::
 	.incbin "sound/direct_sound_samples/cry_mankey.bin"
 
 	.align 2
-Cry_Primeape:: @ 8547874
+Cry_Primeape::
 	.incbin "sound/direct_sound_samples/cry_primeape.bin"
 
 	.align 2
-Cry_Growlithe:: @ 85488A4
+Cry_Growlithe::
 	.incbin "sound/direct_sound_samples/cry_growlithe.bin"
 
 	.align 2
-Cry_Arcanine:: @ 8549608
+Cry_Arcanine::
 	.incbin "sound/direct_sound_samples/cry_arcanine.bin"
 
 	.align 2
-Cry_Poliwag:: @ 854A744
+Cry_Poliwag::
 	.incbin "sound/direct_sound_samples/cry_poliwag.bin"
 
 	.align 2
-Cry_Poliwhirl:: @ 854B260
+Cry_Poliwhirl::
 	.incbin "sound/direct_sound_samples/cry_poliwhirl.bin"
 
 	.align 2
-Cry_Poliwrath:: @ 854B908
+Cry_Poliwrath::
 	.incbin "sound/direct_sound_samples/cry_poliwrath.bin"
 
 	.align 2
-Cry_Abra:: @ 854C42C
+Cry_Abra::
 	.incbin "sound/direct_sound_samples/cry_abra.bin"
 
 	.align 2
-Cry_Kadabra:: @ 854DB90
+Cry_Kadabra::
 	.incbin "sound/direct_sound_samples/cry_kadabra.bin"
 
 	.align 2
-Cry_Alakazam:: @ 854F678
+Cry_Alakazam::
 	.incbin "sound/direct_sound_samples/cry_alakazam.bin"
 
 	.align 2
-Cry_Machop:: @ 8551614
+Cry_Machop::
 	.incbin "sound/direct_sound_samples/cry_machop.bin"
 
 	.align 2
-Cry_Machoke:: @ 8552378
+Cry_Machoke::
 	.incbin "sound/direct_sound_samples/cry_machoke.bin"
 
 	.align 2
-Cry_Machamp:: @ 8553108
+Cry_Machamp::
 	.incbin "sound/direct_sound_samples/cry_machamp.bin"
 
 	.align 2
-Cry_Bellsprout:: @ 8554190
+Cry_Bellsprout::
 	.incbin "sound/direct_sound_samples/cry_bellsprout.bin"
 
 	.align 2
-Cry_Weepinbell:: @ 855491C
+Cry_Weepinbell::
 	.incbin "sound/direct_sound_samples/cry_weepinbell.bin"
 
 	.align 2
-Cry_Victreebel:: @ 85557BC
+Cry_Victreebel::
 	.incbin "sound/direct_sound_samples/cry_victreebel.bin"
 
 	.align 2
-Cry_Tentacool:: @ 8556B08
+Cry_Tentacool::
 	.incbin "sound/direct_sound_samples/cry_tentacool.bin"
 
 	.align 2
-Cry_Tentacruel:: @ 8557AF8
+Cry_Tentacruel::
 	.incbin "sound/direct_sound_samples/cry_tentacruel.bin"
 
 	.align 2
-Cry_Geodude:: @ 85591F4
+Cry_Geodude::
 	.incbin "sound/direct_sound_samples/cry_geodude.bin"
 
 	.align 2
-Cry_Graveler:: @ 855A9A8
+Cry_Graveler::
 	.incbin "sound/direct_sound_samples/cry_graveler.bin"
 
 	.align 2
-Cry_Golem:: @ 855C590
+Cry_Golem::
 	.incbin "sound/direct_sound_samples/cry_golem.bin"
 
 	.align 2
-Cry_Ponyta:: @ 855D3BC
+Cry_Ponyta::
 	.incbin "sound/direct_sound_samples/cry_ponyta.bin"
 
 	.align 2
-Cry_Rapidash:: @ 855E2CC
+Cry_Rapidash::
 	.incbin "sound/direct_sound_samples/cry_rapidash.bin"
 
 	.align 2
-Cry_Slowpoke:: @ 855F56C
+Cry_Slowpoke::
 	.incbin "sound/direct_sound_samples/cry_slowpoke.bin"
 
 	.align 2
-Cry_Slowbro:: @ 855FCD4
+Cry_Slowbro::
 	.incbin "sound/direct_sound_samples/cry_slowbro.bin"
 
 	.align 2
-Cry_Magnemite:: @ 8560A44
+Cry_Magnemite::
 	.incbin "sound/direct_sound_samples/cry_magnemite.bin"
 
 	.align 2
-Cry_Magneton:: @ 8561D88
+Cry_Magneton::
 	.incbin "sound/direct_sound_samples/cry_magneton.bin"
 
 	.align 2
-Cry_Farfetchd:: @ 8563570
+Cry_Farfetchd::
 	.incbin "sound/direct_sound_samples/cry_farfetchd.bin"
 
 	.align 2
-Cry_Doduo:: @ 8563CEC
+Cry_Doduo::
 	.incbin "sound/direct_sound_samples/cry_doduo.bin"
 
 	.align 2
-Cry_Dodrio:: @ 8565030
+Cry_Dodrio::
 	.incbin "sound/direct_sound_samples/cry_dodrio.bin"
 
 	.align 2
-Cry_Seel:: @ 85663A8
+Cry_Seel::
 	.incbin "sound/direct_sound_samples/cry_seel.bin"
 
 	.align 2
-Cry_Dewgong:: @ 8567598
+Cry_Dewgong::
 	.incbin "sound/direct_sound_samples/cry_dewgong.bin"
 
 	.align 2
-Cry_Grimer:: @ 8568ABC
+Cry_Grimer::
 	.incbin "sound/direct_sound_samples/cry_grimer.bin"
 
 	.align 2
-Cry_Muk:: @ 8569544
+Cry_Muk::
 	.incbin "sound/direct_sound_samples/cry_muk.bin"
 
 	.align 2
-Cry_Shellder:: @ 856A404
+Cry_Shellder::
 	.incbin "sound/direct_sound_samples/cry_shellder.bin"
 
 	.align 2
-Cry_Cloyster:: @ 856B378
+Cry_Cloyster::
 	.incbin "sound/direct_sound_samples/cry_cloyster.bin"
 
 	.align 2
-Cry_Gastly:: @ 856C83C
+Cry_Gastly::
 	.incbin "sound/direct_sound_samples/cry_gastly.bin"
 
 	.align 2
-Cry_Haunter:: @ 856DF8C
+Cry_Haunter::
 	.incbin "sound/direct_sound_samples/cry_haunter.bin"
 
 	.align 2
-Cry_Gengar:: @ 856F70C
+Cry_Gengar::
 	.incbin "sound/direct_sound_samples/cry_gengar.bin"
 
 	.align 2
-Cry_Onix:: @ 85705CC
+Cry_Onix::
 	.incbin "sound/direct_sound_samples/cry_onix.bin"
 
 	.align 2
-Cry_Drowzee:: @ 8571E90
+Cry_Drowzee::
 	.incbin "sound/direct_sound_samples/cry_drowzee.bin"
 
 	.align 2
-Cry_Hypno:: @ 8573BA8
+Cry_Hypno::
 	.incbin "sound/direct_sound_samples/cry_hypno.bin"
 
 	.align 2
-Cry_Krabby:: @ 85758AC
+Cry_Krabby::
 	.incbin "sound/direct_sound_samples/cry_krabby.bin"
 
 	.align 2
-Cry_Kingler:: @ 85770F8
+Cry_Kingler::
 	.incbin "sound/direct_sound_samples/cry_kingler.bin"
 
 	.align 2
-Cry_Voltorb:: @ 8578950
+Cry_Voltorb::
 	.incbin "sound/direct_sound_samples/cry_voltorb.bin"
 
 	.align 2
-Cry_Electrode:: @ 857A214
+Cry_Electrode::
 	.incbin "sound/direct_sound_samples/cry_electrode.bin"
 
 	.align 2
-Cry_Exeggcute:: @ 857BB4C
+Cry_Exeggcute::
 	.incbin "sound/direct_sound_samples/cry_exeggcute.bin"
 
 	.align 2
-Cry_Exeggutor:: @ 857CE2C
+Cry_Exeggutor::
 	.incbin "sound/direct_sound_samples/cry_exeggutor.bin"
 
 	.align 2
-Cry_Cubone:: @ 857EE10
+Cry_Cubone::
 	.incbin "sound/direct_sound_samples/cry_cubone.bin"
 
 	.align 2
-Cry_Marowak:: @ 857FD30
+Cry_Marowak::
 	.incbin "sound/direct_sound_samples/cry_marowak.bin"
 
 	.align 2
-Cry_Hitmonlee:: @ 8580BA0
+Cry_Hitmonlee::
 	.incbin "sound/direct_sound_samples/cry_hitmonlee.bin"
 
 	.align 2
-Cry_Hitmonchan:: @ 8581E4C
+Cry_Hitmonchan::
 	.incbin "sound/direct_sound_samples/cry_hitmonchan.bin"
 
 	.align 2
-Cry_Lickitung:: @ 8583024
+Cry_Lickitung::
 	.incbin "sound/direct_sound_samples/cry_lickitung.bin"
 
 	.align 2
-Cry_Koffing:: @ 8583F4C
+Cry_Koffing::
 	.incbin "sound/direct_sound_samples/cry_koffing.bin"
 
 	.align 2
-Cry_Weezing:: @ 85853A8
+Cry_Weezing::
 	.incbin "sound/direct_sound_samples/cry_weezing.bin"
 
 	.align 2
-Cry_Rhyhorn:: @ 8586954
+Cry_Rhyhorn::
 	.incbin "sound/direct_sound_samples/cry_rhyhorn.bin"
 
 	.align 2
-Cry_Rhydon:: @ 8587CC0
+Cry_Rhydon::
 	.incbin "sound/direct_sound_samples/cry_rhydon.bin"
 
 	.align 2
-Cry_Chansey:: @ 858912C
+Cry_Chansey::
 	.incbin "sound/direct_sound_samples/cry_chansey.bin"
 
 	.align 2
-Cry_Tangela:: @ 8589FF8
+Cry_Tangela::
 	.incbin "sound/direct_sound_samples/cry_tangela.bin"
 
 	.align 2
-Cry_Kangaskhan:: @ 858AF14
+Cry_Kangaskhan::
 	.incbin "sound/direct_sound_samples/cry_kangaskhan.bin"
 
 	.align 2
-Cry_Horsea:: @ 858C1C8
+Cry_Horsea::
 	.incbin "sound/direct_sound_samples/cry_horsea.bin"
 
 	.align 2
-Cry_Seadra:: @ 858CB44
+Cry_Seadra::
 	.incbin "sound/direct_sound_samples/cry_seadra.bin"
 
 	.align 2
-Cry_Goldeen:: @ 858D3B0
+Cry_Goldeen::
 	.incbin "sound/direct_sound_samples/cry_goldeen.bin"
 
 	.align 2
-Cry_Seaking:: @ 858DD88
+Cry_Seaking::
 	.incbin "sound/direct_sound_samples/cry_seaking.bin"
 
 	.align 2
-Cry_Staryu:: @ 858F0E0
+Cry_Staryu::
 	.incbin "sound/direct_sound_samples/cry_staryu.bin"
 
 	.align 2
-Cry_Starmie:: @ 85904C8
+Cry_Starmie::
 	.incbin "sound/direct_sound_samples/cry_starmie.bin"
 
 	.align 2
-Cry_MrMime:: @ 85919A4
+Cry_MrMime::
 	.incbin "sound/direct_sound_samples/cry_mr_mime.bin"
 
 	.align 2
-Cry_Scyther:: @ 8592C94
+Cry_Scyther::
 	.incbin "sound/direct_sound_samples/cry_scyther.bin"
 
 	.align 2
-Cry_Jynx:: @ 85939F0
+Cry_Jynx::
 	.incbin "sound/direct_sound_samples/cry_jynx.bin"
 
 	.align 2
-Cry_Electabuzz:: @ 8596964
+Cry_Electabuzz::
 	.incbin "sound/direct_sound_samples/cry_electabuzz.bin"
 
 	.align 2
-Cry_Magmar:: @ 8598848
+Cry_Magmar::
 	.incbin "sound/direct_sound_samples/cry_magmar.bin"
 
 	.align 2
-Cry_Pinsir:: @ 85997C4
+Cry_Pinsir::
 	.incbin "sound/direct_sound_samples/cry_pinsir.bin"
 
 	.align 2
-Cry_Tauros:: @ 859A420
+Cry_Tauros::
 	.incbin "sound/direct_sound_samples/cry_tauros.bin"
 
 	.align 2
-Cry_Magikarp:: @ 859B674
+Cry_Magikarp::
 	.incbin "sound/direct_sound_samples/cry_magikarp.bin"
 
 	.align 2
-Cry_Gyarados:: @ 859C97C
+Cry_Gyarados::
 	.incbin "sound/direct_sound_samples/cry_gyarados.bin"
 
 	.align 2
-Cry_Lapras:: @ 859DDB0
+Cry_Lapras::
 	.incbin "sound/direct_sound_samples/cry_lapras.bin"
 
 	.align 2
-Cry_Ditto:: @ 859EC84
+Cry_Ditto::
 	.incbin "sound/direct_sound_samples/cry_ditto.bin"
 
 	.align 2
-Cry_Eevee:: @ 859F7A0
+Cry_Eevee::
 	.incbin "sound/direct_sound_samples/cry_eevee.bin"
 
 	.align 2
-Cry_Vaporeon:: @ 85A05D8
+Cry_Vaporeon::
 	.incbin "sound/direct_sound_samples/cry_vaporeon.bin"
 
 	.align 2
-Cry_Jolteon:: @ 85A1BF0
+Cry_Jolteon::
 	.incbin "sound/direct_sound_samples/cry_jolteon.bin"
 
 	.align 2
-Cry_Flareon:: @ 85A2BC4
+Cry_Flareon::
 	.incbin "sound/direct_sound_samples/cry_flareon.bin"
 
 	.align 2
-Cry_Porygon:: @ 85A3B48
+Cry_Porygon::
 	.incbin "sound/direct_sound_samples/cry_porygon.bin"
 
 	.align 2
-Cry_Omanyte:: @ 85A4F54
+Cry_Omanyte::
 	.incbin "sound/direct_sound_samples/cry_omanyte.bin"
 
 	.align 2
-Cry_Omastar:: @ 85A5CAC
+Cry_Omastar::
 	.incbin "sound/direct_sound_samples/cry_omastar.bin"
 
 	.align 2
-Cry_Kabuto:: @ 85A6A00
+Cry_Kabuto::
 	.incbin "sound/direct_sound_samples/cry_kabuto.bin"
 
 	.align 2
-Cry_Kabutops:: @ 85A7654
+Cry_Kabutops::
 	.incbin "sound/direct_sound_samples/cry_kabutops.bin"
 
 	.align 2
-Cry_Aerodactyl:: @ 85A8410
+Cry_Aerodactyl::
 	.incbin "sound/direct_sound_samples/cry_aerodactyl.bin"
 
 	.align 2
-Cry_Snorlax:: @ 85A9C6C
+Cry_Snorlax::
 	.incbin "sound/direct_sound_samples/cry_snorlax.bin"
 
 	.align 2
-Cry_Articuno:: @ 85AA1A8
+Cry_Articuno::
 	.incbin "sound/direct_sound_samples/cry_articuno.bin"
 
 	.align 2
-Cry_Zapdos:: @ 85AB950
+Cry_Zapdos::
 	.incbin "sound/direct_sound_samples/cry_zapdos.bin"
 
 	.align 2
-Cry_Moltres:: @ 85AC8C8
+Cry_Moltres::
 	.incbin "sound/direct_sound_samples/cry_moltres.bin"
 
 	.align 2
-Cry_Dratini:: @ 85AE074
+Cry_Dratini::
 	.incbin "sound/direct_sound_samples/cry_dratini.bin"
 
 	.align 2
-Cry_Dragonair:: @ 85AEC10
+Cry_Dragonair::
 	.incbin "sound/direct_sound_samples/cry_dragonair.bin"
 
 	.align 2
-Cry_Dragonite:: @ 85AFCB8
+Cry_Dragonite::
 	.incbin "sound/direct_sound_samples/cry_dragonite.bin"
 
 	.align 2
-Cry_Mewtwo:: @ 85B0FC4
+Cry_Mewtwo::
 	.incbin "sound/direct_sound_samples/cry_mewtwo.bin"
 
 	.align 2
-Cry_Mew:: @ 85B2E2C
+Cry_Mew::
 	.incbin "sound/direct_sound_samples/cry_mew.bin"
 
 	.align 2
-Cry_Chikorita:: @ 85B4C94
+Cry_Chikorita::
 	.incbin "sound/direct_sound_samples/cry_chikorita.bin"
 
 	.align 2
-Cry_Bayleef:: @ 85B51D4
+Cry_Bayleef::
 	.incbin "sound/direct_sound_samples/cry_bayleef.bin"
 
 	.align 2
-Cry_Meganium:: @ 85B5AA0
+Cry_Meganium::
 	.incbin "sound/direct_sound_samples/cry_meganium.bin"
 
 	.align 2
-Cry_Cyndaquil:: @ 85B6AD8
+Cry_Cyndaquil::
 	.incbin "sound/direct_sound_samples/cry_cyndaquil.bin"
 
 	.align 2
-Cry_Quilava:: @ 85B71DC
+Cry_Quilava::
 	.incbin "sound/direct_sound_samples/cry_quilava.bin"
 
 	.align 2
-Cry_Typhlosion:: @ 85B7DC4
+Cry_Typhlosion::
 	.incbin "sound/direct_sound_samples/cry_typhlosion.bin"
 
 	.align 2
-Cry_Totodile:: @ 85BA3D4
+Cry_Totodile::
 	.incbin "sound/direct_sound_samples/cry_totodile.bin"
 
 	.align 2
-Cry_Croconaw:: @ 85BB62C
+Cry_Croconaw::
 	.incbin "sound/direct_sound_samples/cry_croconaw.bin"
 
 	.align 2
-Cry_Feraligatr:: @ 85BCA68
+Cry_Feraligatr::
 	.incbin "sound/direct_sound_samples/cry_feraligatr.bin"
 
 	.align 2
-Cry_Sentret:: @ 85BE3EC
+Cry_Sentret::
 	.incbin "sound/direct_sound_samples/cry_sentret.bin"
 
 	.align 2
-Cry_Furret:: @ 85BE814
+Cry_Furret::
 	.incbin "sound/direct_sound_samples/cry_furret.bin"
 
 	.align 2
-Cry_Hoothoot:: @ 85BEE5C
+Cry_Hoothoot::
 	.incbin "sound/direct_sound_samples/cry_hoothoot.bin"
 
 	.align 2
-Cry_Noctowl:: @ 85BF940
+Cry_Noctowl::
 	.incbin "sound/direct_sound_samples/cry_noctowl.bin"
 
 	.align 2
-Cry_Ledyba:: @ 85C0E70
+Cry_Ledyba::
 	.incbin "sound/direct_sound_samples/cry_ledyba.bin"
 
 	.align 2
-Cry_Ledian:: @ 85C1568
+Cry_Ledian::
 	.incbin "sound/direct_sound_samples/cry_ledian.bin"
 
 	.align 2
-Cry_Spinarak:: @ 85C1DCC
+Cry_Spinarak::
 	.incbin "sound/direct_sound_samples/cry_spinarak.bin"
 
 	.align 2
-Cry_Ariados:: @ 85C2B30
+Cry_Ariados::
 	.incbin "sound/direct_sound_samples/cry_ariados.bin"
 
 	.align 2
-Cry_Crobat:: @ 85C3784
+Cry_Crobat::
 	.incbin "sound/direct_sound_samples/cry_crobat.bin"
 
 	.align 2
-Cry_Chinchou:: @ 85C4EB4
+Cry_Chinchou::
 	.incbin "sound/direct_sound_samples/cry_chinchou.bin"
 
 	.align 2
-Cry_Lanturn:: @ 85C5B64
+Cry_Lanturn::
 	.incbin "sound/direct_sound_samples/cry_lanturn.bin"
 
 	.align 2
-Cry_Pichu:: @ 85C65F0
+Cry_Pichu::
 	.incbin "sound/direct_sound_samples/cry_pichu.bin"
 
 	.align 2
-Cry_Cleffa:: @ 85C6D44
+Cry_Cleffa::
 	.incbin "sound/direct_sound_samples/cry_cleffa.bin"
 
 	.align 2
-Cry_Igglybuff:: @ 85C7334
+Cry_Igglybuff::
 	.incbin "sound/direct_sound_samples/cry_igglybuff.bin"
 
 	.align 2
-Cry_Togepi:: @ 85C7A30
+Cry_Togepi::
 	.incbin "sound/direct_sound_samples/cry_togepi.bin"
 
 	.align 2
-Cry_Togetic:: @ 85C8518
+Cry_Togetic::
 	.incbin "sound/direct_sound_samples/cry_togetic.bin"
 
 	.align 2
-Cry_Natu:: @ 85C8C18
+Cry_Natu::
 	.incbin "sound/direct_sound_samples/cry_natu.bin"
 
 	.align 2
-Cry_Xatu:: @ 85C96A8
+Cry_Xatu::
 	.incbin "sound/direct_sound_samples/cry_xatu.bin"
 
 	.align 2
-Cry_Mareep:: @ 85CA574
+Cry_Mareep::
 	.incbin "sound/direct_sound_samples/cry_mareep.bin"
 
 	.align 2
-Cry_Flaaffy:: @ 85CACCC
+Cry_Flaaffy::
 	.incbin "sound/direct_sound_samples/cry_flaaffy.bin"
 
 	.align 2
-Cry_Ampharos:: @ 85CBA80
+Cry_Ampharos::
 	.incbin "sound/direct_sound_samples/cry_ampharos.bin"
 
 	.align 2
-Cry_Bellossom:: @ 85CCB00
+Cry_Bellossom::
 	.incbin "sound/direct_sound_samples/cry_bellossom.bin"
 
 	.align 2
-Cry_Marill:: @ 85CD918
+Cry_Marill::
 	.incbin "sound/direct_sound_samples/cry_marill.bin"
 
 	.align 2
-Cry_Azumarill:: @ 85CE62C
+Cry_Azumarill::
 	.incbin "sound/direct_sound_samples/cry_azumarill.bin"
 
 	.align 2
-Cry_Sudowoodo:: @ 85CF718
+Cry_Sudowoodo::
 	.incbin "sound/direct_sound_samples/cry_sudowoodo.bin"
 
 	.align 2
-Cry_Politoed:: @ 85D0748
+Cry_Politoed::
 	.incbin "sound/direct_sound_samples/cry_politoed.bin"
 
 	.align 2
-Cry_Hoppip:: @ 85D198C
+Cry_Hoppip::
 	.incbin "sound/direct_sound_samples/cry_hoppip.bin"
 
 	.align 2
-Cry_Skiploom:: @ 85D21F8
+Cry_Skiploom::
 	.incbin "sound/direct_sound_samples/cry_skiploom.bin"
 
 	.align 2
-Cry_Jumpluff:: @ 85D2F00
+Cry_Jumpluff::
 	.incbin "sound/direct_sound_samples/cry_jumpluff.bin"
 
 	.align 2
-Cry_Aipom:: @ 85D3F3C
+Cry_Aipom::
 	.incbin "sound/direct_sound_samples/cry_aipom.bin"
 
 	.align 2
-Cry_Sunkern:: @ 85D4D5C
+Cry_Sunkern::
 	.incbin "sound/direct_sound_samples/cry_sunkern.bin"
 
 	.align 2
-Cry_Sunflora:: @ 85D5570
+Cry_Sunflora::
 	.incbin "sound/direct_sound_samples/cry_sunflora.bin"
 
 	.align 2
-Cry_Yanma:: @ 85D6550
+Cry_Yanma::
 	.incbin "sound/direct_sound_samples/cry_yanma.bin"
 
 	.align 2
-Cry_Wooper:: @ 85D7658
+Cry_Wooper::
 	.incbin "sound/direct_sound_samples/cry_wooper.bin"
 
 	.align 2
-Cry_Quagsire:: @ 85D7DB8
+Cry_Quagsire::
 	.incbin "sound/direct_sound_samples/cry_quagsire.bin"
 
 	.align 2
-Cry_Espeon:: @ 85D8B18
+Cry_Espeon::
 	.incbin "sound/direct_sound_samples/cry_espeon.bin"
 
 	.align 2
-Cry_Umbreon:: @ 85D9ECC
+Cry_Umbreon::
 	.incbin "sound/direct_sound_samples/cry_umbreon.bin"
 
 	.align 2
-Cry_Murkrow:: @ 85DAE4C
+Cry_Murkrow::
 	.incbin "sound/direct_sound_samples/cry_murkrow.bin"
 
 	.align 2
-Cry_Slowking:: @ 85DBF10
+Cry_Slowking::
 	.incbin "sound/direct_sound_samples/cry_slowking.bin"
 
 	.align 2
-Cry_Misdreavus:: @ 85DD6F4
+Cry_Misdreavus::
 	.incbin "sound/direct_sound_samples/cry_misdreavus.bin"
 
 	.align 2
-Cry_Unown:: @ 85DE294
+Cry_Unown::
 	.incbin "sound/direct_sound_samples/cry_unown.bin"
 
 	.align 2
-Cry_Wobbuffet:: @ 85DEFBC
+Cry_Wobbuffet::
 	.incbin "sound/direct_sound_samples/cry_wobbuffet.bin"
 
 	.align 2
-Cry_Girafarig:: @ 85E0458
+Cry_Girafarig::
 	.incbin "sound/direct_sound_samples/cry_girafarig.bin"
 
 	.align 2
-Cry_Pineco:: @ 85E130C
+Cry_Pineco::
 	.incbin "sound/direct_sound_samples/cry_pineco.bin"
 
 	.align 2
-Cry_Forretress:: @ 85E206C
+Cry_Forretress::
 	.incbin "sound/direct_sound_samples/cry_forretress.bin"
 
 	.align 2
-Cry_Dunsparce:: @ 85E3474
+Cry_Dunsparce::
 	.incbin "sound/direct_sound_samples/cry_dunsparce.bin"
 
 	.align 2
-Cry_Gligar:: @ 85E4454
+Cry_Gligar::
 	.incbin "sound/direct_sound_samples/cry_gligar.bin"
 
 	.align 2
-Cry_Steelix:: @ 85E5074
+Cry_Steelix::
 	.incbin "sound/direct_sound_samples/cry_steelix.bin"
 
 	.align 2
-Cry_Snubbull:: @ 85E769C
+Cry_Snubbull::
 	.incbin "sound/direct_sound_samples/cry_snubbull.bin"
 
 	.align 2
-Cry_Granbull:: @ 85E8510
+Cry_Granbull::
 	.incbin "sound/direct_sound_samples/cry_granbull.bin"
 
 	.align 2
-Cry_Qwilfish:: @ 85E9CB4
+Cry_Qwilfish::
 	.incbin "sound/direct_sound_samples/cry_qwilfish.bin"
 
 	.align 2
-Cry_Scizor:: @ 85EA850
+Cry_Scizor::
 	.incbin "sound/direct_sound_samples/cry_scizor.bin"
 
 	.align 2
-Cry_Shuckle:: @ 85EBF4C
+Cry_Shuckle::
 	.incbin "sound/direct_sound_samples/cry_shuckle.bin"
 
 	.align 2
-Cry_Heracross:: @ 85EC980
+Cry_Heracross::
 	.incbin "sound/direct_sound_samples/cry_heracross.bin"
 
 	.align 2
-Cry_Sneasel:: @ 85EDBD4
+Cry_Sneasel::
 	.incbin "sound/direct_sound_samples/cry_sneasel.bin"
 
 	.align 2
-Cry_Teddiursa:: @ 85EE4F8
+Cry_Teddiursa::
 	.incbin "sound/direct_sound_samples/cry_teddiursa.bin"
 
 	.align 2
-Cry_Ursaring:: @ 85EF584
+Cry_Ursaring::
 	.incbin "sound/direct_sound_samples/cry_ursaring.bin"
 
 	.align 2
-Cry_Slugma:: @ 85F135C
+Cry_Slugma::
 	.incbin "sound/direct_sound_samples/cry_slugma.bin"
 
 	.align 2
-Cry_Magcargo:: @ 85F2474
+Cry_Magcargo::
 	.incbin "sound/direct_sound_samples/cry_magcargo.bin"
 
 	.align 2
-Cry_Swinub:: @ 85F397C
+Cry_Swinub::
 	.incbin "sound/direct_sound_samples/cry_swinub.bin"
 
 	.align 2
-Cry_Piloswine:: @ 85F4624
+Cry_Piloswine::
 	.incbin "sound/direct_sound_samples/cry_piloswine.bin"
 
 	.align 2
-Cry_Corsola:: @ 85F5318
+Cry_Corsola::
 	.incbin "sound/direct_sound_samples/cry_corsola.bin"
 
 	.align 2
-Cry_Remoraid:: @ 85F5FF8
+Cry_Remoraid::
 	.incbin "sound/direct_sound_samples/cry_remoraid.bin"
 
 	.align 2
-Cry_Octillery:: @ 85F6A88
+Cry_Octillery::
 	.incbin "sound/direct_sound_samples/cry_octillery.bin"
 
 	.align 2
-Cry_Delibird:: @ 85F84CC
+Cry_Delibird::
 	.incbin "sound/direct_sound_samples/cry_delibird.bin"
 
 	.align 2
-Cry_Mantine:: @ 85F9500
+Cry_Mantine::
 	.incbin "sound/direct_sound_samples/cry_mantine.bin"
 
 	.align 2
-Cry_Skarmory:: @ 85FA4C8
+Cry_Skarmory::
 	.incbin "sound/direct_sound_samples/cry_skarmory.bin"
 
 	.align 2
-Cry_Houndour:: @ 85FBCD0
+Cry_Houndour::
 	.incbin "sound/direct_sound_samples/cry_houndour.bin"
 
 	.align 2
-Cry_Houndoom:: @ 85FC978
+Cry_Houndoom::
 	.incbin "sound/direct_sound_samples/cry_houndoom.bin"
 
 	.align 2
-Cry_Kingdra:: @ 85FDD28
+Cry_Kingdra::
 	.incbin "sound/direct_sound_samples/cry_kingdra.bin"
 
 	.align 2
-Cry_Phanpy:: @ 85FEB00
+Cry_Phanpy::
 	.incbin "sound/direct_sound_samples/cry_phanpy.bin"
 
 	.align 2
-Cry_Donphan:: @ 85FF650
+Cry_Donphan::
 	.incbin "sound/direct_sound_samples/cry_donphan.bin"
 
 	.align 2
-Cry_Porygon2:: @ 8600774
+Cry_Porygon2::
 	.incbin "sound/direct_sound_samples/cry_porygon2.bin"
 
 	.align 2
-Cry_Stantler:: @ 860172C
+Cry_Stantler::
 	.incbin "sound/direct_sound_samples/cry_stantler.bin"
 
 	.align 2
-Cry_Smeargle:: @ 8602DA8
+Cry_Smeargle::
 	.incbin "sound/direct_sound_samples/cry_smeargle.bin"
 
 	.align 2
-Cry_Tyrogue:: @ 86037DC
+Cry_Tyrogue::
 	.incbin "sound/direct_sound_samples/cry_tyrogue.bin"
 
 	.align 2
-Cry_Hitmontop:: @ 8604804
+Cry_Hitmontop::
 	.incbin "sound/direct_sound_samples/cry_hitmontop.bin"
 
 	.align 2
-Cry_Smoochum:: @ 86055E4
+Cry_Smoochum::
 	.incbin "sound/direct_sound_samples/cry_smoochum.bin"
 
 	.align 2
-Cry_Elekid:: @ 8606198
+Cry_Elekid::
 	.incbin "sound/direct_sound_samples/cry_elekid.bin"
 
 	.align 2
-Cry_Magby:: @ 8606C24
+Cry_Magby::
 	.incbin "sound/direct_sound_samples/cry_magby.bin"
 
 	.align 2
-Cry_Miltank:: @ 8607A94
+Cry_Miltank::
 	.incbin "sound/direct_sound_samples/cry_miltank.bin"
 
 	.align 2
-Cry_Blissey:: @ 8608970
+Cry_Blissey::
 	.incbin "sound/direct_sound_samples/cry_blissey.bin"
 
 	.align 2
-Cry_Raikou:: @ 8609A04
+Cry_Raikou::
 	.incbin "sound/direct_sound_samples/cry_raikou.bin"
 
 	.align 2
-Cry_Entei:: @ 860AB74
+Cry_Entei::
 	.incbin "sound/direct_sound_samples/cry_entei.bin"
 
 	.align 2
-Cry_Suicune:: @ 860BFE8
+Cry_Suicune::
 	.incbin "sound/direct_sound_samples/cry_suicune.bin"
 
 	.align 2
-Cry_Larvitar:: @ 860D230
+Cry_Larvitar::
 	.incbin "sound/direct_sound_samples/cry_larvitar.bin"
 
 	.align 2
-Cry_Pupitar:: @ 860DEE0
+Cry_Pupitar::
 	.incbin "sound/direct_sound_samples/cry_pupitar.bin"
 
 	.align 2
-Cry_Tyranitar:: @ 860E750
+Cry_Tyranitar::
 	.incbin "sound/direct_sound_samples/cry_tyranitar.bin"
 
 	.align 2
-Cry_Lugia:: @ 860FEB0
+Cry_Lugia::
 	.incbin "sound/direct_sound_samples/cry_lugia.bin"
 
 	.align 2
-Cry_HoOh:: @ 86124A8
+Cry_HoOh::
 	.incbin "sound/direct_sound_samples/cry_ho_oh.bin"
 
 	.align 2
-Cry_Celebi:: @ 8613B3C
+Cry_Celebi::
 	.incbin "sound/direct_sound_samples/cry_celebi.bin"
 
 	.align 2
-Cry_Kecleon:: @ 86149B4
+Cry_Kecleon::
 	.incbin "sound/direct_sound_samples/cry_kecleon.bin"
 
 	.align 2
-Cry_Roselia:: @ 8615214
+Cry_Roselia::
 	.incbin "sound/direct_sound_samples/cry_roselia.bin"
 
 	.align 2
-Cry_Torkoal:: @ 8615CD4
+Cry_Torkoal::
 	.incbin "sound/direct_sound_samples/cry_torkoal.bin"
 
 	.align 2
-Cry_Electrike:: @ 8616620
+Cry_Electrike::
 	.incbin "sound/direct_sound_samples/cry_electrike.bin"
 
 	.align 2
-Cry_Manectric:: @ 861727C
+Cry_Manectric::
 	.incbin "sound/direct_sound_samples/cry_manectric.bin"
 
 	.align 2
-Cry_Duskull:: @ 8618784
+Cry_Duskull::
 	.incbin "sound/direct_sound_samples/cry_duskull.bin"
 
 	.align 2
-Cry_Latias:: @ 861921C
+Cry_Latias::
 	.incbin "sound/direct_sound_samples/cry_latias.bin"
 
 	.align 2
-Cry_Wynaut:: @ 8619E4C
+Cry_Wynaut::
 	.incbin "sound/direct_sound_samples/cry_wynaut.bin"
 
 	.align 2
-Cry_Seviper:: @ 861AC2C
+Cry_Seviper::
 	.incbin "sound/direct_sound_samples/cry_seviper.bin"
 
 	.align 2
-Cry_Sharpedo:: @ 861B7CC
+Cry_Sharpedo::
 	.incbin "sound/direct_sound_samples/cry_sharpedo.bin"
 
 	.align 2
-Cry_Zangoose:: @ 861CED8
+Cry_Zangoose::
 	.incbin "sound/direct_sound_samples/cry_zangoose.bin"
 
 	.align 2
-Cry_Azurill:: @ 861D868
+Cry_Azurill::
 	.incbin "sound/direct_sound_samples/cry_azurill.bin"
 
 	.align 2
-Cry_Swablu:: @ 861E2D0
+Cry_Swablu::
 	.incbin "sound/direct_sound_samples/cry_swablu.bin"
 
 	.align 2
-Cry_Altaria:: @ 861E868
+Cry_Altaria::
 	.incbin "sound/direct_sound_samples/cry_altaria.bin"
 
 	.align 2
-Cry_Unused265:: @ 861F384
+Cry_Unused265::
 	.incbin "sound/direct_sound_samples/cry_unused_265.bin"
 
 	.align 2
-Cry_Taillow:: @ 861FCD8
+Cry_Taillow::
 	.incbin "sound/direct_sound_samples/cry_taillow.bin"
 
 	.align 2
-Cry_Swellow:: @ 86202D8
+Cry_Swellow::
 	.incbin "sound/direct_sound_samples/cry_swellow.bin"
 
 	.align 2
-Cry_Unused268:: @ 8620BDC
+Cry_Unused268::
 	.incbin "sound/direct_sound_samples/cry_unused_268.bin"
 
 	.align 2
-Cry_Spinda:: @ 8621D8C
+Cry_Spinda::
 	.incbin "sound/direct_sound_samples/cry_spinda.bin"
 
 	.align 2
-Cry_Torchic:: @ 86229F8
+Cry_Torchic::
 	.incbin "sound/direct_sound_samples/cry_torchic.bin"
 
 	.align 2
-Cry_Combusken:: @ 86233A0
+Cry_Combusken::
 	.incbin "sound/direct_sound_samples/cry_combusken.bin"
 
 	.align 2
-Cry_Blaziken:: @ 8625074
+Cry_Blaziken::
 	.incbin "sound/direct_sound_samples/cry_blaziken.bin"
 
 	.align 2
-Cry_Treecko:: @ 8626FF4
+Cry_Treecko::
 	.incbin "sound/direct_sound_samples/cry_treecko.bin"
 
 	.align 2
-Cry_Grovyle:: @ 8627B9C
+Cry_Grovyle::
 	.incbin "sound/direct_sound_samples/cry_grovyle.bin"
 
 	.align 2
-Cry_Sceptile:: @ 8629010
+Cry_Sceptile::
 	.incbin "sound/direct_sound_samples/cry_sceptile.bin"
 
 	.align 2
-Cry_Mudkip:: @ 862AA2C
+Cry_Mudkip::
 	.incbin "sound/direct_sound_samples/cry_mudkip.bin"
 
 	.align 2
-Cry_Marshtomp:: @ 862B1B0
+Cry_Marshtomp::
 	.incbin "sound/direct_sound_samples/cry_marshtomp.bin"
 
 	.align 2
-Cry_Swampert:: @ 862C2B4
+Cry_Swampert::
 	.incbin "sound/direct_sound_samples/cry_swampert.bin"
 
 	.align 2
-Cry_Pelipper:: @ 862D934
+Cry_Pelipper::
 	.incbin "sound/direct_sound_samples/cry_pelipper.bin"
 
 	.align 2
-Cry_Wingull:: @ 862E4FC
+Cry_Wingull::
 	.incbin "sound/direct_sound_samples/cry_wingull.bin"
 
 	.align 2
-Cry_Banette:: @ 862F13C
+Cry_Banette::
 	.incbin "sound/direct_sound_samples/cry_banette.bin"
 
 	.align 2
-Cry_Shuppet:: @ 862FDE4
+Cry_Shuppet::
 	.incbin "sound/direct_sound_samples/cry_shuppet.bin"
 
 	.align 2
-Cry_Lotad:: @ 8630624
+Cry_Lotad::
 	.incbin "sound/direct_sound_samples/cry_lotad.bin"
 
 	.align 2
-Cry_Lombre:: @ 8630A8C
+Cry_Lombre::
 	.incbin "sound/direct_sound_samples/cry_lombre.bin"
 
 	.align 2
-Cry_Ludicolo:: @ 8631920
+Cry_Ludicolo::
 	.incbin "sound/direct_sound_samples/cry_ludicolo.bin"
 
 	.align 2
-Cry_Seedot:: @ 86329F0
+Cry_Seedot::
 	.incbin "sound/direct_sound_samples/cry_seedot.bin"
 
 	.align 2
-Cry_Nuzleaf:: @ 863321C
+Cry_Nuzleaf::
 	.incbin "sound/direct_sound_samples/cry_nuzleaf.bin"
 
 	.align 2
-Cry_Shiftry:: @ 8633D84
+Cry_Shiftry::
 	.incbin "sound/direct_sound_samples/cry_shiftry.bin"
 
 	.align 2
-Cry_Carvanha:: @ 8635148
+Cry_Carvanha::
 	.incbin "sound/direct_sound_samples/cry_carvanha.bin"
 
 	.align 2
-Cry_Wurmple:: @ 8635B5C
+Cry_Wurmple::
 	.incbin "sound/direct_sound_samples/cry_wurmple.bin"
 
 	.align 2
-Cry_Silcoon:: @ 8636428
+Cry_Silcoon::
 	.incbin "sound/direct_sound_samples/cry_silcoon.bin"
 
 	.align 2
-Cry_Beautifly:: @ 8637454
+Cry_Beautifly::
 	.incbin "sound/direct_sound_samples/cry_beautifly.bin"
 
 	.align 2
-Cry_Cascoon:: @ 8637C8C
+Cry_Cascoon::
 	.incbin "sound/direct_sound_samples/cry_cascoon.bin"
 
 	.align 2
-Cry_Dustox:: @ 8638CD0
+Cry_Dustox::
 	.incbin "sound/direct_sound_samples/cry_dustox.bin"
 
 	.align 2
-Cry_Ralts:: @ 863997C
+Cry_Ralts::
 	.incbin "sound/direct_sound_samples/cry_ralts.bin"
 
 	.align 2
-Cry_Kirlia:: @ 863A398
+Cry_Kirlia::
 	.incbin "sound/direct_sound_samples/cry_kirlia.bin"
 
 	.align 2
-Cry_Gardevoir:: @ 863AFC8
+Cry_Gardevoir::
 	.incbin "sound/direct_sound_samples/cry_gardevoir.bin"
 
 	.align 2
-Cry_Slakoth:: @ 863C82C
+Cry_Slakoth::
 	.incbin "sound/direct_sound_samples/cry_slakoth.bin"
 
 	.align 2
-Cry_Vigoroth:: @ 863D0B0
+Cry_Vigoroth::
 	.incbin "sound/direct_sound_samples/cry_vigoroth.bin"
 
 	.align 2
-Cry_Slaking:: @ 863DF08
+Cry_Slaking::
 	.incbin "sound/direct_sound_samples/cry_slaking.bin"
 
 	.align 2
-Cry_Nincada:: @ 863E8F4
+Cry_Nincada::
 	.incbin "sound/direct_sound_samples/cry_nincada.bin"
 
 	.align 2
-Cry_Ninjask:: @ 863EF64
+Cry_Ninjask::
 	.incbin "sound/direct_sound_samples/cry_ninjask.bin"
 
 	.align 2
-Cry_Shedinja:: @ 863FB8C
+Cry_Shedinja::
 	.incbin "sound/direct_sound_samples/cry_shedinja.bin"
 
 	.align 2
-Cry_Makuhita:: @ 8640344
+Cry_Makuhita::
 	.incbin "sound/direct_sound_samples/cry_makuhita.bin"
 
 	.align 2
-Cry_Hariyama:: @ 8640AA0
+Cry_Hariyama::
 	.incbin "sound/direct_sound_samples/cry_hariyama.bin"
 
 	.align 2
-Cry_Nosepass:: @ 8641B58
+Cry_Nosepass::
 	.incbin "sound/direct_sound_samples/cry_nosepass.bin"
 
 	.align 2
-Cry_Glalie:: @ 86428BC
+Cry_Glalie::
 	.incbin "sound/direct_sound_samples/cry_glalie.bin"
 
 	.align 2
-Cry_Plusle:: @ 8643DA0
+Cry_Plusle::
 	.incbin "sound/direct_sound_samples/cry_plusle.bin"
 
 	.align 2
-Cry_Minun:: @ 864469C
+Cry_Minun::
 	.incbin "sound/direct_sound_samples/cry_minun.bin"
 
 	.align 2
-Cry_Surskit:: @ 86456A4
+Cry_Surskit::
 	.incbin "sound/direct_sound_samples/cry_surskit.bin"
 
 	.align 2
-Cry_Masquerain:: @ 8646124
+Cry_Masquerain::
 	.incbin "sound/direct_sound_samples/cry_masquerain.bin"
 
 	.align 2
-Cry_Skitty:: @ 86474D8
+Cry_Skitty::
 	.incbin "sound/direct_sound_samples/cry_skitty.bin"
 
 	.align 2
-Cry_Delcatty:: @ 8647BEC
+Cry_Delcatty::
 	.incbin "sound/direct_sound_samples/cry_delcatty.bin"
 
 	.align 2
-Cry_Gulpin:: @ 8649104
+Cry_Gulpin::
 	.incbin "sound/direct_sound_samples/cry_gulpin.bin"
 
 	.align 2
-Cry_Swalot:: @ 8649908
+Cry_Swalot::
 	.incbin "sound/direct_sound_samples/cry_swalot.bin"
 
 	.align 2
-Cry_Numel:: @ 864AA68
+Cry_Numel::
 	.incbin "sound/direct_sound_samples/cry_numel.bin"
 
 	.align 2
-Cry_Camerupt:: @ 864B3B4
+Cry_Camerupt::
 	.incbin "sound/direct_sound_samples/cry_camerupt.bin"
 
 	.align 2
-Cry_Barboach:: @ 864CAD4
+Cry_Barboach::
 	.incbin "sound/direct_sound_samples/cry_barboach.bin"
 
 	.align 2
-Cry_Whiscash:: @ 864D410
+Cry_Whiscash::
 	.incbin "sound/direct_sound_samples/cry_whiscash.bin"
 
 	.align 2
-Cry_Corphish:: @ 864E50C
+Cry_Corphish::
 	.incbin "sound/direct_sound_samples/cry_corphish.bin"
 
 	.align 2
-Cry_Crawdaunt:: @ 864F110
+Cry_Crawdaunt::
 	.incbin "sound/direct_sound_samples/cry_crawdaunt.bin"
 
 	.align 2
-Cry_Spoink:: @ 86509C8
+Cry_Spoink::
 	.incbin "sound/direct_sound_samples/cry_spoink.bin"
 
 	.align 2
-Cry_Grumpig:: @ 8651108
+Cry_Grumpig::
 	.incbin "sound/direct_sound_samples/cry_grumpig.bin"
 
 	.align 2
-Cry_Trapinch:: @ 8651DA8
+Cry_Trapinch::
 	.incbin "sound/direct_sound_samples/cry_trapinch.bin"
 
 	.align 2
-Cry_Vibrava:: @ 86527CC
+Cry_Vibrava::
 	.incbin "sound/direct_sound_samples/cry_vibrava.bin"
 
 	.align 2
-Cry_Flygon:: @ 86535D0
+Cry_Flygon::
 	.incbin "sound/direct_sound_samples/cry_flygon.bin"
 
 	.align 2
-Cry_Cacnea:: @ 8654FD8
+Cry_Cacnea::
 	.incbin "sound/direct_sound_samples/cry_cacnea.bin"
 
 	.align 2
-Cry_Cacturne:: @ 86558C8
+Cry_Cacturne::
 	.incbin "sound/direct_sound_samples/cry_cacturne.bin"
 
 	.align 2
-Cry_Baltoy:: @ 8656F78
+Cry_Baltoy::
 	.incbin "sound/direct_sound_samples/cry_baltoy.bin"
 
 	.align 2
-Cry_Claydol:: @ 8657BFC
+Cry_Claydol::
 	.incbin "sound/direct_sound_samples/cry_claydol.bin"
 
 	.align 2
-Cry_Lunatone:: @ 8658F5C
+Cry_Lunatone::
 	.incbin "sound/direct_sound_samples/cry_lunatone.bin"
 
 	.align 2
-Cry_Solrock:: @ 865A758
+Cry_Solrock::
 	.incbin "sound/direct_sound_samples/cry_solrock.bin"
 
 	.align 2
-Cry_Feebas:: @ 865B784
+Cry_Feebas::
 	.incbin "sound/direct_sound_samples/cry_feebas.bin"
 
 	.align 2
-Cry_Milotic:: @ 865BF58
+Cry_Milotic::
 	.incbin "sound/direct_sound_samples/cry_milotic.bin"
 
 	.align 2
-Cry_Absol:: @ 865E69C
+Cry_Absol::
 	.incbin "sound/direct_sound_samples/cry_absol.bin"
 
 	.align 2
-Cry_Meditite:: @ 865F118
+Cry_Meditite::
 	.incbin "sound/direct_sound_samples/cry_meditite.bin"
 
 	.align 2
-Cry_Medicham:: @ 865F938
+Cry_Medicham::
 	.incbin "sound/direct_sound_samples/cry_medicham.bin"
 
 	.align 2
-Cry_Spheal:: @ 86609BC
+Cry_Spheal::
 	.incbin "sound/direct_sound_samples/cry_spheal.bin"
 
 	.align 2
-Cry_Sealeo:: @ 8660F70
+Cry_Sealeo::
 	.incbin "sound/direct_sound_samples/cry_sealeo.bin"
 
 	.align 2
-Cry_Walrein:: @ 8661B48
+Cry_Walrein::
 	.incbin "sound/direct_sound_samples/cry_walrein.bin"
 
 	.align 2
-Cry_Clamperl:: @ 8663F94
+Cry_Clamperl::
 	.incbin "sound/direct_sound_samples/cry_clamperl.bin"
 
 	.align 2
-Cry_Huntail:: @ 86651E4
+Cry_Huntail::
 	.incbin "sound/direct_sound_samples/cry_huntail.bin"
 
 	.align 2
-Cry_Gorebyss:: @ 86661CC
+Cry_Gorebyss::
 	.incbin "sound/direct_sound_samples/cry_gorebyss.bin"
 
 	.align 2
-Cry_Lileep:: @ 8667838
+Cry_Lileep::
 	.incbin "sound/direct_sound_samples/cry_lileep.bin"
 
 	.align 2
-Cry_Cradily:: @ 86681E0
+Cry_Cradily::
 	.incbin "sound/direct_sound_samples/cry_cradily.bin"
 
 	.align 2
-Cry_Anorith:: @ 8669F10
+Cry_Anorith::
 	.incbin "sound/direct_sound_samples/cry_anorith.bin"
 
 	.align 2
-Cry_Armaldo:: @ 866AAC8
+Cry_Armaldo::
 	.incbin "sound/direct_sound_samples/cry_armaldo.bin"
 
 	.align 2
-Cry_Beldum:: @ 866C19C
+Cry_Beldum::
 	.incbin "sound/direct_sound_samples/cry_beldum.bin"
 
 	.align 2
-Cry_Metang:: @ 866CB3C
+Cry_Metang::
 	.incbin "sound/direct_sound_samples/cry_metang.bin"
 
 	.align 2
-Cry_Metagross:: @ 866DE10
+Cry_Metagross::
 	.incbin "sound/direct_sound_samples/cry_metagross.bin"
 
 	.align 2
-Cry_Bagon:: @ 8670588
+Cry_Bagon::
 	.incbin "sound/direct_sound_samples/cry_bagon.bin"
 
 	.align 2
-Cry_Shelgon:: @ 8670D5C
+Cry_Shelgon::
 	.incbin "sound/direct_sound_samples/cry_shelgon.bin"
 
 	.align 2
-Cry_Regirock:: @ 8672164
+Cry_Regirock::
 	.incbin "sound/direct_sound_samples/cry_regirock.bin"
 
 	.align 2
-Cry_Regice:: @ 8674140
+Cry_Regice::
 	.incbin "sound/direct_sound_samples/cry_regice.bin"
 
 	.align 2
-Cry_Registeel:: @ 8676140
+Cry_Registeel::
 	.incbin "sound/direct_sound_samples/cry_registeel.bin"
 
 	.align 2
-Cry_Castform:: @ 8677844
+Cry_Castform::
 	.incbin "sound/direct_sound_samples/cry_castform.bin"
 
 	.align 2
-Cry_Volbeat:: @ 86784DC
+Cry_Volbeat::
 	.incbin "sound/direct_sound_samples/cry_volbeat.bin"
 
 	.align 2
-Cry_Illumise:: @ 8679064
+Cry_Illumise::
 	.incbin "sound/direct_sound_samples/cry_illumise.bin"
 
 	.align 2
-Cry_Poochyena:: @ 867A17C
+Cry_Poochyena::
 	.incbin "sound/direct_sound_samples/cry_poochyena.bin"
 
 	.align 2
-Cry_Mightyena:: @ 867AAC4
+Cry_Mightyena::
 	.incbin "sound/direct_sound_samples/cry_mightyena.bin"
 
 	.align 2
-Cry_Dusclops:: @ 867BE50
+Cry_Dusclops::
 	.incbin "sound/direct_sound_samples/cry_dusclops.bin"
 
 	.align 2
-Cry_Sableye:: @ 867CC08
+Cry_Sableye::
 	.incbin "sound/direct_sound_samples/cry_sableye.bin"
 
 	.align 2
-Cry_Mawile:: @ 867D7AC
+Cry_Mawile::
 	.incbin "sound/direct_sound_samples/cry_mawile.bin"
 
 	.align 2
-Cry_Aron:: @ 867E32C
+Cry_Aron::
 	.incbin "sound/direct_sound_samples/cry_aron.bin"
 
 	.align 2
-Cry_Lairon:: @ 867EC58
+Cry_Lairon::
 	.incbin "sound/direct_sound_samples/cry_lairon.bin"
 
 	.align 2
-Cry_Aggron:: @ 8680130
+Cry_Aggron::
 	.incbin "sound/direct_sound_samples/cry_aggron.bin"
 
 	.align 2
-Cry_Relicanth:: @ 8681AD4
+Cry_Relicanth::
 	.incbin "sound/direct_sound_samples/cry_relicanth.bin"
 
 	.align 2
-Cry_Luvdisc:: @ 8682F04
+Cry_Luvdisc::
 	.incbin "sound/direct_sound_samples/cry_luvdisc.bin"
 
 	.align 2
-Cry_Groudon:: @ 86833E0
+Cry_Groudon::
 	.incbin "sound/direct_sound_samples/cry_groudon.bin"
 
 	.align 2
-Cry_Kyogre:: @ 86858EC
+Cry_Kyogre::
 	.incbin "sound/direct_sound_samples/cry_kyogre.bin"
 
 	.align 2
-Cry_Rayquaza:: @ 8687CA4
+Cry_Rayquaza::
 	.incbin "sound/direct_sound_samples/cry_rayquaza.bin"
 
 	.align 2
-Cry_Salamence:: @ 86899D0
+Cry_Salamence::
 	.incbin "sound/direct_sound_samples/cry_salamence.bin"
 
 	.align 2
-Cry_Breloom:: @ 868B2EC
+Cry_Breloom::
 	.incbin "sound/direct_sound_samples/cry_breloom.bin"
 
 	.align 2
-Cry_Shroomish:: @ 868BFAC
+Cry_Shroomish::
 	.incbin "sound/direct_sound_samples/cry_shroomish.bin"
 
 	.align 2
-Cry_Linoone:: @ 868C884
+Cry_Linoone::
 	.incbin "sound/direct_sound_samples/cry_linoone.bin"
 
 	.align 2
-Cry_Tropius:: @ 868E720
+Cry_Tropius::
 	.incbin "sound/direct_sound_samples/cry_tropius.bin"
 
 	.align 2
-Cry_Wailmer:: @ 86907E4
+Cry_Wailmer::
 	.incbin "sound/direct_sound_samples/cry_wailmer.bin"
 
 	.align 2
-Cry_Zigzagoon:: @ 8692444
+Cry_Zigzagoon::
 	.incbin "sound/direct_sound_samples/cry_zigzagoon.bin"
 
 	.align 2
-Cry_Exploud:: @ 8692FD4
+Cry_Exploud::
 	.incbin "sound/direct_sound_samples/cry_exploud.bin"
 
 	.align 2
-Cry_Loudred:: @ 8694C1C
+Cry_Loudred::
 	.incbin "sound/direct_sound_samples/cry_loudred.bin"
 
 	.align 2
-Cry_Wailord:: @ 8695944
+Cry_Wailord::
 	.incbin "sound/direct_sound_samples/cry_wailord.bin"
 
 	.align 2
-Cry_Whismur:: @ 8698354
+Cry_Whismur::
 	.incbin "sound/direct_sound_samples/cry_whismur.bin"
 
 	.align 2
-Cry_Snorunt:: @ 8698B78
+Cry_Snorunt::
 	.incbin "sound/direct_sound_samples/cry_snorunt.bin"
 
 	.align 2
-Cry_Latios:: @ 8699C80
+Cry_Latios::
 	.incbin "sound/direct_sound_samples/cry_latios.bin"
 
 	.align 2
-Cry_Jirachi:: @ 869B278
+Cry_Jirachi::
 	.incbin "sound/direct_sound_samples/cry_jirachi.bin"
 
 	.align 2
-Cry_Deoxys:: @ 869BFFC
+Cry_Deoxys::
 	.incbin "sound/direct_sound_samples/cry_deoxys.bin"
 
 	.align 2
-Cry_Chimecho:: @ 869D4D0
+Cry_Chimecho::
 	.incbin "sound/direct_sound_samples/cry_chimecho.bin"
 
 	.align 2
 
-gDirectSoundWaveData_76:: @ 869DEE0
-	.incbin "sound/direct_sound_samples/wave_76.bin"
+DirectSoundWaveData_register_noise::
+	.incbin "sound/direct_sound_samples/register_noise.bin"
 
-gDirectSoundWaveData_77:: @ 869FE40
+DirectSoundWaveData_wave_77::
 	.incbin "sound/direct_sound_samples/wave_77.bin"
 
-gDirectSoundWaveData_78:: @ 86A18E0
-	.incbin "sound/direct_sound_samples/wave_78.bin"
+DirectSoundWaveData_sc88_nylon_str_guitar::
+	.incbin "sound/direct_sound_samples/sc88_nylon_str_guitar.bin"
 
-gDirectSoundWaveData_79:: @ 86A3850
-	.incbin "sound/direct_sound_samples/wave_79.bin"
+DirectSoundWaveData_sd90_special_scream_drive::
+	.incbin "sound/direct_sound_samples/sd90_special_scream_drive.bin"
 
-gDirectSoundWaveData_80:: @ 86A5088
-	.incbin "sound/direct_sound_samples/wave_80.bin"
+DirectSoundWaveData_sc88_accordion_duplicate::
+	.incbin "sound/direct_sound_samples/sc88_accordion_duplicate.bin"
 
-gDirectSoundWaveData_81:: @ 86A6458
-	.incbin "sound/direct_sound_samples/wave_81.bin"
+DirectSoundWaveData_steinway_b_piano::
+	.incbin "sound/direct_sound_samples/steinway_b_piano.bin"
 
-gDirectSoundWaveData_82:: @ 86A761C
-	.incbin "sound/direct_sound_samples/wave_82.bin"
+DirectSoundWaveData_sd90_classical_overdrive_guitar::
+	.incbin "sound/direct_sound_samples/sd90_classical_overdrive_guitar.bin"
 
-gDirectSoundWaveData_83:: @ 86A948C
-	.incbin "sound/direct_sound_samples/wave_83.bin"
+DirectSoundWaveData_sd90_classical_distortion_guitar_high::
+	.incbin "sound/direct_sound_samples/sd90_classical_distortion_guitar_high.bin"
 
-gDirectSoundWaveData_84:: @ 86AC47C
-	.incbin "sound/direct_sound_samples/wave_84.bin"
+DirectSoundWaveData_sd90_classical_distortion_guitar_low::
+	.incbin "sound/direct_sound_samples/sd90_classical_distortion_guitar_low.bin"
 
-gDirectSoundWaveData_85:: @ 86AF0D0
-	.incbin "sound/direct_sound_samples/wave_85.bin"
+DirectSoundWaveData_sd90_classical_whistle::
+	.incbin "sound/direct_sound_samples/sd90_classical_whistle.bin"
 
-gDirectSoundWaveData_86:: @ 86AFB30
-	.incbin "sound/direct_sound_samples/wave_86.bin"
+DirectSoundWaveData_sd90_classical_detuned_ep1_low::
+	.incbin "sound/direct_sound_samples/sd90_classical_detuned_ep1_low.bin"
 
-gDirectSoundWaveData_87:: @ 86B2198
-	.incbin "sound/direct_sound_samples/wave_87.bin"
+DirectSoundWaveData_sd90_classical_detuned_ep1_high::
+	.incbin "sound/direct_sound_samples/sd90_classical_detuned_ep1_high.bin"
 
-gDirectSoundWaveData_88:: @ 86B3540
-	.incbin "sound/direct_sound_samples/wave_88.bin"
+DirectSoundWaveData_sd90_enhanced_delay_shaku::
+	.incbin "sound/direct_sound_samples/sd90_enhanced_delay_shaku.bin"
diff --git a/sound/direct_sound_samples/wave_53.aif b/sound/direct_sound_samples/bicycle_bell.aif
index 52191fa16..52191fa16 100644
--- a/sound/direct_sound_samples/wave_53.aif
+++ b/sound/direct_sound_samples/bicycle_bell.aif
diff --git a/sound/direct_sound_samples/wave_6.aif b/sound/direct_sound_samples/classical_choir_voice_ahhs.aif
index 25d766a6b..25d766a6b 100644
--- a/sound/direct_sound_samples/wave_6.aif
+++ b/sound/direct_sound_samples/classical_choir_voice_ahhs.aif
diff --git a/sound/direct_sound_samples/wave_26.aif b/sound/direct_sound_samples/dance_drums_ride_bell.aif
index 743451262..743451262 100644
--- a/sound/direct_sound_samples/wave_26.aif
+++ b/sound/direct_sound_samples/dance_drums_ride_bell.aif
diff --git a/sound/direct_sound_samples/wave_23.aif b/sound/direct_sound_samples/drum_and_percussion_kick.aif
index b82e9c208..b82e9c208 100644
--- a/sound/direct_sound_samples/wave_23.aif
+++ b/sound/direct_sound_samples/drum_and_percussion_kick.aif
diff --git a/sound/direct_sound_samples/wave_3.aif b/sound/direct_sound_samples/jv1080_slap_bass.aif
index b709d3aee..b709d3aee 100644
--- a/sound/direct_sound_samples/wave_3.aif
+++ b/sound/direct_sound_samples/jv1080_slap_bass.aif
diff --git a/sound/direct_sound_samples/wave_76.aif b/sound/direct_sound_samples/register_noise.aif
index e56c5c131..e56c5c131 100644
--- a/sound/direct_sound_samples/wave_76.aif
+++ b/sound/direct_sound_samples/register_noise.aif
diff --git a/sound/direct_sound_samples/wave_74.aif b/sound/direct_sound_samples/sc88_accordion.aif
index e4c024cf5..e4c024cf5 100644
--- a/sound/direct_sound_samples/wave_74.aif
+++ b/sound/direct_sound_samples/sc88_accordion.aif
diff --git a/sound/direct_sound_samples/wave_80.aif b/sound/direct_sound_samples/sc88_accordion_duplicate.aif
index e4c024cf5..e4c024cf5 100644
--- a/sound/direct_sound_samples/wave_80.aif
+++ b/sound/direct_sound_samples/sc88_accordion_duplicate.aif
diff --git a/sound/direct_sound_samples/wave_21.aif b/sound/direct_sound_samples/sc88_bongo.aif
index 2e1bf9c64..2e1bf9c64 100644
--- a/sound/direct_sound_samples/wave_21.aif
+++ b/sound/direct_sound_samples/sc88_bongo.aif
diff --git a/sound/direct_sound_samples/wave_22.aif b/sound/direct_sound_samples/sc88_bongo_low.aif
index 8e1cb620a..8e1cb620a 100644
--- a/sound/direct_sound_samples/wave_22.aif
+++ b/sound/direct_sound_samples/sc88_bongo_low.aif
diff --git a/sound/direct_sound_samples/wave_60.aif b/sound/direct_sound_samples/sc88_bubbles.aif
index 89872bf55..89872bf55 100644
--- a/sound/direct_sound_samples/wave_60.aif
+++ b/sound/direct_sound_samples/sc88_bubbles.aif
diff --git a/sound/direct_sound_samples/wave_48.aif b/sound/direct_sound_samples/sc88_flute.aif
index f32c5a71e..f32c5a71e 100644
--- a/sound/direct_sound_samples/wave_48.aif
+++ b/sound/direct_sound_samples/sc88_flute.aif
diff --git a/sound/direct_sound_samples/wave_46.aif b/sound/direct_sound_samples/sc88_french_horn_60.aif
index 742c4385e..742c4385e 100644
--- a/sound/direct_sound_samples/wave_46.aif
+++ b/sound/direct_sound_samples/sc88_french_horn_60.aif
diff --git a/sound/direct_sound_samples/wave_47.aif b/sound/direct_sound_samples/sc88_french_horn_72.aif
index b7f98929f..b7f98929f 100644
--- a/sound/direct_sound_samples/wave_47.aif
+++ b/sound/direct_sound_samples/sc88_french_horn_72.aif
diff --git a/sound/direct_sound_samples/wave_2.aif b/sound/direct_sound_samples/sc88_fretless_bass.aif
index 737a7200f..737a7200f 100644
--- a/sound/direct_sound_samples/wave_2.aif
+++ b/sound/direct_sound_samples/sc88_fretless_bass.aif
diff --git a/sound/direct_sound_samples/wave_0.aif b/sound/direct_sound_samples/sc88_glockenspiel.aif
index 22b8f1691..22b8f1691 100644
--- a/sound/direct_sound_samples/wave_0.aif
+++ b/sound/direct_sound_samples/sc88_glockenspiel.aif
diff --git a/sound/direct_sound_samples/wave_70.aif b/sound/direct_sound_samples/sc88_harp.aif
index 083c45e3d..083c45e3d 100644
--- a/sound/direct_sound_samples/wave_70.aif
+++ b/sound/direct_sound_samples/sc88_harp.aif
diff --git a/sound/direct_sound_samples/wave_78.aif b/sound/direct_sound_samples/sc88_nylon_str_guitar.aif
index c1a575c12..c1a575c12 100644
--- a/sound/direct_sound_samples/wave_78.aif
+++ b/sound/direct_sound_samples/sc88_nylon_str_guitar.aif
diff --git a/sound/direct_sound_samples/wave_20.aif b/sound/direct_sound_samples/sc88_orchestra_cymbal_crash.aif
index 56286e494..56286e494 100644
--- a/sound/direct_sound_samples/wave_20.aif
+++ b/sound/direct_sound_samples/sc88_orchestra_cymbal_crash.aif
diff --git a/sound/direct_sound_samples/wave_17.aif b/sound/direct_sound_samples/sc88_orchestra_snare.aif
index 3b30d894c..3b30d894c 100644
--- a/sound/direct_sound_samples/wave_17.aif
+++ b/sound/direct_sound_samples/sc88_orchestra_snare.aif
diff --git a/sound/direct_sound_samples/wave_1.aif b/sound/direct_sound_samples/sc88_organ2.aif
index 6372bbc32..6372bbc32 100644
--- a/sound/direct_sound_samples/wave_1.aif
+++ b/sound/direct_sound_samples/sc88_organ2.aif
diff --git a/sound/direct_sound_samples/wave_34.aif b/sound/direct_sound_samples/sc88_piano1_48.aif
index dd30ae441..dd30ae441 100644
--- a/sound/direct_sound_samples/wave_34.aif
+++ b/sound/direct_sound_samples/sc88_piano1_48.aif
diff --git a/sound/direct_sound_samples/wave_35.aif b/sound/direct_sound_samples/sc88_piano1_60.aif
index df4773522..df4773522 100644
--- a/sound/direct_sound_samples/wave_35.aif
+++ b/sound/direct_sound_samples/sc88_piano1_60.aif
diff --git a/sound/direct_sound_samples/wave_36.aif b/sound/direct_sound_samples/sc88_piano1_72.aif
index 81ebda139..81ebda139 100644
--- a/sound/direct_sound_samples/wave_36.aif
+++ b/sound/direct_sound_samples/sc88_piano1_72.aif
diff --git a/sound/direct_sound_samples/wave_37.aif b/sound/direct_sound_samples/sc88_piano1_84.aif
index 8ec870f7b..8ec870f7b 100644
--- a/sound/direct_sound_samples/wave_37.aif
+++ b/sound/direct_sound_samples/sc88_piano1_84.aif
diff --git a/sound/direct_sound_samples/wave_49.aif b/sound/direct_sound_samples/sc88_pick_bass.aif
index ee52f958a..ee52f958a 100644
--- a/sound/direct_sound_samples/wave_49.aif
+++ b/sound/direct_sound_samples/sc88_pick_bass.aif
diff --git a/sound/direct_sound_samples/wave_55.aif b/sound/direct_sound_samples/sc88_pizzicato_strings.aif
index c30d477ee..c30d477ee 100644
--- a/sound/direct_sound_samples/wave_55.aif
+++ b/sound/direct_sound_samples/sc88_pizzicato_strings.aif
diff --git a/sound/direct_sound_samples/wave_52.aif b/sound/direct_sound_samples/sc88_square_wave.aif
index 09e17f0ca..09e17f0ca 100644
--- a/sound/direct_sound_samples/wave_52.aif
+++ b/sound/direct_sound_samples/sc88_square_wave.aif
diff --git a/sound/direct_sound_samples/wave_15.aif b/sound/direct_sound_samples/sc88_standard3_snare.aif
index 115ebd3f8..115ebd3f8 100644
--- a/sound/direct_sound_samples/wave_15.aif
+++ b/sound/direct_sound_samples/sc88_standard3_snare.aif
diff --git a/sound/direct_sound_samples/wave_30.aif b/sound/direct_sound_samples/sc88_standard_bells.aif
index 6d8330b86..6d8330b86 100644
--- a/sound/direct_sound_samples/wave_30.aif
+++ b/sound/direct_sound_samples/sc88_standard_bells.aif
diff --git a/sound/direct_sound_samples/wave_16.aif b/sound/direct_sound_samples/sc88_standard_hand_clap.aif
index b11787ffc..b11787ffc 100644
--- a/sound/direct_sound_samples/wave_16.aif
+++ b/sound/direct_sound_samples/sc88_standard_hand_clap.aif
diff --git a/sound/direct_sound_samples/wave_14.aif b/sound/direct_sound_samples/sc88_standard_kick.aif
index d3caec2bf..d3caec2bf 100644
--- a/sound/direct_sound_samples/wave_14.aif
+++ b/sound/direct_sound_samples/sc88_standard_kick.aif
diff --git a/sound/direct_sound_samples/wave_38.aif b/sound/direct_sound_samples/sc88_string_ensemble_60.aif
index bfaa5c196..bfaa5c196 100644
--- a/sound/direct_sound_samples/wave_38.aif
+++ b/sound/direct_sound_samples/sc88_string_ensemble_60.aif
diff --git a/sound/direct_sound_samples/wave_39.aif b/sound/direct_sound_samples/sc88_string_ensemble_72.aif
index 17b03d91a..17b03d91a 100644
--- a/sound/direct_sound_samples/wave_39.aif
+++ b/sound/direct_sound_samples/sc88_string_ensemble_72.aif
diff --git a/sound/direct_sound_samples/wave_40.aif b/sound/direct_sound_samples/sc88_string_ensemble_84.aif
index ab3d5da53..ab3d5da53 100644
--- a/sound/direct_sound_samples/wave_40.aif
+++ b/sound/direct_sound_samples/sc88_string_ensemble_84.aif
diff --git a/sound/direct_sound_samples/wave_4.aif b/sound/direct_sound_samples/sc88_synth_bass.aif
index 81b82c41c..81b82c41c 100644
--- a/sound/direct_sound_samples/wave_4.aif
+++ b/sound/direct_sound_samples/sc88_synth_bass.aif
diff --git a/sound/direct_sound_samples/wave_5.aif b/sound/direct_sound_samples/sc88_timpani.aif
index 84829d634..84829d634 100644
--- a/sound/direct_sound_samples/wave_5.aif
+++ b/sound/direct_sound_samples/sc88_timpani.aif
diff --git a/sound/direct_sound_samples/wave_50.aif b/sound/direct_sound_samples/sc88_timpani_with_snare.aif
index 6147cf25c..6147cf25c 100644
--- a/sound/direct_sound_samples/wave_50.aif
+++ b/sound/direct_sound_samples/sc88_timpani_with_snare.aif
diff --git a/sound/direct_sound_samples/wave_41.aif b/sound/direct_sound_samples/sc88_trumpet_60.aif
index fe5ac0067..fe5ac0067 100644
--- a/sound/direct_sound_samples/wave_41.aif
+++ b/sound/direct_sound_samples/sc88_trumpet_60.aif
diff --git a/sound/direct_sound_samples/wave_42.aif b/sound/direct_sound_samples/sc88_trumpet_72.aif
index fb862d2fc..fb862d2fc 100644
--- a/sound/direct_sound_samples/wave_42.aif
+++ b/sound/direct_sound_samples/sc88_trumpet_72.aif
diff --git a/sound/direct_sound_samples/wave_43.aif b/sound/direct_sound_samples/sc88_trumpet_84.aif
index f39c9fd79..f39c9fd79 100644
--- a/sound/direct_sound_samples/wave_43.aif
+++ b/sound/direct_sound_samples/sc88_trumpet_84.aif
diff --git a/sound/direct_sound_samples/wave_66.aif b/sound/direct_sound_samples/sc88_tubular_bell.aif
index 9d00ecae6..9d00ecae6 100644
--- a/sound/direct_sound_samples/wave_66.aif
+++ b/sound/direct_sound_samples/sc88_tubular_bell.aif
diff --git a/sound/direct_sound_samples/wave_59.aif b/sound/direct_sound_samples/sc88_wind.aif
index 6b247df07..6b247df07 100644
--- a/sound/direct_sound_samples/wave_59.aif
+++ b/sound/direct_sound_samples/sc88_wind.aif
diff --git a/sound/direct_sound_samples/wave_71.aif b/sound/direct_sound_samples/sc88_xylophone.aif
index d9e2f840a..d9e2f840a 100644
--- a/sound/direct_sound_samples/wave_71.aif
+++ b/sound/direct_sound_samples/sc88_xylophone.aif
diff --git a/sound/direct_sound_samples/wave_25.aif b/sound/direct_sound_samples/sd90_ambient_tom.aif
index d6357accb..d6357accb 100644
--- a/sound/direct_sound_samples/wave_25.aif
+++ b/sound/direct_sound_samples/sd90_ambient_tom.aif
diff --git a/sound/direct_sound_samples/wave_87.aif b/sound/direct_sound_samples/sd90_classical_detuned_ep1_high.aif
index 86ea0fa76..86ea0fa76 100644
--- a/sound/direct_sound_samples/wave_87.aif
+++ b/sound/direct_sound_samples/sd90_classical_detuned_ep1_high.aif
diff --git a/sound/direct_sound_samples/wave_86.aif b/sound/direct_sound_samples/sd90_classical_detuned_ep1_low.aif
index 90359b459..90359b459 100644
--- a/sound/direct_sound_samples/wave_86.aif
+++ b/sound/direct_sound_samples/sd90_classical_detuned_ep1_low.aif
diff --git a/sound/direct_sound_samples/wave_83.aif b/sound/direct_sound_samples/sd90_classical_distortion_guitar_high.aif
index b0f0e82a1..b0f0e82a1 100644
--- a/sound/direct_sound_samples/wave_83.aif
+++ b/sound/direct_sound_samples/sd90_classical_distortion_guitar_high.aif
diff --git a/sound/direct_sound_samples/wave_84.aif b/sound/direct_sound_samples/sd90_classical_distortion_guitar_low.aif
index aa97fe3ef..aa97fe3ef 100644
--- a/sound/direct_sound_samples/wave_84.aif
+++ b/sound/direct_sound_samples/sd90_classical_distortion_guitar_low.aif
diff --git a/sound/direct_sound_samples/wave_7.aif b/sound/direct_sound_samples/sd90_classical_oboe.aif
index 83cb8c7d0..83cb8c7d0 100644
--- a/sound/direct_sound_samples/wave_7.aif
+++ b/sound/direct_sound_samples/sd90_classical_oboe.aif
diff --git a/sound/direct_sound_samples/wave_82.aif b/sound/direct_sound_samples/sd90_classical_overdrive_guitar.aif
index 6bdc1beab..6bdc1beab 100644
--- a/sound/direct_sound_samples/wave_82.aif
+++ b/sound/direct_sound_samples/sd90_classical_overdrive_guitar.aif
diff --git a/sound/direct_sound_samples/wave_85.aif b/sound/direct_sound_samples/sd90_classical_whistle.aif
index 357e348a7..357e348a7 100644
--- a/sound/direct_sound_samples/wave_85.aif
+++ b/sound/direct_sound_samples/sd90_classical_whistle.aif
diff --git a/sound/direct_sound_samples/wave_88.aif b/sound/direct_sound_samples/sd90_enhanced_delay_shaku.aif
index 2ae1b3021..2ae1b3021 100644
--- a/sound/direct_sound_samples/wave_88.aif
+++ b/sound/direct_sound_samples/sd90_enhanced_delay_shaku.aif
diff --git a/sound/direct_sound_samples/wave_24.aif b/sound/direct_sound_samples/sd90_solo_snare.aif
index 3343a53a3..3343a53a3 100644
--- a/sound/direct_sound_samples/wave_24.aif
+++ b/sound/direct_sound_samples/sd90_solo_snare.aif
diff --git a/sound/direct_sound_samples/wave_79.aif b/sound/direct_sound_samples/sd90_special_scream_drive.aif
index 8b7a7da40..8b7a7da40 100644
--- a/sound/direct_sound_samples/wave_79.aif
+++ b/sound/direct_sound_samples/sd90_special_scream_drive.aif
diff --git a/sound/direct_sound_samples/wave_81.aif b/sound/direct_sound_samples/steinway_b_piano.aif
index 3124e31a0..3124e31a0 100644
--- a/sound/direct_sound_samples/wave_81.aif
+++ b/sound/direct_sound_samples/steinway_b_piano.aif
diff --git a/sound/direct_sound_samples/wave_19.aif b/sound/direct_sound_samples/trinity_cymbal_crash.aif
index 55b9f73ba..55b9f73ba 100644
--- a/sound/direct_sound_samples/wave_19.aif
+++ b/sound/direct_sound_samples/trinity_cymbal_crash.aif
diff --git a/sound/direct_sound_samples/wave_29.aif b/sound/direct_sound_samples/unknown_anvil_high.aif
index fb1ce68f0..fb1ce68f0 100644
--- a/sound/direct_sound_samples/wave_29.aif
+++ b/sound/direct_sound_samples/unknown_anvil_high.aif
diff --git a/sound/direct_sound_samples/wave_31.aif b/sound/direct_sound_samples/unknown_anvil_low.aif
index 519c3b8a8..519c3b8a8 100644
--- a/sound/direct_sound_samples/wave_31.aif
+++ b/sound/direct_sound_samples/unknown_anvil_low.aif
diff --git a/sound/direct_sound_samples/wave_67.aif b/sound/direct_sound_samples/unknown_close_hihat.aif
index 7ed48cd30..7ed48cd30 100644
--- a/sound/direct_sound_samples/wave_67.aif
+++ b/sound/direct_sound_samples/unknown_close_hihat.aif
diff --git a/sound/direct_sound_samples/wave_27.aif b/sound/direct_sound_samples/unknown_cowbell.aif
index 5f3819310..5f3819310 100644
--- a/sound/direct_sound_samples/wave_27.aif
+++ b/sound/direct_sound_samples/unknown_cowbell.aif
diff --git a/sound/direct_sound_samples/wave_28.aif b/sound/direct_sound_samples/unknown_djembe.aif
index 2e67f1d73..2e67f1d73 100644
--- a/sound/direct_sound_samples/wave_28.aif
+++ b/sound/direct_sound_samples/unknown_djembe.aif
diff --git a/sound/direct_sound_samples/wave_32.aif b/sound/direct_sound_samples/unknown_ethnic_drum.aif
index 2cb47ad90..2cb47ad90 100644
--- a/sound/direct_sound_samples/wave_32.aif
+++ b/sound/direct_sound_samples/unknown_ethnic_drum.aif
diff --git a/sound/direct_sound_samples/wave_69.aif b/sound/direct_sound_samples/unknown_polysynth.aif
index 75d17efdf..75d17efdf 100644
--- a/sound/direct_sound_samples/wave_69.aif
+++ b/sound/direct_sound_samples/unknown_polysynth.aif
diff --git a/sound/direct_sound_samples/wave_11.aif b/sound/direct_sound_samples/unknown_snare.aif
index d8a81b503..d8a81b503 100644
--- a/sound/direct_sound_samples/wave_11.aif
+++ b/sound/direct_sound_samples/unknown_snare.aif
diff --git a/sound/direct_sound_samples/wave_51.aif b/sound/direct_sound_samples/unknown_synth_snare.aif
index eec199f07..eec199f07 100644
--- a/sound/direct_sound_samples/wave_51.aif
+++ b/sound/direct_sound_samples/unknown_synth_snare.aif
diff --git a/sound/direct_sound_samples/wave_18.aif b/sound/direct_sound_samples/unknown_tambourine.aif
index 39ec57d29..39ec57d29 100644
--- a/sound/direct_sound_samples/wave_18.aif
+++ b/sound/direct_sound_samples/unknown_tambourine.aif
diff --git a/sound/direct_sound_samples/wave_75.aif b/sound/direct_sound_samples/unknown_tom.aif
index 7d84c7b31..7d84c7b31 100644
--- a/sound/direct_sound_samples/wave_75.aif
+++ b/sound/direct_sound_samples/unknown_tom.aif
diff --git a/sound/direct_sound_samples/wave_44.aif b/sound/direct_sound_samples/unknown_trombone_39.aif
index f8862cebf..f8862cebf 100644
--- a/sound/direct_sound_samples/wave_44.aif
+++ b/sound/direct_sound_samples/unknown_trombone_39.aif
diff --git a/sound/direct_sound_samples/wave_45.aif b/sound/direct_sound_samples/unknown_trombone_51.aif
index 6adda7673..6adda7673 100644
--- a/sound/direct_sound_samples/wave_45.aif
+++ b/sound/direct_sound_samples/unknown_trombone_51.aif
diff --git a/sound/direct_sound_samples/wave_33.aif b/sound/direct_sound_samples/unknown_tsuzumi.aif
index b161f72ee..b161f72ee 100644
--- a/sound/direct_sound_samples/wave_33.aif
+++ b/sound/direct_sound_samples/unknown_tsuzumi.aif
diff --git a/sound/direct_sound_samples/wave_13.aif b/sound/direct_sound_samples/unknown_wood_block_high.aif
index dcae315ec..dcae315ec 100644
--- a/sound/direct_sound_samples/wave_13.aif
+++ b/sound/direct_sound_samples/unknown_wood_block_high.aif
diff --git a/sound/direct_sound_samples/wave_12.aif b/sound/direct_sound_samples/unknown_wood_block_low.aif
index fa33ba810..fa33ba810 100644
--- a/sound/direct_sound_samples/wave_12.aif
+++ b/sound/direct_sound_samples/unknown_wood_block_low.aif
diff --git a/sound/direct_sound_samples/wave_63.aif b/sound/direct_sound_samples/unused_acid_bass.aif
index c2c7e46ec..c2c7e46ec 100644
--- a/sound/direct_sound_samples/wave_63.aif
+++ b/sound/direct_sound_samples/unused_acid_bass.aif
diff --git a/sound/direct_sound_samples/wave_9.aif b/sound/direct_sound_samples/unused_electric_guitar.aif
index 83f997481..83f997481 100644
--- a/sound/direct_sound_samples/wave_9.aif
+++ b/sound/direct_sound_samples/unused_electric_guitar.aif
diff --git a/sound/direct_sound_samples/wave_10.aif b/sound/direct_sound_samples/unused_sc88_unison_slap.aif
index c0ce144f6..c0ce144f6 100644
--- a/sound/direct_sound_samples/wave_10.aif
+++ b/sound/direct_sound_samples/unused_sc88_unison_slap.aif
diff --git a/sound/direct_sound_samples/wave_8.aif b/sound/direct_sound_samples/unused_sd90_oboe.aif
index 2a0ea2a26..2a0ea2a26 100644
--- a/sound/direct_sound_samples/wave_8.aif
+++ b/sound/direct_sound_samples/unused_sd90_oboe.aif
diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc
index abdedcbb5..eb74c7d0e 100644
--- a/sound/voice_groups.inc
+++ b/sound/voice_groups.inc
@@ -9,7 +9,7 @@ voicegroup000:: @ 8489C8C
 	voice_square_2 2, 0, 0, 9, 2 @ 8489CD4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489CE0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489CEC
-	voice_directsound 60, 0, gDirectSoundWaveData_0, 255, 165, 51, 235 @ 8489CF8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 235 @ 8489CF8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489D04
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489D10
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489D1C
@@ -17,7 +17,7 @@ voicegroup000:: @ 8489C8C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489D34
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489D40
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489D4C
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 255, 0, 255, 127 @ 8489D58
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 8489D58
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489D64
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489D70
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489D7C
@@ -32,13 +32,13 @@ voicegroup000:: @ 8489C8C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489DE8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489DF4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489E00
-	voice_directsound 60, 0, gDirectSoundWaveData_2, 255, 253, 0, 149 @ 8489E0C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 149 @ 8489E0C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489E18
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489E24
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489E30
-	voice_directsound 60, 0, gDirectSoundWaveData_3, 255, 235, 128, 115 @ 8489E3C
+	voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 235, 128, 115 @ 8489E3C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489E48
-	voice_directsound 60, 0, gDirectSoundWaveData_4, 255, 252, 0, 115 @ 8489E54
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8489E54
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489E60
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489E6C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489E78
@@ -47,7 +47,7 @@ voicegroup000:: @ 8489C8C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489E9C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489EA8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489EB4
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 204, 193, 239 @ 8489EC0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 204, 193, 239 @ 8489EC0
 	voice_keysplit voicegroup004, KeySplitTable2 @ 8489ECC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489ED8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8489EE4
@@ -92,21 +92,21 @@ voicegroup001:: @ 8489F74
 	voice_square_1 0, 0, 0, 1, 6, 0 @ 848A0A0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A0AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A0B8
-	voice_directsound 60, 0, gDirectSoundWaveData_6, 255, 0, 255, 0 @ 848A0C4
+	voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 @ 848A0C4
 
 voicegroup002:: @ 848A0D0
-	voice_directsound 60, 0, gDirectSoundWaveData_7, 255, 165, 154, 127 @ 848A0D0
-	voice_directsound 60, 0, gDirectSoundWaveData_8, 255, 165, 154, 127 @ 848A0DC
-	voice_directsound 60, 0, gDirectSoundWaveData_9, 255, 165, 206, 127 @ 848A0E8
-	voice_directsound 60, 0, gDirectSoundWaveData_10, 255, 165, 206, 127 @ 848A0F4
-	voice_directsound 60, 0, gDirectSoundWaveData_11, 255, 0, 255, 0 @ 848A100
-	voice_directsound 60, 0, gDirectSoundWaveData_12, 255, 0, 255, 0 @ 848A10C
-	voice_directsound 60, 0, gDirectSoundWaveData_13, 255, 0, 255, 0 @ 848A118
-	voice_directsound_no_resample 60, 64, gDirectSoundWaveData_14, 255, 0, 255, 242 @ 848A124
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 255, 165, 154, 127 @ 848A0D0
+	voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 255, 165, 154, 127 @ 848A0DC
+	voice_directsound 60, 0, DirectSoundWaveData_unused_electric_guitar, 255, 165, 206, 127 @ 848A0E8
+	voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_unison_slap, 255, 165, 206, 127 @ 848A0F4
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_snare, 255, 0, 255, 0 @ 848A100
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_wood_block_low, 255, 0, 255, 0 @ 848A10C
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_wood_block_high, 255, 0, 255, 0 @ 848A118
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_kick, 255, 0, 255, 242 @ 848A124
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A130
-	voice_directsound_no_resample 60, 64, gDirectSoundWaveData_15, 255, 0, 255, 242 @ 848A13C
-	voice_directsound_no_resample 60, 64, gDirectSoundWaveData_16, 255, 255, 255, 127 @ 848A148
-	voice_directsound_no_resample 60, 64, gDirectSoundWaveData_17, 255, 0, 255, 242 @ 848A154
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 848A13C
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 848A148
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 848A154
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A160
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A16C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A178
@@ -120,46 +120,46 @@ voicegroup002:: @ 848A0D0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A1D8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A1E4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A1F0
-	voice_directsound_no_resample 32, 34, gDirectSoundWaveData_18, 255, 127, 77, 204 @ 848A1FC
-	voice_directsound_no_resample 60, 14, gDirectSoundWaveData_19, 255, 235, 0, 165 @ 848A208
+	voice_directsound_no_resample 32, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 848A1FC
+	voice_directsound_no_resample 60, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 235, 0, 165 @ 848A208
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A214
-	voice_directsound_no_resample 30, 54, gDirectSoundWaveData_20, 255, 246, 0, 216 @ 848A220
+	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 246, 0, 216 @ 848A220
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A22C
-	voice_directsound_no_resample 30, 54, gDirectSoundWaveData_20, 255, 246, 0, 216 @ 848A238
-	voice_directsound_no_resample 30, 64, gDirectSoundWaveData_20, 8, 0, 255, 216 @ 848A244
+	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 246, 0, 216 @ 848A238
+	voice_directsound_no_resample 30, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216 @ 848A244
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A250
-	voice_directsound_no_resample 72, 104, gDirectSoundWaveData_21, 255, 0, 255, 0 @ 848A25C
+	voice_directsound_no_resample 72, 104, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 848A25C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A268
-	voice_directsound_no_resample 72, 94, gDirectSoundWaveData_22, 255, 0, 255, 0 @ 848A274
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_23, 255, 0, 255, 0 @ 848A280
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_24, 255, 180, 175, 228 @ 848A28C
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_24, 255, 0, 255, 242 @ 848A298
-	voice_directsound_no_resample 64, 54, gDirectSoundWaveData_16, 255, 255, 255, 127 @ 848A2A4
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_17, 255, 0, 255, 242 @ 848A2B0
-	voice_directsound 64, 24, gDirectSoundWaveData_25, 255, 0, 255, 226 @ 848A2BC
-	voice_directsound_no_resample 64, 80, gDirectSoundWaveData_17, 255, 0, 255, 242 @ 848A2C8
-	voice_directsound 68, 34, gDirectSoundWaveData_25, 255, 0, 255, 226 @ 848A2D4
-	voice_directsound_no_resample 60, 64, gDirectSoundWaveData_15, 255, 0, 255, 242 @ 848A2E0
-	voice_directsound 72, 44, gDirectSoundWaveData_25, 255, 0, 255, 226 @ 848A2EC
+	voice_directsound_no_resample 72, 94, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 848A274
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 848A280
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 848A28C
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 848A298
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 848A2A4
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 848A2B0
+	voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 848A2BC
+	voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 848A2C8
+	voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 848A2D4
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 848A2E0
+	voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 848A2EC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A2F8
-	voice_directsound 76, 84, gDirectSoundWaveData_25, 255, 0, 255, 226 @ 848A304
-	voice_directsound 80, 94, gDirectSoundWaveData_25, 255, 0, 255, 226 @ 848A310
-	voice_directsound_no_resample 33, 89, gDirectSoundWaveData_20, 255, 235, 0, 231 @ 848A31C
-	voice_directsound 84, 104, gDirectSoundWaveData_25, 255, 0, 255, 235 @ 848A328
+	voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 848A304
+	voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 848A310
+	voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 848A31C
+	voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235 @ 848A328
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A334
-	voice_directsound 63, 64, gDirectSoundWaveData_20, 255, 235, 0, 231 @ 848A340
-	voice_directsound_no_resample 64, 24, gDirectSoundWaveData_26, 255, 165, 103, 231 @ 848A34C
-	voice_directsound_no_resample 64, 34, gDirectSoundWaveData_18, 255, 127, 77, 204 @ 848A358
-	voice_directsound_no_resample 64, 14, gDirectSoundWaveData_19, 255, 231, 0, 188 @ 848A364
-	voice_directsound_no_resample 64, 89, gDirectSoundWaveData_27, 255, 0, 255, 242 @ 848A370
-	voice_directsound_no_resample 64, 29, gDirectSoundWaveData_20, 255, 235, 0, 231 @ 848A37C
+	voice_directsound 63, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 848A340
+	voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 848A34C
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 848A358
+	voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 @ 848A364
+	voice_directsound_no_resample 64, 89, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242 @ 848A370
+	voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 848A37C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A388
-	voice_directsound_no_resample 64, 54, gDirectSoundWaveData_20, 255, 235, 0, 231 @ 848A394
-	voice_directsound_no_resample 64, 54, gDirectSoundWaveData_20, 8, 0, 255, 216 @ 848A3A0
-	voice_directsound_no_resample 64, 94, gDirectSoundWaveData_28, 255, 0, 255, 0 @ 848A3AC
-	voice_directsound_no_resample 64, 34, gDirectSoundWaveData_21, 255, 0, 255, 0 @ 848A3B8
-	voice_directsound_no_resample 64, 34, gDirectSoundWaveData_22, 255, 0, 255, 0 @ 848A3C4
-	voice_directsound_no_resample 64, 90, gDirectSoundWaveData_22, 255, 0, 255, 0 @ 848A3D0
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 848A394
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216 @ 848A3A0
+	voice_directsound_no_resample 64, 94, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 848A3AC
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 848A3B8
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 848A3C4
+	voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 848A3D0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A3DC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A3E8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A3F4
@@ -175,32 +175,32 @@ voicegroup002:: @ 848A0D0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A46C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A478
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A484
-	voice_directsound_no_resample 64, 39, gDirectSoundWaveData_29, 255, 242, 103, 188 @ 848A490
-	voice_directsound_no_resample 64, 79, gDirectSoundWaveData_29, 255, 242, 103, 188 @ 848A49C
-	voice_directsound_no_resample 64, 39, gDirectSoundWaveData_29, 255, 165, 103, 188 @ 848A4A8
-	voice_directsound_no_resample 64, 24, gDirectSoundWaveData_30, 255, 0, 255, 0 @ 848A4B4
+	voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 848A490
+	voice_directsound_no_resample 64, 79, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 848A49C
+	voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188 @ 848A4A8
+	voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 848A4B4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A4C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A4CC
-	voice_directsound_no_resample 64, 104, gDirectSoundWaveData_31, 255, 0, 255, 0 @ 848A4D8
-	voice_directsound 63, 64, gDirectSoundWaveData_32, 255, 0, 255, 0 @ 848A4E4
-	voice_directsound 50, 84, gDirectSoundWaveData_33, 255, 0, 255, 0 @ 848A4F0
-	voice_directsound 64, 84, gDirectSoundWaveData_33, 255, 0, 255, 0 @ 848A4FC
+	voice_directsound_no_resample 64, 104, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 848A4D8
+	voice_directsound 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 848A4E4
+	voice_directsound 50, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 848A4F0
+	voice_directsound 64, 84, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 848A4FC
 
 voicegroup003:: @ 848A508
-	voice_directsound 60, 0, gDirectSoundWaveData_34, 255, 252, 0, 239 @ 848A508
-	voice_directsound 60, 0, gDirectSoundWaveData_35, 255, 250, 0, 221 @ 848A514
-	voice_directsound 60, 0, gDirectSoundWaveData_36, 255, 250, 0, 221 @ 848A520
-	voice_directsound 60, 0, gDirectSoundWaveData_37, 255, 247, 0, 221 @ 848A52C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_piano1_48, 255, 252, 0, 239 @ 848A508
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_piano1_60, 255, 250, 0, 221 @ 848A514
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_piano1_72, 255, 250, 0, 221 @ 848A520
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_piano1_84, 255, 247, 0, 221 @ 848A52C
 
 voicegroup004:: @ 848A538
-	voice_directsound 60, 0, gDirectSoundWaveData_38, 255, 0, 255, 196 @ 848A538
-	voice_directsound 60, 0, gDirectSoundWaveData_39, 255, 0, 255, 196 @ 848A544
-	voice_directsound 60, 0, gDirectSoundWaveData_40, 255, 0, 255, 196 @ 848A550
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_string_ensemble_60, 255, 0, 255, 196 @ 848A538
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_string_ensemble_72, 255, 0, 255, 196 @ 848A544
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_string_ensemble_84, 255, 0, 255, 196 @ 848A550
 
 voicegroup005:: @ 848A55C
-	voice_directsound 60, 0, gDirectSoundWaveData_41, 255, 0, 193, 127 @ 848A55C
-	voice_directsound 60, 0, gDirectSoundWaveData_42, 255, 0, 193, 127 @ 848A568
-	voice_directsound 60, 0, gDirectSoundWaveData_43, 255, 0, 193, 127 @ 848A574
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_trumpet_60, 255, 0, 193, 127 @ 848A55C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_trumpet_72, 255, 0, 193, 127 @ 848A568
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_trumpet_84, 255, 0, 193, 127 @ 848A574
 	voice_square_1_alt 38, 2, 1, 0, 0, 0 @ 848A580
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A58C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848A598
@@ -331,28 +331,28 @@ voicegroup005:: @ 848A55C
 	voice_square_1_alt 21, 2, 0, 0, 15, 2 @ 848AB74
 
 voicegroup006:: @ 848AB80
-	voice_directsound 60, 0, gDirectSoundWaveData_44, 255, 0, 255, 165 @ 848AB80
-	voice_directsound 60, 0, gDirectSoundWaveData_45, 255, 0, 255, 165 @ 848AB8C
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_trombone_39, 255, 0, 255, 165 @ 848AB80
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_trombone_51, 255, 0, 255, 165 @ 848AB8C
 
 voicegroup007:: @ 848AB98
-	voice_directsound 60, 0, gDirectSoundWaveData_46, 255, 0, 224, 165 @ 848AB98
-	voice_directsound 60, 0, gDirectSoundWaveData_47, 255, 0, 218, 165 @ 848ABA4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_french_horn_60, 255, 0, 224, 165 @ 848AB98
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_french_horn_72, 255, 0, 218, 165 @ 848ABA4
 
 voicegroup008:: @ 848ABB0
 	voice_keysplit_all voicegroup001 @ 848ABB0
 	voice_keysplit voicegroup003, KeySplitTable1 @ 848ABBC
-	voice_directsound 60, 0, gDirectSoundWaveData_63, 255, 178, 180, 165 @ 848ABC8
+	voice_directsound 60, 0, DirectSoundWaveData_unused_acid_bass, 255, 178, 180, 165 @ 848ABC8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848ABD4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848ABE0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848ABEC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848ABF8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848AC04
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848AC10
-	voice_directsound 60, 0, gDirectSoundWaveData_0, 255, 165, 51, 235 @ 848AC1C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 235 @ 848AC1C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848AC28
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848AC34
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848AC40
-	voice_directsound 60, 0, gDirectSoundWaveData_71, 255, 235, 0, 204 @ 848AC4C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 848AC4C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848AC58
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848AC64
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848AC70
@@ -385,8 +385,8 @@ voicegroup008:: @ 848ABB0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848ADB4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848ADC0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848ADCC
-	voice_directsound 60, 0, gDirectSoundWaveData_70, 255, 242, 0, 204 @ 848ADD8
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 246, 0, 226 @ 848ADE4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 204 @ 848ADD8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 848ADE4
 	voice_keysplit voicegroup004, KeySplitTable2 @ 848ADF0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848ADFC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848AE08
@@ -412,7 +412,7 @@ voicegroup008:: @ 848ABB0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848AEF8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848AF04
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848AF10
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 127, 231, 127 @ 848AF1C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 848AF1C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848AF28
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848AF34
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848AF40
@@ -490,7 +490,7 @@ voicegroup009:: @ 848B078
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B288
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B294
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B2A0
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 246, 0, 226 @ 848B2AC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 848B2AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B2B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B2C4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B2D0
@@ -563,7 +563,7 @@ voicegroup010:: @ 848B474
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B5DC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B5E8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B5F4
-	voice_directsound 60, 0, gDirectSoundWaveData_49, 255, 253, 0, 149 @ 848B600
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 848B600
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B60C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B618
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B624
@@ -575,9 +575,9 @@ voicegroup010:: @ 848B474
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B66C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B678
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B684
-	voice_directsound 60, 0, gDirectSoundWaveData_55, 255, 216, 0, 165 @ 848B690
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 848B690
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B69C
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 246, 0, 226 @ 848B6A8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 848B6A8
 	voice_keysplit voicegroup004, KeySplitTable2 @ 848B6B4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B6C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B6CC
@@ -640,7 +640,7 @@ voicegroup011:: @ 848B8B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B960
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B96C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B978
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 255, 0, 255, 127 @ 848B984
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 848B984
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B990
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B99C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848B9A8
@@ -656,7 +656,7 @@ voicegroup011:: @ 848B8B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BA20
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BA2C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BA38
-	voice_directsound 60, 0, gDirectSoundWaveData_49, 255, 253, 0, 149 @ 848BA44
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 848BA44
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BA50
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BA5C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BA68
@@ -669,8 +669,8 @@ voicegroup011:: @ 848B8B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BABC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BAC8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BAD4
-	voice_directsound_no_resample 60, 0, gDirectSoundWaveData_50, 255, 246, 0, 226 @ 848BAE0
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 246, 0, 226 @ 848BAEC
+	voice_directsound_no_resample 60, 0, DirectSoundWaveData_sc88_timpani_with_snare, 255, 246, 0, 226 @ 848BAE0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 848BAEC
 	voice_keysplit voicegroup004, KeySplitTable2 @ 848BAF8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BB04
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BB10
@@ -720,7 +720,7 @@ voicegroup012:: @ 848BCFC
 	voice_keysplit voicegroup003, KeySplitTable1 @ 848BD08
 
 voicegroup127:: @ 848BD14
-	voice_directsound 60, 0, gDirectSoundWaveData_51, 255, 249, 103, 165 @ 848BD14
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_synth_snare, 255, 249, 103, 165 @ 848BD14
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BD20
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BD2C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BD38
@@ -733,8 +733,8 @@ voicegroup127:: @ 848BD14
 	voice_square_1_alt 0, 2, 2, 0, 15, 0 @ 848BD8C
 	voice_square_1_alt 0, 1, 2, 0, 15, 0 @ 848BD98
 	voice_square_1_alt 23, 1, 0, 1, 9, 0 @ 848BDA4
-	voice_directsound 60, 0, gDirectSoundWaveData_52, 255, 0, 255, 165 @ 848BDB0
-	voice_directsound 60, 0, gDirectSoundWaveData_52, 255, 226, 0, 165 @ 848BDBC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 165 @ 848BDB0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 226, 0, 165 @ 848BDBC
 	voice_square_1_alt 0, 2, 0, 6, 0, 1 @ 848BDC8
 	voice_square_1_alt 36, 0, 0, 2, 0, 0 @ 848BDD4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BDE0
@@ -767,7 +767,7 @@ voicegroup127:: @ 848BD14
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BF24
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BF30
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BF3C
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 246, 0, 226 @ 848BF48
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 848BF48
 	voice_keysplit voicegroup004, KeySplitTable2 @ 848BF54
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BF60
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848BF6C
@@ -850,80 +850,80 @@ voicegroup127:: @ 848BD14
 	voice_noise_alt 0, 0, 1, 0, 1 @ 848C308
 
 voicegroup128:: @ 848C314
-	voice_directsound_no_resample 60, 0, gDirectSoundWaveData_53, 255, 249, 0, 165 @ 848C314
-	voice_directsound_alt 60, 0, gDirectSoundWaveData_53, 255, 0, 255, 165 @ 848C320
-	voice_directsound 60, 0, gDirectSoundWaveData_51, 255, 0, 255, 165 @ 848C32C
-	voice_directsound 60, 0, gDirectSoundWaveData_0, 255, 242, 0, 127 @ 848C338
+	voice_directsound_no_resample 60, 0, DirectSoundWaveData_bicycle_bell, 255, 249, 0, 165 @ 848C314
+	voice_directsound_alt 60, 0, DirectSoundWaveData_bicycle_bell, 255, 0, 255, 165 @ 848C320
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_synth_snare, 255, 0, 255, 165 @ 848C32C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 242, 0, 127 @ 848C338
 	voice_noise_alt 0, 0, 1, 0, 1 @ 848C344
 	voice_noise_alt 1, 0, 1, 0, 1 @ 848C350
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 0, 255, 165 @ 848C35C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 255, 165 @ 848C35C
 	voice_square_1_alt 0, 2, 0, 2, 0, 1 @ 848C368
-	voice_directsound 60, 0, gDirectSoundWaveData_54, 255, 0, 255, 165 @ 848C374
-	voice_directsound 60, 0, gDirectSoundWaveData_55, 255, 0, 255, 127 @ 848C380
-	voice_directsound 60, 0, gDirectSoundWaveData_56, 255, 0, 255, 127 @ 848C38C
+	voice_directsound 60, 0, DirectSoundWaveData_wave_54, 255, 0, 255, 165 @ 848C374
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 0, 255, 127 @ 848C380
+	voice_directsound 60, 0, DirectSoundWaveData_wave_56, 255, 0, 255, 127 @ 848C38C
 	voice_noise_alt 1, 0, 2, 0, 0 @ 848C398
 	voice_square_1 103, 3, 2, 7, 0, 0 @ 848C3A4
 	voice_square_2 3, 2, 7, 0, 0 @ 848C3B0
-	voice_directsound 60, 0, gDirectSoundWaveData_52, 255, 226, 0, 127 @ 848C3BC
-	voice_directsound 60, 0, gDirectSoundWaveData_57, 255, 0, 255, 0 @ 848C3C8
-	voice_directsound 60, 0, gDirectSoundWaveData_52, 255, 204, 0, 127 @ 848C3D4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 226, 0, 127 @ 848C3BC
+	voice_directsound 60, 0, DirectSoundWaveData_wave_57, 255, 0, 255, 0 @ 848C3C8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 204, 0, 127 @ 848C3D4
 	voice_square_1_alt 0, 2, 0, 2, 0, 1 @ 848C3E0
-	voice_directsound 60, 0, gDirectSoundWaveData_58, 255, 0, 255, 127 @ 848C3EC
-	voice_directsound 60, 0, gDirectSoundWaveData_52, 255, 0, 255, 127 @ 848C3F8
+	voice_directsound 60, 0, DirectSoundWaveData_wave_58, 255, 0, 255, 127 @ 848C3EC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 127 @ 848C3F8
 	voice_square_1 103, 0, 0, 7, 0, 0 @ 848C404
-	voice_directsound 60, 0, gDirectSoundWaveData_17, 255, 0, 255, 127 @ 848C410
-	voice_directsound 60, 0, gDirectSoundWaveData_59, 255, 0, 255, 127 @ 848C41C
-	voice_directsound 60, 0, gDirectSoundWaveData_60, 255, 0, 255, 127 @ 848C428
-	voice_directsound 60, 0, gDirectSoundWaveData_15, 255, 0, 255, 127 @ 848C434
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 127 @ 848C410
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_wind, 255, 0, 255, 127 @ 848C41C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_bubbles, 255, 0, 255, 127 @ 848C428
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 127 @ 848C434
 	voice_noise_alt 0, 0, 7, 15, 1 @ 848C440
-	voice_directsound 60, 0, gDirectSoundWaveData_61, 255, 0, 255, 127 @ 848C44C
+	voice_directsound 60, 0, DirectSoundWaveData_wave_61, 255, 0, 255, 127 @ 848C44C
 	voice_noise_alt 1, 0, 7, 15, 1 @ 848C458
-	voice_directsound 60, 0, gDirectSoundWaveData_0, 255, 246, 0, 127 @ 848C464
-	voice_directsound 60, 0, gDirectSoundWaveData_62, 255, 0, 255, 127 @ 848C470
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 246, 0, 127 @ 848C464
+	voice_directsound 60, 0, DirectSoundWaveData_wave_62, 255, 0, 255, 127 @ 848C470
 	voice_square_1_alt 19, 2, 0, 2, 0, 0 @ 848C47C
-	voice_directsound 60, 0, gDirectSoundWaveData_63, 255, 0, 255, 127 @ 848C488
+	voice_directsound 60, 0, DirectSoundWaveData_unused_acid_bass, 255, 0, 255, 127 @ 848C488
 	voice_square_1 103, 0, 0, 0, 15, 0 @ 848C494
-	voice_directsound_alt 60, 0, gDirectSoundWaveData_62, 255, 0, 255, 127 @ 848C4A0
-	voice_directsound 60, 0, gDirectSoundWaveData_2, 255, 255, 255, 127 @ 848C4AC
-	voice_directsound 60, 0, gDirectSoundWaveData_4, 255, 0, 255, 127 @ 848C4B8
-	voice_directsound 60, 0, gDirectSoundWaveData_64, 255, 0, 255, 127 @ 848C4C4
-	voice_directsound 60, 0, gDirectSoundWaveData_63, 255, 242, 0, 0 @ 848C4D0
-	voice_directsound 60, 0, gDirectSoundWaveData_65, 255, 0, 255, 0 @ 848C4DC
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 848C4E8
-	voice_directsound 60, 0, gDirectSoundWaveData_67, 255, 127, 0, 188 @ 848C4F4
-	voice_directsound 60, 0, gDirectSoundWaveData_68, 255, 249, 0, 165 @ 848C500
+	voice_directsound_alt 60, 0, DirectSoundWaveData_wave_62, 255, 0, 255, 127 @ 848C4A0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 255, 255, 127 @ 848C4AC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 0, 255, 127 @ 848C4B8
+	voice_directsound 60, 0, DirectSoundWaveData_wave_64, 255, 0, 255, 127 @ 848C4C4
+	voice_directsound 60, 0, DirectSoundWaveData_unused_acid_bass, 255, 242, 0, 0 @ 848C4D0
+	voice_directsound 60, 0, DirectSoundWaveData_wave_65, 255, 0, 255, 0 @ 848C4DC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 848C4E8
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_close_hihat, 255, 127, 0, 188 @ 848C4F4
+	voice_directsound 60, 0, DirectSoundWaveData_wave_68, 255, 249, 0, 165 @ 848C500
 	voice_square_1 0, 0, 4, 6, 0, 0 @ 848C50C
-	voice_directsound 60, 0, gDirectSoundWaveData_0, 13, 0, 255, 127 @ 848C518
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 13, 0, 255, 127 @ 848C524
-	voice_directsound 60, 0, gDirectSoundWaveData_69, 255, 0, 255, 127 @ 848C530
-	voice_directsound 60, 0, gDirectSoundWaveData_70, 255, 252, 0, 204 @ 848C53C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 13, 0, 255, 127 @ 848C518
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 13, 0, 255, 127 @ 848C524
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_polysynth, 255, 0, 255, 127 @ 848C530
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 252, 0, 204 @ 848C53C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848C548
-	voice_directsound 60, 0, gDirectSoundWaveData_71, 255, 235, 0, 204 @ 848C554
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 848C554
 	voice_square_1 0, 0, 4, 0, 15, 0 @ 848C560
-	voice_directsound 60, 0, gDirectSoundWaveData_71, 255, 188, 0, 0 @ 848C56C
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 226, 0, 127 @ 848C578
-	voice_directsound 60, 0, gDirectSoundWaveData_20, 26, 0, 255, 127 @ 848C584
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 188, 0, 0 @ 848C56C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 226, 0, 127 @ 848C578
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 26, 0, 255, 127 @ 848C584
 	voice_square_1_alt 0, 2, 0, 1, 0, 0 @ 848C590
-	voice_directsound 60, 0, gDirectSoundWaveData_0, 255, 252, 0, 127 @ 848C59C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 252, 0, 127 @ 848C59C
 	voice_square_1_alt 0, 1, 0, 2, 0, 0 @ 848C5A8
-	voice_directsound 60, 0, gDirectSoundWaveData_55, 255, 127, 0, 127 @ 848C5B4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 127, 0, 127 @ 848C5B4
 	voice_noise_alt 0, 1, 6, 0, 0 @ 848C5C0
-	voice_directsound 60, 0, gDirectSoundWaveData_3, 255, 255, 255, 127 @ 848C5CC
-	voice_directsound 60, 0, gDirectSoundWaveData_16, 255, 255, 255, 127 @ 848C5D8
-	voice_directsound 60, 0, gDirectSoundWaveData_72, 255, 255, 255, 127 @ 848C5E4
-	voice_directsound 60, 0, gDirectSoundWaveData_47, 11, 242, 0, 127 @ 848C5F0
+	voice_directsound 60, 0, DirectSoundWaveData_jv1080_slap_bass, 255, 255, 255, 127 @ 848C5CC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 848C5D8
+	voice_directsound 60, 0, DirectSoundWaveData_wave_72, 255, 255, 255, 127 @ 848C5E4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_french_horn_72, 11, 242, 0, 127 @ 848C5F0
 	voice_square_1_alt 0, 2, 4, 6, 0, 0 @ 848C5FC
-	voice_directsound 60, 0, gDirectSoundWaveData_73, 255, 255, 255, 127 @ 848C608
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 255, 0, 255, 165 @ 848C614
-	voice_directsound 60, 0, gDirectSoundWaveData_75, 255, 0, 255, 165 @ 848C620
+	voice_directsound 60, 0, DirectSoundWaveData_wave_73, 255, 255, 255, 127 @ 848C608
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 848C614
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_tom, 255, 0, 255, 165 @ 848C620
 	voice_noise_alt 0, 5, 7, 15, 1 @ 848C62C
-	voice_directsound 60, 0, gDirectSoundWaveData_52, 128, 242, 0, 165 @ 848C638
-	voice_directsound 60, 0, gDirectSoundWaveData_39, 255, 0, 255, 165 @ 848C644
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 128, 242, 0, 165 @ 848C638
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_string_ensemble_72, 255, 0, 255, 165 @ 848C644
 	voice_square_1 0, 0, 1, 5, 0, 0 @ 848C650
 	voice_noise_alt 0, 6, 6, 0, 1 @ 848C65C
 	voice_noise_alt 0, 3, 6, 0, 1 @ 848C668
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848C674
-	voice_directsound 60, 0, gDirectSoundWaveData_63, 15, 127, 231, 127 @ 848C680
+	voice_directsound 60, 0, DirectSoundWaveData_unused_acid_bass, 15, 127, 231, 127 @ 848C680
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848C68C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848C698
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848C6A4
@@ -1761,17 +1761,17 @@ gCryTable2:: @ 848DB44
 
 voicegroup129:: @ 848ED74
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848ED74
-	voice_directsound 60, 0, gDirectSoundWaveData_21, 255, 0, 255, 0 @ 848ED80
-	voice_directsound 60, 0, gDirectSoundWaveData_22, 255, 0, 255, 0 @ 848ED8C
-	voice_directsound 60, 0, gDirectSoundWaveData_16, 255, 226, 25, 0 @ 848ED98
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 848ED80
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 848ED8C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_standard_hand_clap, 255, 226, 25, 0 @ 848ED98
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EDA4
-	voice_directsound 60, 0, gDirectSoundWaveData_54, 255, 0, 255, 165 @ 848EDB0
-	voice_directsound 60, 0, gDirectSoundWaveData_26, 255, 165, 103, 231 @ 848EDBC
-	voice_directsound 60, 0, gDirectSoundWaveData_29, 255, 204, 128, 249 @ 848EDC8
-	voice_directsound 60, 0, gDirectSoundWaveData_76, 255, 0, 255, 76 @ 848EDD4
-	voice_directsound 60, 0, gDirectSoundWaveData_77, 255, 0, 206, 204 @ 848EDE0
-	voice_directsound 60, 0, gDirectSoundWaveData_12, 255, 0, 206, 38 @ 848EDEC
-	voice_directsound 60, 0, gDirectSoundWaveData_13, 255, 0, 206, 0 @ 848EDF8
+	voice_directsound 60, 0, DirectSoundWaveData_wave_54, 255, 0, 255, 165 @ 848EDB0
+	voice_directsound 60, 0, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 848EDBC
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_high, 255, 204, 128, 249 @ 848EDC8
+	voice_directsound 60, 0, DirectSoundWaveData_register_noise, 255, 0, 255, 76 @ 848EDD4
+	voice_directsound 60, 0, DirectSoundWaveData_wave_77, 255, 0, 206, 204 @ 848EDE0
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_wood_block_low, 255, 0, 206, 38 @ 848EDEC
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_wood_block_high, 255, 0, 206, 0 @ 848EDF8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EE04
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EE10
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EE1C
@@ -1784,14 +1784,14 @@ voicegroup129:: @ 848ED74
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EE70
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EE7C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EE88
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 255, 165, 128, 204 @ 848EE94
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 848EE94
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EEA0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EEAC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EEB8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EEC4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EED0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EEDC
-	voice_directsound 60, 0, gDirectSoundWaveData_79, 255, 0, 255, 165 @ 848EEE8
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 848EEE8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EEF4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EF00
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EF0C
@@ -1806,9 +1806,9 @@ voicegroup129:: @ 848ED74
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EF78
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EF84
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EF90
-	voice_directsound 60, 0, gDirectSoundWaveData_70, 255, 252, 0, 204 @ 848EF9C
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 255, 0, 255, 165 @ 848EFA8
-	voice_directsound 60, 0, gDirectSoundWaveData_52, 255, 204, 0, 127 @ 848EFB4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 252, 0, 204 @ 848EF9C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 848EFA8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 204, 0, 127 @ 848EFB4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EFC0
 	voice_square_1_alt 0, 2, 0, 0, 15, 0 @ 848EFCC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848EFD8
@@ -1911,7 +1911,7 @@ voicegroup130:: @ 848F374
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848F44C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848F458
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848F464
-	voice_directsound 60, 0, gDirectSoundWaveData_80, 255, 249, 25, 248 @ 848F470
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion_duplicate, 255, 249, 25, 248 @ 848F470
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848F47C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848F488
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848F494
@@ -2022,7 +2022,7 @@ voicegroup130:: @ 848F374
 voicegroup131:: @ 848F974
 	voice_keysplit_all voicegroup002 @ 848F974
 	voice_keysplit voicegroup003, KeySplitTable1 @ 848F980
-	voice_directsound 60, 0, gDirectSoundWaveData_81, 128, 204, 51, 242 @ 848F98C
+	voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 128, 204, 51, 242 @ 848F98C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848F998
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848F9A4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848F9B0
@@ -2044,7 +2044,7 @@ voicegroup131:: @ 848F974
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848FA70
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848FA7C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848FA88
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 128, 204, 103, 226 @ 848FA94
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 204, 103, 226 @ 848FA94
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848FAA0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848FAAC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848FAB8
@@ -2164,17 +2164,17 @@ voicegroup132:: @ 848FF74
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 848FFF8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490004
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490010
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 97, 236 @ 849001C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 97, 236 @ 849001C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490028
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490034
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 128, 146, 118, 137 @ 8490040
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 118, 137 @ 8490040
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849004C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490058
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490064
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490070
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849007C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490088
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 51, 204, 92, 226 @ 8490094
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 51, 204, 92, 226 @ 8490094
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84900A0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84900AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84900B8
@@ -2197,7 +2197,7 @@ voicegroup132:: @ 848FF74
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490184
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490190
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849019C
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 165, 154, 235 @ 84901A8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 165, 154, 235 @ 84901A8
 	voice_keysplit voicegroup004, KeySplitTable2 @ 84901B4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84901C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84901CC
@@ -2223,7 +2223,7 @@ voicegroup132:: @ 848FF74
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84902BC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84902C8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84902D4
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 127, 231, 127 @ 84902E0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 84902E0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84902EC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84902F8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490304
@@ -2290,27 +2290,27 @@ voicegroup133:: @ 8490574
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84905C8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84905D4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84905E0
-	voice_directsound 60, 0, gDirectSoundWaveData_31, 255, 0, 255, 0 @ 84905EC
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 84905EC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84905F8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490604
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490610
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 849061C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 849061C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490628
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490634
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 128, 146, 108, 137 @ 8490640
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 108, 137 @ 8490640
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849064C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490658
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490664
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490670
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849067C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490688
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 128, 204, 103, 226 @ 8490694
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 204, 103, 226 @ 8490694
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84906A0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84906AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84906B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84906C4
-	voice_directsound 60, 0, gDirectSoundWaveData_82, 255, 0, 255, 127 @ 84906D0
-	voice_directsound 60, 0, gDirectSoundWaveData_83, 255, 0, 255, 127 @ 84906DC
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 84906D0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 84906DC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84906E8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84906F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490700
@@ -2318,8 +2318,8 @@ voicegroup133:: @ 8490574
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490718
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490724
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490730
-	voice_directsound 60, 0, gDirectSoundWaveData_4, 255, 252, 0, 115 @ 849073C
-	voice_directsound 60, 0, gDirectSoundWaveData_52, 255, 0, 255, 127 @ 8490748
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 849073C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 127 @ 8490748
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490754
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490760
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849076C
@@ -2327,7 +2327,7 @@ voicegroup133:: @ 8490574
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490784
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490790
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849079C
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 0, 193, 153 @ 84907A8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 153 @ 84907A8
 	voice_keysplit voicegroup004, KeySplitTable2 @ 84907B4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84907C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84907CC
@@ -2342,7 +2342,7 @@ voicegroup133:: @ 8490574
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490838
 	voice_keysplit voicegroup007, KeySplitTable5 @ 8490844
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490850
-	voice_directsound 60, 0, gDirectSoundWaveData_84, 255, 0, 255, 127 @ 849085C
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 @ 849085C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490868
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490874
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490880
@@ -2358,7 +2358,7 @@ voicegroup133:: @ 8490574
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84908F8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490904
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490910
-	voice_directsound 60, 0, gDirectSoundWaveData_85, 255, 0, 255, 127 @ 849091C
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 849091C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490928
 	voice_square_1_alt 0, 1, 0, 1, 9, 0 @ 8490934
 	voice_square_2_alt 3, 0, 2, 9, 1 @ 8490940
@@ -2400,7 +2400,7 @@ voicegroup133:: @ 8490574
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490AF0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490AFC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490B08
-	voice_directsound 60, 0, gDirectSoundWaveData_79, 255, 0, 255, 165 @ 8490B14
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 8490B14
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490B20
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490B2C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490B38
@@ -2457,7 +2457,7 @@ voicegroup134:: @ 8490B74
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490D84
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490D90
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490D9C
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 246, 0, 226 @ 8490DA8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 8490DA8
 	voice_keysplit voicegroup004, KeySplitTable2 @ 8490DB4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490DC0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8490DCC
@@ -2523,7 +2523,7 @@ voicegroup135:: @ 8490FAC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491084
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491090
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849109C
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 85, 137, 180, 204 @ 84910A8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 85, 137, 180, 204 @ 84910A8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84910B4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84910C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84910CC
@@ -2616,8 +2616,8 @@ voicegroup136:: @ 8491390
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84914C8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84914D4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84914E0
-	voice_directsound 60, 0, gDirectSoundWaveData_82, 255, 0, 255, 127 @ 84914EC
-	voice_directsound 60, 0, gDirectSoundWaveData_83, 255, 0, 255, 127 @ 84914F8
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 84914EC
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 84914F8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491504
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491510
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849151C
@@ -2625,7 +2625,7 @@ voicegroup136:: @ 8491390
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491534
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491540
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849154C
-	voice_directsound 60, 0, gDirectSoundWaveData_4, 255, 252, 0, 115 @ 8491558
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8491558
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491564
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491570
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849157C
@@ -2649,7 +2649,7 @@ voicegroup136:: @ 8491390
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491654
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491660
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849166C
-	voice_directsound 60, 0, gDirectSoundWaveData_84, 255, 0, 255, 127 @ 8491678
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 @ 8491678
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491684
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491690
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849169C
@@ -2721,17 +2721,17 @@ voicegroup137:: @ 8491990
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849199C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84919A8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84919B4
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 255, 165, 180, 165 @ 84919C0
-	voice_directsound 60, 0, gDirectSoundWaveData_87, 255, 137, 154, 165 @ 84919CC
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 165, 180, 165 @ 84919C0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 137, 154, 165 @ 84919CC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84919D8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84919E4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84919F0
-	voice_directsound 60, 0, gDirectSoundWaveData_0, 255, 204, 51, 242 @ 84919FC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 204, 51, 242 @ 84919FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491A08
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491A14
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491A20
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491A2C
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 8491A38
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8491A38
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491A44
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491A50
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491A5C
@@ -2763,8 +2763,8 @@ voicegroup137:: @ 8491990
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491B94
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491BA0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491BAC
-	voice_directsound 60, 0, gDirectSoundWaveData_70, 255, 242, 0, 242 @ 8491BB8
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 0, 193, 153 @ 8491BC4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 0, 242 @ 8491BB8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 153 @ 8491BC4
 	voice_keysplit voicegroup004, KeySplitTable2 @ 8491BD0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491BDC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491BE8
@@ -2851,8 +2851,8 @@ voicegroup138:: @ 8491F90
 	voice_keysplit voicegroup003, KeySplitTable1 @ 8491F9C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491FA8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491FB4
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 255, 188, 128, 226 @ 8491FC0
-	voice_directsound 60, 65, gDirectSoundWaveData_87, 255, 204, 77, 246 @ 8491FCC
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 8491FC0
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 @ 8491FCC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491FD8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491FE4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8491FF0
@@ -2864,14 +2864,14 @@ voicegroup138:: @ 8491F90
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492038
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492044
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492050
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 255, 76, 133, 137 @ 849205C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 849205C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492068
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492074
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492080
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 64, 188, 108, 165 @ 849208C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 849208C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492098
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84920A4
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 255, 249, 25, 127 @ 84920B0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 84920B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84920BC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84920C8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84920D4
@@ -2893,7 +2893,7 @@ voicegroup138:: @ 8491F90
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492194
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84921A0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84921AC
-	voice_directsound 60, 0, gDirectSoundWaveData_70, 255, 246, 0, 235 @ 84921B8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 84921B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84921C4
 	voice_keysplit voicegroup004, KeySplitTable2 @ 84921D0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84921DC
@@ -2920,7 +2920,7 @@ voicegroup138:: @ 8491F90
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84922D8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84922E4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84922F0
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 127, 231, 127 @ 84922FC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 84922FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492308
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492314
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492320
@@ -2986,22 +2986,22 @@ voicegroup139:: @ 8492590
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84925D8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84925E4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84925F0
-	voice_directsound 60, 0, gDirectSoundWaveData_0, 255, 165, 51, 242 @ 84925FC
-	voice_directsound 60, 0, gDirectSoundWaveData_31, 255, 0, 255, 0 @ 8492608
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 242 @ 84925FC
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 8492608
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492614
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492620
-	voice_directsound 60, 0, gDirectSoundWaveData_71, 255, 235, 0, 204 @ 849262C
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 8492638
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 849262C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8492638
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492644
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492650
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 128, 127, 103, 201 @ 849265C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 127, 103, 201 @ 849265C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492668
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492674
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492680
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 37, 127, 77, 165 @ 849268C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 37, 127, 77, 165 @ 849268C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492698
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84926A4
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 51, 204, 92, 226 @ 84926B0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 51, 204, 92, 226 @ 84926B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84926BC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84926C8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84926D4
@@ -3023,7 +3023,7 @@ voicegroup139:: @ 8492590
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492794
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84927A0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84927AC
-	voice_directsound 60, 0, gDirectSoundWaveData_70, 255, 242, 51, 226 @ 84927B8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 226 @ 84927B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84927C4
 	voice_keysplit voicegroup004, KeySplitTable2 @ 84927D0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84927DC
@@ -3050,12 +3050,12 @@ voicegroup139:: @ 8492590
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84928D8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84928E4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84928F0
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 0, 255, 165 @ 84928FC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 84928FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492908
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492914
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492920
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849292C
-	voice_directsound 60, 0, gDirectSoundWaveData_85, 255, 0, 255, 127 @ 8492938
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 8492938
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492944
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492950
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849295C
@@ -3126,18 +3126,18 @@ voicegroup141:: @ 8492BC0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492C38
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492C44
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492C50
-	voice_directsound 60, 0, gDirectSoundWaveData_71, 255, 235, 0, 204 @ 8492C5C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 8492C5C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492C68
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492C74
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492C80
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 255, 76, 133, 137 @ 8492C8C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 8492C8C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492C98
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492CA4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492CB0
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 64, 188, 108, 165 @ 8492CBC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 8492CBC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492CC8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492CD4
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 85, 249, 25, 127 @ 8492CE0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 85, 249, 25, 127 @ 8492CE0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492CEC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492CF8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492D04
@@ -3186,7 +3186,7 @@ voicegroup141:: @ 8492BC0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492F08
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492F14
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492F20
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 0, 255, 165 @ 8492F2C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8492F2C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492F38
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492F44
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8492F50
@@ -3260,20 +3260,20 @@ voicegroup142:: @ 84931C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493268
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493274
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493280
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 64, 188, 128, 201 @ 849328C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 64, 188, 128, 201 @ 849328C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493298
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84932A4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84932B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84932BC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84932C8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84932D4
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 64, 195, 103, 220 @ 84932E0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 64, 195, 103, 220 @ 84932E0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84932EC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84932F8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493304
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493310
-	voice_directsound 60, 0, gDirectSoundWaveData_82, 128, 195, 72, 127 @ 849331C
-	voice_directsound 60, 0, gDirectSoundWaveData_83, 85, 188, 103, 160 @ 8493328
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 195, 72, 127 @ 849331C
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 85, 188, 103, 160 @ 8493328
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493334
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493340
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849334C
@@ -3281,7 +3281,7 @@ voicegroup142:: @ 84931C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493364
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493370
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849337C
-	voice_directsound 60, 0, gDirectSoundWaveData_4, 128, 188, 77, 115 @ 8493388
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 128, 188, 77, 115 @ 8493388
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493394
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84933A0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84933AC
@@ -3305,7 +3305,7 @@ voicegroup142:: @ 84931C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493484
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493490
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849349C
-	voice_directsound 60, 0, gDirectSoundWaveData_84, 255, 175, 154, 127 @ 84934A8
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 175, 154, 127 @ 84934A8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84934B4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84934C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84934CC
@@ -3346,14 +3346,14 @@ voicegroup143:: @ 84935B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493658
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493664
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493670
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 128, 160, 123, 165 @ 849367C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 160, 123, 165 @ 849367C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493688
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493694
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84936A0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84936AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84936B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84936C4
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 255, 249, 25, 0 @ 84936D0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 0 @ 84936D0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84936DC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84936E8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84936F4
@@ -3476,14 +3476,14 @@ voicegroup144:: @ 8493BB0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493C58
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493C64
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493C70
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 85, 188, 92, 165 @ 8493C7C
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 85, 127, 180, 165 @ 8493C88
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 85, 188, 92, 165 @ 8493C7C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 85, 127, 180, 165 @ 8493C88
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493C94
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493CA0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493CAC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493CB8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493CC4
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 51, 204, 92, 226 @ 8493CD0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 51, 204, 92, 226 @ 8493CD0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493CDC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493CE8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493CF4
@@ -3494,10 +3494,10 @@ voicegroup144:: @ 8493BB0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493D30
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493D3C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493D48
-	voice_directsound 60, 0, gDirectSoundWaveData_2, 255, 253, 0, 216 @ 8493D54
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 216 @ 8493D54
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493D60
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493D6C
-	voice_directsound 60, 0, gDirectSoundWaveData_4, 255, 252, 0, 115 @ 8493D78
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8493D78
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493D84
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493D90
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8493D9C
@@ -3593,8 +3593,8 @@ voicegroup145:: @ 84941B0
 	voice_keysplit voicegroup003, KeySplitTable1 @ 84941BC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84941C8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84941D4
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 255, 188, 128, 226 @ 84941E0
-	voice_directsound 60, 65, gDirectSoundWaveData_87, 255, 204, 77, 246 @ 84941EC
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 84941E0
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 @ 84941EC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84941F8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494204
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494210
@@ -3606,14 +3606,14 @@ voicegroup145:: @ 84941B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494258
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494264
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494270
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 255, 76, 133, 137 @ 849427C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 849427C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494288
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494294
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84942A0
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 64, 188, 108, 165 @ 84942AC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 84942AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84942B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84942C4
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 255, 249, 25, 127 @ 84942D0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 84942D0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84942DC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84942E8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84942F4
@@ -3635,7 +3635,7 @@ voicegroup145:: @ 84941B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84943B4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84943C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84943CC
-	voice_directsound 60, 0, gDirectSoundWaveData_70, 255, 246, 0, 235 @ 84943D8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 84943D8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84943E4
 	voice_keysplit voicegroup004, KeySplitTable2 @ 84943F0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84943FC
@@ -3662,7 +3662,7 @@ voicegroup145:: @ 84941B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84944F8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494504
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494510
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 127, 231, 127 @ 849451C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 849451C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494528
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494534
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494540
@@ -3720,7 +3720,7 @@ voicegroup145:: @ 84941B0
 
 voicegroup146:: @ 84947B0
 	voice_keysplit_all voicegroup002 @ 84947B0
-	voice_directsound 60, 0, gDirectSoundWaveData_81, 255, 165, 103, 235 @ 84947BC
+	voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 255, 165, 103, 235 @ 84947BC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84947C8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84947D4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84947E0
@@ -3732,7 +3732,7 @@ voicegroup146:: @ 84947B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494828
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494834
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494840
-	voice_directsound 60, 0, gDirectSoundWaveData_71, 255, 235, 0, 204 @ 849484C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 849484C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494858
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494864
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494870
@@ -3743,7 +3743,7 @@ voicegroup146:: @ 84947B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84948AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84948B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84948C4
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 85, 249, 25, 226 @ 84948D0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 85, 249, 25, 226 @ 84948D0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84948DC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84948E8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84948F4
@@ -3797,7 +3797,7 @@ voicegroup146:: @ 84947B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494B34
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494B40
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494B4C
-	voice_directsound 60, 0, gDirectSoundWaveData_85, 43, 76, 103, 216 @ 8494B58
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 43, 76, 103, 216 @ 8494B58
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494B64
 	voice_square_2_alt 2, 0, 2, 4, 4 @ 8494B70
 	voice_square_1_alt 0, 2, 0, 0, 15, 0 @ 8494B7C
@@ -3873,7 +3873,7 @@ voicegroup147:: @ 8494DB0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494EAC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494EB8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494EC4
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 64, 249, 25, 226 @ 8494ED0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 64, 249, 25, 226 @ 8494ED0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494EDC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494EE8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8494EF4
@@ -3948,8 +3948,8 @@ voicegroup148:: @ 84951A0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495218
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495224
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495230
-	voice_directsound 60, 0, gDirectSoundWaveData_52, 255, 226, 0, 127 @ 849523C
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 8495248
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 226, 0, 127 @ 849523C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8495248
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495254
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495260
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849526C
@@ -3974,7 +3974,7 @@ voicegroup148:: @ 84951A0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495350
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849535C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495368
-	voice_directsound 60, 0, gDirectSoundWaveData_52, 255, 0, 255, 127 @ 8495374
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 127 @ 8495374
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495380
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849538C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495398
@@ -4074,12 +4074,12 @@ voicegroup149:: @ 84957A0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84957E8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84957F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495800
-	voice_directsound 60, 0, gDirectSoundWaveData_0, 255, 165, 51, 242 @ 849580C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 242 @ 849580C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495818
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495824
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495830
-	voice_directsound 60, 0, gDirectSoundWaveData_71, 255, 235, 0, 204 @ 849583C
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 8495848
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 849583C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8495848
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495854
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495860
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849586C
@@ -4111,8 +4111,8 @@ voicegroup149:: @ 84957A0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84959A4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84959B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84959BC
-	voice_directsound 60, 0, gDirectSoundWaveData_70, 255, 246, 0, 235 @ 84959C8
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 165, 154, 153 @ 84959D4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 84959C8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 165, 154, 153 @ 84959D4
 	voice_keysplit voicegroup004, KeySplitTable2 @ 84959E0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84959EC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84959F8
@@ -4133,12 +4133,12 @@ voicegroup149:: @ 84957A0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495AAC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495AB8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495AC4
-	voice_directsound 60, 0, gDirectSoundWaveData_7, 43, 188, 103, 165 @ 8495AD0
-	voice_directsound 60, 0, gDirectSoundWaveData_8, 43, 165, 103, 165 @ 8495ADC
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 43, 188, 103, 165 @ 8495AD0
+	voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 43, 165, 103, 165 @ 8495ADC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495AE8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495AF4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495B00
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 127, 231, 127 @ 8495B0C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 8495B0C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495B18
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495B24
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495B30
@@ -4161,7 +4161,7 @@ voicegroup149:: @ 84957A0
 
 voicegroup150:: @ 8495BFC
 	voice_keysplit_all voicegroup002 @ 8495BFC
-	voice_directsound 60, 0, gDirectSoundWaveData_81, 255, 165, 103, 235 @ 8495C08
+	voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 255, 165, 103, 235 @ 8495C08
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495C14
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495C20
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495C2C
@@ -4238,7 +4238,7 @@ voicegroup150:: @ 8495BFC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495F80
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495F8C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495F98
-	voice_directsound 60, 0, gDirectSoundWaveData_85, 85, 204, 77, 127 @ 8495FA4
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 85, 204, 77, 127 @ 8495FA4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8495FB0
 	voice_square_2_alt 1, 0, 1, 4, 6 @ 8495FBC
 	voice_square_1_alt 0, 1, 0, 2, 4, 5 @ 8495FC8
@@ -4304,7 +4304,7 @@ voicegroup151:: @ 84961FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496280
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849628C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496298
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 84962A4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 84962A4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84962B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84962BC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84962C8
@@ -4337,7 +4337,7 @@ voicegroup151:: @ 84961FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849640C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496418
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496424
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 0, 193, 127 @ 8496430
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 127 @ 8496430
 	voice_keysplit voicegroup004, KeySplitTable2 @ 849643C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496448
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496454
@@ -4394,17 +4394,17 @@ voicegroup152:: @ 849661C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84966A0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84966AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84966B8
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 97, 236 @ 84966C4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 97, 236 @ 84966C4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84966D0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84966DC
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 128, 160, 175, 165 @ 84966E8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 160, 175, 165 @ 84966E8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84966F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496700
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849670C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496718
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496724
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496730
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 255, 165, 128, 204 @ 849673C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 849673C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496748
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496754
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496760
@@ -4427,7 +4427,7 @@ voicegroup152:: @ 849661C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849682C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496838
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496844
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 127, 154, 235 @ 8496850
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 127, 154, 235 @ 8496850
 	voice_keysplit voicegroup004, KeySplitTable2 @ 849685C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496868
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496874
@@ -4524,7 +4524,7 @@ voicegroup153:: @ 8496C1C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496CA0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496CAC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496CB8
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 97, 236 @ 8496CC4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 97, 236 @ 8496CC4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496CD0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496CDC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496CE8
@@ -4556,8 +4556,8 @@ voicegroup153:: @ 8496C1C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496E20
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496E2C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496E38
-	voice_directsound 60, 0, gDirectSoundWaveData_70, 255, 246, 0, 235 @ 8496E44
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 127, 154, 235 @ 8496E50
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 8496E44
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 127, 154, 235 @ 8496E50
 	voice_keysplit voicegroup004, KeySplitTable2 @ 8496E5C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496E68
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496E74
@@ -4583,7 +4583,7 @@ voicegroup153:: @ 8496C1C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496F64
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496F70
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496F7C
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 127, 231, 127 @ 8496F88
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 8496F88
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496F94
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496FA0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8496FAC
@@ -4644,7 +4644,7 @@ voicegroup154:: @ 849721C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497228
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497234
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497240
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 255, 249, 0, 165 @ 849724C
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 849724C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497258
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497264
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497270
@@ -4654,7 +4654,7 @@ voicegroup154:: @ 849721C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84972A0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84972AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84972B8
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 97, 236 @ 84972C4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 97, 236 @ 84972C4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84972D0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84972DC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84972E8
@@ -4687,7 +4687,7 @@ voicegroup154:: @ 849721C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849742C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497438
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497444
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 127, 154, 235 @ 8497450
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 127, 154, 235 @ 8497450
 	voice_keysplit voicegroup004, KeySplitTable2 @ 849745C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497468
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497474
@@ -4739,8 +4739,8 @@ voicegroup155:: @ 8497678
 	voice_keysplit voicegroup003, KeySplitTable1 @ 8497684
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497690
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849769C
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 255, 249, 0, 165 @ 84976A8
-	voice_directsound 60, 0, gDirectSoundWaveData_87, 255, 188, 103, 165 @ 84976B4
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 84976A8
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 188, 103, 165 @ 84976B4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84976C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84976CC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84976D8
@@ -4749,23 +4749,23 @@ voicegroup155:: @ 8497678
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84976FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497708
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497714
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 8497720
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8497720
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849772C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497738
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 255, 0, 255, 127 @ 8497744
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 8497744
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497750
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849775C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497768
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497774
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497780
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849778C
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 128, 249, 25, 127 @ 8497798
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 255, 165, 128, 204 @ 84977A4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 8497798
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 84977A4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84977B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84977BC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84977C8
-	voice_directsound 60, 0, gDirectSoundWaveData_82, 255, 0, 255, 127 @ 84977D4
-	voice_directsound 60, 0, gDirectSoundWaveData_83, 255, 165, 154, 165 @ 84977E0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 84977D4
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 165, 154, 165 @ 84977E0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84977EC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84977F8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497804
@@ -4782,7 +4782,7 @@ voicegroup155:: @ 8497678
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497888
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497894
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84978A0
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 246, 0, 226 @ 84978AC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 84978AC
 	voice_keysplit voicegroup004, KeySplitTable2 @ 84978B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84978C4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84978D0
@@ -4797,7 +4797,7 @@ voicegroup155:: @ 8497678
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849793C
 	voice_keysplit voicegroup007, KeySplitTable5 @ 8497948
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497954
-	voice_directsound 60, 0, gDirectSoundWaveData_84, 255, 165, 180, 165 @ 8497960
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 165, 180, 165 @ 8497960
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849796C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497978
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497984
@@ -4855,7 +4855,7 @@ voicegroup155:: @ 8497678
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497BF4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497C00
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497C0C
-	voice_directsound 60, 0, gDirectSoundWaveData_79, 255, 0, 255, 165 @ 8497C18
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 8497C18
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497C24
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497C30
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497C3C
@@ -4870,7 +4870,7 @@ voicegroup156:: @ 8497C78
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497C90
 	voice_programmable_wave_alt gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 8497C9C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497CA8
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 255, 249, 0, 165 @ 8497CB4
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 8497CB4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497CC0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497CCC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497CD8
@@ -4882,26 +4882,26 @@ voicegroup156:: @ 8497C78
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497D20
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497D2C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497D38
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 255, 0, 255, 127 @ 8497D44
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 8497D44
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497D50
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497D5C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497D68
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 255, 0, 255, 165 @ 8497D74
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 8497D74
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497D80
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497D8C
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 255, 165, 128, 204 @ 8497D98
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 8497D98
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497DA4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497DB0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497DBC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497DC8
-	voice_directsound 60, 0, gDirectSoundWaveData_82, 255, 0, 255, 127 @ 8497DD4
-	voice_directsound 60, 0, gDirectSoundWaveData_83, 255, 0, 255, 127 @ 8497DE0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 8497DD4
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 8497DE0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497DEC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497DF8
 	voice_square_2_alt 3, 0, 4, 4, 4 @ 8497E04
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497E10
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497E1C
-	voice_directsound 60, 0, gDirectSoundWaveData_10, 255, 165, 180, 216 @ 8497E28
+	voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_unison_slap, 255, 165, 180, 216 @ 8497E28
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497E34
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497E40
 	voice_square_2_alt 1, 0, 1, 7, 5 @ 8497E4C
@@ -4927,7 +4927,7 @@ voicegroup156:: @ 8497C78
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497F3C
 	voice_keysplit voicegroup007, KeySplitTable5 @ 8497F48
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497F54
-	voice_directsound 60, 0, gDirectSoundWaveData_84, 255, 0, 255, 127 @ 8497F60
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 @ 8497F60
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497F6C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497F78
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8497F84
@@ -4985,7 +4985,7 @@ voicegroup156:: @ 8497C78
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84981F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498200
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849820C
-	voice_directsound 60, 0, gDirectSoundWaveData_79, 255, 0, 255, 165 @ 8498218
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 8498218
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498224
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498230
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849823C
@@ -5012,28 +5012,28 @@ voicegroup157:: @ 8498278
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498320
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849832C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498338
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 128, 146, 190, 115 @ 8498344
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 190, 115 @ 8498344
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498350
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849835C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498368
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 255, 0, 255, 165 @ 8498374
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 8498374
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498380
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849838C
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 255, 165, 128, 204 @ 8498398
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 128, 204 @ 8498398
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84983A4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84983B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84983BC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84983C8
-	voice_directsound 60, 0, gDirectSoundWaveData_82, 255, 0, 255, 127 @ 84983D4
-	voice_directsound 60, 0, gDirectSoundWaveData_83, 255, 0, 255, 127 @ 84983E0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 84983D4
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 84983E0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84983EC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84983F8
-	voice_directsound 60, 0, gDirectSoundWaveData_49, 255, 253, 0, 149 @ 8498404
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 8498404
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498410
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849841C
-	voice_directsound 60, 0, gDirectSoundWaveData_10, 255, 165, 180, 216 @ 8498428
+	voice_directsound 60, 0, DirectSoundWaveData_unused_sc88_unison_slap, 255, 165, 180, 216 @ 8498428
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498434
-	voice_directsound 60, 0, gDirectSoundWaveData_4, 255, 252, 0, 115 @ 8498440
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8498440
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849844C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498458
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498464
@@ -5057,7 +5057,7 @@ voicegroup157:: @ 8498278
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849853C
 	voice_keysplit voicegroup007, KeySplitTable5 @ 8498548
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498554
-	voice_directsound 60, 0, gDirectSoundWaveData_84, 255, 0, 255, 127 @ 8498560
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 @ 8498560
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849856C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498578
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498584
@@ -5129,42 +5129,42 @@ voicegroup158:: @ 8498878
 	voice_keysplit voicegroup003, KeySplitTable1 @ 8498884
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498890
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849889C
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 255, 249, 0, 165 @ 84988A8
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 84988A8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84988B4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84988C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84988CC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84988D8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84988E4
-	voice_directsound 60, 0, gDirectSoundWaveData_31, 255, 0, 255, 0 @ 84988F0
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 84988F0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84988FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498908
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498914
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 8498920
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8498920
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849892C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498938
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 128, 146, 108, 137 @ 8498944
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 108, 137 @ 8498944
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498950
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849895C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498968
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498974
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498980
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849898C
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 128, 204, 103, 226 @ 8498998
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 204, 103, 226 @ 8498998
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84989A4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84989B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84989BC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84989C8
-	voice_directsound 60, 0, gDirectSoundWaveData_82, 255, 0, 255, 127 @ 84989D4
-	voice_directsound 60, 0, gDirectSoundWaveData_83, 255, 0, 255, 127 @ 84989E0
-	voice_directsound 60, 0, gDirectSoundWaveData_79, 255, 0, 255, 165 @ 84989EC
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 84989D4
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 84989E0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 84989EC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84989F8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498A04
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498A10
-	voice_directsound 60, 0, gDirectSoundWaveData_2, 255, 253, 0, 188 @ 8498A1C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 8498A1C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498A28
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498A34
-	voice_directsound 60, 0, gDirectSoundWaveData_4, 255, 252, 0, 115 @ 8498A40
-	voice_directsound 60, 0, gDirectSoundWaveData_52, 255, 0, 255, 127 @ 8498A4C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 8498A40
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 127 @ 8498A4C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498A58
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498A64
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498A70
@@ -5172,13 +5172,13 @@ voicegroup158:: @ 8498878
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498A88
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498A94
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498AA0
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 0, 193, 153 @ 8498AAC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 153 @ 8498AAC
 	voice_keysplit voicegroup004, KeySplitTable2 @ 8498AB8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498AC4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498AD0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498ADC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498AE8
-	voice_directsound 60, 0, gDirectSoundWaveData_6, 255, 0, 255, 0 @ 8498AF4
+	voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 @ 8498AF4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498B00
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498B0C
 	voice_keysplit voicegroup005, KeySplitTable3 @ 8498B18
@@ -5187,7 +5187,7 @@ voicegroup158:: @ 8498878
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498B3C
 	voice_keysplit voicegroup007, KeySplitTable5 @ 8498B48
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498B54
-	voice_directsound 60, 0, gDirectSoundWaveData_84, 255, 0, 236, 188 @ 8498B60
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 236, 188 @ 8498B60
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498B6C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498B78
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498B84
@@ -5203,7 +5203,7 @@ voicegroup158:: @ 8498878
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498BFC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498C08
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498C14
-	voice_directsound 60, 0, gDirectSoundWaveData_85, 255, 0, 255, 127 @ 8498C20
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 8498C20
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498C2C
 	voice_square_1_alt 0, 1, 0, 1, 9, 0 @ 8498C38
 	voice_square_2_alt 3, 0, 1, 10, 1 @ 8498C44
@@ -5259,8 +5259,8 @@ voicegroup159:: @ 8498E78
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498E84
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498E90
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498E9C
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 64, 249, 0, 188 @ 8498EA8
-	voice_directsound 60, 0, gDirectSoundWaveData_87, 51, 249, 0, 165 @ 8498EB4
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 64, 249, 0, 188 @ 8498EA8
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 51, 249, 0, 165 @ 8498EB4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498EC0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498ECC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498ED8
@@ -5279,7 +5279,7 @@ voicegroup159:: @ 8498E78
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498F74
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498F80
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498F8C
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 85, 249, 25, 127 @ 8498F98
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 85, 249, 25, 127 @ 8498F98
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498FA4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498FB0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8498FBC
@@ -5399,7 +5399,7 @@ voicegroup160:: @ 8499478
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84994FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499508
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499514
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 8499520
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8499520
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849952C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499538
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499544
@@ -5409,7 +5409,7 @@ voicegroup160:: @ 8499478
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499574
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499580
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849958C
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 128, 249, 25, 127 @ 8499598
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 8499598
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84995A4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84995B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84995BC
@@ -5420,7 +5420,7 @@ voicegroup160:: @ 8499478
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84995F8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499604
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499610
-	voice_directsound 60, 0, gDirectSoundWaveData_2, 255, 253, 0, 188 @ 849961C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 849961C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499628
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499634
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499640
@@ -5489,14 +5489,14 @@ voicegroup161:: @ 8499898
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849991C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499928
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499934
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 8499940
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8499940
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849994C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499958
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 255, 0, 255, 127 @ 8499964
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 8499964
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499970
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849997C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499988
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 255, 0, 255, 165 @ 8499994
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 8499994
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84999A0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84999AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84999B8
@@ -5548,7 +5548,7 @@ voicegroup161:: @ 8499898
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499BE0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499BEC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499BF8
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 0, 255, 165 @ 8499C04
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 8499C04
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499C10
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499C1C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499C28
@@ -5609,7 +5609,7 @@ voicegroup162:: @ 8499E98
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499EA4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499EB0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499EBC
-	voice_directsound 60, 0, gDirectSoundWaveData_87, 64, 188, 108, 244 @ 8499EC8
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 64, 188, 108, 244 @ 8499EC8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499ED4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499EE0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499EEC
@@ -5619,17 +5619,17 @@ voicegroup162:: @ 8499E98
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499F1C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499F28
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499F34
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 8499F40
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 8499F40
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499F4C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499F58
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 64, 195, 92, 235 @ 8499F64
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 64, 195, 92, 235 @ 8499F64
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499F70
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499F7C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499F88
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499F94
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499FA0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499FAC
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 128, 249, 25, 127 @ 8499FB8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 8499FB8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499FC4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499FD0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 8499FDC
@@ -5638,7 +5638,7 @@ voicegroup162:: @ 8499E98
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A000
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A00C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A018
-	voice_directsound 60, 0, gDirectSoundWaveData_49, 64, 204, 113, 235 @ 849A024
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 64, 204, 113, 235 @ 849A024
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A030
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A03C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A048
@@ -5704,8 +5704,8 @@ voicegroup163:: @ 849A2F4
 	voice_keysplit voicegroup003, KeySplitTable1 @ 849A300
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A30C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A318
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 255, 188, 128, 226 @ 849A324
-	voice_directsound 60, 65, gDirectSoundWaveData_87, 255, 204, 77, 246 @ 849A330
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 849A324
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 @ 849A330
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A33C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A348
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A354
@@ -5717,14 +5717,14 @@ voicegroup163:: @ 849A2F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A39C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A3A8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A3B4
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 255, 76, 133, 137 @ 849A3C0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 849A3C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A3CC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A3D8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A3E4
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 64, 188, 108, 165 @ 849A3F0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 849A3F0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A3FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A408
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 255, 249, 25, 127 @ 849A414
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 849A414
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A420
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A42C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A438
@@ -5746,7 +5746,7 @@ voicegroup163:: @ 849A2F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A4F8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A504
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A510
-	voice_directsound 60, 0, gDirectSoundWaveData_70, 255, 246, 0, 235 @ 849A51C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 849A51C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A528
 	voice_keysplit voicegroup004, KeySplitTable2 @ 849A534
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A540
@@ -5758,7 +5758,7 @@ voicegroup163:: @ 849A2F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A588
 	voice_keysplit voicegroup005, KeySplitTable3 @ 849A594
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A5A0
-	voice_directsound 60, 0, gDirectSoundWaveData_77, 255, 0, 206, 204 @ 849A5AC
+	voice_directsound 60, 0, DirectSoundWaveData_wave_77, 255, 0, 206, 204 @ 849A5AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A5B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A5C4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A5D0
@@ -5773,7 +5773,7 @@ voicegroup163:: @ 849A2F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A63C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A648
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A654
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 127, 231, 127 @ 849A660
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 849A660
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A66C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A678
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A684
@@ -5834,8 +5834,8 @@ voicegroup164:: @ 849A8F4
 	voice_keysplit voicegroup003, KeySplitTable1 @ 849A900
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A90C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A918
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 128, 180, 108, 209 @ 849A924
-	voice_directsound 60, 65, gDirectSoundWaveData_87, 85, 204, 77, 246 @ 849A930
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 128, 180, 108, 209 @ 849A924
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 85, 204, 77, 246 @ 849A930
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A93C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A948
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A954
@@ -5847,14 +5847,14 @@ voicegroup164:: @ 849A8F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A99C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A9A8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A9B4
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 255, 76, 133, 137 @ 849A9C0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 849A9C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A9CC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A9D8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A9E4
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 64, 188, 108, 165 @ 849A9F0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 849A9F0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849A9FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AA08
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 255, 249, 25, 127 @ 849AA14
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 849AA14
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AA20
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AA2C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AA38
@@ -5876,7 +5876,7 @@ voicegroup164:: @ 849A8F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AAF8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AB04
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AB10
-	voice_directsound 60, 0, gDirectSoundWaveData_70, 255, 246, 0, 235 @ 849AB1C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 849AB1C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AB28
 	voice_keysplit voicegroup004, KeySplitTable2 @ 849AB34
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AB40
@@ -5903,7 +5903,7 @@ voicegroup164:: @ 849A8F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AC3C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AC48
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AC54
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 127, 231, 127 @ 849AC60
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 849AC60
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AC6C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AC78
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AC84
@@ -5969,22 +5969,22 @@ voicegroup165:: @ 849AEF4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AF3C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AF48
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AF54
-	voice_directsound 60, 0, gDirectSoundWaveData_0, 255, 165, 51, 242 @ 849AF60
-	voice_directsound 60, 0, gDirectSoundWaveData_31, 255, 0, 255, 0 @ 849AF6C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_glockenspiel, 255, 165, 51, 242 @ 849AF60
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 849AF6C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AF78
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AF84
-	voice_directsound 60, 0, gDirectSoundWaveData_71, 255, 235, 0, 204 @ 849AF90
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 849AF9C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 849AF90
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 849AF9C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AFA8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AFB4
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 37, 165, 103, 127 @ 849AFC0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 37, 165, 103, 127 @ 849AFC0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AFCC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AFD8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AFE4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AFF0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849AFFC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B008
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 255, 204, 92, 226 @ 849B014
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 204, 92, 226 @ 849B014
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B020
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B02C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B038
@@ -6006,7 +6006,7 @@ voicegroup165:: @ 849AEF4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B0F8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B104
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B110
-	voice_directsound 60, 0, gDirectSoundWaveData_70, 255, 242, 51, 226 @ 849B11C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 226 @ 849B11C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B128
 	voice_keysplit voicegroup004, KeySplitTable2 @ 849B134
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B140
@@ -6033,12 +6033,12 @@ voicegroup165:: @ 849AEF4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B23C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B248
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B254
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 0, 255, 165 @ 849B260
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 0, 255, 165 @ 849B260
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B26C
-	voice_directsound 60, 0, gDirectSoundWaveData_88, 255, 191, 97, 165 @ 849B278
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_enhanced_delay_shaku, 255, 191, 97, 165 @ 849B278
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B284
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B290
-	voice_directsound 60, 0, gDirectSoundWaveData_85, 255, 0, 255, 127 @ 849B29C
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 849B29C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B2A8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B2B4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B2C0
@@ -6100,36 +6100,36 @@ voicegroup166:: @ 849B4F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B548
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B554
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B560
-	voice_directsound 60, 0, gDirectSoundWaveData_31, 255, 0, 255, 0 @ 849B56C
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 849B56C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B578
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B584
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B590
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 849B59C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 849B59C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B5A8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B5B4
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 128, 146, 108, 137 @ 849B5C0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 128, 146, 108, 137 @ 849B5C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B5CC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B5D8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B5E4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B5F0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B5FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B608
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 128, 204, 103, 226 @ 849B614
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 204, 103, 226 @ 849B614
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B620
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B62C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B638
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B644
-	voice_directsound 60, 0, gDirectSoundWaveData_82, 255, 0, 255, 127 @ 849B650
-	voice_directsound 60, 0, gDirectSoundWaveData_83, 255, 0, 255, 127 @ 849B65C
-	voice_directsound 60, 0, gDirectSoundWaveData_79, 255, 0, 255, 165 @ 849B668
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 849B650
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 849B65C
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 849B668
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B674
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B680
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B68C
-	voice_directsound 60, 0, gDirectSoundWaveData_2, 255, 253, 0, 188 @ 849B698
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 849B698
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B6A4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B6B0
-	voice_directsound 60, 0, gDirectSoundWaveData_4, 255, 252, 0, 115 @ 849B6BC
-	voice_directsound 60, 0, gDirectSoundWaveData_52, 255, 0, 255, 127 @ 849B6C8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 849B6BC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_square_wave, 255, 0, 255, 127 @ 849B6C8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B6D4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B6E0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B6EC
@@ -6137,7 +6137,7 @@ voicegroup166:: @ 849B4F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B704
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B710
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B71C
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 0, 193, 153 @ 849B728
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 153 @ 849B728
 	voice_keysplit voicegroup004, KeySplitTable2 @ 849B734
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B740
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B74C
@@ -6152,7 +6152,7 @@ voicegroup166:: @ 849B4F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B7B8
 	voice_keysplit voicegroup007, KeySplitTable5 @ 849B7C4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B7D0
-	voice_directsound 60, 0, gDirectSoundWaveData_84, 255, 0, 236, 188 @ 849B7DC
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 236, 188 @ 849B7DC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B7E8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B7F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B800
@@ -6168,7 +6168,7 @@ voicegroup166:: @ 849B4F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B878
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B884
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B890
-	voice_directsound 60, 0, gDirectSoundWaveData_85, 255, 0, 255, 127 @ 849B89C
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 849B89C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849B8A8
 	voice_square_1_alt 0, 3, 0, 1, 9, 0 @ 849B8B4
 	voice_square_2_alt 3, 0, 2, 9, 1 @ 849B8C0
@@ -6237,14 +6237,14 @@ voicegroup167:: @ 849BAF4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849BB9C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849BBA8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849BBB4
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 255, 76, 133, 137 @ 849BBC0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 849BBC0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849BBCC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849BBD8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849BBE4
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 64, 188, 108, 165 @ 849BBF0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 849BBF0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849BBFC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849BC08
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 128, 249, 25, 127 @ 849BC14
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 849BC14
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849BC20
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849BC2C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849BC38
@@ -6354,8 +6354,8 @@ voicegroup168:: @ 849C0F4
 	voice_keysplit voicegroup003, KeySplitTable1 @ 849C100
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C10C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C118
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 255, 188, 128, 226 @ 849C124
-	voice_directsound 60, 65, gDirectSoundWaveData_87, 255, 204, 77, 246 @ 849C130
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 849C124
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 @ 849C130
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C13C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C148
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C154
@@ -6367,14 +6367,14 @@ voicegroup168:: @ 849C0F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C19C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C1A8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C1B4
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 255, 76, 133, 137 @ 849C1C0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 849C1C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C1CC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C1D8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C1E4
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 64, 188, 108, 165 @ 849C1F0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 849C1F0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C1FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C208
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 255, 249, 25, 127 @ 849C214
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 849C214
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C220
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C22C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C238
@@ -6395,8 +6395,8 @@ voicegroup168:: @ 849C0F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C2EC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C2F8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C304
-	voice_directsound 60, 0, gDirectSoundWaveData_55, 255, 216, 0, 165 @ 849C310
-	voice_directsound 60, 0, gDirectSoundWaveData_70, 255, 246, 0, 235 @ 849C31C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 849C310
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 849C31C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C328
 	voice_keysplit voicegroup004, KeySplitTable2 @ 849C334
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C340
@@ -6423,7 +6423,7 @@ voicegroup168:: @ 849C0F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C43C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C448
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C454
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 127, 231, 127 @ 849C460
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 849C460
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C46C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C478
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C484
@@ -6497,7 +6497,7 @@ voicegroup169:: @ 849C6F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C79C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C7A8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C7B4
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 255, 0, 255, 210 @ 849C7C0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 210 @ 849C7C0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C7CC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C7D8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C7E4
@@ -6515,7 +6515,7 @@ voicegroup169:: @ 849C6F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C874
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C880
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C88C
-	voice_directsound 60, 0, gDirectSoundWaveData_2, 255, 253, 0, 188 @ 849C898
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 849C898
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C8A4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C8B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849C8BC
@@ -6657,7 +6657,7 @@ voicegroup170:: @ 849CCF4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849CF04
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849CF10
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849CF1C
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 246, 0, 226 @ 849CF28
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 849CF28
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849CF34
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849CF40
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849CF4C
@@ -6683,7 +6683,7 @@ voicegroup170:: @ 849CCF4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D03C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D048
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D054
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 127, 231, 127 @ 849D060
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 849D060
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D06C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D078
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D084
@@ -6741,9 +6741,9 @@ voicegroup171:: @ 849D0E4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D2DC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D2E8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D2F4
-	voice_directsound 60, 0, gDirectSoundWaveData_55, 255, 216, 0, 165 @ 849D300
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 849D300
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D30C
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 246, 0, 226 @ 849D318
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 849D318
 	voice_keysplit voicegroup004, KeySplitTable2 @ 849D324
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D330
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D33C
@@ -6769,7 +6769,7 @@ voicegroup171:: @ 849D0E4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D42C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D438
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D444
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 127, 231, 127 @ 849D450
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 849D450
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D45C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D468
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D474
@@ -6793,8 +6793,8 @@ voicegroup172:: @ 849D528
 	voice_keysplit voicegroup003, KeySplitTable1 @ 849D534
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D540
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D54C
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 255, 188, 128, 226 @ 849D558
-	voice_directsound 60, 65, gDirectSoundWaveData_87, 255, 204, 77, 246 @ 849D564
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 849D558
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 @ 849D564
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D570
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D57C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D588
@@ -6806,14 +6806,14 @@ voicegroup172:: @ 849D528
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D5D0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D5DC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D5E8
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 255, 76, 133, 137 @ 849D5F4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 849D5F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D600
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D60C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D618
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 64, 188, 108, 165 @ 849D624
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 849D624
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D630
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D63C
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 255, 249, 25, 127 @ 849D648
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 849D648
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D654
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D660
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D66C
@@ -6835,7 +6835,7 @@ voicegroup172:: @ 849D528
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D72C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D738
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D744
-	voice_directsound 60, 0, gDirectSoundWaveData_70, 255, 246, 0, 235 @ 849D750
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 849D750
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D75C
 	voice_keysplit voicegroup004, KeySplitTable2 @ 849D768
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D774
@@ -6862,7 +6862,7 @@ voicegroup172:: @ 849D528
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D870
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D87C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D888
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 127, 231, 127 @ 849D894
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 849D894
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D8A0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D8AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849D8B8
@@ -6923,8 +6923,8 @@ voicegroup173:: @ 849DB28
 	voice_keysplit voicegroup003, KeySplitTable1 @ 849DB34
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DB40
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DB4C
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 255, 188, 128, 226 @ 849DB58
-	voice_directsound 60, 65, gDirectSoundWaveData_87, 128, 204, 77, 246 @ 849DB64
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 849DB58
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246 @ 849DB64
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DB70
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DB7C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DB88
@@ -6933,18 +6933,18 @@ voicegroup173:: @ 849DB28
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DBAC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DBB8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DBC4
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 849DBD0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 849DBD0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DBDC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DBE8
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 51, 0, 203, 127 @ 849DBF4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 51, 0, 203, 127 @ 849DBF4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DC00
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DC0C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DC18
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DC24
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DC30
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DC3C
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 128, 249, 25, 127 @ 849DC48
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 64, 216, 51, 224 @ 849DC54
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 849DC48
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 64, 216, 51, 224 @ 849DC54
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DC60
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DC6C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DC78
@@ -6954,7 +6954,7 @@ voicegroup173:: @ 849DB28
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DCA8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DCB4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DCC0
-	voice_directsound 60, 0, gDirectSoundWaveData_2, 255, 253, 0, 188 @ 849DCCC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 849DCCC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DCD8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DCE4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DCF0
@@ -6992,7 +6992,7 @@ voicegroup173:: @ 849DB28
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DE70
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DE7C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DE88
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 127, 231, 127 @ 849DE94
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 849DE94
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DEA0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DEAC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849DEB8
@@ -7054,7 +7054,7 @@ voicegroup174:: @ 849E128
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E140
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E14C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E158
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 255, 249, 0, 165 @ 849E164
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 849E164
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E170
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E17C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E188
@@ -7066,11 +7066,11 @@ voicegroup174:: @ 849E128
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E1D0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E1DC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E1E8
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 255, 0, 255, 127 @ 849E1F4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 0, 255, 127 @ 849E1F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E200
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E20C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E218
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 255, 0, 255, 165 @ 849E224
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 255, 0, 255, 165 @ 849E224
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E230
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E23C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E248
@@ -7078,8 +7078,8 @@ voicegroup174:: @ 849E128
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E260
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E26C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E278
-	voice_directsound 60, 0, gDirectSoundWaveData_82, 128, 0, 255, 214 @ 849E284
-	voice_directsound 60, 0, gDirectSoundWaveData_83, 128, 0, 255, 206 @ 849E290
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 0, 255, 214 @ 849E284
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 128, 0, 255, 206 @ 849E290
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E29C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E2A8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E2B4
@@ -7087,7 +7087,7 @@ voicegroup174:: @ 849E128
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E2CC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E2D8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E2E4
-	voice_directsound 60, 0, gDirectSoundWaveData_4, 255, 252, 0, 165 @ 849E2F0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 165 @ 849E2F0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E2FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E308
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E314
@@ -7111,7 +7111,7 @@ voicegroup174:: @ 849E128
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E3EC
 	voice_keysplit voicegroup007, KeySplitTable5 @ 849E3F8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E404
-	voice_directsound 60, 0, gDirectSoundWaveData_84, 255, 0, 255, 209 @ 849E410
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 209 @ 849E410
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E41C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E428
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E434
@@ -7169,7 +7169,7 @@ voicegroup174:: @ 849E128
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E6A4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E6B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E6BC
-	voice_directsound 60, 0, gDirectSoundWaveData_79, 255, 0, 255, 165 @ 849E6C8
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 849E6C8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E6D4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E6E0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E6EC
@@ -7201,7 +7201,7 @@ voicegroup174:: @ 849E128
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E824
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E830
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E83C
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 255, 165, 154, 127 @ 849E848
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 154, 127 @ 849E848
 	voice_keysplit_all voicegroup002 @ 849E854
 	voice_square_1_alt 0, 2, 0, 2, 3, 1 @ 849E860
 	voice_square_2_alt 2, 0, 2, 3, 1 @ 849E86C
@@ -7221,7 +7221,7 @@ voicegroup175:: @ 849E884
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E8FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E908
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E914
-	voice_directsound 60, 0, gDirectSoundWaveData_71, 255, 235, 0, 204 @ 849E920
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 849E920
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E92C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E938
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E944
@@ -7232,7 +7232,7 @@ voicegroup175:: @ 849E884
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E980
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E98C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E998
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 85, 165, 154, 127 @ 849E9A4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 85, 165, 154, 127 @ 849E9A4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E9B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E9BC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849E9C8
@@ -7347,36 +7347,36 @@ voicegroup177:: @ 849ED34
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849EEB4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849EEC0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849EECC
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_30, 255, 0, 255, 0 @ 849EED8
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_23, 255, 0, 255, 0 @ 849EEE4
-	voice_directsound_no_resample 67, 71, gDirectSoundWaveData_24, 255, 180, 175, 228 @ 849EEF0
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_24, 255, 0, 255, 242 @ 849EEFC
-	voice_directsound_no_resample 65, 0, gDirectSoundWaveData_16, 255, 255, 255, 127 @ 849EF08
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_17, 255, 0, 255, 242 @ 849EF14
-	voice_directsound 64, 24, gDirectSoundWaveData_25, 255, 0, 255, 226 @ 849EF20
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 849EED8
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 849EEE4
+	voice_directsound_no_resample 67, 71, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 849EEF0
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 849EEFC
+	voice_directsound_no_resample 65, 0, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 849EF08
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 849EF14
+	voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 849EF20
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849EF2C
-	voice_directsound 68, 29, gDirectSoundWaveData_25, 255, 0, 255, 226 @ 849EF38
-	voice_directsound_no_resample 60, 64, gDirectSoundWaveData_15, 255, 0, 255, 242 @ 849EF44
-	voice_directsound 72, 64, gDirectSoundWaveData_25, 255, 0, 255, 226 @ 849EF50
+	voice_directsound 68, 29, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 849EF38
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 849EF44
+	voice_directsound 72, 64, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 849EF50
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849EF5C
-	voice_directsound 76, 39, gDirectSoundWaveData_25, 255, 0, 255, 226 @ 849EF68
-	voice_directsound 80, 89, gDirectSoundWaveData_25, 255, 0, 255, 226 @ 849EF74
-	voice_directsound_no_resample 33, 10, gDirectSoundWaveData_20, 255, 235, 0, 231 @ 849EF80
-	voice_directsound 84, 104, gDirectSoundWaveData_25, 255, 0, 255, 235 @ 849EF8C
+	voice_directsound 76, 39, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 849EF68
+	voice_directsound 80, 89, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 849EF74
+	voice_directsound_no_resample 33, 10, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 849EF80
+	voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235 @ 849EF8C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849EF98
-	voice_directsound 63, 64, gDirectSoundWaveData_20, 255, 235, 0, 231 @ 849EFA4
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_26, 255, 165, 103, 231 @ 849EFB0
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_18, 255, 127, 77, 204 @ 849EFBC
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_19, 255, 231, 0, 188 @ 849EFC8
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_27, 255, 0, 255, 242 @ 849EFD4
-	voice_directsound_no_resample 64, 118, gDirectSoundWaveData_20, 255, 235, 0, 231 @ 849EFE0
+	voice_directsound 63, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 849EFA4
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 849EFB0
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 849EFBC
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 @ 849EFC8
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242 @ 849EFD4
+	voice_directsound_no_resample 64, 118, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 849EFE0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849EFEC
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_20, 255, 235, 0, 231 @ 849EFF8
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_20, 8, 0, 255, 216 @ 849F004
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_28, 255, 0, 255, 0 @ 849F010
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_21, 255, 0, 255, 0 @ 849F01C
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_22, 255, 0, 255, 0 @ 849F028
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_22, 255, 0, 255, 0 @ 849F034
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 849EFF8
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216 @ 849F004
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 849F010
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 849F01C
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 849F028
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 849F034
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F040
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F04C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F058
@@ -7392,16 +7392,16 @@ voicegroup177:: @ 849ED34
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F0D0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F0DC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F0E8
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_29, 255, 242, 103, 188 @ 849F0F4
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_29, 255, 242, 103, 188 @ 849F100
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_29, 255, 165, 103, 188 @ 849F10C
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_30, 255, 0, 255, 0 @ 849F118
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 849F0F4
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 849F100
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188 @ 849F10C
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 849F118
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F124
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F130
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_31, 255, 0, 255, 0 @ 849F13C
-	voice_directsound 63, 64, gDirectSoundWaveData_32, 255, 0, 255, 0 @ 849F148
-	voice_directsound 50, 64, gDirectSoundWaveData_33, 255, 0, 255, 0 @ 849F154
-	voice_directsound 64, 64, gDirectSoundWaveData_33, 255, 0, 255, 0 @ 849F160
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 849F13C
+	voice_directsound 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 849F148
+	voice_directsound 50, 64, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 849F154
+	voice_directsound 64, 64, DirectSoundWaveData_unknown_tsuzumi, 255, 0, 255, 0 @ 849F160
 
 voicegroup178:: @ 849F16C
 	voice_keysplit_all voicegroup177 @ 849F16C
@@ -7417,7 +7417,7 @@ voicegroup178:: @ 849F16C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F1E4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F1F0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F1FC
-	voice_directsound 60, 0, gDirectSoundWaveData_71, 255, 204, 103, 165 @ 849F208
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 204, 103, 165 @ 849F208
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F214
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F220
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F22C
@@ -7428,7 +7428,7 @@ voicegroup178:: @ 849F16C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F268
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F274
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F280
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 255, 165, 154, 165 @ 849F28C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 165, 154, 165 @ 849F28C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F298
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F2A4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F2B0
@@ -7507,7 +7507,7 @@ voicegroup179:: @ 849F58C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F604
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F610
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F61C
-	voice_directsound 60, 0, gDirectSoundWaveData_71, 255, 235, 0, 204 @ 849F628
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_xylophone, 255, 235, 0, 204 @ 849F628
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F634
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F640
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F64C
@@ -7518,7 +7518,7 @@ voicegroup179:: @ 849F58C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F688
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F694
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F6A0
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 85, 165, 154, 127 @ 849F6AC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 85, 165, 154, 127 @ 849F6AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F6B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F6C4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F6D0
@@ -7527,7 +7527,7 @@ voicegroup179:: @ 849F58C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F6F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F700
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F70C
-	voice_directsound 60, 0, gDirectSoundWaveData_49, 255, 253, 0, 149 @ 849F718
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 849F718
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F724
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F730
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F73C
@@ -7588,8 +7588,8 @@ voicegroup180:: @ 849F9AC
 	voice_keysplit voicegroup003, KeySplitTable1 @ 849F9B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F9C4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F9D0
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 64, 249, 0, 188 @ 849F9DC
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 255, 249, 0, 165 @ 849F9E8
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 64, 249, 0, 188 @ 849F9DC
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 849F9E8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849F9F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849FA00
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849FA0C
@@ -7710,7 +7710,7 @@ voicegroup180:: @ 849F9AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849FF70
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849FF7C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 849FF88
-	voice_directsound_no_resample 60, 0, gDirectSoundWaveData_16, 255, 255, 255, 127 @ 849FF94
+	voice_directsound_no_resample 60, 0, DirectSoundWaveData_sc88_standard_hand_clap, 255, 255, 255, 127 @ 849FF94
 	voice_noise_alt 0, 0, 1, 0, 0 @ 849FFA0
 
 voicegroup181:: @ 849FFAC
@@ -7760,7 +7760,7 @@ voicegroup181:: @ 849FFAC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A01B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A01BC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A01C8
-	voice_directsound 60, 0, gDirectSoundWaveData_70, 255, 242, 51, 242 @ 84A01D4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 242, 51, 242 @ 84A01D4
 
 voicegroup182:: @ 84A01E0
 	voice_keysplit_all voicegroup002 @ 84A01E0
@@ -7810,7 +7810,7 @@ voicegroup182:: @ 84A01E0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A03F0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A03FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0408
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 0, 193, 76 @ 84A0414
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 0, 193, 76 @ 84A0414
 	voice_keysplit voicegroup004, KeySplitTable2 @ 84A0420
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A042C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0438
@@ -7877,7 +7877,7 @@ voicegroup183:: @ 84A0600
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A06FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0708
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0714
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 128, 249, 25, 127 @ 84A0720
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 84A0720
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A072C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0738
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0744
@@ -7888,7 +7888,7 @@ voicegroup183:: @ 84A0600
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0780
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A078C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0798
-	voice_directsound 60, 0, gDirectSoundWaveData_2, 255, 253, 0, 188 @ 84A07A4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 84A07A4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A07B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A07BC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A07C8
@@ -7997,7 +7997,7 @@ voicegroup184:: @ 84A0C00
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0C84
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0C90
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0C9C
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 84A0CA8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 84A0CA8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0CB4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0CC0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0CCC
@@ -8014,14 +8014,14 @@ voicegroup184:: @ 84A0C00
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0D50
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0D5C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0D68
-	voice_directsound 60, 0, gDirectSoundWaveData_79, 255, 0, 255, 165 @ 84A0D74
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 84A0D74
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0D80
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0D8C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0D98
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0DA4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0DB0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0DBC
-	voice_directsound 60, 0, gDirectSoundWaveData_4, 255, 252, 0, 115 @ 84A0DC8
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 84A0DC8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0DD4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0DE0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0DEC
@@ -8068,7 +8068,7 @@ voicegroup184:: @ 84A0C00
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0FD8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0FE4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A0FF0
-	voice_directsound 60, 0, gDirectSoundWaveData_6, 255, 0, 255, 0 @ 84A0FFC
+	voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 @ 84A0FFC
 
 voicegroup185:: @ 84A1008
 	voice_keysplit_all voicegroup002 @ 84A1008
@@ -8085,7 +8085,7 @@ voicegroup185:: @ 84A1008
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A108C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1098
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A10A4
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 84A10B0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 84A10B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A10BC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A10C8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A10D4
@@ -8100,31 +8100,31 @@ voicegroup185:: @ 84A1008
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1140
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A114C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1158
-	voice_directsound 60, 0, gDirectSoundWaveData_82, 128, 0, 255, 214 @ 84A1164
-	voice_directsound 60, 0, gDirectSoundWaveData_83, 128, 0, 255, 206 @ 84A1170
-	voice_directsound 60, 0, gDirectSoundWaveData_79, 255, 0, 255, 165 @ 84A117C
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 0, 255, 214 @ 84A1164
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 128, 0, 255, 206 @ 84A1170
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 84A117C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1188
-	voice_directsound 60, 0, gDirectSoundWaveData_49, 255, 253, 0, 149 @ 84A1194
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_pick_bass, 255, 253, 0, 149 @ 84A1194
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A11A0
-	voice_directsound 60, 0, gDirectSoundWaveData_2, 255, 253, 0, 188 @ 84A11AC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 84A11AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A11B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A11C4
-	voice_directsound 60, 0, gDirectSoundWaveData_4, 255, 252, 0, 115 @ 84A11D0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_synth_bass, 255, 252, 0, 115 @ 84A11D0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A11DC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A11E8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A11F4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1200
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A120C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1218
-	voice_directsound 60, 0, gDirectSoundWaveData_55, 255, 216, 0, 165 @ 84A1224
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_pizzicato_strings, 255, 216, 0, 165 @ 84A1224
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1230
-	voice_directsound 60, 0, gDirectSoundWaveData_5, 255, 246, 0, 226 @ 84A123C
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_timpani, 255, 246, 0, 226 @ 84A123C
 	voice_keysplit voicegroup004, KeySplitTable2 @ 84A1248
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1254
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1260
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A126C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1278
-	voice_directsound 60, 0, gDirectSoundWaveData_6, 85, 0, 154, 165 @ 84A1284
+	voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 85, 0, 154, 165 @ 84A1284
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1290
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A129C
 	voice_keysplit voicegroup005, KeySplitTable3 @ 84A12A8
@@ -8133,7 +8133,7 @@ voicegroup185:: @ 84A1008
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A12CC
 	voice_keysplit voicegroup007, KeySplitTable5 @ 84A12D8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A12E4
-	voice_directsound 60, 0, gDirectSoundWaveData_84, 255, 0, 255, 209 @ 84A12F0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 209 @ 84A12F0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A12FC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1308
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1314
@@ -8149,7 +8149,7 @@ voicegroup185:: @ 84A1008
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A138C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1398
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A13A4
-	voice_directsound 60, 0, gDirectSoundWaveData_85, 255, 0, 255, 127 @ 84A13B0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 84A13B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A13BC
 	voice_square_2_alt 2, 0, 0, 15, 0 @ 84A13C8
 	voice_square_1_alt 0, 2, 0, 0, 15, 0 @ 84A13D4
@@ -8348,14 +8348,14 @@ voicegroup187:: @ 84A1C08
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1CB0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1CBC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1CC8
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 255, 76, 133, 137 @ 84A1CD4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 255, 76, 133, 137 @ 84A1CD4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1CE0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1CEC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1CF8
-	voice_directsound 60, 0, gDirectSoundWaveData_74, 64, 188, 108, 165 @ 84A1D04
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_accordion, 64, 188, 108, 165 @ 84A1D04
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1D10
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1D1C
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 255, 249, 25, 127 @ 84A1D28
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 255, 249, 25, 127 @ 84A1D28
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1D34
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1D40
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1D4C
@@ -8377,7 +8377,7 @@ voicegroup187:: @ 84A1C08
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1E0C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1E18
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1E24
-	voice_directsound 60, 0, gDirectSoundWaveData_70, 255, 246, 0, 235 @ 84A1E30
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_harp, 255, 246, 0, 235 @ 84A1E30
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1E3C
 	voice_keysplit voicegroup004, KeySplitTable2 @ 84A1E48
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1E54
@@ -8404,7 +8404,7 @@ voicegroup187:: @ 84A1C08
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1F50
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1F5C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1F68
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 127, 231, 127 @ 84A1F74
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 84A1F74
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1F80
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1F8C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A1F98
@@ -8465,8 +8465,8 @@ voicegroup188:: @ 84A2208
 	voice_keysplit voicegroup003, KeySplitTable1 @ 84A2214
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2220
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A222C
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 255, 188, 128, 226 @ 84A2238
-	voice_directsound 60, 65, gDirectSoundWaveData_87, 128, 204, 77, 246 @ 84A2244
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 84A2238
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246 @ 84A2244
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2250
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A225C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2268
@@ -8475,18 +8475,18 @@ voicegroup188:: @ 84A2208
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A228C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2298
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A22A4
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 84A22B0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 84A22B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A22BC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A22C8
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 51, 0, 203, 127 @ 84A22D4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 51, 0, 203, 127 @ 84A22D4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A22E0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A22EC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A22F8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2304
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2310
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A231C
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 128, 249, 25, 127 @ 84A2328
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 64, 216, 51, 224 @ 84A2334
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 84A2328
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 64, 216, 51, 224 @ 84A2334
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2340
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A234C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2358
@@ -8496,7 +8496,7 @@ voicegroup188:: @ 84A2208
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2388
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2394
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A23A0
-	voice_directsound 60, 0, gDirectSoundWaveData_2, 255, 253, 0, 188 @ 84A23AC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 84A23AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A23B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A23C4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A23D0
@@ -8534,7 +8534,7 @@ voicegroup188:: @ 84A2208
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2550
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A255C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2568
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 127, 231, 127 @ 84A2574
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 84A2574
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2580
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A258C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2598
@@ -8595,8 +8595,8 @@ voicegroup189:: @ 84A2808
 	voice_keysplit voicegroup003, KeySplitTable1 @ 84A2814
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2820
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A282C
-	voice_directsound 60, 0, gDirectSoundWaveData_86, 255, 188, 128, 226 @ 84A2838
-	voice_directsound 60, 65, gDirectSoundWaveData_87, 128, 204, 77, 246 @ 84A2844
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 84A2838
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246 @ 84A2844
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2850
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A285C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2868
@@ -8605,18 +8605,18 @@ voicegroup189:: @ 84A2808
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A288C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2898
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A28A4
-	voice_directsound 60, 0, gDirectSoundWaveData_66, 255, 165, 90, 216 @ 84A28B0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_tubular_bell, 255, 165, 90, 216 @ 84A28B0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A28BC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A28C8
-	voice_directsound 60, 0, gDirectSoundWaveData_1, 51, 0, 203, 127 @ 84A28D4
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_organ2, 51, 0, 203, 127 @ 84A28D4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A28E0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A28EC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A28F8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2904
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2910
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A291C
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 128, 249, 25, 127 @ 84A2928
-	voice_directsound 60, 0, gDirectSoundWaveData_78, 64, 216, 51, 224 @ 84A2934
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 128, 249, 25, 127 @ 84A2928
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_nylon_str_guitar, 64, 216, 51, 224 @ 84A2934
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2940
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A294C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2958
@@ -8626,7 +8626,7 @@ voicegroup189:: @ 84A2808
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2988
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2994
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A29A0
-	voice_directsound 60, 0, gDirectSoundWaveData_2, 255, 253, 0, 188 @ 84A29AC
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_fretless_bass, 255, 253, 0, 188 @ 84A29AC
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A29B8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A29C4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A29D0
@@ -8664,7 +8664,7 @@ voicegroup189:: @ 84A2808
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2B50
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2B5C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2B68
-	voice_directsound 60, 0, gDirectSoundWaveData_48, 255, 127, 231, 127 @ 84A2B74
+	voice_directsound 60, 0, DirectSoundWaveData_sc88_flute, 255, 127, 231, 127 @ 84A2B74
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2B80
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2B8C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2B98
@@ -8721,35 +8721,35 @@ voicegroup190:: @ 84A2C58
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2DE4
 	voice_noise_alt 0, 0, 2, 7, 0 @ 84A2DF0
 	voice_noise_alt 0, 0, 1, 9, 1 @ 84A2DFC
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_23, 255, 0, 255, 0 @ 84A2E08
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 84A2E08
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2E14
-	voice_directsound_no_resample 64, 52, gDirectSoundWaveData_17, 255, 0, 255, 242 @ 84A2E20
+	voice_directsound_no_resample 64, 52, DirectSoundWaveData_sc88_orchestra_snare, 255, 0, 255, 242 @ 84A2E20
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2E2C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2E38
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2E44
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2E50
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2E5C
-	voice_directsound_no_resample 60, 64, gDirectSoundWaveData_15, 255, 0, 255, 242 @ 84A2E68
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88_standard3_snare, 255, 0, 255, 242 @ 84A2E68
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2E74
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2E80
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2E8C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2E98
-	voice_directsound_no_resample 33, 104, gDirectSoundWaveData_20, 255, 235, 0, 231 @ 84A2EA4
+	voice_directsound_no_resample 33, 104, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 84A2EA4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2EB0
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2EBC
-	voice_directsound 63, 64, gDirectSoundWaveData_20, 255, 235, 0, 231 @ 84A2EC8
+	voice_directsound 63, 64, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 84A2EC8
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2ED4
-	voice_directsound_no_resample 64, 34, gDirectSoundWaveData_18, 255, 127, 77, 204 @ 84A2EE0
-	voice_directsound_no_resample 64, 14, gDirectSoundWaveData_19, 255, 231, 0, 188 @ 84A2EEC
-	voice_directsound_no_resample 64, 89, gDirectSoundWaveData_27, 255, 0, 255, 242 @ 84A2EF8
-	voice_directsound_no_resample 64, 24, gDirectSoundWaveData_20, 255, 235, 0, 231 @ 84A2F04
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_unknown_tambourine, 255, 127, 77, 204 @ 84A2EE0
+	voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 @ 84A2EEC
+	voice_directsound_no_resample 64, 89, DirectSoundWaveData_unknown_cowbell, 255, 0, 255, 242 @ 84A2EF8
+	voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 84A2F04
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2F10
-	voice_directsound_no_resample 64, 54, gDirectSoundWaveData_20, 255, 235, 0, 231 @ 84A2F1C
-	voice_directsound_no_resample 64, 54, gDirectSoundWaveData_20, 8, 0, 255, 216 @ 84A2F28
-	voice_directsound_no_resample 64, 94, gDirectSoundWaveData_28, 255, 0, 255, 0 @ 84A2F34
-	voice_directsound_no_resample 64, 34, gDirectSoundWaveData_21, 255, 0, 255, 0 @ 84A2F40
-	voice_directsound_no_resample 64, 34, gDirectSoundWaveData_22, 255, 0, 255, 0 @ 84A2F4C
-	voice_directsound_no_resample 64, 90, gDirectSoundWaveData_22, 255, 0, 255, 0 @ 84A2F58
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 255, 235, 0, 231 @ 84A2F1C
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88_orchestra_cymbal_crash, 8, 0, 255, 216 @ 84A2F28
+	voice_directsound_no_resample 64, 94, DirectSoundWaveData_unknown_djembe, 255, 0, 255, 0 @ 84A2F34
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo, 255, 0, 255, 0 @ 84A2F40
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 84A2F4C
+	voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88_bongo_low, 255, 0, 255, 0 @ 84A2F58
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2F64
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2F70
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2F7C
@@ -8765,11 +8765,11 @@ voicegroup190:: @ 84A2C58
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A2FF4
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A3000
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A300C
-	voice_directsound_no_resample 64, 39, gDirectSoundWaveData_29, 255, 242, 103, 188 @ 84A3018
-	voice_directsound_no_resample 64, 79, gDirectSoundWaveData_29, 255, 242, 103, 188 @ 84A3024
-	voice_directsound_no_resample 64, 39, gDirectSoundWaveData_29, 255, 165, 103, 188 @ 84A3030
-	voice_directsound_no_resample 64, 64, gDirectSoundWaveData_30, 255, 0, 255, 0 @ 84A303C
+	voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 84A3018
+	voice_directsound_no_resample 64, 79, DirectSoundWaveData_unknown_anvil_high, 255, 242, 103, 188 @ 84A3024
+	voice_directsound_no_resample 64, 39, DirectSoundWaveData_unknown_anvil_high, 255, 165, 103, 188 @ 84A3030
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88_standard_bells, 255, 0, 255, 0 @ 84A303C
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A3048
 	voice_square_1 0, 2, 0, 0, 15, 0 @ 84A3054
-	voice_directsound_no_resample 64, 104, gDirectSoundWaveData_31, 255, 0, 255, 0 @ 84A3060
-	voice_directsound 63, 64, gDirectSoundWaveData_32, 255, 0, 255, 0 @ 84A306C
+	voice_directsound_no_resample 64, 104, DirectSoundWaveData_unknown_anvil_low, 255, 0, 255, 0 @ 84A3060
+	voice_directsound 63, 64, DirectSoundWaveData_unknown_ethnic_drum, 255, 0, 255, 0 @ 84A306C
diff --git a/src/cereader_tool.c b/src/cereader_tool.c
index 654a70b48..2c5d05018 100644
--- a/src/cereader_tool.c
+++ b/src/cereader_tool.c
@@ -41,8 +41,8 @@ bool32 ValidateTrainerTowerData(struct EReaderTrainerHillSet * ttdata)
 
 static bool32 CEReaderTool_SaveTrainerTower_r(struct EReaderTrainerHillSet * ttdata, u8 * buffer)
 {
-    AGB_ASSERT_EX(ttdata->dummy == 0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/cereader_tool.c", 198);
-    AGB_ASSERT_EX(ttdata->id == 0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/cereader_tool.c", 199)
+    AGB_ASSERT_EX(ttdata->dummy == 0, ABSPATH("cereader_tool.c"), 198);
+    AGB_ASSERT_EX(ttdata->id == 0, ABSPATH("cereader_tool.c"), 199)
 
     memset(buffer, 0, 0x1000);
     memcpy(buffer, ttdata, SEC30_SIZE);
diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h
index 3285c8d11..be073876f 100644
--- a/src/data/pokemon/pokedex_text.h
+++ b/src/data/pokemon/pokedex_text.h
@@ -1063,9 +1063,14 @@ const u8 gMewPokedexText[] = _(
 const u8 gMewPokedexTextUnused[] = _("");
 
 const u8 gChikoritaPokedexText[] = _(
+#if REVISION == 0
     "Its pleasantly aromatic leaves have the\n"
+#else
+    "Its pleasantly aromatic leaf has the\n"
+#endif
     "ability to check the humidity and\n"
-    "temperature.");
+    "temperature."
+);
 
 const u8 gChikoritaPokedexTextUnused[] = _("");
 
@@ -1735,9 +1740,16 @@ const u8 gPupitarPokedexText[] = _(
 const u8 gPupitarPokedexTextUnused[] = _("");
 
 const u8 gTyranitarPokedexText[] = _(
+#if REVISION == 0
     "Its body can't be harmed by any sort of\n"
     "attack, so it is very eager to make\n"
-    "challenges against enemies.");
+    "challenges against enemies."
+#else
+    "It has an impudent nature. Having great\n"
+    "strength, it can even change surrounding\n"
+    "landforms."
+#endif
+);
 
 const u8 gTyranitarPokedexTextUnused[] = _("");
 
diff --git a/src/daycare.c b/src/daycare.c
index 8862dfda9..b3e76faba 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -1503,7 +1503,11 @@ static void DaycarePrintMonLvl(struct DayCare *daycare, u8 windowId, u32 daycare
     u8 lvlText[12];
     u8 intText[8];
 
+#if REVISION == 0
     strcpy((char *)lvlText, (const char *)gText_Lv);
+#else
+    StringCopy(lvlText, gText_Lv);
+#endif
     level = GetLevelAfterDaycareSteps(&daycare->mons[daycareSlotId].mon, daycare->mons[daycareSlotId].steps);
     ConvertIntToDecimalStringN(intText, level, STR_CONV_MODE_LEFT_ALIGN, 3);
     StringAppend(lvlText, intText);
diff --git a/src/field_specials.c b/src/field_specials.c
index de3bc7d57..7abc3f5c9 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1915,7 +1915,7 @@ u16 Special_BattleCardAction(void)
     case 4:
         return sub_81445C0(2);
     default:
-        AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scr_tool.c", 3873);
+        AGB_ASSERT_EX(0, ABSPATH("scr_tool.c"), 3873);
         return 0;
     }
 }
diff --git a/src/fieldmap.c b/src/fieldmap.c
index 5582b6977..adb26f230 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -83,7 +83,7 @@ void sub_8058A00(struct MapHeader * mapHeader)
     VMap.map = gBackupMapLayout;
     VMap.Xsize = mapLayout->width + 15;
     VMap.Ysize = mapLayout->height + 14;
-    AGB_ASSERT_EX(VMap.Xsize * VMap.Ysize <= VIRTUAL_MAP_SIZE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/fieldmap.c", 158);
+    AGB_ASSERT_EX(VMap.Xsize * VMap.Ysize <= VIRTUAL_MAP_SIZE, ABSPATH("fieldmap.c"), 158);
     map_copy_with_padding(mapLayout->map, mapLayout->width, mapLayout->height);
     mapheader_copy_mapdata_of_adjacent_maps(mapHeader);
 }
diff --git a/src/intro.c b/src/intro.c
index 33a03a389..cee1c8fec 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -131,6 +131,11 @@ static void sub_80EE9D4(struct Sprite * sprite);
 static void sub_80EEA94(struct IntroSequenceData * ptr);
 static void sub_80EEB08(struct Sprite * sprite);
 static void sub_80EEBE4(void);
+#if REVISION >= 1
+static void sub_rev1_80EDFAC(void);
+#else
+#define sub_rev1_80EDFAC()
+#endif
 
 extern const u32 gMultiBootProgram_PokemonColosseum_Start[];
 
@@ -828,6 +833,7 @@ static void sub_80ECD60(struct IntroSequenceData * this)
         if (!IsDma3ManagerBusyWithBgCopy())
         {
             DestroySprite(this->field_0014);
+            sub_rev1_80EDFAC();
             this->field_0012 = 0;
             this->field_0004++;
         }
@@ -1592,6 +1598,17 @@ static struct Sprite * sub_80EDF68(void)
     return &gSprites[spriteId];
 }
 
+#if REVISION >= 1
+static void sub_rev1_80EDFAC(void)
+{
+    int i;
+    for (i = 0; i < 2; i++)
+    {
+        gSprites[CreateSprite(&gUnknown_840BCFC, 0x68 + 32 * i, 0x6c, 5)].oam.tileNum += i * 4;
+    }
+}
+#endif
+
 static void sub_80EDF94(struct IntroSequenceData * this)
 {
     u8 taskId;
diff --git a/src/main.c b/src/main.c
index 9294c80ce..6d50e5fd3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -57,14 +57,20 @@ static void IntrDummy(void);
 
 #if defined(FIRERED)
 #define GAME_VERSION VERSION_FIRE_RED
-#elif defined(LEAF_GREEN)
+#elif defined(LEAFGREEN)
 #define GAME_VERSION VERSION_LEAF_GREEN
+#else
+#error unknown version
 #endif
 const u8 gGameVersion = GAME_VERSION;
 
 const u8 gGameLanguage = GAME_LANGUAGE;
 
+#if REVISION == 0
 const char BuildDateTime[] = "2004 04 26 11:20";
+#else
+const char BuildDateTime[] = "2004 07 20 09:30";
+#endif
 
 const IntrFunc gIntrTableTemplate[] =
 {
diff --git a/src/malloc.c b/src/malloc.c
index 4768721ba..590d45c05 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -93,7 +93,7 @@ void *AllocInternal(void *heapStart, u32 size)
 
         if (pos->next == head)
         {
-            AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/gflib/malloc.c", 174);
+            AGB_ASSERT_EX(0, ABSPATH("gflib/malloc.c"), 174);
             return NULL;
         }
 
@@ -103,20 +103,20 @@ void *AllocInternal(void *heapStart, u32 size)
 
 void FreeInternal(void *heapStart, void *p)
 {
-    AGB_ASSERT_EX(p != NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/gflib/malloc.c", 195);
+    AGB_ASSERT_EX(p != NULL, ABSPATH("gflib/malloc.c"), 195);
 
     if (p) {
         struct MemBlock *head = (struct MemBlock *)heapStart;
         struct MemBlock *pos = (struct MemBlock *)((u8 *)p - sizeof(struct MemBlock));
-        AGB_ASSERT_EX(pos->magic_number == MALLOC_SYSTEM_ID, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/gflib/malloc.c", 204);
-        AGB_ASSERT_EX(pos->flag == TRUE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/gflib/malloc.c", 205);
+        AGB_ASSERT_EX(pos->magic_number == MALLOC_SYSTEM_ID, ABSPATH("gflib/malloc.c"), 204);
+        AGB_ASSERT_EX(pos->flag == TRUE, ABSPATH("gflib/malloc.c"), 205);
         pos->flag = FALSE;
 
         // If the freed block isn't the last one, merge with the next block
         // if it's not in use.
         if (pos->next != head) {
             if (!pos->next->flag) {
-                AGB_ASSERT_EX(pos->next->magic_number == MALLOC_SYSTEM_ID, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/gflib/malloc.c", 211);
+                AGB_ASSERT_EX(pos->next->magic_number == MALLOC_SYSTEM_ID, ABSPATH("gflib/malloc.c"), 211);
                 pos->size += sizeof(struct MemBlock) + pos->next->size;
                 pos->next->magic_number = 0;
                 pos->next = pos->next->next;
@@ -129,7 +129,7 @@ void FreeInternal(void *heapStart, void *p)
         // if it's not in use.
         if (pos != head) {
             if (!pos->prev->flag) {
-                AGB_ASSERT_EX(pos->prev->magic_number == MALLOC_SYSTEM_ID, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/gflib/malloc.c", 228);
+                AGB_ASSERT_EX(pos->prev->magic_number == MALLOC_SYSTEM_ID, ABSPATH("gflib/malloc.c"), 228);
 
                 pos->prev->next = pos->next;
 
diff --git a/src/menews_jisan.c b/src/menews_jisan.c
index f38de9cfd..d8971f6a2 100644
--- a/src/menews_jisan.c
+++ b/src/menews_jisan.c
@@ -142,7 +142,7 @@ static u32 GetMENewsJisanState(struct MENewsJisanStruct *a0)
             return 4;
         return 5;
     default:
-        AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/menews_jisan.c", 383);
+        AGB_ASSERT_EX(0, ABSPATH("menews_jisan.c"), 383);
         return 0;
     }
 }
diff --git a/src/mevent.c b/src/mevent.c
index 5ed001d09..3eff0c086 100644
--- a/src/mevent.c
+++ b/src/mevent.c
@@ -852,7 +852,7 @@ u16 sub_81444B0(const struct MEventClientHeaderStruct * a0, u32 command)
         case 4:
             return a0->unk_44;
         default:
-             AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c", 825);
+             AGB_ASSERT_EX(0, ABSPATH("mevent.c"), 825);
             return 0;
     }
 }
@@ -881,7 +881,7 @@ void sub_814451C(u32 command)
         }
         if (dest == NULL)
         {
-             AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c", 868);
+             AGB_ASSERT_EX(0, ABSPATH("mevent.c"), 868);
         }
         else if (++(*dest) > 999)
         {
@@ -939,7 +939,7 @@ u16 sub_81445C0(u32 command)
             break;
         }
     }
-    AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c", 913);
+    AGB_ASSERT_EX(0, ABSPATH("mevent.c"), 913);
     return 0;
 }
 
@@ -977,7 +977,7 @@ void sub_8144714(u32 a0, u32 a1)
                 sub_8144824(1, a1, gSaveBlock1Ptr->mysteryEventBuffers.unk_344[0], 5);
                 break;
             default:
-                 AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent.c", 988);
+                 AGB_ASSERT_EX(0, ABSPATH("mevent.c"), 988);
         }
     }
 }
diff --git a/src/mevent_server.c b/src/mevent_server.c
index 252a8885f..bebd69fe3 100644
--- a/src/mevent_server.c
+++ b/src/mevent_server.c
@@ -68,7 +68,7 @@ static void mevent_srv_free_resources(struct mevent_srv_common * svr)
 
 static void mevent_srv_common_init_send(struct mevent_srv_common * svr, u32 ident, const void * src, u32 size)
 {
-     AGB_ASSERT_EX(size <= ME_SEND_BUF_SIZE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 257);
+     AGB_ASSERT_EX(size <= ME_SEND_BUF_SIZE, ABSPATH("mevent_server.c"), 257);
     mevent_srv_sub_init_send(&svr->manager, ident, src, size);
 }
 
@@ -129,7 +129,7 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr)
     switch (cmd->instr)
     {
         case 0:
-            AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 354);
+            AGB_ASSERT_EX(cmd->parameter == NULL, ABSPATH("mevent_server.c"), 354);
             svr->mainseqno = 1;
             svr->param = cmd->flag;
             break;
@@ -137,23 +137,23 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr)
             svr->mainseqno = 3;
             break;
         case 2:
-            AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 364);
+            AGB_ASSERT_EX(cmd->parameter == NULL, ABSPATH("mevent_server.c"), 364);
             mevent_srv_sub_init_recv(&svr->manager, cmd->flag, svr->recvBuffer);
             svr->mainseqno = 2;
             break;
         case 3:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 370);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 370);
             svr->cmdidx = 0;
             svr->cmdBuffer = cmd->parameter;
             break;
         case 5:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 376);
-            AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 377);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 376);
+            AGB_ASSERT_EX(cmd->parameter == NULL, ABSPATH("mevent_server.c"), 377);
             memcpy(svr->mevent_unk1442cc, svr->recvBuffer, sizeof(struct MEventClientHeaderStruct));
             break;
         case 6:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 382);
-            AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 383);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 382);
+            AGB_ASSERT_EX(cmd->parameter == NULL, ABSPATH("mevent_server.c"), 383);
             svr->param = ValidateMEventClientHeader(svr->mevent_unk1442cc);
             break;
         case 4:
@@ -164,42 +164,42 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr)
             }
             break;
         case 7:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 396);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 396);
             ptr = mevent_first_if_not_null_else_second(cmd->parameter, svr->card);
             svr->param = sub_8144418(ptr, svr->mevent_unk1442cc, ptr);
             break;
         case 8:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 402);
-            AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 403);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 402);
+            AGB_ASSERT_EX(cmd->parameter == NULL, ABSPATH("mevent_server.c"), 403);
             svr->param = *(u32 *)svr->recvBuffer;
             break;
         case 9:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 408);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 408);
             ptr = mevent_first_if_not_null_else_second(cmd->parameter, &svr->sendWord);
             svr->param = sub_8144434(ptr, svr->mevent_unk1442cc, ptr);
             break;
         case 10:
-            AGB_ASSERT_EX(cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 415);
+            AGB_ASSERT_EX(cmd->parameter == NULL, ABSPATH("mevent_server.c"), 415);
             svr->param = sub_81444B0(svr->mevent_unk1442cc, cmd->flag);
             break;
         case 11:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 420);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 420);
             svr->param = sub_8144474(svr->mevent_unk1442cc, cmd->parameter);
             break;
         case 12:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 426);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 426);
             svr->param = mevent_compare_pointers(cmd->parameter, *(void **)svr->recvBuffer);
             break;
         case 14:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 432);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 432);
             mevent_srv_common_init_send(svr, 0x17, mevent_first_if_not_null_else_second(cmd->parameter, svr->news), sizeof(struct MEWonderNewsData));
             break;
         case 13:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 438);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 438);
             mevent_srv_common_init_send(svr, 0x16, mevent_first_if_not_null_else_second(cmd->parameter, svr->card), sizeof(struct MEWonderCardData));
             break;
         case 16:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 444);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 444);
             mevent_srv_common_init_send(svr, 0x18, mevent_first_if_not_null_else_second(cmd->parameter, &svr->sendWord), 4);
             break;
         case 15:
@@ -215,7 +215,7 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr)
                 mevent_srv_common_init_send(svr, 0x10, cmd->parameter, cmd->flag);
             break;
         case 19:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 466);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 466);
             mevent_srv_common_init_send(svr, 0x1a, cmd->parameter, 188);
             break;
         case 20:
@@ -225,15 +225,15 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr)
             mevent_srv_common_init_send(svr, 0x1c, cmd->parameter, cmd->flag);
             break;
         case 22:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 481);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 481);
             memcpy(svr->card, cmd->parameter, 332);
             break;
         case 23:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 486);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 486);
             memcpy(svr->news, cmd->parameter, 444);
             break;
         case 21:
-            AGB_ASSERT_EX(cmd->flag == FALSE, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 491);
+            AGB_ASSERT_EX(cmd->flag == FALSE, ABSPATH("mevent_server.c"), 491);
             svr->sendWord = *(u32 *)cmd->parameter;
             break;
         case 24:
@@ -245,16 +245,16 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr)
             svr->sendBuffer2Size = cmd->flag;
             break;
         case 26:
-            AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 506);
+            AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, ABSPATH("mevent_server.c"), 506);
             memcpy(svr->card, GetSavedWonderCard(), 332);
             sub_814410C(svr->card);
             break;
         case 27:
-            AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 512);
+            AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, ABSPATH("mevent_server.c"), 512);
             memcpy(svr->news, GetSavedWonderNews(), 444);
             break;
         case 28:
-            AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 517);
+            AGB_ASSERT_EX(cmd->flag == FALSE && cmd->parameter == NULL, ABSPATH("mevent_server.c"), 517);
             svr->sendBuffer1 = sub_8069E48();
             break;
         case 29:
@@ -276,8 +276,8 @@ static u32 (*const func_tbl[])(struct mevent_srv_common *) = {
 static u32 mevent_srv_exec_common(struct mevent_srv_common * svr)
 {
     u32 response;
-    AGB_ASSERT_EX(svr->mainseqno < NELEMS(func_tbl), "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 546);
+    AGB_ASSERT_EX(svr->mainseqno < NELEMS(func_tbl), ABSPATH("mevent_server.c"), 546);
     response = func_tbl[svr->mainseqno](svr);
-    AGB_ASSERT_EX(svr->mainseqno < NELEMS(func_tbl), "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/mevent_server.c", 548);
+    AGB_ASSERT_EX(svr->mainseqno < NELEMS(func_tbl), ABSPATH("mevent_server.c"), 548);
     return response;
 }
diff --git a/src/quest_log.c b/src/quest_log.c
index 6b25150f3..970071a0f 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -179,9 +179,9 @@ static void sub_8113A1C(u16);
 static void sub_811381C(void);
 static bool8 sub_8113A44(u16, const u16 *);
 static u16 *QuestLog_SkipCommand(u16 *, u16 **);
-static void sub_8113ABC(u16 *);
-static bool8 sub_8113AE8(u16 *);
-static bool8 sub_8113B44(u16 *);
+static void sub_8113ABC(const u16 *);
+static bool8 sub_8113AE8(const u16 *);
+static bool8 sub_8113B44(const u16 *);
 static void sub_8113B88(void);
 static void sub_8113B94(u16);
 static void sub_8113BD8(void);
@@ -2831,19 +2831,24 @@ static u16 *QuestLog_SkipCommand(u16 *curPtr, u16 **prevPtr_p)
     return sQuestLogEventCmdSizes[idx] + (sQuestLogEventCmdSizes[idx] - 4) * cnt + (void *)curPtr;
 }
 
-static void sub_8113ABC(u16 *a0)
+static void sub_8113ABC(const u16 *a0)
 {
-    u8 *r2 = (u8 *)(a0 + 2);
+    const u8 *r2 = (const u8 *)(a0 + 2);
     if ((a0[0] & 0xFFF) != 35)
         gUnknown_203B04A = 0;
     else
         gUnknown_203B04A = r2[1] + 1;
 }
 
-#ifdef NONMATCHING
-static bool8 sub_8113AE8(u16 *a0)
+static bool8 sub_8113AE8(const u16 *a0)
 {
-    if (a0 == NULL || a0[1] > sQuestLogIdx)
+#ifndef NONMATCHING
+    register const u16 *r0 asm("r0") = a0;
+#else
+    const u16 *r0 = a0;
+#endif
+    
+    if (r0 == NULL || r0[1] > sQuestLogIdx)
         return FALSE;
 
     sQuestLogScriptParsingCBs[a0[0] & 0xFFF](a0);
@@ -2853,60 +2858,8 @@ static bool8 sub_8113AE8(u16 *a0)
         gUnknown_203B044.unk_2 = 1;
     return TRUE;
 }
-#else
-NAKED
-static bool8 sub_8113AE8(u16 *a0)
-{
-    asm_unified("\tpush {r4,lr}\n"
-                "\tadds r4, r0, 0\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _08113AFA\n"
-                "\tldr r1, _08113B00 @ =sQuestLogIdx\n"
-                "\tldrh r0, [r0, 0x2]\n"
-                "\tldrh r1, [r1]\n"
-                "\tcmp r0, r1\n"
-                "\tbls _08113B04\n"
-                "_08113AFA:\n"
-                "\tmovs r0, 0\n"
-                "\tb _08113B32\n"
-                "\t.align 2, 0\n"
-                "_08113B00: .4byte sQuestLogIdx\n"
-                "_08113B04:\n"
-                "\tldr r2, _08113B38 @ =sQuestLogScriptParsingCBs\n"
-                "\tldrh r1, [r4]\n"
-                "\tldr r0, _08113B3C @ =0x00000fff\n"
-                "\tands r0, r1\n"
-                "\tlsls r0, 2\n"
-                "\tadds r0, r2\n"
-                "\tldr r1, [r0]\n"
-                "\tadds r0, r4, 0\n"
-                "\tbl _call_via_r1\n"
-                "\tldr r2, _08113B40 @ =gUnknown_203B044\n"
-                "\tldrh r1, [r4]\n"
-                "\tstrb r1, [r2]\n"
-                "\tmovs r0, 0xF0\n"
-                "\tlsls r0, 8\n"
-                "\tands r0, r1\n"
-                "\tlsrs r0, 12\n"
-                "\tstrb r0, [r2, 0x1]\n"
-                "\tcmp r0, 0\n"
-                "\tbeq _08113B30\n"
-                "\tmovs r0, 0x1\n"
-                "\tstrh r0, [r2, 0x2]\n"
-                "_08113B30:\n"
-                "\tmovs r0, 0x1\n"
-                "_08113B32:\n"
-                "\tpop {r4}\n"
-                "\tpop {r1}\n"
-                "\tbx r1\n"
-                "\t.align 2, 0\n"
-                "_08113B38: .4byte sQuestLogScriptParsingCBs\n"
-                "_08113B3C: .4byte 0x00000fff\n"
-                "_08113B40: .4byte gUnknown_203B044");
-}
-#endif
 
-static bool8 sub_8113B44(u16 *a0)
+static bool8 sub_8113B44(const u16 *a0)
 {
     if (gUnknown_203B044.unk_2 == 0)
         return FALSE;
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 6a5d61227..a88655e17 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -105,7 +105,7 @@ bool8 ScrCmd_special(struct ScriptContext *ctx)
     if (specialPtr < gSpecialsEnd)
         (*specialPtr)();
     else
-        AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c", 241);
+        AGB_ASSERT_EX(0, ABSPATH("scrcmd.c"), 241);
     return FALSE;
 }
 
@@ -116,7 +116,7 @@ bool8 ScrCmd_specialvar(struct ScriptContext *ctx)
     if (specialPtr < gSpecialsEnd)
         *varPtr = (*specialPtr)();
     else
-        AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c", 263);
+        AGB_ASSERT_EX(0, ABSPATH("scrcmd.c"), 263);
     return FALSE;
 }
 
diff --git a/src/title_screen.c b/src/title_screen.c
index a67c2cb36..e2257fbbe 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -60,6 +60,7 @@ static void UpdateScanlineEffectRegBuffer(s16 a0);
 static void ScheduleStopScanlineEffect(void);
 static void LoadMainTitleScreenPalsAndResetBgs(void);
 static void CB2_FadeOutTransitionToSaveClearScreen(void);
+static void SpriteCallback_TitleScreenFlameOrLeaf(struct Sprite * sprite);
 static void CB2_FadeOutTransitionToBerryFix(void);
 static void LoadSpriteGfxAndPals(void);
 static void Task_FlameOrLeafSpawner(u8 taskId);
@@ -238,6 +239,12 @@ static const u8 gUnknown_83BFBD4[] = {
     0x04, 0x10, 0x1a, 0x20, 0x30, 0xc8, 0xd8, 0xe0, 0xe8, 0x3c, 0x4c, 0x5c, 0x6c, 0x80, 0x90
 };
 
+#if defined(LEAFGREEN)
+static const u16 gUnknown_LG_83BFA10[] = {
+    50, 80, 110, 60, 90, 70, 100, 50
+};
+#endif
+
 void CB2_InitTitleScreen(void)
 {
     switch (gMain.state)
@@ -876,6 +883,7 @@ static void SpriteCallback_TitleScreenFlameOrLeaf(struct Sprite * sprite)
 #endif
 }
 
+#if defined(FIRERED)
 static bool32 CreateFlameOrLeafSprite(s32 x, s32 y, s32 xspeed, s32 yspeed, bool32 templateId)
 {
     u8 spriteId;
@@ -901,6 +909,35 @@ static bool32 CreateFlameOrLeafSprite(s32 x, s32 y, s32 xspeed, s32 yspeed, bool
     }
     return FALSE;
 }
+#elif defined(LEAFGREEN)
+void _CreateFlameOrLeafSprite(s32 y0, s32 x1, s32 y1)
+{
+    u8 spriteId = CreateSprite(&sSpriteTemplate_FlameOrLeaf_State0, 0xF0, y0, 0);
+    if (spriteId != MAX_SPRITES)
+    {
+        gSprites[spriteId].data[0] = 0xF00;
+        gSprites[spriteId].data[1] = x1;
+        gSprites[spriteId].data[2] = y0 << 4;
+        gSprites[spriteId].data[3] = y1;
+        gSprites[spriteId].callback = SpriteCallback_TitleScreenFlameOrLeaf;
+    }
+}
+
+void SpriteCallback_LG_8079800(struct Sprite * sprite)
+{
+    sprite->pos1.x -= 7;
+    if (sprite->pos1.x < -16)
+    {
+        sprite->pos1.x = 0x100;
+        sprite->data[7]++;
+        if (sprite->data[7] >= NELEMS(gUnknown_LG_83BFA10))
+            sprite->data[7] = 0;
+        sprite->pos1.y = gUnknown_LG_83BFA10[sprite->data[7]];
+    }
+}
+
+#define CreateFlameOrLeafSprite ((bool32 (*)())_CreateFlameOrLeafSprite)
+#endif //FRLG
 
 static void Task_FlameOrLeafSpawner(u8 taskId)
 {
diff --git a/src/trade.c b/src/trade.c
index 42ff22978..2f48928ec 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -365,41 +365,58 @@ static const u8 sTradeMonSpriteCoords[][2] = {
     {0x17, 0x12},
 };
 
-// No idea if a 4D array is correct
-static const u8 gUnknown_8261E5A[][2][6][2] = {
-    {
-        {
-            {0x05, 0x04},
-            {0x0c, 0x04},
-            {0x05, 0x09},
-            {0x0c, 0x09},
-            {0x05, 0x0e},
-            {0x0c, 0x0e}
-        }, {
-            {0x14, 0x04},
-            {0x1b, 0x04},
-            {0x14, 0x09},
-            {0x1b, 0x09},
-            {0x14, 0x0e},
-            {0x1b, 0x0e}
-        }
-    }, {
-        {
-            {0x01, 0x03},
-            {0x08, 0x03},
-            {0x01, 0x08},
-            {0x08, 0x08},
-            {0x01, 0x0d},
-            {0x08, 0x0d}
-        }, {
-            {0x10, 0x03},
-            {0x17, 0x03},
-            {0x10, 0x08},
-            {0x17, 0x08},
-            {0x10, 0x0d},
-            {0x17, 0x0d}
-        }
-    }
+static const u8 gUnknown_8261E5A[][2][2] = {
+    {
+        {0x05, 0x04},
+        {0x0c, 0x04},
+    },
+    {
+        {0x05, 0x09},
+        {0x0c, 0x09},
+    },
+    {
+        {0x05, 0x0e},
+        {0x0c, 0x0e}
+    },
+    {
+        {0x14, 0x04},
+        {0x1b, 0x04},
+    },
+    {
+        {0x14, 0x09},
+        {0x1b, 0x09},
+    },
+    {
+        {0x14, 0x0e},
+        {0x1b, 0x0e},
+    },
+};
+
+static const u8 gUnknown_8261E72[][2][2] = {
+    {
+        {0x01, 0x03},
+        {0x08, 0x03},
+    },
+    {
+        {0x01, 0x08},
+        {0x08, 0x08},
+    },
+    {
+        {0x01, 0x0d},
+        {0x08, 0x0d}
+    },
+    {
+        {0x10, 0x03},
+        {0x17, 0x03},
+    },
+    {
+        {0x10, 0x08},
+        {0x17, 0x08},
+    },
+    {
+        {0x10, 0x0d},
+        {0x17, 0x0d},
+    },
 };
 
 static const u8 sTradeUnknownSpriteCoords[][4] = {
@@ -2328,78 +2345,28 @@ static void sub_804F08C(u8 whichParty, u8 monIdx, u8 a2, u8 a3, u8 a4, u8 a5)
     sTradeMenuResourcesPtr->tilemapBuffer[(a3 - 1) * 32 + a2 + 1] = r2;
 }
 
-#ifdef NONMATCHING
-// Instruction swap when setting r5 and r4
 static void sub_804F284(u8 whichParty)
 {
     s32 i;
     for (i = 0; i < sTradeMenuResourcesPtr->partyCounts[whichParty]; i++)
     {
+        const u8 (*r5)[2];
+        const u8 (*r4)[2];
+        u32 r0 = 3 * whichParty;
+        const u8 (*r1)[2][2] = gUnknown_8261E5A;
+        r5 = r1[r0];
+        r4 = gUnknown_8261E72[r0];
+
         sub_804F08C(
             whichParty,
             i,
-            gUnknown_8261E5A[0][whichParty][i][0],
-            gUnknown_8261E5A[0][whichParty][i][1],
-            gUnknown_8261E5A[1][whichParty][i][0],
-            gUnknown_8261E5A[1][whichParty][i][1]
+            r5[i][0],
+            r5[i][1],
+            r4[i][0],
+            r4[i][1]
         );
     }
 }
-#else
-NAKED
-static void sub_804F284(u8 whichParty)
-{
-    asm_unified("\tpush {r4-r7,lr}\n"
-                "\tsub sp, 0x8\n"
-                "\tlsls r0, 24\n"
-                "\tlsrs r6, r0, 24\n"
-                "\tmovs r7, 0\n"
-                "\tldr r0, _0804F2DC @ =sTradeMenuResourcesPtr\n"
-                "\tldr r0, [r0]\n"
-                "\tadds r0, 0x36\n"
-                "\tadds r0, r6\n"
-                "\tldrb r0, [r0]\n"
-                "\tcmp r7, r0\n"
-                "\tbge _0804F2D4\n"
-                "\tlsls r0, r6, 1\n"
-                "\tadds r0, r6\n"
-                "\tldr r1, _0804F2E0 @ =gUnknown_8261E5A\n"
-                "\tlsls r0, 2\n"
-                "\tadds r5, r0, r1\n"
-                "\tldr r1, _0804F2E4 @ =gUnknown_8261E5A+24\n"
-                "\tadds r4, r0, r1\n"
-                "_0804F2AA:\n"
-                "\tlsls r1, r7, 24\n"
-                "\tlsrs r1, 24\n"
-                "\tldrb r2, [r5]\n"
-                "\tldrb r3, [r5, 0x1]\n"
-                "\tldrb r0, [r4]\n"
-                "\tstr r0, [sp]\n"
-                "\tldrb r0, [r4, 0x1]\n"
-                "\tstr r0, [sp, 0x4]\n"
-                "\tadds r0, r6, 0\n"
-                "\tbl sub_804F08C\n"
-                "\tadds r5, 0x2\n"
-                "\tadds r4, 0x2\n"
-                "\tadds r7, 0x1\n"
-                "\tldr r0, _0804F2DC @ =sTradeMenuResourcesPtr\n"
-                "\tldr r0, [r0]\n"
-                "\tadds r0, 0x36\n"
-                "\tadds r0, r6\n"
-                "\tldrb r0, [r0]\n"
-                "\tcmp r7, r0\n"
-                "\tblt _0804F2AA\n"
-                "_0804F2D4:\n"
-                "\tadd sp, 0x8\n"
-                "\tpop {r4-r7}\n"
-                "\tpop {r0}\n"
-                "\tbx r0\n"
-                "\t.align 2, 0\n"
-                "_0804F2DC: .4byte sTradeMenuResourcesPtr\n"
-                "_0804F2E0: .4byte gUnknown_8261E5A\n"
-                "_0804F2E4: .4byte gUnknown_8261E5A+24");
-}
-#endif //NONMATCHING
 
 static void sub_804F2E8(u8 whichParty)
 {