Use macros for direct sound data.

2 files changed, 132 insertions, 472 deletions

diff --git a/asm/macros/music_voice.s b/asm/macros/music_voice.s
index 9a95d69f4..357ee3b3f 100644
--- a/asm/macros/music_voice.s
+++ b/asm/macros/music_voice.s
@@ -111,3 +111,17 @@
 	.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/sound_data.s b/data/sound_data.s
index c29c5d8f7..969bf09d1 100644
--- a/data/sound_data.s
+++ b/data/sound_data.s
@@ -12285,948 +12285,594 @@ BlankMusic_Header: @ 845632C
 	.byte 0, 0, 0 @ unknown
 
 DirectSoundWaveData_8456330: @ 8456330
-	.4byte 0x40000000
-	.4byte 0x344300
-	.4byte 0x2bb
-	.4byte 0x692
+	directsound_looped 0x344300, 0x2bb, 0x692
 	.incbin "data/music/direct_sound_samples/8456330.pcm"
 	.align 2
 
 DirectSoundWaveData_84569D4: @ 84569D4
-	.4byte 0x40000000
-	.4byte 0x688600
-	.4byte 0x47e
-	.4byte 0x7e7
+	directsound_looped 0x688600, 0x47e, 0x7e7
 	.incbin "data/music/direct_sound_samples/84569D4.pcm"
 	.align 2
 
 DirectSoundWaveData_84571CC: @ 84571CC
-	.4byte 0x40000000
-	.4byte 0x3443000
-	.4byte 0x482
-	.4byte 0xbb8
+	directsound_looped 0x3443000, 0x482, 0xbb8
 	.incbin "data/music/direct_sound_samples/84571CC.pcm"
 	.align 2
 
 DirectSoundWaveData_8457D98: @ 8457D98
-	.4byte 0x40000000
-	.4byte 0x2b11000
-	.4byte 0x9dc
-	.4byte 0xf26
+	directsound_looped 0x2b11000, 0x9dc, 0xf26
 	.incbin "data/music/direct_sound_samples/8457D98.pcm"
 	.align 2
 
 DirectSoundWaveData_8458CD0: @ 8458CD0
-	.4byte 0x40000000
-	.4byte 0x1588800
-	.4byte 0x71a
-	.4byte 0xc61
+	directsound_looped 0x1588800, 0x71a, 0xc61
 	.incbin "data/music/direct_sound_samples/8458CD0.pcm"
 	.align 2
 
 DirectSoundWaveData_8459944: @ 8459944
-	.4byte 0x40000000
-	.4byte 0x1a21800
-	.4byte 0xed5
-	.4byte 0x14bd
+	directsound_looped 0x1a21800, 0xed5, 0x14bd
 	.incbin "data/music/direct_sound_samples/8459944.pcm"
 	.align 2
 
 DirectSoundWaveData_845AE14: @ 845AE14
-	.4byte 0x0
-	.4byte 0xd10c00
-	.4byte 0x0
-	.4byte 0x48e
+	directsound_not_looped 0xd10c00, 0x48e
 	.incbin "data/music/direct_sound_samples/845AE14.pcm"
 	.align 2
 
 DirectSoundWaveData_845B2B4: @ 845B2B4
-	.4byte 0x0
-	.4byte 0xac4400
-	.4byte 0x0
-	.4byte 0x6e1
+	directsound_not_looped 0xac4400, 0x6e1
 	.incbin "data/music/direct_sound_samples/845B2B4.pcm"
 	.align 2
 
 DirectSoundWaveData_845B9A8: @ 845B9A8
-	.4byte 0x0
-	.4byte 0xd10c00
-	.4byte 0x0
-	.4byte 0x87f
+	directsound_not_looped 0xd10c00, 0x87f
 	.incbin "data/music/direct_sound_samples/845B9A8.pcm"
 	.align 2
 
 DirectSoundWaveData_845C238: @ 845C238
-	.4byte 0x0
-	.4byte 0xd10c00
-	.4byte 0x0
-	.4byte 0x864
+	directsound_not_looped 0xd10c00, 0x864
 	.incbin "data/music/direct_sound_samples/845C238.pcm"
 	.align 2
 
 DirectSoundWaveData_845CAB0: @ 845CAB0
-	.4byte 0x40000000
-	.4byte 0xac4400
-	.4byte 0x8c6
-	.4byte 0x102d
+	directsound_looped 0xac4400, 0x8c6, 0x102d
 	.incbin "data/music/direct_sound_samples/845CAB0.pcm"
 	.align 2
 
 DirectSoundWaveData_845DAF0: @ 845DAF0
