Sync with pokered

1 files changed, 166 insertions, 248 deletions

diff --git a/audio/headers/sfxheaders4.asm b/audio/headers/sfxheaders4.asm
index 1fdb69ab..c7f7e9d6 100644
--- a/audio/headers/sfxheaders4.asm
+++ b/audio/headers/sfxheaders4.asm
@@ -1,294 +1,212 @@
 SFX_Headers_4::
 	dbw -1, -1 ; padding
 
-SFX_Snare1_4::
-	dbw CH7, SFX_Snare1_4_Ch7
+SFX_Noise_Instrument01_4::
+	audio_header SFX_Noise_Instrument01_4, Ch8
 
-SFX_Snare2_4::
-	dbw CH7, SFX_Snare2_4_Ch7
+SFX_Noise_Instrument02_4::
+	audio_header SFX_Noise_Instrument02_4, Ch8
 
-SFX_Snare3_4::
-	dbw CH7, SFX_Snare3_4_Ch7
+SFX_Noise_Instrument03_4::
+	audio_header SFX_Noise_Instrument03_4, Ch8
 
-SFX_Snare4_4::
-	dbw CH7, SFX_Snare4_4_Ch7
+SFX_Noise_Instrument04_4::
+	audio_header SFX_Noise_Instrument04_4, Ch8
 
-SFX_Snare5_4::
-	dbw CH7, SFX_Snare5_4_Ch7
+SFX_Noise_Instrument05_4::
+	audio_header SFX_Noise_Instrument05_4, Ch8
 
-SFX_Triangle1_4::
-	dbw CH7, SFX_Triangle1_4_Ch7
+SFX_Noise_Instrument06_4::
+	audio_header SFX_Noise_Instrument06_4, Ch8
 
-SFX_Triangle2_4::
-	dbw CH7, SFX_Triangle2_4_Ch7
+SFX_Noise_Instrument07_4::
+	audio_header SFX_Noise_Instrument07_4, Ch8
 
-SFX_Snare6_4::
-	dbw CH7, SFX_Snare6_4_Ch7
+SFX_Noise_Instrument08_4::
+	audio_header SFX_Noise_Instrument08_4, Ch8
 
-SFX_Snare7_4::
-	dbw CH7, SFX_Snare7_4_Ch7
+SFX_Noise_Instrument09_4::
+	audio_header SFX_Noise_Instrument09_4, Ch8
 
-SFX_Snare8_4::
-	dbw CH7, SFX_Snare8_4_Ch7
+SFX_Noise_Instrument10_4::
+	audio_header SFX_Noise_Instrument10_4, Ch8
 
-SFX_Snare9_4::
-	dbw CH7, SFX_Snare9_4_Ch7
+SFX_Noise_Instrument11_4::
+	audio_header SFX_Noise_Instrument11_4, Ch8
 
-SFX_Cymbal1_4::
-	dbw CH7, SFX_Cymbal1_4_Ch7
+SFX_Noise_Instrument12_4::
+	audio_header SFX_Noise_Instrument12_4, Ch8
 
-SFX_Cymbal2_4::
-	dbw CH7, SFX_Cymbal2_4_Ch7
+SFX_Noise_Instrument13_4::
+	audio_header SFX_Noise_Instrument13_4, Ch8
 
-SFX_Cymbal3_4::
-	dbw CH7, SFX_Cymbal3_4_Ch7
+SFX_Noise_Instrument14_4::
+	audio_header SFX_Noise_Instrument14_4, Ch8
 
-SFX_Muted_Snare1_4::
-	dbw CH7, SFX_Muted_Snare1_4_Ch7
+SFX_Noise_Instrument15_4::
+	audio_header SFX_Noise_Instrument15_4, Ch8
 
-SFX_Triangle3_4::
-	dbw CH7, SFX_Triangle3_4_Ch7
+SFX_Noise_Instrument16_4::
+	audio_header SFX_Noise_Instrument16_4, Ch8
 
-SFX_Muted_Snare2_4::
-	dbw CH7, SFX_Muted_Snare2_4_Ch7
+SFX_Noise_Instrument17_4::
+	audio_header SFX_Noise_Instrument17_4, Ch8
 
