Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync

sound/direct_sound_data.inc

@@ -283,24 +283,24 @@ DirectSoundWaveData_bicycle_bell::
 	.incbin "sound/direct_sound_samples/bicycle_bell.bin"
 
 	.align 2
-DirectSoundWaveData_8725A2C::
-	.incbin "sound/direct_sound_samples/8725A2C.bin"
+DirectSoundWaveData_unknown_1::
+	.incbin "sound/direct_sound_samples/unknown_01.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_pizzicato_strings::
 	.incbin "sound/direct_sound_samples/sc88pro_pizzicato_strings.bin"
 
 	.align 2
-DirectSoundWaveData_872762C::
-	.incbin "sound/direct_sound_samples/872762C.bin"
+DirectSoundWaveData_unknown_2::
+	.incbin "sound/direct_sound_samples/unknown_02.bin"
 
 	.align 2
-DirectSoundWaveData_872921C::
-	.incbin "sound/direct_sound_samples/872921C.bin"
+DirectSoundWaveData_unknown_3::
+	.incbin "sound/direct_sound_samples/unknown_03.bin"
 
 	.align 2
-DirectSoundWaveData_872A5D0::
-	.incbin "sound/direct_sound_samples/872A5D0.bin"
+DirectSoundWaveData_unknown_4::
+	.incbin "sound/direct_sound_samples/unknown_04.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_wind::
@@ -311,32 +311,32 @@ DirectSoundWaveData_sc88pro_bubbles::
 	.incbin "sound/direct_sound_samples/sc88pro_bubbles.bin"
 
 	.align 2
-DirectSoundWaveData_872EEA8::
-	.incbin "sound/direct_sound_samples/872EEA8.bin"
+DirectSoundWaveData_unknown_5::
+	.incbin "sound/direct_sound_samples/unknown_05.bin"
 
 	.align 2
-DirectSoundWaveData_87301B0::
-	.incbin "sound/direct_sound_samples/87301B0.bin"
+DirectSoundWaveData_unknown_6::
+	.incbin "sound/direct_sound_samples/unknown_06.bin"
 
 	.align 2
 DirectSoundWaveData_trinity_30303_mega_bass::
 	.incbin "sound/direct_sound_samples/trinity_30303_mega_bass.bin"
 
 	.align 2
-DirectSoundWaveData_8734298::
-	.incbin "sound/direct_sound_samples/8734298.bin"
+DirectSoundWaveData_unknown_7::
+	.incbin "sound/direct_sound_samples/unknown_07.bin"
 
 	.align 2
-DirectSoundWaveData_87364A8::
-	.incbin "sound/direct_sound_samples/87364A8.bin"
+DirectSoundWaveData_unknown_8::
+	.incbin "sound/direct_sound_samples/unknown_08.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_tubular_bell::
 	.incbin "sound/direct_sound_samples/sc88pro_tubular_bell.bin"
 
 	.align 2
-DirectSoundWaveData_87385E4::
-	.incbin "sound/direct_sound_samples/87385E4.bin"
+DirectSoundWaveData_unknown_9::
+	.incbin "sound/direct_sound_samples/unknown_09.bin"
 
 	.align 2
 DirectSoundWaveData_trinity_big_boned::
@@ -351,40 +351,40 @@ DirectSoundWaveData_sc88pro_xylophone::
 	.incbin "sound/direct_sound_samples/sc88pro_xylophone.bin"
 
 	.align 2
-DirectSoundWaveData_873ECD8::
-	.incbin "sound/direct_sound_samples/873ECD8.bin"
+DirectSoundWaveData_unknown_10::
+	.incbin "sound/direct_sound_samples/unknown_10.bin"
 
 	.align 2
-DirectSoundWaveData_8740818::
-	.incbin "sound/direct_sound_samples/8740818.bin"
+DirectSoundWaveData_unknown_11::
+	.incbin "sound/direct_sound_samples/unknown_11.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_accordion::
 	.incbin "sound/direct_sound_samples/sc88pro_accordion.bin"
 
 	.align 2
-DirectSoundWaveData_87424B0::
-	.incbin "sound/direct_sound_samples/87424B0.bin"
+DirectSoundWaveData_unknown_12::
+	.incbin "sound/direct_sound_samples/unknown_12.bin"
 
 	.align 2
-DirectSoundWaveData_87430C0::
-	.incbin "sound/direct_sound_samples/87430C0.bin"
+DirectSoundWaveData_unknown_13::
+	.incbin "sound/direct_sound_samples/unknown_13.bin"
 
 	.align 2
