Merge branch 'master' of https://github.com/pret/pokered

1 files changed, 222 insertions, 70 deletions

diff --git a/audio/headers/sfxheaders4.asm b/audio/headers/sfxheaders4.asm
index d371d3f8..fc2c6166 100644
--- a/audio/headers/sfxheaders4.asm
+++ b/audio/headers/sfxheaders4.asm
@@ -2,211 +2,363 @@ SFX_Headers_4::
 	db $ff, $ff, $ff ; padding
 
 SFX_Noise_Instrument01_4::
-	audio_header SFX_Noise_Instrument01_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument01_4_Ch8
 
 SFX_Noise_Instrument02_4::
-	audio_header SFX_Noise_Instrument02_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument02_4_Ch8
 
 SFX_Noise_Instrument03_4::
-	audio_header SFX_Noise_Instrument03_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument03_4_Ch8
 
 SFX_Noise_Instrument04_4::
-	audio_header SFX_Noise_Instrument04_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument04_4_Ch8
 
 SFX_Noise_Instrument05_4::
-	audio_header SFX_Noise_Instrument05_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument05_4_Ch8
 
 SFX_Noise_Instrument06_4::
-	audio_header SFX_Noise_Instrument06_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument06_4_Ch8
 
 SFX_Noise_Instrument07_4::
-	audio_header SFX_Noise_Instrument07_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument07_4_Ch8
 
 SFX_Noise_Instrument08_4::
-	audio_header SFX_Noise_Instrument08_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument08_4_Ch8
 
 SFX_Noise_Instrument09_4::
-	audio_header SFX_Noise_Instrument09_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument09_4_Ch8
 
 SFX_Noise_Instrument10_4::
-	audio_header SFX_Noise_Instrument10_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument10_4_Ch8
 
 SFX_Noise_Instrument11_4::
-	audio_header SFX_Noise_Instrument11_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument11_4_Ch8
 
 SFX_Noise_Instrument12_4::
-	audio_header SFX_Noise_Instrument12_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument12_4_Ch8
 
 SFX_Noise_Instrument13_4::
-	audio_header SFX_Noise_Instrument13_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument13_4_Ch8
 
 SFX_Noise_Instrument14_4::
-	audio_header SFX_Noise_Instrument14_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument14_4_Ch8
 
 SFX_Noise_Instrument15_4::
-	audio_header SFX_Noise_Instrument15_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument15_4_Ch8
 
 SFX_Noise_Instrument16_4::
-	audio_header SFX_Noise_Instrument16_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument16_4_Ch8
 
 SFX_Noise_Instrument17_4::
-	audio_header SFX_Noise_Instrument17_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument17_4_Ch8
 
 SFX_Noise_Instrument18_4::
-	audio_header SFX_Noise_Instrument18_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument18_4_Ch8
 
 SFX_Noise_Instrument19_4::
-	audio_header SFX_Noise_Instrument19_4, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument19_4_Ch8
 
 SFX_Cry00_4::
-	audio_header SFX_Cry00_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry00_4_Ch5
+	channel 6, SFX_Cry00_4_Ch6
+	channel 8, SFX_Cry00_4_Ch8
 
 SFX_Cry01_4::
-	audio_header SFX_Cry01_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry01_4_Ch5
+	channel 6, SFX_Cry01_4_Ch6
+	channel 8, SFX_Cry01_4_Ch8
 
 SFX_Cry02_4::
-	audio_header SFX_Cry02_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry02_4_Ch5
+	channel 6, SFX_Cry02_4_Ch6
+	channel 8, SFX_Cry02_4_Ch8
 
 SFX_Cry03_4::
-	audio_header SFX_Cry03_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry03_4_Ch5
+	channel 6, SFX_Cry03_4_Ch6
+	channel 8, SFX_Cry03_4_Ch8
 
 SFX_Cry04_4::
-	audio_header SFX_Cry04_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry04_4_Ch5
+	channel 6, SFX_Cry04_4_Ch6
+	channel 8, SFX_Cry04_4_Ch8
 
 SFX_Cry05_4::
-	audio_header SFX_Cry05_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry05_4_Ch5
+	channel 6, SFX_Cry05_4_Ch6
+	channel 8, SFX_Cry05_4_Ch8
 
 SFX_Cry06_4::
-	audio_header SFX_Cry06_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry06_4_Ch5
+	channel 6, SFX_Cry06_4_Ch6
+	channel 8, SFX_Cry06_4_Ch8
 
 SFX_Cry07_4::
-	audio_header SFX_Cry07_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry07_4_Ch5
+	channel 6, SFX_Cry07_4_Ch6
+	channel 8, SFX_Cry07_4_Ch8
 
 SFX_Cry08_4::
