Update audio macro names

change audio channel numbers from 0-7 back to 1-8
change all note macros back to single note macro
todo: fix comments with old macro names, update noise macros/instrument names

1 files changed, 96 insertions, 96 deletions

diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm
index 72a69646..cc50dddd 100644
--- a/audio/headers/sfxheaders1.asm
+++ b/audio/headers/sfxheaders1.asm
@@ -2,287 +2,287 @@ SFX_Headers_1::
 	db $ff, $ff, $ff ; padding
 
 SFX_Snare1_1::
-	audio SFX_Snare1_1, Ch7
+	audio_header SFX_Snare1_1, Ch8
 
 SFX_Snare2_1::
-	audio SFX_Snare2_1, Ch7
+	audio_header SFX_Snare2_1, Ch8
 
 SFX_Snare3_1::
-	audio SFX_Snare3_1, Ch7
+	audio_header SFX_Snare3_1, Ch8
 
 SFX_Snare4_1::
-	audio SFX_Snare4_1, Ch7
+	audio_header SFX_Snare4_1, Ch8
 
 SFX_Snare5_1::
-	audio SFX_Snare5_1, Ch7
+	audio_header SFX_Snare5_1, Ch8
 
 SFX_Triangle1_1::
-	audio SFX_Triangle1_1, Ch7
+	audio_header SFX_Triangle1_1, Ch8
 
 SFX_Triangle2_1::
-	audio SFX_Triangle2_1, Ch7
+	audio_header SFX_Triangle2_1, Ch8
 
 SFX_Snare6_1::
-	audio SFX_Snare6_1, Ch7
+	audio_header SFX_Snare6_1, Ch8
 
 SFX_Snare7_1::
-	audio SFX_Snare7_1, Ch7
+	audio_header SFX_Snare7_1, Ch8
 
 SFX_Snare8_1::
-	audio SFX_Snare8_1, Ch7
+	audio_header SFX_Snare8_1, Ch8
 
 SFX_Snare9_1::
-	audio SFX_Snare9_1, Ch7
+	audio_header SFX_Snare9_1, Ch8
 
 SFX_Cymbal1_1::
-	audio SFX_Cymbal1_1, Ch7
+	audio_header SFX_Cymbal1_1, Ch8
 
 SFX_Cymbal2_1::
-	audio SFX_Cymbal2_1, Ch7
+	audio_header SFX_Cymbal2_1, Ch8
 
 SFX_Cymbal3_1::
-	audio SFX_Cymbal3_1, Ch7
+	audio_header SFX_Cymbal3_1, Ch8
 
 SFX_Muted_Snare1_1::
-	audio SFX_Muted_Snare1_1, Ch7
+	audio_header SFX_Muted_Snare1_1, Ch8
 
 SFX_Triangle3_1::
-	audio SFX_Triangle3_1, Ch7
+	audio_header SFX_Triangle3_1, Ch8
 
 SFX_Muted_Snare2_1::
-	audio SFX_Muted_Snare2_1, Ch7
+	audio_header SFX_Muted_Snare2_1, Ch8
 
 SFX_Muted_Snare3_1::
-	audio SFX_Muted_Snare3_1, Ch7
+	audio_header SFX_Muted_Snare3_1, Ch8
 
 SFX_Muted_Snare4_1::
-	audio SFX_Muted_Snare4_1, Ch7
+	audio_header SFX_Muted_Snare4_1, Ch8
 
 SFX_Cry00_1::
-	audio SFX_Cry00_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry00_1, Ch5, Ch6, Ch8
 
 SFX_Cry01_1::
-	audio SFX_Cry01_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry01_1, Ch5, Ch6, Ch8
 
 SFX_Cry02_1::
-	audio SFX_Cry02_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry02_1, Ch5, Ch6, Ch8
 
 SFX_Cry03_1::
-	audio SFX_Cry03_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry03_1, Ch5, Ch6, Ch8
 
 SFX_Cry04_1::
-	audio SFX_Cry04_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry04_1, Ch5, Ch6, Ch8
 
 SFX_Cry05_1::
-	audio SFX_Cry05_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry05_1, Ch5, Ch6, Ch8
 
 SFX_Cry06_1::
-	audio SFX_Cry06_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry06_1, Ch5, Ch6, Ch8
 
 SFX_Cry07_1::
-	audio SFX_Cry07_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry07_1, Ch5, Ch6, Ch8
 
 SFX_Cry08_1::
-	audio SFX_Cry08_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry08_1, Ch5, Ch6, Ch8
 
 SFX_Cry09_1::
-	audio SFX_Cry09_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry09_1, Ch5, Ch6, Ch8
 
 SFX_Cry0A_1::
-	audio SFX_Cry0A_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0A_1, Ch5, Ch6, Ch8
 
 SFX_Cry0B_1::