-	.4byte 0x0
-	.4byte 0xd10c00
-	.4byte 0x0
-	.4byte 0x400
+	directsound_not_looped 0xd10c00, 0x400
 	.incbin "data/music/direct_sound_samples/845DAF0.pcm"
 	.align 2
 
 DirectSoundWaveData_845DF04: @ 845DF04
-	.4byte 0x40000000
-	.4byte 0xd10c00
-	.4byte 0x8c7
-	.4byte 0xe1d
+	directsound_looped 0xd10c00, 0x8c7, 0xe1d
 	.incbin "data/music/direct_sound_samples/845DF04.pcm"
 	.align 2
 
 DirectSoundWaveData_845ED34: @ 845ED34
-	.4byte 0x40000000
-	.4byte 0xac4400
-	.4byte 0xa45
-	.4byte 0xf83
+	directsound_looped 0xac4400, 0xa45, 0xf83
 	.incbin "data/music/direct_sound_samples/845ED34.pcm"
 	.align 2
 
 DirectSoundWaveData_845FCC8: @ 845FCC8
-	.4byte 0x0
-	.4byte 0xd10c00
-	.4byte 0x0
-	.4byte 0x8a3
+	directsound_not_looped 0xd10c00, 0x8a3
 	.incbin "data/music/direct_sound_samples/845FCC8.pcm"
 	.align 2
 
 DirectSoundWaveData_846057C: @ 846057C
-	.4byte 0x40000000
-	.4byte 0xac4400
-	.4byte 0x628
-	.4byte 0x8d1
+	directsound_looped 0xac4400, 0x628, 0x8d1
 	.incbin "data/music/direct_sound_samples/846057C.pcm"
 	.align 2
 
 DirectSoundWaveData_8460E60: @ 8460E60
-	.4byte 0x40000000
-	.4byte 0xd10c00
-	.4byte 0x8d5
-	.4byte 0xf18
+	directsound_looped 0xd10c00, 0x8d5, 0xf18
 	.incbin "data/music/direct_sound_samples/8460E60.pcm"
 	.align 2
 
 DirectSoundWaveData_8461D8C: @ 8461D8C
-	.4byte 0x0
-	.4byte 0xd10c00
-	.4byte 0x0
-	.4byte 0x507
+	directsound_not_looped 0xd10c00, 0x507
 	.incbin "data/music/direct_sound_samples/8461D8C.pcm"
 	.align 2
 
 DirectSoundWaveData_84622A4: @ 84622A4
-	.4byte 0x0
-	.4byte 0xd10c00
-	.4byte 0x0
-	.4byte 0x5b7
+	directsound_not_looped 0xd10c00, 0x5b7
 	.incbin "data/music/direct_sound_samples/84622A4.pcm"
 	.align 2
 
 DirectSoundWaveData_846286C: @ 846286C
-	.4byte 0x40000000
-	.4byte 0x1a21800
-	.4byte 0x9b4
-	.4byte 0xf4c
+	directsound_looped 0x1a21800, 0x9b4, 0xf4c
 	.incbin "data/music/direct_sound_samples/846286C.pcm"
 	.align 2
 
 DirectSoundWaveData_84637CC: @ 84637CC
-	.4byte 0x40000000
-	.4byte 0xd10c00
-	.4byte 0xc50
-	.4byte 0x164d
+	directsound_looped 0xd10c00, 0xc50, 0x164d
 	.incbin "data/music/direct_sound_samples/84637CC.pcm"
 	.align 2
 
 DirectSoundWaveData_8464E2C: @ 8464E2C
-	.4byte 0x40000000
-	.4byte 0x688600
-	.4byte 0xae8
-	.4byte 0x1549
+	directsound_looped 0x688600, 0xae8, 0x1549
 	.incbin "data/music/direct_sound_samples/8464E2C.pcm"
 	.align 2
 
 DirectSoundWaveData_8466388: @ 8466388
-	.4byte 0x40000000
-	.4byte 0x1a2180
-	.4byte 0x600
-	.4byte 0xb79
+	directsound_looped 0x1a2180, 0x600, 0xb79
 	.incbin "data/music/direct_sound_samples/8466388.pcm"
 	.align 2
 
 DirectSoundWaveData_8466F14: @ 8466F14
-	.4byte 0x40000000
-	.4byte 0xd10c00
-	.4byte 0x10cd
-	.4byte 0x3593
+	directsound_looped 0xd10c00, 0x10cd, 0x3593
 	.incbin "data/music/direct_sound_samples/8466F14.pcm"
 	.align 2
 
 DirectSoundWaveData_846A4B8: @ 846A4B8