-DirectSoundWaveData_8743C50::
-	.incbin "sound/direct_sound_samples/8743C50.bin"
+DirectSoundWaveData_unknown_14::
+	.incbin "sound/direct_sound_samples/unknown_14.bin"
 
 	.align 2
-DirectSoundWaveData_87446EC::
-	.incbin "sound/direct_sound_samples/87446EC.bin"
+DirectSoundWaveData_unknown_15::
+	.incbin "sound/direct_sound_samples/unknown_15.bin"
 
 	.align 2
-DirectSoundWaveData_8745034::
-	.incbin "sound/direct_sound_samples/8745034.bin"
+DirectSoundWaveData_unknown_16::
+	.incbin "sound/direct_sound_samples/unknown_16.bin"
 
 	.align 2
-DirectSoundWaveData_8745A7C::
-	.incbin "sound/direct_sound_samples/8745A7C.bin"
+DirectSoundWaveData_unknown_17::
+	.incbin "sound/direct_sound_samples/unknown_17.bin"
 
 	.align 2
 Cry_Bulbasaur::
@@ -4311,8 +4311,8 @@ DirectSoundWaveData_register_noise::
 	.incbin "sound/direct_sound_samples/register_noise.bin"
 
 	.align 2
-DirectSoundWaveData_88D6978::
-	.incbin "sound/direct_sound_samples/88D6978.bin"
+DirectSoundWaveData_unknown_18::
+	.incbin "sound/direct_sound_samples/unknown_18.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_nylon_str_guitar::
@@ -4323,208 +4323,208 @@ DirectSoundWaveData_sd90_special_scream_drive::
 	.incbin "sound/direct_sound_samples/sd90_special_scream_drive.bin"
 
 	.align 2
-DirectSoundWaveData_88DBBC0::
-	.incbin "sound/direct_sound_samples/88DBBC0.bin"
+DirectSoundWaveData_Phoneme_1::
+	.incbin "sound/direct_sound_samples/phonemes/01.bin"
 
 	.align 2
-DirectSoundWaveData_88DC220::
-	.incbin "sound/direct_sound_samples/88DC220.bin"
+DirectSoundWaveData_Phoneme_2::
+	.incbin "sound/direct_sound_samples/phonemes/02.bin"
 
 	.align 2
-DirectSoundWaveData_88DC704::
-	.incbin "sound/direct_sound_samples/88DC704.bin"
+DirectSoundWaveData_Phoneme_3::
+	.incbin "sound/direct_sound_samples/phonemes/03.bin"
 
 	.align 2
-DirectSoundWaveData_88DD054::
-	.incbin "sound/direct_sound_samples/88DD054.bin"
+DirectSoundWaveData_Phoneme_4::
+	.incbin "sound/direct_sound_samples/phonemes/04.bin"
 
 	.align 2
-DirectSoundWaveData_88DDAC4::
-	.incbin "sound/direct_sound_samples/88DDAC4.bin"
+DirectSoundWaveData_Phoneme_5::
+	.incbin "sound/direct_sound_samples/phonemes/05.bin"
 
 	.align 2
-DirectSoundWaveData_88DDDE4::
-	.incbin "sound/direct_sound_samples/88DDDE4.bin"
+DirectSoundWaveData_Phoneme_6::
+	.incbin "sound/direct_sound_samples/phonemes/06.bin"
 
 	.align 2
-DirectSoundWaveData_88DEA6C::
-	.incbin "sound/direct_sound_samples/88DEA6C.bin"
+DirectSoundWaveData_Phoneme_7::
+	.incbin "sound/direct_sound_samples/phonemes/07.bin"
 
 	.align 2
-DirectSoundWaveData_88DF08C::
-	.incbin "sound/direct_sound_samples/88DF08C.bin"
+DirectSoundWaveData_Phoneme_8::
+	.incbin "sound/direct_sound_samples/phonemes/08.bin"
 
 	.align 2
-DirectSoundWaveData_88DF414::
-	.incbin "sound/direct_sound_samples/88DF414.bin"
+DirectSoundWaveData_Phoneme_9::
+	.incbin "sound/direct_sound_samples/phonemes/09.bin"
 
 	.align 2
-DirectSoundWaveData_88E01F8::
-	.incbin "sound/direct_sound_samples/88E01F8.bin"
+DirectSoundWaveData_Phoneme_10::
+	.incbin "sound/direct_sound_samples/phonemes/10.bin"
 
 	.align 2