-	audio SFX_Cry0B_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0B_1, Ch5, Ch6, Ch8
 
 SFX_Cry0C_1::
-	audio SFX_Cry0C_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0C_1, Ch5, Ch6, Ch8
 
 SFX_Cry0D_1::
-	audio SFX_Cry0D_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0D_1, Ch5, Ch6, Ch8
 
 SFX_Cry0E_1::
-	audio SFX_Cry0E_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0E_1, Ch5, Ch6, Ch8
 
 SFX_Cry0F_1::
-	audio SFX_Cry0F_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0F_1, Ch5, Ch6, Ch8
 
 SFX_Cry10_1::
-	audio SFX_Cry10_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry10_1, Ch5, Ch6, Ch8
 
 SFX_Cry11_1::
-	audio SFX_Cry11_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry11_1, Ch5, Ch6, Ch8
 
 SFX_Cry12_1::
-	audio SFX_Cry12_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry12_1, Ch5, Ch6, Ch8
 
 SFX_Cry13_1::
-	audio SFX_Cry13_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry13_1, Ch5, Ch6, Ch8
 
 SFX_Cry14_1::
-	audio SFX_Cry14_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry14_1, Ch5, Ch6, Ch8
 
 SFX_Cry15_1::
-	audio SFX_Cry15_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry15_1, Ch5, Ch6, Ch8
 
 SFX_Cry16_1::
-	audio SFX_Cry16_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry16_1, Ch5, Ch6, Ch8
 
 SFX_Cry17_1::
-	audio SFX_Cry17_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry17_1, Ch5, Ch6, Ch8
 
 SFX_Cry18_1::
-	audio SFX_Cry18_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry18_1, Ch5, Ch6, Ch8
 
 SFX_Cry19_1::
-	audio SFX_Cry19_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry19_1, Ch5, Ch6, Ch8
 
 SFX_Cry1A_1::
-	audio SFX_Cry1A_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1A_1, Ch5, Ch6, Ch8
 
 SFX_Cry1B_1::
-	audio SFX_Cry1B_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1B_1, Ch5, Ch6, Ch8
 
 SFX_Cry1C_1::
-	audio SFX_Cry1C_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1C_1, Ch5, Ch6, Ch8
 
 SFX_Cry1D_1::
-	audio SFX_Cry1D_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1D_1, Ch5, Ch6, Ch8
 
 SFX_Cry1E_1::
-	audio SFX_Cry1E_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1E_1, Ch5, Ch6, Ch8
 
 SFX_Cry1F_1::
-	audio SFX_Cry1F_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1F_1, Ch5, Ch6, Ch8
 
 SFX_Cry20_1::
-	audio SFX_Cry20_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry20_1, Ch5, Ch6, Ch8
 
 SFX_Cry21_1::
-	audio SFX_Cry21_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry21_1, Ch5, Ch6, Ch8
 
 SFX_Cry22_1::
-	audio SFX_Cry22_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry22_1, Ch5, Ch6, Ch8
 
 SFX_Cry23_1::
-	audio SFX_Cry23_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry23_1, Ch5, Ch6, Ch8
 
 SFX_Cry24_1::
-	audio SFX_Cry24_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry24_1, Ch5, Ch6, Ch8
 
 SFX_Cry25_1::
-	audio SFX_Cry25_1, Ch4, Ch5, Ch7
+	audio_header SFX_Cry25_1, Ch5, Ch6, Ch8
 
 SFX_Get_Item1_1::
-	audio SFX_Get_Item1_1, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Item1_1, Ch5, Ch6, Ch7
 
 SFX_Get_Item2_1::
-	audio SFX_Get_Item2_1, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Item2_1, Ch5, Ch6, Ch7
 
 SFX_Tink_1::
-	audio SFX_Tink_1, Ch4
+	audio_header SFX_Tink_1, Ch5
 
 SFX_Heal_HP_1::
-	audio SFX_Heal_HP_1, Ch4
+	audio_header SFX_Heal_HP_1, Ch5
 
 SFX_Heal_Ailment_1::
-	audio SFX_Heal_Ailment_1, Ch4
+	audio_header SFX_Heal_Ailment_1, Ch5
 
 SFX_Start_Menu_1::
-	audio SFX_Start_Menu_1, Ch7
+	audio_header SFX_Start_Menu_1, Ch8
 
 SFX_Press_AB_1::
-	audio SFX_Press_AB_1, Ch4
+	audio_header SFX_Press_AB_1, Ch5
 
 SFX_Pokedex_Rating_1::
-	audio SFX_Pokedex_Rating_1, Ch4, Ch5, Ch6
+	audio_header SFX_Pokedex_Rating_1, Ch5, Ch6, Ch7
 
 SFX_Get_Key_Item_1::
-	audio SFX_Get_Key_Item_1, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Key_Item_1, Ch5, Ch6, Ch7
 
 SFX_Poisoned_1::
