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, 103 insertions, 103 deletions

diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm
index 19a19272..6fb67546 100644
--- a/audio/headers/sfxheaders3.asm
+++ b/audio/headers/sfxheaders3.asm
@@ -2,310 +2,310 @@ SFX_Headers_3::
 	db $ff, $ff, $ff ; padding
 
 SFX_Snare1_3::
-	audio SFX_Snare1_3, Ch7
+	audio_header SFX_Snare1_3, Ch8
 
 SFX_Snare2_3::
-	audio SFX_Snare2_3, Ch7
+	audio_header SFX_Snare2_3, Ch8
 
 SFX_Snare3_3::
-	audio SFX_Snare3_3, Ch7
+	audio_header SFX_Snare3_3, Ch8
 
 SFX_Snare4_3::
-	audio SFX_Snare4_3, Ch7
+	audio_header SFX_Snare4_3, Ch8
 
 SFX_Snare5_3::
-	audio SFX_Snare5_3, Ch7
+	audio_header SFX_Snare5_3, Ch8
 
 SFX_Triangle1_3::
-	audio SFX_Triangle1_3, Ch7
+	audio_header SFX_Triangle1_3, Ch8
 
 SFX_Triangle2_3::
-	audio SFX_Triangle2_3, Ch7
+	audio_header SFX_Triangle2_3, Ch8
 
 SFX_Snare6_3::
-	audio SFX_Snare6_3, Ch7
+	audio_header SFX_Snare6_3, Ch8
 
 SFX_Snare7_3::
-	audio SFX_Snare7_3, Ch7
+	audio_header SFX_Snare7_3, Ch8
 
 SFX_Snare8_3::
-	audio SFX_Snare8_3, Ch7
+	audio_header SFX_Snare8_3, Ch8
 
 SFX_Snare9_3::
-	audio SFX_Snare9_3, Ch7
+	audio_header SFX_Snare9_3, Ch8
 
 SFX_Cymbal1_3::
-	audio SFX_Cymbal1_3, Ch7
+	audio_header SFX_Cymbal1_3, Ch8
 
 SFX_Cymbal2_3::
-	audio SFX_Cymbal2_3, Ch7
+	audio_header SFX_Cymbal2_3, Ch8
 
 SFX_Cymbal3_3::
-	audio SFX_Cymbal3_3, Ch7
+	audio_header SFX_Cymbal3_3, Ch8
 
 SFX_Muted_Snare1_3::
-	audio SFX_Muted_Snare1_3, Ch7
+	audio_header SFX_Muted_Snare1_3, Ch8
 
 SFX_Triangle3_3::
-	audio SFX_Triangle3_3, Ch7
+	audio_header SFX_Triangle3_3, Ch8
 
 SFX_Muted_Snare2_3::
-	audio SFX_Muted_Snare2_3, Ch7
+	audio_header SFX_Muted_Snare2_3, Ch8
 
 SFX_Muted_Snare3_3::
-	audio SFX_Muted_Snare3_3, Ch7
+	audio_header SFX_Muted_Snare3_3, Ch8
 
 SFX_Muted_Snare4_3::
-	audio SFX_Muted_Snare4_3, Ch7
+	audio_header SFX_Muted_Snare4_3, Ch8
 
 SFX_Cry00_3::
-	audio SFX_Cry00_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry00_3, Ch5, Ch6, Ch8
 
 SFX_Cry01_3::
-	audio SFX_Cry01_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry01_3, Ch5, Ch6, Ch8
 
 SFX_Cry02_3::
-	audio SFX_Cry02_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry02_3, Ch5, Ch6, Ch8
 
 SFX_Cry03_3::
-	audio SFX_Cry03_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry03_3, Ch5, Ch6, Ch8
 
 SFX_Cry04_3::
-	audio SFX_Cry04_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry04_3, Ch5, Ch6, Ch8
 
 SFX_Cry05_3::