-	audio_header SFX_Cry08_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry08_4_Ch5
+	channel 6, SFX_Cry08_4_Ch6
+	channel 8, SFX_Cry08_4_Ch8
 
 SFX_Cry09_4::
-	audio_header SFX_Cry09_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry09_4_Ch5
+	channel 6, SFX_Cry09_4_Ch6
+	channel 8, SFX_Cry09_4_Ch8
 
 SFX_Cry0A_4::
-	audio_header SFX_Cry0A_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0A_4_Ch5
+	channel 6, SFX_Cry0A_4_Ch6
+	channel 8, SFX_Cry0A_4_Ch8
 
 SFX_Cry0B_4::
-	audio_header SFX_Cry0B_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0B_4_Ch5
+	channel 6, SFX_Cry0B_4_Ch6
+	channel 8, SFX_Cry0B_4_Ch8
 
 SFX_Cry0C_4::
-	audio_header SFX_Cry0C_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0C_4_Ch5
+	channel 6, SFX_Cry0C_4_Ch6
+	channel 8, SFX_Cry0C_4_Ch8
 
 SFX_Cry0D_4::
-	audio_header SFX_Cry0D_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0D_4_Ch5
+	channel 6, SFX_Cry0D_4_Ch6
+	channel 8, SFX_Cry0D_4_Ch8
 
 SFX_Cry0E_4::
-	audio_header SFX_Cry0E_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0E_4_Ch5
+	channel 6, SFX_Cry0E_4_Ch6
+	channel 8, SFX_Cry0E_4_Ch8
 
 SFX_Cry0F_4::
-	audio_header SFX_Cry0F_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0F_4_Ch5
+	channel 6, SFX_Cry0F_4_Ch6
+	channel 8, SFX_Cry0F_4_Ch8
 
 SFX_Cry10_4::
-	audio_header SFX_Cry10_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry10_4_Ch5
+	channel 6, SFX_Cry10_4_Ch6
+	channel 8, SFX_Cry10_4_Ch8
 
 SFX_Cry11_4::
-	audio_header SFX_Cry11_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry11_4_Ch5
+	channel 6, SFX_Cry11_4_Ch6
+	channel 8, SFX_Cry11_4_Ch8
 
 SFX_Cry12_4::
-	audio_header SFX_Cry12_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry12_4_Ch5
+	channel 6, SFX_Cry12_4_Ch6
+	channel 8, SFX_Cry12_4_Ch8
 
 SFX_Cry13_4::
-	audio_header SFX_Cry13_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry13_4_Ch5
+	channel 6, SFX_Cry13_4_Ch6
+	channel 8, SFX_Cry13_4_Ch8
 
 SFX_Cry14_4::
-	audio_header SFX_Cry14_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry14_4_Ch5
+	channel 6, SFX_Cry14_4_Ch6
+	channel 8, SFX_Cry14_4_Ch8
 
 SFX_Cry15_4::
-	audio_header SFX_Cry15_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry15_4_Ch5
+	channel 6, SFX_Cry15_4_Ch6
+	channel 8, SFX_Cry15_4_Ch8
 
 SFX_Cry16_4::
-	audio_header SFX_Cry16_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry16_4_Ch5
+	channel 6, SFX_Cry16_4_Ch6
+	channel 8, SFX_Cry16_4_Ch8
 
 SFX_Cry17_4::
-	audio_header SFX_Cry17_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry17_4_Ch5
+	channel 6, SFX_Cry17_4_Ch6
+	channel 8, SFX_Cry17_4_Ch8
 
 SFX_Cry18_4::
-	audio_header SFX_Cry18_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry18_4_Ch5
+	channel 6, SFX_Cry18_4_Ch6
+	channel 8, SFX_Cry18_4_Ch8
 
 SFX_Cry19_4::
-	audio_header SFX_Cry19_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry19_4_Ch5
+	channel 6, SFX_Cry19_4_Ch6
+	channel 8, SFX_Cry19_4_Ch8
 
 SFX_Cry1A_4::
-	audio_header SFX_Cry1A_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1A_4_Ch5
+	channel 6, SFX_Cry1A_4_Ch6
+	channel 8, SFX_Cry1A_4_Ch8
 
 SFX_Cry1B_4::
-	audio_header SFX_Cry1B_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1B_4_Ch5
+	channel 6, SFX_Cry1B_4_Ch6
+	channel 8, SFX_Cry1B_4_Ch8
 
 SFX_Cry1C_4::
-	audio_header SFX_Cry1C_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1C_4_Ch5
+	channel 6, SFX_Cry1C_4_Ch6
+	channel 8, SFX_Cry1C_4_Ch8
 
 SFX_Cry1D_4::