-DirectSoundWaveData_88E0B68::
-	.incbin "sound/direct_sound_samples/88E0B68.bin"
+DirectSoundWaveData_Phoneme_11::
+	.incbin "sound/direct_sound_samples/phonemes/11.bin"
 
 	.align 2
-DirectSoundWaveData_88E0F04::
-	.incbin "sound/direct_sound_samples/88E0F04.bin"
+DirectSoundWaveData_Phoneme_12::
+	.incbin "sound/direct_sound_samples/phonemes/12.bin"
 
 	.align 2
-DirectSoundWaveData_88E16B8::
-	.incbin "sound/direct_sound_samples/88E16B8.bin"
+DirectSoundWaveData_Phoneme_13::
+	.incbin "sound/direct_sound_samples/phonemes/13.bin"
 
 	.align 2
-DirectSoundWaveData_88E2414::
-	.incbin "sound/direct_sound_samples/88E2414.bin"
+DirectSoundWaveData_Phoneme_14::
+	.incbin "sound/direct_sound_samples/phonemes/14.bin"
 
 	.align 2
-DirectSoundWaveData_88E2658::
-	.incbin "sound/direct_sound_samples/88E2658.bin"
+DirectSoundWaveData_Phoneme_15::
+	.incbin "sound/direct_sound_samples/phonemes/15.bin"
 
 	.align 2
-DirectSoundWaveData_88E3498::
-	.incbin "sound/direct_sound_samples/88E3498.bin"
+DirectSoundWaveData_Phoneme_16::
+	.incbin "sound/direct_sound_samples/phonemes/16.bin"
 
 	.align 2
-DirectSoundWaveData_88E3DEC::
-	.incbin "sound/direct_sound_samples/88E3DEC.bin"
+DirectSoundWaveData_Phoneme_17::
+	.incbin "sound/direct_sound_samples/phonemes/17.bin"
 
 	.align 2
-DirectSoundWaveData_88E4140::
-	.incbin "sound/direct_sound_samples/88E4140.bin"
+DirectSoundWaveData_Phoneme_18::
+	.incbin "sound/direct_sound_samples/phonemes/18.bin"
 
 	.align 2
-DirectSoundWaveData_88E4774::
-	.incbin "sound/direct_sound_samples/88E4774.bin"
+DirectSoundWaveData_Phoneme_19::
+	.incbin "sound/direct_sound_samples/phonemes/19.bin"
 
 	.align 2
-DirectSoundWaveData_88E53E0::
-	.incbin "sound/direct_sound_samples/88E53E0.bin"
+DirectSoundWaveData_Phoneme_20::
+	.incbin "sound/direct_sound_samples/phonemes/20.bin"
 
 	.align 2
-DirectSoundWaveData_88E5978::
-	.incbin "sound/direct_sound_samples/88E5978.bin"
+DirectSoundWaveData_Phoneme_21::
+	.incbin "sound/direct_sound_samples/phonemes/21.bin"
 
 	.align 2
-DirectSoundWaveData_88E647C::
-	.incbin "sound/direct_sound_samples/88E647C.bin"
+DirectSoundWaveData_Phoneme_22::
+	.incbin "sound/direct_sound_samples/phonemes/22.bin"
 
 	.align 2
-DirectSoundWaveData_88E6A80::
-	.incbin "sound/direct_sound_samples/88E6A80.bin"
+DirectSoundWaveData_Phoneme_23::
+	.incbin "sound/direct_sound_samples/phonemes/23.bin"
 
 	.align 2
-DirectSoundWaveData_88E6C78::
-	.incbin "sound/direct_sound_samples/88E6C78.bin"
+DirectSoundWaveData_Phoneme_24::
+	.incbin "sound/direct_sound_samples/phonemes/24.bin"
 
 	.align 2
-DirectSoundWaveData_88E75DC::
-	.incbin "sound/direct_sound_samples/88E75DC.bin"
+DirectSoundWaveData_Phoneme_25::
+	.incbin "sound/direct_sound_samples/phonemes/25.bin"
 
 	.align 2
-DirectSoundWaveData_88E8568::
-	.incbin "sound/direct_sound_samples/88E8568.bin"
+DirectSoundWaveData_Phoneme_26::
+	.incbin "sound/direct_sound_samples/phonemes/26.bin"
 
 	.align 2
-DirectSoundWaveData_88E8BA0::
-	.incbin "sound/direct_sound_samples/88E8BA0.bin"
+DirectSoundWaveData_Phoneme_27::
+	.incbin "sound/direct_sound_samples/phonemes/27.bin"
 
 	.align 2