-	.4byte 0x40000000
-	.4byte 0x688600
-	.4byte 0x1151
-	.4byte 0x230a
+	directsound_looped 0x688600, 0x1151, 0x230a
 	.incbin "data/music/direct_sound_samples/846A4B8.pcm"
 	.align 2
 
 DirectSoundWaveData_846C7D4: @ 846C7D4
-	.4byte 0x40000000
-	.4byte 0x344300
-	.4byte 0x1f9b
-	.4byte 0x36b8
+	directsound_looped 0x344300, 0x1f9b, 0x36b8
 	.incbin "data/music/direct_sound_samples/846C7D4.pcm"
 	.align 2
 
 DirectSoundWaveData_846FEA0: @ 846FEA0
-	.4byte 0x40000000
-	.4byte 0xd10c00
-	.4byte 0xf0b
-	.4byte 0x133d
+	directsound_looped 0xd10c00, 0xf0b, 0x133d
 	.incbin "data/music/direct_sound_samples/846FEA0.pcm"
 	.align 2
 
 DirectSoundWaveData_84711F0: @ 84711F0
-	.4byte 0x40000000
-	.4byte 0x688600
-	.4byte 0xe34
-	.4byte 0x14fe
+	directsound_looped 0x688600, 0xe34, 0x14fe
 	.incbin "data/music/direct_sound_samples/84711F0.pcm"
 	.align 2
 
 DirectSoundWaveData_8472700: @ 8472700
-	.4byte 0x40000000
-	.4byte 0x344300
-	.4byte 0x121a
-	.4byte 0x140c
+	directsound_looped 0x344300, 0x121a, 0x140c
 	.incbin "data/music/direct_sound_samples/8472700.pcm"
 	.align 2
 
 DirectSoundWaveData_8473B20: @ 8473B20
-	.4byte 0x40000000
-	.4byte 0x2b11000
-	.4byte 0xe8c
-	.4byte 0x1088
+	directsound_looped 0x2b11000, 0xe8c, 0x1088
 	.incbin "data/music/direct_sound_samples/8473B20.pcm"
 	.align 2
 
 DirectSoundWaveData_8474BBC: @ 8474BBC
-	.4byte 0x40000000
-	.4byte 0x1588800
-	.4byte 0x75d
-	.4byte 0x1048
+	directsound_looped 0x1588800, 0x75d, 0x1048
 	.incbin "data/music/direct_sound_samples/8474BBC.pcm"
 	.align 2
 
 DirectSoundWaveData_8475C18: @ 8475C18
-	.4byte 0x40000000
-	.4byte 0xd10c00
-	.4byte 0x216e
-	.4byte 0x6f83
+	directsound_looped 0xd10c00, 0x216e, 0x6f83
 	.incbin "data/music/direct_sound_samples/8475C18.pcm"
 	.align 2
 
 DirectSoundWaveData_847CBAC: @ 847CBAC
-	.4byte 0x40000000
-	.4byte 0x688600
-	.4byte 0x2624
-	.4byte 0x4571
+	directsound_looped 0x688600, 0x2624, 0x4571
 	.incbin "data/music/direct_sound_samples/847CBAC.pcm"
 	.align 2
 
 DirectSoundWaveData_8481130: @ 8481130
-	.4byte 0x40000000
-	.4byte 0x688600
-	.4byte 0x1693
-	.4byte 0x1f5d
+	directsound_looped 0x688600, 0x1693, 0x1f5d
 	.incbin "data/music/direct_sound_samples/8481130.pcm"
 	.align 2
 
 DirectSoundWaveData_84830A0: @ 84830A0
-	.4byte 0x40000000
-	.4byte 0x344300
-	.4byte 0x520
-	.4byte 0x752
+	directsound_looped 0x344300, 0x520, 0x752
 	.incbin "data/music/direct_sound_samples/84830A0.pcm"
 	.align 2
 
 DirectSoundWaveData_8483804: @ 8483804
-	.4byte 0x40000000
-	.4byte 0x3443000
-	.4byte 0x1037
-	.4byte 0x1c3d
+	directsound_looped 0x3443000, 0x1037, 0x1c3d
 	.incbin "data/music/direct_sound_samples/8483804.pcm"
 	.align 2
 
 DirectSoundWaveData_8485454: @ 8485454
-	.4byte 0x40000000
-	.4byte 0x1a21800
-	.4byte 0xed5
-	.4byte 0x14bd
+	directsound_looped 0x1a21800, 0xed5, 0x14bd
 	.incbin "data/music/direct_sound_samples/8485454.pcm"
 	.align 2
 
 DirectSoundWaveData_8486924: @ 8486924