-SFX_Muted_Snare3_4::
-	dbw CH7, SFX_Muted_Snare3_4_Ch7
+SFX_Noise_Instrument18_4::
+	audio_header SFX_Noise_Instrument18_4, Ch8
 
-SFX_Muted_Snare4_4::
-	dbw CH7, SFX_Muted_Snare4_4_Ch7
+SFX_Noise_Instrument19_4::
+	audio_header SFX_Noise_Instrument19_4, Ch8
 
-SFX_8003c_4::
-	dbw ( $80 | CH4 ), SFX_805db_4_Ch4
-	dbw CH5, SFX_805ea_4_Ch5
-	dbw CH7, SFX_805f9_4_Ch7
+SFX_Unknown_805db::
+	audio_header SFX_Unknown_805db, Ch5, Ch6, Ch8
 
-SFX_80045_4::
-	dbw ( $80 | CH4 ), SFX_807eb_4_Ch4
-	dbw CH5, SFX_807fe_4_Ch5
-	dbw CH7, SFX_80811_4_Ch7
+SFX_Unknown_807eb::
+	audio_header SFX_Unknown_807eb, Ch5, Ch6, Ch8
 
-SFX_8004e_4::
-	dbw ( $80 | CH4 ), SFX_80760_4_Ch4
-	dbw CH5, SFX_8076f_4_Ch5
-	dbw CH7, SFX_8077d_4_Ch7
-
-SFX_80057_4::
-	dbw ( $80 | CH4 ), SFX_804fa_4_Ch4
-	dbw CH5, SFX_80519_4_Ch5
-	dbw CH7, SFX_80538_4_Ch7
-
-SFX_80060_4::
-	dbw ( $80 | CH4 ), SFX_808a9_4_Ch4
-	dbw CH5, SFX_808c8_4_Ch5
-	dbw CH7, SFX_808e7_4_Ch7
-
-SFX_80069_4::
-	dbw ( $80 | CH4 ), SFX_80689_4_Ch4
-	dbw CH5, SFX_8069c_4_Ch5
-	dbw CH7, SFX_806ae_4_Ch7
-
-SFX_80072_4::
-	dbw ( $80 | CH4 ), SFX_80633_4_Ch4
-	dbw CH5, SFX_8064d_4_Ch5
-	dbw CH7, SFX_8064e_4_Ch7
-
-SFX_8007b_4::
-	dbw ( $80 | CH4 ), SFX_80661_4_Ch4
-	dbw CH5, SFX_80670_4_Ch5
-	dbw CH7, SFX_8067f_4_Ch7
-
-SFX_80084_4::
-	dbw ( $80 | CH4 ), SFX_80879_4_Ch4
-	dbw CH5, SFX_8088c_4_Ch5
-	dbw CH7, SFX_8089f_4_Ch7
-
-SFX_8008d_4::
-	dbw ( $80 | CH4 ), SFX_80383_4_Ch4
-	dbw CH5, SFX_803a0_4_Ch5
-	dbw CH7, SFX_803c1_4_Ch7
-
-SFX_80096_4::
-	dbw ( $80 | CH4 ), SFX_8081e_4_Ch4
-	dbw CH5, SFX_8083d_4_Ch5
-	dbw CH7, SFX_80860_4_Ch7
-
-SFX_8009f_4::
-	dbw ( $80 | CH4 ), SFX_806af_4_Ch4
-	dbw CH5, SFX_806da_4_Ch5
-	dbw CH7, SFX_806f9_4_Ch7
-
-SFX_800a8_4::
-	dbw ( $80 | CH4 ), SFX_80712_4_Ch4
-	dbw CH5, SFX_80739_4_Ch5
-	dbw CH7, SFX_8075f_4_Ch7
-
-SFX_800b1_4::
-	dbw ( $80 | CH4 ), SFX_8077e_4_Ch4
-	dbw CH5, SFX_8079d_4_Ch5
-	dbw CH7, SFX_807cc_4_Ch7
-
-SFX_800ba_4::
-	dbw ( $80 | CH4 ), SFX_80603_4_Ch4
-	dbw CH5, SFX_80616_4_Ch5
-	dbw CH7, SFX_80629_4_Ch7
-
-SFX_800c3_4::
-	dbw ( $80 | CH4 ), SFX_80545_4_Ch4
-	dbw CH5, SFX_80560_4_Ch5
-	dbw CH7, SFX_8057b_4_Ch7
-
-SFX_800cc_4::
-	dbw ( $80 | CH4 ), SFX_8058b_4_Ch4
-	dbw CH5, SFX_805ae_4_Ch5
-	dbw CH7, SFX_805d1_4_Ch7
-
-SFX_800d5_4::
-	dbw ( $80 | CH4 ), SFX_80467_4_Ch4
-	dbw CH5, SFX_80486_4_Ch5
-	dbw CH7, SFX_804a9_4_Ch7
-
-SFX_800de_4::
-	dbw ( $80 | CH4 ), SFX_8097f_4_Ch4
-	dbw CH5, SFX_80992_4_Ch5
-	dbw CH7, SFX_809a5_4_Ch7
-
-SFX_800e7_4::
-	dbw ( $80 | CH4 ), SFX_809b2_4_Ch4
-	dbw CH5, SFX_809cd_4_Ch5
-	dbw CH7, SFX_809e8_4_Ch7
-
-SFX_800f0_4::
-	dbw ( $80 | CH4 ), SFX_809fb_4_Ch4
-	dbw CH5, SFX_80a0a_4_Ch5
-	dbw CH7, SFX_80a19_4_Ch7
-
-SFX_800f9_4::
-	dbw ( $80 | CH4 ), SFX_80a89_4_Ch4
-	dbw CH5, SFX_80aa4_4_Ch5
-	dbw CH7, SFX_80abf_4_Ch7
-
-SFX_80102_4::
-	dbw ( $80 | CH4 ), SFX_8091c_4_Ch4
-	dbw CH5, SFX_8092b_4_Ch5
-	dbw CH7, SFX_8093a_4_Ch7
-
-SFX_8010b_4::
-	dbw ( $80 | CH4 ), SFX_80ad2_4_Ch4
-	dbw CH5, SFX_80ae5_4_Ch5
-	dbw CH7, SFX_80af8_4_Ch7
-
-SFX_80114_4::
-	dbw ( $80 | CH4 ), SFX_80be2_4_Ch4
-	dbw CH5, SFX_80c05_4_Ch5
-	dbw CH7, SFX_80c28_4_Ch7
-
-SFX_8011d_4::
-	dbw ( $80 | CH4 ), SFX_808fa_4_Ch4
-	dbw CH5, SFX_80909_4_Ch5
-	dbw CH7, SFX_8091b_4_Ch7
-
-SFX_80126_4::
-	dbw ( $80 | CH4 ), SFX_80b53_4_Ch4
-	dbw CH5, SFX_80b6e_4_Ch5
-	dbw CH7, SFX_80b89_4_Ch7
-
-SFX_8012f_4::
-	dbw ( $80 | CH4 ), SFX_80944_4_Ch4
-	dbw CH5, SFX_8095b_4_Ch5
-	dbw CH7, SFX_80972_4_Ch7
-
-SFX_80138_4::
-	dbw ( $80 | CH4 ), SFX_80b05_4_Ch4
-	dbw CH5, SFX_80b28_4_Ch5
-	dbw CH7, SFX_80b43_4_Ch7
-
-SFX_80141_4::
-	dbw ( $80 | CH4 ), SFX_80b9c_4_Ch4
-	dbw CH5, SFX_80bb7_4_Ch5
-	dbw CH7, SFX_80bd2_4_Ch7
-
-SFX_8014a_4::
-	dbw ( $80 | CH4 ), SFX_80a23_4_Ch4
-	dbw CH5, SFX_80a46_4_Ch5
-	dbw CH7, SFX_80a6d_4_Ch7
-
-SFX_80153_4::
-	dbw ( $80 | CH4 ), SFX_80c3b_4_Ch4
-	dbw CH5, SFX_80c4e_4_Ch5
-	dbw CH7, SFX_80c61_4_Ch7
-
-SFX_8015c_4::
-	dbw ( $80 | CH4 ), SFX_80c6e_4_Ch4
-	dbw CH5, SFX_80c81_4_Ch5
-	dbw CH7, SFX_80c94_4_Ch7
-
-SFX_80165_4::
-	dbw ( $80 | CH4 ), SFX_80ca1_4_Ch4
-	dbw CH5, SFX_80cc4_4_Ch5
-	dbw CH7, SFX_80ce6_4_Ch7
-
-SFX_8016e_4::
-	dbw ( $80 | CH4 ), SFX_80ce7_4_Ch4
-	dbw CH5, SFX_80cfa_4_Ch5
-	dbw CH7, SFX_80d0d_4_Ch7
-
-SFX_80177_4::
-	dbw ( $80 | CH4 ), SFX_803da_4_Ch4
-	dbw CH5, SFX_803f1_4_Ch5
-	dbw CH7, SFX_80404_4_Ch7
-
-SFX_80180_4::
-	dbw ( $80 | CH4 ), SFX_80411_4_Ch4
-	dbw CH5, SFX_80434_4_Ch5
-	dbw CH7, SFX_80457_4_Ch7
-
-SFX_80189_4::
-	dbw ( $80 | CH4 ), SFX_804bf_4_Ch4
-	dbw CH5, SFX_804d6_4_Ch5
-	dbw CH7, SFX_804ed_4_Ch7
+SFX_Unknown_80760::
+	audio_header SFX_Unknown_80760, Ch5, Ch6, Ch8
+
+SFX_Unknown_804fa::
+	audio_header SFX_Unknown_804fa, Ch5, Ch6, Ch8
+
+SFX_Unknown_808a9::
+	audio_header SFX_Unknown_808a9, Ch5, Ch6, Ch8
+
+SFX_Unknown_80689::
+	audio_header SFX_Unknown_80689, Ch5, Ch6, Ch8
+
+SFX_Unknown_80633::
+	audio_header SFX_Unknown_80633, Ch5, Ch6, Ch8
+
+SFX_Unknown_80661::
+	audio_header SFX_Unknown_80661, Ch5, Ch6, Ch8
+
+SFX_Unknown_80879::
+	audio_header SFX_Unknown_80879, Ch5, Ch6, Ch8
+
+SFX_Unknown_80383::
+	audio_header SFX_Unknown_80383, Ch5, Ch6, Ch8
+
+SFX_Unknown_8081e::
+	audio_header SFX_Unknown_8081e, Ch5, Ch6, Ch8
+
+SFX_Unknown_806af::
+	audio_header SFX_Unknown_806af, Ch5, Ch6, Ch8
+
+SFX_Unknown_80712::
+	audio_header SFX_Unknown_80712, Ch5, Ch6, Ch8
+
+SFX_Unknown_8077e::
+	audio_header SFX_Unknown_8077e, Ch5, Ch6, Ch8
+
+SFX_Unknown_80603::
+	audio_header SFX_Unknown_80603, Ch5, Ch6, Ch8
+
+SFX_Unknown_80545::
+	audio_header SFX_Unknown_80545, Ch5, Ch6, Ch8
+
+SFX_Unknown_8058b::
+	audio_header SFX_Unknown_8058b, Ch5, Ch6, Ch8
+
+SFX_Unknown_80467::
+	audio_header SFX_Unknown_80467, Ch5, Ch6, Ch8
+
+SFX_Unknown_8097f::
+	audio_header SFX_Unknown_8097f, Ch5, Ch6, Ch8
+
+SFX_Unknown_809b2::
+	audio_header SFX_Unknown_809b2, Ch5, Ch6, Ch8
+
+SFX_Unknown_809fb::
+	audio_header SFX_Unknown_809fb, Ch5, Ch6, Ch8
+
+SFX_Unknown_80a89::
+	audio_header SFX_Unknown_80a89, Ch5, Ch6, Ch8
+
+SFX_Unknown_8091c::
+	audio_header SFX_Unknown_8091c, Ch5, Ch6, Ch8
+
+SFX_Unknown_80ad2::
+	audio_header SFX_Unknown_80ad2, Ch5, Ch6, Ch8
+
+SFX_Unknown_80be2::
+	audio_header SFX_Unknown_80be2, Ch5, Ch6, Ch8
+
+SFX_Unknown_808fa::
+	audio_header SFX_Unknown_808fa, Ch5, Ch6, Ch8
+
+SFX_Unknown_80b53::
+	audio_header SFX_Unknown_80b53, Ch5, Ch6, Ch8
+
+SFX_Unknown_80944::
+	audio_header SFX_Unknown_80944, Ch5, Ch6, Ch8
+
+SFX_Unknown_80b05::
+	audio_header SFX_Unknown_80b05, Ch5, Ch6, Ch8
+
+SFX_Unknown_80b9c::
+	audio_header SFX_Unknown_80b9c, Ch5, Ch6, Ch8
+
+SFX_Unknown_80a23::
+	audio_header SFX_Unknown_80a23, Ch5, Ch6, Ch8
+
+SFX_Unknown_80c3b::
+	audio_header SFX_Unknown_80c3b, Ch5, Ch6, Ch8
+
+SFX_Unknown_80c6e::
+	audio_header SFX_Unknown_80c6e, Ch5, Ch6, Ch8
+
+SFX_Unknown_80ca1::
+	audio_header SFX_Unknown_80ca1, Ch5, Ch6, Ch8
+
+SFX_Unknown_80ce7::
+	audio_header SFX_Unknown_80ce7, Ch5, Ch6, Ch8
+
+SFX_Unknown_803da::
+	audio_header SFX_Unknown_803da, Ch5, Ch6, Ch8
+
+SFX_Unknown_80411::
+	audio_header SFX_Unknown_80411, Ch5, Ch6, Ch8
+
+SFX_Unknown_804bf::
+	audio_header SFX_Unknown_804bf, Ch5, Ch6, Ch8
 
 SFX_Get_Item1_4::