-DirectSoundWaveData_88E9674::
-	.incbin "sound/direct_sound_samples/88E9674.bin"
+DirectSoundWaveData_Phoneme_28::
+	.incbin "sound/direct_sound_samples/phonemes/28.bin"
 
 	.align 2
-DirectSoundWaveData_88EA5B8::
-	.incbin "sound/direct_sound_samples/88EA5B8.bin"
+DirectSoundWaveData_Phoneme_29::
+	.incbin "sound/direct_sound_samples/phonemes/29.bin"
 
 	.align 2
-DirectSoundWaveData_88EAB30::
-	.incbin "sound/direct_sound_samples/88EAB30.bin"
+DirectSoundWaveData_Phoneme_30::
+	.incbin "sound/direct_sound_samples/phonemes/30.bin"
 
 	.align 2
-DirectSoundWaveData_88EB97C::
-	.incbin "sound/direct_sound_samples/88EB97C.bin"
+DirectSoundWaveData_Phoneme_31::
+	.incbin "sound/direct_sound_samples/phonemes/31.bin"
 
 	.align 2
-DirectSoundWaveData_88EC884::
-	.incbin "sound/direct_sound_samples/88EC884.bin"
+DirectSoundWaveData_Phoneme_32::
+	.incbin "sound/direct_sound_samples/phonemes/32.bin"
 
 	.align 2
-DirectSoundWaveData_88ED358::
-	.incbin "sound/direct_sound_samples/88ED358.bin"
+DirectSoundWaveData_Phoneme_33::
+	.incbin "sound/direct_sound_samples/phonemes/33.bin"
 
 	.align 2
-DirectSoundWaveData_88EDEEC::
-	.incbin "sound/direct_sound_samples/88EDEEC.bin"
+DirectSoundWaveData_Phoneme_34::
+	.incbin "sound/direct_sound_samples/phonemes/34.bin"
 
 	.align 2
-DirectSoundWaveData_88EE8C4::
-	.incbin "sound/direct_sound_samples/88EE8C4.bin"
+DirectSoundWaveData_Phoneme_35::
+	.incbin "sound/direct_sound_samples/phonemes/35.bin"
 
 	.align 2
-DirectSoundWaveData_88EEF04::
-	.incbin "sound/direct_sound_samples/88EEF04.bin"
+DirectSoundWaveData_Phoneme_36::
+	.incbin "sound/direct_sound_samples/phonemes/36.bin"
 
 	.align 2
-DirectSoundWaveData_88EF9E4::
-	.incbin "sound/direct_sound_samples/88EF9E4.bin"
+DirectSoundWaveData_Phoneme_37::
+	.incbin "sound/direct_sound_samples/phonemes/37.bin"
 
 	.align 2
-DirectSoundWaveData_88F0020::
-	.incbin "sound/direct_sound_samples/88F0020.bin"
+DirectSoundWaveData_Phoneme_38::
+	.incbin "sound/direct_sound_samples/phonemes/38.bin"
 
 	.align 2
-DirectSoundWaveData_88F0738::
-	.incbin "sound/direct_sound_samples/88F0738.bin"
+DirectSoundWaveData_Phoneme_39::
+	.incbin "sound/direct_sound_samples/phonemes/39.bin"
 
 	.align 2
-DirectSoundWaveData_88F1074::
-	.incbin "sound/direct_sound_samples/88F1074.bin"
+DirectSoundWaveData_Phoneme_40::
+	.incbin "sound/direct_sound_samples/phonemes/40.bin"
 
 	.align 2
-DirectSoundWaveData_88F1830::
-	.incbin "sound/direct_sound_samples/88F1830.bin"
+DirectSoundWaveData_Phoneme_41::
+	.incbin "sound/direct_sound_samples/phonemes/41.bin"
 
 	.align 2
-DirectSoundWaveData_88F1D94::
-	.incbin "sound/direct_sound_samples/88F1D94.bin"
+DirectSoundWaveData_Phoneme_42::
+	.incbin "sound/direct_sound_samples/phonemes/42.bin"
 
 	.align 2
-DirectSoundWaveData_88F2B08::
-	.incbin "sound/direct_sound_samples/88F2B08.bin"
+DirectSoundWaveData_Phoneme_43::
+	.incbin "sound/direct_sound_samples/phonemes/43.bin"
 
 	.align 2