-	audio SFX_Cry05_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry05_3, Ch5, Ch6, Ch8
 
 SFX_Cry06_3::
-	audio SFX_Cry06_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry06_3, Ch5, Ch6, Ch8
 
 SFX_Cry07_3::
-	audio SFX_Cry07_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry07_3, Ch5, Ch6, Ch8
 
 SFX_Cry08_3::
-	audio SFX_Cry08_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry08_3, Ch5, Ch6, Ch8
 
 SFX_Cry09_3::
-	audio SFX_Cry09_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry09_3, Ch5, Ch6, Ch8
 
 SFX_Cry0A_3::
-	audio SFX_Cry0A_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0A_3, Ch5, Ch6, Ch8
 
 SFX_Cry0B_3::
-	audio SFX_Cry0B_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0B_3, Ch5, Ch6, Ch8
 
 SFX_Cry0C_3::
-	audio SFX_Cry0C_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0C_3, Ch5, Ch6, Ch8
 
 SFX_Cry0D_3::
-	audio SFX_Cry0D_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0D_3, Ch5, Ch6, Ch8
 
 SFX_Cry0E_3::
-	audio SFX_Cry0E_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0E_3, Ch5, Ch6, Ch8
 
 SFX_Cry0F_3::
-	audio SFX_Cry0F_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry0F_3, Ch5, Ch6, Ch8
 
 SFX_Cry10_3::
-	audio SFX_Cry10_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry10_3, Ch5, Ch6, Ch8
 
 SFX_Cry11_3::
-	audio SFX_Cry11_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry11_3, Ch5, Ch6, Ch8
 
 SFX_Cry12_3::
-	audio SFX_Cry12_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry12_3, Ch5, Ch6, Ch8
 
 SFX_Cry13_3::
-	audio SFX_Cry13_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry13_3, Ch5, Ch6, Ch8
 
 SFX_Cry14_3::
-	audio SFX_Cry14_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry14_3, Ch5, Ch6, Ch8
 
 SFX_Cry15_3::
-	audio SFX_Cry15_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry15_3, Ch5, Ch6, Ch8
 
 SFX_Cry16_3::
-	audio SFX_Cry16_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry16_3, Ch5, Ch6, Ch8
 
 SFX_Cry17_3::
-	audio SFX_Cry17_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry17_3, Ch5, Ch6, Ch8
 
 SFX_Cry18_3::
-	audio SFX_Cry18_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry18_3, Ch5, Ch6, Ch8
 
 SFX_Cry19_3::
-	audio SFX_Cry19_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry19_3, Ch5, Ch6, Ch8
 
 SFX_Cry1A_3::
-	audio SFX_Cry1A_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1A_3, Ch5, Ch6, Ch8
 
 SFX_Cry1B_3::
-	audio SFX_Cry1B_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1B_3, Ch5, Ch6, Ch8
 
 SFX_Cry1C_3::
-	audio SFX_Cry1C_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1C_3, Ch5, Ch6, Ch8
 
 SFX_Cry1D_3::
-	audio SFX_Cry1D_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1D_3, Ch5, Ch6, Ch8
 
 SFX_Cry1E_3::
-	audio SFX_Cry1E_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1E_3, Ch5, Ch6, Ch8
 
 SFX_Cry1F_3::
-	audio SFX_Cry1F_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry1F_3, Ch5, Ch6, Ch8
 
 SFX_Cry20_3::
-	audio SFX_Cry20_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry20_3, Ch5, Ch6, Ch8
 
 SFX_Cry21_3::
-	audio SFX_Cry21_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry21_3, Ch5, Ch6, Ch8
 
 SFX_Cry22_3::
-	audio SFX_Cry22_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry22_3, Ch5, Ch6, Ch8
 
 SFX_Cry23_3::
-	audio SFX_Cry23_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry23_3, Ch5, Ch6, Ch8
 
 SFX_Cry24_3::