-	dbw ( $80 | CH4 ), SFX_80e5a_4_Ch4
-	dbw CH5, SFX_80e71_4_Ch5
-	dbw CH6, SFX_80e81_4_Ch6
+	audio_header SFX_Get_Item1_4, Ch5, Ch6, Ch7
 
 SFX_Get_Item2_4::
-	dbw ( $80 | CH4 ), SFX_80ec8_4_Ch4
-	dbw CH5, SFX_80ee7_4_Ch5
-	dbw CH6, SFX_80eff_4_Ch6
+	audio_header SFX_Get_Item2_4, Ch5, Ch6, Ch7
 
 SFX_Tink_4::
-	dbw CH4, SFX_8028e_4_Ch4
+	audio_header SFX_Tink_4, Ch5
 
-SFX_Heal_Ailment_4::
-	dbw CH4, SFX_8027f_4_Ch4
+SFX_Unknown_8027f::
+	audio_header SFX_Unknown_8027f, Ch5
 
-SFX_Start_Menu_4::
-	dbw CH4, SFX_8026a_4_Ch4
+SFX_Unknown_8026a::
+	audio_header SFX_Unknown_8026a, Ch5
 
-SFX_PressAB_4::
-	dbw CH7, SFX_80263_4_Ch7
+SFX_Unknown_80263::
+	audio_header SFX_Unknown_80263, Ch8
 
 SFX_Surfing_Add_Points::
