Output .bin file for direct sound metadata (loop point, pitch adust, and number of samples). This was needed since we couldn't incbin a string argument in a macro.

5 files changed, 252 insertions, 369 deletions

diff --git a/.gitignore b/.gitignore
index f41dfbdfb..01f43cd36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 *.latfont
 *.hwjpnfont
 *.fwjpnfont
+data/music/direct_sound_samples/*.bin
 pokeas
 pokeld
 pokeobjcopy
diff --git a/Makefile b/Makefile
index d838fcbe2..3f11e0246 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ PREPROC := tools/preproc/preproc
 # Secondary expansion is required for dependency variables in object rules.
 .SECONDEXPANSION:
 
-.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl %.pcm
+.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl %.pcm %.bin
 
 .PHONY: all clean compare ruby sapphire
 
@@ -91,6 +91,7 @@ include misc.mk
 %.lz: % ; $(GFX) $< $@
 %.rl: % ; $(GFX) $< $@
 %.pcm: %.aif  ; $(AIF) $< $@
+%.bin: %.aif  ; $(AIF) $< $@
 
 src/libc_ruby.o src/libc_sapphire.o: CC1 := tools/agbcc/bin/old_agbcc
 src/libc_ruby.o src/libc_sapphire.o: CFLAGS := -O2
diff --git a/asm/macros/music_voice.s b/asm/macros/music_voice.s
index 357ee3b3f..9a95d69f4 100644
--- a/asm/macros/music_voice.s
+++ b/asm/macros/music_voice.s
@@ -111,17 +111,3 @@
 	.4byte \voice_group_pointer
 	.4byte 0
 	.endm
-
-	.macro directsound_looped pitch_adjust, loop_start_sample_index, num_samples
-	.4byte 0x40000000
-	.4byte \pitch_adjust
-	.4byte \loop_start_sample_index
-	.4byte \num_samples
-	.endm
-
-	.macro directsound_not_looped pitch_adjust, num_samples
-	.4byte 0x0
-	.4byte \pitch_adjust
-	.4byte 0x0
-	.4byte \num_samples
-	.endm
diff --git a/data/music/direct_sound_data.s b/data/music/direct_sound_data.s
index e5a321c82..49e79a6c6 100644
--- a/data/music/direct_sound_data.s
+++ b/data/music/direct_sound_data.s
@@ -1,827 +1,709 @@
 DirectSoundWaveData_8456330: @ 8456330
-	directsound_looped 0x344300, 0x2bb, (DirectSoundSamples_8456330_End - DirectSoundSamples_8456330_Start) - 1
-DirectSoundSamples_8456330_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8456330.bin"
 	.incbin "data/music/direct_sound_samples/8456330.pcm"
-DirectSoundSamples_8456330_End:
 	.align 2
 
 DirectSoundWaveData_84569D4: @ 84569D4
-	directsound_looped 0x688600, 0x47e, (DirectSoundSamples_84569D4_End - DirectSoundSamples_84569D4_Start) - 1
-DirectSoundSamples_84569D4_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/84569D4.bin"
 	.incbin "data/music/direct_sound_samples/84569D4.pcm"
-DirectSoundSamples_84569D4_End:
 	.align 2
 
 DirectSoundWaveData_84571CC: @ 84571CC
-	directsound_looped 0x3443000, 0x482, (DirectSoundSamples_84571CC_End - DirectSoundSamples_84571CC_Start) - 1
-DirectSoundSamples_84571CC_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/84571CC.bin"
 	.incbin "data/music/direct_sound_samples/84571CC.pcm"
-DirectSoundSamples_84571CC_End:
 	.align 2
 
 DirectSoundWaveData_8457D98: @ 8457D98
-	directsound_looped 0x2b11000, 0x9dc, (DirectSoundSamples_8457D98_End - DirectSoundSamples_8457D98_Start) - 1
-DirectSoundSamples_8457D98_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8457D98.bin"
 	.incbin "data/music/direct_sound_samples/8457D98.pcm"
-DirectSoundSamples_8457D98_End:
 	.align 2
 
 DirectSoundWaveData_8458CD0: @ 8458CD0
-	directsound_looped 0x1588800, 0x71a, (DirectSoundSamples_8458CD0_End - DirectSoundSamples_8458CD0_Start) - 1
-DirectSoundSamples_8458CD0_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8458CD0.bin"
 	.incbin "data/music/direct_sound_samples/8458CD0.pcm"
-DirectSoundSamples_8458CD0_End:
 	.align 2
 
 DirectSoundWaveData_8459944: @ 8459944
-	directsound_looped 0x1a21800, 0xed5, (DirectSoundSamples_8459944_End - DirectSoundSamples_8459944_Start) - 1
-DirectSoundSamples_8459944_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8459944.bin"
 	.incbin "data/music/direct_sound_samples/8459944.pcm"
-DirectSoundSamples_8459944_End:
 	.align 2
 
 DirectSoundWaveData_845AE14: @ 845AE14
-	directsound_not_looped 0xd10c00, (DirectSoundSamples_845AE14_End - DirectSoundSamples_845AE14_Start) - 1
-DirectSoundSamples_845AE14_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/845AE14.bin"
 	.incbin "data/music/direct_sound_samples/845AE14.pcm"
-DirectSoundSamples_845AE14_End:
 	.align 2
 
 DirectSoundWaveData_845B2B4: @ 845B2B4
-	directsound_not_looped 0xac4400, (DirectSoundSamples_845B2B4_End - DirectSoundSamples_845B2B4_Start) - 1
-DirectSoundSamples_845B2B4_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/845B2B4.bin"
 	.incbin "data/music/direct_sound_samples/845B2B4.pcm"
-DirectSoundSamples_845B2B4_End:
 	.align 2
 
 DirectSoundWaveData_845B9A8: @ 845B9A8
-	directsound_not_looped 0xd10c00, (DirectSoundSamples_845B9A8_End - DirectSoundSamples_845B9A8_Start) - 1
-DirectSoundSamples_845B9A8_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/845B9A8.bin"
 	.incbin "data/music/direct_sound_samples/845B9A8.pcm"
-DirectSoundSamples_845B9A8_End:
 	.align 2
 
 DirectSoundWaveData_845C238: @ 845C238
-	directsound_not_looped 0xd10c00, (DirectSoundSamples_845C238_End - DirectSoundSamples_845C238_Start) - 1
-DirectSoundSamples_845C238_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/845C238.bin"
 	.incbin "data/music/direct_sound_samples/845C238.pcm"
-DirectSoundSamples_845C238_End:
 	.align 2
 
 DirectSoundWaveData_845CAB0: @ 845CAB0
-	directsound_looped 0xac4400, 0x8c6, (DirectSoundSamples_845CAB0_End - DirectSoundSamples_845CAB0_Start) - 1
-DirectSoundSamples_845CAB0_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/845CAB0.bin"
 	.incbin "data/music/direct_sound_samples/845CAB0.pcm"
-DirectSoundSamples_845CAB0_End:
 	.align 2
 
 DirectSoundWaveData_845DAF0: @ 845DAF0
-	directsound_not_looped 0xd10c00, (DirectSoundSamples_845DAF0_End - DirectSoundSamples_845DAF0_Start) - 1
-DirectSoundSamples_845DAF0_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/845DAF0.bin"
 	.incbin "data/music/direct_sound_samples/845DAF0.pcm"
-DirectSoundSamples_845DAF0_End:
 	.align 2
 
 DirectSoundWaveData_845DF04: @ 845DF04
-	directsound_looped 0xd10c00, 0x8c7, (DirectSoundSamples_845DF04_End - DirectSoundSamples_845DF04_Start) - 1
-DirectSoundSamples_845DF04_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/845DF04.bin"
 	.incbin "data/music/direct_sound_samples/845DF04.pcm"
-DirectSoundSamples_845DF04_End:
 	.align 2
 
 DirectSoundWaveData_845ED34: @ 845ED34
-	directsound_looped 0xac4400, 0xa45, (DirectSoundSamples_845ED34_End - DirectSoundSamples_845ED34_Start) - 1
-DirectSoundSamples_845ED34_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/845ED34.bin"
 	.incbin "data/music/direct_sound_samples/845ED34.pcm"
-DirectSoundSamples_845ED34_End:
 	.align 2
 
 DirectSoundWaveData_845FCC8: @ 845FCC8
-	directsound_not_looped 0xd10c00, (DirectSoundSamples_845FCC8_End - DirectSoundSamples_845FCC8_Start) - 1
-DirectSoundSamples_845FCC8_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/845FCC8.bin"
 	.incbin "data/music/direct_sound_samples/845FCC8.pcm"
-DirectSoundSamples_845FCC8_End:
 	.align 2
 
 DirectSoundWaveData_846057C: @ 846057C
-	directsound_looped 0xac4400, 0x628, (DirectSoundSamples_846057C_End - DirectSoundSamples_846057C_Start) - 1
-DirectSoundSamples_846057C_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/846057C.bin"
 	.incbin "data/music/direct_sound_samples/846057C.pcm"
-DirectSoundSamples_846057C_End:
 	.align 2
 
 DirectSoundWaveData_8460E60: @ 8460E60
-	directsound_looped 0xd10c00, 0x8d5, (DirectSoundSamples_8460E60_End - DirectSoundSamples_8460E60_Start) - 1
-DirectSoundSamples_8460E60_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8460E60.bin"
 	.incbin "data/music/direct_sound_samples/8460E60.pcm"
-DirectSoundSamples_8460E60_End:
 	.align 2
 
 DirectSoundWaveData_8461D8C: @ 8461D8C
-	directsound_not_looped 0xd10c00, (DirectSoundSamples_8461D8C_End - DirectSoundSamples_8461D8C_Start) - 1
-DirectSoundSamples_8461D8C_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8461D8C.bin"
 	.incbin "data/music/direct_sound_samples/8461D8C.pcm"
-DirectSoundSamples_8461D8C_End:
 	.align 2
 
 DirectSoundWaveData_84622A4: @ 84622A4
-	directsound_not_looped 0xd10c00, (DirectSoundSamples_84622A4_End - DirectSoundSamples_84622A4_Start) - 1
-DirectSoundSamples_84622A4_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/84622A4.bin"
 	.incbin "data/music/direct_sound_samples/84622A4.pcm"
-DirectSoundSamples_84622A4_End:
 	.align 2
 
 DirectSoundWaveData_846286C: @ 846286C
-	directsound_looped 0x1a21800, 0x9b4, (DirectSoundSamples_846286C_End - DirectSoundSamples_846286C_Start) - 1
-DirectSoundSamples_846286C_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/846286C.bin"
 	.incbin "data/music/direct_sound_samples/846286C.pcm"
-DirectSoundSamples_846286C_End:
 	.align 2
 
 DirectSoundWaveData_84637CC: @ 84637CC
-	directsound_looped 0xd10c00, 0xc50, (DirectSoundSamples_84637CC_End - DirectSoundSamples_84637CC_Start) - 1
-DirectSoundSamples_84637CC_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/84637CC.bin"
 	.incbin "data/music/direct_sound_samples/84637CC.pcm"
-DirectSoundSamples_84637CC_End:
 	.align 2
 
 DirectSoundWaveData_8464E2C: @ 8464E2C
-	directsound_looped 0x688600, 0xae8, (DirectSoundSamples_8464E2C_End - DirectSoundSamples_8464E2C_Start) - 1
-DirectSoundSamples_8464E2C_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8464E2C.bin"
 	.incbin "data/music/direct_sound_samples/8464E2C.pcm"
-DirectSoundSamples_8464E2C_End:
 	.align 2
 
 DirectSoundWaveData_8466388: @ 8466388
-	directsound_looped 0x1a2180, 0x600, (DirectSoundSamples_8466388_End - DirectSoundSamples_8466388_Start) - 1
-DirectSoundSamples_8466388_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8466388.bin"
 	.incbin "data/music/direct_sound_samples/8466388.pcm"
-DirectSoundSamples_8466388_End:
 	.align 2
 
 DirectSoundWaveData_8466F14: @ 8466F14
-	directsound_looped 0xd10c00, 0x10cd, (DirectSoundSamples_8466F14_End - DirectSoundSamples_8466F14_Start) - 1
-DirectSoundSamples_8466F14_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8466F14.bin"
 	.incbin "data/music/direct_sound_samples/8466F14.pcm"
-DirectSoundSamples_8466F14_End:
 	.align 2
 
 DirectSoundWaveData_846A4B8: @ 846A4B8
-	directsound_looped 0x688600, 0x1151, (DirectSoundSamples_846A4B8_End - DirectSoundSamples_846A4B8_Start) - 1
-DirectSoundSamples_846A4B8_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/846A4B8.bin"
 	.incbin "data/music/direct_sound_samples/846A4B8.pcm"
-DirectSoundSamples_846A4B8_End:
 	.align 2
 
 DirectSoundWaveData_846C7D4: @ 846C7D4
-	directsound_looped 0x344300, 0x1f9b, (DirectSoundSamples_846C7D4_End - DirectSoundSamples_846C7D4_Start) - 1
-DirectSoundSamples_846C7D4_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/846C7D4.bin"
 	.incbin "data/music/direct_sound_samples/846C7D4.pcm"
-DirectSoundSamples_846C7D4_End:
 	.align 2
 
 DirectSoundWaveData_846FEA0: @ 846FEA0
-	directsound_looped 0xd10c00, 0xf0b, (DirectSoundSamples_846FEA0_End - DirectSoundSamples_846FEA0_Start) - 1
-DirectSoundSamples_846FEA0_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/846FEA0.bin"
 	.incbin "data/music/direct_sound_samples/846FEA0.pcm"
-DirectSoundSamples_846FEA0_End:
 	.align 2
 
 DirectSoundWaveData_84711F0: @ 84711F0
-	directsound_looped 0x688600, 0xe34, (DirectSoundSamples_84711F0_End - DirectSoundSamples_84711F0_Start) - 1
-DirectSoundSamples_84711F0_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/84711F0.bin"
 	.incbin "data/music/direct_sound_samples/84711F0.pcm"
-DirectSoundSamples_84711F0_End:
 	.align 2
 
 DirectSoundWaveData_8472700: @ 8472700
-	directsound_looped 0x344300, 0x121a, (DirectSoundSamples_8472700_End - DirectSoundSamples_8472700_Start) - 1
-DirectSoundSamples_8472700_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8472700.bin"
 	.incbin "data/music/direct_sound_samples/8472700.pcm"
-DirectSoundSamples_8472700_End:
 	.align 2
 
 DirectSoundWaveData_8473B20: @ 8473B20
-	directsound_looped 0x2b11000, 0xe8c, (DirectSoundSamples_8473B20_End - DirectSoundSamples_8473B20_Start) - 1
-DirectSoundSamples_8473B20_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8473B20.bin"
 	.incbin "data/music/direct_sound_samples/8473B20.pcm"
-DirectSoundSamples_8473B20_End:
 	.align 2
 
 DirectSoundWaveData_8474BBC: @ 8474BBC
-	directsound_looped 0x1588800, 0x75d, (DirectSoundSamples_8474BBC_End - DirectSoundSamples_8474BBC_Start) - 1
-DirectSoundSamples_8474BBC_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8474BBC.bin"
 	.incbin "data/music/direct_sound_samples/8474BBC.pcm"
-DirectSoundSamples_8474BBC_End:
 	.align 2
 
 DirectSoundWaveData_8475C18: @ 8475C18
-	directsound_looped 0xd10c00, 0x216e, (DirectSoundSamples_8475C18_End - DirectSoundSamples_8475C18_Start) - 1
-DirectSoundSamples_8475C18_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8475C18.bin"
 	.incbin "data/music/direct_sound_samples/8475C18.pcm"
-DirectSoundSamples_8475C18_End:
 	.align 2
 
 DirectSoundWaveData_847CBAC: @ 847CBAC
-	directsound_looped 0x688600, 0x2624, (DirectSoundSamples_847CBAC_End - DirectSoundSamples_847CBAC_Start) - 1
-DirectSoundSamples_847CBAC_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/847CBAC.bin"
 	.incbin "data/music/direct_sound_samples/847CBAC.pcm"
-DirectSoundSamples_847CBAC_End:
 	.align 2
 
 DirectSoundWaveData_8481130: @ 8481130
-	directsound_looped 0x688600, 0x1693, (DirectSoundSamples_8481130_End - DirectSoundSamples_8481130_Start) - 1
-DirectSoundSamples_8481130_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8481130.bin"
 	.incbin "data/music/direct_sound_samples/8481130.pcm"
-DirectSoundSamples_8481130_End:
 	.align 2
 
 DirectSoundWaveData_84830A0: @ 84830A0
-	directsound_looped 0x344300, 0x520, (DirectSoundSamples_84830A0_End - DirectSoundSamples_84830A0_Start) - 1
-DirectSoundSamples_84830A0_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/84830A0.bin"
 	.incbin "data/music/direct_sound_samples/84830A0.pcm"
-DirectSoundSamples_84830A0_End:
 	.align 2
 
 DirectSoundWaveData_8483804: @ 8483804
-	directsound_looped 0x3443000, 0x1037, (DirectSoundSamples_8483804_End - DirectSoundSamples_8483804_Start) - 1
-DirectSoundSamples_8483804_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8483804.bin"
 	.incbin "data/music/direct_sound_samples/8483804.pcm"
-DirectSoundSamples_8483804_End:
 	.align 2
 
 DirectSoundWaveData_8485454: @ 8485454
-	directsound_looped 0x1a21800, 0xed5, (DirectSoundSamples_8485454_End - DirectSoundSamples_8485454_Start) - 1
-DirectSoundSamples_8485454_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8485454.bin"
 	.incbin "data/music/direct_sound_samples/8485454.pcm"
-DirectSoundSamples_8485454_End:
 	.align 2
 
 DirectSoundWaveData_8486924: @ 8486924
-	directsound_looped 0xac4400, 0x667, (DirectSoundSamples_8486924_End - DirectSoundSamples_8486924_Start) - 1
-DirectSoundSamples_8486924_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8486924.bin"
 	.incbin "data/music/direct_sound_samples/8486924.pcm"
-DirectSoundSamples_8486924_End:
 	.align 2
 
 DirectSoundWaveData_8487330: @ 8487330
-	directsound_looped 0x688600, 0xcb1, (DirectSoundSamples_8487330_End - DirectSoundSamples_8487330_Start) - 1
-DirectSoundSamples_8487330_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8487330.bin"
 	.incbin "data/music/direct_sound_samples/8487330.pcm"
-DirectSoundSamples_8487330_End:
 	.align 2
 
 DirectSoundWaveData_8488F44: @ 8488F44
-	directsound_not_looped 0xd10c00, (DirectSoundSamples_8488F44_End - DirectSoundSamples_8488F44_Start) - 1
-DirectSoundSamples_8488F44_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8488F44.bin"
 	.incbin "data/music/direct_sound_samples/8488F44.pcm"
-DirectSoundSamples_8488F44_End:
 	.align 2
 
 DirectSoundWaveData_848A8A4: @ 848A8A4
-	directsound_not_looped 0xd10c00, (DirectSoundSamples_848A8A4_End - DirectSoundSamples_848A8A4_Start) - 1
-DirectSoundSamples_848A8A4_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/848A8A4.bin"
 	.incbin "data/music/direct_sound_samples/848A8A4.pcm"
-DirectSoundSamples_848A8A4_End:
 	.align 2
 
 DirectSoundWaveData_848BD68: @ 848BD68
-	directsound_looped 0x688600, 0x309, (DirectSoundSamples_848BD68_End - DirectSoundSamples_848BD68_Start) - 1
-DirectSoundSamples_848BD68_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/848BD68.bin"
 	.incbin "data/music/direct_sound_samples/848BD68.pcm"
-DirectSoundSamples_848BD68_End:
 	.align 2
 
 DirectSoundWaveData_848C4A4: @ 848C4A4
-	directsound_looped 0xd10c00, 0x0, (DirectSoundSamples_848C4A4_End - DirectSoundSamples_848C4A4_Start) - 1
-DirectSoundSamples_848C4A4_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/848C4A4.bin"
 	.incbin "data/music/direct_sound_samples/848C4A4.pcm"
-DirectSoundSamples_848C4A4_End:
 	.align 2
 
 DirectSoundWaveData_848E094: @ 848E094
-	directsound_looped 0xd10c00, 0x0, (DirectSoundSamples_848E094_End - DirectSoundSamples_848E094_Start) - 1
-DirectSoundSamples_848E094_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/848E094.bin"
 	.incbin "data/music/direct_sound_samples/848E094.pcm"
-DirectSoundSamples_848E094_End:
 	.align 2
 
 DirectSoundWaveData_848F448: @ 848F448
-	directsound_looped 0xd10c00, 0x1998, (DirectSoundSamples_848F448_End - DirectSoundSamples_848F448_Start) - 1
-DirectSoundSamples_848F448_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/848F448.bin"
 	.incbin "data/music/direct_sound_samples/848F448.pcm"
-DirectSoundSamples_848F448_End:
 	.align 2
 
 DirectSoundWaveData_8491ACC: @ 8491ACC
-	directsound_looped 0xd10c00, 0x8c6, (DirectSoundSamples_8491ACC_End - DirectSoundSamples_8491ACC_Start) - 1
-DirectSoundSamples_8491ACC_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8491ACC.bin"
 	.incbin "data/music/direct_sound_samples/8491ACC.pcm"
-DirectSoundSamples_8491ACC_End:
 	.align 2
 
 DirectSoundWaveData_8492D10: @ 8492D10
-	directsound_not_looped 0xd10c00, (DirectSoundSamples_8492D10_End - DirectSoundSamples_8492D10_Start) - 1
-DirectSoundSamples_8492D10_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8492D10.bin"
 	.incbin "data/music/direct_sound_samples/8492D10.pcm"
-DirectSoundSamples_8492D10_End:
 	.align 2
 
 DirectSoundWaveData_8493D20: @ 8493D20
-	directsound_looped 0xd10c00, 0x2cd, (DirectSoundSamples_8493D20_End - DirectSoundSamples_8493D20_Start) - 1
-DirectSoundSamples_8493D20_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8493D20.bin"
 	.incbin "data/music/direct_sound_samples/8493D20.pcm"
-DirectSoundSamples_8493D20_End:
 	.align 2
 
 DirectSoundWaveData_8495028: @ 8495028
-	directsound_looped 0xd10c00, 0x67c, (DirectSoundSamples_8495028_End - DirectSoundSamples_8495028_Start) - 1
-DirectSoundSamples_8495028_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8495028.bin"
 	.incbin "data/music/direct_sound_samples/8495028.pcm"
-DirectSoundSamples_8495028_End:
 	.align 2
 
 DirectSoundWaveData_8497134: @ 8497134
-	directsound_looped 0x688600, 0x1a98, (DirectSoundSamples_8497134_End - DirectSoundSamples_8497134_Start) - 1
-DirectSoundSamples_8497134_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8497134.bin"
 	.incbin "data/music/direct_sound_samples/8497134.pcm"
-DirectSoundSamples_8497134_End:
 	.align 2
 
 DirectSoundWaveData_8499110: @ 8499110
-	directsound_looped 0xd10c00, 0xb45, (DirectSoundSamples_8499110_End - DirectSoundSamples_8499110_Start) - 1
-DirectSoundSamples_8499110_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8499110.bin"
 	.incbin "data/music/direct_sound_samples/8499110.pcm"
-DirectSoundSamples_8499110_End:
 	.align 2
 
 DirectSoundWaveData_849B320: @ 849B320
-	directsound_looped 0xd10c00, 0xd5, (DirectSoundSamples_849B320_End - DirectSoundSamples_849B320_Start) - 1
-DirectSoundSamples_849B320_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/849B320.bin"
 	.incbin "data/music/direct_sound_samples/849B320.pcm"
-DirectSoundSamples_849B320_End:
 	.align 2
 
 DirectSoundWaveData_849BAEC: @ 849BAEC
-	directsound_looped 0x688600, 0x107a, (DirectSoundSamples_849BAEC_End - DirectSoundSamples_849BAEC_Start) - 1
-DirectSoundSamples_849BAEC_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/849BAEC.bin"
 	.incbin "data/music/direct_sound_samples/849BAEC.pcm"
-DirectSoundSamples_849BAEC_End:
 	.align 2
 
 DirectSoundWaveData_849D45C: @ 849D45C
-	directsound_looped 0xd10c00, 0xc79, (DirectSoundSamples_849D45C_End - DirectSoundSamples_849D45C_Start) - 1
-DirectSoundSamples_849D45C_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/849D45C.bin"
 	.incbin "data/music/direct_sound_samples/849D45C.pcm"
-DirectSoundSamples_849D45C_End:
 	.align 2
 
 DirectSoundWaveData_849F40C: @ 849F40C
-	directsound_looped 0x1a21800, 0x1577, (DirectSoundSamples_849F40C_End - DirectSoundSamples_849F40C_Start) - 1
-DirectSoundSamples_849F40C_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/849F40C.bin"
 	.incbin "data/music/direct_sound_samples/849F40C.pcm"
-DirectSoundSamples_849F40C_End:
 	.align 2
 
 DirectSoundWaveData_84A26EC: @ 84A26EC
-	directsound_looped 0x344300, 0x461, (DirectSoundSamples_84A26EC_End - DirectSoundSamples_84A26EC_Start) - 1
-DirectSoundSamples_84A26EC_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/84A26EC.bin"
 	.incbin "data/music/direct_sound_samples/84A26EC.pcm"
-DirectSoundSamples_84A26EC_End:
 	.align 2
 
 DirectSoundWaveData_84A311C: @ 84A311C
-	directsound_looped 0x344300, 0x5b1, (DirectSoundSamples_84A311C_End - DirectSoundSamples_84A311C_Start) - 1
-DirectSoundSamples_84A311C_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/84A311C.bin"
 	.incbin "data/music/direct_sound_samples/84A311C.pcm"
-DirectSoundSamples_84A311C_End:
 	.align 2
 
 DirectSoundWaveData_84A3B50: @ 84A3B50
-	directsound_looped 0xd10c00, 0xb87, (DirectSoundSamples_84A3B50_End - DirectSoundSamples_84A3B50_Start) - 1
-DirectSoundSamples_84A3B50_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/84A3B50.bin"
 	.incbin "data/music/direct_sound_samples/84A3B50.pcm"
-DirectSoundSamples_84A3B50_End:
 	.align 2
 
 DirectSoundWaveData_84A5690: @ 84A5690
-	directsound_looped 0xac4400, 0x0, (DirectSoundSamples_84A5690_End - DirectSoundSamples_84A5690_Start) - 1
-DirectSoundSamples_84A5690_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/84A5690.bin"
 	.incbin "data/music/direct_sound_samples/84A5690.pcm"
-DirectSoundSamples_84A5690_End:
 	.align 2
 
 DirectSoundWaveData_84A5F58: @ 84A5F58
-	directsound_looped 0x688600, 0x7c2, (DirectSoundSamples_84A5F58_End - DirectSoundSamples_84A5F58_Start) - 1
-DirectSoundSamples_84A5F58_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/84A5F58.bin"
 	.incbin "data/music/direct_sound_samples/84A5F58.pcm"
-DirectSoundSamples_84A5F58_End:
 	.align 2
 
 DirectSoundWaveData_84A7328: @ 84A7328
-	directsound_looped 0xa44000, 0x628, (DirectSoundSamples_84A7328_End - DirectSoundSamples_84A7328_Start) - 1
-DirectSoundSamples_84A7328_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/84A7328.bin"
 	.incbin "data/music/direct_sound_samples/84A7328.pcm"
-DirectSoundSamples_84A7328_End:
 	.align 2
 
 DirectSoundWaveData_84A7F38: @ 84A7F38
-	directsound_looped 0xa44000, 0x54d, (DirectSoundSamples_84A7F38_End - DirectSoundSamples_84A7F38_Start) - 1
-DirectSoundSamples_84A7F38_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/84A7F38.bin"
 	.incbin "data/music/direct_sound_samples/84A7F38.pcm"
-DirectSoundSamples_84A7F38_End:
 	.align 2
 
 DirectSoundWaveData_84A8AC8: @ 84A8AC8
-	directsound_looped 0xa44000, 0x4cd, (DirectSoundSamples_84A8AC8_End - DirectSoundSamples_84A8AC8_Start) - 1
-DirectSoundSamples_84A8AC8_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/84A8AC8.bin"
 	.incbin "data/music/direct_sound_samples/84A8AC8.pcm"
-DirectSoundSamples_84A8AC8_End:
 	.align 2
 
 DirectSoundWaveData_84A9564: @ 84A9564
-	directsound_looped 0xa44000, 0x48a, (DirectSoundSamples_84A9564_End - DirectSoundSamples_84A9564_Start) - 1
-DirectSoundSamples_84A9564_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/84A9564.bin"
 	.incbin "data/music/direct_sound_samples/84A9564.pcm"
-DirectSoundSamples_84A9564_End:
 	.align 2
 
 DirectSoundWaveData_84A9EAC: @ 84A9EAC
-	directsound_looped 0xa44000, 0x56b, (DirectSoundSamples_84A9EAC_End - DirectSoundSamples_84A9EAC_Start) - 1
-DirectSoundSamples_84A9EAC_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/84A9EAC.bin"
 	.incbin "data/music/direct_sound_samples/84A9EAC.pcm"
-DirectSoundSamples_84A9EAC_End:
 	.align 2
 
 DirectSoundWaveData_84AA8F4: @ 84AA8F4
-	directsound_looped 0xa44000, 0x5d6, (DirectSoundSamples_84AA8F4_End - DirectSoundSamples_84AA8F4_Start) - 1
-DirectSoundSamples_84AA8F4_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/84AA8F4.bin"
 	.incbin "data/music/direct_sound_samples/84AA8F4.pcm"
-DirectSoundSamples_84AA8F4_End:
 	.align 2
 
 	.incbin "baserom.gba", 0x004ab57c, 0x18e31c
 
 DirectSoundWaveData_8639898: @ 8639898
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_8639898_End - DirectSoundSamples_8639898_Start) - 1
-DirectSoundSamples_8639898_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8639898.bin"
 	.incbin "data/music/direct_sound_samples/8639898.pcm"
-DirectSoundSamples_8639898_End:
 	.align 2
 
 DirectSoundWaveData_8639EF8: @ 8639EF8
-	directsound_looped 0x7b3000, 0x49f, (DirectSoundSamples_8639EF8_End - DirectSoundSamples_8639EF8_Start) - 1
-DirectSoundSamples_8639EF8_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8639EF8.bin"
 	.incbin "data/music/direct_sound_samples/8639EF8.pcm"
-DirectSoundSamples_8639EF8_End:
 	.align 2
 
 DirectSoundWaveData_863A3DC: @ 863A3DC
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_863A3DC_End - DirectSoundSamples_863A3DC_Start) - 1
-DirectSoundSamples_863A3DC_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/863A3DC.bin"
 	.incbin "data/music/direct_sound_samples/863A3DC.pcm"
-DirectSoundSamples_863A3DC_End:
 	.align 2
 
 DirectSoundWaveData_863AD2C: @ 863AD2C
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_863AD2C_End - DirectSoundSamples_863AD2C_Start) - 1
-DirectSoundSamples_863AD2C_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/863AD2C.bin"
 	.incbin "data/music/direct_sound_samples/863AD2C.pcm"
-DirectSoundSamples_863AD2C_End:
 	.align 2
 
 DirectSoundWaveData_863B79C: @ 863B79C
-	directsound_looped 0x7b3000, 0x2db, (DirectSoundSamples_863B79C_End - DirectSoundSamples_863B79C_Start) - 1
-DirectSoundSamples_863B79C_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/863B79C.bin"
 	.incbin "data/music/direct_sound_samples/863B79C.pcm"
-DirectSoundSamples_863B79C_End:
 	.align 2
 
 DirectSoundWaveData_863BABC: @ 863BABC
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_863BABC_End - DirectSoundSamples_863BABC_Start) - 1
-DirectSoundSamples_863BABC_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/863BABC.bin"
 	.incbin "data/music/direct_sound_samples/863BABC.pcm"
-DirectSoundSamples_863BABC_End:
 	.align 2
 
 DirectSoundWaveData_863C744: @ 863C744
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_863C744_End - DirectSoundSamples_863C744_Start) - 1
-DirectSoundSamples_863C744_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/863C744.bin"
 	.incbin "data/music/direct_sound_samples/863C744.pcm"
-DirectSoundSamples_863C744_End:
 	.align 2
 
 DirectSoundWaveData_863CD64: @ 863CD64
-	directsound_looped 0x7b3000, 0x347, (DirectSoundSamples_863CD64_End - DirectSoundSamples_863CD64_Start) - 1
-DirectSoundSamples_863CD64_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/863CD64.bin"
 	.incbin "data/music/direct_sound_samples/863CD64.pcm"
-DirectSoundSamples_863CD64_End:
 	.align 2
 
 DirectSoundWaveData_863D0EC: @ 863D0EC
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_863D0EC_End - DirectSoundSamples_863D0EC_Start) - 1
-DirectSoundSamples_863D0EC_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/863D0EC.bin"
 	.incbin "data/music/direct_sound_samples/863D0EC.pcm"
-DirectSoundSamples_863D0EC_End:
 	.align 2
 
 DirectSoundWaveData_863DED0: @ 863DED0
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_863DED0_End - DirectSoundSamples_863DED0_Start) - 1
-DirectSoundSamples_863DED0_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/863DED0.bin"
 	.incbin "data/music/direct_sound_samples/863DED0.pcm"
-DirectSoundSamples_863DED0_End:
 	.align 2
 
 DirectSoundWaveData_863E840: @ 863E840
-	directsound_looped 0x7b3000, 0x352, (DirectSoundSamples_863E840_End - DirectSoundSamples_863E840_Start) - 1
-DirectSoundSamples_863E840_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/863E840.bin"
 	.incbin "data/music/direct_sound_samples/863E840.pcm"
-DirectSoundSamples_863E840_End:
 	.align 2
 
 DirectSoundWaveData_863EBDC: @ 863EBDC
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_863EBDC_End - DirectSoundSamples_863EBDC_Start) - 1
-DirectSoundSamples_863EBDC_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/863EBDC.bin"
 	.incbin "data/music/direct_sound_samples/863EBDC.pcm"
-DirectSoundSamples_863EBDC_End:
 	.align 2
 
 DirectSoundWaveData_863F390: @ 863F390
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_863F390_End - DirectSoundSamples_863F390_Start) - 1
-DirectSoundSamples_863F390_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/863F390.bin"
 	.incbin "data/music/direct_sound_samples/863F390.pcm"
-DirectSoundSamples_863F390_End:
 	.align 2
 
 DirectSoundWaveData_86400EC: @ 86400EC
-	directsound_looped 0x7b3000, 0x202, (DirectSoundSamples_86400EC_End - DirectSoundSamples_86400EC_Start) - 1
-DirectSoundSamples_86400EC_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/86400EC.bin"
 	.incbin "data/music/direct_sound_samples/86400EC.pcm"
-DirectSoundSamples_86400EC_End:
 	.align 2
 
 DirectSoundWaveData_8640330: @ 8640330
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_8640330_End - DirectSoundSamples_8640330_Start) - 1
-DirectSoundSamples_8640330_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8640330.bin"
 	.incbin "data/music/direct_sound_samples/8640330.pcm"
-DirectSoundSamples_8640330_End:
 	.align 2
 
 DirectSoundWaveData_8641170: @ 8641170
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_8641170_End - DirectSoundSamples_8641170_Start) - 1
-DirectSoundSamples_8641170_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8641170.bin"
 	.incbin "data/music/direct_sound_samples/8641170.pcm"
-DirectSoundSamples_8641170_End:
 	.align 2
 
 DirectSoundWaveData_8641AC4: @ 8641AC4
-	directsound_looped 0x7b3000, 0x30e, (DirectSoundSamples_8641AC4_End - DirectSoundSamples_8641AC4_Start) - 1
-DirectSoundSamples_8641AC4_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8641AC4.bin"
 	.incbin "data/music/direct_sound_samples/8641AC4.pcm"
-DirectSoundSamples_8641AC4_End:
 	.align 2
 
 DirectSoundWaveData_8641E18: @ 8641E18
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_8641E18_End - DirectSoundSamples_8641E18_Start) - 1
-DirectSoundSamples_8641E18_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8641E18.bin"
 	.incbin "data/music/direct_sound_samples/8641E18.pcm"
-DirectSoundSamples_8641E18_End:
 	.align 2
 
 DirectSoundWaveData_864244C: @ 864244C
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_864244C_End - DirectSoundSamples_864244C_Start) - 1
-DirectSoundSamples_864244C_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/864244C.bin"
 	.incbin "data/music/direct_sound_samples/864244C.pcm"
-DirectSoundSamples_864244C_End:
 	.align 2
 
 DirectSoundWaveData_86430B8: @ 86430B8
-	directsound_looped 0x7b3000, 0x556, (DirectSoundSamples_86430B8_End - DirectSoundSamples_86430B8_Start) - 1
-DirectSoundSamples_86430B8_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/86430B8.bin"
 	.incbin "data/music/direct_sound_samples/86430B8.pcm"
-DirectSoundSamples_86430B8_End:
 	.align 2
 
 DirectSoundWaveData_8643650: @ 8643650
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_8643650_End - DirectSoundSamples_8643650_Start) - 1
-DirectSoundSamples_8643650_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8643650.bin"
 	.incbin "data/music/direct_sound_samples/8643650.pcm"
-DirectSoundSamples_8643650_End:
 	.align 2
 
 DirectSoundWaveData_8644154: @ 8644154
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_8644154_End - DirectSoundSamples_8644154_Start) - 1
-DirectSoundSamples_8644154_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8644154.bin"
 	.incbin "data/music/direct_sound_samples/8644154.pcm"
-DirectSoundSamples_8644154_End:
 	.align 2
 
 DirectSoundWaveData_8644758: @ 8644758
-	directsound_looped 0x7b3000, 0x1b0, (DirectSoundSamples_8644758_End - DirectSoundSamples_8644758_Start) - 1
-DirectSoundSamples_8644758_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8644758.bin"
 	.incbin "data/music/direct_sound_samples/8644758.pcm"
-DirectSoundSamples_8644758_End:
 	.align 2
 
 DirectSoundWaveData_8644950: @ 8644950
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_8644950_End - DirectSoundSamples_8644950_Start) - 1
-DirectSoundSamples_8644950_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8644950.bin"
 	.incbin "data/music/direct_sound_samples/8644950.pcm"
-DirectSoundSamples_8644950_End:
 	.align 2
 
 DirectSoundWaveData_86452B4: @ 86452B4
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_86452B4_End - DirectSoundSamples_86452B4_Start) - 1
-DirectSoundSamples_86452B4_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/86452B4.bin"
 	.incbin "data/music/direct_sound_samples/86452B4.pcm"
-DirectSoundSamples_86452B4_End:
 	.align 2
 
 DirectSoundWaveData_8646240: @ 8646240
-	directsound_looped 0x7b3000, 0x5f9, (DirectSoundSamples_8646240_End - DirectSoundSamples_8646240_Start) - 1
-DirectSoundSamples_8646240_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8646240.bin"
 	.incbin "data/music/direct_sound_samples/8646240.pcm"
-DirectSoundSamples_8646240_End:
 	.align 2
 
 DirectSoundWaveData_8646878: @ 8646878
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_8646878_End - DirectSoundSamples_8646878_Start) - 1
-DirectSoundSamples_8646878_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8646878.bin"
 	.incbin "data/music/direct_sound_samples/8646878.pcm"
-DirectSoundSamples_8646878_End:
 	.align 2
 
 DirectSoundWaveData_864734C: @ 864734C
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_864734C_End - DirectSoundSamples_864734C_Start) - 1
-DirectSoundSamples_864734C_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/864734C.bin"
 	.incbin "data/music/direct_sound_samples/864734C.pcm"
-DirectSoundSamples_864734C_End:
 	.align 2
 
 DirectSoundWaveData_8648290: @ 8648290
-	directsound_looped 0x7b3000, 0x535, (DirectSoundSamples_8648290_End - DirectSoundSamples_8648290_Start) - 1
-DirectSoundSamples_8648290_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8648290.bin"
 	.incbin "data/music/direct_sound_samples/8648290.pcm"
-DirectSoundSamples_8648290_End:
 	.align 2
 
 DirectSoundWaveData_8648808: @ 8648808
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_8648808_End - DirectSoundSamples_8648808_Start) - 1
-DirectSoundSamples_8648808_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8648808.bin"
 	.incbin "data/music/direct_sound_samples/8648808.pcm"
-DirectSoundSamples_8648808_End:
 	.align 2
 
 DirectSoundWaveData_8649654: @ 8649654
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_8649654_End - DirectSoundSamples_8649654_Start) - 1
-DirectSoundSamples_8649654_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8649654.bin"
 	.incbin "data/music/direct_sound_samples/8649654.pcm"
-DirectSoundSamples_8649654_End:
 	.align 2
 
 DirectSoundWaveData_864A55C: @ 864A55C
-	directsound_looped 0x7b3000, 0xa94, (DirectSoundSamples_864A55C_End - DirectSoundSamples_864A55C_Start) - 1
-DirectSoundSamples_864A55C_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/864A55C.bin"
 	.incbin "data/music/direct_sound_samples/864A55C.pcm"
-DirectSoundSamples_864A55C_End:
 	.align 2
 
 DirectSoundWaveData_864B030: @ 864B030
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_864B030_End - DirectSoundSamples_864B030_Start) - 1
-DirectSoundSamples_864B030_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/864B030.bin"
 	.incbin "data/music/direct_sound_samples/864B030.pcm"
-DirectSoundSamples_864B030_End:
 	.align 2
 
 DirectSoundWaveData_864BBC4: @ 864BBC4
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_864BBC4_End - DirectSoundSamples_864BBC4_Start) - 1
-DirectSoundSamples_864BBC4_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/864BBC4.bin"
 	.incbin "data/music/direct_sound_samples/864BBC4.pcm"
-DirectSoundSamples_864BBC4_End:
 	.align 2
 
 DirectSoundWaveData_864C59C: @ 864C59C
-	directsound_looped 0x7b3000, 0x5f4, (DirectSoundSamples_864C59C_End - DirectSoundSamples_864C59C_Start) - 1
-DirectSoundSamples_864C59C_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/864C59C.bin"
 	.incbin "data/music/direct_sound_samples/864C59C.pcm"
-DirectSoundSamples_864C59C_End:
 	.align 2
 
 DirectSoundWaveData_864CBDC: @ 864CBDC
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_864CBDC_End - DirectSoundSamples_864CBDC_Start) - 1
-DirectSoundSamples_864CBDC_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/864CBDC.bin"
 	.incbin "data/music/direct_sound_samples/864CBDC.pcm"
-DirectSoundSamples_864CBDC_End:
 	.align 2
 
 DirectSoundWaveData_864D6BC: @ 864D6BC
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_864D6BC_End - DirectSoundSamples_864D6BC_Start) - 1
-DirectSoundSamples_864D6BC_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/864D6BC.bin"
 	.incbin "data/music/direct_sound_samples/864D6BC.pcm"
-DirectSoundSamples_864D6BC_End:
 	.align 2
 
 DirectSoundWaveData_864DCF8: @ 864DCF8
-	directsound_looped 0x7b3000, 0x6ce, (DirectSoundSamples_864DCF8_End - DirectSoundSamples_864DCF8_Start) - 1
-DirectSoundSamples_864DCF8_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/864DCF8.bin"
 	.incbin "data/music/direct_sound_samples/864DCF8.pcm"
-DirectSoundSamples_864DCF8_End:
 	.align 2
 
 DirectSoundWaveData_864E410: @ 864E410
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_864E410_End - DirectSoundSamples_864E410_Start) - 1
-DirectSoundSamples_864E410_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/864E410.bin"
 	.incbin "data/music/direct_sound_samples/864E410.pcm"
-DirectSoundSamples_864E410_End:
 	.align 2
 
 DirectSoundWaveData_864ED4C: @ 864ED4C
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_864ED4C_End - DirectSoundSamples_864ED4C_Start) - 1
-DirectSoundSamples_864ED4C_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/864ED4C.bin"
 	.incbin "data/music/direct_sound_samples/864ED4C.pcm"
-DirectSoundSamples_864ED4C_End:
 	.align 2
 
 DirectSoundWaveData_864F508: @ 864F508
-	directsound_looped 0x7b3000, 0x51c, (DirectSoundSamples_864F508_End - DirectSoundSamples_864F508_Start) - 1
-DirectSoundSamples_864F508_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/864F508.bin"
 	.incbin "data/music/direct_sound_samples/864F508.pcm"
-DirectSoundSamples_864F508_End:
 	.align 2
 
 DirectSoundWaveData_864FA6C: @ 864FA6C
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_864FA6C_End - DirectSoundSamples_864FA6C_Start) - 1
-DirectSoundSamples_864FA6C_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/864FA6C.bin"
 	.incbin "data/music/direct_sound_samples/864FA6C.pcm"
-DirectSoundSamples_864FA6C_End:
 	.align 2
 
 DirectSoundWaveData_86507E0: @ 86507E0
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_86507E0_End - DirectSoundSamples_86507E0_Start) - 1
-DirectSoundSamples_86507E0_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/86507E0.bin"
 	.incbin "data/music/direct_sound_samples/86507E0.pcm"
-DirectSoundSamples_86507E0_End:
 	.align 2
 
 DirectSoundWaveData_8650C5C: @ 8650C5C
-	directsound_looped 0x7b3000, 0x4a7, (DirectSoundSamples_8650C5C_End - DirectSoundSamples_8650C5C_Start) - 1
-DirectSoundSamples_8650C5C_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8650C5C.bin"
 	.incbin "data/music/direct_sound_samples/8650C5C.pcm"
-DirectSoundSamples_8650C5C_End:
 	.align 2
 
 DirectSoundWaveData_8651148: @ 8651148
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_8651148_End - DirectSoundSamples_8651148_Start) - 1
-DirectSoundSamples_8651148_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8651148.bin"
 	.incbin "data/music/direct_sound_samples/8651148.pcm"
-DirectSoundSamples_8651148_End:
 	.align 2
 
 DirectSoundWaveData_8651910: @ 8651910
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_8651910_End - DirectSoundSamples_8651910_Start) - 1
-DirectSoundSamples_8651910_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8651910.bin"
 	.incbin "data/music/direct_sound_samples/8651910.pcm"
-DirectSoundSamples_8651910_End:
 	.align 2
 
 DirectSoundWaveData_865250C: @ 865250C
-	directsound_looped 0x7b3000, 0x335, (DirectSoundSamples_865250C_End - DirectSoundSamples_865250C_Start) - 1
-DirectSoundSamples_865250C_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/865250C.bin"
 	.incbin "data/music/direct_sound_samples/865250C.pcm"
-DirectSoundSamples_865250C_End:
 	.align 2
 
 DirectSoundWaveData_8652884: @ 8652884
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_8652884_End - DirectSoundSamples_8652884_Start) - 1
-DirectSoundSamples_8652884_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8652884.bin"
 	.incbin "data/music/direct_sound_samples/8652884.pcm"
-DirectSoundSamples_8652884_End:
 	.align 2
 
 DirectSoundWaveData_8653040: @ 8653040
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_8653040_End - DirectSoundSamples_8653040_Start) - 1
-DirectSoundSamples_8653040_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8653040.bin"
 	.incbin "data/music/direct_sound_samples/8653040.pcm"
-DirectSoundSamples_8653040_End:
 	.align 2
 
 DirectSoundWaveData_8653CA4: @ 8653CA4
-	directsound_looped 0x7b3000, 0x482, (DirectSoundSamples_8653CA4_End - DirectSoundSamples_8653CA4_Start) - 1
-DirectSoundSamples_8653CA4_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8653CA4.bin"
 	.incbin "data/music/direct_sound_samples/8653CA4.pcm"
-DirectSoundSamples_8653CA4_End:
 	.align 2
 
 DirectSoundWaveData_8654170: @ 8654170
-	directsound_not_looped 0x7b3000, (DirectSoundSamples_8654170_End - DirectSoundSamples_8654170_Start) - 1
-DirectSoundSamples_8654170_Start:
+	.4byte 0
+	.incbin "data/music/direct_sound_samples/8654170.bin"
 	.incbin "data/music/direct_sound_samples/8654170.pcm"
-DirectSoundSamples_8654170_End:
 	.align 2
 
 DirectSoundWaveData_8654C20: @ 8654C20
-	directsound_looped 0x688600, 0x7c2, (DirectSoundSamples_8654C20_End - DirectSoundSamples_8654C20_Start) - 1
-DirectSoundSamples_8654C20_Start:
+	.4byte 0x40000000  @ looped directsound
+	.incbin "data/music/direct_sound_samples/8654C20.bin"
 	.incbin "data/music/direct_sound_samples/8654C20.pcm"
-DirectSoundSamples_8654C20_End:
 	.align 2
diff --git a/tools/aif2pcm/main.c b/tools/aif2pcm/main.c
index 31842ff8e..b1bdf7a98 100644
--- a/tools/aif2pcm/main.c
+++ b/tools/aif2pcm/main.c
@@ -228,6 +228,11 @@ void aif2pcm(const char *aif_filename)
 	strcpy(pcm_filename, aif_filename);
 	change_file_extension(pcm_filename, "pcm");
 
+	// Get .metadata filename.
+	char metadata_filename[strlen(aif_filename)];
+	strcpy(metadata_filename, aif_filename);
+	change_file_extension(metadata_filename, "bin");
+
 	// Open the given .aif file so we can read its contents.
 	FILE *aif_file;
 	aif_file = fopen(aif_filename, "rb");
@@ -264,6 +269,14 @@ void aif2pcm(const char *aif_filename)
 	fwrite(aif_data->samples, aif_data->num_samples, 1, pcm_file);
 	fclose(pcm_file);
 
+	// Write the output .bin file containing .aif metadata.
+	FILE *metadata_file;
+	metadata_file = fopen(metadata_filename, "wb");
+	unsigned long pitch_adjust = (unsigned long)(aif_data->sample_rate * 1024);
+	fwrite(&pitch_adjust, sizeof(unsigned long), 1, metadata_file);
+	fwrite(&(aif_data->loop_offset), sizeof(unsigned long), 1, metadata_file);
+	fclose(metadata_file);
+
 	free(aif_data->samples);
 	free(aif_data);
 	free(aif_file_data);