-	audio SFX_Cry24_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry24_3, Ch5, Ch6, Ch8
 
 SFX_Cry25_3::
-	audio SFX_Cry25_3, Ch4, Ch5, Ch7
+	audio_header SFX_Cry25_3, Ch5, Ch6, Ch8
 
 SFX_Get_Item1_3::
-	audio SFX_Get_Item1_3, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Item1_3, Ch5, Ch6, Ch7
 
 SFX_Get_Item2_3::
-	audio SFX_Get_Item2_3, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Item2_3, Ch5, Ch6, Ch7
 
 SFX_Tink_3::
-	audio SFX_Tink_3, Ch4
+	audio_header SFX_Tink_3, Ch5
 
 SFX_Heal_HP_3::
-	audio SFX_Heal_HP_3, Ch4
+	audio_header SFX_Heal_HP_3, Ch5
 
 SFX_Heal_Ailment_3::
-	audio SFX_Heal_Ailment_3, Ch4
+	audio_header SFX_Heal_Ailment_3, Ch5
 
 SFX_Start_Menu_3::
-	audio SFX_Start_Menu_3, Ch7
+	audio_header SFX_Start_Menu_3, Ch8
 
 SFX_Press_AB_3::
-	audio SFX_Press_AB_3, Ch4
+	audio_header SFX_Press_AB_3, Ch5
 
 SFX_Pokedex_Rating_3::
-	audio SFX_Pokedex_Rating_3, Ch4, Ch5, Ch6
+	audio_header SFX_Pokedex_Rating_3, Ch5, Ch6, Ch7
 
 SFX_Get_Key_Item_3::
-	audio SFX_Get_Key_Item_3, Ch4, Ch5, Ch6
+	audio_header SFX_Get_Key_Item_3, Ch5, Ch6, Ch7
 
 SFX_Poisoned_3::
-	audio SFX_Poisoned_3, Ch4
+	audio_header SFX_Poisoned_3, Ch5
 
 SFX_Trade_Machine_3::
-	audio SFX_Trade_Machine_3, Ch4
+	audio_header SFX_Trade_Machine_3, Ch5
 
 SFX_Turn_On_PC_3::
-	audio SFX_Turn_On_PC_3, Ch4
+	audio_header SFX_Turn_On_PC_3, Ch5
 
 SFX_Turn_Off_PC_3::
-	audio SFX_Turn_Off_PC_3, Ch4
+	audio_header SFX_Turn_Off_PC_3, Ch5
 
 SFX_Enter_PC_3::
-	audio SFX_Enter_PC_3, Ch4
+	audio_header SFX_Enter_PC_3, Ch5
 
 SFX_Shrink_3::
-	audio SFX_Shrink_3, Ch4
+	audio_header SFX_Shrink_3, Ch5
 
 SFX_Switch_3::
-	audio SFX_Switch_3, Ch4
+	audio_header SFX_Switch_3, Ch5
 
 SFX_Healing_Machine_3::
-	audio SFX_Healing_Machine_3, Ch4
+	audio_header SFX_Healing_Machine_3, Ch5
 
 SFX_Teleport_Exit1_3::
-	audio SFX_Teleport_Exit1_3, Ch4
+	audio_header SFX_Teleport_Exit1_3, Ch5
 
 SFX_Teleport_Enter1_3::
-	audio SFX_Teleport_Enter1_3, Ch4
+	audio_header SFX_Teleport_Enter1_3, Ch5
 
 SFX_Teleport_Exit2_3::
-	audio SFX_Teleport_Exit2_3, Ch4
+	audio_header SFX_Teleport_Exit2_3, Ch5
 
 SFX_Ledge_3::
-	audio SFX_Ledge_3, Ch4
+	audio_header SFX_Ledge_3, Ch5
 
 SFX_Teleport_Enter2_3::
-	audio SFX_Teleport_Enter2_3, Ch7
+	audio_header SFX_Teleport_Enter2_3, Ch8
 
 SFX_Fly_3::