-	.4byte 0x40000000
-	.4byte 0xac4400
-	.4byte 0x667
-	.4byte 0x9fa
+	directsound_looped 0xac4400, 0x667, 0x9fa
 	.incbin "data/music/direct_sound_samples/8486924.pcm"
 	.align 2
 
 DirectSoundWaveData_8487330: @ 8487330
-	.4byte 0x40000000
-	.4byte 0x688600
-	.4byte 0xcb1
-	.4byte 0x1c03
+	directsound_looped 0x688600, 0xcb1, 0x1c03
 	.incbin "data/music/direct_sound_samples/8487330.pcm"
 	.align 2
 
 DirectSoundWaveData_8488F44: @ 8488F44
-	.4byte 0x0
-	.4byte 0xd10c00
-	.4byte 0x0
-	.4byte 0x194e
+	directsound_not_looped 0xd10c00, 0x194e
 	.incbin "data/music/direct_sound_samples/8488F44.pcm"
 	.align 2
 
 DirectSoundWaveData_848A8A4: @ 848A8A4
-	.4byte 0x0
-	.4byte 0xd10c00
-	.4byte 0x0
-	.4byte 0x14b3
+	directsound_not_looped 0xd10c00, 0x14b3
 	.incbin "data/music/direct_sound_samples/848A8A4.pcm"
 	.align 2
 
 DirectSoundWaveData_848BD68: @ 848BD68
-	.4byte 0x40000000
-	.4byte 0x688600
-	.4byte 0x309
-	.4byte 0x728
+	directsound_looped 0x688600, 0x309, 0x728
 	.incbin "data/music/direct_sound_samples/848BD68.pcm"
 	.align 2
 
 DirectSoundWaveData_848C4A4: @ 848C4A4
-	.4byte 0x40000000
-	.4byte 0xd10c00
-	.4byte 0x0
-	.4byte 0x1bdf
+	directsound_looped 0xd10c00, 0x0, 0x1bdf
 	.incbin "data/music/direct_sound_samples/848C4A4.pcm"
 	.align 2
 
 DirectSoundWaveData_848E094: @ 848E094
-	.4byte 0x40000000
-	.4byte 0xd10c00
-	.4byte 0x0
-	.4byte 0x13a2
+	directsound_looped 0xd10c00, 0x0, 0x13a2
 	.incbin "data/music/direct_sound_samples/848E094.pcm"
 	.align 2
 
 DirectSoundWaveData_848F448: @ 848F448
-	.4byte 0x40000000
-	.4byte 0xd10c00
-	.4byte 0x1998
-	.4byte 0x2670
+	directsound_looped 0xd10c00, 0x1998, 0x2670
 	.incbin "data/music/direct_sound_samples/848F448.pcm"
 	.align 2
 
 DirectSoundWaveData_8491ACC: @ 8491ACC
-	.4byte 0x40000000
-	.4byte 0xd10c00
-	.4byte 0x8c6
-	.4byte 0x1231
+	directsound_looped 0xd10c00, 0x8c6, 0x1231
 	.incbin "data/music/direct_sound_samples/8491ACC.pcm"
 	.align 2
 
 DirectSoundWaveData_8492D10: @ 8492D10
-	.4byte 0x0
-	.4byte 0xd10c00
-	.4byte 0x0
-	.4byte 0xfff
+	directsound_not_looped 0xd10c00, 0xfff
 	.incbin "data/music/direct_sound_samples/8492D10.pcm"
 	.align 2
 
 DirectSoundWaveData_8493D20: @ 8493D20
-	.4byte 0x40000000
-	.4byte 0xd10c00
-	.4byte 0x2cd
-	.4byte 0x12f4
+	directsound_looped 0xd10c00, 0x2cd, 0x12f4
 	.incbin "data/music/direct_sound_samples/8493D20.pcm"
 	.align 2
 
 DirectSoundWaveData_8495028: @ 8495028
-	.4byte 0x40000000
-	.4byte 0xd10c00
-	.4byte 0x67c
-	.4byte 0x20f8
+	directsound_looped 0xd10c00, 0x67c, 0x20f8
 	.incbin "data/music/direct_sound_samples/8495028.pcm"
 	.align 2
 
 DirectSoundWaveData_8497134: @ 8497134
-	.4byte 0x40000000
-	.4byte 0x688600
-	.4byte 0x1a98
-	.4byte 0x1fca
+	directsound_looped 0x688600, 0x1a98, 0x1fca
 	.incbin "data/music/direct_sound_samples/8497134.pcm"
 	.align 2
 
 DirectSoundWaveData_8499110: @ 8499110
-	.4byte 0x40000000
-	.4byte 0xd10c00
-	.4byte 0xb45
-	.4byte 0x21ff
+	directsound_looped 0xd10c00, 0xb45, 0x21ff
 	.incbin "data/music/direct_sound_samples/8499110.pcm"
 	.align 2
 
 DirectSoundWaveData_849B320: @ 849B320