-	audio SFX_Poisoned_1, Ch4
+	audio_header SFX_Poisoned_1, Ch5
 
 SFX_Trade_Machine_1::
-	audio SFX_Trade_Machine_1, Ch4
+	audio_header SFX_Trade_Machine_1, Ch5
 
 SFX_Turn_On_PC_1::
-	audio SFX_Turn_On_PC_1, Ch4
+	audio_header SFX_Turn_On_PC_1, Ch5
 
 SFX_Turn_Off_PC_1::
-	audio SFX_Turn_Off_PC_1, Ch4
+	audio_header SFX_Turn_Off_PC_1, Ch5
 
 SFX_Enter_PC_1::
-	audio SFX_Enter_PC_1, Ch4
+	audio_header SFX_Enter_PC_1, Ch5
 
 SFX_Shrink_1::
-	audio SFX_Shrink_1, Ch4
+	audio_header SFX_Shrink_1, Ch5
 
 SFX_Switch_1::
-	audio SFX_Switch_1, Ch4
+	audio_header SFX_Switch_1, Ch5
 
 SFX_Healing_Machine_1::
-	audio SFX_Healing_Machine_1, Ch4
+	audio_header SFX_Healing_Machine_1, Ch5
 
 SFX_Teleport_Exit1_1::
-	audio SFX_Teleport_Exit1_1, Ch4
+	audio_header SFX_Teleport_Exit1_1, Ch5
 
 SFX_Teleport_Enter1_1::
-	audio SFX_Teleport_Enter1_1, Ch4
+	audio_header SFX_Teleport_Enter1_1, Ch5
 
 SFX_Teleport_Exit2_1::
-	audio SFX_Teleport_Exit2_1, Ch4
+	audio_header SFX_Teleport_Exit2_1, Ch5
 
 SFX_Ledge_1::
-	audio SFX_Ledge_1, Ch4
+	audio_header SFX_Ledge_1, Ch5
 
 SFX_Teleport_Enter2_1::
-	audio SFX_Teleport_Enter2_1, Ch7
+	audio_header SFX_Teleport_Enter2_1, Ch8
 
 SFX_Fly_1::
-	audio SFX_Fly_1, Ch7
+	audio_header SFX_Fly_1, Ch8
 
 SFX_Denied_1::
-	audio SFX_Denied_1, Ch4, Ch5
+	audio_header SFX_Denied_1, Ch5, Ch6
 
 SFX_Arrow_Tiles_1::
-	audio SFX_Arrow_Tiles_1, Ch4
+	audio_header SFX_Arrow_Tiles_1, Ch5
 
 SFX_Push_Boulder_1::
-	audio SFX_Push_Boulder_1, Ch7
+	audio_header SFX_Push_Boulder_1, Ch8
 
 SFX_SS_Anne_Horn_1::
-	audio SFX_SS_Anne_Horn_1, Ch4, Ch5
+	audio_header SFX_SS_Anne_Horn_1, Ch5, Ch6
 
 SFX_Withdraw_Deposit_1::
-	audio SFX_Withdraw_Deposit_1, Ch4
+	audio_header SFX_Withdraw_Deposit_1, Ch5
 
 SFX_Cut_1::
-	audio SFX_Cut_1, Ch7
+	audio_header SFX_Cut_1, Ch8
 
 SFX_Go_Inside_1::
-	audio SFX_Go_Inside_1, Ch7
+	audio_header SFX_Go_Inside_1, Ch8
 
 SFX_Swap_1::
-	audio SFX_Swap_1, Ch4, Ch5
+	audio_header SFX_Swap_1, Ch5, Ch6
 
 SFX_59_1::
-	audio SFX_59_1, Ch4, Ch5
+	audio_header SFX_59_1, Ch5, Ch6
 
 SFX_Purchase_1::
-	audio SFX_Purchase_1, Ch4, Ch5
+	audio_header SFX_Purchase_1, Ch5, Ch6
 
 SFX_Collision_1::
-	audio SFX_Collision_1, Ch4
+	audio_header SFX_Collision_1, Ch5
 
 SFX_Go_Outside_1::
-	audio SFX_Go_Outside_1, Ch7
+	audio_header SFX_Go_Outside_1, Ch8
 
 SFX_Save_1::
-	audio SFX_Save_1, Ch4, Ch5
+	audio_header SFX_Save_1, Ch5, Ch6
 
-; the Pokeflute sound effect directly hijacks channel 2
+; the Pokeflute sound effect directly hijacks channel 3
 SFX_Pokeflute::
-	audio SFX_Pokeflute, Ch2
+	audio_header SFX_Pokeflute, Ch3
 
 SFX_Safari_Zone_PA::
-	audio SFX_Safari_Zone_PA, Ch4
+	audio_header SFX_Safari_Zone_PA, Ch5