-	audio SFX_Fly_3, Ch7
+	audio_header SFX_Fly_3, Ch8
 
 SFX_Denied_3::
-	audio SFX_Denied_3, Ch4, Ch5
+	audio_header SFX_Denied_3, Ch5, Ch6
 
 SFX_Arrow_Tiles_3::
-	audio SFX_Arrow_Tiles_3, Ch4
+	audio_header SFX_Arrow_Tiles_3, Ch5
 
 SFX_Push_Boulder_3::
-	audio SFX_Push_Boulder_3, Ch7
+	audio_header SFX_Push_Boulder_3, Ch8
 
 SFX_SS_Anne_Horn_3::
-	audio SFX_SS_Anne_Horn_3, Ch4, Ch5
+	audio_header SFX_SS_Anne_Horn_3, Ch5, Ch6
 
 SFX_Withdraw_Deposit_3::
-	audio SFX_Withdraw_Deposit_3, Ch4
+	audio_header SFX_Withdraw_Deposit_3, Ch5
 
 SFX_Cut_3::
-	audio SFX_Cut_3, Ch7
+	audio_header SFX_Cut_3, Ch8
 
 SFX_Go_Inside_3::
-	audio SFX_Go_Inside_3, Ch7
+	audio_header SFX_Go_Inside_3, Ch8
 
 SFX_Swap_3::
-	audio SFX_Swap_3, Ch4, Ch5
+	audio_header SFX_Swap_3, Ch5, Ch6
 
 SFX_59_3::
-	audio SFX_59_3, Ch4, Ch5
+	audio_header SFX_59_3, Ch5, Ch6
 
 SFX_Purchase_3::
-	audio SFX_Purchase_3, Ch4, Ch5
+	audio_header SFX_Purchase_3, Ch5, Ch6
 
 SFX_Collision_3::
-	audio SFX_Collision_3, Ch4
+	audio_header SFX_Collision_3, Ch5
 
 SFX_Go_Outside_3::
-	audio SFX_Go_Outside_3, Ch7
+	audio_header SFX_Go_Outside_3, Ch8
 
 SFX_Save_3::
-	audio SFX_Save_3, Ch4, Ch5
+	audio_header SFX_Save_3, Ch5, Ch6
 
 SFX_Intro_Lunge::
-	audio SFX_Intro_Lunge, Ch7
+	audio_header SFX_Intro_Lunge, Ch8
 
 SFX_Intro_Hip::
-	audio SFX_Intro_Hip, Ch4
+	audio_header SFX_Intro_Hip, Ch5
 
 SFX_Intro_Hop::
-	audio SFX_Intro_Hop, Ch4
+	audio_header SFX_Intro_Hop, Ch5
 
 SFX_Intro_Raise::
-	audio SFX_Intro_Raise, Ch7
+	audio_header SFX_Intro_Raise, Ch8
 
 SFX_Intro_Crash::
-	audio SFX_Intro_Crash, Ch7
+	audio_header SFX_Intro_Crash, Ch8
 
 SFX_Intro_Whoosh::
-	audio SFX_Intro_Whoosh, Ch7
+	audio_header SFX_Intro_Whoosh, Ch8
 
 SFX_Slots_Stop_Wheel::
-	audio SFX_Slots_Stop_Wheel, Ch4
+	audio_header SFX_Slots_Stop_Wheel, Ch5
 
 SFX_Slots_Reward::
-	audio SFX_Slots_Reward, Ch4
+	audio_header SFX_Slots_Reward, Ch5
 
 SFX_Slots_New_Spin::
-	audio SFX_Slots_New_Spin, Ch4, Ch5
+	audio_header SFX_Slots_New_Spin, Ch5, Ch6
 
 SFX_Shooting_Star::
-	audio SFX_Shooting_Star, Ch4
+	audio_header SFX_Shooting_Star, Ch5