-	audio_header SFX_Cry1D_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1D_4_Ch5
+	channel 6, SFX_Cry1D_4_Ch6
+	channel 8, SFX_Cry1D_4_Ch8
 
 SFX_Cry1E_4::
-	audio_header SFX_Cry1E_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1E_4_Ch5
+	channel 6, SFX_Cry1E_4_Ch6
+	channel 8, SFX_Cry1E_4_Ch8
 
 SFX_Cry1F_4::
-	audio_header SFX_Cry1F_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1F_4_Ch5
+	channel 6, SFX_Cry1F_4_Ch6
+	channel 8, SFX_Cry1F_4_Ch8
 
 SFX_Cry20_4::
-	audio_header SFX_Cry20_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry20_4_Ch5
+	channel 6, SFX_Cry20_4_Ch6
+	channel 8, SFX_Cry20_4_Ch8
 
 SFX_Cry21_4::
-	audio_header SFX_Cry21_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry21_4_Ch5
+	channel 6, SFX_Cry21_4_Ch6
+	channel 8, SFX_Cry21_4_Ch8
 
 SFX_Cry22_4::
-	audio_header SFX_Cry22_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry22_4_Ch5
+	channel 6, SFX_Cry22_4_Ch6
+	channel 8, SFX_Cry22_4_Ch8
 
 SFX_Cry23_4::
-	audio_header SFX_Cry23_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry23_4_Ch5
+	channel 6, SFX_Cry23_4_Ch6
+	channel 8, SFX_Cry23_4_Ch8
 
 SFX_Cry24_4::
-	audio_header SFX_Cry24_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry24_4_Ch5
+	channel 6, SFX_Cry24_4_Ch6
+	channel 8, SFX_Cry24_4_Ch8
 
 SFX_Cry25_4::
-	audio_header SFX_Cry25_4, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry25_4_Ch5
+	channel 6, SFX_Cry25_4_Ch6
+	channel 8, SFX_Cry25_4_Ch8
 
 SFX_Get_Item1_4::
-	audio_header SFX_Get_Item1_4, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Item1_4_Ch5
+	channel 6, SFX_Get_Item1_4_Ch6
+	channel 7, SFX_Get_Item1_4_Ch7
 
 SFX_Get_Item2_4::
-	audio_header SFX_Get_Item2_4, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Item2_4_Ch5
+	channel 6, SFX_Get_Item2_4_Ch6
+	channel 7, SFX_Get_Item2_4_Ch7
 
 SFX_Tink_4::
-	audio_header SFX_Tink_4, Ch5
+	channel_count 1
+	channel 5, SFX_Tink_4_Ch5
 
 SFX_Heal_HP_4::
-	audio_header SFX_Heal_HP_4, Ch5
+	channel_count 1
+	channel 5, SFX_Heal_HP_4_Ch5
 
 SFX_Heal_Ailment_4::
-	audio_header SFX_Heal_Ailment_4, Ch5
+	channel_count 1
+	channel 5, SFX_Heal_Ailment_4_Ch5
 
 SFX_Start_Menu_4::
-	audio_header SFX_Start_Menu_4, Ch8
+	channel_count 1
+	channel 8, SFX_Start_Menu_4_Ch8
 
 SFX_Press_AB_4::
-	audio_header SFX_Press_AB_4, Ch5
+	channel_count 1
+	channel 5, SFX_Press_AB_4_Ch5
 
 SFX_Surfing_Jump::
-	audio_header SFX_Surfing_Jump, Ch8
+	channel_count 1
+	channel 8, SFX_Surfing_Jump_Ch8
 
 SFX_Surfing_Flip::
-	audio_header SFX_Surfing_Flip, Ch5
+	channel_count 1
+	channel 5, SFX_Surfing_Flip_Ch5
 
 SFX_Surfing_Crash::
-	audio_header SFX_Surfing_Crash, Ch8
+	channel_count 1
+	channel 8, SFX_Surfing_Crash_Ch8
 
 SFX_Unknown_802cc::
-	audio_header SFX_Unknown_802cc, Ch5
+	channel_count 1
+	channel 5, SFX_Unknown_802cc_Ch5
 
 SFX_Surfing_Land::
-	audio_header SFX_Surfing_Land, Ch8
+	channel_count 1
+	channel 8, SFX_Surfing_Land_Ch8
 
 SFX_Get_Item2_4_2::
-	audio_header SFX_Get_Item2_4_2, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Item2_4_2_Ch5
+	channel 6, SFX_Get_Item2_4_2_Ch6
+	channel 7, SFX_Get_Item2_4_2_Ch7