-DirectSoundWaveData_88F2F84::
-	.incbin "sound/direct_sound_samples/88F2F84.bin"
+DirectSoundWaveData_Phoneme_44::
+	.incbin "sound/direct_sound_samples/phonemes/44.bin"
 
 	.align 2
-DirectSoundWaveData_88F3470::
-	.incbin "sound/direct_sound_samples/88F3470.bin"
+DirectSoundWaveData_Phoneme_45::
+	.incbin "sound/direct_sound_samples/phonemes/45.bin"
 
 	.align 2
-DirectSoundWaveData_88F3C38::
-	.incbin "sound/direct_sound_samples/88F3C38.bin"
+DirectSoundWaveData_Phoneme_46::
+	.incbin "sound/direct_sound_samples/phonemes/46.bin"
 
 	.align 2
-DirectSoundWaveData_88F4834::
-	.incbin "sound/direct_sound_samples/88F4834.bin"
+DirectSoundWaveData_Phoneme_47::
+	.incbin "sound/direct_sound_samples/phonemes/47.bin"
 
 	.align 2
-DirectSoundWaveData_88F4BAC::
-	.incbin "sound/direct_sound_samples/88F4BAC.bin"
+DirectSoundWaveData_Phoneme_48::
+	.incbin "sound/direct_sound_samples/phonemes/48.bin"
 
 	.align 2
-DirectSoundWaveData_88F5368::
-	.incbin "sound/direct_sound_samples/88F5368.bin"
+DirectSoundWaveData_Phoneme_49::
+	.incbin "sound/direct_sound_samples/phonemes/49.bin"
 
 	.align 2
-DirectSoundWaveData_88F5FCC::
-	.incbin "sound/direct_sound_samples/88F5FCC.bin"
+DirectSoundWaveData_Phoneme_50::
+	.incbin "sound/direct_sound_samples/phonemes/50.bin"
 
 	.align 2
-DirectSoundWaveData_88F6498::
-	.incbin "sound/direct_sound_samples/88F6498.bin"
+DirectSoundWaveData_Phoneme_51::
+	.incbin "sound/direct_sound_samples/phonemes/51.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_accordion_duplicate::

sound/programmable_wave_data.inc

@@ -1,74 +1,78 @@
-ProgrammableWaveData_86B4830::
-	.incbin "sound/programmable_wave_samples/86B4830.pcm"
+ProgrammableWaveData_1::
+	.incbin "sound/programmable_wave_samples/01.pcm"
 
-ProgrammableWaveData_86B4840::
-	.incbin "sound/programmable_wave_samples/86B4840.pcm"
+ProgrammableWaveData_2::
+	.incbin "sound/programmable_wave_samples/02.pcm"
 
-ProgrammableWaveData_86B4850::
-	.incbin "sound/programmable_wave_samples/86B4850.pcm"
+ProgrammableWaveData_3::
+	.incbin "sound/programmable_wave_samples/03.pcm"
 
-ProgrammableWaveData_86B4860::
-	.incbin "sound/programmable_wave_samples/86B4860.pcm"
+ProgrammableWaveData_4::
+	.incbin "sound/programmable_wave_samples/04.pcm"
 
-ProgrammableWaveData_86B4870::
-	.incbin "sound/programmable_wave_samples/86B4870.pcm"
+ProgrammableWaveData_5::
+	.incbin "sound/programmable_wave_samples/05.pcm"
 
-ProgrammableWaveData_86B4880::
-	.incbin "sound/programmable_wave_samples/86B4880.pcm"
+ProgrammableWaveData_6::
+	.incbin "sound/programmable_wave_samples/06.pcm"
 
-ProgrammableWaveData_86B4890::
-	.incbin "sound/programmable_wave_samples/86B4890.pcm"
+ProgrammableWaveData_7::
+	.incbin "sound/programmable_wave_samples/07.pcm"
 
-ProgrammableWaveData_86B48A0::
-	.incbin "sound/programmable_wave_samples/86B48A0.pcm"
+ProgrammableWaveData_8::
+	.incbin "sound/programmable_wave_samples/08.pcm"
 
-ProgrammableWaveData_86B48B0::
-	.incbin "sound/programmable_wave_samples/86B48B0.pcm"
+ProgrammableWaveData_9::
+	.incbin "sound/programmable_wave_samples/09.pcm"
 
-ProgrammableWaveData_86B48C0::
-	.incbin "sound/programmable_wave_samples/86B48C0.pcm"
+ProgrammableWaveData_10::
+	.incbin "sound/programmable_wave_samples/10.pcm"
 