-	dbw CH4, SFX_Surfing_Add_Points_Ch4
+	audio_header SFX_Surfing_Add_Points, Ch5
 
 SFX_Surfing_Jump::
-	dbw CH7, SFX_Surfing_Jump_Ch7
+	audio_header SFX_Surfing_Jump, Ch8
 
 SFX_Surfing_Flip::
-	dbw CH4, SFX_Surfing_Flip_Ch4
+	audio_header SFX_Surfing_Flip, Ch5
 
 SFX_Surfing_Land::
-	dbw CH7, SFX_Surfing_Land_Ch7
+	audio_header SFX_Surfing_Land, Ch8
 
-SFX_801bc_4::
-	dbw CH4, SFX_802cc_4_Ch4
+SFX_Unknown_802cc::
+	audio_header SFX_Unknown_802cc, Ch5
 
 SFX_Surfing_Crash::
-	dbw CH7, SFX_Surfing_Crash_Ch7
+	audio_header SFX_Surfing_Crash, Ch8
 
 SFX_Get_Item2_4_2::
-	dbw ( $80 | CH4 ), SFX_Get_Item2_4_2_Ch1
-	dbw CH5, SFX_Get_Item2_4_2_Ch2
-	dbw CH6, SFX_Get_Item2_4_2_Ch3
+	audio_header SFX_Get_Item2_4_2, Ch5, Ch6, Ch7