-	.4byte 0x40000000
-	.4byte 0xd10c00
-	.4byte 0xd5
-	.4byte 0x7ba
+	directsound_looped 0xd10c00, 0xd5, 0x7ba
 	.incbin "data/music/direct_sound_samples/849B320.pcm"
 	.align 2
 
 DirectSoundWaveData_849BAEC: @ 849BAEC
-	.4byte 0x40000000
-	.4byte 0x688600
-	.4byte 0x107a
-	.4byte 0x195f
+	directsound_looped 0x688600, 0x107a, 0x195f
 	.incbin "data/music/direct_sound_samples/849BAEC.pcm"
 	.align 2
 
 DirectSoundWaveData_849D45C: @ 849D45C
-	.4byte 0x40000000
-	.4byte 0xd10c00
-	.4byte 0xc79
-	.4byte 0x1f9c
+	directsound_looped 0xd10c00, 0xc79, 0x1f9c
 	.incbin "data/music/direct_sound_samples/849D45C.pcm"
 	.align 2
 
 DirectSoundWaveData_849F40C: @ 849F40C
-	.4byte 0x40000000
-	.4byte 0x1a21800
-	.4byte 0x1577
-	.4byte 0x32ce
+	directsound_looped 0x1a21800, 0x1577, 0x32ce
 	.incbin "data/music/direct_sound_samples/849F40C.pcm"
 	.align 2
 
 DirectSoundWaveData_84A26EC: @ 84A26EC
-	.4byte 0x40000000
-	.4byte 0x344300
-	.4byte 0x461
-	.4byte 0xa1f
+	directsound_looped 0x344300, 0x461, 0xa1f
 	.incbin "data/music/direct_sound_samples/84A26EC.pcm"
 	.align 2
 
 DirectSoundWaveData_84A311C: @ 84A311C
-	.4byte 0x40000000
-	.4byte 0x344300
-	.4byte 0x5b1
-	.4byte 0xa22
+	directsound_looped 0x344300, 0x5b1, 0xa22
 	.incbin "data/music/direct_sound_samples/84A311C.pcm"
 	.align 2
 
 DirectSoundWaveData_84A3B50: @ 84A3B50
-	.4byte 0x40000000
-	.4byte 0xd10c00
-	.4byte 0xb87
-	.4byte 0x1b2c
+	directsound_looped 0xd10c00, 0xb87, 0x1b2c
 	.incbin "data/music/direct_sound_samples/84A3B50.pcm"
 	.align 2
 
 DirectSoundWaveData_84A5690: @ 84A5690
-	.4byte 0x40000000
-	.4byte 0xac4400
-	.4byte 0x0
-	.4byte 0x8b7
+	directsound_looped 0xac4400, 0x0, 0x8b7
 	.incbin "data/music/direct_sound_samples/84A5690.pcm"
 	.align 2
 
 DirectSoundWaveData_84A5F58: @ 84A5F58
-	.4byte 0x40000000
-	.4byte 0x688600
-	.4byte 0x7c2
-	.4byte 0x13be
+	directsound_looped 0x688600, 0x7c2, 0x13be
 	.incbin "data/music/direct_sound_samples/84A5F58.pcm"
 	.align 2
 
 DirectSoundWaveData_84A7328: @ 84A7328
-	.4byte 0x40000000
-	.4byte 0xa44000
-	.4byte 0x628
-	.4byte 0xbff
+	directsound_looped 0xa44000, 0x628, 0xbff
 	.incbin "data/music/direct_sound_samples/84A7328.pcm"
 	.align 2
 
 DirectSoundWaveData_84A7F38: @ 84A7F38
-	.4byte 0x40000000
-	.4byte 0xa44000
-	.4byte 0x54d
-	.4byte 0xb7e
+	directsound_looped 0xa44000, 0x54d, 0xb7e
 	.incbin "data/music/direct_sound_samples/84A7F38.pcm"
 	.align 2
 
 DirectSoundWaveData_84A8AC8: @ 84A8AC8
-	.4byte 0x40000000
-	.4byte 0xa44000
-	.4byte 0x4cd
-	.4byte 0xa8b
+	directsound_looped 0xa44000, 0x4cd, 0xa8b
 	.incbin "data/music/direct_sound_samples/84A8AC8.pcm"
 	.align 2
 
 DirectSoundWaveData_84A9564: @ 84A9564
-	.4byte 0x40000000
-	.4byte 0xa44000
-	.4byte 0x48a
-	.4byte 0x937
+	directsound_looped 0xa44000, 0x48a, 0x937
 	.incbin "data/music/direct_sound_samples/84A9564.pcm"
 	.align 2
 
 DirectSoundWaveData_84A9EAC: @ 84A9EAC
