Use the same music headers as pokecrystal (#382)

1 files changed, 280 insertions, 95 deletions

diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm
index 2d5eca4a..297b7582 100644
--- a/audio/headers/sfxheaders1.asm
+++ b/audio/headers/sfxheaders1.asm
@@ -2,287 +2,472 @@ SFX_Headers_1::
 	db $ff, $ff, $ff ; padding
 
 SFX_Noise_Instrument01_1::
-	audio_header SFX_Noise_Instrument01_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument01_1_Ch8
 
 SFX_Noise_Instrument02_1::
-	audio_header SFX_Noise_Instrument02_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument02_1_Ch8
 
 SFX_Noise_Instrument03_1::
-	audio_header SFX_Noise_Instrument03_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument03_1_Ch8
 
 SFX_Noise_Instrument04_1::
-	audio_header SFX_Noise_Instrument04_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument04_1_Ch8
 
 SFX_Noise_Instrument05_1::
-	audio_header SFX_Noise_Instrument05_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument05_1_Ch8
 
 SFX_Noise_Instrument06_1::
-	audio_header SFX_Noise_Instrument06_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument06_1_Ch8
 
 SFX_Noise_Instrument07_1::
-	audio_header SFX_Noise_Instrument07_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument07_1_Ch8
 
 SFX_Noise_Instrument08_1::
-	audio_header SFX_Noise_Instrument08_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument08_1_Ch8
 
 SFX_Noise_Instrument09_1::
-	audio_header SFX_Noise_Instrument09_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument09_1_Ch8
 
 SFX_Noise_Instrument10_1::
-	audio_header SFX_Noise_Instrument10_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument10_1_Ch8
 
 SFX_Noise_Instrument11_1::
-	audio_header SFX_Noise_Instrument11_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument11_1_Ch8
 
 SFX_Noise_Instrument12_1::
-	audio_header SFX_Noise_Instrument12_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument12_1_Ch8
 
 SFX_Noise_Instrument13_1::
-	audio_header SFX_Noise_Instrument13_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument13_1_Ch8
 
 SFX_Noise_Instrument14_1::
-	audio_header SFX_Noise_Instrument14_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument14_1_Ch8
 
 SFX_Noise_Instrument15_1::
-	audio_header SFX_Noise_Instrument15_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument15_1_Ch8
 
 SFX_Noise_Instrument16_1::
-	audio_header SFX_Noise_Instrument16_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument16_1_Ch8
 
 SFX_Noise_Instrument17_1::
-	audio_header SFX_Noise_Instrument17_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument17_1_Ch8
 
 SFX_Noise_Instrument18_1::
-	audio_header SFX_Noise_Instrument18_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument18_1_Ch8
 
 SFX_Noise_Instrument19_1::
-	audio_header SFX_Noise_Instrument19_1, Ch8
+	channel_count 1
+	channel 8, SFX_Noise_Instrument19_1_Ch8
 
 SFX_Cry00_1::
-	audio_header SFX_Cry00_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry00_1_Ch5
+	channel 6, SFX_Cry00_1_Ch6
+	channel 8, SFX_Cry00_1_Ch8
 
 SFX_Cry01_1::
-	audio_header SFX_Cry01_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry01_1_Ch5
+	channel 6, SFX_Cry01_1_Ch6
+	channel 8, SFX_Cry01_1_Ch8
 
 SFX_Cry02_1::
-	audio_header SFX_Cry02_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry02_1_Ch5
+	channel 6, SFX_Cry02_1_Ch6
+	channel 8, SFX_Cry02_1_Ch8
 
 SFX_Cry03_1::
-	audio_header SFX_Cry03_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry03_1_Ch5
+	channel 6, SFX_Cry03_1_Ch6
+	channel 8, SFX_Cry03_1_Ch8
 
 SFX_Cry04_1::
-	audio_header SFX_Cry04_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry04_1_Ch5
+	channel 6, SFX_Cry04_1_Ch6
+	channel 8, SFX_Cry04_1_Ch8
 
 SFX_Cry05_1::
-	audio_header SFX_Cry05_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry05_1_Ch5
+	channel 6, SFX_Cry05_1_Ch6
+	channel 8, SFX_Cry05_1_Ch8
 
 SFX_Cry06_1::
-	audio_header SFX_Cry06_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry06_1_Ch5
+	channel 6, SFX_Cry06_1_Ch6
+	channel 8, SFX_Cry06_1_Ch8
 
 SFX_Cry07_1::
-	audio_header SFX_Cry07_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry07_1_Ch5
+	channel 6, SFX_Cry07_1_Ch6
+	channel 8, SFX_Cry07_1_Ch8
 
 SFX_Cry08_1::
-	audio_header SFX_Cry08_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry08_1_Ch5
+	channel 6, SFX_Cry08_1_Ch6
+	channel 8, SFX_Cry08_1_Ch8
 
 SFX_Cry09_1::
-	audio_header SFX_Cry09_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry09_1_Ch5
+	channel 6, SFX_Cry09_1_Ch6
+	channel 8, SFX_Cry09_1_Ch8
 
 SFX_Cry0A_1::
-	audio_header SFX_Cry0A_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0A_1_Ch5
+	channel 6, SFX_Cry0A_1_Ch6
+	channel 8, SFX_Cry0A_1_Ch8
 
 SFX_Cry0B_1::
-	audio_header SFX_Cry0B_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0B_1_Ch5
+	channel 6, SFX_Cry0B_1_Ch6
+	channel 8, SFX_Cry0B_1_Ch8
 
 SFX_Cry0C_1::
-	audio_header SFX_Cry0C_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0C_1_Ch5
+	channel 6, SFX_Cry0C_1_Ch6
+	channel 8, SFX_Cry0C_1_Ch8
 
 SFX_Cry0D_1::
-	audio_header SFX_Cry0D_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0D_1_Ch5
+	channel 6, SFX_Cry0D_1_Ch6
+	channel 8, SFX_Cry0D_1_Ch8
 
 SFX_Cry0E_1::
-	audio_header SFX_Cry0E_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0E_1_Ch5
+	channel 6, SFX_Cry0E_1_Ch6
+	channel 8, SFX_Cry0E_1_Ch8
 
 SFX_Cry0F_1::
-	audio_header SFX_Cry0F_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry0F_1_Ch5
+	channel 6, SFX_Cry0F_1_Ch6
+	channel 8, SFX_Cry0F_1_Ch8
 
 SFX_Cry10_1::
-	audio_header SFX_Cry10_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry10_1_Ch5
+	channel 6, SFX_Cry10_1_Ch6
+	channel 8, SFX_Cry10_1_Ch8
 
 SFX_Cry11_1::
-	audio_header SFX_Cry11_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry11_1_Ch5
+	channel 6, SFX_Cry11_1_Ch6
+	channel 8, SFX_Cry11_1_Ch8
 
 SFX_Cry12_1::
-	audio_header SFX_Cry12_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry12_1_Ch5
+	channel 6, SFX_Cry12_1_Ch6
+	channel 8, SFX_Cry12_1_Ch8
 
 SFX_Cry13_1::
-	audio_header SFX_Cry13_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry13_1_Ch5
+	channel 6, SFX_Cry13_1_Ch6
+	channel 8, SFX_Cry13_1_Ch8
 
 SFX_Cry14_1::
-	audio_header SFX_Cry14_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry14_1_Ch5
+	channel 6, SFX_Cry14_1_Ch6
+	channel 8, SFX_Cry14_1_Ch8
 
 SFX_Cry15_1::
-	audio_header SFX_Cry15_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry15_1_Ch5
+	channel 6, SFX_Cry15_1_Ch6
+	channel 8, SFX_Cry15_1_Ch8
 
 SFX_Cry16_1::
-	audio_header SFX_Cry16_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry16_1_Ch5
+	channel 6, SFX_Cry16_1_Ch6
+	channel 8, SFX_Cry16_1_Ch8
 
 SFX_Cry17_1::
-	audio_header SFX_Cry17_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry17_1_Ch5
+	channel 6, SFX_Cry17_1_Ch6
+	channel 8, SFX_Cry17_1_Ch8
 
 SFX_Cry18_1::
-	audio_header SFX_Cry18_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry18_1_Ch5
+	channel 6, SFX_Cry18_1_Ch6
+	channel 8, SFX_Cry18_1_Ch8
 
 SFX_Cry19_1::
-	audio_header SFX_Cry19_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry19_1_Ch5
+	channel 6, SFX_Cry19_1_Ch6
+	channel 8, SFX_Cry19_1_Ch8
 
 SFX_Cry1A_1::
-	audio_header SFX_Cry1A_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1A_1_Ch5
+	channel 6, SFX_Cry1A_1_Ch6
+	channel 8, SFX_Cry1A_1_Ch8
 
 SFX_Cry1B_1::
-	audio_header SFX_Cry1B_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1B_1_Ch5
+	channel 6, SFX_Cry1B_1_Ch6
+	channel 8, SFX_Cry1B_1_Ch8
 
 SFX_Cry1C_1::
-	audio_header SFX_Cry1C_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1C_1_Ch5
+	channel 6, SFX_Cry1C_1_Ch6
+	channel 8, SFX_Cry1C_1_Ch8
 
 SFX_Cry1D_1::
-	audio_header SFX_Cry1D_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1D_1_Ch5
+	channel 6, SFX_Cry1D_1_Ch6
+	channel 8, SFX_Cry1D_1_Ch8
 
 SFX_Cry1E_1::
-	audio_header SFX_Cry1E_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1E_1_Ch5
+	channel 6, SFX_Cry1E_1_Ch6
+	channel 8, SFX_Cry1E_1_Ch8
 
 SFX_Cry1F_1::
-	audio_header SFX_Cry1F_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry1F_1_Ch5
+	channel 6, SFX_Cry1F_1_Ch6
+	channel 8, SFX_Cry1F_1_Ch8
 
 SFX_Cry20_1::
-	audio_header SFX_Cry20_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry20_1_Ch5
+	channel 6, SFX_Cry20_1_Ch6
+	channel 8, SFX_Cry20_1_Ch8
 
 SFX_Cry21_1::
-	audio_header SFX_Cry21_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry21_1_Ch5
+	channel 6, SFX_Cry21_1_Ch6
+	channel 8, SFX_Cry21_1_Ch8
 
 SFX_Cry22_1::
-	audio_header SFX_Cry22_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry22_1_Ch5
+	channel 6, SFX_Cry22_1_Ch6
+	channel 8, SFX_Cry22_1_Ch8
 
 SFX_Cry23_1::
-	audio_header SFX_Cry23_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry23_1_Ch5
+	channel 6, SFX_Cry23_1_Ch6
+	channel 8, SFX_Cry23_1_Ch8
 
 SFX_Cry24_1::
-	audio_header SFX_Cry24_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry24_1_Ch5
+	channel 6, SFX_Cry24_1_Ch6
+	channel 8, SFX_Cry24_1_Ch8
 
 SFX_Cry25_1::
-	audio_header SFX_Cry25_1, Ch5, Ch6, Ch8
+	channel_count 3
+	channel 5, SFX_Cry25_1_Ch5
+	channel 6, SFX_Cry25_1_Ch6
+	channel 8, SFX_Cry25_1_Ch8
 
 SFX_Get_Item1_1::
-	audio_header SFX_Get_Item1_1, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Item1_1_Ch5
+	channel 6, SFX_Get_Item1_1_Ch6
+	channel 7, SFX_Get_Item1_1_Ch7
 
 SFX_Get_Item2_1::
-	audio_header SFX_Get_Item2_1, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Item2_1_Ch5
+	channel 6, SFX_Get_Item2_1_Ch6
+	channel 7, SFX_Get_Item2_1_Ch7
 
 SFX_Tink_1::
-	audio_header SFX_Tink_1, Ch5
+	channel_count 1
+	channel 5, SFX_Tink_1_Ch5
 
 SFX_Heal_HP_1::
-	audio_header SFX_Heal_HP_1, Ch5
+	channel_count 1
+	channel 5, SFX_Heal_HP_1_Ch5
 
 SFX_Heal_Ailment_1::
-	audio_header SFX_Heal_Ailment_1, Ch5
+	channel_count 1
+	channel 5, SFX_Heal_Ailment_1_Ch5
 
 SFX_Start_Menu_1::
-	audio_header SFX_Start_Menu_1, Ch8
+	channel_count 1
+	channel 8, SFX_Start_Menu_1_Ch8
 
 SFX_Press_AB_1::
-	audio_header SFX_Press_AB_1, Ch5
+	channel_count 1
+	channel 5, SFX_Press_AB_1_Ch5
 
 SFX_Pokedex_Rating_1::
-	audio_header SFX_Pokedex_Rating_1, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Pokedex_Rating_1_Ch5
+	channel 6, SFX_Pokedex_Rating_1_Ch6
+	channel 7, SFX_Pokedex_Rating_1_Ch7
 
 SFX_Get_Key_Item_1::
-	audio_header SFX_Get_Key_Item_1, Ch5, Ch6, Ch7
+	channel_count 3
+	channel 5, SFX_Get_Key_Item_1_Ch5
+	channel 6, SFX_Get_Key_Item_1_Ch6
+	channel 7, SFX_Get_Key_Item_1_Ch7
 
 SFX_Poisoned_1::
-	audio_header SFX_Poisoned_1, Ch5
+	channel_count 1
+	channel 5, SFX_Poisoned_1_Ch5
 
 SFX_Trade_Machine_1::
-	audio_header SFX_Trade_Machine_1, Ch5
+	channel_count 1
+	channel 5, SFX_Trade_Machine_1_Ch5
 
 SFX_Turn_On_PC_1::
-	audio_header SFX_Turn_On_PC_1, Ch5
+	channel_count 1
+	channel 5, SFX_Turn_On_PC_1_Ch5
 
 SFX_Turn_Off_PC_1::
-	audio_header SFX_Turn_Off_PC_1, Ch5
+	channel_count 1
+	channel 5, SFX_Turn_Off_PC_1_Ch5
 
 SFX_Enter_PC_1::
-	audio_header SFX_Enter_PC_1, Ch5
+	channel_count 1
+	channel 5, SFX_Enter_PC_1_Ch5
 
 SFX_Shrink_1::
-	audio_header SFX_Shrink_1, Ch5
+	channel_count 1
+	channel 5, SFX_Shrink_1_Ch5
 
 SFX_Switch_1::
-	audio_header SFX_Switch_1, Ch5
+	channel_count 1
+	channel 5, SFX_Switch_1_Ch5
 
 SFX_Healing_Machine_1::
-	audio_header SFX_Healing_Machine_1, Ch5
+	channel_count 1
+	channel 5, SFX_Healing_Machine_1_Ch5
 
 SFX_Teleport_Exit1_1::
-	audio_header SFX_Teleport_Exit1_1, Ch5
+	channel_count 1
+	channel 5, SFX_Teleport_Exit1_1_Ch5
 
 SFX_Teleport_Enter1_1::
-	audio_header SFX_Teleport_Enter1_1, Ch5
+	channel_count 1
+	channel 5, SFX_Teleport_Enter1_1_Ch5
 
 SFX_Teleport_Exit2_1::
-	audio_header SFX_Teleport_Exit2_1, Ch5
+	channel_count 1
+	channel 5, SFX_Teleport_Exit2_1_Ch5
 
 SFX_Ledge_1::
-	audio_header SFX_Ledge_1, Ch5
+	channel_count 1
+	channel 5, SFX_Ledge_1_Ch5
 
 SFX_Teleport_Enter2_1::
-	audio_header SFX_Teleport_Enter2_1, Ch8
+	channel_count 1
+	channel 8, SFX_Teleport_Enter2_1_Ch8
 
 SFX_Fly_1::
-	audio_header SFX_Fly_1, Ch8
+	channel_count 1
+	channel 8, SFX_Fly_1_Ch8
 
 SFX_Denied_1::
-	audio_header SFX_Denied_1, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Denied_1_Ch5
+	channel 6, SFX_Denied_1_Ch6
 
 SFX_Arrow_Tiles_1::
-	audio_header SFX_Arrow_Tiles_1, Ch5
+	channel_count 1
+	channel 5, SFX_Arrow_Tiles_1_Ch5
 
 SFX_Push_Boulder_1::
-	audio_header SFX_Push_Boulder_1, Ch8
+	channel_count 1
+	channel 8, SFX_Push_Boulder_1_Ch8
 
 SFX_SS_Anne_Horn_1::
-	audio_header SFX_SS_Anne_Horn_1, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_SS_Anne_Horn_1_Ch5
+	channel 6, SFX_SS_Anne_Horn_1_Ch6
 
 SFX_Withdraw_Deposit_1::
-	audio_header SFX_Withdraw_Deposit_1, Ch5
+	channel_count 1
+	channel 5, SFX_Withdraw_Deposit_1_Ch5
 
 SFX_Cut_1::
-	audio_header SFX_Cut_1, Ch8
+	channel_count 1
+	channel 8, SFX_Cut_1_Ch8
 
 SFX_Go_Inside_1::
-	audio_header SFX_Go_Inside_1, Ch8
+	channel_count 1
+	channel 8, SFX_Go_Inside_1_Ch8
 
 SFX_Swap_1::
-	audio_header SFX_Swap_1, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Swap_1_Ch5
+	channel 6, SFX_Swap_1_Ch6
 
 SFX_59_1::
-	audio_header SFX_59_1, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_59_1_Ch5
+	channel 6, SFX_59_1_Ch6
 
 SFX_Purchase_1::
-	audio_header SFX_Purchase_1, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Purchase_1_Ch5
+	channel 6, SFX_Purchase_1_Ch6
 
 SFX_Collision_1::
-	audio_header SFX_Collision_1, Ch5
+	channel_count 1
+	channel 5, SFX_Collision_1_Ch5
 
 SFX_Go_Outside_1::
-	audio_header SFX_Go_Outside_1, Ch8
+	channel_count 1
+	channel 8, SFX_Go_Outside_1_Ch8
 
 SFX_Save_1::
-	audio_header SFX_Save_1, Ch5, Ch6
+	channel_count 2
+	channel 5, SFX_Save_1_Ch5
+	channel 6, SFX_Save_1_Ch6
 
 ; the Pokeflute sound effect directly hijacks channel 3
 SFX_Pokeflute::
-	audio_header SFX_Pokeflute, Ch3
+	channel_count 1
+	channel 3, SFX_Pokeflute_Ch3
 
 SFX_Safari_Zone_PA::
-	audio_header SFX_Safari_Zone_PA, Ch5
+	channel_count 1
+	channel 5, SFX_Safari_Zone_PA_Ch5