Use the same music headers as pokecrystal (#382)

1 files changed, 297 insertions, 103 deletions

diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm
index 2732767f..bc6451a7 100644
--- a/audio/headers/sfxheaders3.asm
+++ b/audio/headers/sfxheaders3.asm
@@ -2,310 +2,504 @@ SFX_Headers_3::
 	db $ff, $ff, $ff ; padding
 
 SFX_Noise_Instrument01_3::
-	audio_header SFX_Noise_Instrument01_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument01_3_Ch8
 
 SFX_Noise_Instrument02_3::
-	audio_header SFX_Noise_Instrument02_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument02_3_Ch8
 
 SFX_Noise_Instrument03_3::
-	audio_header SFX_Noise_Instrument03_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument03_3_Ch8
 
 SFX_Noise_Instrument04_3::
-	audio_header SFX_Noise_Instrument04_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument04_3_Ch8
 
 SFX_Noise_Instrument05_3::
-	audio_header SFX_Noise_Instrument05_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument05_3_Ch8
 
 SFX_Noise_Instrument06_3::
-	audio_header SFX_Noise_Instrument06_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument06_3_Ch8
 
 SFX_Noise_Instrument07_3::
-	audio_header SFX_Noise_Instrument07_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument07_3_Ch8
 
 SFX_Noise_Instrument08_3::
-	audio_header SFX_Noise_Instrument08_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument08_3_Ch8
 
 SFX_Noise_Instrument09_3::
-	audio_header SFX_Noise_Instrument09_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument09_3_Ch8
 
 SFX_Noise_Instrument10_3::
-	audio_header SFX_Noise_Instrument10_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument10_3_Ch8
 
 SFX_Noise_Instrument11_3::
-	audio_header SFX_Noise_Instrument11_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument11_3_Ch8
 
 SFX_Noise_Instrument12_3::
-	audio_header SFX_Noise_Instrument12_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument12_3_Ch8
 
 SFX_Noise_Instrument13_3::
-	audio_header SFX_Noise_Instrument13_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument13_3_Ch8
 
 SFX_Noise_Instrument14_3::
-	audio_header SFX_Noise_Instrument14_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument14_3_Ch8
 
 SFX_Noise_Instrument15_3::
-	audio_header SFX_Noise_Instrument15_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument15_3_Ch8
 
 SFX_Noise_Instrument16_3::
-	audio_header SFX_Noise_Instrument16_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument16_3_Ch8
 
 SFX_Noise_Instrument17_3::
-	audio_header SFX_Noise_Instrument17_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument17_3_Ch8
 
 SFX_Noise_Instrument18_3::
-	audio_header SFX_Noise_Instrument18_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument18_3_Ch8
 
 SFX_Noise_Instrument19_3::
-	audio_header SFX_Noise_Instrument19_3, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument19_3_Ch8
 
 SFX_Cry00_3::
-	audio_header SFX_Cry00_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry00_3_Ch5
+	channel 6, SFX_Cry00_3_Ch6
+	channel 8, SFX_Cry00_3_Ch8
 
 SFX_Cry01_3::
-	audio_header SFX_Cry01_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry01_3_Ch5
+	channel 6, SFX_Cry01_3_Ch6
+	channel 8, SFX_Cry01_3_Ch8
 
 SFX_Cry02_3::
-	audio_header SFX_Cry02_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry02_3_Ch5
+	channel 6, SFX_Cry02_3_Ch6
+	channel 8, SFX_Cry02_3_Ch8
 
 SFX_Cry03_3::
-	audio_header SFX_Cry03_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry03_3_Ch5
+	channel 6, SFX_Cry03_3_Ch6
+	channel 8, SFX_Cry03_3_Ch8
 
 SFX_Cry04_3::
-	audio_header SFX_Cry04_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry04_3_Ch5
+	channel 6, SFX_Cry04_3_Ch6
+	channel 8, SFX_Cry04_3_Ch8
 
 SFX_Cry05_3::
-	audio_header SFX_Cry05_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry05_3_Ch5
+	channel 6, SFX_Cry05_3_Ch6
+	channel 8, SFX_Cry05_3_Ch8
 
 SFX_Cry06_3::
-	audio_header SFX_Cry06_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry06_3_Ch5
+	channel 6, SFX_Cry06_3_Ch6
+	channel 8, SFX_Cry06_3_Ch8
 
 SFX_Cry07_3::
-	audio_header SFX_Cry07_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry07_3_Ch5
+	channel 6, SFX_Cry07_3_Ch6
+	channel 8, SFX_Cry07_3_Ch8
 
 SFX_Cry08_3::
-	audio_header SFX_Cry08_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry08_3_Ch5
+	channel 6, SFX_Cry08_3_Ch6
+	channel 8, SFX_Cry08_3_Ch8
 
 SFX_Cry09_3::
-	audio_header SFX_Cry09_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry09_3_Ch5
+	channel 6, SFX_Cry09_3_Ch6
+	channel 8, SFX_Cry09_3_Ch8
 
 SFX_Cry0A_3::
-	audio_header SFX_Cry0A_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0A_3_Ch5
+	channel 6, SFX_Cry0A_3_Ch6
+	channel 8, SFX_Cry0A_3_Ch8
 
 SFX_Cry0B_3::
-	audio_header SFX_Cry0B_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0B_3_Ch5
+	channel 6, SFX_Cry0B_3_Ch6
+	channel 8, SFX_Cry0B_3_Ch8
 
 SFX_Cry0C_3::
-	audio_header SFX_Cry0C_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0C_3_Ch5
+	channel 6, SFX_Cry0C_3_Ch6
+	channel 8, SFX_Cry0C_3_Ch8
 
 SFX_Cry0D_3::
-	audio_header SFX_Cry0D_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0D_3_Ch5
+	channel 6, SFX_Cry0D_3_Ch6
+	channel 8, SFX_Cry0D_3_Ch8
 
 SFX_Cry0E_3::
-	audio_header SFX_Cry0E_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0E_3_Ch5
+	channel 6, SFX_Cry0E_3_Ch6
+	channel 8, SFX_Cry0E_3_Ch8
 
 SFX_Cry0F_3::
-	audio_header SFX_Cry0F_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0F_3_Ch5
+	channel 6, SFX_Cry0F_3_Ch6
+	channel 8, SFX_Cry0F_3_Ch8
 
 SFX_Cry10_3::
-	audio_header SFX_Cry10_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry10_3_Ch5
+	channel 6, SFX_Cry10_3_Ch6
+	channel 8, SFX_Cry10_3_Ch8
 
 SFX_Cry11_3::
-	audio_header SFX_Cry11_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry11_3_Ch5
+	channel 6, SFX_Cry11_3_Ch6
+	channel 8, SFX_Cry11_3_Ch8
 
 SFX_Cry12_3::
-	audio_header SFX_Cry12_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry12_3_Ch5
+	channel 6, SFX_Cry12_3_Ch6
+	channel 8, SFX_Cry12_3_Ch8
 
 SFX_Cry13_3::
-	audio_header SFX_Cry13_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry13_3_Ch5
+	channel 6, SFX_Cry13_3_Ch6
+	channel 8, SFX_Cry13_3_Ch8
 
 SFX_Cry14_3::
-	audio_header SFX_Cry14_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry14_3_Ch5
+	channel 6, SFX_Cry14_3_Ch6
+	channel 8, SFX_Cry14_3_Ch8
 
 SFX_Cry15_3::
-	audio_header SFX_Cry15_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry15_3_Ch5
+	channel 6, SFX_Cry15_3_Ch6
+	channel 8, SFX_Cry15_3_Ch8
 
 SFX_Cry16_3::
-	audio_header SFX_Cry16_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry16_3_Ch5
+	channel 6, SFX_Cry16_3_Ch6
+	channel 8, SFX_Cry16_3_Ch8
 
 SFX_Cry17_3::
-	audio_header SFX_Cry17_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry17_3_Ch5
+	channel 6, SFX_Cry17_3_Ch6
+	channel 8, SFX_Cry17_3_Ch8
 
 SFX_Cry18_3::
-	audio_header SFX_Cry18_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry18_3_Ch5
+	channel 6, SFX_Cry18_3_Ch6
+	channel 8, SFX_Cry18_3_Ch8
 
 SFX_Cry19_3::
-	audio_header SFX_Cry19_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry19_3_Ch5
+	channel 6, SFX_Cry19_3_Ch6
+	channel 8, SFX_Cry19_3_Ch8
 
 SFX_Cry1A_3::
-	audio_header SFX_Cry1A_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1A_3_Ch5
+	channel 6, SFX_Cry1A_3_Ch6
+	channel 8, SFX_Cry1A_3_Ch8
 
 SFX_Cry1B_3::
-	audio_header SFX_Cry1B_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1B_3_Ch5
+	channel 6, SFX_Cry1B_3_Ch6
+	channel 8, SFX_Cry1B_3_Ch8
 
 SFX_Cry1C_3::
-	audio_header SFX_Cry1C_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1C_3_Ch5
+	channel 6, SFX_Cry1C_3_Ch6
+	channel 8, SFX_Cry1C_3_Ch8
 
 SFX_Cry1D_3::
-	audio_header SFX_Cry1D_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1D_3_Ch5
+	channel 6, SFX_Cry1D_3_Ch6
+	channel 8, SFX_Cry1D_3_Ch8
 
 SFX_Cry1E_3::
-	audio_header SFX_Cry1E_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1E_3_Ch5
+	channel 6, SFX_Cry1E_3_Ch6
+	channel 8, SFX_Cry1E_3_Ch8
 
 SFX_Cry1F_3::
-	audio_header SFX_Cry1F_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1F_3_Ch5
+	channel 6, SFX_Cry1F_3_Ch6
+	channel 8, SFX_Cry1F_3_Ch8
 
 SFX_Cry20_3::
-	audio_header SFX_Cry20_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry20_3_Ch5
+	channel 6, SFX_Cry20_3_Ch6
+	channel 8, SFX_Cry20_3_Ch8
 
 SFX_Cry21_3::
-	audio_header SFX_Cry21_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry21_3_Ch5
+	channel 6, SFX_Cry21_3_Ch6
+	channel 8, SFX_Cry21_3_Ch8
 
 SFX_Cry22_3::
-	audio_header SFX_Cry22_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry22_3_Ch5
+	channel 6, SFX_Cry22_3_Ch6
+	channel 8, SFX_Cry22_3_Ch8
 
 SFX_Cry23_3::
-	audio_header SFX_Cry23_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry23_3_Ch5
+	channel 6, SFX_Cry23_3_Ch6
+	channel 8, SFX_Cry23_3_Ch8
 
 SFX_Cry24_3::
-	audio_header SFX_Cry24_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry24_3_Ch5
+	channel 6, SFX_Cry24_3_Ch6
+	channel 8, SFX_Cry24_3_Ch8
 
 SFX_Cry25_3::
-	audio_header SFX_Cry25_3, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry25_3_Ch5
+	channel 6, SFX_Cry25_3_Ch6
+	channel 8, SFX_Cry25_3_Ch8
 
 SFX_Get_Item1_3::
-	audio_header SFX_Get_Item1_3, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Item1_3_Ch5
+	channel 6, SFX_Get_Item1_3_Ch6
+	channel 7, SFX_Get_Item1_3_Ch7
 
 SFX_Get_Item2_3::
-	audio_header SFX_Get_Item2_3, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Item2_3_Ch5
+	channel 6, SFX_Get_Item2_3_Ch6
+	channel 7, SFX_Get_Item2_3_Ch7
 
 SFX_Tink_3::
-	audio_header SFX_Tink_3, Ch5
+	channel_count 1
+	channel 5, SFX_Tink_3_Ch5
 
 SFX_Heal_HP_3::
-	audio_header SFX_Heal_HP_3, Ch5
+	channel_count 1
+	channel 5, SFX_Heal_HP_3_Ch5
 
 SFX_Heal_Ailment_3::
-	audio_header SFX_Heal_Ailment_3, Ch5
+	channel_count 1
+	channel 5, SFX_Heal_Ailment_3_Ch5
 
 SFX_Start_Menu_3::
-	audio_header SFX_Start_Menu_3, Ch8
+	channel_count 1
+	channel 8, SFX_Start_Menu_3_Ch8
 
 SFX_Press_AB_3::
-	audio_header SFX_Press_AB_3, Ch5
+	channel_count 1
+	channel 5, SFX_Press_AB_3_Ch5
 
 SFX_Pokedex_Rating_3::
-	audio_header SFX_Pokedex_Rating_3, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Pokedex_Rating_3_Ch5
+	channel 6, SFX_Pokedex_Rating_3_Ch6
+	channel 7, SFX_Pokedex_Rating_3_Ch7
 
 SFX_Get_Key_Item_3::
-	audio_header SFX_Get_Key_Item_3, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Key_Item_3_Ch5
+	channel 6, SFX_Get_Key_Item_3_Ch6
+	channel 7, SFX_Get_Key_Item_3_Ch7
 
 SFX_Poisoned_3::
-	audio_header SFX_Poisoned_3, Ch5
+	channel_count 1
+	channel 5, SFX_Poisoned_3_Ch5
 
 SFX_Trade_Machine_3::
-	audio_header SFX_Trade_Machine_3, Ch5
+	channel_count 1
+	channel 5, SFX_Trade_Machine_3_Ch5
 
 SFX_Turn_On_PC_3::
-	audio_header SFX_Turn_On_PC_3, Ch5
+	channel_count 1
+	channel 5, SFX_Turn_On_PC_3_Ch5
 
 SFX_Turn_Off_PC_3::
-	audio_header SFX_Turn_Off_PC_3, Ch5
+	channel_count 1
+	channel 5, SFX_Turn_Off_PC_3_Ch5
 
 SFX_Enter_PC_3::
-	audio_header SFX_Enter_PC_3, Ch5
+	channel_count 1
+	channel 5, SFX_Enter_PC_3_Ch5
 
 SFX_Shrink_3::
-	audio_header SFX_Shrink_3, Ch5
+	channel_count 1
+	channel 5, SFX_Shrink_3_Ch5
 
 SFX_Switch_3::
-	audio_header SFX_Switch_3, Ch5
+	channel_count 1
+	channel 5, SFX_Switch_3_Ch5
 
 SFX_Healing_Machine_3::
-	audio_header SFX_Healing_Machine_3, Ch5
+	channel_count 1
+	channel 5, SFX_Healing_Machine_3_Ch5
 
 SFX_Teleport_Exit1_3::
-	audio_header SFX_Teleport_Exit1_3, Ch5
+	channel_count 1
+	channel 5, SFX_Teleport_Exit1_3_Ch5
 
 SFX_Teleport_Enter1_3::
-	audio_header SFX_Teleport_Enter1_3, Ch5
+	channel_count 1
+	channel 5, SFX_Teleport_Enter1_3_Ch5
 
 SFX_Teleport_Exit2_3::
-	audio_header SFX_Teleport_Exit2_3, Ch5
+	channel_count 1
+	channel 5, SFX_Teleport_Exit2_3_Ch5
 
 SFX_Ledge_3::
-	audio_header SFX_Ledge_3, Ch5
+	channel_count 1
+	channel 5, SFX_Ledge_3_Ch5
 
 SFX_Teleport_Enter2_3::
-	audio_header SFX_Teleport_Enter2_3, Ch8
+	channel_count 1
+	channel 8, SFX_Teleport_Enter2_3_Ch8
 
 SFX_Fly_3::
-	audio_header SFX_Fly_3, Ch8
+	channel_count 1
+	channel 8, SFX_Fly_3_Ch8
 
 SFX_Denied_3::
-	audio_header SFX_Denied_3, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Denied_3_Ch5
+	channel 6, SFX_Denied_3_Ch6
 
 SFX_Arrow_Tiles_3::
-	audio_header SFX_Arrow_Tiles_3, Ch5
+	channel_count 1
+	channel 5, SFX_Arrow_Tiles_3_Ch5
 
 SFX_Push_Boulder_3::
-	audio_header SFX_Push_Boulder_3, Ch8
+	channel_count 1
+	channel 8, SFX_Push_Boulder_3_Ch8
 
 SFX_SS_Anne_Horn_3::
-	audio_header SFX_SS_Anne_Horn_3, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_SS_Anne_Horn_3_Ch5
+	channel 6, SFX_SS_Anne_Horn_3_Ch6
 
 SFX_Withdraw_Deposit_3::
-	audio_header SFX_Withdraw_Deposit_3, Ch5
+	channel_count 1
+	channel 5, SFX_Withdraw_Deposit_3_Ch5
 
 SFX_Cut_3::
-	audio_header SFX_Cut_3, Ch8
+	channel_count 1
+	channel 8, SFX_Cut_3_Ch8
 
 SFX_Go_Inside_3::
-	audio_header SFX_Go_Inside_3, Ch8
+	channel_count 1
+	channel 8, SFX_Go_Inside_3_Ch8
 
 SFX_Swap_3::
-	audio_header SFX_Swap_3, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Swap_3_Ch5
+	channel 6, SFX_Swap_3_Ch6
 
 SFX_59_3::
-	audio_header SFX_59_3, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_59_3_Ch5
+	channel 6, SFX_59_3_Ch6
 
 SFX_Purchase_3::
-	audio_header SFX_Purchase_3, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Purchase_3_Ch5
+	channel 6, SFX_Purchase_3_Ch6
 
 SFX_Collision_3::
-	audio_header SFX_Collision_3, Ch5
+	channel_count 1
+	channel 5, SFX_Collision_3_Ch5
 
 SFX_Go_Outside_3::
-	audio_header SFX_Go_Outside_3, Ch8
+	channel_count 1
+	channel 8, SFX_Go_Outside_3_Ch8
 
 SFX_Save_3::
-	audio_header SFX_Save_3, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Save_3_Ch5
+	channel 6, SFX_Save_3_Ch6
 
 SFX_Intro_Lunge::
-	audio_header SFX_Intro_Lunge, Ch8
+	channel_count 1
+	channel 8, SFX_Intro_Lunge_Ch8
 
 SFX_Intro_Hip::
-	audio_header SFX_Intro_Hip, Ch5
+	channel_count 1
+	channel 5, SFX_Intro_Hip_Ch5
 
 SFX_Intro_Hop::
-	audio_header SFX_Intro_Hop, Ch5
+	channel_count 1
+	channel 5, SFX_Intro_Hop_Ch5
 
 SFX_Intro_Raise::
-	audio_header SFX_Intro_Raise, Ch8
+	channel_count 1
+	channel 8, SFX_Intro_Raise_Ch8
 
 SFX_Intro_Crash::
-	audio_header SFX_Intro_Crash, Ch8
+	channel_count 1
+	channel 8, SFX_Intro_Crash_Ch8
 
 SFX_Intro_Whoosh::
-	audio_header SFX_Intro_Whoosh, Ch8
+	channel_count 1
+	channel 8, SFX_Intro_Whoosh_Ch8
 
 SFX_Slots_Stop_Wheel::
-	audio_header SFX_Slots_Stop_Wheel, Ch5
+	channel_count 1
+	channel 5, SFX_Slots_Stop_Wheel_Ch5
 
 SFX_Slots_Reward::
-	audio_header SFX_Slots_Reward, Ch5
+	channel_count 1
+	channel 5, SFX_Slots_Reward_Ch5
 
 SFX_Slots_New_Spin::
-	audio_header SFX_Slots_New_Spin, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Slots_New_Spin_Ch5
+	channel 6, SFX_Slots_New_Spin_Ch6
 
 SFX_Shooting_Star::
-	audio_header SFX_Shooting_Star, Ch5
+	channel_count 1
+	channel 5, SFX_Shooting_Star_Ch5