-	.4byte 0x40000000
-	.4byte 0xa44000
-	.4byte 0x56b
-	.4byte 0xa36
+	directsound_looped 0xa44000, 0x56b, 0xa36
 	.incbin "data/music/direct_sound_samples/84A9EAC.pcm"
 	.align 2
 
 DirectSoundWaveData_84AA8F4: @ 84AA8F4
-	.4byte 0x40000000
-	.4byte 0xa44000
-	.4byte 0x5d6
-	.4byte 0xc76
+	directsound_looped 0xa44000, 0x5d6, 0xc76
 	.incbin "data/music/direct_sound_samples/84AA8F4.pcm"
 	.align 2
 
 	.incbin "baserom.gba", 0x004ab57c, 0x18e31c
 
 DirectSoundWaveData_8639898: @ 8639898
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0x64e
+	directsound_not_looped 0x7b3000, 0x64e
 	.incbin "data/music/direct_sound_samples/8639898.pcm"
 	.align 2
 
 DirectSoundWaveData_8639EF8: @ 8639EF8
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0x49f
-	.4byte 0x4d3
+	directsound_looped 0x7b3000, 0x49f, 0x4d3
 	.incbin "data/music/direct_sound_samples/8639EF8.pcm"
 	.align 2
 
 DirectSoundWaveData_863A3DC: @ 863A3DC
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0x93c
+	directsound_not_looped 0x7b3000, 0x93c
 	.incbin "data/music/direct_sound_samples/863A3DC.pcm"
 	.align 2
 
 DirectSoundWaveData_863AD2C: @ 863AD2C
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xa5f
+	directsound_not_looped 0x7b3000, 0xa5f
 	.incbin "data/music/direct_sound_samples/863AD2C.pcm"
 	.align 2
 
 DirectSoundWaveData_863B79C: @ 863B79C
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0x2db
-	.4byte 0x30e
+	directsound_looped 0x7b3000, 0x2db, 0x30e
 	.incbin "data/music/direct_sound_samples/863B79C.pcm"
 	.align 2
 
 DirectSoundWaveData_863BABC: @ 863BABC
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xc76
+	directsound_not_looped 0x7b3000, 0xc76
 	.incbin "data/music/direct_sound_samples/863BABC.pcm"
 	.align 2
 
 DirectSoundWaveData_863C744: @ 863C744
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0x60f
+	directsound_not_looped 0x7b3000, 0x60f
 	.incbin "data/music/direct_sound_samples/863C744.pcm"
 	.align 2
 
 DirectSoundWaveData_863CD64: @ 863CD64
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0x347
-	.4byte 0x374
+	directsound_looped 0x7b3000, 0x347, 0x374
 	.incbin "data/music/direct_sound_samples/863CD64.pcm"
 	.align 2
 
 DirectSoundWaveData_863D0EC: @ 863D0EC
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xdd0
+	directsound_not_looped 0x7b3000, 0xdd0
 	.incbin "data/music/direct_sound_samples/863D0EC.pcm"
 	.align 2
 
 DirectSoundWaveData_863DED0: @ 863DED0
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0x95e
+	directsound_not_looped 0x7b3000, 0x95e
 	.incbin "data/music/direct_sound_samples/863DED0.pcm"
 	.align 2
 
 DirectSoundWaveData_863E840: @ 863E840
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0x352
-	.4byte 0x38a
+	directsound_looped 0x7b3000, 0x352, 0x38a
 	.incbin "data/music/direct_sound_samples/863E840.pcm"
 	.align 2
 
 DirectSoundWaveData_863EBDC: @ 863EBDC
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0x7a0
+	directsound_not_looped 0x7b3000, 0x7a0
 	.incbin "data/music/direct_sound_samples/863EBDC.pcm"
 	.align 2
 
 DirectSoundWaveData_863F390: @ 863F390
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xd48
+	directsound_not_looped 0x7b3000, 0xd48
 	.incbin "data/music/direct_sound_samples/863F390.pcm"
 	.align 2
 
 DirectSoundWaveData_86400EC: @ 86400EC
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0x202
-	.4byte 0x233
+	directsound_looped 0x7b3000, 0x202, 0x233
 	.incbin "data/music/direct_sound_samples/86400EC.pcm"
 	.align 2
 
 DirectSoundWaveData_8640330: @ 8640330
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xe2c
+	directsound_not_looped 0x7b3000, 0xe2c
 	.incbin "data/music/direct_sound_samples/8640330.pcm"
 	.align 2
 
 DirectSoundWaveData_8641170: @ 8641170
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0x940
+	directsound_not_looped 0x7b3000, 0x940
 	.incbin "data/music/direct_sound_samples/8641170.pcm"
 	.align 2
 
 DirectSoundWaveData_8641AC4: @ 8641AC4
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0x30e
-	.4byte 0x341
+	directsound_looped 0x7b3000, 0x30e, 0x341
 	.incbin "data/music/direct_sound_samples/8641AC4.pcm"
 	.align 2
 
 DirectSoundWaveData_8641E18: @ 8641E18
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0x620
+	directsound_not_looped 0x7b3000, 0x620
 	.incbin "data/music/direct_sound_samples/8641E18.pcm"
 	.align 2
 
 DirectSoundWaveData_864244C: @ 864244C
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xc58
+	directsound_not_looped 0x7b3000, 0xc58
 	.incbin "data/music/direct_sound_samples/864244C.pcm"
 	.align 2
 
 DirectSoundWaveData_86430B8: @ 86430B8
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0x556
-	.4byte 0x586
+	directsound_looped 0x7b3000, 0x556, 0x586
 	.incbin "data/music/direct_sound_samples/86430B8.pcm"
 	.align 2
 
 DirectSoundWaveData_8643650: @ 8643650
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xaf0
+	directsound_not_looped 0x7b3000, 0xaf0
 	.incbin "data/music/direct_sound_samples/8643650.pcm"
 	.align 2
 
 DirectSoundWaveData_8644154: @ 8644154
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0x5f2
+	directsound_not_looped 0x7b3000, 0x5f2
 	.incbin "data/music/direct_sound_samples/8644154.pcm"
 	.align 2
 
 DirectSoundWaveData_8644758: @ 8644758
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0x1b0
-	.4byte 0x1e4
+	directsound_looped 0x7b3000, 0x1b0, 0x1e4
 	.incbin "data/music/direct_sound_samples/8644758.pcm"
 	.align 2
 
 DirectSoundWaveData_8644950: @ 8644950
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0x950
+	directsound_not_looped 0x7b3000, 0x950
 	.incbin "data/music/direct_sound_samples/8644950.pcm"
 	.align 2
 
 DirectSoundWaveData_86452B4: @ 86452B4
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xf78
+	directsound_not_looped 0x7b3000, 0xf78
 	.incbin "data/music/direct_sound_samples/86452B4.pcm"
 	.align 2
 
 DirectSoundWaveData_8646240: @ 8646240
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0x5f9
-	.4byte 0x624
+	directsound_looped 0x7b3000, 0x5f9, 0x624
 	.incbin "data/music/direct_sound_samples/8646240.pcm"
 	.align 2
 
 DirectSoundWaveData_8646878: @ 8646878
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xac0
+	directsound_not_looped 0x7b3000, 0xac0
 	.incbin "data/music/direct_sound_samples/8646878.pcm"
 	.align 2
 
 DirectSoundWaveData_864734C: @ 864734C
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xf33
+	directsound_not_looped 0x7b3000, 0xf33
 	.incbin "data/music/direct_sound_samples/864734C.pcm"
 	.align 2
 
 DirectSoundWaveData_8648290: @ 8648290
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0x535
-	.4byte 0x567
+	directsound_looped 0x7b3000, 0x535, 0x567
 	.incbin "data/music/direct_sound_samples/8648290.pcm"
 	.align 2
 
 DirectSoundWaveData_8648808: @ 8648808
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xe38
+	directsound_not_looped 0x7b3000, 0xe38
 	.incbin "data/music/direct_sound_samples/8648808.pcm"
 	.align 2
 
 DirectSoundWaveData_8649654: @ 8649654
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xef4
+	directsound_not_looped 0x7b3000, 0xef4
 	.incbin "data/music/direct_sound_samples/8649654.pcm"
 	.align 2
 
 DirectSoundWaveData_864A55C: @ 864A55C
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0xa94
-	.4byte 0xac3
+	directsound_looped 0x7b3000, 0xa94, 0xac3
 	.incbin "data/music/direct_sound_samples/864A55C.pcm"
 	.align 2
 
 DirectSoundWaveData_864B030: @ 864B030
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xb80
+	directsound_not_looped 0x7b3000, 0xb80
 	.incbin "data/music/direct_sound_samples/864B030.pcm"
 	.align 2
 
 DirectSoundWaveData_864BBC4: @ 864BBC4
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0x9c4
+	directsound_not_looped 0x7b3000, 0x9c4
 	.incbin "data/music/direct_sound_samples/864BBC4.pcm"
 	.align 2
 
 DirectSoundWaveData_864C59C: @ 864C59C
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0x5f4
-	.4byte 0x62d
+	directsound_looped 0x7b3000, 0x5f4, 0x62d
 	.incbin "data/music/direct_sound_samples/864C59C.pcm"
 	.align 2
 
 DirectSoundWaveData_864CBDC: @ 864CBDC
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xacc
+	directsound_not_looped 0x7b3000, 0xacc
 	.incbin "data/music/direct_sound_samples/864CBDC.pcm"
 	.align 2
 
 DirectSoundWaveData_864D6BC: @ 864D6BC
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0x629
+	directsound_not_looped 0x7b3000, 0x629
 	.incbin "data/music/direct_sound_samples/864D6BC.pcm"
 	.align 2
 
 DirectSoundWaveData_864DCF8: @ 864DCF8
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0x6ce
-	.4byte 0x705
+	directsound_looped 0x7b3000, 0x6ce, 0x705
 	.incbin "data/music/direct_sound_samples/864DCF8.pcm"
 	.align 2
 
 DirectSoundWaveData_864E410: @ 864E410
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0x928
+	directsound_not_looped 0x7b3000, 0x928
 	.incbin "data/music/direct_sound_samples/864E410.pcm"
 	.align 2
 
 DirectSoundWaveData_864ED4C: @ 864ED4C
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0x7a8
+	directsound_not_looped 0x7b3000, 0x7a8
 	.incbin "data/music/direct_sound_samples/864ED4C.pcm"
 	.align 2
 
 DirectSoundWaveData_864F508: @ 864F508
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0x51c
-	.4byte 0x553
+	directsound_looped 0x7b3000, 0x51c, 0x553
 	.incbin "data/music/direct_sound_samples/864F508.pcm"
 	.align 2
 
 DirectSoundWaveData_864FA6C: @ 864FA6C
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xd60
+	directsound_not_looped 0x7b3000, 0xd60
 	.incbin "data/music/direct_sound_samples/864FA6C.pcm"
 	.align 2
 
 DirectSoundWaveData_86507E0: @ 86507E0
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0x46a
+	directsound_not_looped 0x7b3000, 0x46a
 	.incbin "data/music/direct_sound_samples/86507E0.pcm"
 	.align 2
 
 DirectSoundWaveData_8650C5C: @ 8650C5C
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0x4a7
-	.4byte 0x4db
+	directsound_looped 0x7b3000, 0x4a7, 0x4db
 	.incbin "data/music/direct_sound_samples/8650C5C.pcm"
 	.align 2
 
 DirectSoundWaveData_8651148: @ 8651148
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0x7b4
+	directsound_not_looped 0x7b3000, 0x7b4
 	.incbin "data/music/direct_sound_samples/8651148.pcm"
 	.align 2
 
 DirectSoundWaveData_8651910: @ 8651910
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xbea
+	directsound_not_looped 0x7b3000, 0xbea
 	.incbin "data/music/direct_sound_samples/8651910.pcm"
 	.align 2
 
 DirectSoundWaveData_865250C: @ 865250C
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0x335
-	.4byte 0x365
+	directsound_looped 0x7b3000, 0x335, 0x365
 	.incbin "data/music/direct_sound_samples/865250C.pcm"
 	.align 2
 
 DirectSoundWaveData_8652884: @ 8652884
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0x7a8
+	directsound_not_looped 0x7b3000, 0x7a8
 	.incbin "data/music/direct_sound_samples/8652884.pcm"
 	.align 2
 
 DirectSoundWaveData_8653040: @ 8653040
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xc50
+	directsound_not_looped 0x7b3000, 0xc50
 	.incbin "data/music/direct_sound_samples/8653040.pcm"
 	.align 2
 
 DirectSoundWaveData_8653CA4: @ 8653CA4
-	.4byte 0x40000000
-	.4byte 0x7b3000
-	.4byte 0x482
-	.4byte 0x4bb
+	directsound_looped 0x7b3000, 0x482, 0x4bb
 	.incbin "data/music/direct_sound_samples/8653CA4.pcm"
 	.align 2
 
 DirectSoundWaveData_8654170: @ 8654170
-	.4byte 0x0
-	.4byte 0x7b3000
-	.4byte 0x0
-	.4byte 0xa9c
+	directsound_not_looped 0x7b3000, 0xa9c
 	.incbin "data/music/direct_sound_samples/8654170.pcm"
 	.align 2
 
 DirectSoundWaveData_8654C20: @ 8654C20
-	.4byte 0x40000000
-	.4byte 0x688600
-	.4byte 0x7c2
-	.4byte 0x13be
+	directsound_looped 0x688600, 0x7c2, 0x13be
 	.incbin "data/music/direct_sound_samples/8654C20.pcm"
 	.align 2