-ProgrammableWaveData_86B48D0::
-	.incbin "sound/programmable_wave_samples/86B48D0.pcm"
+ProgrammableWaveData_11::
+	.incbin "sound/programmable_wave_samples/11.pcm"
 
-ProgrammableWaveData_86B48E0::
-	.incbin "sound/programmable_wave_samples/86B48E0.pcm"
+ProgrammableWaveData_12::
+	.incbin "sound/programmable_wave_samples/12.pcm"
 
-ProgrammableWaveData_86B48F0::
-	.incbin "sound/programmable_wave_samples/86B48F0.pcm"
+ProgrammableWaveData_13::
+	.incbin "sound/programmable_wave_samples/13.pcm"
 
-ProgrammableWaveData_86B4900::
-	.incbin "sound/programmable_wave_samples/86B4900.pcm"
+ProgrammableWaveData_14::
+	.incbin "sound/programmable_wave_samples/14.pcm"
 
-ProgrammableWaveData_86B4910::
-	.incbin "sound/programmable_wave_samples/86B4910.pcm"
+ProgrammableWaveData_15::
+	.incbin "sound/programmable_wave_samples/15.pcm"
 
-ProgrammableWaveData_86B4920::
-	.incbin "sound/programmable_wave_samples/86B4920.pcm"
+ProgrammableWaveData_16::
+	.incbin "sound/programmable_wave_samples/16.pcm"
 
-ProgrammableWaveData_Unused_86B4930::
-	.incbin "sound/programmable_wave_samples/unused_86B4930.pcm"
+@ Unused
+ProgrammableWaveData_17::
+	.incbin "sound/programmable_wave_samples/17.pcm"
 
-ProgrammableWaveData_Unused_86B4940::
-	.incbin "sound/programmable_wave_samples/unused_86B4940.pcm"
+@ Unused
+ProgrammableWaveData_18::
+	.incbin "sound/programmable_wave_samples/18.pcm"
 
-ProgrammableWaveData_Unused_86B4950::
-	.incbin "sound/programmable_wave_samples/unused_86B4950.pcm"
+@ Unused
+ProgrammableWaveData_19::
+	.incbin "sound/programmable_wave_samples/19.pcm"
 
-ProgrammableWaveData_Unused_86B4960::
-	.incbin "sound/programmable_wave_samples/unused_86B4960.pcm"
+@ Unused
+ProgrammableWaveData_20::
+	.incbin "sound/programmable_wave_samples/20.pcm"
 
-ProgrammableWaveData_86B4970::
-	.incbin "sound/programmable_wave_samples/86B4970.pcm"
+ProgrammableWaveData_21::
+	.incbin "sound/programmable_wave_samples/21.pcm"
 
-ProgrammableWaveData_86B4980::
-	.incbin "sound/programmable_wave_samples/86B4980.pcm"
+ProgrammableWaveData_22::
+	.incbin "sound/programmable_wave_samples/22.pcm"
 
-ProgrammableWaveData_86B4990::
-	.incbin "sound/programmable_wave_samples/86B4990.pcm"
+ProgrammableWaveData_23::
+	.incbin "sound/programmable_wave_samples/23.pcm"
 
-ProgrammableWaveData_86B49A0::
-	.incbin "sound/programmable_wave_samples/86B49A0.pcm"
+ProgrammableWaveData_24::
+	.incbin "sound/programmable_wave_samples/24.pcm"
 
-ProgrammableWaveData_86B49B0::
-	.incbin "sound/programmable_wave_samples/86B49B0.pcm"
+ProgrammableWaveData_25::
+	.incbin "sound/programmable_wave_samples/25.pcm"

sound/voicegroups/voicegroup001.inc

@@ -11,7 +11,7 @@ voicegroup001::
 	voice_square_1 60, 0, 0, 2, 0, 1, 6, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_programmable_wave 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -19,7 +19,7 @@ voicegroup001::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2 60, 0, 2, 0, 1, 6, 0
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1
+	voice_programmable_wave 60, 0, ProgrammableWaveData_3, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 1, 6, 0
 	voice_square_2 60, 0, 3, 0, 1, 6, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0

sound/voicegroups/voicegroup010.inc

@@ -81,7 +81,7 @@ voicegroup010::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2 60, 0, 3, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1
 	voice_square_1 60, 0, 0, 3, 0, 0, 7, 1
 

sound/voicegroups/voicegroup011.inc

@@ -74,7 +74,7 @@ voicegroup011::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0