diff options
Diffstat (limited to 'audio/headers')
| -rw-r--r-- | audio/headers/musicheaders1.asm | 89 | ||||
| -rw-r--r-- | audio/headers/musicheaders2.asm | 28 | ||||
| -rw-r--r-- | audio/headers/musicheaders3.asm | 81 | ||||
| -rw-r--r-- | audio/headers/musicheaders4.asm | 15 | ||||
| -rw-r--r-- | audio/headers/sfxheaders1.asm | 319 | ||||
| -rw-r--r-- | audio/headers/sfxheaders2.asm | 394 | ||||
| -rw-r--r-- | audio/headers/sfxheaders3.asm | 335 | ||||
| -rw-r--r-- | audio/headers/sfxheaders4.asm | 414 |
8 files changed, 594 insertions, 1081 deletions
diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm index 665efceb..ef85eae6 100644 --- a/audio/headers/musicheaders1.asm +++ b/audio/headers/musicheaders1.asm @@ -1,115 +1,66 @@ Music_PalletTown:: - dbw ( $80 | CH0 ), Music_PalletTown_Ch1 - dbw CH1, Music_PalletTown_Ch2 - dbw CH2, Music_PalletTown_Ch3 + audio_header Music_PalletTown, Ch1, Ch2, Ch3 Music_Pokecenter:: - dbw ( $80 | CH0 ), Music_Pokecenter_Ch1 - dbw CH1, Music_Pokecenter_Ch2 - dbw CH2, Music_Pokecenter_Ch3 + audio_header Music_Pokecenter, Ch1, Ch2, Ch3 Music_Gym:: - dbw ( $80 | CH0 ), Music_Gym_Ch1 - dbw CH1, Music_Gym_Ch2 - dbw CH2, Music_Gym_Ch3 + audio_header Music_Gym, Ch1, Ch2, Ch3 ; Viridian City, Pewter City, Saffron City Music_Cities1:: - dbw ( $C0 | CH0 ), Music_Cities1_Ch1 - dbw CH1, Music_Cities1_Ch2 - dbw CH2, Music_Cities1_Ch3 - dbw CH3, Music_Cities1_Ch4 + audio_header Music_Cities1, Ch1, Ch2, Ch3, Ch4 ; Cerulean City, Fuchsia City Music_Cities2:: - dbw ( $80 | CH0 ), Music_Cities2_Ch1 - dbw CH1, Music_Cities2_Ch2 - dbw CH2, Music_Cities2_Ch3 + audio_header Music_Cities2, Ch1, Ch2, Ch3 Music_Celadon:: - dbw ( $80 | CH0 ), Music_Celadon_Ch1 - dbw CH1, Music_Celadon_Ch2 - dbw CH2, Music_Celadon_Ch3 + audio_header Music_Celadon, Ch1, Ch2, Ch3 Music_Cinnabar:: - dbw ( $80 | CH0 ), Music_Cinnabar_Ch1 - dbw CH1, Music_Cinnabar_Ch2 - dbw CH2, Music_Cinnabar_Ch3 + audio_header Music_Cinnabar, Ch1, Ch2, Ch3 Music_Vermilion:: - dbw ( $C0 | CH0 ), Music_Vermilion_Ch1 - dbw CH1, Music_Vermilion_Ch2 - dbw CH2, Music_Vermilion_Ch3 - dbw CH3, Music_Vermilion_Ch4 + audio_header Music_Vermilion, Ch1, Ch2, Ch3, Ch4 Music_Lavender:: - dbw ( $C0 | CH0 ), Music_Lavender_Ch1 - dbw CH1, Music_Lavender_Ch2 - dbw CH2, Music_Lavender_Ch3 - dbw CH3, Music_Lavender_Ch4 + audio_header Music_Lavender, Ch1, Ch2, Ch3, Ch4 Music_SSAnne:: - dbw ( $80 | CH0 ), Music_SSAnne_Ch1 - dbw CH1, Music_SSAnne_Ch2 - dbw CH2, Music_SSAnne_Ch3 + audio_header Music_SSAnne, Ch1, Ch2, Ch3 Music_MeetProfOak:: - dbw ( $80 | CH0 ), Music_MeetProfOak_Ch1 - dbw CH1, Music_MeetProfOak_Ch2 - dbw CH2, Music_MeetProfOak_Ch3 + audio_header Music_MeetProfOak, Ch1, Ch2, Ch3 Music_MeetRival:: - dbw ( $80 | CH0 ), Music_MeetRival_Ch1 - dbw CH1, Music_MeetRival_Ch2 - dbw CH2, Music_MeetRival_Ch3 + audio_header Music_MeetRival, Ch1, Ch2, Ch3 Music_MuseumGuy:: - dbw ( $C0 | CH0 ), Music_MuseumGuy_Ch1 - dbw CH1, Music_MuseumGuy_Ch2 - dbw CH2, Music_MuseumGuy_Ch3 - dbw CH3, Music_MuseumGuy_Ch4 + audio_header Music_MuseumGuy, Ch1, Ch2, Ch3, Ch4 Music_SafariZone:: - dbw ( $80 | CH0 ), Music_SafariZone_Ch1 - dbw CH1, Music_SafariZone_Ch2 - dbw CH2, Music_SafariZone_Ch3 + audio_header Music_SafariZone, Ch1, Ch2, Ch3 Music_PkmnHealed:: - dbw ( $80 | CH0 ), Music_PkmnHealed_Ch1 - dbw CH1, Music_PkmnHealed_Ch2 - dbw CH2, Music_PkmnHealed_Ch3 + audio_header Music_PkmnHealed, Ch1, Ch2, Ch3 ; Routes 1 and 2 Music_Routes1:: - dbw ( $C0 | CH0 ), Music_Routes1_Ch1 - dbw CH1, Music_Routes1_Ch2 - dbw CH2, Music_Routes1_Ch3 - dbw CH3, Music_Routes1_Ch4 + audio_header Music_Routes1, Ch1, Ch2, Ch3, Ch4 ; Routes 24 and 25 Music_Routes2:: - dbw ( $C0 | CH0 ), Music_Routes2_Ch1 - dbw CH1, Music_Routes2_Ch2 - dbw CH2, Music_Routes2_Ch3 - dbw CH3, Music_Routes2_Ch4 + audio_header Music_Routes2, Ch1, Ch2, Ch3, Ch4 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 Music_Routes3:: - dbw ( $C0 | CH0 ), Music_Routes3_Ch1 - dbw CH1, Music_Routes3_Ch2 - dbw CH2, Music_Routes3_Ch3 - dbw CH3, Music_Routes3_Ch4 + audio_header Music_Routes3, Ch1, Ch2, Ch3, Ch4 ; Routes 11, 12, 13, 14, 15 Music_Routes4:: - dbw ( $C0 | CH0 ), Music_Routes4_Ch1 - dbw CH1, Music_Routes4_Ch2 - dbw CH2, Music_Routes4_Ch3 - dbw CH3, Music_Routes4_Ch4 + audio_header Music_Routes4, Ch1, Ch2, Ch3, Ch4 ; Route 23, Indigo Plateau Music_IndigoPlateau:: - dbw ( $C0 | CH0 ), Music_IndigoPlateau_Ch1 - dbw CH1, Music_IndigoPlateau_Ch2 - dbw CH2, Music_IndigoPlateau_Ch3 - dbw CH3, Music_IndigoPlateau_Ch4 + audio_header Music_IndigoPlateau, Ch1, Ch2, Ch3, Ch4 diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index 7df3f8bf..d6cca9a9 100644 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -1,34 +1,20 @@ Music_GymLeaderBattle:: - dbw ( $80 | CH0 ), Music_GymLeaderBattle_Ch1 - dbw CH1, Music_GymLeaderBattle_Ch2 - dbw CH2, Music_GymLeaderBattle_Ch3 + audio_header Music_GymLeaderBattle, Ch1, Ch2, Ch3 Music_TrainerBattle:: - dbw ( $80 | CH0 ), Music_TrainerBattle_Ch1 - dbw CH1, Music_TrainerBattle_Ch2 - dbw CH2, Music_TrainerBattle_Ch3 + audio_header Music_TrainerBattle, Ch1, Ch2, Ch3 Music_WildBattle:: - dbw ( $80 | CH0 ), Music_WildBattle_Ch1 - dbw CH1, Music_WildBattle_Ch2 - dbw CH2, Music_WildBattle_Ch3 + audio_header Music_WildBattle, Ch1, Ch2, Ch3 Music_FinalBattle:: - dbw ( $80 | CH0 ), Music_FinalBattle_Ch1 - dbw CH1, Music_FinalBattle_Ch2 - dbw CH2, Music_FinalBattle_Ch3 + audio_header Music_FinalBattle, Ch1, Ch2, Ch3 Music_DefeatedTrainer:: - dbw ( $80 | CH0 ), Music_DefeatedTrainer_Ch1 - dbw CH1, Music_DefeatedTrainer_Ch2 - dbw CH2, Music_DefeatedTrainer_Ch3 + audio_header Music_DefeatedTrainer, Ch1, Ch2, Ch3 Music_DefeatedWildMon:: - dbw ( $80 | CH0 ), Music_DefeatedWildMon_Ch1 - dbw CH1, Music_DefeatedWildMon_Ch2 - dbw CH2, Music_DefeatedWildMon_Ch3 + audio_header Music_DefeatedWildMon, Ch1, Ch2, Ch3 Music_DefeatedGymLeader:: - dbw ( $80 | CH0 ), Music_DefeatedGymLeader_Ch1 - dbw CH1, Music_DefeatedGymLeader_Ch2 - dbw CH2, Music_DefeatedGymLeader_Ch3 + audio_header Music_DefeatedGymLeader, Ch1, Ch2, Ch3 diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index c694be9b..51c67966 100644 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -1,97 +1,56 @@ Music_TitleScreen:: - dbw ( $C0 | CH0 ), Music_TitleScreen_Ch1 - dbw CH1, Music_TitleScreen_Ch2 - dbw CH2, Music_TitleScreen_Ch3 - dbw CH3, Music_TitleScreen_Ch4 + audio_header Music_TitleScreen, Ch1, Ch2, Ch3, Ch4 Music_Credits:: - dbw ( $80 | CH0 ), Music_Credits_Ch1 - dbw CH1, Music_Credits_Ch2 - dbw CH2, Music_Credits_Ch3 + audio_header Music_Credits, Ch1, Ch2, Ch3 Music_HallOfFame:: - dbw ( $80 | CH0 ), Music_HallOfFame_Ch1 - dbw CH1, Music_HallOfFame_Ch2 - dbw CH2, Music_HallOfFame_Ch3 + audio_header Music_HallOfFame, Ch1, Ch2, Ch3 Music_OaksLab:: - dbw ( $80 | CH0 ), Music_OaksLab_Ch1 - dbw CH1, Music_OaksLab_Ch2 - dbw CH2, Music_OaksLab_Ch3 + audio_header Music_OaksLab, Ch1, Ch2, Ch3 Music_JigglypuffSong:: - dbw $40, Music_JigglypuffSong_Ch1 - dbw CH1, Music_JigglypuffSong_Ch2 + audio_header Music_JigglypuffSong, Ch1, Ch2 Music_BikeRiding:: - dbw ( $C0 | CH0 ), Music_BikeRiding_Ch1 - dbw CH1, Music_BikeRiding_Ch2 - dbw CH2, Music_BikeRiding_Ch3 - dbw CH3, Music_BikeRiding_Ch4 + audio_header Music_BikeRiding, Ch1, Ch2, Ch3, Ch4 Music_Surfing:: - dbw ( $80 | CH0 ), Music_Surfing_Ch1 - dbw CH1, Music_Surfing_Ch2 - dbw CH2, Music_Surfing_Ch3 + audio_header Music_Surfing, Ch1, Ch2, Ch3 Music_GameCorner:: - dbw ( $80 | CH0 ), Music_GameCorner_Ch1 - dbw CH1, Music_GameCorner_Ch2 - dbw CH2, Music_GameCorner_Ch3 + audio_header Music_GameCorner, Ch1, Ch2, Ch3 -Music_IntroBattle:: - dbw ( $80 | CH0 ), Music_YellowIntro_Ch1 - dbw CH1, Music_YellowIntro_Ch2 - dbw CH2, Music_YellowIntro_Ch3 +Music_YellowIntro:: + audio_header Music_YellowIntro, Ch1, Ch2, Ch3 -; Power Plant, Unknown Dungeon, Rocket HQ +; Power Plant, Cerulean Cave, Rocket HQ Music_Dungeon1:: - dbw ( $C0 | CH0 ), Music_Dungeon1_Ch1 - dbw CH1, Music_Dungeon1_Ch2 - dbw CH2, Music_Dungeon1_Ch3 - dbw CH3, Music_Dungeon1_Ch4 + audio_header Music_Dungeon1, Ch1, Ch2, Ch3, Ch4 ; Viridian Forest, Seafoam Islands Music_Dungeon2:: - dbw ( $C0 | CH0 ), Music_Dungeon2_Ch1 - dbw CH1, Music_Dungeon2_Ch2 - dbw CH2, Music_Dungeon2_Ch3 - dbw CH3, Music_Dungeon2_Ch4 + audio_header Music_Dungeon2, Ch1, Ch2, Ch3, Ch4 ; Mt. Moon, Rock Tunnel, Victory Road Music_Dungeon3:: - dbw ( $C0 | CH0 ), Music_Dungeon3_Ch1 - dbw CH1, Music_Dungeon3_Ch2 - dbw CH2, Music_Dungeon3_Ch3 - dbw CH3, Music_Dungeon3_Ch4 + audio_header Music_Dungeon3, Ch1, Ch2, Ch3, Ch4 Music_CinnabarMansion:: - dbw ( $C0 | CH0 ), Music_CinnabarMansion_Ch1 - dbw CH1, Music_CinnabarMansion_Ch2 - dbw CH2, Music_CinnabarMansion_Ch3 - dbw CH3, Music_CinnabarMansion_Ch4 + audio_header Music_CinnabarMansion, Ch1, Ch2, Ch3, Ch4 Music_PokemonTower:: - dbw ( $80 | CH0 ), Music_PokemonTower_Ch1 - dbw CH1, Music_PokemonTower_Ch2 - dbw CH2, Music_PokemonTower_Ch3 + audio_header Music_PokemonTower, Ch1, Ch2, Ch3 Music_SilphCo:: - dbw ( $80 | CH0 ), Music_SilphCo_Ch1 - dbw CH1, Music_SilphCo_Ch2 - dbw CH2, Music_SilphCo_Ch3 + audio_header Music_SilphCo, Ch1, Ch2, Ch3 Music_MeetEvilTrainer:: - dbw ( $80 | CH0 ), Music_MeetEvilTrainer_Ch1 - dbw CH1, Music_MeetEvilTrainer_Ch2 - dbw CH2, Music_MeetEvilTrainer_Ch3 + audio_header Music_MeetEvilTrainer, Ch1, Ch2, Ch3 Music_MeetFemaleTrainer:: - dbw ( $80 | CH0 ), Music_MeetFemaleTrainer_Ch1 - dbw CH1, Music_MeetFemaleTrainer_Ch2 - dbw CH2, Music_MeetFemaleTrainer_Ch3 + audio_header Music_MeetFemaleTrainer, Ch1, Ch2, Ch3 Music_MeetMaleTrainer:: - dbw ( $80 | CH0 ), Music_MeetMaleTrainer_Ch1 - dbw CH1, Music_MeetMaleTrainer_Ch2 - dbw CH2, Music_MeetMaleTrainer_Ch3 + audio_header Music_MeetMaleTrainer, Ch1, Ch2, Ch3 diff --git a/audio/headers/musicheaders4.asm b/audio/headers/musicheaders4.asm index be5d822a..8c537ff9 100644 --- a/audio/headers/musicheaders4.asm +++ b/audio/headers/musicheaders4.asm @@ -1,18 +1,11 @@ Music_SurfingPikachu:: - dbw ((3 - 1) << 6) | CH0, Music_SurfingPikachu_Ch1 - dbw CH1, Music_SurfingPikachu_Ch2 - dbw CH2, Music_SurfingPikachu_Ch3 + audio_header Music_SurfingPikachu, Ch1, Ch2, Ch3 Music_MeetJessieJames:: - dbw ((3 - 1) << 6) | CH0, Music_MeetJessieJames_Ch1 - dbw CH1, Music_MeetJessieJames_Ch2 - dbw CH2, Music_MeetJessieJames_Ch3 + audio_header Music_MeetJessieJames, Ch1, Ch2, Ch3 Music_YellowUnusedSong:: - dbw ((4 - 1) << 6) | CH0, Music_YellowUnusedSong_Ch1 - dbw CH1, Music_YellowUnusedSong_Ch2 - dbw CH2, Music_YellowUnusedSong_Ch3 - dbw CH3, Music_YellowUnusedSong_Ch4 + audio_header Music_YellowUnusedSong, Ch1, Ch2, Ch3, Ch4 Music_GBPrinter:: - dbw ((1 - 1) << 6) | CH2, Music_GBPrinter_Ch3 + audio_header Music_GBPrinter, Ch3 diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index fdbcb5f3..de0d3b89 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -1,377 +1,288 @@ SFX_Headers_1:: dbw -1, -1 ; padding -SFX_Snare1_1:: - dbw CH7, SFX_Snare1_1_Ch1 +SFX_Noise_Instrument01_1:: + audio_header SFX_Noise_Instrument01_1, Ch8 -SFX_Snare2_1:: - dbw CH7, SFX_Snare2_1_Ch1 +SFX_Noise_Instrument02_1:: + audio_header SFX_Noise_Instrument02_1, Ch8 -SFX_Snare3_1:: - dbw CH7, SFX_Snare3_1_Ch1 +SFX_Noise_Instrument03_1:: + audio_header SFX_Noise_Instrument03_1, Ch8 -SFX_Snare4_1:: - dbw CH7, SFX_Snare4_1_Ch1 +SFX_Noise_Instrument04_1:: + audio_header SFX_Noise_Instrument04_1, Ch8 -SFX_Snare5_1:: - dbw CH7, SFX_Snare5_1_Ch1 +SFX_Noise_Instrument05_1:: + audio_header SFX_Noise_Instrument05_1, Ch8 -SFX_Triangle1_1:: - dbw CH7, SFX_Triangle1_1_Ch1 +SFX_Noise_Instrument06_1:: + audio_header SFX_Noise_Instrument06_1, Ch8 -SFX_Triangle2_1:: - dbw CH7, SFX_Triangle2_1_Ch1 +SFX_Noise_Instrument07_1:: + audio_header SFX_Noise_Instrument07_1, Ch8 -SFX_Snare6_1:: - dbw CH7, SFX_Snare6_1_Ch1 +SFX_Noise_Instrument08_1:: + audio_header SFX_Noise_Instrument08_1, Ch8 -SFX_Snare7_1:: - dbw CH7, SFX_Snare7_1_Ch1 +SFX_Noise_Instrument09_1:: + audio_header SFX_Noise_Instrument09_1, Ch8 -SFX_Snare8_1:: - dbw CH7, SFX_Snare8_1_Ch1 +SFX_Noise_Instrument10_1:: + audio_header SFX_Noise_Instrument10_1, Ch8 -SFX_Snare9_1:: - dbw CH7, SFX_Snare9_1_Ch1 +SFX_Noise_Instrument11_1:: + audio_header SFX_Noise_Instrument11_1, Ch8 -SFX_Cymbal1_1:: - dbw CH7, SFX_Cymbal1_1_Ch1 +SFX_Noise_Instrument12_1:: + audio_header SFX_Noise_Instrument12_1, Ch8 -SFX_Cymbal2_1:: - dbw CH7, SFX_Cymbal2_1_Ch1 +SFX_Noise_Instrument13_1:: + audio_header SFX_Noise_Instrument13_1, Ch8 -SFX_Cymbal3_1:: - dbw CH7, SFX_Cymbal3_1_Ch1 +SFX_Noise_Instrument14_1:: + audio_header SFX_Noise_Instrument14_1, Ch8 -SFX_Muted_Snare1_1:: - dbw CH7, SFX_Muted_Snare1_1_Ch1 +SFX_Noise_Instrument15_1:: + audio_header SFX_Noise_Instrument15_1, Ch8 -SFX_Triangle3_1:: - dbw CH7, SFX_Triangle3_1_Ch1 +SFX_Noise_Instrument16_1:: + audio_header SFX_Noise_Instrument16_1, Ch8 -SFX_Muted_Snare2_1:: - dbw CH7, SFX_Muted_Snare2_1_Ch1 +SFX_Noise_Instrument17_1:: + audio_header SFX_Noise_Instrument17_1, Ch8 -SFX_Muted_Snare3_1:: - dbw CH7, SFX_Muted_Snare3_1_Ch1 +SFX_Noise_Instrument18_1:: + audio_header SFX_Noise_Instrument18_1, Ch8 -SFX_Muted_Snare4_1:: - dbw CH7, SFX_Muted_Snare4_1_Ch1 +SFX_Noise_Instrument19_1:: + audio_header SFX_Noise_Instrument19_1, Ch8 SFX_Cry00_1:: - dbw ( $80 | CH4 ), SFX_Cry00_1_Ch1 - dbw CH5, SFX_Cry00_1_Ch2 - dbw CH7, SFX_Cry00_1_Ch3 + audio_header SFX_Cry00_1, Ch5, Ch6, Ch8 SFX_Cry01_1:: - dbw ( $80 | CH4 ), SFX_Cry01_1_Ch1 - dbw CH5, SFX_Cry01_1_Ch2 - dbw CH7, SFX_Cry01_1_Ch3 + audio_header SFX_Cry01_1, Ch5, Ch6, Ch8 SFX_Cry02_1:: - dbw ( $80 | CH4 ), SFX_Cry02_1_Ch1 - dbw CH5, SFX_Cry02_1_Ch2 - dbw CH7, SFX_Cry02_1_Ch3 + audio_header SFX_Cry02_1, Ch5, Ch6, Ch8 SFX_Cry03_1:: - dbw ( $80 | CH4 ), SFX_Cry03_1_Ch1 - dbw CH5, SFX_Cry03_1_Ch2 - dbw CH7, SFX_Cry03_1_Ch3 + audio_header SFX_Cry03_1, Ch5, Ch6, Ch8 SFX_Cry04_1:: - dbw ( $80 | CH4 ), SFX_Cry04_1_Ch1 - dbw CH5, SFX_Cry04_1_Ch2 - dbw CH7, SFX_Cry04_1_Ch3 + audio_header SFX_Cry04_1, Ch5, Ch6, Ch8 SFX_Cry05_1:: - dbw ( $80 | CH4 ), SFX_Cry05_1_Ch1 - dbw CH5, SFX_Cry05_1_Ch2 - dbw CH7, SFX_Cry05_1_Ch3 + audio_header SFX_Cry05_1, Ch5, Ch6, Ch8 SFX_Cry06_1:: - dbw ( $80 | CH4 ), SFX_Cry06_1_Ch1 - dbw CH5, SFX_Cry06_1_Ch2 - dbw CH7, SFX_Cry06_1_Ch3 + audio_header SFX_Cry06_1, Ch5, Ch6, Ch8 SFX_Cry07_1:: - dbw ( $80 | CH4 ), SFX_Cry07_1_Ch1 - dbw CH5, SFX_Cry07_1_Ch2 - dbw CH7, SFX_Cry07_1_Ch3 + audio_header SFX_Cry07_1, Ch5, Ch6, Ch8 SFX_Cry08_1:: - dbw ( $80 | CH4 ), SFX_Cry08_1_Ch1 - dbw CH5, SFX_Cry08_1_Ch2 - dbw CH7, SFX_Cry08_1_Ch3 + audio_header SFX_Cry08_1, Ch5, Ch6, Ch8 SFX_Cry09_1:: - dbw ( $80 | CH4 ), SFX_Cry09_1_Ch1 - dbw CH5, SFX_Cry09_1_Ch2 - dbw CH7, SFX_Cry09_1_Ch3 + audio_header SFX_Cry09_1, Ch5, Ch6, Ch8 SFX_Cry0A_1:: - dbw ( $80 | CH4 ), SFX_Cry0A_1_Ch1 - dbw CH5, SFX_Cry0A_1_Ch2 - dbw CH7, SFX_Cry0A_1_Ch3 + audio_header SFX_Cry0A_1, Ch5, Ch6, Ch8 SFX_Cry0B_1:: - dbw ( $80 | CH4 ), SFX_Cry0B_1_Ch1 - dbw CH5, SFX_Cry0B_1_Ch2 - dbw CH7, SFX_Cry0B_1_Ch3 + audio_header SFX_Cry0B_1, Ch5, Ch6, Ch8 SFX_Cry0C_1:: - dbw ( $80 | CH4 ), SFX_Cry0C_1_Ch1 - dbw CH5, SFX_Cry0C_1_Ch2 - dbw CH7, SFX_Cry0C_1_Ch3 + audio_header SFX_Cry0C_1, Ch5, Ch6, Ch8 SFX_Cry0D_1:: - dbw ( $80 | CH4 ), SFX_Cry0D_1_Ch1 - dbw CH5, SFX_Cry0D_1_Ch2 - dbw CH7, SFX_Cry0D_1_Ch3 + audio_header SFX_Cry0D_1, Ch5, Ch6, Ch8 SFX_Cry0E_1:: - dbw ( $80 | CH4 ), SFX_Cry0E_1_Ch1 - dbw CH5, SFX_Cry0E_1_Ch2 - dbw CH7, SFX_Cry0E_1_Ch3 + audio_header SFX_Cry0E_1, Ch5, Ch6, Ch8 SFX_Cry0F_1:: - dbw ( $80 | CH4 ), SFX_Cry0F_1_Ch1 - dbw CH5, SFX_Cry0F_1_Ch2 - dbw CH7, SFX_Cry0F_1_Ch3 + audio_header SFX_Cry0F_1, Ch5, Ch6, Ch8 SFX_Cry10_1:: - dbw ( $80 | CH4 ), SFX_Cry10_1_Ch1 - dbw CH5, SFX_Cry10_1_Ch2 - dbw CH7, SFX_Cry10_1_Ch3 + audio_header SFX_Cry10_1, Ch5, Ch6, Ch8 SFX_Cry11_1:: - dbw ( $80 | CH4 ), SFX_Cry11_1_Ch1 - dbw CH5, SFX_Cry11_1_Ch2 - dbw CH7, SFX_Cry11_1_Ch3 + audio_header SFX_Cry11_1, Ch5, Ch6, Ch8 SFX_Cry12_1:: - dbw ( $80 | CH4 ), SFX_Cry12_1_Ch1 - dbw CH5, SFX_Cry12_1_Ch2 - dbw CH7, SFX_Cry12_1_Ch3 + audio_header SFX_Cry12_1, Ch5, Ch6, Ch8 SFX_Cry13_1:: - dbw ( $80 | CH4 ), SFX_Cry13_1_Ch1 - dbw CH5, SFX_Cry13_1_Ch2 - dbw CH7, SFX_Cry13_1_Ch3 + audio_header SFX_Cry13_1, Ch5, Ch6, Ch8 SFX_Cry14_1:: - dbw ( $80 | CH4 ), SFX_Cry14_1_Ch1 - dbw CH5, SFX_Cry14_1_Ch2 - dbw CH7, SFX_Cry14_1_Ch3 + audio_header SFX_Cry14_1, Ch5, Ch6, Ch8 SFX_Cry15_1:: - dbw ( $80 | CH4 ), SFX_Cry15_1_Ch1 - dbw CH5, SFX_Cry15_1_Ch2 - dbw CH7, SFX_Cry15_1_Ch3 + audio_header SFX_Cry15_1, Ch5, Ch6, Ch8 SFX_Cry16_1:: - dbw ( $80 | CH4 ), SFX_Cry16_1_Ch1 - dbw CH5, SFX_Cry16_1_Ch2 - dbw CH7, SFX_Cry16_1_Ch3 + audio_header SFX_Cry16_1, Ch5, Ch6, Ch8 SFX_Cry17_1:: - dbw ( $80 | CH4 ), SFX_Cry17_1_Ch1 - dbw CH5, SFX_Cry17_1_Ch2 - dbw CH7, SFX_Cry17_1_Ch3 + audio_header SFX_Cry17_1, Ch5, Ch6, Ch8 SFX_Cry18_1:: - dbw ( $80 | CH4 ), SFX_Cry18_1_Ch1 - dbw CH5, SFX_Cry18_1_Ch2 - dbw CH7, SFX_Cry18_1_Ch3 + audio_header SFX_Cry18_1, Ch5, Ch6, Ch8 SFX_Cry19_1:: - dbw ( $80 | CH4 ), SFX_Cry19_1_Ch1 - dbw CH5, SFX_Cry19_1_Ch2 - dbw CH7, SFX_Cry19_1_Ch3 + audio_header SFX_Cry19_1, Ch5, Ch6, Ch8 SFX_Cry1A_1:: - dbw ( $80 | CH4 ), SFX_Cry1A_1_Ch1 - dbw CH5, SFX_Cry1A_1_Ch2 - dbw CH7, SFX_Cry1A_1_Ch3 + audio_header SFX_Cry1A_1, Ch5, Ch6, Ch8 SFX_Cry1B_1:: - dbw ( $80 | CH4 ), SFX_Cry1B_1_Ch1 - dbw CH5, SFX_Cry1B_1_Ch2 - dbw CH7, SFX_Cry1B_1_Ch3 + audio_header SFX_Cry1B_1, Ch5, Ch6, Ch8 SFX_Cry1C_1:: - dbw ( $80 | CH4 ), SFX_Cry1C_1_Ch1 - dbw CH5, SFX_Cry1C_1_Ch2 - dbw CH7, SFX_Cry1C_1_Ch3 + audio_header SFX_Cry1C_1, Ch5, Ch6, Ch8 SFX_Cry1D_1:: - dbw ( $80 | CH4 ), SFX_Cry1D_1_Ch1 - dbw CH5, SFX_Cry1D_1_Ch2 - dbw CH7, SFX_Cry1D_1_Ch3 + audio_header SFX_Cry1D_1, Ch5, Ch6, Ch8 SFX_Cry1E_1:: - dbw ( $80 | CH4 ), SFX_Cry1E_1_Ch1 - dbw CH5, SFX_Cry1E_1_Ch2 - dbw CH7, SFX_Cry1E_1_Ch3 + audio_header SFX_Cry1E_1, Ch5, Ch6, Ch8 SFX_Cry1F_1:: - dbw ( $80 | CH4 ), SFX_Cry1F_1_Ch1 - dbw CH5, SFX_Cry1F_1_Ch2 - dbw CH7, SFX_Cry1F_1_Ch3 + audio_header SFX_Cry1F_1, Ch5, Ch6, Ch8 SFX_Cry20_1:: - dbw ( $80 | CH4 ), SFX_Cry20_1_Ch1 - dbw CH5, SFX_Cry20_1_Ch2 - dbw CH7, SFX_Cry20_1_Ch3 + audio_header SFX_Cry20_1, Ch5, Ch6, Ch8 SFX_Cry21_1:: - dbw ( $80 | CH4 ), SFX_Cry21_1_Ch1 - dbw CH5, SFX_Cry21_1_Ch2 - dbw CH7, SFX_Cry21_1_Ch3 + audio_header SFX_Cry21_1, Ch5, Ch6, Ch8 SFX_Cry22_1:: - dbw ( $80 | CH4 ), SFX_Cry22_1_Ch1 - dbw CH5, SFX_Cry22_1_Ch2 - dbw CH7, SFX_Cry22_1_Ch3 + audio_header SFX_Cry22_1, Ch5, Ch6, Ch8 SFX_Cry23_1:: - dbw ( $80 | CH4 ), SFX_Cry23_1_Ch1 - dbw CH5, SFX_Cry23_1_Ch2 - dbw CH7, SFX_Cry23_1_Ch3 + audio_header SFX_Cry23_1, Ch5, Ch6, Ch8 SFX_Cry24_1:: - dbw ( $80 | CH4 ), SFX_Cry24_1_Ch1 - dbw CH5, SFX_Cry24_1_Ch2 - dbw CH7, SFX_Cry24_1_Ch3 + audio_header SFX_Cry24_1, Ch5, Ch6, Ch8 SFX_Cry25_1:: - dbw ( $80 | CH4 ), SFX_Cry25_1_Ch1 - dbw CH5, SFX_Cry25_1_Ch2 - dbw CH7, SFX_Cry25_1_Ch3 + audio_header SFX_Cry25_1, Ch5, Ch6, Ch8 SFX_Get_Item1_1:: - dbw ( $80 | CH4 ), SFX_Get_Item1_1_Ch1 - dbw CH5, SFX_Get_Item1_1_Ch2 - dbw CH6, SFX_Get_Item1_1_Ch3 + audio_header SFX_Get_Item1_1, Ch5, Ch6, Ch7 SFX_Get_Item2_1:: - dbw ( $80 | CH4 ), SFX_Get_Item2_1_Ch1 - dbw CH5, SFX_Get_Item2_1_Ch2 - dbw CH6, SFX_Get_Item2_1_Ch3 + audio_header SFX_Get_Item2_1, Ch5, Ch6, Ch7 SFX_Tink_1:: - dbw CH4, SFX_Tink_1_Ch1 + audio_header SFX_Tink_1, Ch5 SFX_Heal_HP_1:: - dbw CH4, SFX_Heal_HP_1_Ch1 + audio_header SFX_Heal_HP_1, Ch5 SFX_Heal_Ailment_1:: - dbw CH4, SFX_Heal_Ailment_1_Ch1 + audio_header SFX_Heal_Ailment_1, Ch5 SFX_Start_Menu_1:: - dbw CH7, SFX_Start_Menu_1_Ch1 + audio_header SFX_Start_Menu_1, Ch8 SFX_Press_AB_1:: - dbw CH4, SFX_Press_AB_1_Ch1 + audio_header SFX_Press_AB_1, Ch5 SFX_Pokedex_Rating_1:: - dbw ( $80 | CH4 ), SFX_Pokedex_Rating_1_Ch1 - dbw CH5, SFX_Pokedex_Rating_1_Ch2 - dbw CH6, SFX_Pokedex_Rating_1_Ch3 + audio_header SFX_Pokedex_Rating_1, Ch5, Ch6, Ch7 SFX_Get_Key_Item_1:: - dbw ( $80 | CH4 ), SFX_Get_Key_Item_1_Ch1 - dbw CH5, SFX_Get_Key_Item_1_Ch2 - dbw CH6, SFX_Get_Key_Item_1_Ch3 + audio_header SFX_Get_Key_Item_1, Ch5, Ch6, Ch7 SFX_Poisoned_1:: - dbw CH4, SFX_Poisoned_1_Ch1 + audio_header SFX_Poisoned_1, Ch5 SFX_Trade_Machine_1:: - dbw CH4, SFX_Trade_Machine_1_Ch1 + audio_header SFX_Trade_Machine_1, Ch5 SFX_Turn_On_PC_1:: - dbw CH4, SFX_Turn_On_PC_1_Ch1 + audio_header SFX_Turn_On_PC_1, Ch5 SFX_Turn_Off_PC_1:: - dbw CH4, SFX_Turn_Off_PC_1_Ch1 + audio_header SFX_Turn_Off_PC_1, Ch5 SFX_Enter_PC_1:: - dbw CH4, SFX_Enter_PC_1_Ch1 + audio_header SFX_Enter_PC_1, Ch5 SFX_Shrink_1:: - dbw CH4, SFX_Shrink_1_Ch1 + audio_header SFX_Shrink_1, Ch5 SFX_Switch_1:: - dbw CH4, SFX_Switch_1_Ch1 + audio_header SFX_Switch_1, Ch5 SFX_Healing_Machine_1:: - dbw CH4, SFX_Healing_Machine_1_Ch1 + audio_header SFX_Healing_Machine_1, Ch5 SFX_Teleport_Exit1_1:: - dbw CH4, SFX_Teleport_Exit1_1_Ch1 + audio_header SFX_Teleport_Exit1_1, Ch5 SFX_Teleport_Enter1_1:: - dbw CH4, SFX_Teleport_Enter1_1_Ch1 + audio_header SFX_Teleport_Enter1_1, Ch5 SFX_Teleport_Exit2_1:: - dbw CH4, SFX_Teleport_Exit2_1_Ch1 + audio_header SFX_Teleport_Exit2_1, Ch5 SFX_Ledge_1:: - dbw CH4, SFX_Ledge_1_Ch1 + audio_header SFX_Ledge_1, Ch5 SFX_Teleport_Enter2_1:: - dbw CH7, SFX_Teleport_Enter2_1_Ch1 + audio_header SFX_Teleport_Enter2_1, Ch8 SFX_Fly_1:: - dbw CH7, SFX_Fly_1_Ch1 + audio_header SFX_Fly_1, Ch8 SFX_Denied_1:: - dbw ( $40 | CH4 ), SFX_Denied_1_Ch1 - dbw CH5, SFX_Denied_1_Ch2 + audio_header SFX_Denied_1, Ch5, Ch6 SFX_Arrow_Tiles_1:: - dbw CH4, SFX_Arrow_Tiles_1_Ch1 + audio_header SFX_Arrow_Tiles_1, Ch5 SFX_Push_Boulder_1:: - dbw CH7, SFX_Push_Boulder_1_Ch1 + audio_header SFX_Push_Boulder_1, Ch8 SFX_SS_Anne_Horn_1:: - dbw ( $40 | CH4 ), SFX_SS_Anne_Horn_1_Ch1 - dbw CH5, SFX_SS_Anne_Horn_1_Ch2 + audio_header SFX_SS_Anne_Horn_1, Ch5, Ch6 SFX_Withdraw_Deposit_1:: - dbw CH4, SFX_Withdraw_Deposit_1_Ch1 + audio_header SFX_Withdraw_Deposit_1, Ch5 SFX_Cut_1:: - dbw CH7, SFX_Cut_1_Ch1 + audio_header SFX_Cut_1, Ch8 SFX_Go_Inside_1:: - dbw CH7, SFX_Go_Inside_1_Ch1 + audio_header SFX_Go_Inside_1, Ch8 SFX_Swap_1:: - dbw ( $40 | CH4 ), SFX_Swap_1_Ch1 - dbw CH5, SFX_Swap_1_Ch2 + audio_header SFX_Swap_1, Ch5, Ch6 SFX_59_1:: - dbw ( $40 | CH4 ), SFX_59_1_Ch1 - dbw CH5, SFX_59_1_Ch2 + audio_header SFX_59_1, Ch5, Ch6 SFX_Purchase_1:: - dbw ( $40 | CH4 ), SFX_Purchase_1_Ch1 - dbw CH5, SFX_Purchase_1_Ch2 + audio_header SFX_Purchase_1, Ch5, Ch6 SFX_Collision_1:: - dbw CH4, SFX_Collision_1_Ch1 + audio_header SFX_Collision_1, Ch5 SFX_Go_Outside_1:: - dbw CH7, SFX_Go_Outside_1_Ch1 + audio_header SFX_Go_Outside_1, Ch8 SFX_Save_1:: - dbw ( $40 | CH4 ), SFX_Save_1_Ch1 - dbw CH5, SFX_Save_1_Ch2 + audio_header SFX_Save_1, Ch5, Ch6 +; the Pokeflute sound effect directly hijacks channel 3 SFX_Pokeflute:: - dbw CH2, SFX_Pokeflute_Ch1 + audio_header SFX_Pokeflute, Ch3 SFX_Safari_Zone_PA:: - dbw CH4, SFX_Safari_Zone_PA_Ch1 + audio_header SFX_Safari_Zone_PA, Ch5 diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index 2f517d10..eb8eb4c1 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -1,473 +1,359 @@ SFX_Headers_2:: dbw -1, -1 ; padding -SFX_Snare1_2:: - dbw CH7, SFX_Snare1_2_Ch1 +SFX_Noise_Instrument01_2:: + audio_header SFX_Noise_Instrument01_2, Ch8 -SFX_Snare2_2:: - dbw CH7, SFX_Snare2_2_Ch1 +SFX_Noise_Instrument02_2:: + audio_header SFX_Noise_Instrument02_2, Ch8 -SFX_Snare3_2:: - dbw CH7, SFX_Snare3_2_Ch1 +SFX_Noise_Instrument03_2:: + audio_header SFX_Noise_Instrument03_2, Ch8 -SFX_Snare4_2:: - dbw CH7, SFX_Snare4_2_Ch1 +SFX_Noise_Instrument04_2:: + audio_header SFX_Noise_Instrument04_2, Ch8 -SFX_Snare5_2:: - dbw CH7, SFX_Snare5_2_Ch1 +SFX_Noise_Instrument05_2:: + audio_header SFX_Noise_Instrument05_2, Ch8 -SFX_Triangle1_2:: - dbw CH7, SFX_Triangle1_2_Ch1 +SFX_Noise_Instrument06_2:: + audio_header SFX_Noise_Instrument06_2, Ch8 -SFX_Triangle2_2:: - dbw CH7, SFX_Triangle2_2_Ch1 +SFX_Noise_Instrument07_2:: + audio_header SFX_Noise_Instrument07_2, Ch8 -SFX_Snare6_2:: - dbw CH7, SFX_Snare6_2_Ch1 +SFX_Noise_Instrument08_2:: + audio_header SFX_Noise_Instrument08_2, Ch8 -SFX_Snare7_2:: - dbw CH7, SFX_Snare7_2_Ch1 +SFX_Noise_Instrument09_2:: + audio_header SFX_Noise_Instrument09_2, Ch8 -SFX_Snare8_2:: - dbw CH7, SFX_Snare8_2_Ch1 +SFX_Noise_Instrument10_2:: + audio_header SFX_Noise_Instrument10_2, Ch8 -SFX_Snare9_2:: - dbw CH7, SFX_Snare9_2_Ch1 +SFX_Noise_Instrument11_2:: + audio_header SFX_Noise_Instrument11_2, Ch8 -SFX_Cymbal1_2:: - dbw CH7, SFX_Cymbal1_2_Ch1 +SFX_Noise_Instrument12_2:: + audio_header SFX_Noise_Instrument12_2, Ch8 -SFX_Cymbal2_2:: - dbw CH7, SFX_Cymbal2_2_Ch1 +SFX_Noise_Instrument13_2:: + audio_header SFX_Noise_Instrument13_2, Ch8 -SFX_Cymbal3_2:: - dbw CH7, SFX_Cymbal3_2_Ch1 +SFX_Noise_Instrument14_2:: + audio_header SFX_Noise_Instrument14_2, Ch8 -SFX_Muted_Snare1_2:: - dbw CH7, SFX_Muted_Snare1_2_Ch1 +SFX_Noise_Instrument15_2:: + audio_header SFX_Noise_Instrument15_2, Ch8 -SFX_Triangle3_2:: - dbw CH7, SFX_Triangle3_2_Ch1 +SFX_Noise_Instrument16_2:: + audio_header SFX_Noise_Instrument16_2, Ch8 -SFX_Muted_Snare2_2:: - dbw CH7, SFX_Muted_Snare2_2_Ch1 +SFX_Noise_Instrument17_2:: + audio_header SFX_Noise_Instrument17_2, Ch8 -SFX_Muted_Snare3_2:: - dbw CH7, SFX_Muted_Snare3_2_Ch1 +SFX_Noise_Instrument18_2:: + audio_header SFX_Noise_Instrument18_2, Ch8 -SFX_Muted_Snare4_2:: - dbw CH7, SFX_Muted_Snare4_2_Ch1 +SFX_Noise_Instrument19_2:: + audio_header SFX_Noise_Instrument19_2, Ch8 SFX_Cry00_2:: - dbw ( $80 | CH4 ), SFX_Cry00_2_Ch1 - dbw CH5, SFX_Cry00_2_Ch2 - dbw CH7, SFX_Cry00_2_Ch3 + audio_header SFX_Cry00_2, Ch5, Ch6, Ch8 SFX_Cry01_2:: - dbw ( $80 | CH4 ), SFX_Cry01_2_Ch1 - dbw CH5, SFX_Cry01_2_Ch2 - dbw CH7, SFX_Cry01_2_Ch3 + audio_header SFX_Cry01_2, Ch5, Ch6, Ch8 SFX_Cry02_2:: - dbw ( $80 | CH4 ), SFX_Cry02_2_Ch1 - dbw CH5, SFX_Cry02_2_Ch2 - dbw CH7, SFX_Cry02_2_Ch3 + audio_header SFX_Cry02_2, Ch5, Ch6, Ch8 SFX_Cry03_2:: - dbw ( $80 | CH4 ), SFX_Cry03_2_Ch1 - dbw CH5, SFX_Cry03_2_Ch2 - dbw CH7, SFX_Cry03_2_Ch3 + audio_header SFX_Cry03_2, Ch5, Ch6, Ch8 SFX_Cry04_2:: - dbw ( $80 | CH4 ), SFX_Cry04_2_Ch1 - dbw CH5, SFX_Cry04_2_Ch2 - dbw CH7, SFX_Cry04_2_Ch3 + audio_header SFX_Cry04_2, Ch5, Ch6, Ch8 SFX_Cry05_2:: - dbw ( $80 | CH4 ), SFX_Cry05_2_Ch1 - dbw CH5, SFX_Cry05_2_Ch2 - dbw CH7, SFX_Cry05_2_Ch3 + audio_header SFX_Cry05_2, Ch5, Ch6, Ch8 SFX_Cry06_2:: - dbw ( $80 | CH4 ), SFX_Cry06_2_Ch1 - dbw CH5, SFX_Cry06_2_Ch2 - dbw CH7, SFX_Cry06_2_Ch3 + audio_header SFX_Cry06_2, Ch5, Ch6, Ch8 SFX_Cry07_2:: - dbw ( $80 | CH4 ), SFX_Cry07_2_Ch1 - dbw CH5, SFX_Cry07_2_Ch2 - dbw CH7, SFX_Cry07_2_Ch3 + audio_header SFX_Cry07_2, Ch5, Ch6, Ch8 SFX_Cry08_2:: - dbw ( $80 | CH4 ), SFX_Cry08_2_Ch1 - dbw CH5, SFX_Cry08_2_Ch2 - dbw CH7, SFX_Cry08_2_Ch3 + audio_header SFX_Cry08_2, Ch5, Ch6, Ch8 SFX_Cry09_2:: - dbw ( $80 | CH4 ), SFX_Cry09_2_Ch1 - dbw CH5, SFX_Cry09_2_Ch2 - dbw CH7, SFX_Cry09_2_Ch3 + audio_header SFX_Cry09_2, Ch5, Ch6, Ch8 SFX_Cry0A_2:: - dbw ( $80 | CH4 ), SFX_Cry0A_2_Ch1 - dbw CH5, SFX_Cry0A_2_Ch2 - dbw CH7, SFX_Cry0A_2_Ch3 + audio_header SFX_Cry0A_2, Ch5, Ch6, Ch8 SFX_Cry0B_2:: - dbw ( $80 | CH4 ), SFX_Cry0B_2_Ch1 - dbw CH5, SFX_Cry0B_2_Ch2 - dbw CH7, SFX_Cry0B_2_Ch3 + audio_header SFX_Cry0B_2, Ch5, Ch6, Ch8 SFX_Cry0C_2:: - dbw ( $80 | CH4 ), SFX_Cry0C_2_Ch1 - dbw CH5, SFX_Cry0C_2_Ch2 - dbw CH7, SFX_Cry0C_2_Ch3 + audio_header SFX_Cry0C_2, Ch5, Ch6, Ch8 SFX_Cry0D_2:: - dbw ( $80 | CH4 ), SFX_Cry0D_2_Ch1 - dbw CH5, SFX_Cry0D_2_Ch2 - dbw CH7, SFX_Cry0D_2_Ch3 + audio_header SFX_Cry0D_2, Ch5, Ch6, Ch8 SFX_Cry0E_2:: - dbw ( $80 | CH4 ), SFX_Cry0E_2_Ch1 - dbw CH5, SFX_Cry0E_2_Ch2 - dbw CH7, SFX_Cry0E_2_Ch3 + audio_header SFX_Cry0E_2, Ch5, Ch6, Ch8 SFX_Cry0F_2:: - dbw ( $80 | CH4 ), SFX_Cry0F_2_Ch1 - dbw CH5, SFX_Cry0F_2_Ch2 - dbw CH7, SFX_Cry0F_2_Ch3 + audio_header SFX_Cry0F_2, Ch5, Ch6, Ch8 SFX_Cry10_2:: - dbw ( $80 | CH4 ), SFX_Cry10_2_Ch1 - dbw CH5, SFX_Cry10_2_Ch2 - dbw CH7, SFX_Cry10_2_Ch3 + audio_header SFX_Cry10_2, Ch5, Ch6, Ch8 SFX_Cry11_2:: - dbw ( $80 | CH4 ), SFX_Cry11_2_Ch1 - dbw CH5, SFX_Cry11_2_Ch2 - dbw CH7, SFX_Cry11_2_Ch3 + audio_header SFX_Cry11_2, Ch5, Ch6, Ch8 SFX_Cry12_2:: - dbw ( $80 | CH4 ), SFX_Cry12_2_Ch1 - dbw CH5, SFX_Cry12_2_Ch2 - dbw CH7, SFX_Cry12_2_Ch3 + audio_header SFX_Cry12_2, Ch5, Ch6, Ch8 SFX_Cry13_2:: - dbw ( $80 | CH4 ), SFX_Cry13_2_Ch1 - dbw CH5, SFX_Cry13_2_Ch2 - dbw CH7, SFX_Cry13_2_Ch3 + audio_header SFX_Cry13_2, Ch5, Ch6, Ch8 SFX_Cry14_2:: - dbw ( $80 | CH4 ), SFX_Cry14_2_Ch1 - dbw CH5, SFX_Cry14_2_Ch2 - dbw CH7, SFX_Cry14_2_Ch3 + audio_header SFX_Cry14_2, Ch5, Ch6, Ch8 SFX_Cry15_2:: - dbw ( $80 | CH4 ), SFX_Cry15_2_Ch1 - dbw CH5, SFX_Cry15_2_Ch2 - dbw CH7, SFX_Cry15_2_Ch3 + audio_header SFX_Cry15_2, Ch5, Ch6, Ch8 SFX_Cry16_2:: - dbw ( $80 | CH4 ), SFX_Cry16_2_Ch1 - dbw CH5, SFX_Cry16_2_Ch2 - dbw CH7, SFX_Cry16_2_Ch3 + audio_header SFX_Cry16_2, Ch5, Ch6, Ch8 SFX_Cry17_2:: - dbw ( $80 | CH4 ), SFX_Cry17_2_Ch1 - dbw CH5, SFX_Cry17_2_Ch2 - dbw CH7, SFX_Cry17_2_Ch3 + audio_header SFX_Cry17_2, Ch5, Ch6, Ch8 SFX_Cry18_2:: - dbw ( $80 | CH4 ), SFX_Cry18_2_Ch1 - dbw CH5, SFX_Cry18_2_Ch2 - dbw CH7, SFX_Cry18_2_Ch3 + audio_header SFX_Cry18_2, Ch5, Ch6, Ch8 SFX_Cry19_2:: - dbw ( $80 | CH4 ), SFX_Cry19_2_Ch1 - dbw CH5, SFX_Cry19_2_Ch2 - dbw CH7, SFX_Cry19_2_Ch3 + audio_header SFX_Cry19_2, Ch5, Ch6, Ch8 SFX_Cry1A_2:: - dbw ( $80 | CH4 ), SFX_Cry1A_2_Ch1 - dbw CH5, SFX_Cry1A_2_Ch2 - dbw CH7, SFX_Cry1A_2_Ch3 + audio_header SFX_Cry1A_2, Ch5, Ch6, Ch8 SFX_Cry1B_2:: - dbw ( $80 | CH4 ), SFX_Cry1B_2_Ch1 - dbw CH5, SFX_Cry1B_2_Ch2 - dbw CH7, SFX_Cry1B_2_Ch3 + audio_header SFX_Cry1B_2, Ch5, Ch6, Ch8 SFX_Cry1C_2:: - dbw ( $80 | CH4 ), SFX_Cry1C_2_Ch1 - dbw CH5, SFX_Cry1C_2_Ch2 - dbw CH7, SFX_Cry1C_2_Ch3 + audio_header SFX_Cry1C_2, Ch5, Ch6, Ch8 SFX_Cry1D_2:: - dbw ( $80 | CH4 ), SFX_Cry1D_2_Ch1 - dbw CH5, SFX_Cry1D_2_Ch2 - dbw CH7, SFX_Cry1D_2_Ch3 + audio_header SFX_Cry1D_2, Ch5, Ch6, Ch8 SFX_Cry1E_2:: - dbw ( $80 | CH4 ), SFX_Cry1E_2_Ch1 - dbw CH5, SFX_Cry1E_2_Ch2 - dbw CH7, SFX_Cry1E_2_Ch3 + audio_header SFX_Cry1E_2, Ch5, Ch6, Ch8 SFX_Cry1F_2:: - dbw ( $80 | CH4 ), SFX_Cry1F_2_Ch1 - dbw CH5, SFX_Cry1F_2_Ch2 - dbw CH7, SFX_Cry1F_2_Ch3 + audio_header SFX_Cry1F_2, Ch5, Ch6, Ch8 SFX_Cry20_2:: - dbw ( $80 | CH4 ), SFX_Cry20_2_Ch1 - dbw CH5, SFX_Cry20_2_Ch2 - dbw CH7, SFX_Cry20_2_Ch3 + audio_header SFX_Cry20_2, Ch5, Ch6, Ch8 SFX_Cry21_2:: - dbw ( $80 | CH4 ), SFX_Cry21_2_Ch1 - dbw CH5, SFX_Cry21_2_Ch2 - dbw CH7, SFX_Cry21_2_Ch3 + audio_header SFX_Cry21_2, Ch5, Ch6, Ch8 SFX_Cry22_2:: - dbw ( $80 | CH4 ), SFX_Cry22_2_Ch1 - dbw CH5, SFX_Cry22_2_Ch2 - dbw CH7, SFX_Cry22_2_Ch3 + audio_header SFX_Cry22_2, Ch5, Ch6, Ch8 SFX_Cry23_2:: - dbw ( $80 | CH4 ), SFX_Cry23_2_Ch1 - dbw CH5, SFX_Cry23_2_Ch2 - dbw CH7, SFX_Cry23_2_Ch3 + audio_header SFX_Cry23_2, Ch5, Ch6, Ch8 SFX_Cry24_2:: - dbw ( $80 | CH4 ), SFX_Cry24_2_Ch1 - dbw CH5, SFX_Cry24_2_Ch2 - dbw CH7, SFX_Cry24_2_Ch3 + audio_header SFX_Cry24_2, Ch5, Ch6, Ch8 SFX_Cry25_2:: - dbw ( $80 | CH4 ), SFX_Cry25_2_Ch1 - dbw CH5, SFX_Cry25_2_Ch2 - dbw CH7, SFX_Cry25_2_Ch3 + audio_header SFX_Cry25_2, Ch5, Ch6, Ch8 SFX_Level_Up:: - dbw ( $80 | CH4 ), SFX_Level_Up_Ch1 - dbw CH5, SFX_Level_Up_Ch2 - dbw CH6, SFX_Level_Up_Ch3 + audio_header SFX_Level_Up, Ch5, Ch6, Ch7 SFX_Get_Item2_2:: - dbw ( $80 | CH4 ), SFX_Get_Item2_2_Ch1 - dbw CH5, SFX_Get_Item2_2_Ch2 - dbw CH6, SFX_Get_Item2_2_Ch3 + audio_header SFX_Get_Item2_2, Ch5, Ch6, Ch7 SFX_Tink_2:: - dbw CH4, SFX_Tink_2_Ch1 + audio_header SFX_Tink_2, Ch5 SFX_Heal_HP_2:: - dbw CH4, SFX_Heal_HP_2_Ch1 + audio_header SFX_Heal_HP_2, Ch5 SFX_Heal_Ailment_2:: - dbw CH4, SFX_Heal_Ailment_2_Ch1 + audio_header SFX_Heal_Ailment_2, Ch5 SFX_Start_Menu_2:: - dbw CH7, SFX_Start_Menu_2_Ch1 + audio_header SFX_Start_Menu_2, Ch8 SFX_Press_AB_2:: - dbw CH4, SFX_Press_AB_2_Ch1 + audio_header SFX_Press_AB_2, Ch5 SFX_Ball_Toss:: - dbw ( $40 | CH4 ), SFX_Ball_Toss_Ch1 - dbw CH5, SFX_Ball_Toss_Ch2 + audio_header SFX_Ball_Toss, Ch5, Ch6 SFX_Ball_Poof:: - dbw ( $40 | CH4 ), SFX_Ball_Poof_Ch1 - dbw CH7, SFX_Ball_Poof_Ch2 + audio_header SFX_Ball_Poof, Ch5, Ch8 SFX_Faint_Thud:: - dbw ( $40 | CH4 ), SFX_Faint_Thud_Ch1 - dbw CH7, SFX_Faint_Thud_Ch2 + audio_header SFX_Faint_Thud, Ch5, Ch8 SFX_Run:: - dbw CH7, SFX_Run_Ch1 + audio_header SFX_Run, Ch8 SFX_Dex_Page_Added:: - dbw ( $40 | CH4 ), SFX_Dex_Page_Added_Ch1 - dbw CH5, SFX_Dex_Page_Added_Ch2 + audio_header SFX_Dex_Page_Added, Ch5, Ch6 SFX_Caught_Mon:: - dbw ( $80 | CH4 ), SFX_Caught_Mon_Ch1 - dbw CH5, SFX_Caught_Mon_Ch2 - dbw CH6, SFX_Caught_Mon_Ch3 + audio_header SFX_Caught_Mon, Ch5, Ch6, Ch7 SFX_Peck:: - dbw CH7, SFX_Peck_Ch1 + audio_header SFX_Peck, Ch8 SFX_Faint_Fall:: - dbw CH4, SFX_Faint_Fall_Ch1 + audio_header SFX_Faint_Fall, Ch5 SFX_Battle_09:: - dbw CH4, SFX_Battle_09_Ch1 + audio_header SFX_Battle_09, Ch5 SFX_Pound:: - dbw CH7, SFX_Pound_Ch1 + audio_header SFX_Pound, Ch8 SFX_Battle_0B:: - dbw CH7, SFX_Battle_0B_Ch1 + audio_header SFX_Battle_0B, Ch8 SFX_Battle_0C:: - dbw CH7, SFX_Battle_0C_Ch1 + audio_header SFX_Battle_0C, Ch8 SFX_Battle_0D:: - dbw CH7, SFX_Battle_0D_Ch1 + audio_header SFX_Battle_0D, Ch8 SFX_Battle_0E:: - dbw CH7, SFX_Battle_0E_Ch1 + audio_header SFX_Battle_0E, Ch8 SFX_Battle_0F:: - dbw CH7, SFX_Battle_0F_Ch1 + audio_header SFX_Battle_0F, Ch8 SFX_Damage:: - dbw CH7, SFX_Damage_Ch1 + audio_header SFX_Damage, Ch8 SFX_Not_Very_Effective:: - dbw CH7, SFX_Not_Very_Effective_Ch1 + audio_header SFX_Not_Very_Effective, Ch8 SFX_Battle_12:: - dbw CH7, SFX_Battle_12_Ch1 + audio_header SFX_Battle_12, Ch8 SFX_Battle_13:: - dbw CH7, SFX_Battle_13_Ch1 + audio_header SFX_Battle_13, Ch8 SFX_Battle_14:: - dbw CH7, SFX_Battle_14_Ch1 + audio_header SFX_Battle_14, Ch8 SFX_Vine_Whip:: - dbw CH7, SFX_Vine_Whip_Ch1 + audio_header SFX_Vine_Whip, Ch8 SFX_Battle_16:: - dbw CH7, SFX_Battle_16_Ch1 + audio_header SFX_Battle_16, Ch8 SFX_Battle_17:: - dbw CH7, SFX_Battle_17_Ch1 + audio_header SFX_Battle_17, Ch8 SFX_Battle_18:: - dbw CH7, SFX_Battle_18_Ch1 + audio_header SFX_Battle_18, Ch8 SFX_Battle_19:: - dbw CH7, SFX_Battle_19_Ch1 + audio_header SFX_Battle_19, Ch8 SFX_Super_Effective:: - dbw CH7, SFX_Super_Effective_Ch1 + audio_header SFX_Super_Effective, Ch8 SFX_Battle_1B:: - dbw CH7, SFX_Battle_1B_Ch1 + audio_header SFX_Battle_1B, Ch8 SFX_Battle_1C:: - dbw CH7, SFX_Battle_1C_Ch1 + audio_header SFX_Battle_1C, Ch8 SFX_Doubleslap:: - dbw CH7, SFX_Doubleslap_Ch1 + audio_header SFX_Doubleslap, Ch8 SFX_Battle_1E:: - dbw ( $40 | CH4 ), SFX_Battle_1E_Ch1 - dbw CH7, SFX_Battle_1E_Ch2 + audio_header SFX_Battle_1E, Ch5, Ch8 SFX_Horn_Drill:: - dbw CH7, SFX_Horn_Drill_Ch1 + audio_header SFX_Horn_Drill, Ch8 SFX_Battle_20:: - dbw CH7, SFX_Battle_20_Ch1 + audio_header SFX_Battle_20, Ch8 SFX_Battle_21:: - dbw CH7, SFX_Battle_21_Ch1 + audio_header SFX_Battle_21, Ch8 SFX_Battle_22:: - dbw CH7, SFX_Battle_22_Ch1 + audio_header SFX_Battle_22, Ch8 SFX_Battle_23:: - dbw CH7, SFX_Battle_23_Ch1 + audio_header SFX_Battle_23, Ch8 SFX_Battle_24:: - dbw ( $40 | CH4 ), SFX_Battle_24_Ch1 - dbw CH7, SFX_Battle_24_Ch2 + audio_header SFX_Battle_24, Ch5, Ch8 SFX_Battle_25:: - dbw CH7, SFX_Battle_25_Ch1 + audio_header SFX_Battle_25, Ch8 SFX_Battle_26:: - dbw CH7, SFX_Battle_26_Ch1 + audio_header SFX_Battle_26, Ch8 SFX_Battle_27:: - dbw ( $80 | CH4 ), SFX_Battle_27_Ch1 - dbw CH5, SFX_Battle_27_Ch2 - dbw CH7, SFX_Battle_27_Ch3 + audio_header SFX_Battle_27, Ch5, Ch6, Ch8 SFX_Battle_28:: - dbw ( $80 | CH4 ), SFX_Battle_28_Ch1 - dbw CH5, SFX_Battle_28_Ch2 - dbw CH7, SFX_Battle_28_Ch3 + audio_header SFX_Battle_28, Ch5, Ch6, Ch8 -SFX_Earthquake:: - dbw ( $40 | CH4 ), SFX_Earthquake_Ch1 - dbw CH7, SFX_Earthquake_Ch2 +SFX_Battle_29:: + audio_header SFX_Battle_29, Ch5, Ch8 SFX_Battle_2A:: - dbw ( $80 | CH4 ), SFX_Battle_2A_Ch1 - dbw CH5, SFX_Battle_2A_Ch2 - dbw CH7, SFX_Battle_2A_Ch3 + audio_header SFX_Battle_2A, Ch5, Ch6, Ch8 SFX_Battle_2B:: - dbw ( $40 | CH4 ), SFX_Battle_2B_Ch1 - dbw CH7, SFX_Battle_2B_Ch2 + audio_header SFX_Battle_2B, Ch5, Ch8 SFX_Battle_2C:: - dbw ( $80 | CH4 ), SFX_Battle_2C_Ch1 - dbw CH5, SFX_Battle_2C_Ch2 - dbw CH7, SFX_Battle_2C_Ch3 + audio_header SFX_Battle_2C, Ch5, Ch6, Ch8 SFX_Psybeam:: - dbw ( $80 | CH4 ), SFX_Psybeam_Ch1 - dbw CH5, SFX_Psybeam_Ch2 - dbw CH7, SFX_Psybeam_Ch3 + audio_header SFX_Psybeam, Ch5, Ch6, Ch8 SFX_Battle_2E:: - dbw ( $80 | CH4 ), SFX_Battle_2E_Ch1 - dbw CH5, SFX_Battle_2E_Ch2 - dbw CH7, SFX_Battle_2E_Ch3 + audio_header SFX_Battle_2E, Ch5, Ch6, Ch8 -SFX_Thunderbolt:: - dbw ( $80 | CH4 ), SFX_Thunderbolt_Ch1 - dbw CH5, SFX_Thunderbolt_Ch2 - dbw CH7, SFX_Thunderbolt_Ch3 +SFX_Battle_2F:: + audio_header SFX_Battle_2F, Ch5, Ch6, Ch8 SFX_Psychic_M:: - dbw ( $80 | CH4 ), SFX_Psychic_M_Ch1 - dbw CH5, SFX_Psychic_M_Ch2 - dbw CH7, SFX_Psychic_M_Ch3 + audio_header SFX_Psychic_M, Ch5, Ch6, Ch8 SFX_Battle_31:: - dbw ( $40 | CH4 ), SFX_Battle_31_Ch1 - dbw CH5, SFX_Battle_31_Ch2 + audio_header SFX_Battle_31, Ch5, Ch6 SFX_Battle_32:: - dbw ( $40 | CH4 ), SFX_Battle_32_Ch1 - dbw CH5, SFX_Battle_32_Ch2 + audio_header SFX_Battle_32, Ch5, Ch6 SFX_Battle_33:: - dbw ( $40 | CH4 ), SFX_Battle_33_Ch1 - dbw CH5, SFX_Battle_33_Ch2 + audio_header SFX_Battle_33, Ch5, Ch6 SFX_Battle_34:: - dbw ( $80 | CH4 ), SFX_Battle_34_Ch1 - dbw CH5, SFX_Battle_34_Ch2 - dbw CH7, SFX_Battle_34_Ch3 + audio_header SFX_Battle_34, Ch5, Ch6, Ch8 SFX_Battle_35:: - dbw ( $40 | CH4 ), SFX_Battle_35_Ch1 - dbw CH5, SFX_Battle_35_Ch2 + audio_header SFX_Battle_35, Ch5, Ch6 SFX_Battle_36:: - dbw ( $80 | CH4 ), SFX_Battle_36_Ch1 - dbw CH5, SFX_Battle_36_Ch2 - dbw CH7, SFX_Battle_36_Ch3 + audio_header SFX_Battle_36, Ch5, Ch6, Ch8 SFX_Silph_Scope:: - dbw CH4, SFX_Silph_Scope_Ch1 + audio_header SFX_Silph_Scope, Ch5 diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm index cd940357..d1e0a127 100644 --- a/audio/headers/sfxheaders3.asm +++ b/audio/headers/sfxheaders3.asm @@ -1,402 +1,311 @@ SFX_Headers_3:: dbw -1, -1 ; padding -SFX_Snare1_3:: - dbw CH7, SFX_Snare1_3_Ch1 +SFX_Noise_Instrument01_3:: + audio_header SFX_Noise_Instrument01_3, Ch8 -SFX_Snare2_3:: - dbw CH7, SFX_Snare2_3_Ch1 +SFX_Noise_Instrument02_3:: + audio_header SFX_Noise_Instrument02_3, Ch8 -SFX_Snare3_3:: - dbw CH7, SFX_Snare3_3_Ch1 +SFX_Noise_Instrument03_3:: + audio_header SFX_Noise_Instrument03_3, Ch8 -SFX_Snare4_3:: - dbw CH7, SFX_Snare4_3_Ch1 +SFX_Noise_Instrument04_3:: + audio_header SFX_Noise_Instrument04_3, Ch8 -SFX_Snare5_3:: - dbw CH7, SFX_Snare5_3_Ch1 +SFX_Noise_Instrument05_3:: + audio_header SFX_Noise_Instrument05_3, Ch8 -SFX_Triangle1_3:: - dbw CH7, SFX_Triangle1_3_Ch1 +SFX_Noise_Instrument06_3:: + audio_header SFX_Noise_Instrument06_3, Ch8 -SFX_Triangle2_3:: - dbw CH7, SFX_Triangle2_3_Ch1 +SFX_Noise_Instrument07_3:: + audio_header SFX_Noise_Instrument07_3, Ch8 -SFX_Snare6_3:: - dbw CH7, SFX_Snare6_3_Ch1 +SFX_Noise_Instrument08_3:: + audio_header SFX_Noise_Instrument08_3, Ch8 -SFX_Snare7_3:: - dbw CH7, SFX_Snare7_3_Ch1 +SFX_Noise_Instrument09_3:: + audio_header SFX_Noise_Instrument09_3, Ch8 -SFX_Snare8_3:: - dbw CH7, SFX_Snare8_3_Ch1 +SFX_Noise_Instrument10_3:: + audio_header SFX_Noise_Instrument10_3, Ch8 -SFX_Snare9_3:: - dbw CH7, SFX_Snare9_3_Ch1 +SFX_Noise_Instrument11_3:: + audio_header SFX_Noise_Instrument11_3, Ch8 -SFX_Cymbal1_3:: - dbw CH7, SFX_Cymbal1_3_Ch1 +SFX_Noise_Instrument12_3:: + audio_header SFX_Noise_Instrument12_3, Ch8 -SFX_Cymbal2_3:: - dbw CH7, SFX_Cymbal2_3_Ch1 +SFX_Noise_Instrument13_3:: + audio_header SFX_Noise_Instrument13_3, Ch8 -SFX_Cymbal3_3:: - dbw CH7, SFX_Cymbal3_3_Ch1 +SFX_Noise_Instrument14_3:: + audio_header SFX_Noise_Instrument14_3, Ch8 -SFX_Muted_Snare1_3:: - dbw CH7, SFX_Muted_Snare1_3_Ch1 +SFX_Noise_Instrument15_3:: + audio_header SFX_Noise_Instrument15_3, Ch8 -SFX_Triangle3_3:: - dbw CH7, SFX_Triangle3_3_Ch1 +SFX_Noise_Instrument16_3:: + audio_header SFX_Noise_Instrument16_3, Ch8 -SFX_Muted_Snare2_3:: - dbw CH7, SFX_Muted_Snare2_3_Ch1 +SFX_Noise_Instrument17_3:: + audio_header SFX_Noise_Instrument17_3, Ch8 -SFX_Muted_Snare3_3:: - dbw CH7, SFX_Muted_Snare3_3_Ch1 +SFX_Noise_Instrument18_3:: + audio_header SFX_Noise_Instrument18_3, Ch8 -SFX_Muted_Snare4_3:: - dbw CH7, SFX_Muted_Snare4_3_Ch1 +SFX_Noise_Instrument19_3:: + audio_header SFX_Noise_Instrument19_3, Ch8 SFX_Cry00_3:: - dbw ( $80 | CH4 ), SFX_Cry00_3_Ch1 - dbw CH5, SFX_Cry00_3_Ch2 - dbw CH7, SFX_Cry00_3_Ch3 + audio_header SFX_Cry00_3, Ch5, Ch6, Ch8 SFX_Cry01_3:: - dbw ( $80 | CH4 ), SFX_Cry01_3_Ch1 - dbw CH5, SFX_Cry01_3_Ch2 - dbw CH7, SFX_Cry01_3_Ch3 + audio_header SFX_Cry01_3, Ch5, Ch6, Ch8 SFX_Cry02_3:: - dbw ( $80 | CH4 ), SFX_Cry02_3_Ch1 - dbw CH5, SFX_Cry02_3_Ch2 - dbw CH7, SFX_Cry02_3_Ch3 + audio_header SFX_Cry02_3, Ch5, Ch6, Ch8 SFX_Cry03_3:: - dbw ( $80 | CH4 ), SFX_Cry03_3_Ch1 - dbw CH5, SFX_Cry03_3_Ch2 - dbw CH7, SFX_Cry03_3_Ch3 + audio_header SFX_Cry03_3, Ch5, Ch6, Ch8 SFX_Cry04_3:: - dbw ( $80 | CH4 ), SFX_Cry04_3_Ch1 - dbw CH5, SFX_Cry04_3_Ch2 - dbw CH7, SFX_Cry04_3_Ch3 + audio_header SFX_Cry04_3, Ch5, Ch6, Ch8 SFX_Cry05_3:: - dbw ( $80 | CH4 ), SFX_Cry05_3_Ch1 - dbw CH5, SFX_Cry05_3_Ch2 - dbw CH7, SFX_Cry05_3_Ch3 + audio_header SFX_Cry05_3, Ch5, Ch6, Ch8 SFX_Cry06_3:: - dbw ( $80 | CH4 ), SFX_Cry06_3_Ch1 - dbw CH5, SFX_Cry06_3_Ch2 - dbw CH7, SFX_Cry06_3_Ch3 + audio_header SFX_Cry06_3, Ch5, Ch6, Ch8 SFX_Cry07_3:: - dbw ( $80 | CH4 ), SFX_Cry07_3_Ch1 - dbw CH5, SFX_Cry07_3_Ch2 - dbw CH7, SFX_Cry07_3_Ch3 + audio_header SFX_Cry07_3, Ch5, Ch6, Ch8 SFX_Cry08_3:: - dbw ( $80 | CH4 ), SFX_Cry08_3_Ch1 - dbw CH5, SFX_Cry08_3_Ch2 - dbw CH7, SFX_Cry08_3_Ch3 + audio_header SFX_Cry08_3, Ch5, Ch6, Ch8 SFX_Cry09_3:: - dbw ( $80 | CH4 ), SFX_Cry09_3_Ch1 - dbw CH5, SFX_Cry09_3_Ch2 - dbw CH7, SFX_Cry09_3_Ch3 + audio_header SFX_Cry09_3, Ch5, Ch6, Ch8 SFX_Cry0A_3:: - dbw ( $80 | CH4 ), SFX_Cry0A_3_Ch1 - dbw CH5, SFX_Cry0A_3_Ch2 - dbw CH7, SFX_Cry0A_3_Ch3 + audio_header SFX_Cry0A_3, Ch5, Ch6, Ch8 SFX_Cry0B_3:: - dbw ( $80 | CH4 ), SFX_Cry0B_3_Ch1 - dbw CH5, SFX_Cry0B_3_Ch2 - dbw CH7, SFX_Cry0B_3_Ch3 + audio_header SFX_Cry0B_3, Ch5, Ch6, Ch8 SFX_Cry0C_3:: - dbw ( $80 | CH4 ), SFX_Cry0C_3_Ch1 - dbw CH5, SFX_Cry0C_3_Ch2 - dbw CH7, SFX_Cry0C_3_Ch3 + audio_header SFX_Cry0C_3, Ch5, Ch6, Ch8 SFX_Cry0D_3:: - dbw ( $80 | CH4 ), SFX_Cry0D_3_Ch1 - dbw CH5, SFX_Cry0D_3_Ch2 - dbw CH7, SFX_Cry0D_3_Ch3 + audio_header SFX_Cry0D_3, Ch5, Ch6, Ch8 SFX_Cry0E_3:: - dbw ( $80 | CH4 ), SFX_Cry0E_3_Ch1 - dbw CH5, SFX_Cry0E_3_Ch2 - dbw CH7, SFX_Cry0E_3_Ch3 + audio_header SFX_Cry0E_3, Ch5, Ch6, Ch8 SFX_Cry0F_3:: - dbw ( $80 | CH4 ), SFX_Cry0F_3_Ch1 - dbw CH5, SFX_Cry0F_3_Ch2 - dbw CH7, SFX_Cry0F_3_Ch3 + audio_header SFX_Cry0F_3, Ch5, Ch6, Ch8 SFX_Cry10_3:: - dbw ( $80 | CH4 ), SFX_Cry10_3_Ch1 - dbw CH5, SFX_Cry10_3_Ch2 - dbw CH7, SFX_Cry10_3_Ch3 + audio_header SFX_Cry10_3, Ch5, Ch6, Ch8 SFX_Cry11_3:: - dbw ( $80 | CH4 ), SFX_Cry11_3_Ch1 - dbw CH5, SFX_Cry11_3_Ch2 - dbw CH7, SFX_Cry11_3_Ch3 + audio_header SFX_Cry11_3, Ch5, Ch6, Ch8 SFX_Cry12_3:: - dbw ( $80 | CH4 ), SFX_Cry12_3_Ch1 - dbw CH5, SFX_Cry12_3_Ch2 - dbw CH7, SFX_Cry12_3_Ch3 + audio_header SFX_Cry12_3, Ch5, Ch6, Ch8 SFX_Cry13_3:: - dbw ( $80 | CH4 ), SFX_Cry13_3_Ch1 - dbw CH5, SFX_Cry13_3_Ch2 - dbw CH7, SFX_Cry13_3_Ch3 + audio_header SFX_Cry13_3, Ch5, Ch6, Ch8 SFX_Cry14_3:: - dbw ( $80 | CH4 ), SFX_Cry14_3_Ch1 - dbw CH5, SFX_Cry14_3_Ch2 - dbw CH7, SFX_Cry14_3_Ch3 + audio_header SFX_Cry14_3, Ch5, Ch6, Ch8 SFX_Cry15_3:: - dbw ( $80 | CH4 ), SFX_Cry15_3_Ch1 - dbw CH5, SFX_Cry15_3_Ch2 - dbw CH7, SFX_Cry15_3_Ch3 + audio_header SFX_Cry15_3, Ch5, Ch6, Ch8 SFX_Cry16_3:: - dbw ( $80 | CH4 ), SFX_Cry16_3_Ch1 - dbw CH5, SFX_Cry16_3_Ch2 - dbw CH7, SFX_Cry16_3_Ch3 + audio_header SFX_Cry16_3, Ch5, Ch6, Ch8 SFX_Cry17_3:: - dbw ( $80 | CH4 ), SFX_Cry17_3_Ch1 - dbw CH5, SFX_Cry17_3_Ch2 - dbw CH7, SFX_Cry17_3_Ch3 + audio_header SFX_Cry17_3, Ch5, Ch6, Ch8 SFX_Cry18_3:: - dbw ( $80 | CH4 ), SFX_Cry18_3_Ch1 - dbw CH5, SFX_Cry18_3_Ch2 - dbw CH7, SFX_Cry18_3_Ch3 + audio_header SFX_Cry18_3, Ch5, Ch6, Ch8 SFX_Cry19_3:: - dbw ( $80 | CH4 ), SFX_Cry19_3_Ch1 - dbw CH5, SFX_Cry19_3_Ch2 - dbw CH7, SFX_Cry19_3_Ch3 + audio_header SFX_Cry19_3, Ch5, Ch6, Ch8 SFX_Cry1A_3:: - dbw ( $80 | CH4 ), SFX_Cry1A_3_Ch1 - dbw CH5, SFX_Cry1A_3_Ch2 - dbw CH7, SFX_Cry1A_3_Ch3 + audio_header SFX_Cry1A_3, Ch5, Ch6, Ch8 SFX_Cry1B_3:: - dbw ( $80 | CH4 ), SFX_Cry1B_3_Ch1 - dbw CH5, SFX_Cry1B_3_Ch2 - dbw CH7, SFX_Cry1B_3_Ch3 + audio_header SFX_Cry1B_3, Ch5, Ch6, Ch8 SFX_Cry1C_3:: - dbw ( $80 | CH4 ), SFX_Cry1C_3_Ch1 - dbw CH5, SFX_Cry1C_3_Ch2 - dbw CH7, SFX_Cry1C_3_Ch3 + audio_header SFX_Cry1C_3, Ch5, Ch6, Ch8 SFX_Cry1D_3:: - dbw ( $80 | CH4 ), SFX_Cry1D_3_Ch1 - dbw CH5, SFX_Cry1D_3_Ch2 - dbw CH7, SFX_Cry1D_3_Ch3 + audio_header SFX_Cry1D_3, Ch5, Ch6, Ch8 SFX_Cry1E_3:: - dbw ( $80 | CH4 ), SFX_Cry1E_3_Ch1 - dbw CH5, SFX_Cry1E_3_Ch2 - dbw CH7, SFX_Cry1E_3_Ch3 + audio_header SFX_Cry1E_3, Ch5, Ch6, Ch8 SFX_Cry1F_3:: - dbw ( $80 | CH4 ), SFX_Cry1F_3_Ch1 - dbw CH5, SFX_Cry1F_3_Ch2 - dbw CH7, SFX_Cry1F_3_Ch3 + audio_header SFX_Cry1F_3, Ch5, Ch6, Ch8 SFX_Cry20_3:: - dbw ( $80 | CH4 ), SFX_Cry20_3_Ch1 - dbw CH5, SFX_Cry20_3_Ch2 - dbw CH7, SFX_Cry20_3_Ch3 + audio_header SFX_Cry20_3, Ch5, Ch6, Ch8 SFX_Cry21_3:: - dbw ( $80 | CH4 ), SFX_Cry21_3_Ch1 - dbw CH5, SFX_Cry21_3_Ch2 - dbw CH7, SFX_Cry21_3_Ch3 + audio_header SFX_Cry21_3, Ch5, Ch6, Ch8 SFX_Cry22_3:: - dbw ( $80 | CH4 ), SFX_Cry22_3_Ch1 - dbw CH5, SFX_Cry22_3_Ch2 - dbw CH7, SFX_Cry22_3_Ch3 + audio_header SFX_Cry22_3, Ch5, Ch6, Ch8 SFX_Cry23_3:: - dbw ( $80 | CH4 ), SFX_Cry23_3_Ch1 - dbw CH5, SFX_Cry23_3_Ch2 - dbw CH7, SFX_Cry23_3_Ch3 + audio_header SFX_Cry23_3, Ch5, Ch6, Ch8 SFX_Cry24_3:: - dbw ( $80 | CH4 ), SFX_Cry24_3_Ch1 - dbw CH5, SFX_Cry24_3_Ch2 - dbw CH7, SFX_Cry24_3_Ch3 + audio_header SFX_Cry24_3, Ch5, Ch6, Ch8 SFX_Cry25_3:: - dbw ( $80 | CH4 ), SFX_Cry25_3_Ch1 - dbw CH5, SFX_Cry25_3_Ch2 - dbw CH7, SFX_Cry25_3_Ch3 + audio_header SFX_Cry25_3, Ch5, Ch6, Ch8 SFX_Get_Item1_3:: - dbw ( $80 | CH4 ), SFX_Get_Item1_3_Ch1 - dbw CH5, SFX_Get_Item1_3_Ch2 - dbw CH6, SFX_Get_Item1_3_Ch3 + audio_header SFX_Get_Item1_3, Ch5, Ch6, Ch7 SFX_Get_Item2_3:: - dbw ( $80 | CH4 ), SFX_Get_Item2_3_Ch1 - dbw CH5, SFX_Get_Item2_3_Ch2 - dbw CH6, SFX_Get_Item2_3_Ch3 + audio_header SFX_Get_Item2_3, Ch5, Ch6, Ch7 SFX_Tink_3:: - dbw CH4, SFX_Tink_3_Ch1 + audio_header SFX_Tink_3, Ch5 SFX_Heal_HP_3:: - dbw CH4, SFX_Heal_HP_3_Ch1 + audio_header SFX_Heal_HP_3, Ch5 SFX_Heal_Ailment_3:: - dbw CH4, SFX_Heal_Ailment_3_Ch1 + audio_header SFX_Heal_Ailment_3, Ch5 SFX_Start_Menu_3:: - dbw CH7, SFX_Start_Menu_3_Ch1 + audio_header SFX_Start_Menu_3, Ch8 SFX_Press_AB_3:: - dbw CH4, SFX_Press_AB_3_Ch1 + audio_header SFX_Press_AB_3, Ch5 SFX_Pokedex_Rating_3:: - dbw ( $80 | CH4 ), SFX_Pokedex_Rating_3_Ch1 - dbw CH5, SFX_Pokedex_Rating_3_Ch2 - dbw CH6, SFX_Pokedex_Rating_3_Ch3 + audio_header SFX_Pokedex_Rating_3, Ch5, Ch6, Ch7 SFX_Get_Key_Item_3:: - dbw ( $80 | CH4 ), SFX_Get_Key_Item_3_Ch1 - dbw CH5, SFX_Get_Key_Item_3_Ch2 - dbw CH6, SFX_Get_Key_Item_3_Ch3 + audio_header SFX_Get_Key_Item_3, Ch5, Ch6, Ch7 SFX_Poisoned_3:: - dbw CH4, SFX_Poisoned_3_Ch1 + audio_header SFX_Poisoned_3, Ch5 SFX_Trade_Machine_3:: - dbw CH4, SFX_Trade_Machine_3_Ch1 + audio_header SFX_Trade_Machine_3, Ch5 SFX_Turn_On_PC_3:: - dbw CH4, SFX_Turn_On_PC_3_Ch1 + audio_header SFX_Turn_On_PC_3, Ch5 SFX_Turn_Off_PC_3:: - dbw CH4, SFX_Turn_Off_PC_3_Ch1 + audio_header SFX_Turn_Off_PC_3, Ch5 SFX_Enter_PC_3:: - dbw CH4, SFX_Enter_PC_3_Ch1 + audio_header SFX_Enter_PC_3, Ch5 SFX_Shrink_3:: - dbw CH4, SFX_Shrink_3_Ch1 + audio_header SFX_Shrink_3, Ch5 SFX_Switch_3:: - dbw CH4, SFX_Switch_3_Ch1 + audio_header SFX_Switch_3, Ch5 SFX_Healing_Machine_3:: - dbw CH4, SFX_Healing_Machine_3_Ch1 + audio_header SFX_Healing_Machine_3, Ch5 SFX_Teleport_Exit1_3:: - dbw CH4, SFX_Teleport_Exit1_3_Ch1 + audio_header SFX_Teleport_Exit1_3, Ch5 SFX_Teleport_Enter1_3:: - dbw CH4, SFX_Teleport_Enter1_3_Ch1 + audio_header SFX_Teleport_Enter1_3, Ch5 SFX_Teleport_Exit2_3:: - dbw CH4, SFX_Teleport_Exit2_3_Ch1 + audio_header SFX_Teleport_Exit2_3, Ch5 SFX_Ledge_3:: - dbw CH4, SFX_Ledge_3_Ch1 + audio_header SFX_Ledge_3, Ch5 SFX_Teleport_Enter2_3:: - dbw CH7, SFX_Teleport_Enter2_3_Ch1 + audio_header SFX_Teleport_Enter2_3, Ch8 SFX_Fly_3:: - dbw CH7, SFX_Fly_3_Ch1 + audio_header SFX_Fly_3, Ch8 SFX_Denied_3:: - dbw ( $40 | CH4 ), SFX_Denied_3_Ch1 - dbw CH5, SFX_Denied_3_Ch2 + audio_header SFX_Denied_3, Ch5, Ch6 SFX_Arrow_Tiles_3:: - dbw CH4, SFX_Arrow_Tiles_3_Ch1 + audio_header SFX_Arrow_Tiles_3, Ch5 SFX_Push_Boulder_3:: - dbw CH7, SFX_Push_Boulder_3_Ch1 + audio_header SFX_Push_Boulder_3, Ch8 SFX_SS_Anne_Horn_3:: - dbw ( $40 | CH4 ), SFX_SS_Anne_Horn_3_Ch1 - dbw CH5, SFX_SS_Anne_Horn_3_Ch2 + audio_header SFX_SS_Anne_Horn_3, Ch5, Ch6 SFX_Withdraw_Deposit_3:: - dbw CH4, SFX_Withdraw_Deposit_3_Ch1 + audio_header SFX_Withdraw_Deposit_3, Ch5 SFX_Cut_3:: - dbw CH7, SFX_Cut_3_Ch1 + audio_header SFX_Cut_3, Ch8 SFX_Go_Inside_3:: - dbw CH7, SFX_Go_Inside_3_Ch1 + audio_header SFX_Go_Inside_3, Ch8 SFX_Swap_3:: - dbw ( $40 | CH4 ), SFX_Swap_3_Ch1 - dbw CH5, SFX_Swap_3_Ch2 + audio_header SFX_Swap_3, Ch5, Ch6 SFX_59_3:: - dbw ( $40 | CH4 ), SFX_59_3_Ch1 - dbw CH5, SFX_59_3_Ch2 + audio_header SFX_59_3, Ch5, Ch6 SFX_Purchase_3:: - dbw ( $40 | CH4 ), SFX_Purchase_3_Ch1 - dbw CH5, SFX_Purchase_3_Ch2 + audio_header SFX_Purchase_3, Ch5, Ch6 SFX_Collision_3:: - dbw CH4, SFX_Collision_3_Ch1 + audio_header SFX_Collision_3, Ch5 SFX_Go_Outside_3:: - dbw CH7, SFX_Go_Outside_3_Ch1 + audio_header SFX_Go_Outside_3, Ch8 SFX_Save_3:: - dbw ( $40 | CH4 ), SFX_Save_3_Ch1 - dbw CH5, SFX_Save_3_Ch2 + audio_header SFX_Save_3, Ch5, Ch6 SFX_Intro_Lunge:: - dbw CH7, SFX_Intro_Lunge_Ch1 + audio_header SFX_Intro_Lunge, Ch8 SFX_Intro_Hip:: - dbw CH4, SFX_Intro_Hip_Ch1 + audio_header SFX_Intro_Hip, Ch5 SFX_Intro_Hop:: - dbw CH4, SFX_Intro_Hop_Ch1 + audio_header SFX_Intro_Hop, Ch5 SFX_Intro_Raise:: - dbw CH7, SFX_Intro_Raise_Ch1 + audio_header SFX_Intro_Raise, Ch8 SFX_Intro_Crash:: - dbw CH7, SFX_Intro_Crash_Ch1 + audio_header SFX_Intro_Crash, Ch8 SFX_Intro_Whoosh:: - dbw CH7, SFX_Intro_Whoosh_Ch1 + audio_header SFX_Intro_Whoosh, Ch8 SFX_Slots_Stop_Wheel:: - dbw CH4, SFX_Slots_Stop_Wheel_Ch1 + audio_header SFX_Slots_Stop_Wheel, Ch5 SFX_Slots_Reward:: - dbw CH4, SFX_Slots_Reward_Ch1 + audio_header SFX_Slots_Reward, Ch5 SFX_Slots_New_Spin:: - dbw ( $40 | CH4 ), SFX_Slots_New_Spin_Ch1 - dbw CH5, SFX_Slots_New_Spin_Ch2 + audio_header SFX_Slots_New_Spin, Ch5, Ch6 SFX_Shooting_Star:: - dbw CH4, SFX_Shooting_Star_Ch1 + audio_header SFX_Shooting_Star, Ch5 diff --git a/audio/headers/sfxheaders4.asm b/audio/headers/sfxheaders4.asm index 1fdb69ab..c7f7e9d6 100644 --- a/audio/headers/sfxheaders4.asm +++ b/audio/headers/sfxheaders4.asm @@ -1,294 +1,212 @@ SFX_Headers_4:: dbw -1, -1 ; padding -SFX_Snare1_4:: - dbw CH7, SFX_Snare1_4_Ch7 +SFX_Noise_Instrument01_4:: + audio_header SFX_Noise_Instrument01_4, Ch8 -SFX_Snare2_4:: - dbw CH7, SFX_Snare2_4_Ch7 +SFX_Noise_Instrument02_4:: + audio_header SFX_Noise_Instrument02_4, Ch8 -SFX_Snare3_4:: - dbw CH7, SFX_Snare3_4_Ch7 +SFX_Noise_Instrument03_4:: + audio_header SFX_Noise_Instrument03_4, Ch8 -SFX_Snare4_4:: - dbw CH7, SFX_Snare4_4_Ch7 +SFX_Noise_Instrument04_4:: + audio_header SFX_Noise_Instrument04_4, Ch8 -SFX_Snare5_4:: - dbw CH7, SFX_Snare5_4_Ch7 +SFX_Noise_Instrument05_4:: + audio_header SFX_Noise_Instrument05_4, Ch8 -SFX_Triangle1_4:: - dbw CH7, SFX_Triangle1_4_Ch7 +SFX_Noise_Instrument06_4:: + audio_header SFX_Noise_Instrument06_4, Ch8 -SFX_Triangle2_4:: - dbw CH7, SFX_Triangle2_4_Ch7 +SFX_Noise_Instrument07_4:: + audio_header SFX_Noise_Instrument07_4, Ch8 -SFX_Snare6_4:: - dbw CH7, SFX_Snare6_4_Ch7 +SFX_Noise_Instrument08_4:: + audio_header SFX_Noise_Instrument08_4, Ch8 -SFX_Snare7_4:: - dbw CH7, SFX_Snare7_4_Ch7 +SFX_Noise_Instrument09_4:: + audio_header SFX_Noise_Instrument09_4, Ch8 -SFX_Snare8_4:: - dbw CH7, SFX_Snare8_4_Ch7 +SFX_Noise_Instrument10_4:: + audio_header SFX_Noise_Instrument10_4, Ch8 -SFX_Snare9_4:: - dbw CH7, SFX_Snare9_4_Ch7 +SFX_Noise_Instrument11_4:: + audio_header SFX_Noise_Instrument11_4, Ch8 -SFX_Cymbal1_4:: - dbw CH7, SFX_Cymbal1_4_Ch7 +SFX_Noise_Instrument12_4:: + audio_header SFX_Noise_Instrument12_4, Ch8 -SFX_Cymbal2_4:: - dbw CH7, SFX_Cymbal2_4_Ch7 +SFX_Noise_Instrument13_4:: + audio_header SFX_Noise_Instrument13_4, Ch8 -SFX_Cymbal3_4:: - dbw CH7, SFX_Cymbal3_4_Ch7 +SFX_Noise_Instrument14_4:: + audio_header SFX_Noise_Instrument14_4, Ch8 -SFX_Muted_Snare1_4:: - dbw CH7, SFX_Muted_Snare1_4_Ch7 +SFX_Noise_Instrument15_4:: + audio_header SFX_Noise_Instrument15_4, Ch8 -SFX_Triangle3_4:: - dbw CH7, SFX_Triangle3_4_Ch7 +SFX_Noise_Instrument16_4:: + audio_header SFX_Noise_Instrument16_4, Ch8 -SFX_Muted_Snare2_4:: - dbw CH7, SFX_Muted_Snare2_4_Ch7 +SFX_Noise_Instrument17_4:: + audio_header SFX_Noise_Instrument17_4, Ch8 -SFX_Muted_Snare3_4:: - dbw CH7, SFX_Muted_Snare3_4_Ch7 +SFX_Noise_Instrument18_4:: + audio_header SFX_Noise_Instrument18_4, Ch8 -SFX_Muted_Snare4_4:: - dbw CH7, SFX_Muted_Snare4_4_Ch7 +SFX_Noise_Instrument19_4:: + audio_header SFX_Noise_Instrument19_4, Ch8 -SFX_8003c_4:: - dbw ( $80 | CH4 ), SFX_805db_4_Ch4 - dbw CH5, SFX_805ea_4_Ch5 - dbw CH7, SFX_805f9_4_Ch7 +SFX_Unknown_805db:: + audio_header SFX_Unknown_805db, Ch5, Ch6, Ch8 -SFX_80045_4:: - dbw ( $80 | CH4 ), SFX_807eb_4_Ch4 - dbw CH5, SFX_807fe_4_Ch5 - dbw CH7, SFX_80811_4_Ch7 +SFX_Unknown_807eb:: + audio_header SFX_Unknown_807eb, Ch5, Ch6, Ch8 -SFX_8004e_4:: - dbw ( $80 | CH4 ), SFX_80760_4_Ch4 - dbw CH5, SFX_8076f_4_Ch5 - dbw CH7, SFX_8077d_4_Ch7 - -SFX_80057_4:: - dbw ( $80 | CH4 ), SFX_804fa_4_Ch4 - dbw CH5, SFX_80519_4_Ch5 - dbw CH7, SFX_80538_4_Ch7 - -SFX_80060_4:: - dbw ( $80 | CH4 ), SFX_808a9_4_Ch4 - dbw CH5, SFX_808c8_4_Ch5 - dbw CH7, SFX_808e7_4_Ch7 - -SFX_80069_4:: - dbw ( $80 | CH4 ), SFX_80689_4_Ch4 - dbw CH5, SFX_8069c_4_Ch5 - dbw CH7, SFX_806ae_4_Ch7 - -SFX_80072_4:: - dbw ( $80 | CH4 ), SFX_80633_4_Ch4 - dbw CH5, SFX_8064d_4_Ch5 - dbw CH7, SFX_8064e_4_Ch7 - -SFX_8007b_4:: - dbw ( $80 | CH4 ), SFX_80661_4_Ch4 - dbw CH5, SFX_80670_4_Ch5 - dbw CH7, SFX_8067f_4_Ch7 - -SFX_80084_4:: - dbw ( $80 | CH4 ), SFX_80879_4_Ch4 - dbw CH5, SFX_8088c_4_Ch5 - dbw CH7, SFX_8089f_4_Ch7 - -SFX_8008d_4:: - dbw ( $80 | CH4 ), SFX_80383_4_Ch4 - dbw CH5, SFX_803a0_4_Ch5 - dbw CH7, SFX_803c1_4_Ch7 - -SFX_80096_4:: - dbw ( $80 | CH4 ), SFX_8081e_4_Ch4 - dbw CH5, SFX_8083d_4_Ch5 - dbw CH7, SFX_80860_4_Ch7 - -SFX_8009f_4:: - dbw ( $80 | CH4 ), SFX_806af_4_Ch4 - dbw CH5, SFX_806da_4_Ch5 - dbw CH7, SFX_806f9_4_Ch7 - -SFX_800a8_4:: - dbw ( $80 | CH4 ), SFX_80712_4_Ch4 - dbw CH5, SFX_80739_4_Ch5 - dbw CH7, SFX_8075f_4_Ch7 - -SFX_800b1_4:: - dbw ( $80 | CH4 ), SFX_8077e_4_Ch4 - dbw CH5, SFX_8079d_4_Ch5 - dbw CH7, SFX_807cc_4_Ch7 - -SFX_800ba_4:: - dbw ( $80 | CH4 ), SFX_80603_4_Ch4 - dbw CH5, SFX_80616_4_Ch5 - dbw CH7, SFX_80629_4_Ch7 - -SFX_800c3_4:: - dbw ( $80 | CH4 ), SFX_80545_4_Ch4 - dbw CH5, SFX_80560_4_Ch5 - dbw CH7, SFX_8057b_4_Ch7 - -SFX_800cc_4:: - dbw ( $80 | CH4 ), SFX_8058b_4_Ch4 - dbw CH5, SFX_805ae_4_Ch5 - dbw CH7, SFX_805d1_4_Ch7 - -SFX_800d5_4:: - dbw ( $80 | CH4 ), SFX_80467_4_Ch4 - dbw CH5, SFX_80486_4_Ch5 - dbw CH7, SFX_804a9_4_Ch7 - -SFX_800de_4:: - dbw ( $80 | CH4 ), SFX_8097f_4_Ch4 - dbw CH5, SFX_80992_4_Ch5 - dbw CH7, SFX_809a5_4_Ch7 - -SFX_800e7_4:: - dbw ( $80 | CH4 ), SFX_809b2_4_Ch4 - dbw CH5, SFX_809cd_4_Ch5 - dbw CH7, SFX_809e8_4_Ch7 - -SFX_800f0_4:: - dbw ( $80 | CH4 ), SFX_809fb_4_Ch4 - dbw CH5, SFX_80a0a_4_Ch5 - dbw CH7, SFX_80a19_4_Ch7 - -SFX_800f9_4:: - dbw ( $80 | CH4 ), SFX_80a89_4_Ch4 - dbw CH5, SFX_80aa4_4_Ch5 - dbw CH7, SFX_80abf_4_Ch7 - -SFX_80102_4:: - dbw ( $80 | CH4 ), SFX_8091c_4_Ch4 - dbw CH5, SFX_8092b_4_Ch5 - dbw CH7, SFX_8093a_4_Ch7 - -SFX_8010b_4:: - dbw ( $80 | CH4 ), SFX_80ad2_4_Ch4 - dbw CH5, SFX_80ae5_4_Ch5 - dbw CH7, SFX_80af8_4_Ch7 - -SFX_80114_4:: - dbw ( $80 | CH4 ), SFX_80be2_4_Ch4 - dbw CH5, SFX_80c05_4_Ch5 - dbw CH7, SFX_80c28_4_Ch7 - -SFX_8011d_4:: - dbw ( $80 | CH4 ), SFX_808fa_4_Ch4 - dbw CH5, SFX_80909_4_Ch5 - dbw CH7, SFX_8091b_4_Ch7 - -SFX_80126_4:: - dbw ( $80 | CH4 ), SFX_80b53_4_Ch4 - dbw CH5, SFX_80b6e_4_Ch5 - dbw CH7, SFX_80b89_4_Ch7 - -SFX_8012f_4:: - dbw ( $80 | CH4 ), SFX_80944_4_Ch4 - dbw CH5, SFX_8095b_4_Ch5 - dbw CH7, SFX_80972_4_Ch7 - -SFX_80138_4:: - dbw ( $80 | CH4 ), SFX_80b05_4_Ch4 - dbw CH5, SFX_80b28_4_Ch5 - dbw CH7, SFX_80b43_4_Ch7 - -SFX_80141_4:: - dbw ( $80 | CH4 ), SFX_80b9c_4_Ch4 - dbw CH5, SFX_80bb7_4_Ch5 - dbw CH7, SFX_80bd2_4_Ch7 - -SFX_8014a_4:: - dbw ( $80 | CH4 ), SFX_80a23_4_Ch4 - dbw CH5, SFX_80a46_4_Ch5 - dbw CH7, SFX_80a6d_4_Ch7 - -SFX_80153_4:: - dbw ( $80 | CH4 ), SFX_80c3b_4_Ch4 - dbw CH5, SFX_80c4e_4_Ch5 - dbw CH7, SFX_80c61_4_Ch7 - -SFX_8015c_4:: - dbw ( $80 | CH4 ), SFX_80c6e_4_Ch4 - dbw CH5, SFX_80c81_4_Ch5 - dbw CH7, SFX_80c94_4_Ch7 - -SFX_80165_4:: - dbw ( $80 | CH4 ), SFX_80ca1_4_Ch4 - dbw CH5, SFX_80cc4_4_Ch5 - dbw CH7, SFX_80ce6_4_Ch7 - -SFX_8016e_4:: - dbw ( $80 | CH4 ), SFX_80ce7_4_Ch4 - dbw CH5, SFX_80cfa_4_Ch5 - dbw CH7, SFX_80d0d_4_Ch7 - -SFX_80177_4:: - dbw ( $80 | CH4 ), SFX_803da_4_Ch4 - dbw CH5, SFX_803f1_4_Ch5 - dbw CH7, SFX_80404_4_Ch7 - -SFX_80180_4:: - dbw ( $80 | CH4 ), SFX_80411_4_Ch4 - dbw CH5, SFX_80434_4_Ch5 - dbw CH7, SFX_80457_4_Ch7 - -SFX_80189_4:: - dbw ( $80 | CH4 ), SFX_804bf_4_Ch4 - dbw CH5, SFX_804d6_4_Ch5 - dbw CH7, SFX_804ed_4_Ch7 +SFX_Unknown_80760:: + audio_header SFX_Unknown_80760, Ch5, Ch6, Ch8 + +SFX_Unknown_804fa:: + audio_header SFX_Unknown_804fa, Ch5, Ch6, Ch8 + +SFX_Unknown_808a9:: + audio_header SFX_Unknown_808a9, Ch5, Ch6, Ch8 + +SFX_Unknown_80689:: + audio_header SFX_Unknown_80689, Ch5, Ch6, Ch8 + +SFX_Unknown_80633:: + audio_header SFX_Unknown_80633, Ch5, Ch6, Ch8 + +SFX_Unknown_80661:: + audio_header SFX_Unknown_80661, Ch5, Ch6, Ch8 + +SFX_Unknown_80879:: + audio_header SFX_Unknown_80879, Ch5, Ch6, Ch8 + +SFX_Unknown_80383:: + audio_header SFX_Unknown_80383, Ch5, Ch6, Ch8 + +SFX_Unknown_8081e:: + audio_header SFX_Unknown_8081e, Ch5, Ch6, Ch8 + +SFX_Unknown_806af:: + audio_header SFX_Unknown_806af, Ch5, Ch6, Ch8 + +SFX_Unknown_80712:: + audio_header SFX_Unknown_80712, Ch5, Ch6, Ch8 + +SFX_Unknown_8077e:: + audio_header SFX_Unknown_8077e, Ch5, Ch6, Ch8 + +SFX_Unknown_80603:: + audio_header SFX_Unknown_80603, Ch5, Ch6, Ch8 + +SFX_Unknown_80545:: + audio_header SFX_Unknown_80545, Ch5, Ch6, Ch8 + +SFX_Unknown_8058b:: + audio_header SFX_Unknown_8058b, Ch5, Ch6, Ch8 + +SFX_Unknown_80467:: + audio_header SFX_Unknown_80467, Ch5, Ch6, Ch8 + +SFX_Unknown_8097f:: + audio_header SFX_Unknown_8097f, Ch5, Ch6, Ch8 + +SFX_Unknown_809b2:: + audio_header SFX_Unknown_809b2, Ch5, Ch6, Ch8 + +SFX_Unknown_809fb:: + audio_header SFX_Unknown_809fb, Ch5, Ch6, Ch8 + +SFX_Unknown_80a89:: + audio_header SFX_Unknown_80a89, Ch5, Ch6, Ch8 + +SFX_Unknown_8091c:: + audio_header SFX_Unknown_8091c, Ch5, Ch6, Ch8 + +SFX_Unknown_80ad2:: + audio_header SFX_Unknown_80ad2, Ch5, Ch6, Ch8 + +SFX_Unknown_80be2:: + audio_header SFX_Unknown_80be2, Ch5, Ch6, Ch8 + +SFX_Unknown_808fa:: + audio_header SFX_Unknown_808fa, Ch5, Ch6, Ch8 + +SFX_Unknown_80b53:: + audio_header SFX_Unknown_80b53, Ch5, Ch6, Ch8 + +SFX_Unknown_80944:: + audio_header SFX_Unknown_80944, Ch5, Ch6, Ch8 + +SFX_Unknown_80b05:: + audio_header SFX_Unknown_80b05, Ch5, Ch6, Ch8 + +SFX_Unknown_80b9c:: + audio_header SFX_Unknown_80b9c, Ch5, Ch6, Ch8 + +SFX_Unknown_80a23:: + audio_header SFX_Unknown_80a23, Ch5, Ch6, Ch8 + +SFX_Unknown_80c3b:: + audio_header SFX_Unknown_80c3b, Ch5, Ch6, Ch8 + +SFX_Unknown_80c6e:: + audio_header SFX_Unknown_80c6e, Ch5, Ch6, Ch8 + +SFX_Unknown_80ca1:: + audio_header SFX_Unknown_80ca1, Ch5, Ch6, Ch8 + +SFX_Unknown_80ce7:: + audio_header SFX_Unknown_80ce7, Ch5, Ch6, Ch8 + +SFX_Unknown_803da:: + audio_header SFX_Unknown_803da, Ch5, Ch6, Ch8 + +SFX_Unknown_80411:: + audio_header SFX_Unknown_80411, Ch5, Ch6, Ch8 + +SFX_Unknown_804bf:: + audio_header SFX_Unknown_804bf, Ch5, Ch6, Ch8 SFX_Get_Item1_4:: - dbw ( $80 | CH4 ), SFX_80e5a_4_Ch4 - dbw CH5, SFX_80e71_4_Ch5 - dbw CH6, SFX_80e81_4_Ch6 + audio_header SFX_Get_Item1_4, Ch5, Ch6, Ch7 SFX_Get_Item2_4:: - dbw ( $80 | CH4 ), SFX_80ec8_4_Ch4 - dbw CH5, SFX_80ee7_4_Ch5 - dbw CH6, SFX_80eff_4_Ch6 + audio_header SFX_Get_Item2_4, Ch5, Ch6, Ch7 SFX_Tink_4:: - dbw CH4, SFX_8028e_4_Ch4 + audio_header SFX_Tink_4, Ch5 -SFX_Heal_Ailment_4:: - dbw CH4, SFX_8027f_4_Ch4 +SFX_Unknown_8027f:: + audio_header SFX_Unknown_8027f, Ch5 -SFX_Start_Menu_4:: - dbw CH4, SFX_8026a_4_Ch4 +SFX_Unknown_8026a:: + audio_header SFX_Unknown_8026a, Ch5 -SFX_PressAB_4:: - dbw CH7, SFX_80263_4_Ch7 +SFX_Unknown_80263:: + audio_header SFX_Unknown_80263, Ch8 SFX_Surfing_Add_Points:: - dbw CH4, SFX_Surfing_Add_Points_Ch4 + audio_header SFX_Surfing_Add_Points, Ch5 SFX_Surfing_Jump:: - dbw CH7, SFX_Surfing_Jump_Ch7 + audio_header SFX_Surfing_Jump, Ch8 SFX_Surfing_Flip:: - dbw CH4, SFX_Surfing_Flip_Ch4 + audio_header SFX_Surfing_Flip, Ch5 SFX_Surfing_Land:: - dbw CH7, SFX_Surfing_Land_Ch7 + audio_header SFX_Surfing_Land, Ch8 -SFX_801bc_4:: - dbw CH4, SFX_802cc_4_Ch4 +SFX_Unknown_802cc:: + audio_header SFX_Unknown_802cc, Ch5 SFX_Surfing_Crash:: - dbw CH7, SFX_Surfing_Crash_Ch7 + audio_header SFX_Surfing_Crash, Ch8 SFX_Get_Item2_4_2:: - dbw ( $80 | CH4 ), SFX_Get_Item2_4_2_Ch1 - dbw CH5, SFX_Get_Item2_4_2_Ch2 - dbw CH6, SFX_Get_Item2_4_2_Ch3 + audio_header SFX_Get_Item2_4_2, Ch5, Ch6, Ch7 |