diff options
Diffstat (limited to 'audio')
84 files changed, 3040 insertions, 2042 deletions
diff --git a/audio/engine_4.asm b/audio/engine_4.asm index c4c1c9dd..fdeead3e 100644 --- a/audio/engine_4.asm +++ b/audio/engine_4.asm @@ -10,6 +10,7 @@ Audio4_PlaySound:: ; 82bd4 (20:6bd4) cp $a3 jr z, .asm_7d127 jp nc, Audio4_7d12d + .asm_7d127 call InitMusicVariables jp Audio4_7d192 @@ -61,6 +62,7 @@ Audio4_7d12d: ; 7d12d (1f:512d) cp $14 jr nc, .asm_7d172 ret + .asm_7d172 ld a, [hl] cp $14 @@ -72,6 +74,7 @@ Audio4_7d12d: ; 7d12d (1f:512d) jr z, .asm_7d182 jr c, .asm_7d182 ret + .asm_7d182 call InitSFXVariables ld a, c @@ -158,6 +161,7 @@ Audio4_7d192: ; 7d192 (1f:5192) cp $14 jr nc, .asm_7d1f5 jr .asm_7d21f + .asm_7d1f5 ld a, [wSoundID] cp $86 diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm index a6449436..b3e640af 100644 --- a/audio/headers/musicheaders1.asm +++ b/audio/headers/musicheaders1.asm @@ -1,184 +1,115 @@ Music_PalletTown:: ; 822e (2:422e) - db ( $80 | CH0 ) - dw Music_PalletTown_Ch1 - db CH1 - dw Music_PalletTown_Ch2 - db CH2 - dw Music_PalletTown_Ch3 + dbw ( $80 | CH0 ), Music_PalletTown_Ch1 + dbw CH1, Music_PalletTown_Ch2 + dbw CH2, Music_PalletTown_Ch3 Music_Pokecenter:: ; 8237 (2:4237) - db ( $80 | CH0 ) - dw Music_Pokecenter_Ch1 - db CH1 - dw Music_Pokecenter_Ch2 - db CH2 - dw Music_Pokecenter_Ch3 + dbw ( $80 | CH0 ), Music_Pokecenter_Ch1 + dbw CH1, Music_Pokecenter_Ch2 + dbw CH2, Music_Pokecenter_Ch3 Music_Gym:: ; 8240 (2:4240) - db ( $80 | CH0 ) - dw Music_Gym_Ch1 - db CH1 - dw Music_Gym_Ch2 - db CH2 - dw Music_Gym_Ch3 + dbw ( $80 | CH0 ), Music_Gym_Ch1 + dbw CH1, Music_Gym_Ch2 + dbw CH2, Music_Gym_Ch3 ; Viridian City, Pewter City, Saffron City Music_Cities1:: ; 8249 (2:4249) - db ( $C0 | CH0 ) - dw Music_Cities1_Ch1 - db CH1 - dw Music_Cities1_Ch2 - db CH2 - dw Music_Cities1_Ch3 - db CH3 - dw Music_Cities1_Ch4 + dbw ( $C0 | CH0 ), Music_Cities1_Ch1 + dbw CH1, Music_Cities1_Ch2 + dbw CH2, Music_Cities1_Ch3 + dbw CH3, Music_Cities1_Ch4 ; Cerulean City, Fuchsia City Music_Cities2:: ; 8255 (2:4255) - db ( $80 | CH0 ) - dw Music_Cities2_Ch1 - db CH1 - dw Music_Cities2_Ch2 - db CH2 - dw Music_Cities2_Ch3 + dbw ( $80 | CH0 ), Music_Cities2_Ch1 + dbw CH1, Music_Cities2_Ch2 + dbw CH2, Music_Cities2_Ch3 Music_Celadon:: ; 825e (2:425e) - db ( $80 | CH0 ) - dw Music_Celadon_Ch1 - db CH1 - dw Music_Celadon_Ch2 - db CH2 - dw Music_Celadon_Ch3 + dbw ( $80 | CH0 ), Music_Celadon_Ch1 + dbw CH1, Music_Celadon_Ch2 + dbw CH2, Music_Celadon_Ch3 Music_Cinnabar:: ; 8267 (2:4267) - db ( $80 | CH0 ) - dw Music_Cinnabar_Ch1 - db CH1 - dw Music_Cinnabar_Ch2 - db CH2 - dw Music_Cinnabar_Ch3 + dbw ( $80 | CH0 ), Music_Cinnabar_Ch1 + dbw CH1, Music_Cinnabar_Ch2 + dbw CH2, Music_Cinnabar_Ch3 Music_Vermilion:: ; 8270 (2:4270) - db ( $C0 | CH0 ) - dw Music_Vermilion_Ch1 - db CH1 - dw Music_Vermilion_Ch2 - db CH2 - dw Music_Vermilion_Ch3 - db CH3 - dw Music_Vermilion_Ch4 + dbw ( $C0 | CH0 ), Music_Vermilion_Ch1 + dbw CH1, Music_Vermilion_Ch2 + dbw CH2, Music_Vermilion_Ch3 + dbw CH3, Music_Vermilion_Ch4 Music_Lavender:: ; 827c (2:427c) - db ( $C0 | CH0 ) - dw Music_Lavender_Ch1 - db CH1 - dw Music_Lavender_Ch2 - db CH2 - dw Music_Lavender_Ch3 - db CH3 - dw Music_Lavender_Ch4 + dbw ( $C0 | CH0 ), Music_Lavender_Ch1 + dbw CH1, Music_Lavender_Ch2 + dbw CH2, Music_Lavender_Ch3 + dbw CH3, Music_Lavender_Ch4 Music_SSAnne:: ; 8288 (2:4288) - db ( $80 | CH0 ) - dw Music_SSAnne_Ch1 - db CH1 - dw Music_SSAnne_Ch2 - db CH2 - dw Music_SSAnne_Ch3 + dbw ( $80 | CH0 ), Music_SSAnne_Ch1 + dbw CH1, Music_SSAnne_Ch2 + dbw CH2, Music_SSAnne_Ch3 Music_MeetProfOak:: ; 8291 (2:4291) - db ( $80 | CH0 ) - dw Music_MeetProfOak_Ch1 - db CH1 - dw Music_MeetProfOak_Ch2 - db CH2 - dw Music_MeetProfOak_Ch3 + dbw ( $80 | CH0 ), Music_MeetProfOak_Ch1 + dbw CH1, Music_MeetProfOak_Ch2 + dbw CH2, Music_MeetProfOak_Ch3 Music_MeetRival:: ; 829a (2:429a) - db ( $80 | CH0 ) - dw Music_MeetRival_Ch1 - db CH1 - dw Music_MeetRival_Ch2 - db CH2 - dw Music_MeetRival_Ch3 + dbw ( $80 | CH0 ), Music_MeetRival_Ch1 + dbw CH1, Music_MeetRival_Ch2 + dbw CH2, Music_MeetRival_Ch3 Music_MuseumGuy:: ; 82a3 (2:42a3) - db ( $C0 | CH0 ) - dw Music_MuseumGuy_Ch1 - db CH1 - dw Music_MuseumGuy_Ch2 - db CH2 - dw Music_MuseumGuy_Ch3 - db CH3 - dw Music_MuseumGuy_Ch4 + dbw ( $C0 | CH0 ), Music_MuseumGuy_Ch1 + dbw CH1, Music_MuseumGuy_Ch2 + dbw CH2, Music_MuseumGuy_Ch3 + dbw CH3, Music_MuseumGuy_Ch4 Music_SafariZone:: ; 82af (2:42af) - db ( $80 | CH0 ) - dw Music_SafariZone_Ch1 - db CH1 - dw Music_SafariZone_Ch2 - db CH2 - dw Music_SafariZone_Ch3 + dbw ( $80 | CH0 ), Music_SafariZone_Ch1 + dbw CH1, Music_SafariZone_Ch2 + dbw CH2, Music_SafariZone_Ch3 Music_PkmnHealed:: ; 82b8 (2:42b8) - db ( $80 | CH0 ) - dw Music_PkmnHealed_Ch1 - db CH1 - dw Music_PkmnHealed_Ch2 - db CH2 - dw Music_PkmnHealed_Ch3 + dbw ( $80 | CH0 ), Music_PkmnHealed_Ch1 + dbw CH1, Music_PkmnHealed_Ch2 + dbw CH2, Music_PkmnHealed_Ch3 ; Routes 1 and 2 Music_Routes1:: ; 82c1 (2:42c1) - db ( $C0 | CH0 ) - dw Music_Routes1_Ch1 - db CH1 - dw Music_Routes1_Ch2 - db CH2 - dw Music_Routes1_Ch3 - db CH3 - dw Music_Routes1_Ch4 + dbw ( $C0 | CH0 ), Music_Routes1_Ch1 + dbw CH1, Music_Routes1_Ch2 + dbw CH2, Music_Routes1_Ch3 + dbw CH3, Music_Routes1_Ch4 ; Routes 24 and 25 Music_Routes2:: ; 82cd (2:42cd) - db ( $C0 | CH0 ) - dw Music_Routes2_Ch1 - db CH1 - dw Music_Routes2_Ch2 - db CH2 - dw Music_Routes2_Ch3 - db CH3 - dw Music_Routes2_Ch4 + dbw ( $C0 | CH0 ), Music_Routes2_Ch1 + dbw CH1, Music_Routes2_Ch2 + dbw CH2, Music_Routes2_Ch3 + dbw CH3, Music_Routes2_Ch4 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 Music_Routes3:: ; 82d9 (2:42d9) - db ( $C0 | CH0 ) - dw Music_Routes3_Ch1 - db CH1 - dw Music_Routes3_Ch2 - db CH2 - dw Music_Routes3_Ch3 - db CH3 - dw Music_Routes3_Ch4 + dbw ( $C0 | CH0 ), Music_Routes3_Ch1 + dbw CH1, Music_Routes3_Ch2 + dbw CH2, Music_Routes3_Ch3 + dbw CH3, Music_Routes3_Ch4 ; Routes 11, 12, 13, 14, 15 Music_Routes4:: ; 82d5 (2:42d5) - db ( $C0 | CH0 ) - dw Music_Routes4_Ch1 - db CH1 - dw Music_Routes4_Ch2 - db CH2 - dw Music_Routes4_Ch3 - db CH3 - dw Music_Routes4_Ch4 + dbw ( $C0 | CH0 ), Music_Routes4_Ch1 + dbw CH1, Music_Routes4_Ch2 + dbw CH2, Music_Routes4_Ch3 + dbw CH3, Music_Routes4_Ch4 ; Route 23, Indigo Plateau Music_IndigoPlateau:: ; 82f1 (2:42f1) - db ( $C0 | CH0 ) - dw Music_IndigoPlateau_Ch1 - db CH1 - dw Music_IndigoPlateau_Ch2 - db CH2 - dw Music_IndigoPlateau_Ch3 - db CH3 - dw Music_IndigoPlateau_Ch4 + dbw ( $C0 | CH0 ), Music_IndigoPlateau_Ch1 + dbw CH1, Music_IndigoPlateau_Ch2 + dbw CH2, Music_IndigoPlateau_Ch3 + dbw CH3, Music_IndigoPlateau_Ch4 diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index 85cf2825..1862a040 100644 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -1,57 +1,36 @@ Music_GymLeaderBattle:: ; 202be (8:42be) - db ( $80 | CH0 ) - dw Music_GymLeaderBattle_Ch1 - db CH1 - dw Music_GymLeaderBattle_Ch2 - db CH2 - dw Music_GymLeaderBattle_Ch3 + dbw ( $80 | CH0 ), Music_GymLeaderBattle_Ch1 + dbw CH1, Music_GymLeaderBattle_Ch2 + dbw CH2, Music_GymLeaderBattle_Ch3 Music_TrainerBattle:: ; 202c7 (8:42c7) - db ( $80 | CH0 ) - dw Music_TrainerBattle_Ch1 - db CH1 - dw Music_TrainerBattle_Ch2 - db CH2 - dw Music_TrainerBattle_Ch3 + dbw ( $80 | CH0 ), Music_TrainerBattle_Ch1 + dbw CH1, Music_TrainerBattle_Ch2 + dbw CH2, Music_TrainerBattle_Ch3 Music_WildBattle:: ; 202d0 (8:42d0) - db ( $80 | CH0 ) - dw Music_WildBattle_Ch1 - db CH1 - dw Music_WildBattle_Ch2 - db CH2 - dw Music_WildBattle_Ch3 + dbw ( $80 | CH0 ), Music_WildBattle_Ch1 + dbw CH1, Music_WildBattle_Ch2 + dbw CH2, Music_WildBattle_Ch3 Music_FinalBattle:: ; 202d9 (8:42d9) - db ( $80 | CH0 ) - dw Music_FinalBattle_Ch1 - db CH1 - dw Music_FinalBattle_Ch2 - db CH2 - dw Music_FinalBattle_Ch3 + dbw ( $80 | CH0 ), Music_FinalBattle_Ch1 + dbw CH1, Music_FinalBattle_Ch2 + dbw CH2, Music_FinalBattle_Ch3 Music_DefeatedTrainer:: ; 202e2 (8:42e2) - db ( $80 | CH0 ) - dw Music_DefeatedTrainer_Ch1 - db CH1 - dw Music_DefeatedTrainer_Ch2 - db CH2 - dw Music_DefeatedTrainer_Ch3 + dbw ( $80 | CH0 ), Music_DefeatedTrainer_Ch1 + dbw CH1, Music_DefeatedTrainer_Ch2 + dbw CH2, Music_DefeatedTrainer_Ch3 Music_DefeatedWildMon:: ; 202eb (8:42eb) - db ( $80 | CH0 ) - dw Music_DefeatedWildMon_Ch1 - db CH1 - dw Music_DefeatedWildMon_Ch2 - db CH2 - dw Music_DefeatedWildMon_Ch3 + dbw ( $80 | CH0 ), Music_DefeatedWildMon_Ch1 + dbw CH1, Music_DefeatedWildMon_Ch2 + dbw CH2, Music_DefeatedWildMon_Ch3 Music_DefeatedGymLeader:: ; 202f4 (8:42f4) - db ( $80 | CH0 ) - dw Music_DefeatedGymLeader_Ch1 - db CH1 - dw Music_DefeatedGymLeader_Ch2 - db CH2 - dw Music_DefeatedGymLeader_Ch3 + dbw ( $80 | CH0 ), Music_DefeatedGymLeader_Ch1 + dbw CH1, Music_DefeatedGymLeader_Ch2 + dbw CH2, Music_DefeatedGymLeader_Ch3 ; 202fd diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index be83f2ee..a1bfaad2 100644 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -1,156 +1,97 @@ Music_TitleScreen:: ; 7c249 (1f:4249) - db ( $C0 | CH0 ) - dw Music_TitleScreen_Ch1 - db CH1 - dw Music_TitleScreen_Ch2 - db CH2 - dw Music_TitleScreen_Ch3 - db CH3 - dw Music_TitleScreen_Ch4 + dbw ( $C0 | CH0 ), Music_TitleScreen_Ch1 + dbw CH1, Music_TitleScreen_Ch2 + dbw CH2, Music_TitleScreen_Ch3 + dbw CH3, Music_TitleScreen_Ch4 Music_Credits:: ; 7c255 (1f:4255) - db ( $80 | CH0 ) - dw Music_Credits_Ch1 - db CH1 - dw Music_Credits_Ch2 - db CH2 - dw Music_Credits_Ch3 + dbw ( $80 | CH0 ), Music_Credits_Ch1 + dbw CH1, Music_Credits_Ch2 + dbw CH2, Music_Credits_Ch3 Music_HallOfFame:: ; 7c25e (1f:425e) - db ( $80 | CH0 ) - dw Music_HallOfFame_Ch1 - db CH1 - dw Music_HallOfFame_Ch2 - db CH2 - dw Music_HallOfFame_Ch3 + dbw ( $80 | CH0 ), Music_HallOfFame_Ch1 + dbw CH1, Music_HallOfFame_Ch2 + dbw CH2, Music_HallOfFame_Ch3 Music_OaksLab:: ; 7c267 (1f:4267) - db ( $80 | CH0 ) - dw Music_OaksLab_Ch1 - db CH1 - dw Music_OaksLab_Ch2 - db CH2 - dw Music_OaksLab_Ch3 + dbw ( $80 | CH0 ), Music_OaksLab_Ch1 + dbw CH1, Music_OaksLab_Ch2 + dbw CH2, Music_OaksLab_Ch3 Music_JigglypuffSong:: ; 7c270 (1f:4270) - db $40 - dw Music_JigglypuffSong_Ch1 - db CH1 - dw Music_JigglypuffSong_Ch2 + dbw $40, Music_JigglypuffSong_Ch1 + dbw CH1, Music_JigglypuffSong_Ch2 Music_BikeRiding:: ; 7c276 (1f:4276) - db ( $C0 | CH0 ) - dw Music_BikeRiding_Ch1 - db CH1 - dw Music_BikeRiding_Ch2 - db CH2 - dw Music_BikeRiding_Ch3 - db CH3 - dw Music_BikeRiding_Ch4 + dbw ( $C0 | CH0 ), Music_BikeRiding_Ch1 + dbw CH1, Music_BikeRiding_Ch2 + dbw CH2, Music_BikeRiding_Ch3 + dbw CH3, Music_BikeRiding_Ch4 Music_Surfing:: ; 7c282 (1f:4282) - db ( $80 | CH0 ) - dw Music_Surfing_Ch1 - db CH1 - dw Music_Surfing_Ch2 - db CH2 - dw Music_Surfing_Ch3 + dbw ( $80 | CH0 ), Music_Surfing_Ch1 + dbw CH1, Music_Surfing_Ch2 + dbw CH2, Music_Surfing_Ch3 Music_GameCorner:: ; 7c28b (1f:428b) - db ( $80 | CH0 ) - dw Music_GameCorner_Ch1 - db CH1 - dw Music_GameCorner_Ch2 - db CH2 - dw Music_GameCorner_Ch3 + dbw ( $80 | CH0 ), Music_GameCorner_Ch1 + dbw CH1, Music_GameCorner_Ch2 + dbw CH2, Music_GameCorner_Ch3 Music_IntroBattle:: ; 7c294 (1f:4294) - db ( $80 | CH0 ) - dw Music_YellowIntro_Ch1 - db CH1 - dw Music_YellowIntro_Ch2 - db CH2 - dw Music_YellowIntro_Ch3 + dbw ( $80 | CH0 ), Music_YellowIntro_Ch1 + dbw CH1, Music_YellowIntro_Ch2 + dbw CH2, Music_YellowIntro_Ch3 ; Power Plant, Unknown Dungeon, Rocket HQ Music_Dungeon1:: ; 7c2a0 (1f:42a0) - db ( $C0 | CH0 ) - dw Music_Dungeon1_Ch1 - db CH1 - dw Music_Dungeon1_Ch2 - db CH2 - dw Music_Dungeon1_Ch3 - db CH3 - dw Music_Dungeon1_Ch4 + dbw ( $C0 | CH0 ), Music_Dungeon1_Ch1 + dbw CH1, Music_Dungeon1_Ch2 + dbw CH2, Music_Dungeon1_Ch3 + dbw CH3, Music_Dungeon1_Ch4 ; Viridian Forest, Seafoam Islands Music_Dungeon2:: ; 7c2ac (1f:42ac) - db ( $C0 | CH0 ) - dw Music_Dungeon2_Ch1 - db CH1 - dw Music_Dungeon2_Ch2 - db CH2 - dw Music_Dungeon2_Ch3 - db CH3 - dw Music_Dungeon2_Ch4 + dbw ( $C0 | CH0 ), Music_Dungeon2_Ch1 + dbw CH1, Music_Dungeon2_Ch2 + dbw CH2, Music_Dungeon2_Ch3 + dbw CH3, Music_Dungeon2_Ch4 ; Mt. Moon, Rock Tunnel, Victory Road Music_Dungeon3:: ; 7c2b8 (1f:42b8) - db ( $C0 | CH0 ) - dw Music_Dungeon3_Ch1 - db CH1 - dw Music_Dungeon3_Ch2 - db CH2 - dw Music_Dungeon3_Ch3 - db CH3 - dw Music_Dungeon3_Ch4 + dbw ( $C0 | CH0 ), Music_Dungeon3_Ch1 + dbw CH1, Music_Dungeon3_Ch2 + dbw CH2, Music_Dungeon3_Ch3 + dbw CH3, Music_Dungeon3_Ch4 Music_CinnabarMansion:: ; 7c2c4 (1f:42c4) - db ( $C0 | CH0 ) - dw Music_CinnabarMansion_Ch1 - db CH1 - dw Music_CinnabarMansion_Ch2 - db CH2 - dw Music_CinnabarMansion_Ch3 - db CH3 - dw Music_CinnabarMansion_Ch4 + dbw ( $C0 | CH0 ), Music_CinnabarMansion_Ch1 + dbw CH1, Music_CinnabarMansion_Ch2 + dbw CH2, Music_CinnabarMansion_Ch3 + dbw CH3, Music_CinnabarMansion_Ch4 Music_PokemonTower:: ; 7c2d0 (1f:42d0) - db ( $80 | CH0 ) - dw Music_PokemonTower_Ch1 - db CH1 - dw Music_PokemonTower_Ch2 - db CH2 - dw Music_PokemonTower_Ch3 + dbw ( $80 | CH0 ), Music_PokemonTower_Ch1 + dbw CH1, Music_PokemonTower_Ch2 + dbw CH2, Music_PokemonTower_Ch3 Music_SilphCo:: ; 7c2d9 (1f:42d9) - db ( $80 | CH0 ) - dw Music_SilphCo_Ch1 - db CH1 - dw Music_SilphCo_Ch2 - db CH2 - dw Music_SilphCo_Ch3 + dbw ( $80 | CH0 ), Music_SilphCo_Ch1 + dbw CH1, Music_SilphCo_Ch2 + dbw CH2, Music_SilphCo_Ch3 Music_MeetEvilTrainer:: ; 7c2e2 (1f:42e2) - db ( $80 | CH0 ) - dw Music_MeetEvilTrainer_Ch1 - db CH1 - dw Music_MeetEvilTrainer_Ch2 - db CH2 - dw Music_MeetEvilTrainer_Ch3 + dbw ( $80 | CH0 ), Music_MeetEvilTrainer_Ch1 + dbw CH1, Music_MeetEvilTrainer_Ch2 + dbw CH2, Music_MeetEvilTrainer_Ch3 Music_MeetFemaleTrainer:: ; 7c2eb (1f:42eb) - db ( $80 | CH0 ) - dw Music_MeetFemaleTrainer_Ch1 - db CH1 - dw Music_MeetFemaleTrainer_Ch2 - db CH2 - dw Music_MeetFemaleTrainer_Ch3 + dbw ( $80 | CH0 ), Music_MeetFemaleTrainer_Ch1 + dbw CH1, Music_MeetFemaleTrainer_Ch2 + dbw CH2, Music_MeetFemaleTrainer_Ch3 Music_MeetMaleTrainer:: ; 7c2f4 (1f:42f4) - db ( $80 | CH0 ) - dw Music_MeetMaleTrainer_Ch1 - db CH1 - dw Music_MeetMaleTrainer_Ch2 - db CH2 - dw Music_MeetMaleTrainer_Ch3 + dbw ( $80 | CH0 ), Music_MeetMaleTrainer_Ch1 + dbw CH1, Music_MeetMaleTrainer_Ch2 + dbw CH2, Music_MeetMaleTrainer_Ch3 diff --git a/audio/headers/musicheaders4.asm b/audio/headers/musicheaders4.asm index 76678dcb..7f26601e 100644 --- a/audio/headers/musicheaders4.asm +++ b/audio/headers/musicheaders4.asm @@ -1,22 +1,18 @@ - db $80 - dw $6ce8 - db $1 - dw $6d9d - db $2 - dw $6e45 - db $80 - dw $716d - db $1 - dw $71c8 - db $2 - dw $722a - db $c0 - dw $6fbe - db $1 - dw $7010 - db $2 - dw $7068 - db $3 - dw $7092 - db $2 - dw $4d1a
\ No newline at end of file +Music_SurfingPikachu:: + dbw ((3 - 1) << 6) | CH0, Music_SurfingPikachu_Ch1 + dbw CH1, Music_SurfingPikachu_Ch2 + dbw CH2, Music_SurfingPikachu_Ch3 + +Music_JessieAndJames:: + dbw ((3 - 1) << 6) | CH0, Music_JessieAndJames_Ch1 + dbw CH1, Music_JessieAndJames_Ch2 + dbw CH2, Music_JessieAndJames_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 + +Music_GBPrinter:: + dbw ((1 - 1) << 6) | CH2, Music_GBPrinter_Ch3 diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index 49370aa4..8a24fcb5 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -1,562 +1,377 @@ SFX_Headers_1:: - db $ff, $ff, $ff ; padding + dbw -1, -1 ; padding SFX_Snare1_1:: ; 8003 (2:4003) - db CH7 - dw SFX_Snare1_1_Ch1 + dbw CH7, SFX_Snare1_1_Ch1 SFX_Snare2_1:: ; 8006 (2:4006) - db CH7 - dw SFX_Snare2_1_Ch1 + dbw CH7, SFX_Snare2_1_Ch1 SFX_Snare3_1:: ; 8009 (2:4009) - db CH7 - dw SFX_Snare3_1_Ch1 + dbw CH7, SFX_Snare3_1_Ch1 SFX_Snare4_1:: ; 800c (2:400c) - db CH7 - dw SFX_Snare4_1_Ch1 + dbw CH7, SFX_Snare4_1_Ch1 SFX_Snare5_1:: ; 800f (2:400f) - db CH7 - dw SFX_Snare5_1_Ch1 + dbw CH7, SFX_Snare5_1_Ch1 SFX_Triangle1_1:: ; 8012 (2:4012) - db CH7 - dw SFX_Triangle1_1_Ch1 + dbw CH7, SFX_Triangle1_1_Ch1 SFX_Triangle2_1:: ; 8015 (2:4015) - db CH7 - dw SFX_Triangle2_1_Ch1 + dbw CH7, SFX_Triangle2_1_Ch1 SFX_Snare6_1:: ; 8018 (2:4018) - db CH7 - dw SFX_Snare6_1_Ch1 + dbw CH7, SFX_Snare6_1_Ch1 SFX_Snare7_1:: ; 801b (2:401b) - db CH7 - dw SFX_Snare7_1_Ch1 + dbw CH7, SFX_Snare7_1_Ch1 SFX_Snare8_1:: ; 801e (2:401e) - db CH7 - dw SFX_Snare8_1_Ch1 + dbw CH7, SFX_Snare8_1_Ch1 SFX_Snare9_1:: ; 8021 (2:4021) - db CH7 - dw SFX_Snare9_1_Ch1 + dbw CH7, SFX_Snare9_1_Ch1 SFX_Cymbal1_1:: ; 8024 (2:4024) - db CH7 - dw SFX_Cymbal1_1_Ch1 + dbw CH7, SFX_Cymbal1_1_Ch1 SFX_Cymbal2_1:: ; 8027 (2:4027) - db CH7 - dw SFX_Cymbal2_1_Ch1 + dbw CH7, SFX_Cymbal2_1_Ch1 SFX_Cymbal3_1:: ; 802a (2:402a) - db CH7 - dw SFX_Cymbal3_1_Ch1 + dbw CH7, SFX_Cymbal3_1_Ch1 SFX_Muted_Snare1_1:: ; 802d (2:402d) - db CH7 - dw SFX_Muted_Snare1_1_Ch1 + dbw CH7, SFX_Muted_Snare1_1_Ch1 SFX_Triangle3_1:: ; 8030 (2:4030) - db CH7 - dw SFX_Triangle3_1_Ch1 + dbw CH7, SFX_Triangle3_1_Ch1 SFX_Muted_Snare2_1:: ; 8033 (2:4033) - db CH7 - dw SFX_Muted_Snare2_1_Ch1 + dbw CH7, SFX_Muted_Snare2_1_Ch1 SFX_Muted_Snare3_1:: ; 8036 (2:4036) - db CH7 - dw SFX_Muted_Snare3_1_Ch1 + dbw CH7, SFX_Muted_Snare3_1_Ch1 SFX_Muted_Snare4_1:: ; 8039 (2:4039) - db CH7 - dw SFX_Muted_Snare4_1_Ch1 + dbw CH7, SFX_Muted_Snare4_1_Ch1 SFX_Cry00_1:: ; 803c (2:403c) - db ( $80 | CH4 ) - dw SFX_Cry00_1_Ch1 - db CH5 - dw SFX_Cry00_1_Ch2 - db CH7 - dw SFX_Cry00_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry00_1_Ch1 + dbw CH5, SFX_Cry00_1_Ch2 + dbw CH7, SFX_Cry00_1_Ch3 SFX_Cry01_1:: ; 8045 (2:4045) - db ( $80 | CH4 ) - dw SFX_Cry01_1_Ch1 - db CH5 - dw SFX_Cry01_1_Ch2 - db CH7 - dw SFX_Cry01_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry01_1_Ch1 + dbw CH5, SFX_Cry01_1_Ch2 + dbw CH7, SFX_Cry01_1_Ch3 SFX_Cry02_1:: ; 804e (2:404e) - db ( $80 | CH4 ) - dw SFX_Cry02_1_Ch1 - db CH5 - dw SFX_Cry02_1_Ch2 - db CH7 - dw SFX_Cry02_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry02_1_Ch1 + dbw CH5, SFX_Cry02_1_Ch2 + dbw CH7, SFX_Cry02_1_Ch3 SFX_Cry03_1:: ; 8057 (2:4057) - db ( $80 | CH4 ) - dw SFX_Cry03_1_Ch1 - db CH5 - dw SFX_Cry03_1_Ch2 - db CH7 - dw SFX_Cry03_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry03_1_Ch1 + dbw CH5, SFX_Cry03_1_Ch2 + dbw CH7, SFX_Cry03_1_Ch3 SFX_Cry04_1:: ; 8060 (2:4060) - db ( $80 | CH4 ) - dw SFX_Cry04_1_Ch1 - db CH5 - dw SFX_Cry04_1_Ch2 - db CH7 - dw SFX_Cry04_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry04_1_Ch1 + dbw CH5, SFX_Cry04_1_Ch2 + dbw CH7, SFX_Cry04_1_Ch3 SFX_Cry05_1:: ; 8069 (2:4069) - db ( $80 | CH4 ) - dw SFX_Cry05_1_Ch1 - db CH5 - dw SFX_Cry05_1_Ch2 - db CH7 - dw SFX_Cry05_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry05_1_Ch1 + dbw CH5, SFX_Cry05_1_Ch2 + dbw CH7, SFX_Cry05_1_Ch3 SFX_Cry06_1:: ; 8072 (2:4072) - db ( $80 | CH4 ) - dw SFX_Cry06_1_Ch1 - db CH5 - dw SFX_Cry06_1_Ch2 - db CH7 - dw SFX_Cry06_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry06_1_Ch1 + dbw CH5, SFX_Cry06_1_Ch2 + dbw CH7, SFX_Cry06_1_Ch3 SFX_Cry07_1:: ; 807b (2:407b) - db ( $80 | CH4 ) - dw SFX_Cry07_1_Ch1 - db CH5 - dw SFX_Cry07_1_Ch2 - db CH7 - dw SFX_Cry07_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry07_1_Ch1 + dbw CH5, SFX_Cry07_1_Ch2 + dbw CH7, SFX_Cry07_1_Ch3 SFX_Cry08_1:: ; 8084 (2:4084) - db ( $80 | CH4 ) - dw SFX_Cry08_1_Ch1 - db CH5 - dw SFX_Cry08_1_Ch2 - db CH7 - dw SFX_Cry08_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry08_1_Ch1 + dbw CH5, SFX_Cry08_1_Ch2 + dbw CH7, SFX_Cry08_1_Ch3 SFX_Cry09_1:: ; 808d (2:408d) - db ( $80 | CH4 ) - dw SFX_Cry09_1_Ch1 - db CH5 - dw SFX_Cry09_1_Ch2 - db CH7 - dw SFX_Cry09_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry09_1_Ch1 + dbw CH5, SFX_Cry09_1_Ch2 + dbw CH7, SFX_Cry09_1_Ch3 SFX_Cry0A_1:: ; 8096 (2:4096) - db ( $80 | CH4 ) - dw SFX_Cry0A_1_Ch1 - db CH5 - dw SFX_Cry0A_1_Ch2 - db CH7 - dw SFX_Cry0A_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0A_1_Ch1 + dbw CH5, SFX_Cry0A_1_Ch2 + dbw CH7, SFX_Cry0A_1_Ch3 SFX_Cry0B_1:: ; 809f (2:409f) - db ( $80 | CH4 ) - dw SFX_Cry0B_1_Ch1 - db CH5 - dw SFX_Cry0B_1_Ch2 - db CH7 - dw SFX_Cry0B_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0B_1_Ch1 + dbw CH5, SFX_Cry0B_1_Ch2 + dbw CH7, SFX_Cry0B_1_Ch3 SFX_Cry0C_1:: ; 80a8 (2:40a8) - db ( $80 | CH4 ) - dw SFX_Cry0C_1_Ch1 - db CH5 - dw SFX_Cry0C_1_Ch2 - db CH7 - dw SFX_Cry0C_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0C_1_Ch1 + dbw CH5, SFX_Cry0C_1_Ch2 + dbw CH7, SFX_Cry0C_1_Ch3 SFX_Cry0D_1:: ; 80b1 (2:40b1) - db ( $80 | CH4 ) - dw SFX_Cry0D_1_Ch1 - db CH5 - dw SFX_Cry0D_1_Ch2 - db CH7 - dw SFX_Cry0D_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0D_1_Ch1 + dbw CH5, SFX_Cry0D_1_Ch2 + dbw CH7, SFX_Cry0D_1_Ch3 SFX_Cry0E_1:: ; 80ba (2:40ba) - db ( $80 | CH4 ) - dw SFX_Cry0E_1_Ch1 - db CH5 - dw SFX_Cry0E_1_Ch2 - db CH7 - dw SFX_Cry0E_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0E_1_Ch1 + dbw CH5, SFX_Cry0E_1_Ch2 + dbw CH7, SFX_Cry0E_1_Ch3 SFX_Cry0F_1:: ; 80c3 (2:40c3) - db ( $80 | CH4 ) - dw SFX_Cry0F_1_Ch1 - db CH5 - dw SFX_Cry0F_1_Ch2 - db CH7 - dw SFX_Cry0F_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0F_1_Ch1 + dbw CH5, SFX_Cry0F_1_Ch2 + dbw CH7, SFX_Cry0F_1_Ch3 SFX_Cry10_1:: ; 80cc (2:40cc) - db ( $80 | CH4 ) - dw SFX_Cry10_1_Ch1 - db CH5 - dw SFX_Cry10_1_Ch2 - db CH7 - dw SFX_Cry10_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry10_1_Ch1 + dbw CH5, SFX_Cry10_1_Ch2 + dbw CH7, SFX_Cry10_1_Ch3 SFX_Cry11_1:: ; 80d5 (2:40d5) - db ( $80 | CH4 ) - dw SFX_Cry11_1_Ch1 - db CH5 - dw SFX_Cry11_1_Ch2 - db CH7 - dw SFX_Cry11_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry11_1_Ch1 + dbw CH5, SFX_Cry11_1_Ch2 + dbw CH7, SFX_Cry11_1_Ch3 SFX_Cry12_1:: ; 80de (2:40de) - db ( $80 | CH4 ) - dw SFX_Cry12_1_Ch1 - db CH5 - dw SFX_Cry12_1_Ch2 - db CH7 - dw SFX_Cry12_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry12_1_Ch1 + dbw CH5, SFX_Cry12_1_Ch2 + dbw CH7, SFX_Cry12_1_Ch3 SFX_Cry13_1:: ; 80e7 (2:40e7) - db ( $80 | CH4 ) - dw SFX_Cry13_1_Ch1 - db CH5 - dw SFX_Cry13_1_Ch2 - db CH7 - dw SFX_Cry13_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry13_1_Ch1 + dbw CH5, SFX_Cry13_1_Ch2 + dbw CH7, SFX_Cry13_1_Ch3 SFX_Cry14_1:: ; 80f0 (2:40f0) - db ( $80 | CH4 ) - dw SFX_Cry14_1_Ch1 - db CH5 - dw SFX_Cry14_1_Ch2 - db CH7 - dw SFX_Cry14_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry14_1_Ch1 + dbw CH5, SFX_Cry14_1_Ch2 + dbw CH7, SFX_Cry14_1_Ch3 SFX_Cry15_1:: ; 80f9 (2:40f9) - db ( $80 | CH4 ) - dw SFX_Cry15_1_Ch1 - db CH5 - dw SFX_Cry15_1_Ch2 - db CH7 - dw SFX_Cry15_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry15_1_Ch1 + dbw CH5, SFX_Cry15_1_Ch2 + dbw CH7, SFX_Cry15_1_Ch3 SFX_Cry16_1:: ; 8102 (2:4102) - db ( $80 | CH4 ) - dw SFX_Cry16_1_Ch1 - db CH5 - dw SFX_Cry16_1_Ch2 - db CH7 - dw SFX_Cry16_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry16_1_Ch1 + dbw CH5, SFX_Cry16_1_Ch2 + dbw CH7, SFX_Cry16_1_Ch3 SFX_Cry17_1:: ; 810b (2:410b) - db ( $80 | CH4 ) - dw SFX_Cry17_1_Ch1 - db CH5 - dw SFX_Cry17_1_Ch2 - db CH7 - dw SFX_Cry17_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry17_1_Ch1 + dbw CH5, SFX_Cry17_1_Ch2 + dbw CH7, SFX_Cry17_1_Ch3 SFX_Cry18_1:: ; 8114 (2:4114) - db ( $80 | CH4 ) - dw SFX_Cry18_1_Ch1 - db CH5 - dw SFX_Cry18_1_Ch2 - db CH7 - dw SFX_Cry18_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry18_1_Ch1 + dbw CH5, SFX_Cry18_1_Ch2 + dbw CH7, SFX_Cry18_1_Ch3 SFX_Cry19_1:: ; 811d (2:411d) - db ( $80 | CH4 ) - dw SFX_Cry19_1_Ch1 - db CH5 - dw SFX_Cry19_1_Ch2 - db CH7 - dw SFX_Cry19_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry19_1_Ch1 + dbw CH5, SFX_Cry19_1_Ch2 + dbw CH7, SFX_Cry19_1_Ch3 SFX_Cry1A_1:: ; 8126 (2:4126) - db ( $80 | CH4 ) - dw SFX_Cry1A_1_Ch1 - db CH5 - dw SFX_Cry1A_1_Ch2 - db CH7 - dw SFX_Cry1A_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1A_1_Ch1 + dbw CH5, SFX_Cry1A_1_Ch2 + dbw CH7, SFX_Cry1A_1_Ch3 SFX_Cry1B_1:: ; 812f (2:412f) - db ( $80 | CH4 ) - dw SFX_Cry1B_1_Ch1 - db CH5 - dw SFX_Cry1B_1_Ch2 - db CH7 - dw SFX_Cry1B_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1B_1_Ch1 + dbw CH5, SFX_Cry1B_1_Ch2 + dbw CH7, SFX_Cry1B_1_Ch3 SFX_Cry1C_1:: ; 8138 (2:4138) - db ( $80 | CH4 ) - dw SFX_Cry1C_1_Ch1 - db CH5 - dw SFX_Cry1C_1_Ch2 - db CH7 - dw SFX_Cry1C_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1C_1_Ch1 + dbw CH5, SFX_Cry1C_1_Ch2 + dbw CH7, SFX_Cry1C_1_Ch3 SFX_Cry1D_1:: ; 8141 (2:4141) - db ( $80 | CH4 ) - dw SFX_Cry1D_1_Ch1 - db CH5 - dw SFX_Cry1D_1_Ch2 - db CH7 - dw SFX_Cry1D_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1D_1_Ch1 + dbw CH5, SFX_Cry1D_1_Ch2 + dbw CH7, SFX_Cry1D_1_Ch3 SFX_Cry1E_1:: ; 814a (2:414a) - db ( $80 | CH4 ) - dw SFX_Cry1E_1_Ch1 - db CH5 - dw SFX_Cry1E_1_Ch2 - db CH7 - dw SFX_Cry1E_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1E_1_Ch1 + dbw CH5, SFX_Cry1E_1_Ch2 + dbw CH7, SFX_Cry1E_1_Ch3 SFX_Cry1F_1:: ; 8153 (2:4153) - db ( $80 | CH4 ) - dw SFX_Cry1F_1_Ch1 - db CH5 - dw SFX_Cry1F_1_Ch2 - db CH7 - dw SFX_Cry1F_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1F_1_Ch1 + dbw CH5, SFX_Cry1F_1_Ch2 + dbw CH7, SFX_Cry1F_1_Ch3 SFX_Cry20_1:: ; 815c (2:415c) - db ( $80 | CH4 ) - dw SFX_Cry20_1_Ch1 - db CH5 - dw SFX_Cry20_1_Ch2 - db CH7 - dw SFX_Cry20_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry20_1_Ch1 + dbw CH5, SFX_Cry20_1_Ch2 + dbw CH7, SFX_Cry20_1_Ch3 SFX_Cry21_1:: ; 8165 (2:4165) - db ( $80 | CH4 ) - dw SFX_Cry21_1_Ch1 - db CH5 - dw SFX_Cry21_1_Ch2 - db CH7 - dw SFX_Cry21_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry21_1_Ch1 + dbw CH5, SFX_Cry21_1_Ch2 + dbw CH7, SFX_Cry21_1_Ch3 SFX_Cry22_1:: ; 816e (2:416e) - db ( $80 | CH4 ) - dw SFX_Cry22_1_Ch1 - db CH5 - dw SFX_Cry22_1_Ch2 - db CH7 - dw SFX_Cry22_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry22_1_Ch1 + dbw CH5, SFX_Cry22_1_Ch2 + dbw CH7, SFX_Cry22_1_Ch3 SFX_Cry23_1:: ; 8177 (2:4177) - db ( $80 | CH4 ) - dw SFX_Cry23_1_Ch1 - db CH5 - dw SFX_Cry23_1_Ch2 - db CH7 - dw SFX_Cry23_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry23_1_Ch1 + dbw CH5, SFX_Cry23_1_Ch2 + dbw CH7, SFX_Cry23_1_Ch3 SFX_Cry24_1:: ; 8180 (2:4180) - db ( $80 | CH4 ) - dw SFX_Cry24_1_Ch1 - db CH5 - dw SFX_Cry24_1_Ch2 - db CH7 - dw SFX_Cry24_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry24_1_Ch1 + dbw CH5, SFX_Cry24_1_Ch2 + dbw CH7, SFX_Cry24_1_Ch3 SFX_Cry25_1:: ; 8189 (2:4189) - db ( $80 | CH4 ) - dw SFX_Cry25_1_Ch1 - db CH5 - dw SFX_Cry25_1_Ch2 - db CH7 - dw SFX_Cry25_1_Ch3 + dbw ( $80 | CH4 ), SFX_Cry25_1_Ch1 + dbw CH5, SFX_Cry25_1_Ch2 + dbw CH7, SFX_Cry25_1_Ch3 SFX_Get_Item1_1:: ; 8192 (2:4192) - db ( $80 | CH4 ) - dw SFX_Get_Item1_1_Ch1 - db CH5 - dw SFX_Get_Item1_1_Ch2 - db CH6 - dw SFX_Get_Item1_1_Ch3 + dbw ( $80 | CH4 ), SFX_Get_Item1_1_Ch1 + dbw CH5, SFX_Get_Item1_1_Ch2 + dbw CH6, SFX_Get_Item1_1_Ch3 SFX_Get_Item2_1:: ; 819b (2:419b) - db ( $80 | CH4 ) - dw SFX_Get_Item2_1_Ch1 - db CH5 - dw SFX_Get_Item2_1_Ch2 - db CH6 - dw SFX_Get_Item2_1_Ch3 + dbw ( $80 | CH4 ), SFX_Get_Item2_1_Ch1 + dbw CH5, SFX_Get_Item2_1_Ch2 + dbw CH6, SFX_Get_Item2_1_Ch3 SFX_Tink_1:: ; 81a4 (2:41a4) - db CH4 - dw SFX_Tink_1_Ch1 + dbw CH4, SFX_Tink_1_Ch1 SFX_Heal_HP_1:: ; 81a7 (2:41a7) - db CH4 - dw SFX_Heal_HP_1_Ch1 + dbw CH4, SFX_Heal_HP_1_Ch1 SFX_Heal_Ailment_1:: ; 81aa (2:41aa) - db CH4 - dw SFX_Heal_Ailment_1_Ch1 + dbw CH4, SFX_Heal_Ailment_1_Ch1 SFX_Start_Menu_1:: ; 81ad (2:41ad) - db CH7 - dw SFX_Start_Menu_1_Ch1 + dbw CH7, SFX_Start_Menu_1_Ch1 SFX_Press_AB_1:: ; 81b0 (2:41b0) - db CH4 - dw SFX_Press_AB_1_Ch1 + dbw CH4, SFX_Press_AB_1_Ch1 SFX_Pokedex_Rating_1:: ; 81b3 (2:41b3) - db ( $80 | CH4 ) - dw SFX_Pokedex_Rating_1_Ch1 - db CH5 - dw SFX_Pokedex_Rating_1_Ch2 - db CH6 - dw SFX_Pokedex_Rating_1_Ch3 + dbw ( $80 | CH4 ), SFX_Pokedex_Rating_1_Ch1 + dbw CH5, SFX_Pokedex_Rating_1_Ch2 + dbw CH6, SFX_Pokedex_Rating_1_Ch3 SFX_Get_Key_Item_1:: ; 81bc (2:41bc) - db ( $80 | CH4 ) - dw SFX_Get_Key_Item_1_Ch1 - db CH5 - dw SFX_Get_Key_Item_1_Ch2 - db CH6 - dw SFX_Get_Key_Item_1_Ch3 + 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 SFX_Poisoned_1:: ; 81c5 (2:41c5) - db CH4 - dw SFX_Poisoned_1_Ch1 + dbw CH4, SFX_Poisoned_1_Ch1 SFX_Trade_Machine_1:: ; 81c8 (2:41c8) - db CH4 - dw SFX_Trade_Machine_1_Ch1 + dbw CH4, SFX_Trade_Machine_1_Ch1 SFX_Turn_On_PC_1:: ; 81cb (2:41cb) - db CH4 - dw SFX_Turn_On_PC_1_Ch1 + dbw CH4, SFX_Turn_On_PC_1_Ch1 SFX_Turn_Off_PC_1:: ; 81ce (2:41ce) - db CH4 - dw SFX_Turn_Off_PC_1_Ch1 + dbw CH4, SFX_Turn_Off_PC_1_Ch1 SFX_Enter_PC_1:: ; 81d1 (2:41d1) - db CH4 - dw SFX_Enter_PC_1_Ch1 + dbw CH4, SFX_Enter_PC_1_Ch1 SFX_Shrink_1:: ; 81d4 (2:41d4) - db CH4 - dw SFX_Shrink_1_Ch1 + dbw CH4, SFX_Shrink_1_Ch1 SFX_Switch_1:: ; 81d7 (2:41d7) - db CH4 - dw SFX_Switch_1_Ch1 + dbw CH4, SFX_Switch_1_Ch1 SFX_Healing_Machine_1:: ; 81da (2:41da) - db CH4 - dw SFX_Healing_Machine_1_Ch1 + dbw CH4, SFX_Healing_Machine_1_Ch1 SFX_Teleport_Exit1_1:: ; 81dd (2:41dd) - db CH4 - dw SFX_Teleport_Exit1_1_Ch1 + dbw CH4, SFX_Teleport_Exit1_1_Ch1 SFX_Teleport_Enter1_1:: ; 81e0 (2:41e0) - db CH4 - dw SFX_Teleport_Enter1_1_Ch1 + dbw CH4, SFX_Teleport_Enter1_1_Ch1 SFX_Teleport_Exit2_1:: ; 81e3 (2:41e3) - db CH4 - dw SFX_Teleport_Exit2_1_Ch1 + dbw CH4, SFX_Teleport_Exit2_1_Ch1 SFX_Ledge_1:: ; 81e6 (2:41e6) - db CH4 - dw SFX_Ledge_1_Ch1 + dbw CH4, SFX_Ledge_1_Ch1 SFX_Teleport_Enter2_1:: ; 81e9 (2:41e9) - db CH7 - dw SFX_Teleport_Enter2_1_Ch1 + dbw CH7, SFX_Teleport_Enter2_1_Ch1 SFX_Fly_1:: ; 81ec (2:41ec) - db CH7 - dw SFX_Fly_1_Ch1 + dbw CH7, SFX_Fly_1_Ch1 SFX_Denied_1:: ; 81ef (2:41ef) - db ( $40 | CH4 ) - dw SFX_Denied_1_Ch1 - db CH5 - dw SFX_Denied_1_Ch2 + dbw ( $40 | CH4 ), SFX_Denied_1_Ch1 + dbw CH5, SFX_Denied_1_Ch2 SFX_Arrow_Tiles_1:: ; 81f5 (2:41f5) - db CH4 - dw SFX_Arrow_Tiles_1_Ch1 + dbw CH4, SFX_Arrow_Tiles_1_Ch1 SFX_Push_Boulder_1:: ; 81f8 (2:41f8) - db CH7 - dw SFX_Push_Boulder_1_Ch1 + dbw CH7, SFX_Push_Boulder_1_Ch1 SFX_SS_Anne_Horn_1:: ; 81fb (2:41fb) - db ( $40 | CH4 ) - dw SFX_SS_Anne_Horn_1_Ch1 - db CH5 - dw SFX_SS_Anne_Horn_1_Ch2 + dbw ( $40 | CH4 ), SFX_SS_Anne_Horn_1_Ch1 + dbw CH5, SFX_SS_Anne_Horn_1_Ch2 SFX_Withdraw_Deposit_1:: ; 8201 (2:4201) - db CH4 - dw SFX_Withdraw_Deposit_1_Ch1 + dbw CH4, SFX_Withdraw_Deposit_1_Ch1 SFX_Cut_1:: ; 8204 (2:4204) - db CH7 - dw SFX_Cut_1_Ch1 + dbw CH7, SFX_Cut_1_Ch1 SFX_Go_Inside_1:: ; 8207 (2:4207) - db CH7 - dw SFX_Go_Inside_1_Ch1 + dbw CH7, SFX_Go_Inside_1_Ch1 SFX_Swap_1:: ; 820a (2:420a) - db ( $40 | CH4 ) - dw SFX_Swap_1_Ch1 - db CH5 - dw SFX_Swap_1_Ch2 + dbw ( $40 | CH4 ), SFX_Swap_1_Ch1 + dbw CH5, SFX_Swap_1_Ch2 SFX_59_1:: ; 8210 (2:4210) - db ( $40 | CH4 ) - dw SFX_59_1_Ch1 - db CH5 - dw SFX_59_1_Ch2 + dbw ( $40 | CH4 ), SFX_59_1_Ch1 + dbw CH5, SFX_59_1_Ch2 SFX_Purchase_1:: ; 8216 (2:4216) - db ( $40 | CH4 ) - dw SFX_Purchase_1_Ch1 - db CH5 - dw SFX_Purchase_1_Ch2 + dbw ( $40 | CH4 ), SFX_Purchase_1_Ch1 + dbw CH5, SFX_Purchase_1_Ch2 SFX_Collision_1:: ; 821c (2:421c) - db CH4 - dw SFX_Collision_1_Ch1 + dbw CH4, SFX_Collision_1_Ch1 SFX_Go_Outside_1:: ; 821f (2:421f) - db CH7 - dw SFX_Go_Outside_1_Ch1 + dbw CH7, SFX_Go_Outside_1_Ch1 SFX_Save_1:: ; 8222 (2:4222) - db ( $40 | CH4 ) - dw SFX_Save_1_Ch1 - db CH5 - dw SFX_Save_1_Ch2 + dbw ( $40 | CH4 ), SFX_Save_1_Ch1 + dbw CH5, SFX_Save_1_Ch2 SFX_Pokeflute:: ; 8228 (2:4228) - db CH2 - dw SFX_Pokeflute_Ch1 + dbw CH2, SFX_Pokeflute_Ch1 SFX_Safari_Zone_PA:: ; 822b (2:422b) - db CH4 - dw SFX_Safari_Zone_PA_Ch1 + dbw CH4, SFX_Safari_Zone_PA_Ch1 diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index 1b30f5cc..f3d0720e 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -1,706 +1,473 @@ SFX_Headers_2:: - db $ff, $ff, $ff ; padding + dbw -1, -1 ; padding SFX_Snare1_2:: ; 20003 (8:4003) - db CH7 - dw SFX_Snare1_2_Ch1 + dbw CH7, SFX_Snare1_2_Ch1 SFX_Snare2_2:: ; 20006 (8:4006) - db CH7 - dw SFX_Snare2_2_Ch1 + dbw CH7, SFX_Snare2_2_Ch1 SFX_Snare3_2:: ; 20009 (8:4009) - db CH7 - dw SFX_Snare3_2_Ch1 + dbw CH7, SFX_Snare3_2_Ch1 SFX_Snare4_2:: ; 2000c (8:400c) - db CH7 - dw SFX_Snare4_2_Ch1 + dbw CH7, SFX_Snare4_2_Ch1 SFX_Snare5_2:: ; 2000f (8:400f) - db CH7 - dw SFX_Snare5_2_Ch1 + dbw CH7, SFX_Snare5_2_Ch1 SFX_Triangle1_2:: ; 20012 (8:4012) - db CH7 - dw SFX_Triangle1_2_Ch1 + dbw CH7, SFX_Triangle1_2_Ch1 SFX_Triangle2_2:: ; 20015 (8:4015) - db CH7 - dw SFX_Triangle2_2_Ch1 + dbw CH7, SFX_Triangle2_2_Ch1 SFX_Snare6_2:: ; 20018 (8:4018) - db CH7 - dw SFX_Snare6_2_Ch1 + dbw CH7, SFX_Snare6_2_Ch1 SFX_Snare7_2:: ; 2001b (8:401b) - db CH7 - dw SFX_Snare7_2_Ch1 + dbw CH7, SFX_Snare7_2_Ch1 SFX_Snare8_2:: ; 2001e (8:401e) - db CH7 - dw SFX_Snare8_2_Ch1 + dbw CH7, SFX_Snare8_2_Ch1 SFX_Snare9_2:: ; 20021 (8:4021) - db CH7 - dw SFX_Snare9_2_Ch1 + dbw CH7, SFX_Snare9_2_Ch1 SFX_Cymbal1_2:: ; 20024 (8:4024) - db CH7 - dw SFX_Cymbal1_2_Ch1 + dbw CH7, SFX_Cymbal1_2_Ch1 SFX_Cymbal2_2:: ; 20027 (8:4027) - db CH7 - dw SFX_Cymbal2_2_Ch1 + dbw CH7, SFX_Cymbal2_2_Ch1 SFX_Cymbal3_2:: ; 2002a (8:402a) - db CH7 - dw SFX_Cymbal3_2_Ch1 + dbw CH7, SFX_Cymbal3_2_Ch1 SFX_Muted_Snare1_2:: ; 2002d (8:402d) - db CH7 - dw SFX_Muted_Snare1_2_Ch1 + dbw CH7, SFX_Muted_Snare1_2_Ch1 SFX_Triangle3_2:: ; 20030 (8:4030) - db CH7 - dw SFX_Triangle3_2_Ch1 + dbw CH7, SFX_Triangle3_2_Ch1 SFX_Muted_Snare2_2:: ; 20033 (8:4033) - db CH7 - dw SFX_Muted_Snare2_2_Ch1 + dbw CH7, SFX_Muted_Snare2_2_Ch1 SFX_Muted_Snare3_2:: ; 20036 (8:4036) - db CH7 - dw SFX_Muted_Snare3_2_Ch1 + dbw CH7, SFX_Muted_Snare3_2_Ch1 SFX_Muted_Snare4_2:: ; 20039 (8:4039) - db CH7 - dw SFX_Muted_Snare4_2_Ch1 + dbw CH7, SFX_Muted_Snare4_2_Ch1 SFX_Cry00_2:: ; 2003c (8:403c) - db ( $80 | CH4 ) - dw SFX_Cry00_2_Ch1 - db CH5 - dw SFX_Cry00_2_Ch2 - db CH7 - dw SFX_Cry00_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry00_2_Ch1 + dbw CH5, SFX_Cry00_2_Ch2 + dbw CH7, SFX_Cry00_2_Ch3 SFX_Cry01_2:: ; 20045 (8:4045) - db ( $80 | CH4 ) - dw SFX_Cry01_2_Ch1 - db CH5 - dw SFX_Cry01_2_Ch2 - db CH7 - dw SFX_Cry01_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry01_2_Ch1 + dbw CH5, SFX_Cry01_2_Ch2 + dbw CH7, SFX_Cry01_2_Ch3 SFX_Cry02_2:: ; 2004e (8:404e) - db ( $80 | CH4 ) - dw SFX_Cry02_2_Ch1 - db CH5 - dw SFX_Cry02_2_Ch2 - db CH7 - dw SFX_Cry02_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry02_2_Ch1 + dbw CH5, SFX_Cry02_2_Ch2 + dbw CH7, SFX_Cry02_2_Ch3 SFX_Cry03_2:: ; 20057 (8:4057) - db ( $80 | CH4 ) - dw SFX_Cry03_2_Ch1 - db CH5 - dw SFX_Cry03_2_Ch2 - db CH7 - dw SFX_Cry03_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry03_2_Ch1 + dbw CH5, SFX_Cry03_2_Ch2 + dbw CH7, SFX_Cry03_2_Ch3 SFX_Cry04_2:: ; 20060 (8:4060) - db ( $80 | CH4 ) - dw SFX_Cry04_2_Ch1 - db CH5 - dw SFX_Cry04_2_Ch2 - db CH7 - dw SFX_Cry04_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry04_2_Ch1 + dbw CH5, SFX_Cry04_2_Ch2 + dbw CH7, SFX_Cry04_2_Ch3 SFX_Cry05_2:: ; 20069 (8:4069) - db ( $80 | CH4 ) - dw SFX_Cry05_2_Ch1 - db CH5 - dw SFX_Cry05_2_Ch2 - db CH7 - dw SFX_Cry05_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry05_2_Ch1 + dbw CH5, SFX_Cry05_2_Ch2 + dbw CH7, SFX_Cry05_2_Ch3 SFX_Cry06_2:: ; 20072 (8:4072) - db ( $80 | CH4 ) - dw SFX_Cry06_2_Ch1 - db CH5 - dw SFX_Cry06_2_Ch2 - db CH7 - dw SFX_Cry06_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry06_2_Ch1 + dbw CH5, SFX_Cry06_2_Ch2 + dbw CH7, SFX_Cry06_2_Ch3 SFX_Cry07_2:: ; 2007b (8:407b) - db ( $80 | CH4 ) - dw SFX_Cry07_2_Ch1 - db CH5 - dw SFX_Cry07_2_Ch2 - db CH7 - dw SFX_Cry07_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry07_2_Ch1 + dbw CH5, SFX_Cry07_2_Ch2 + dbw CH7, SFX_Cry07_2_Ch3 SFX_Cry08_2:: ; 20084 (8:4084) - db ( $80 | CH4 ) - dw SFX_Cry08_2_Ch1 - db CH5 - dw SFX_Cry08_2_Ch2 - db CH7 - dw SFX_Cry08_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry08_2_Ch1 + dbw CH5, SFX_Cry08_2_Ch2 + dbw CH7, SFX_Cry08_2_Ch3 SFX_Cry09_2:: ; 2008d (8:408d) - db ( $80 | CH4 ) - dw SFX_Cry09_2_Ch1 - db CH5 - dw SFX_Cry09_2_Ch2 - db CH7 - dw SFX_Cry09_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry09_2_Ch1 + dbw CH5, SFX_Cry09_2_Ch2 + dbw CH7, SFX_Cry09_2_Ch3 SFX_Cry0A_2:: ; 20096 (8:4096) - db ( $80 | CH4 ) - dw SFX_Cry0A_2_Ch1 - db CH5 - dw SFX_Cry0A_2_Ch2 - db CH7 - dw SFX_Cry0A_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0A_2_Ch1 + dbw CH5, SFX_Cry0A_2_Ch2 + dbw CH7, SFX_Cry0A_2_Ch3 SFX_Cry0B_2:: ; 2009f (8:409f) - db ( $80 | CH4 ) - dw SFX_Cry0B_2_Ch1 - db CH5 - dw SFX_Cry0B_2_Ch2 - db CH7 - dw SFX_Cry0B_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0B_2_Ch1 + dbw CH5, SFX_Cry0B_2_Ch2 + dbw CH7, SFX_Cry0B_2_Ch3 SFX_Cry0C_2:: ; 200a8 (8:40a8) - db ( $80 | CH4 ) - dw SFX_Cry0C_2_Ch1 - db CH5 - dw SFX_Cry0C_2_Ch2 - db CH7 - dw SFX_Cry0C_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0C_2_Ch1 + dbw CH5, SFX_Cry0C_2_Ch2 + dbw CH7, SFX_Cry0C_2_Ch3 SFX_Cry0D_2:: ; 200b1 (8:40b1) - db ( $80 | CH4 ) - dw SFX_Cry0D_2_Ch1 - db CH5 - dw SFX_Cry0D_2_Ch2 - db CH7 - dw SFX_Cry0D_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0D_2_Ch1 + dbw CH5, SFX_Cry0D_2_Ch2 + dbw CH7, SFX_Cry0D_2_Ch3 SFX_Cry0E_2:: ; 200ba (8:40ba) - db ( $80 | CH4 ) - dw SFX_Cry0E_2_Ch1 - db CH5 - dw SFX_Cry0E_2_Ch2 - db CH7 - dw SFX_Cry0E_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0E_2_Ch1 + dbw CH5, SFX_Cry0E_2_Ch2 + dbw CH7, SFX_Cry0E_2_Ch3 SFX_Cry0F_2:: ; 200c3 (8:40c3) - db ( $80 | CH4 ) - dw SFX_Cry0F_2_Ch1 - db CH5 - dw SFX_Cry0F_2_Ch2 - db CH7 - dw SFX_Cry0F_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0F_2_Ch1 + dbw CH5, SFX_Cry0F_2_Ch2 + dbw CH7, SFX_Cry0F_2_Ch3 SFX_Cry10_2:: ; 200cc (8:40cc) - db ( $80 | CH4 ) - dw SFX_Cry10_2_Ch1 - db CH5 - dw SFX_Cry10_2_Ch2 - db CH7 - dw SFX_Cry10_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry10_2_Ch1 + dbw CH5, SFX_Cry10_2_Ch2 + dbw CH7, SFX_Cry10_2_Ch3 SFX_Cry11_2:: ; 200d5 (8:40d5) - db ( $80 | CH4 ) - dw SFX_Cry11_2_Ch1 - db CH5 - dw SFX_Cry11_2_Ch2 - db CH7 - dw SFX_Cry11_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry11_2_Ch1 + dbw CH5, SFX_Cry11_2_Ch2 + dbw CH7, SFX_Cry11_2_Ch3 SFX_Cry12_2:: ; 200de (8:40de) - db ( $80 | CH4 ) - dw SFX_Cry12_2_Ch1 - db CH5 - dw SFX_Cry12_2_Ch2 - db CH7 - dw SFX_Cry12_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry12_2_Ch1 + dbw CH5, SFX_Cry12_2_Ch2 + dbw CH7, SFX_Cry12_2_Ch3 SFX_Cry13_2:: ; 200e7 (8:40e7) - db ( $80 | CH4 ) - dw SFX_Cry13_2_Ch1 - db CH5 - dw SFX_Cry13_2_Ch2 - db CH7 - dw SFX_Cry13_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry13_2_Ch1 + dbw CH5, SFX_Cry13_2_Ch2 + dbw CH7, SFX_Cry13_2_Ch3 SFX_Cry14_2:: ; 200f0 (8:40f0) - db ( $80 | CH4 ) - dw SFX_Cry14_2_Ch1 - db CH5 - dw SFX_Cry14_2_Ch2 - db CH7 - dw SFX_Cry14_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry14_2_Ch1 + dbw CH5, SFX_Cry14_2_Ch2 + dbw CH7, SFX_Cry14_2_Ch3 SFX_Cry15_2:: ; 200f9 (8:40f9) - db ( $80 | CH4 ) - dw SFX_Cry15_2_Ch1 - db CH5 - dw SFX_Cry15_2_Ch2 - db CH7 - dw SFX_Cry15_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry15_2_Ch1 + dbw CH5, SFX_Cry15_2_Ch2 + dbw CH7, SFX_Cry15_2_Ch3 SFX_Cry16_2:: ; 20102 (8:4102) - db ( $80 | CH4 ) - dw SFX_Cry16_2_Ch1 - db CH5 - dw SFX_Cry16_2_Ch2 - db CH7 - dw SFX_Cry16_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry16_2_Ch1 + dbw CH5, SFX_Cry16_2_Ch2 + dbw CH7, SFX_Cry16_2_Ch3 SFX_Cry17_2:: ; 2010b (8:410b) - db ( $80 | CH4 ) - dw SFX_Cry17_2_Ch1 - db CH5 - dw SFX_Cry17_2_Ch2 - db CH7 - dw SFX_Cry17_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry17_2_Ch1 + dbw CH5, SFX_Cry17_2_Ch2 + dbw CH7, SFX_Cry17_2_Ch3 SFX_Cry18_2:: ; 20114 (8:4114) - db ( $80 | CH4 ) - dw SFX_Cry18_2_Ch1 - db CH5 - dw SFX_Cry18_2_Ch2 - db CH7 - dw SFX_Cry18_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry18_2_Ch1 + dbw CH5, SFX_Cry18_2_Ch2 + dbw CH7, SFX_Cry18_2_Ch3 SFX_Cry19_2:: ; 2011d (8:411d) - db ( $80 | CH4 ) - dw SFX_Cry19_2_Ch1 - db CH5 - dw SFX_Cry19_2_Ch2 - db CH7 - dw SFX_Cry19_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry19_2_Ch1 + dbw CH5, SFX_Cry19_2_Ch2 + dbw CH7, SFX_Cry19_2_Ch3 SFX_Cry1A_2:: ; 20126 (8:4126) - db ( $80 | CH4 ) - dw SFX_Cry1A_2_Ch1 - db CH5 - dw SFX_Cry1A_2_Ch2 - db CH7 - dw SFX_Cry1A_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1A_2_Ch1 + dbw CH5, SFX_Cry1A_2_Ch2 + dbw CH7, SFX_Cry1A_2_Ch3 SFX_Cry1B_2:: ; 2012f (8:412f) - db ( $80 | CH4 ) - dw SFX_Cry1B_2_Ch1 - db CH5 - dw SFX_Cry1B_2_Ch2 - db CH7 - dw SFX_Cry1B_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1B_2_Ch1 + dbw CH5, SFX_Cry1B_2_Ch2 + dbw CH7, SFX_Cry1B_2_Ch3 SFX_Cry1C_2:: ; 20138 (8:4138) - db ( $80 | CH4 ) - dw SFX_Cry1C_2_Ch1 - db CH5 - dw SFX_Cry1C_2_Ch2 - db CH7 - dw SFX_Cry1C_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1C_2_Ch1 + dbw CH5, SFX_Cry1C_2_Ch2 + dbw CH7, SFX_Cry1C_2_Ch3 SFX_Cry1D_2:: ; 20141 (8:4141) - db ( $80 | CH4 ) - dw SFX_Cry1D_2_Ch1 - db CH5 - dw SFX_Cry1D_2_Ch2 - db CH7 - dw SFX_Cry1D_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1D_2_Ch1 + dbw CH5, SFX_Cry1D_2_Ch2 + dbw CH7, SFX_Cry1D_2_Ch3 SFX_Cry1E_2:: ; 2014a (8:414a) - db ( $80 | CH4 ) - dw SFX_Cry1E_2_Ch1 - db CH5 - dw SFX_Cry1E_2_Ch2 - db CH7 - dw SFX_Cry1E_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1E_2_Ch1 + dbw CH5, SFX_Cry1E_2_Ch2 + dbw CH7, SFX_Cry1E_2_Ch3 SFX_Cry1F_2:: ; 20153 (8:4153) - db ( $80 | CH4 ) - dw SFX_Cry1F_2_Ch1 - db CH5 - dw SFX_Cry1F_2_Ch2 - db CH7 - dw SFX_Cry1F_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1F_2_Ch1 + dbw CH5, SFX_Cry1F_2_Ch2 + dbw CH7, SFX_Cry1F_2_Ch3 SFX_Cry20_2:: ; 2015c (8:415c) - db ( $80 | CH4 ) - dw SFX_Cry20_2_Ch1 - db CH5 - dw SFX_Cry20_2_Ch2 - db CH7 - dw SFX_Cry20_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry20_2_Ch1 + dbw CH5, SFX_Cry20_2_Ch2 + dbw CH7, SFX_Cry20_2_Ch3 SFX_Cry21_2:: ; 20165 (8:4165) - db ( $80 | CH4 ) - dw SFX_Cry21_2_Ch1 - db CH5 - dw SFX_Cry21_2_Ch2 - db CH7 - dw SFX_Cry21_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry21_2_Ch1 + dbw CH5, SFX_Cry21_2_Ch2 + dbw CH7, SFX_Cry21_2_Ch3 SFX_Cry22_2:: ; 2016e (8:416e) - db ( $80 | CH4 ) - dw SFX_Cry22_2_Ch1 - db CH5 - dw SFX_Cry22_2_Ch2 - db CH7 - dw SFX_Cry22_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry22_2_Ch1 + dbw CH5, SFX_Cry22_2_Ch2 + dbw CH7, SFX_Cry22_2_Ch3 SFX_Cry23_2:: ; 20177 (8:4177) - db ( $80 | CH4 ) - dw SFX_Cry23_2_Ch1 - db CH5 - dw SFX_Cry23_2_Ch2 - db CH7 - dw SFX_Cry23_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry23_2_Ch1 + dbw CH5, SFX_Cry23_2_Ch2 + dbw CH7, SFX_Cry23_2_Ch3 SFX_Cry24_2:: ; 20180 (8:4180) - db ( $80 | CH4 ) - dw SFX_Cry24_2_Ch1 - db CH5 - dw SFX_Cry24_2_Ch2 - db CH7 - dw SFX_Cry24_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry24_2_Ch1 + dbw CH5, SFX_Cry24_2_Ch2 + dbw CH7, SFX_Cry24_2_Ch3 SFX_Cry25_2:: ; 20189 (8:4189) - db ( $80 | CH4 ) - dw SFX_Cry25_2_Ch1 - db CH5 - dw SFX_Cry25_2_Ch2 - db CH7 - dw SFX_Cry25_2_Ch3 + dbw ( $80 | CH4 ), SFX_Cry25_2_Ch1 + dbw CH5, SFX_Cry25_2_Ch2 + dbw CH7, SFX_Cry25_2_Ch3 SFX_Level_Up:: ; 20192 (8:4192) - db ( $80 | CH4 ) - dw SFX_Level_Up_Ch1 - db CH5 - dw SFX_Level_Up_Ch2 - db CH6 - dw SFX_Level_Up_Ch3 + dbw ( $80 | CH4 ), SFX_Level_Up_Ch1 + dbw CH5, SFX_Level_Up_Ch2 + dbw CH6, SFX_Level_Up_Ch3 SFX_Get_Item2_2:: ; 2019b (8:419b) - db ( $80 | CH4 ) - dw SFX_Get_Item2_2_Ch1 - db CH5 - dw SFX_Get_Item2_2_Ch2 - db CH6 - dw SFX_Get_Item2_2_Ch3 + dbw ( $80 | CH4 ), SFX_Get_Item2_2_Ch1 + dbw CH5, SFX_Get_Item2_2_Ch2 + dbw CH6, SFX_Get_Item2_2_Ch3 SFX_Tink_2:: ; 201a4 (8:41a4) - db CH4 - dw SFX_Tink_2_Ch1 + dbw CH4, SFX_Tink_2_Ch1 SFX_Heal_HP_2:: ; 201a7 (8:41a7) - db CH4 - dw SFX_Heal_HP_2_Ch1 + dbw CH4, SFX_Heal_HP_2_Ch1 SFX_Heal_Ailment_2:: ; 201aa (8:41aa) - db CH4 - dw SFX_Heal_Ailment_2_Ch1 + dbw CH4, SFX_Heal_Ailment_2_Ch1 SFX_Start_Menu_2:: ; 201ad (8:41ad) - db CH7 - dw SFX_Start_Menu_2_Ch1 + dbw CH7, SFX_Start_Menu_2_Ch1 SFX_Press_AB_2:: ; 201b0 (8:41b0) - db CH4 - dw SFX_Press_AB_2_Ch1 + dbw CH4, SFX_Press_AB_2_Ch1 SFX_Ball_Toss:: ; 201b3 (8:41b3) - db ( $40 | CH4 ) - dw SFX_Ball_Toss_Ch1 - db CH5 - dw SFX_Ball_Toss_Ch2 + dbw ( $40 | CH4 ), SFX_Ball_Toss_Ch1 + dbw CH5, SFX_Ball_Toss_Ch2 SFX_Ball_Poof:: ; 201b9 (8:41b9) - db ( $40 | CH4 ) - dw SFX_Ball_Poof_Ch1 - db CH7 - dw SFX_Ball_Poof_Ch2 + dbw ( $40 | CH4 ), SFX_Ball_Poof_Ch1 + dbw CH7, SFX_Ball_Poof_Ch2 SFX_Faint_Thud:: ; 201bf (8:41bf) - db ( $40 | CH4 ) - dw SFX_Faint_Thud_Ch1 - db CH7 - dw SFX_Faint_Thud_Ch2 + dbw ( $40 | CH4 ), SFX_Faint_Thud_Ch1 + dbw CH7, SFX_Faint_Thud_Ch2 SFX_Run:: ; 201c5 (8:41c5) - db CH7 - dw SFX_Run_Ch1 + dbw CH7, SFX_Run_Ch1 SFX_Dex_Page_Added:: ; 201c8 (8:41c8) - db ( $40 | CH4 ) - dw SFX_Dex_Page_Added_Ch1 - db CH5 - dw SFX_Dex_Page_Added_Ch2 + dbw ( $40 | CH4 ), SFX_Dex_Page_Added_Ch1 + dbw CH5, SFX_Dex_Page_Added_Ch2 SFX_Caught_Mon:: ; 201ce (8:41ce) - db ( $80 | CH4 ) - dw SFX_Caught_Mon_Ch1 - db CH5 - dw SFX_Caught_Mon_Ch2 - db CH6 - dw SFX_Caught_Mon_Ch3 + dbw ( $80 | CH4 ), SFX_Caught_Mon_Ch1 + dbw CH5, SFX_Caught_Mon_Ch2 + dbw CH6, SFX_Caught_Mon_Ch3 SFX_Peck:: ; 201d7 (8:41d7) - db CH7 - dw SFX_Peck_Ch1 + dbw CH7, SFX_Peck_Ch1 SFX_Faint_Fall:: ; 201da (8:41da) - db CH4 - dw SFX_Faint_Fall_Ch1 + dbw CH4, SFX_Faint_Fall_Ch1 SFX_Battle_09:: ; 201dd (8:41dd) - db CH4 - dw SFX_Battle_09_Ch1 + dbw CH4, SFX_Battle_09_Ch1 SFX_Pound:: ; 201e0 (8:41e0) - db CH7 - dw SFX_Pound_Ch1 + dbw CH7, SFX_Pound_Ch1 SFX_Battle_0B:: ; 201e3 (8:41e3) - db CH7 - dw SFX_Battle_0B_Ch1 + dbw CH7, SFX_Battle_0B_Ch1 SFX_Battle_0C:: ; 201e6 (8:41e6) - db CH7 - dw SFX_Battle_0C_Ch1 + dbw CH7, SFX_Battle_0C_Ch1 SFX_Battle_0D:: ; 201e9 (8:41e9) - db CH7 - dw SFX_Battle_0D_Ch1 + dbw CH7, SFX_Battle_0D_Ch1 SFX_Battle_0E:: ; 201ec (8:41ec) - db CH7 - dw SFX_Battle_0E_Ch1 + dbw CH7, SFX_Battle_0E_Ch1 SFX_Battle_0F:: ; 201ef (8:41ef) - db CH7 - dw SFX_Battle_0F_Ch1 + dbw CH7, SFX_Battle_0F_Ch1 SFX_Damage:: ; 201f2 (8:41f2) - db CH7 - dw SFX_Damage_Ch1 + dbw CH7, SFX_Damage_Ch1 SFX_Not_Very_Effective:: ; 201f5 (8:41f5) - db CH7 - dw SFX_Not_Very_Effective_Ch1 + dbw CH7, SFX_Not_Very_Effective_Ch1 SFX_Battle_12:: ; 201f8 (8:41f8) - db CH7 - dw SFX_Battle_12_Ch1 + dbw CH7, SFX_Battle_12_Ch1 SFX_Battle_13:: ; 201fb (8:41fb) - db CH7 - dw SFX_Battle_13_Ch1 + dbw CH7, SFX_Battle_13_Ch1 SFX_Battle_14:: ; 201fe (8:41fe) - db CH7 - dw SFX_Battle_14_Ch1 + dbw CH7, SFX_Battle_14_Ch1 SFX_Vine_Whip:: ; 20201 (8:4201) - db CH7 - dw SFX_Vine_Whip_Ch1 + dbw CH7, SFX_Vine_Whip_Ch1 SFX_Battle_16:: ; 20204 (8:4204) - db CH7 - dw SFX_Battle_16_Ch1 + dbw CH7, SFX_Battle_16_Ch1 SFX_Battle_17:: ; 20207 (8:4207) - db CH7 - dw SFX_Battle_17_Ch1 + dbw CH7, SFX_Battle_17_Ch1 SFX_Battle_18:: ; 2020a (8:420a) - db CH7 - dw SFX_Battle_18_Ch1 + dbw CH7, SFX_Battle_18_Ch1 SFX_Battle_19:: ; 2020d (8:420d) - db CH7 - dw SFX_Battle_19_Ch1 + dbw CH7, SFX_Battle_19_Ch1 SFX_Super_Effective:: ; 20210 (8:4210) - db CH7 - dw SFX_Super_Effective_Ch1 + dbw CH7, SFX_Super_Effective_Ch1 SFX_Battle_1B:: ; 20213 (8:4213) - db CH7 - dw SFX_Battle_1B_Ch1 + dbw CH7, SFX_Battle_1B_Ch1 SFX_Battle_1C:: ; 20216 (8:4216) - db CH7 - dw SFX_Battle_1C_Ch1 + dbw CH7, SFX_Battle_1C_Ch1 SFX_Doubleslap:: ; 20219 (8:4219) - db CH7 - dw SFX_Doubleslap_Ch1 + dbw CH7, SFX_Doubleslap_Ch1 SFX_Battle_1E:: ; 2021c (8:421c) - db ( $40 | CH4 ) - dw SFX_Battle_1E_Ch1 - db CH7 - dw SFX_Battle_1E_Ch2 + dbw ( $40 | CH4 ), SFX_Battle_1E_Ch1 + dbw CH7, SFX_Battle_1E_Ch2 SFX_Horn_Drill:: ; 20222 (8:4222) - db CH7 - dw SFX_Horn_Drill_Ch1 + dbw CH7, SFX_Horn_Drill_Ch1 SFX_Battle_20:: ; 20225 (8:4225) - db CH7 - dw SFX_Battle_20_Ch1 + dbw CH7, SFX_Battle_20_Ch1 SFX_Battle_21:: ; 20228 (8:4228) - db CH7 - dw SFX_Battle_21_Ch1 + dbw CH7, SFX_Battle_21_Ch1 SFX_Battle_22:: ; 2022b (8:422b) - db CH7 - dw SFX_Battle_22_Ch1 + dbw CH7, SFX_Battle_22_Ch1 SFX_Battle_23:: ; 2022e (8:422e) - db CH7 - dw SFX_Battle_23_Ch1 + dbw CH7, SFX_Battle_23_Ch1 SFX_Battle_24:: ; 20231 (8:4231) - db ( $40 | CH4 ) - dw SFX_Battle_24_Ch1 - db CH7 - dw SFX_Battle_24_Ch2 + dbw ( $40 | CH4 ), SFX_Battle_24_Ch1 + dbw CH7, SFX_Battle_24_Ch2 SFX_Battle_25:: ; 20237 (8:4237) - db CH7 - dw SFX_Battle_25_Ch1 + dbw CH7, SFX_Battle_25_Ch1 SFX_Battle_26:: ; 2023a (8:423a) - db CH7 - dw SFX_Battle_26_Ch1 + dbw CH7, SFX_Battle_26_Ch1 SFX_Battle_27:: ; 2023d (8:423d) - db ( $80 | CH4 ) - dw SFX_Battle_27_Ch1 - db CH5 - dw SFX_Battle_27_Ch2 - db CH7 - dw SFX_Battle_27_Ch3 + dbw ( $80 | CH4 ), SFX_Battle_27_Ch1 + dbw CH5, SFX_Battle_27_Ch2 + dbw CH7, SFX_Battle_27_Ch3 SFX_Battle_28:: ; 20246 (8:4246) - db ( $80 | CH4 ) - dw SFX_Battle_28_Ch1 - db CH5 - dw SFX_Battle_28_Ch2 - db CH7 - dw SFX_Battle_28_Ch3 + dbw ( $80 | CH4 ), SFX_Battle_28_Ch1 + dbw CH5, SFX_Battle_28_Ch2 + dbw CH7, SFX_Battle_28_Ch3 SFX_Battle_29:: ; 2024f (8:424f) - db ( $40 | CH4 ) - dw SFX_Battle_29_Ch1 - db CH7 - dw SFX_Battle_29_Ch2 + dbw ( $40 | CH4 ), SFX_Battle_29_Ch1 + dbw CH7, SFX_Battle_29_Ch2 SFX_Battle_2A:: ; 20255 (8:4255) - db ( $80 | CH4 ) - dw SFX_Battle_2A_Ch1 - db CH5 - dw SFX_Battle_2A_Ch2 - db CH7 - dw SFX_Battle_2A_Ch3 + dbw ( $80 | CH4 ), SFX_Battle_2A_Ch1 + dbw CH5, SFX_Battle_2A_Ch2 + dbw CH7, SFX_Battle_2A_Ch3 SFX_Battle_2B:: ; 2025e (8:425e) - db ( $40 | CH4 ) - dw SFX_Battle_2B_Ch1 - db CH7 - dw SFX_Battle_2B_Ch2 + dbw ( $40 | CH4 ), SFX_Battle_2B_Ch1 + dbw CH7, SFX_Battle_2B_Ch2 SFX_Battle_2C:: ; 20264 (8:4264) - db ( $80 | CH4 ) - dw SFX_Battle_2C_Ch1 - db CH5 - dw SFX_Battle_2C_Ch2 - db CH7 - dw SFX_Battle_2C_Ch3 + dbw ( $80 | CH4 ), SFX_Battle_2C_Ch1 + dbw CH5, SFX_Battle_2C_Ch2 + dbw CH7, SFX_Battle_2C_Ch3 SFX_Psybeam:: ; 2026d (8:426d) - db ( $80 | CH4 ) - dw SFX_Psybeam_Ch1 - db CH5 - dw SFX_Psybeam_Ch2 - db CH7 - dw SFX_Psybeam_Ch3 + dbw ( $80 | CH4 ), SFX_Psybeam_Ch1 + dbw CH5, SFX_Psybeam_Ch2 + dbw CH7, SFX_Psybeam_Ch3 SFX_Battle_2E:: ; 20276 (8:4276) - db ( $80 | CH4 ) - dw SFX_Battle_2E_Ch1 - db CH5 - dw SFX_Battle_2E_Ch2 - db CH7 - dw SFX_Battle_2E_Ch3 + dbw ( $80 | CH4 ), SFX_Battle_2E_Ch1 + dbw CH5, SFX_Battle_2E_Ch2 + dbw CH7, SFX_Battle_2E_Ch3 SFX_Battle_2F:: ; 2027f (8:427f) - db ( $80 | CH4 ) - dw SFX_Battle_2F_Ch1 - db CH5 - dw SFX_Battle_2F_Ch2 - db CH7 - dw SFX_Battle_2F_Ch3 + dbw ( $80 | CH4 ), SFX_Battle_2F_Ch1 + dbw CH5, SFX_Battle_2F_Ch2 + dbw CH7, SFX_Battle_2F_Ch3 SFX_Psychic_M:: ; 20288 (8:4288) - db ( $80 | CH4 ) - dw SFX_Psychic_M_Ch1 - db CH5 - dw SFX_Psychic_M_Ch2 - db CH7 - dw SFX_Psychic_M_Ch3 + dbw ( $80 | CH4 ), SFX_Psychic_M_Ch1 + dbw CH5, SFX_Psychic_M_Ch2 + dbw CH7, SFX_Psychic_M_Ch3 SFX_Battle_31:: ; 20291 (8:4291) - db ( $40 | CH4 ) - dw SFX_Battle_31_Ch1 - db CH5 - dw SFX_Battle_31_Ch2 + dbw ( $40 | CH4 ), SFX_Battle_31_Ch1 + dbw CH5, SFX_Battle_31_Ch2 SFX_Battle_32:: ; 20297 (8:4297) - db ( $40 | CH4 ) - dw SFX_Battle_32_Ch1 - db CH5 - dw SFX_Battle_32_Ch2 + dbw ( $40 | CH4 ), SFX_Battle_32_Ch1 + dbw CH5, SFX_Battle_32_Ch2 SFX_Battle_33:: ; 2029d (8:429d) - db ( $40 | CH4 ) - dw SFX_Battle_33_Ch1 - db CH5 - dw SFX_Battle_33_Ch2 + dbw ( $40 | CH4 ), SFX_Battle_33_Ch1 + dbw CH5, SFX_Battle_33_Ch2 SFX_Battle_34:: ; 202a3 (8:42a3) - db ( $80 | CH4 ) - dw SFX_Battle_34_Ch1 - db CH5 - dw SFX_Battle_34_Ch2 - db CH7 - dw SFX_Battle_34_Ch3 + dbw ( $80 | CH4 ), SFX_Battle_34_Ch1 + dbw CH5, SFX_Battle_34_Ch2 + dbw CH7, SFX_Battle_34_Ch3 SFX_Battle_35:: ; 202ac (8:42ac) - db ( $40 | CH4 ) - dw SFX_Battle_35_Ch1 - db CH5 - dw SFX_Battle_35_Ch2 + dbw ( $40 | CH4 ), SFX_Battle_35_Ch1 + dbw CH5, SFX_Battle_35_Ch2 SFX_Battle_36:: ; 202b2 (8:42b2) - db ( $80 | CH4 ) - dw SFX_Battle_36_Ch1 - db CH5 - dw SFX_Battle_36_Ch2 - db CH7 - dw SFX_Battle_36_Ch3 + dbw ( $80 | CH4 ), SFX_Battle_36_Ch1 + dbw CH5, SFX_Battle_36_Ch2 + dbw CH7, SFX_Battle_36_Ch3 SFX_Silph_Scope:: ; 202bb (8:42bb) - db CH4 - dw SFX_Silph_Scope_Ch1 + dbw CH4, SFX_Silph_Scope_Ch1 diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm index 321a33f5..8328d6c7 100644 --- a/audio/headers/sfxheaders3.asm +++ b/audio/headers/sfxheaders3.asm @@ -1,596 +1,402 @@ SFX_Headers_3:: - db $ff, $ff, $ff ; padding + dbw -1, -1 ; padding SFX_Snare1_3:: ; 7c003 (1f:4003) - db CH7 - dw SFX_Snare1_3_Ch1 + dbw CH7, SFX_Snare1_3_Ch1 SFX_Snare2_3:: ; 7c006 (1f:4006) - db CH7 - dw SFX_Snare2_3_Ch1 + dbw CH7, SFX_Snare2_3_Ch1 SFX_Snare3_3:: ; 7c009 (1f:4009) - db CH7 - dw SFX_Snare3_3_Ch1 + dbw CH7, SFX_Snare3_3_Ch1 SFX_Snare4_3:: ; 7c00c (1f:400c) - db CH7 - dw SFX_Snare4_3_Ch1 + dbw CH7, SFX_Snare4_3_Ch1 SFX_Snare5_3:: ; 7c00f (1f:400f) - db CH7 - dw SFX_Snare5_3_Ch1 + dbw CH7, SFX_Snare5_3_Ch1 SFX_Triangle1_3:: ; 7c012 (1f:4012) - db CH7 - dw SFX_Triangle1_3_Ch1 + dbw CH7, SFX_Triangle1_3_Ch1 SFX_Triangle2_3:: ; 7c015 (1f:4015) - db CH7 - dw SFX_Triangle2_3_Ch1 + dbw CH7, SFX_Triangle2_3_Ch1 SFX_Snare6_3:: ; 7c018 (1f:4018) - db CH7 - dw SFX_Snare6_3_Ch1 + dbw CH7, SFX_Snare6_3_Ch1 SFX_Snare7_3:: ; 7c01b (1f:401b) - db CH7 - dw SFX_Snare7_3_Ch1 + dbw CH7, SFX_Snare7_3_Ch1 SFX_Snare8_3:: ; 7c01e (1f:401e) - db CH7 - dw SFX_Snare8_3_Ch1 + dbw CH7, SFX_Snare8_3_Ch1 SFX_Snare9_3:: ; 7c021 (1f:4021) - db CH7 - dw SFX_Snare9_3_Ch1 + dbw CH7, SFX_Snare9_3_Ch1 SFX_Cymbal1_3:: ; 7c024 (1f:4024) - db CH7 - dw SFX_Cymbal1_3_Ch1 + dbw CH7, SFX_Cymbal1_3_Ch1 SFX_Cymbal2_3:: ; 7c027 (1f:4027) - db CH7 - dw SFX_Cymbal2_3_Ch1 + dbw CH7, SFX_Cymbal2_3_Ch1 SFX_Cymbal3_3:: ; 7c02a (1f:402a) - db CH7 - dw SFX_Cymbal3_3_Ch1 + dbw CH7, SFX_Cymbal3_3_Ch1 SFX_Muted_Snare1_3:: ; 7c02d (1f:402d) - db CH7 - dw SFX_Muted_Snare1_3_Ch1 + dbw CH7, SFX_Muted_Snare1_3_Ch1 SFX_Triangle3_3:: ; 7c030 (1f:4030) - db CH7 - dw SFX_Triangle3_3_Ch1 + dbw CH7, SFX_Triangle3_3_Ch1 SFX_Muted_Snare2_3:: ; 7c033 (1f:4033) - db CH7 - dw SFX_Muted_Snare2_3_Ch1 + dbw CH7, SFX_Muted_Snare2_3_Ch1 SFX_Muted_Snare3_3:: ; 7c036 (1f:4036) - db CH7 - dw SFX_Muted_Snare3_3_Ch1 + dbw CH7, SFX_Muted_Snare3_3_Ch1 SFX_Muted_Snare4_3:: ; 7c039 (1f:4039) - db CH7 - dw SFX_Muted_Snare4_3_Ch1 + dbw CH7, SFX_Muted_Snare4_3_Ch1 SFX_Cry00_3:: ; 7c03c (1f:403c) - db ( $80 | CH4 ) - dw SFX_Cry00_3_Ch1 - db CH5 - dw SFX_Cry00_3_Ch2 - db CH7 - dw SFX_Cry00_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry00_3_Ch1 + dbw CH5, SFX_Cry00_3_Ch2 + dbw CH7, SFX_Cry00_3_Ch3 SFX_Cry01_3:: ; 7c045 (1f:4045) - db ( $80 | CH4 ) - dw SFX_Cry01_3_Ch1 - db CH5 - dw SFX_Cry01_3_Ch2 - db CH7 - dw SFX_Cry01_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry01_3_Ch1 + dbw CH5, SFX_Cry01_3_Ch2 + dbw CH7, SFX_Cry01_3_Ch3 SFX_Cry02_3:: ; 7c04e (1f:404e) - db ( $80 | CH4 ) - dw SFX_Cry02_3_Ch1 - db CH5 - dw SFX_Cry02_3_Ch2 - db CH7 - dw SFX_Cry02_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry02_3_Ch1 + dbw CH5, SFX_Cry02_3_Ch2 + dbw CH7, SFX_Cry02_3_Ch3 SFX_Cry03_3:: ; 7c057 (1f:4057) - db ( $80 | CH4 ) - dw SFX_Cry03_3_Ch1 - db CH5 - dw SFX_Cry03_3_Ch2 - db CH7 - dw SFX_Cry03_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry03_3_Ch1 + dbw CH5, SFX_Cry03_3_Ch2 + dbw CH7, SFX_Cry03_3_Ch3 SFX_Cry04_3:: ; 7c060 (1f:4060) - db ( $80 | CH4 ) - dw SFX_Cry04_3_Ch1 - db CH5 - dw SFX_Cry04_3_Ch2 - db CH7 - dw SFX_Cry04_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry04_3_Ch1 + dbw CH5, SFX_Cry04_3_Ch2 + dbw CH7, SFX_Cry04_3_Ch3 SFX_Cry05_3:: ; 7c069 (1f:4069) - db ( $80 | CH4 ) - dw SFX_Cry05_3_Ch1 - db CH5 - dw SFX_Cry05_3_Ch2 - db CH7 - dw SFX_Cry05_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry05_3_Ch1 + dbw CH5, SFX_Cry05_3_Ch2 + dbw CH7, SFX_Cry05_3_Ch3 SFX_Cry06_3:: ; 7c072 (1f:4072) - db ( $80 | CH4 ) - dw SFX_Cry06_3_Ch1 - db CH5 - dw SFX_Cry06_3_Ch2 - db CH7 - dw SFX_Cry06_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry06_3_Ch1 + dbw CH5, SFX_Cry06_3_Ch2 + dbw CH7, SFX_Cry06_3_Ch3 SFX_Cry07_3:: ; 7c07b (1f:407b) - db ( $80 | CH4 ) - dw SFX_Cry07_3_Ch1 - db CH5 - dw SFX_Cry07_3_Ch2 - db CH7 - dw SFX_Cry07_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry07_3_Ch1 + dbw CH5, SFX_Cry07_3_Ch2 + dbw CH7, SFX_Cry07_3_Ch3 SFX_Cry08_3:: ; 7c084 (1f:4084) - db ( $80 | CH4 ) - dw SFX_Cry08_3_Ch1 - db CH5 - dw SFX_Cry08_3_Ch2 - db CH7 - dw SFX_Cry08_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry08_3_Ch1 + dbw CH5, SFX_Cry08_3_Ch2 + dbw CH7, SFX_Cry08_3_Ch3 SFX_Cry09_3:: ; 7c08d (1f:408d) - db ( $80 | CH4 ) - dw SFX_Cry09_3_Ch1 - db CH5 - dw SFX_Cry09_3_Ch2 - db CH7 - dw SFX_Cry09_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry09_3_Ch1 + dbw CH5, SFX_Cry09_3_Ch2 + dbw CH7, SFX_Cry09_3_Ch3 SFX_Cry0A_3:: ; 7c096 (1f:4096) - db ( $80 | CH4 ) - dw SFX_Cry0A_3_Ch1 - db CH5 - dw SFX_Cry0A_3_Ch2 - db CH7 - dw SFX_Cry0A_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0A_3_Ch1 + dbw CH5, SFX_Cry0A_3_Ch2 + dbw CH7, SFX_Cry0A_3_Ch3 SFX_Cry0B_3:: ; 7c09f (1f:409f) - db ( $80 | CH4 ) - dw SFX_Cry0B_3_Ch1 - db CH5 - dw SFX_Cry0B_3_Ch2 - db CH7 - dw SFX_Cry0B_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0B_3_Ch1 + dbw CH5, SFX_Cry0B_3_Ch2 + dbw CH7, SFX_Cry0B_3_Ch3 SFX_Cry0C_3:: ; 7c0a8 (1f:40a8) - db ( $80 | CH4 ) - dw SFX_Cry0C_3_Ch1 - db CH5 - dw SFX_Cry0C_3_Ch2 - db CH7 - dw SFX_Cry0C_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0C_3_Ch1 + dbw CH5, SFX_Cry0C_3_Ch2 + dbw CH7, SFX_Cry0C_3_Ch3 SFX_Cry0D_3:: ; 7c0b1 (1f:40b1) - db ( $80 | CH4 ) - dw SFX_Cry0D_3_Ch1 - db CH5 - dw SFX_Cry0D_3_Ch2 - db CH7 - dw SFX_Cry0D_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0D_3_Ch1 + dbw CH5, SFX_Cry0D_3_Ch2 + dbw CH7, SFX_Cry0D_3_Ch3 SFX_Cry0E_3:: ; 7c0ba (1f:40ba) - db ( $80 | CH4 ) - dw SFX_Cry0E_3_Ch1 - db CH5 - dw SFX_Cry0E_3_Ch2 - db CH7 - dw SFX_Cry0E_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0E_3_Ch1 + dbw CH5, SFX_Cry0E_3_Ch2 + dbw CH7, SFX_Cry0E_3_Ch3 SFX_Cry0F_3:: ; 7c0c3 (1f:40c3) - db ( $80 | CH4 ) - dw SFX_Cry0F_3_Ch1 - db CH5 - dw SFX_Cry0F_3_Ch2 - db CH7 - dw SFX_Cry0F_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry0F_3_Ch1 + dbw CH5, SFX_Cry0F_3_Ch2 + dbw CH7, SFX_Cry0F_3_Ch3 SFX_Cry10_3:: ; 7c0cc (1f:40cc) - db ( $80 | CH4 ) - dw SFX_Cry10_3_Ch1 - db CH5 - dw SFX_Cry10_3_Ch2 - db CH7 - dw SFX_Cry10_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry10_3_Ch1 + dbw CH5, SFX_Cry10_3_Ch2 + dbw CH7, SFX_Cry10_3_Ch3 SFX_Cry11_3:: ; 7c0d5 (1f:40d5) - db ( $80 | CH4 ) - dw SFX_Cry11_3_Ch1 - db CH5 - dw SFX_Cry11_3_Ch2 - db CH7 - dw SFX_Cry11_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry11_3_Ch1 + dbw CH5, SFX_Cry11_3_Ch2 + dbw CH7, SFX_Cry11_3_Ch3 SFX_Cry12_3:: ; 7c0de (1f:40de) - db ( $80 | CH4 ) - dw SFX_Cry12_3_Ch1 - db CH5 - dw SFX_Cry12_3_Ch2 - db CH7 - dw SFX_Cry12_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry12_3_Ch1 + dbw CH5, SFX_Cry12_3_Ch2 + dbw CH7, SFX_Cry12_3_Ch3 SFX_Cry13_3:: ; 7c0e7 (1f:40e7) - db ( $80 | CH4 ) - dw SFX_Cry13_3_Ch1 - db CH5 - dw SFX_Cry13_3_Ch2 - db CH7 - dw SFX_Cry13_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry13_3_Ch1 + dbw CH5, SFX_Cry13_3_Ch2 + dbw CH7, SFX_Cry13_3_Ch3 SFX_Cry14_3:: ; 7c0f0 (1f:40f0) - db ( $80 | CH4 ) - dw SFX_Cry14_3_Ch1 - db CH5 - dw SFX_Cry14_3_Ch2 - db CH7 - dw SFX_Cry14_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry14_3_Ch1 + dbw CH5, SFX_Cry14_3_Ch2 + dbw CH7, SFX_Cry14_3_Ch3 SFX_Cry15_3:: ; 7c0f9 (1f:40f9) - db ( $80 | CH4 ) - dw SFX_Cry15_3_Ch1 - db CH5 - dw SFX_Cry15_3_Ch2 - db CH7 - dw SFX_Cry15_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry15_3_Ch1 + dbw CH5, SFX_Cry15_3_Ch2 + dbw CH7, SFX_Cry15_3_Ch3 SFX_Cry16_3:: ; 7c102 (1f:4102) - db ( $80 | CH4 ) - dw SFX_Cry16_3_Ch1 - db CH5 - dw SFX_Cry16_3_Ch2 - db CH7 - dw SFX_Cry16_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry16_3_Ch1 + dbw CH5, SFX_Cry16_3_Ch2 + dbw CH7, SFX_Cry16_3_Ch3 SFX_Cry17_3:: ; 7c10b (1f:410b) - db ( $80 | CH4 ) - dw SFX_Cry17_3_Ch1 - db CH5 - dw SFX_Cry17_3_Ch2 - db CH7 - dw SFX_Cry17_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry17_3_Ch1 + dbw CH5, SFX_Cry17_3_Ch2 + dbw CH7, SFX_Cry17_3_Ch3 SFX_Cry18_3:: ; 7c114 (1f:4114) - db ( $80 | CH4 ) - dw SFX_Cry18_3_Ch1 - db CH5 - dw SFX_Cry18_3_Ch2 - db CH7 - dw SFX_Cry18_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry18_3_Ch1 + dbw CH5, SFX_Cry18_3_Ch2 + dbw CH7, SFX_Cry18_3_Ch3 SFX_Cry19_3:: ; 7c11d (1f:411d) - db ( $80 | CH4 ) - dw SFX_Cry19_3_Ch1 - db CH5 - dw SFX_Cry19_3_Ch2 - db CH7 - dw SFX_Cry19_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry19_3_Ch1 + dbw CH5, SFX_Cry19_3_Ch2 + dbw CH7, SFX_Cry19_3_Ch3 SFX_Cry1A_3:: ; 7c126 (1f:4126) - db ( $80 | CH4 ) - dw SFX_Cry1A_3_Ch1 - db CH5 - dw SFX_Cry1A_3_Ch2 - db CH7 - dw SFX_Cry1A_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1A_3_Ch1 + dbw CH5, SFX_Cry1A_3_Ch2 + dbw CH7, SFX_Cry1A_3_Ch3 SFX_Cry1B_3:: ; 7c12f (1f:412f) - db ( $80 | CH4 ) - dw SFX_Cry1B_3_Ch1 - db CH5 - dw SFX_Cry1B_3_Ch2 - db CH7 - dw SFX_Cry1B_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1B_3_Ch1 + dbw CH5, SFX_Cry1B_3_Ch2 + dbw CH7, SFX_Cry1B_3_Ch3 SFX_Cry1C_3:: ; 7c138 (1f:4138) - db ( $80 | CH4 ) - dw SFX_Cry1C_3_Ch1 - db CH5 - dw SFX_Cry1C_3_Ch2 - db CH7 - dw SFX_Cry1C_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1C_3_Ch1 + dbw CH5, SFX_Cry1C_3_Ch2 + dbw CH7, SFX_Cry1C_3_Ch3 SFX_Cry1D_3:: ; 7c141 (1f:4141) - db ( $80 | CH4 ) - dw SFX_Cry1D_3_Ch1 - db CH5 - dw SFX_Cry1D_3_Ch2 - db CH7 - dw SFX_Cry1D_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1D_3_Ch1 + dbw CH5, SFX_Cry1D_3_Ch2 + dbw CH7, SFX_Cry1D_3_Ch3 SFX_Cry1E_3:: ; 7c14a (1f:414a) - db ( $80 | CH4 ) - dw SFX_Cry1E_3_Ch1 - db CH5 - dw SFX_Cry1E_3_Ch2 - db CH7 - dw SFX_Cry1E_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1E_3_Ch1 + dbw CH5, SFX_Cry1E_3_Ch2 + dbw CH7, SFX_Cry1E_3_Ch3 SFX_Cry1F_3:: ; 7c153 (1f:4153) - db ( $80 | CH4 ) - dw SFX_Cry1F_3_Ch1 - db CH5 - dw SFX_Cry1F_3_Ch2 - db CH7 - dw SFX_Cry1F_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry1F_3_Ch1 + dbw CH5, SFX_Cry1F_3_Ch2 + dbw CH7, SFX_Cry1F_3_Ch3 SFX_Cry20_3:: ; 7c15c (1f:415c) - db ( $80 | CH4 ) - dw SFX_Cry20_3_Ch1 - db CH5 - dw SFX_Cry20_3_Ch2 - db CH7 - dw SFX_Cry20_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry20_3_Ch1 + dbw CH5, SFX_Cry20_3_Ch2 + dbw CH7, SFX_Cry20_3_Ch3 SFX_Cry21_3:: ; 7c165 (1f:4165) - db ( $80 | CH4 ) - dw SFX_Cry21_3_Ch1 - db CH5 - dw SFX_Cry21_3_Ch2 - db CH7 - dw SFX_Cry21_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry21_3_Ch1 + dbw CH5, SFX_Cry21_3_Ch2 + dbw CH7, SFX_Cry21_3_Ch3 SFX_Cry22_3:: ; 7c16e (1f:416e) - db ( $80 | CH4 ) - dw SFX_Cry22_3_Ch1 - db CH5 - dw SFX_Cry22_3_Ch2 - db CH7 - dw SFX_Cry22_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry22_3_Ch1 + dbw CH5, SFX_Cry22_3_Ch2 + dbw CH7, SFX_Cry22_3_Ch3 SFX_Cry23_3:: ; 7c177 (1f:4177) - db ( $80 | CH4 ) - dw SFX_Cry23_3_Ch1 - db CH5 - dw SFX_Cry23_3_Ch2 - db CH7 - dw SFX_Cry23_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry23_3_Ch1 + dbw CH5, SFX_Cry23_3_Ch2 + dbw CH7, SFX_Cry23_3_Ch3 SFX_Cry24_3:: ; 7c180 (1f:4180) - db ( $80 | CH4 ) - dw SFX_Cry24_3_Ch1 - db CH5 - dw SFX_Cry24_3_Ch2 - db CH7 - dw SFX_Cry24_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry24_3_Ch1 + dbw CH5, SFX_Cry24_3_Ch2 + dbw CH7, SFX_Cry24_3_Ch3 SFX_Cry25_3:: ; 7c189 (1f:4189) - db ( $80 | CH4 ) - dw SFX_Cry25_3_Ch1 - db CH5 - dw SFX_Cry25_3_Ch2 - db CH7 - dw SFX_Cry25_3_Ch3 + dbw ( $80 | CH4 ), SFX_Cry25_3_Ch1 + dbw CH5, SFX_Cry25_3_Ch2 + dbw CH7, SFX_Cry25_3_Ch3 SFX_Get_Item1_3:: ; 7c192 (1f:4192) - db ( $80 | CH4 ) - dw SFX_Get_Item1_3_Ch1 - db CH5 - dw SFX_Get_Item1_3_Ch2 - db CH6 - dw SFX_Get_Item1_3_Ch3 + dbw ( $80 | CH4 ), SFX_Get_Item1_3_Ch1 + dbw CH5, SFX_Get_Item1_3_Ch2 + dbw CH6, SFX_Get_Item1_3_Ch3 SFX_Get_Item2_3:: ; 7c19b (1f:419b) - db ( $80 | CH4 ) - dw SFX_Get_Item2_3_Ch1 - db CH5 - dw SFX_Get_Item2_3_Ch2 - db CH6 - dw SFX_Get_Item2_3_Ch3 + dbw ( $80 | CH4 ), SFX_Get_Item2_3_Ch1 + dbw CH5, SFX_Get_Item2_3_Ch2 + dbw CH6, SFX_Get_Item2_3_Ch3 SFX_Tink_3:: ; 7c1a4 (1f:41a4) - db CH4 - dw SFX_Tink_3_Ch1 + dbw CH4, SFX_Tink_3_Ch1 SFX_Heal_HP_3:: ; 7c1a7 (1f:41a7) - db CH4 - dw SFX_Heal_HP_3_Ch1 + dbw CH4, SFX_Heal_HP_3_Ch1 SFX_Heal_Ailment_3:: ; 7c1aa (1f:41aa) - db CH4 - dw SFX_Heal_Ailment_3_Ch1 + dbw CH4, SFX_Heal_Ailment_3_Ch1 SFX_Start_Menu_3:: ; 7c1ad (1f:41ad) - db CH7 - dw SFX_Start_Menu_3_Ch1 + dbw CH7, SFX_Start_Menu_3_Ch1 SFX_Press_AB_3:: ; 7c1b0 (1f:41b0) - db CH4 - dw SFX_Press_AB_3_Ch1 + dbw CH4, SFX_Press_AB_3_Ch1 SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3) - db ( $80 | CH4 ) - dw SFX_Pokedex_Rating_3_Ch1 - db CH5 - dw SFX_Pokedex_Rating_3_Ch2 - db CH6 - dw SFX_Pokedex_Rating_3_Ch3 + dbw ( $80 | CH4 ), SFX_Pokedex_Rating_3_Ch1 + dbw CH5, SFX_Pokedex_Rating_3_Ch2 + dbw CH6, SFX_Pokedex_Rating_3_Ch3 SFX_Get_Key_Item_3:: ; 7c1bc (1f:41bc) - db ( $80 | CH4 ) - dw SFX_Get_Key_Item_3_Ch1 - db CH5 - dw SFX_Get_Key_Item_3_Ch2 - db CH6 - dw SFX_Get_Key_Item_3_Ch3 + 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 SFX_Poisoned_3:: ; 7c1c5 (1f:41c5) - db CH4 - dw SFX_Poisoned_3_Ch1 + dbw CH4, SFX_Poisoned_3_Ch1 SFX_Trade_Machine_3:: ; 7c1c8 (1f:41c8) - db CH4 - dw SFX_Trade_Machine_3_Ch1 + dbw CH4, SFX_Trade_Machine_3_Ch1 SFX_Turn_On_PC_3:: ; 7c1cb (1f:41cb) - db CH4 - dw SFX_Turn_On_PC_3_Ch1 + dbw CH4, SFX_Turn_On_PC_3_Ch1 SFX_Turn_Off_PC_3:: ; 7c1ce (1f:41ce) - db CH4 - dw SFX_Turn_Off_PC_3_Ch1 + dbw CH4, SFX_Turn_Off_PC_3_Ch1 SFX_Enter_PC_3:: ; 7c1d1 (1f:41d1) - db CH4 - dw SFX_Enter_PC_3_Ch1 + dbw CH4, SFX_Enter_PC_3_Ch1 SFX_Shrink_3:: ; 7c1d4 (1f:41d4) - db CH4 - dw SFX_Shrink_3_Ch1 + dbw CH4, SFX_Shrink_3_Ch1 SFX_Switch_3:: ; 7c1d7 (1f:41d7) - db CH4 - dw SFX_Switch_3_Ch1 + dbw CH4, SFX_Switch_3_Ch1 SFX_Healing_Machine_3:: ; 7c1da (1f:41da) - db CH4 - dw SFX_Healing_Machine_3_Ch1 + dbw CH4, SFX_Healing_Machine_3_Ch1 SFX_Teleport_Exit1_3:: ; 7c1dd (1f:41dd) - db CH4 - dw SFX_Teleport_Exit1_3_Ch1 + dbw CH4, SFX_Teleport_Exit1_3_Ch1 SFX_Teleport_Enter1_3:: ; 7c1e0 (1f:41e0) - db CH4 - dw SFX_Teleport_Enter1_3_Ch1 + dbw CH4, SFX_Teleport_Enter1_3_Ch1 SFX_Teleport_Exit2_3:: ; 7c1e3 (1f:41e3) - db CH4 - dw SFX_Teleport_Exit2_3_Ch1 + dbw CH4, SFX_Teleport_Exit2_3_Ch1 SFX_Ledge_3:: ; 7c1e6 (1f:41e6) - db CH4 - dw SFX_Ledge_3_Ch1 + dbw CH4, SFX_Ledge_3_Ch1 SFX_Teleport_Enter2_3:: ; 7c1e9 (1f:41e9) - db CH7 - dw SFX_Teleport_Enter2_3_Ch1 + dbw CH7, SFX_Teleport_Enter2_3_Ch1 SFX_Fly_3:: ; 7c1ec (1f:41ec) - db CH7 - dw SFX_Fly_3_Ch1 + dbw CH7, SFX_Fly_3_Ch1 SFX_Denied_3:: ; 7c1ef (1f:41ef) - db ( $40 | CH4 ) - dw SFX_Denied_3_Ch1 - db CH5 - dw SFX_Denied_3_Ch2 + dbw ( $40 | CH4 ), SFX_Denied_3_Ch1 + dbw CH5, SFX_Denied_3_Ch2 SFX_Arrow_Tiles_3:: ; 7c1f5 (1f:41f5) - db CH4 - dw SFX_Arrow_Tiles_3_Ch1 + dbw CH4, SFX_Arrow_Tiles_3_Ch1 SFX_Push_Boulder_3:: ; 7c1f8 (1f:41f8) - db CH7 - dw SFX_Push_Boulder_3_Ch1 + dbw CH7, SFX_Push_Boulder_3_Ch1 SFX_SS_Anne_Horn_3:: ; 7c1fb (1f:41fb) - db ( $40 | CH4 ) - dw SFX_SS_Anne_Horn_3_Ch1 - db CH5 - dw SFX_SS_Anne_Horn_3_Ch2 + dbw ( $40 | CH4 ), SFX_SS_Anne_Horn_3_Ch1 + dbw CH5, SFX_SS_Anne_Horn_3_Ch2 SFX_Withdraw_Deposit_3:: ; 7c201 (1f:4201) - db CH4 - dw SFX_Withdraw_Deposit_3_Ch1 + dbw CH4, SFX_Withdraw_Deposit_3_Ch1 SFX_Cut_3:: ; 7c204 (1f:4204) - db CH7 - dw SFX_Cut_3_Ch1 + dbw CH7, SFX_Cut_3_Ch1 SFX_Go_Inside_3:: ; 7c207 (1f:4207) - db CH7 - dw SFX_Go_Inside_3_Ch1 + dbw CH7, SFX_Go_Inside_3_Ch1 SFX_Swap_3:: ; 7c20a (1f:420a) - db ( $40 | CH4 ) - dw SFX_Swap_3_Ch1 - db CH5 - dw SFX_Swap_3_Ch2 + dbw ( $40 | CH4 ), SFX_Swap_3_Ch1 + dbw CH5, SFX_Swap_3_Ch2 SFX_59_3:: ; 7c210 (1f:4210) - db ( $40 | CH4 ) - dw SFX_59_3_Ch1 - db CH5 - dw SFX_59_3_Ch2 + dbw ( $40 | CH4 ), SFX_59_3_Ch1 + dbw CH5, SFX_59_3_Ch2 SFX_Purchase_3:: ; 7c216 (1f:4216) - db ( $40 | CH4 ) - dw SFX_Purchase_3_Ch1 - db CH5 - dw SFX_Purchase_3_Ch2 + dbw ( $40 | CH4 ), SFX_Purchase_3_Ch1 + dbw CH5, SFX_Purchase_3_Ch2 SFX_Collision_3:: ; 7c21c (1f:421c) - db CH4 - dw SFX_Collision_3_Ch1 + dbw CH4, SFX_Collision_3_Ch1 SFX_Go_Outside_3:: ; 7c21f (1f:421f) - db CH7 - dw SFX_Go_Outside_3_Ch1 + dbw CH7, SFX_Go_Outside_3_Ch1 SFX_Save_3:: ; 7c222 (1f:4222) - db ( $40 | CH4 ) - dw SFX_Save_3_Ch1 - db CH5 - dw SFX_Save_3_Ch2 + dbw ( $40 | CH4 ), SFX_Save_3_Ch1 + dbw CH5, SFX_Save_3_Ch2 SFX_Intro_Lunge:: ; 7c228 (1f:4228) - db CH7 - dw SFX_Intro_Lunge_Ch1 + dbw CH7, SFX_Intro_Lunge_Ch1 SFX_Intro_Hip:: ; 7c22b (1f:422b) - db CH4 - dw SFX_Intro_Hip_Ch1 + dbw CH4, SFX_Intro_Hip_Ch1 SFX_Intro_Hop:: ; 7c22e (1f:422e) - db CH4 - dw SFX_Intro_Hop_Ch1 + dbw CH4, SFX_Intro_Hop_Ch1 SFX_Intro_Raise:: ; 7c231 (1f:4231) - db CH7 - dw SFX_Intro_Raise_Ch1 + dbw CH7, SFX_Intro_Raise_Ch1 SFX_Intro_Crash:: ; 7c234 (1f:4234) - db CH7 - dw SFX_Intro_Crash_Ch1 + dbw CH7, SFX_Intro_Crash_Ch1 SFX_Intro_Whoosh:: ; 7c237 (1f:4237) - db CH7 - dw SFX_Intro_Whoosh_Ch1 + dbw CH7, SFX_Intro_Whoosh_Ch1 SFX_Slots_Stop_Wheel:: ; 7c23a (1f:423a) - db CH4 - dw SFX_Slots_Stop_Wheel_Ch1 + dbw CH4, SFX_Slots_Stop_Wheel_Ch1 SFX_Slots_Reward:: ; 7c23d (1f:423d) - db CH4 - dw SFX_Slots_Reward_Ch1 + dbw CH4, SFX_Slots_Reward_Ch1 SFX_Slots_New_Spin:: ; 7c240 (1f:4240) - db ( $40 | CH4 ) - dw SFX_Slots_New_Spin_Ch1 - db CH5 - dw SFX_Slots_New_Spin_Ch2 + dbw ( $40 | CH4 ), SFX_Slots_New_Spin_Ch1 + dbw CH5, SFX_Slots_New_Spin_Ch2 SFX_Shooting_Star:: ; 7c246 (1f:4246) - db CH4 - dw SFX_Shooting_Star_Ch1 + dbw CH4, SFX_Shooting_Star_Ch1 diff --git a/audio/headers/sfxheaders4.asm b/audio/headers/sfxheaders4.asm index 6968bcf0..bb60c5bd 100644 --- a/audio/headers/sfxheaders4.asm +++ b/audio/headers/sfxheaders4.asm @@ -1,610 +1,294 @@ SFX_Headers_4:: ; 80000 (20:4000) - db $ff, $ff, $ff + dbw -1, -1 ; padding -SFX_80003_4:: ; 80003 (20:4003) - db CH7 - dw SFX_841ec_4_Ch7 +SFX_Snare1_4:: ; 80003 (20:4003) + dbw CH7, SFX_Snare1_4_Ch7 -SFX_80006_4:: ; 80006 (20:4006) - db CH7 - dw SFX_841f0_4_Ch7 +SFX_Snare2_4:: ; 80006 (20:4006) + dbw CH7, SFX_Snare2_4_Ch7 -SFX_80009_4:: ; 80009 (20:4009) - db CH7 - dw SFX_841f4_4_Ch7 +SFX_Snare3_4:: ; 80009 (20:4009) + dbw CH7, SFX_Snare3_4_Ch7 -SFX_8000c_4:: ; 8000c (20:400c) - db CH7 - dw SFX_841f8_4_Ch7 +SFX_Snare4_4:: ; 8000c (20:400c) + dbw CH7, SFX_Snare4_4_Ch7 -SFX_8000f_4:: ; 8000f (20:400f) - db CH7 - dw SFX_841fc_4_Ch7 +SFX_Snare5_4:: ; 8000f (20:400f) + dbw CH7, SFX_Snare5_4_Ch7 -SFX_80012_4:: ; 80012 (20:4012) - db CH7 - dw SFX_8420f_4_Ch7 +SFX_Triangle1_4:: ; 80012 (20:4012) + dbw CH7, SFX_Triangle1_4_Ch7 -SFX_80015_4:: ; 80015 (20:4015) - db CH7 - dw SFX_84213_4_Ch7 +SFX_Triangle2_4:: ; 80015 (20:4015) + dbw CH7, SFX_Triangle2_4_Ch7 -SFX_80018_4:: ; 80018 (20:4018) - db CH7 - dw SFX_8421a_4_Ch7 +SFX_Snare6_4:: ; 80018 (20:4018) + dbw CH7, SFX_Snare6_4_Ch7 -SFX_8001b_4:: ; 8001b (20:401b) - db CH7 - dw SFX_8421e_4_Ch7 +SFX_Snare7_4:: ; 8001b (20:401b) + dbw CH7, SFX_Snare7_4_Ch7 -SFX_8001e_4:: ; 8001e (20:401e) - db CH7 - dw SFX_84222_4_Ch7 +SFX_Snare8_4:: ; 8001e (20:401e) + dbw CH7, SFX_Snare8_4_Ch7 -SFX_80021_4:: ; 80021 (20:4021) - db CH7 - dw SFX_84226_4_Ch7 +SFX_Snare9_4:: ; 80021 (20:4021) + dbw CH7, SFX_Snare9_4_Ch7 -SFX_80024_4:: ; 80024 (20:4024) - db CH7 - dw SFX_8422a_4_Ch7 +SFX_Cymbal1_4:: ; 80024 (20:4024) + dbw CH7, SFX_Cymbal1_4_Ch7 -SFX_80027_4:: ; 80027 (20:4027) - db CH7 - dw SFX_8422e_4_Ch7 +SFX_Cymbal2_4:: ; 80027 (20:4027) + dbw CH7, SFX_Cymbal2_4_Ch7 -SFX_8002a_4:: ; 8002a (20:402a) - db CH7 - dw SFX_84232_4_Ch7 +SFX_Cymbal3_4:: ; 8002a (20:402a) + dbw CH7, SFX_Cymbal3_4_Ch7 -SFX_8002d_4:: ; 8002d (20:402d) - db CH7 - dw SFX_84236_4_Ch7 +SFX_Muted_Snare1_4:: ; 8002d (20:402d) + dbw CH7, SFX_Muted_Snare1_4_Ch7 -SFX_80030_4:: ; 80030 (20:4030) - db CH7 - dw SFX_8423d_4_Ch7 +SFX_Triangle3_4:: ; 80030 (20:4030) + dbw CH7, SFX_Triangle3_4_Ch7 -SFX_80033_4:: ; 80033 (20:4033) - db CH7 - dw SFX_84244_4_Ch7 +SFX_Muted_Snare2_4:: ; 80033 (20:4033) + dbw CH7, SFX_Muted_Snare2_4_Ch7 -SFX_80036_4:: ; 80036 (20:4036) - db CH7 - dw SFX_84248_4_Ch7 +SFX_Muted_Snare3_4:: ; 80036 (20:4036) + dbw CH7, SFX_Muted_Snare3_4_Ch7 -SFX_80039_4:: ; 80039 (20:4039) - db CH7 - dw SFX_8424c_4_Ch7 +SFX_Muted_Snare4_4:: ; 80039 (20:4039) + dbw CH7, SFX_Muted_Snare4_4_Ch7 SFX_8003c_4:: ; 8003c (20:403c) - db ( $80 | CH4 ) - dw SFX_845db_4_Ch4 - -SFX_8003f_4:: ; 8003f (20:403f) - db CH5 - dw SFX_845ea_4_Ch5 - -SFX_80042_4:: ; 80042 (20:4042) - db CH7 - dw SFX_845f9_4_Ch7 + dbw ( $80 | CH4 ), SFX_805db_4_Ch4 + dbw CH5, SFX_805ea_4_Ch5 + dbw CH7, SFX_805f9_4_Ch7 SFX_80045_4:: ; 80045 (20:4045) - db ( $80 | CH4 ) - dw SFX_847eb_4_Ch4 - -SFX_80048_4:: ; 80048 (20:4048) - db CH5 - dw SFX_847fe_4_Ch5 - -SFX_8004b_4:: ; 8004b (20:404b) - db CH7 - dw SFX_84811_4_Ch7 + dbw ( $80 | CH4 ), SFX_807eb_4_Ch4 + dbw CH5, SFX_807fe_4_Ch5 + dbw CH7, SFX_80811_4_Ch7 SFX_8004e_4:: ; 8004e (20:404e) - db ( $80 | CH4 ) - dw SFX_84760_4_Ch4 - -SFX_80051_4:: ; 80051 (20:4051) - db CH5 - dw SFX_8476f_4_Ch5 - -SFX_80054_4:: ; 80054 (20:4054) - db CH7 - dw SFX_8477d_4_Ch7 + dbw ( $80 | CH4 ), SFX_80760_4_Ch4 + dbw CH5, SFX_8076f_4_Ch5 + dbw CH7, SFX_8077d_4_Ch7 SFX_80057_4:: ; 80057 (20:4057) - db ( $80 | CH4 ) - dw SFX_844fa_4_Ch4 - -SFX_8005a_4:: ; 8005a (20:405a) - db CH5 - dw SFX_84519_4_Ch5 - -SFX_8005d_4:: ; 8005d (20:405d) - db CH7 - dw SFX_84538_4_Ch7 + dbw ( $80 | CH4 ), SFX_804fa_4_Ch4 + dbw CH5, SFX_80519_4_Ch5 + dbw CH7, SFX_80538_4_Ch7 SFX_80060_4:: ; 80060 (20:4060) - db ( $80 | CH4 ) - dw SFX_848a9_4_Ch4 - -SFX_80063_4:: ; 80063 (20:4063) - db CH5 - dw SFX_848c8_4_Ch5 - -SFX_80066_4:: ; 80066 (20:4066) - db CH7 - dw SFX_848e7_4_Ch7 + dbw ( $80 | CH4 ), SFX_808a9_4_Ch4 + dbw CH5, SFX_808c8_4_Ch5 + dbw CH7, SFX_808e7_4_Ch7 SFX_80069_4:: ; 80069 (20:4069) - db ( $80 | CH4 ) - dw SFX_84689_4_Ch4 - -SFX_8006c_4:: ; 8006c (20:406c) - db CH5 - dw SFX_8469c_4_Ch5 - -SFX_8006f_4:: ; 8006f (20:406f) - db CH7 - dw SFX_846ae_4_Ch7 + dbw ( $80 | CH4 ), SFX_80689_4_Ch4 + dbw CH5, SFX_8069c_4_Ch5 + dbw CH7, SFX_806ae_4_Ch7 SFX_80072_4:: ; 80072 (20:4072) - db ( $80 | CH4 ) - dw SFX_84633_4_Ch4 - -SFX_80075_4:: ; 80075 (20:4075) - db CH5 - dw SFX_8464d_4_Ch5 - -SFX_80078_4:: ; 80078 (20:4078) - db CH7 - dw SFX_8464e_4_Ch7 + dbw ( $80 | CH4 ), SFX_80633_4_Ch4 + dbw CH5, SFX_8064d_4_Ch5 + dbw CH7, SFX_8064e_4_Ch7 SFX_8007b_4:: ; 8007b (20:407b) - db ( $80 | CH4 ) - dw SFX_84661_4_Ch4 - -SFX_8007e_4:: ; 8007e (20:407e) - db CH5 - dw SFX_84670_4_Ch5 - -SFX_80081_4:: ; 80081 (20:4081) - db CH7 - dw SFX_8467f_4_Ch7 + dbw ( $80 | CH4 ), SFX_80661_4_Ch4 + dbw CH5, SFX_80670_4_Ch5 + dbw CH7, SFX_8067f_4_Ch7 SFX_80084_4:: ; 80084 (20:4084) - db ( $80 | CH4 ) - dw SFX_84879_4_Ch4 - -SFX_80087_4:: ; 80087 (20:4087) - db CH5 - dw SFX_8488c_4_Ch5 - -SFX_8008a_4:: ; 8008a (20:408a) - db CH7 - dw SFX_8489f_4_Ch7 + dbw ( $80 | CH4 ), SFX_80879_4_Ch4 + dbw CH5, SFX_8088c_4_Ch5 + dbw CH7, SFX_8089f_4_Ch7 SFX_8008d_4:: ; 8008d (20:408d) - db ( $80 | CH4 ) - dw SFX_84383_4_Ch4 - -SFX_80090_4:: ; 80090 (20:4090) - db CH5 - dw SFX_843a0_4_Ch5 - -SFX_80093_4:: ; 80093 (20:4093) - db CH7 - dw SFX_843c1_4_Ch7 + dbw ( $80 | CH4 ), SFX_80383_4_Ch4 + dbw CH5, SFX_803a0_4_Ch5 + dbw CH7, SFX_803c1_4_Ch7 SFX_80096_4:: ; 80096 (20:4096) - db ( $80 | CH4 ) - dw SFX_8481e_4_Ch4 - -SFX_80099_4:: ; 80099 (20:4099) - db CH5 - dw SFX_8483d_4_Ch5 - -SFX_8009c_4:: ; 8009c (20:409c) - db CH7 - dw SFX_84860_4_Ch7 + dbw ( $80 | CH4 ), SFX_8081e_4_Ch4 + dbw CH5, SFX_8083d_4_Ch5 + dbw CH7, SFX_80860_4_Ch7 SFX_8009f_4:: ; 8009f (20:409f) - db ( $80 | CH4 ) - dw SFX_846af_4_Ch4 - -SFX_800a2_4:: ; 800a2 (20:40a2) - db CH5 - dw SFX_846da_4_Ch5 - -SFX_800a5_4:: ; 800a5 (20:40a5) - db CH7 - dw SFX_846f9_4_Ch7 + dbw ( $80 | CH4 ), SFX_806af_4_Ch4 + dbw CH5, SFX_806da_4_Ch5 + dbw CH7, SFX_806f9_4_Ch7 SFX_800a8_4:: ; 800a8 (20:40a8) - db ( $80 | CH4 ) - dw SFX_84712_4_Ch4 - -SFX_800ab_4:: ; 800ab (20:40ab) - db CH5 - dw SFX_84739_4_Ch5 - -SFX_800ae_4:: ; 800ae (20:40ae) - db CH7 - dw SFX_8475f_4_Ch7 + dbw ( $80 | CH4 ), SFX_80712_4_Ch4 + dbw CH5, SFX_80739_4_Ch5 + dbw CH7, SFX_8075f_4_Ch7 SFX_800b1_4:: ; 800b1 (20:40b1) - db ( $80 | CH4 ) - dw SFX_8477e_4_Ch4 - -SFX_800b4_4:: ; 800b4 (20:40b4) - db CH5 - dw SFX_8479d_4_Ch5 - -SFX_800b7_4:: ; 800b7 (20:40b7) - db CH7 - dw SFX_847cc_4_Ch7 + dbw ( $80 | CH4 ), SFX_8077e_4_Ch4 + dbw CH5, SFX_8079d_4_Ch5 + dbw CH7, SFX_807cc_4_Ch7 SFX_800ba_4:: ; 800ba (20:40ba) - db ( $80 | CH4 ) - dw SFX_84603_4_Ch4 - -SFX_800bd_4:: ; 800bd (20:40bd) - db CH5 - dw SFX_84616_4_Ch5 - -SFX_800c0_4:: ; 800c0 (20:40c0) - db CH7 - dw SFX_84629_4_Ch7 + dbw ( $80 | CH4 ), SFX_80603_4_Ch4 + dbw CH5, SFX_80616_4_Ch5 + dbw CH7, SFX_80629_4_Ch7 SFX_800c3_4:: ; 800c3 (20:40c3) - db ( $80 | CH4 ) - dw SFX_84545_4_Ch4 - -SFX_800c6_4:: ; 800c6 (20:40c6) - db CH5 - dw SFX_84560_4_Ch5 - -SFX_800c9_4:: ; 800c9 (20:40c9) - db CH7 - dw SFX_8457b_4_Ch7 + dbw ( $80 | CH4 ), SFX_80545_4_Ch4 + dbw CH5, SFX_80560_4_Ch5 + dbw CH7, SFX_8057b_4_Ch7 SFX_800cc_4:: ; 800cc (20:40cc) - db ( $80 | CH4 ) - dw SFX_8458b_4_Ch4 - -SFX_800cf_4:: ; 800cf (20:40cf) - db CH5 - dw SFX_845ae_4_Ch5 - -SFX_800d2_4:: ; 800d2 (20:40d2) - db CH7 - dw SFX_845d1_4_Ch7 + dbw ( $80 | CH4 ), SFX_8058b_4_Ch4 + dbw CH5, SFX_805ae_4_Ch5 + dbw CH7, SFX_805d1_4_Ch7 SFX_800d5_4:: ; 800d5 (20:40d5) - db ( $80 | CH4 ) - dw SFX_84467_4_Ch4 - -SFX_800d8_4:: ; 800d8 (20:40d8) - db CH5 - dw SFX_84486_4_Ch5 - -SFX_800db_4:: ; 800db (20:40db) - db CH7 - dw SFX_844a9_4_Ch7 + dbw ( $80 | CH4 ), SFX_80467_4_Ch4 + dbw CH5, SFX_80486_4_Ch5 + dbw CH7, SFX_804a9_4_Ch7 SFX_800de_4:: ; 800de (20:40de) - db ( $80 | CH4 ) - dw SFX_8497f_4_Ch4 - -SFX_800e1_4:: ; 800e1 (20:40e1) - db CH5 - dw SFX_84992_4_Ch5 - -SFX_800e4_4:: ; 800e4 (20:40e4) - db CH7 - dw SFX_849a5_4_Ch7 + dbw ( $80 | CH4 ), SFX_8097f_4_Ch4 + dbw CH5, SFX_80992_4_Ch5 + dbw CH7, SFX_809a5_4_Ch7 SFX_800e7_4:: ; 800e7 (20:40e7) - db ( $80 | CH4 ) - dw SFX_849b2_4_Ch4 - -SFX_800ea_4:: ; 800ea (20:40ea) - db CH5 - dw SFX_849cd_4_Ch5 - -SFX_800ed_4:: ; 800ed (20:40ed) - db CH7 - dw SFX_849e8_4_Ch7 + dbw ( $80 | CH4 ), SFX_809b2_4_Ch4 + dbw CH5, SFX_809cd_4_Ch5 + dbw CH7, SFX_809e8_4_Ch7 SFX_800f0_4:: ; 800f0 (20:40f0) - db ( $80 | CH4 ) - dw SFX_849fb_4_Ch4 - -SFX_800f3_4:: ; 800f3 (20:40f3) - db CH5 - dw SFX_84a0a_4_Ch5 - -SFX_800f6_4:: ; 800f6 (20:40f6) - db CH7 - dw SFX_84a19_4_Ch7 + dbw ( $80 | CH4 ), SFX_809fb_4_Ch4 + dbw CH5, SFX_80a0a_4_Ch5 + dbw CH7, SFX_80a19_4_Ch7 SFX_800f9_4:: ; 800f9 (20:40f9) - db ( $80 | CH4 ) - dw SFX_84a89_4_Ch4 - -SFX_800fc_4:: ; 800fc (20:40fc) - db CH5 - dw SFX_84aa4_4_Ch5 - -SFX_800ff_4:: ; 800ff (20:40ff) - db CH7 - dw SFX_84abf_4_Ch7 + dbw ( $80 | CH4 ), SFX_80a89_4_Ch4 + dbw CH5, SFX_80aa4_4_Ch5 + dbw CH7, SFX_80abf_4_Ch7 SFX_80102_4:: ; 80102 (20:4102) - db ( $80 | CH4 ) - dw SFX_8491c_4_Ch4 - -SFX_80105_4:: ; 80105 (20:4105) - db CH5 - dw SFX_8492b_4_Ch5 - -SFX_80108_4:: ; 80108 (20:4108) - db CH7 - dw SFX_8493a_4_Ch7 + dbw ( $80 | CH4 ), SFX_8091c_4_Ch4 + dbw CH5, SFX_8092b_4_Ch5 + dbw CH7, SFX_8093a_4_Ch7 SFX_8010b_4:: ; 8010b (20:410b) - db ( $80 | CH4 ) - dw SFX_84ad2_4_Ch4 - -SFX_8010e_4:: ; 8010e (20:410e) - db CH5 - dw SFX_84ae5_4_Ch5 - -SFX_80111_4:: ; 80111 (20:4111) - db CH7 - dw SFX_84af8_4_Ch7 + dbw ( $80 | CH4 ), SFX_80ad2_4_Ch4 + dbw CH5, SFX_80ae5_4_Ch5 + dbw CH7, SFX_80af8_4_Ch7 SFX_80114_4:: ; 80114 (20:4114) - db ( $80 | CH4 ) - dw SFX_84be2_4_Ch4 - -SFX_80117_4:: ; 80117 (20:4117) - db CH5 - dw SFX_84c05_4_Ch5 - -SFX_8011a_4:: ; 8011a (20:411a) - db CH7 - dw SFX_84c28_4_Ch7 + dbw ( $80 | CH4 ), SFX_80be2_4_Ch4 + dbw CH5, SFX_80c05_4_Ch5 + dbw CH7, SFX_80c28_4_Ch7 SFX_8011d_4:: ; 8011d (20:411d) - db ( $80 | CH4 ) - dw SFX_848fa_4_Ch4 - -SFX_80120_4:: ; 80120 (20:4120) - db CH5 - dw SFX_84909_4_Ch5 - -SFX_80123_4:: ; 80123 (20:4123) - db CH7 - dw SFX_8491b_4_Ch7 + dbw ( $80 | CH4 ), SFX_808fa_4_Ch4 + dbw CH5, SFX_80909_4_Ch5 + dbw CH7, SFX_8091b_4_Ch7 SFX_80126_4:: ; 80126 (20:4126) - db ( $80 | CH4 ) - dw SFX_84b53_4_Ch4 - -SFX_80129_4:: ; 80129 (20:4129) - db CH5 - dw SFX_84b6e_4_Ch5 - -SFX_8012c_4:: ; 8012c (20:412c) - db CH7 - dw SFX_84b89_4_Ch7 + dbw ( $80 | CH4 ), SFX_80b53_4_Ch4 + dbw CH5, SFX_80b6e_4_Ch5 + dbw CH7, SFX_80b89_4_Ch7 SFX_8012f_4:: ; 8012f (20:412f) - db ( $80 | CH4 ) - dw SFX_84944_4_Ch4 - -SFX_80132_4:: ; 80132 (20:4132) - db CH5 - dw SFX_8495b_4_Ch5 - -SFX_80135_4:: ; 80135 (20:4135) - db CH7 - dw SFX_84972_4_Ch7 + dbw ( $80 | CH4 ), SFX_80944_4_Ch4 + dbw CH5, SFX_8095b_4_Ch5 + dbw CH7, SFX_80972_4_Ch7 SFX_80138_4:: ; 80138 (20:4138) - db ( $80 | CH4 ) - dw SFX_84b05_4_Ch4 - -SFX_8013b_4:: ; 8013b (20:413b) - db CH5 - dw SFX_84b28_4_Ch5 - -SFX_8013e_4:: ; 8013e (20:413e) - db CH7 - dw SFX_84b43_4_Ch7 + dbw ( $80 | CH4 ), SFX_80b05_4_Ch4 + dbw CH5, SFX_80b28_4_Ch5 + dbw CH7, SFX_80b43_4_Ch7 SFX_80141_4:: ; 80141 (20:4141) - db ( $80 | CH4 ) - dw SFX_84b9c_4_Ch4 - -SFX_80144_4:: ; 80144 (20:4144) - db CH5 - dw SFX_84bb7_4_Ch5 - -SFX_80147_4:: ; 80147 (20:4147) - db CH7 - dw SFX_84bd2_4_Ch7 + dbw ( $80 | CH4 ), SFX_80b9c_4_Ch4 + dbw CH5, SFX_80bb7_4_Ch5 + dbw CH7, SFX_80bd2_4_Ch7 SFX_8014a_4:: ; 8014a (20:414a) - db ( $80 | CH4 ) - dw SFX_84a23_4_Ch4 - -SFX_8014d_4:: ; 8014d (20:414d) - db CH5 - dw SFX_84a46_4_Ch5 - -SFX_80150_4:: ; 80150 (20:4150) - db CH7 - dw SFX_84a6d_4_Ch7 + dbw ( $80 | CH4 ), SFX_80a23_4_Ch4 + dbw CH5, SFX_80a46_4_Ch5 + dbw CH7, SFX_80a6d_4_Ch7 SFX_80153_4:: ; 80153 (20:4153) - db ( $80 | CH4 ) - dw SFX_84c3b_4_Ch4 - -SFX_80156_4:: ; 80156 (20:4156) - db CH5 - dw SFX_84c4e_4_Ch5 - -SFX_80159_4:: ; 80159 (20:4159) - db CH7 - dw SFX_84c61_4_Ch7 + dbw ( $80 | CH4 ), SFX_80c3b_4_Ch4 + dbw CH5, SFX_80c4e_4_Ch5 + dbw CH7, SFX_80c61_4_Ch7 SFX_8015c_4:: ; 8015c (20:415c) - db ( $80 | CH4 ) - dw SFX_84c6e_4_Ch4 - -SFX_8015f_4:: ; 8015f (20:415f) - db CH5 - dw SFX_84c81_4_Ch5 - -SFX_80162_4:: ; 80162 (20:4162) - db CH7 - dw SFX_84c94_4_Ch7 + dbw ( $80 | CH4 ), SFX_80c6e_4_Ch4 + dbw CH5, SFX_80c81_4_Ch5 + dbw CH7, SFX_80c94_4_Ch7 SFX_80165_4:: ; 80165 (20:4165) - db ( $80 | CH4 ) - dw SFX_84ca1_4_Ch4 - -SFX_80168_4:: ; 80168 (20:4168) - db CH5 - dw SFX_84cc4_4_Ch5 - -SFX_8016b_4:: ; 8016b (20:416b) - db CH7 - dw SFX_84ce6_4_Ch7 + dbw ( $80 | CH4 ), SFX_80ca1_4_Ch4 + dbw CH5, SFX_80cc4_4_Ch5 + dbw CH7, SFX_80ce6_4_Ch7 SFX_8016e_4:: ; 8016e (20:416e) - db ( $80 | CH4 ) - dw SFX_84ce7_4_Ch4 - -SFX_80171_4:: ; 80171 (20:4171) - db CH5 - dw SFX_84cfa_4_Ch5 - -SFX_80174_4:: ; 80174 (20:4174) - db CH7 - dw SFX_84d0d_4_Ch7 + dbw ( $80 | CH4 ), SFX_80ce7_4_Ch4 + dbw CH5, SFX_80cfa_4_Ch5 + dbw CH7, SFX_80d0d_4_Ch7 SFX_80177_4:: ; 80177 (20:4177) - db ( $80 | CH4 ) - dw SFX_843da_4_Ch4 - -SFX_8017a_4:: ; 8017a (20:417a) - db CH5 - dw SFX_843f1_4_Ch5 - -SFX_8017d_4:: ; 8017d (20:417d) - db CH7 - dw SFX_84404_4_Ch7 + dbw ( $80 | CH4 ), SFX_803da_4_Ch4 + dbw CH5, SFX_803f1_4_Ch5 + dbw CH7, SFX_80404_4_Ch7 SFX_80180_4:: ; 80180 (20:4180) - db ( $80 | CH4 ) - dw SFX_84411_4_Ch4 - -SFX_80183_4:: ; 80183 (20:4183) - db CH5 - dw SFX_84434_4_Ch5 - -SFX_80186_4:: ; 80186 (20:4186) - db CH7 - dw SFX_84457_4_Ch7 + dbw ( $80 | CH4 ), SFX_80411_4_Ch4 + dbw CH5, SFX_80434_4_Ch5 + dbw CH7, SFX_80457_4_Ch7 SFX_80189_4:: ; 80189 (20:4189) - db ( $80 | CH4 ) - dw SFX_844bf_4_Ch4 - -SFX_8018c_4:: ; 8018c (20:418c) - db CH5 - dw SFX_844d6_4_Ch5 - -SFX_8018f_4:: ; 8018f (20:418f) - db CH7 - dw SFX_844ed_4_Ch7 - -SFX_80192_4:: ; 80192 (20:4192) - db ( $80 | CH4 ) - dw SFX_84e5a_4_Ch4 + dbw ( $80 | CH4 ), SFX_804bf_4_Ch4 + dbw CH5, SFX_804d6_4_Ch5 + dbw CH7, SFX_804ed_4_Ch7 -SFX_80195_4:: ; 80195 (20:4195) - db CH5 - dw SFX_84e71_4_Ch5 +SFX_Get_Item1_4:: ; 80192 (20:4192) + dbw ( $80 | CH4 ), SFX_80e5a_4_Ch4 + dbw CH5, SFX_80e71_4_Ch5 + dbw CH6, SFX_80e81_4_Ch6 -SFX_80198_4:: ; 80198 (20:4198) - db CH6 - dw SFX_84e81_4_Ch6 +SFX_Get_Item2_4:: ; 8019b (20:419b) + dbw ( $80 | CH4 ), SFX_80ec8_4_Ch4 + dbw CH5, SFX_80ee7_4_Ch5 + dbw CH6, SFX_80eff_4_Ch6 -SFX_8019b_4:: ; 8019b (20:419b) - db ( $80 | CH4 ) - dw SFX_84ec8_4_Ch4 +SFX_Tink_4:: ; 801a4 (20:41a4) + dbw CH4, SFX_8028e_4_Ch4 -SFX_8019e_4:: ; 8019e (20:419e) - db CH5 - dw SFX_84ee7_4_Ch5 +SFX_Heal_Ailment_4:: ; 801a7 (20:41a7) + dbw CH4, SFX_8027f_4_Ch4 -SFX_801a1_4:: ; 801a1 (20:41a1) - db CH6 - dw SFX_84eff_4_Ch6 +SFX_Start_Menu_4:: ; 801aa (20:41aa) + dbw CH4, SFX_8026a_4_Ch4 -SFX_801a4_4:: ; 801a4 (20:41a4) - db CH4 - dw SFX_8428e_4_Ch4 - -SFX_801a7_4:: ; 801a7 (20:41a7) - db CH4 - dw SFX_8427f_4_Ch4 - -SFX_801aa_4:: ; 801aa (20:41aa) - db CH4 - dw SFX_8426a_4_Ch4 - -SFX_801ad_4:: ; 801ad (20:41ad) - db CH7 - dw SFX_84263_4_Ch7 +SFX_PressAB_4:: ; 801ad (20:41ad) + dbw CH7, SFX_80263_4_Ch7 SFX_801b0_4:: ; 801b0 (20:41b0) - db CH4 - dw SFX_84250_4_Ch4 + dbw CH4, SFX_80250_4_Ch4 SFX_801b3_4:: ; 801b3 (20:41b3) - db CH7 - dw SFX_8429f_4_Ch7 + dbw CH7, SFX_8029f_4_Ch7 SFX_801b6_4:: ; 801b6 (20:41b6) - db CH4 - dw SFX_842b5_4_Ch4 + dbw CH4, SFX_802b5_4_Ch4 SFX_801b9_4:: ; 801b9 (20:41b9) - db CH7 - dw SFX_842e1_4_Ch7 + dbw CH7, SFX_802e1_4_Ch7 SFX_801bc_4:: ; 801bc (20:41bc) - db CH4 - dw SFX_842cc_4_Ch4 + dbw CH4, SFX_802cc_4_Ch4 SFX_801bf_4:: ; 801bf (20:41bf) - db CH7 - dw SFX_842d7_4_Ch7 - -SFX_801c2_4:: ; 801c2 (20:41c2) - db ( $80 | CH4 ) - dw SFX_842eb_4_Ch4 - -SFX_801c5_4:: ; 801c5 (20:41c5) - db CH5 - dw SFX_8430a_4_Ch5 + dbw CH7, SFX_802d7_4_Ch7 -SFX_801c8_4:: ; 801c8 (20:41c8) - db CH6 - dw SFX_84322_4_Ch6 +SFX_Get_Item2_4_2:: ; 801c2 (20:41c2) + 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 diff --git a/audio/music/jessieandjames.asm b/audio/music/jessieandjames.asm new file mode 100755 index 00000000..0d349ddb --- /dev/null +++ b/audio/music/jessieandjames.asm @@ -0,0 +1,303 @@ +Music_JessieAndJames_Ch1: + tempo 144 + volume 7, 7 + duty 3 + vibrato 8, 1, 4 + notetype 12, 11, 2 + octave 3 + G# 1 + G_ 1 + F# 2 + F_ 2 + E_ 2 + D# 2 + D_ 2 + C# 2 + C_ 2 + notetype 12, 11, 6 + D# 12 + C_ 4 +.loop + notetype 12, 11, 2 + octave 4 + D_ 16 + rest 12 + notetype 12, 11, 4 + octave 3 + A# 4 + rest 16 + rest 8 + notetype 12, 11, 2 + octave 2 + A_ 2 + octave 3 + A# 2 + A_ 4 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 + D# 2 + D_ 2 + D# 2 + F_ 2 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 + octave 2 + A# 4 + notetype 12, 11, 4 + octave 3 + B_ 4 + notetype 12, 11, 2 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 + D# 2 + D_ 2 + D# 2 + F_ 2 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 + octave 2 + A# 2 + octave 3 + B_ 2 + notetype 12, 11, 4 + A# 4 + loopchannel 0, .loop + +Music_JessieAndJames_Ch2: + duty 3 + vibrato 6, 1, 5 + notetype 12, 12, 2 + octave 4 + D_ 1 + C# 1 + C_ 2 + octave 3 + B_ 2 + A# 2 + A_ 2 + G# 2 + G_ 2 + F# 2 + notetype 12, 12, 7 + A_ 12 + octave 4 + C# 4 +.loop + notetype 12, 12, 2 + octave 3 + C# 1 + D_ 1 + D_ 2 + D_ 2 + C# 2 + D_ 2 + C# 2 + D_ 2 + E_ 2 + C# 1 + D_ 1 + D_ 2 + D_ 2 + C# 2 + octave 2 + A_ 4 + notetype 12, 12, 5 + octave 4 + C# 4 + notetype 12, 12, 2 + D_ 1 + octave 3 + D_ 1 + D_ 2 + D_ 2 + C# 2 + D_ 2 + C# 2 + D_ 2 + E_ 2 + C# 1 + D_ 1 + D_ 2 + D_ 2 + C# 2 + notetype 12, 12, 6 + octave 4 + D_ 8 + notetype 12, 12, 2 + D# 6 + F_ 4 + D# 4 + octave 3 + A# 2 + octave 4 + D# 6 + F_ 4 + D# 2 + notetype 12, 12, 5 + D_ 4 + notetype 12, 12, 2 + D# 6 + F_ 4 + D# 4 + octave 3 + A# 2 + octave 4 + D# 4 + F_ 4 + notetype 12, 12, 5 + D# 8 + loopchannel 0, .loop + +Music_JessieAndJames_Ch3: + notetype 12, 1, 0 + rest 16 + rest 8 + octave 4 + D_ 2 + octave 3 + A_ 2 + octave 4 + C_ 2 + D# 2 +.loop + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A# 2 + A_ 2 + D# 2 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + A_ 1 + rest 1 + D_ 1 + rest 1 + octave 3 + A_ 2 + octave 4 + C_ 2 + D_ 2 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + octave 3 + A# 1 + rest 1 + octave 4 + C# 1 + rest 1 + E_ 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + A# 1 + rest 1 + D# 1 + rest 1 + octave 3 + A# 1 + rest 1 + octave 4 + C# 1 + rest 1 + E_ 1 + rest 1 + loopchannel 0, .loop diff --git a/audio/music/printer.asm b/audio/music/printer.asm new file mode 100755 index 00000000..853aa290 --- /dev/null +++ b/audio/music/printer.asm @@ -0,0 +1,316 @@ +Music_GBPrinter_Ch3: + tempo 256 + notetype 12, 1, 0 + octave 4 + B_ 6 + octave 5 + C# 1 + rest 1 + octave 4 + B_ 6 + octave 5 + C# 1 + rest 1 + octave 4 + B_ 1 + rest 1 + octave 5 + E_ 1 + rest 1 + D# 1 + rest 1 + C# 1 + rest 1 + octave 4 + B_ 1 + rest 1 + A_ 1 + rest 1 + G# 1 + rest 1 + F# 1 + rest 1 +.loop: + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + octave 5 + C# 1 + C_ 1 + C# 1 + rest 1 + octave 4 + F# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + E_ 1 + rest 1 + octave 5 + E_ 1 + D# 1 + E_ 1 + rest 1 + octave 4 + D# 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + B_ 1 + rest 1 + A_ 1 + rest 1 + G# 1 + rest 1 + F# 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + C# 1 + rest 1 + D_ 1 + rest 1 + D# 1 + rest 1 + F# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + F# 1 + rest 1 + D# 1 + rest 1 + F# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + F# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + C# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + C# 1 + rest 1 + A_ 1 + rest 1 + B_ 1 + A# 1 + B_ 1 + rest 1 + E_ 1 + rest 1 + F# 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + C# 1 + rest 1 + D_ 1 + rest 1 + D# 1 + rest 1 + F# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + F# 1 + rest 1 + D# 1 + rest 1 + F# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + F# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + E_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + G# 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + C# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + A_ 1 + rest 1 + F# 1 + rest 1 + D# 1 + rest 1 + B_ 1 + rest 1 + B_ 1 + rest 1 + A_ 1 + rest 1 + A_ 1 + rest 1 + G# 1 + rest 1 + octave 3 + B_ 1 + rest 1 + octave 4 + C# 1 + rest 1 + D# 1 + rest 1 + loopchannel 0, .loop diff --git a/audio/sfx/cymbal1_4.asm b/audio/sfx/cymbal1_4.asm new file mode 100644 index 00000000..bd941ef5 --- /dev/null +++ b/audio/sfx/cymbal1_4.asm @@ -0,0 +1,4 @@ +SFX_Cymbal1_4_Ch7: + unknownnoise0x20 0, 161, 16 + endchannel + diff --git a/audio/sfx/cymbal2_4.asm b/audio/sfx/cymbal2_4.asm new file mode 100644 index 00000000..b33e10fc --- /dev/null +++ b/audio/sfx/cymbal2_4.asm @@ -0,0 +1,4 @@ +SFX_Cymbal2_4_Ch7: + unknownnoise0x20 0, 162, 17 + endchannel + diff --git a/audio/sfx/cymbal3_4.asm b/audio/sfx/cymbal3_4.asm new file mode 100644 index 00000000..b5e99c56 --- /dev/null +++ b/audio/sfx/cymbal3_4.asm @@ -0,0 +1,4 @@ +SFX_Cymbal3_4_Ch7: + unknownnoise0x20 0, 162, 80 + endchannel + diff --git a/audio/sfx/get_item2_4.asm b/audio/sfx/get_item2_4.asm new file mode 100644 index 00000000..b2909739 --- /dev/null +++ b/audio/sfx/get_item2_4.asm @@ -0,0 +1,67 @@ +SFX_80ec8_4_Ch4: + executemusic + tempo 256 + volume 7, 7 + duty 2 + toggleperfectpitch + notetype 5, 11, 4 + octave 4 + D_ 4 + C_ 4 + octave 3 + A_ 8 + notetype 5, 11, 2 + octave 4 + D# 2 + D# 2 + D_ 2 + C_ 2 + C_ 2 + octave 3 + A# 2 + notetype 5, 11, 4 + octave 4 + C_ 8 + endchannel + +SFX_80ee7_4_Ch5: + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 5, 12, 5 + octave 4 + A_ 4 + F_ 4 + C_ 8 + notetype 5, 12, 2 + A# 2 + A# 2 + A# 2 + G_ 2 + G_ 2 + A# 2 + notetype 5, 12, 4 + A_ 8 + endchannel + +SFX_80eff_4_Ch6: + executemusic + notetype 5, 1, 0 + octave 5 + F_ 4 + D# 4 + C_ 8 + D# 1 + rest 1 + D# 1 + rest 1 + E_ 1 + rest 1 + F_ 1 + rest 1 + F_ 1 + rest 1 + G_ 1 + rest 1 + A_ 8 + endchannel diff --git a/audio/sfx/get_item2_4_2.asm b/audio/sfx/get_item2_4_2.asm new file mode 100644 index 00000000..6f97390e --- /dev/null +++ b/audio/sfx/get_item2_4_2.asm @@ -0,0 +1,69 @@ +SFX_Get_Item2_4_2_Ch1: ; 802eb (20:42eb) + executemusic + tempo 256 + volume 7, 7 + duty 2 + toggleperfectpitch + notetype 5, 11, 4 + octave 4 + D_ 4 + C_ 4 + octave 3 + A_ 8 + notetype 5, 11, 2 + octave 4 + D# 2 + D# 2 + D_ 2 + C_ 2 + C_ 2 + octave 3 + A# 2 + notetype 5, 11, 4 + octave 4 + C_ 8 + endchannel + + +SFX_Get_Item2_4_2_Ch2: ; 8030a (20:430a) + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 5, 12, 5 + octave 4 + A_ 4 + F_ 4 + C_ 8 + notetype 5, 12, 2 + A# 2 + A# 2 + A# 2 + G_ 2 + G_ 2 + A# 2 + notetype 5, 12, 4 + A_ 8 + endchannel + + +SFX_Get_Item2_4_2_Ch3: ; 80322 (20:4322) + executemusic + notetype 5, 1, 0 + octave 5 + F_ 4 + D# 4 + C_ 8 + D# 1 + rest 1 + D# 1 + rest 1 + E_ 1 + rest 1 + F_ 1 + rest 1 + F_ 1 + rest 1 + G_ 1 + rest 1 + A_ 8 + endchannel diff --git a/audio/sfx/heal_ailment_4.asm b/audio/sfx/heal_ailment_4.asm new file mode 100755 index 00000000..fd80517d --- /dev/null +++ b/audio/sfx/heal_ailment_4.asm @@ -0,0 +1,7 @@ +SFX_8027f_4_Ch4: + duty 2 + unknownsfx0x10 23 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/muted_snare1_4.asm b/audio/sfx/muted_snare1_4.asm new file mode 100644 index 00000000..bcf8c54b --- /dev/null +++ b/audio/sfx/muted_snare1_4.asm @@ -0,0 +1,5 @@ +SFX_Muted_Snare1_4_Ch7: + unknownnoise0x20 0, 161, 24 + unknownnoise0x20 0, 49, 51 + endchannel + diff --git a/audio/sfx/muted_snare2_4.asm b/audio/sfx/muted_snare2_4.asm new file mode 100644 index 00000000..8934afe2 --- /dev/null +++ b/audio/sfx/muted_snare2_4.asm @@ -0,0 +1,4 @@ +SFX_Muted_Snare2_4_Ch7: + unknownnoise0x20 0, 145, 34 + endchannel + diff --git a/audio/sfx/muted_snare3_4.asm b/audio/sfx/muted_snare3_4.asm new file mode 100644 index 00000000..beeec087 --- /dev/null +++ b/audio/sfx/muted_snare3_4.asm @@ -0,0 +1,4 @@ +SFX_Muted_Snare3_4_Ch7: + unknownnoise0x20 0, 113, 34 + endchannel + diff --git a/audio/sfx/muted_snare4_4.asm b/audio/sfx/muted_snare4_4.asm new file mode 100644 index 00000000..7fc65086 --- /dev/null +++ b/audio/sfx/muted_snare4_4.asm @@ -0,0 +1,4 @@ +SFX_Muted_Snare4_4_Ch7: + unknownnoise0x20 0, 97, 34 + endchannel + diff --git a/audio/sfx/snare1_4.asm b/audio/sfx/snare1_4.asm new file mode 100755 index 00000000..4ba3b8c5 --- /dev/null +++ b/audio/sfx/snare1_4.asm @@ -0,0 +1,4 @@ +SFX_Snare1_4_Ch7: ; 841ec + unknownnoise0x20 0, 193, 51 + endchannel + diff --git a/audio/sfx/snare2_4.asm b/audio/sfx/snare2_4.asm new file mode 100755 index 00000000..dc1a26a9 --- /dev/null +++ b/audio/sfx/snare2_4.asm @@ -0,0 +1,4 @@ +SFX_Snare2_4_Ch7: ; 841f0 + unknownnoise0x20 0, 177, 51 + endchannel + diff --git a/audio/sfx/snare3_4.asm b/audio/sfx/snare3_4.asm new file mode 100755 index 00000000..a0fcb0d7 --- /dev/null +++ b/audio/sfx/snare3_4.asm @@ -0,0 +1,4 @@ +SFX_Snare3_4_Ch7: + unknownnoise0x20 0, 161, 51 + endchannel + diff --git a/audio/sfx/snare4_4.asm b/audio/sfx/snare4_4.asm new file mode 100644 index 00000000..c1d5cc21 --- /dev/null +++ b/audio/sfx/snare4_4.asm @@ -0,0 +1,4 @@ +SFX_Snare4_4_Ch7: + unknownnoise0x20 0, 129, 51 + endchannel + diff --git a/audio/sfx/snare5_4.asm b/audio/sfx/snare5_4.asm new file mode 100644 index 00000000..37fe8b27 --- /dev/null +++ b/audio/sfx/snare5_4.asm @@ -0,0 +1,9 @@ +SFX_Snare5_4_Ch7: + unknownnoise0x20 7, 132, 55 + unknownnoise0x20 6, 132, 54 + unknownnoise0x20 5, 131, 53 + unknownnoise0x20 4, 131, 52 + unknownnoise0x20 3, 130, 51 + unknownnoise0x20 2, 129, 50 + endchannel + diff --git a/audio/sfx/snare6_4.asm b/audio/sfx/snare6_4.asm new file mode 100644 index 00000000..1b835f00 --- /dev/null +++ b/audio/sfx/snare6_4.asm @@ -0,0 +1,4 @@ +SFX_Snare6_4_Ch7: + unknownnoise0x20 0, 129, 16 + endchannel + diff --git a/audio/sfx/snare7_4.asm b/audio/sfx/snare7_4.asm new file mode 100644 index 00000000..ed03d368 --- /dev/null +++ b/audio/sfx/snare7_4.asm @@ -0,0 +1,4 @@ +SFX_Snare7_4_Ch7: + unknownnoise0x20 0, 130, 35 + endchannel + diff --git a/audio/sfx/snare8_4.asm b/audio/sfx/snare8_4.asm new file mode 100644 index 00000000..ec0e6665 --- /dev/null +++ b/audio/sfx/snare8_4.asm @@ -0,0 +1,4 @@ +SFX_Snare8_4_Ch7: + unknownnoise0x20 0, 130, 37 + endchannel + diff --git a/audio/sfx/snare9_4.asm b/audio/sfx/snare9_4.asm new file mode 100644 index 00000000..254e9ce6 --- /dev/null +++ b/audio/sfx/snare9_4.asm @@ -0,0 +1,4 @@ +SFX_Snare9_4_Ch7: + unknownnoise0x20 0, 130, 38 + endchannel + diff --git a/audio/sfx/tink_4.asm b/audio/sfx/tink_4.asm new file mode 100755 index 00000000..4efa3209 --- /dev/null +++ b/audio/sfx/tink_4.asm @@ -0,0 +1,8 @@ +SFX_8028e_4_Ch4: + duty 2 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 2 + unknownsfx0x10 34 + unknownsfx0x20 8, 226, 0, 2 + unknownsfx0x10 8 + endchannel diff --git a/audio/sfx/triangle1_4.asm b/audio/sfx/triangle1_4.asm new file mode 100644 index 00000000..a90e4c48 --- /dev/null +++ b/audio/sfx/triangle1_4.asm @@ -0,0 +1,4 @@ +SFX_Triangle1_4_Ch7: + unknownnoise0x20 0, 81, 42 + endchannel + diff --git a/audio/sfx/triangle2_4.asm b/audio/sfx/triangle2_4.asm new file mode 100644 index 00000000..58b6d511 --- /dev/null +++ b/audio/sfx/triangle2_4.asm @@ -0,0 +1,5 @@ +SFX_Triangle2_4_Ch7: + unknownnoise0x20 1, 65, 43 + unknownnoise0x20 0, 97, 42 + endchannel + diff --git a/audio/sfx/triangle3_4.asm b/audio/sfx/triangle3_4.asm new file mode 100644 index 00000000..a2fab704 --- /dev/null +++ b/audio/sfx/triangle3_4.asm @@ -0,0 +1,5 @@ +SFX_Triangle3_4_Ch7: + unknownnoise0x20 2, 145, 40 + unknownnoise0x20 0, 113, 24 + endchannel + diff --git a/audio/sfx/unknown_80250.asm b/audio/sfx/unknown_80250.asm new file mode 100644 index 00000000..4f65a6a0 --- /dev/null +++ b/audio/sfx/unknown_80250.asm @@ -0,0 +1,7 @@ +SFX_80250_4_Ch4: + duty 2 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 0, 129, 208, 7 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 12, 161, 208, 7 + endchannel diff --git a/audio/sfx/unknown_80263.asm b/audio/sfx/unknown_80263.asm new file mode 100755 index 00000000..884c1352 --- /dev/null +++ b/audio/sfx/unknown_80263.asm @@ -0,0 +1,4 @@ +SFX_80263_4_Ch7: + unknownnoise0x20 1, 226, 51 + unknownnoise0x20 8, 225, 34 + endchannel diff --git a/audio/sfx/unknown_8026a.asm b/audio/sfx/unknown_8026a.asm new file mode 100644 index 00000000..9dd6a02b --- /dev/null +++ b/audio/sfx/unknown_8026a.asm @@ -0,0 +1,10 @@ +SFX_8026a_4_Ch4: + duty 2 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x10 23 + unknownsfx0x20 15, 242, 0, 6 + unknownsfx0x10 8 + endchannel + diff --git a/audio/sfx/unknown_8029f.asm b/audio/sfx/unknown_8029f.asm new file mode 100755 index 00000000..475c2813 --- /dev/null +++ b/audio/sfx/unknown_8029f.asm @@ -0,0 +1,10 @@ +SFX_8029f_4_Ch7: + unknownnoise0x20 6, 241, 17 + unknownnoise0x20 7, 242, 34 + unknownnoise0x20 8, 243, 51 + unknownnoise0x20 9, 244, 66 + unknownnoise0x20 10, 245, 51 + unknownnoise0x20 11, 246, 34 + unknownnoise0x20 12, 247, 17 + endchannel + diff --git a/audio/sfx/unknown_802b5.asm b/audio/sfx/unknown_802b5.asm new file mode 100644 index 00000000..364443cf --- /dev/null +++ b/audio/sfx/unknown_802b5.asm @@ -0,0 +1,8 @@ +SFX_802b5_4_Ch4: + duty 2 + unknownsfx0x20 3, 196, 96, 7 + unknownsfx0x20 0, 164, 64, 7 + unknownsfx0x20 2, 196, 64, 7 + unknownsfx0x20 0, 164, 96, 7 + unknownsfx0x20 15, 193, 96, 7 + endchannel diff --git a/audio/sfx/unknown_802cc.asm b/audio/sfx/unknown_802cc.asm new file mode 100755 index 00000000..9e209638 --- /dev/null +++ b/audio/sfx/unknown_802cc.asm @@ -0,0 +1,5 @@ +SFX_802cc_4_Ch4: + duty 2 + unknownsfx0x20 3, 180, 192, 7 + unknownsfx0x20 0, 161, 128, 7 + endchannel diff --git a/audio/sfx/unknown_802d7.asm b/audio/sfx/unknown_802d7.asm new file mode 100755 index 00000000..4a1f1ab4 --- /dev/null +++ b/audio/sfx/unknown_802d7.asm @@ -0,0 +1,6 @@ +SFX_802d7_4_Ch7: + unknownnoise0x20 2, 241, 50 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 4, 230, 33 + endchannel + diff --git a/audio/sfx/unknown_802e1.asm b/audio/sfx/unknown_802e1.asm new file mode 100644 index 00000000..e1963b23 --- /dev/null +++ b/audio/sfx/unknown_802e1.asm @@ -0,0 +1,6 @@ +SFX_802e1_4_Ch7: + unknownnoise0x20 3, 243, 102 + unknownnoise0x20 3, 51, 83 + unknownnoise0x20 7, 245, 81 + endchannel + diff --git a/audio/sfx/unknown_80337.asm b/audio/sfx/unknown_80337.asm new file mode 100644 index 00000000..c21f8794 --- /dev/null +++ b/audio/sfx/unknown_80337.asm @@ -0,0 +1,64 @@ +SFX_80337_4_Branch: + dutycycle 240 + unknownsfx0x20 15, 224, 128, 7 + unknownsfx0x20 15, 240, 132, 7 + unknownsfx0x20 15, 195, 224, 5 + unknownsfx0x20 15, 196, 0, 6 + unknownsfx0x20 10, 108, 128, 7 + unknownsfx0x20 8, 113, 132, 7 + endchannel + +SFX_80352_4_Branch: + dutycycle 5 + unknownsfx0x20 15, 160, 65, 7 + unknownsfx0x20 15, 176, 67, 7 + unknownsfx0x20 15, 147, 177, 5 + unknownsfx0x20 15, 148, 193, 5 + unknownsfx0x20 10, 76, 65, 7 + unknownsfx0x20 8, 49, 70, 7 + endchannel + +SFX_8036c_4_Branch: + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 224, 58 + unknownnoise0x20 15, 208, 58 + unknownnoise0x20 8, 208, 44 + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 12, 125, 76 + unknownnoise0x20 15, 211, 76 + endchannel + +SFX_80383_4_Ch4: + dutycycle 240 + unknownsfx0x20 15, 247, 160, 7 + unknownsfx0x20 6, 230, 163, 7 + unknownsfx0x20 10, 244, 160, 7 + dutycycle 165 + unknownsfx0x20 10, 246, 216, 7 + unknownsfx0x20 4, 227, 215, 7 + unknownsfx0x20 15, 242, 216, 7 + endchannel + +SFX_803a0_4_Ch5: + dutycycle 5 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 15, 167, 161, 6 + unknownsfx0x20 6, 134, 162, 6 + unknownsfx0x20 10, 116, 161, 6 + dutycycle 95 + unknownsfx0x20 10, 118, 214, 6 + unknownsfx0x20 4, 131, 217, 6 + unknownsfx0x20 15, 162, 215, 6 + endchannel + +SFX_803c1_4_Ch7: + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 6, 197, 59 + unknownnoise0x20 6, 228, 61 + unknownnoise0x20 8, 182, 60 + unknownnoise0x20 6, 212, 61 + unknownnoise0x20 8, 193, 59 + endchannel + diff --git a/audio/sfx/unknown_803da.asm b/audio/sfx/unknown_803da.asm new file mode 100644 index 00000000..442bd112 --- /dev/null +++ b/audio/sfx/unknown_803da.asm @@ -0,0 +1,24 @@ +SFX_803da_4_Ch4: + dutycycle 240 + unknownsfx0x20 15, 247, 192, 7 + unknownsfx0x20 6, 228, 193, 7 + unknownsfx0x20 10, 246, 192, 7 + unknownsfx0x20 4, 211, 194, 7 + unknownsfx0x20 8, 193, 192, 7 + endchannel + +SFX_803f1_4_Ch5: + dutycycle 95 + unknownsfx0x20 15, 151, 129, 7 + unknownsfx0x20 6, 132, 128, 7 + unknownsfx0x20 10, 150, 129, 7 + unknownsfx0x20 15, 131, 129, 7 + endchannel + +SFX_80404_4_Ch7: + unknownnoise0x20 3, 242, 60 + unknownnoise0x20 13, 230, 44 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 8, 193, 44 + endchannel + diff --git a/audio/sfx/unknown_80411.asm b/audio/sfx/unknown_80411.asm new file mode 100644 index 00000000..4ef49cdf --- /dev/null +++ b/audio/sfx/unknown_80411.asm @@ -0,0 +1,32 @@ +SFX_80411_4_Ch4: + dutycycle 240 + unknownsfx0x20 15, 247, 128, 6 + unknownsfx0x20 10, 230, 132, 6 + unknownsfx0x20 15, 215, 144, 6 + unknownsfx0x20 8, 213, 144, 6 + unknownsfx0x20 6, 196, 136, 6 + unknownsfx0x20 5, 211, 112, 6 + unknownsfx0x20 4, 211, 96, 6 + unknownsfx0x20 8, 193, 64, 6 + endchannel + +SFX_80434_4_Ch5: + dutycycle 5 + unknownsfx0x20 15, 183, 65, 6 + unknownsfx0x20 10, 150, 66, 6 + unknownsfx0x20 15, 167, 81, 6 + unknownsfx0x20 8, 165, 81, 6 + unknownsfx0x20 6, 148, 71, 6 + unknownsfx0x20 5, 163, 49, 6 + unknownsfx0x20 4, 147, 34, 6 + unknownsfx0x20 8, 113, 1, 6 + endchannel + +SFX_80457_4_Ch7: + unknownnoise0x20 15, 228, 60 + unknownnoise0x20 10, 199, 76 + unknownnoise0x20 10, 199, 60 + unknownnoise0x20 12, 183, 76 + unknownnoise0x20 15, 162, 92 + endchannel + diff --git a/audio/sfx/unknown_80467.asm b/audio/sfx/unknown_80467.asm new file mode 100644 index 00000000..7e5335ff --- /dev/null +++ b/audio/sfx/unknown_80467.asm @@ -0,0 +1,33 @@ +SFX_80467_4_Ch4: + dutycycle 240 + unknownsfx0x20 6, 247, 160, 7 + unknownsfx0x20 8, 230, 164, 7 + unknownsfx0x20 4, 214, 160, 7 + unknownsfx0x20 15, 211, 32, 7 + unknownsfx0x20 8, 195, 35, 7 + unknownsfx0x20 2, 194, 40, 7 + unknownsfx0x20 8, 177, 48, 7 + endchannel + +SFX_80486_4_Ch5: + dutycycle 10 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 6, 167, 65, 7 + unknownsfx0x20 8, 134, 67, 7 + unknownsfx0x20 4, 118, 65, 7 + unknownsfx0x20 13, 131, 194, 6 + unknownsfx0x20 7, 115, 193, 6 + unknownsfx0x20 3, 130, 204, 6 + unknownsfx0x20 8, 113, 216, 6 + endchannel + +SFX_804a9_4_Ch7: + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 230, 58 + unknownnoise0x20 4, 215, 58 + unknownnoise0x20 6, 214, 44 + unknownnoise0x20 8, 229, 60 + unknownnoise0x20 12, 210, 61 + unknownnoise0x20 8, 209, 44 + endchannel + diff --git a/audio/sfx/unknown_804bf.asm b/audio/sfx/unknown_804bf.asm new file mode 100644 index 00000000..6776692c --- /dev/null +++ b/audio/sfx/unknown_804bf.asm @@ -0,0 +1,25 @@ +SFX_804bf_4_Ch4: + dutycycle 165 + unknownsfx0x20 6, 244, 64, 7 + unknownsfx0x20 15, 227, 48, 7 + unknownsfx0x20 4, 244, 64, 7 + unknownsfx0x20 5, 179, 72, 7 + unknownsfx0x20 8, 209, 80, 7 + endchannel + +SFX_804d6_4_Ch5: + dutycycle 119 + unknownsfx0x20 6, 195, 18, 7 + unknownsfx0x20 15, 179, 4, 7 + unknownsfx0x20 3, 195, 18, 7 + unknownsfx0x20 4, 195, 33, 7 + unknownsfx0x20 8, 177, 50, 7 + endchannel + +SFX_804ed_4_Ch7: + unknownnoise0x20 8, 214, 44 + unknownnoise0x20 12, 198, 60 + unknownnoise0x20 10, 182, 44 + unknownnoise0x20 8, 145, 28 + endchannel + diff --git a/audio/sfx/unknown_804fa.asm b/audio/sfx/unknown_804fa.asm new file mode 100644 index 00000000..74b7e681 --- /dev/null +++ b/audio/sfx/unknown_804fa.asm @@ -0,0 +1,29 @@ +SFX_804fa_4_Ch4: + dutycycle 240 + unknownsfx0x20 4, 247, 8, 6 + unknownsfx0x20 6, 230, 0, 6 + unknownsfx0x20 6, 215, 240, 5 + unknownsfx0x20 6, 196, 224, 5 + unknownsfx0x20 5, 211, 192, 5 + unknownsfx0x20 4, 211, 160, 5 + unknownsfx0x20 8, 225, 128, 5 + endchannel + +SFX_80519_4_Ch5: + dutycycle 10 + unknownsfx0x20 4, 199, 4, 5 + unknownsfx0x20 6, 166, 2, 5 + unknownsfx0x20 6, 151, 241, 4 + unknownsfx0x20 4, 180, 225, 4 + unknownsfx0x20 5, 163, 194, 4 + unknownsfx0x20 4, 179, 163, 4 + unknownsfx0x20 8, 193, 130, 4 + endchannel + +SFX_80538_4_Ch7: + unknownnoise0x20 12, 228, 76 + unknownnoise0x20 10, 199, 92 + unknownnoise0x20 12, 182, 76 + unknownnoise0x20 15, 162, 92 + endchannel + diff --git a/audio/sfx/unknown_80545.asm b/audio/sfx/unknown_80545.asm new file mode 100644 index 00000000..9ba19478 --- /dev/null +++ b/audio/sfx/unknown_80545.asm @@ -0,0 +1,28 @@ +SFX_80545_4_Ch4: + dutycycle 241 + unknownsfx0x20 4, 247, 192, 7 + unknownsfx0x20 12, 230, 194, 7 + unknownsfx0x20 6, 181, 128, 6 + unknownsfx0x20 4, 196, 112, 6 + unknownsfx0x20 4, 181, 96, 6 + unknownsfx0x20 8, 193, 64, 6 + endchannel + +SFX_80560_4_Ch5: + dutycycle 204 + unknownsfx0x20 3, 199, 129, 7 + unknownsfx0x20 12, 182, 128, 7 + unknownsfx0x20 6, 165, 65, 6 + unknownsfx0x20 4, 196, 50, 6 + unknownsfx0x20 6, 181, 33, 6 + unknownsfx0x20 8, 161, 2, 6 + endchannel + +SFX_8057b_4_Ch7: + unknownnoise0x20 3, 228, 60 + unknownnoise0x20 12, 214, 44 + unknownnoise0x20 4, 228, 60 + unknownnoise0x20 8, 183, 92 + unknownnoise0x20 15, 194, 93 + endchannel + diff --git a/audio/sfx/unknown_8058b.asm b/audio/sfx/unknown_8058b.asm new file mode 100644 index 00000000..9e424200 --- /dev/null +++ b/audio/sfx/unknown_8058b.asm @@ -0,0 +1,30 @@ +SFX_8058b_4_Ch4: + dutycycle 201 + unknownsfx0x20 8, 247, 128, 6 + unknownsfx0x20 2, 247, 96, 6 + unknownsfx0x20 1, 231, 64, 6 + unknownsfx0x20 1, 231, 32, 6 + unknownsfx0x20 15, 209, 0, 6 + unknownsfx0x20 4, 199, 64, 7 + unknownsfx0x20 4, 167, 48, 7 + unknownsfx0x20 15, 145, 32, 7 + endchannel + +SFX_805ae_4_Ch5: + dutycycle 121 + unknownsfx0x20 10, 231, 130, 6 + unknownsfx0x20 2, 231, 98, 6 + unknownsfx0x20 1, 215, 66, 6 + unknownsfx0x20 1, 215, 34, 6 + unknownsfx0x20 15, 193, 2, 6 + unknownsfx0x20 4, 183, 66, 7 + unknownsfx0x20 2, 151, 50, 7 + unknownsfx0x20 15, 129, 34, 7 + endchannel + +SFX_805d1_4_Ch7: + unknownnoise0x20 4, 116, 33 + unknownnoise0x20 4, 116, 16 + unknownnoise0x20 4, 113, 32 + endchannel + diff --git a/audio/sfx/unknown_805db.asm b/audio/sfx/unknown_805db.asm new file mode 100644 index 00000000..5e978a1e --- /dev/null +++ b/audio/sfx/unknown_805db.asm @@ -0,0 +1,20 @@ +SFX_805db_4_Ch4: + dutycycle 245 + unknownsfx0x20 4, 243, 24, 7 + unknownsfx0x20 15, 229, 152, 7 + unknownsfx0x20 8, 145, 88, 7 + endchannel + +SFX_805ea_4_Ch5: + dutycycle 160 + unknownsfx0x20 5, 179, 8, 7 + unknownsfx0x20 15, 197, 136, 7 + unknownsfx0x20 8, 113, 72, 7 + endchannel + +SFX_805f9_4_Ch7: + unknownnoise0x20 3, 161, 28 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 8, 129, 28 + endchannel + diff --git a/audio/sfx/unknown_80603.asm b/audio/sfx/unknown_80603.asm new file mode 100644 index 00000000..3cbc9ca2 --- /dev/null +++ b/audio/sfx/unknown_80603.asm @@ -0,0 +1,22 @@ +SFX_80603_4_Ch4: + dutycycle 165 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 4, 242, 128, 7 + unknownsfx0x20 2, 146, 64, 7 + unknownsfx0x20 8, 225, 0, 6 + endchannel + +SFX_80616_4_Ch5: + dutycycle 10 + unknownsfx0x20 4, 177, 225, 6 + unknownsfx0x20 3, 194, 225, 6 + unknownsfx0x20 3, 98, 129, 6 + unknownsfx0x20 8, 177, 225, 5 + endchannel + +SFX_80629_4_Ch7: + unknownnoise0x20 2, 97, 50 + unknownnoise0x20 2, 97, 33 + unknownnoise0x20 8, 97, 17 + endchannel + diff --git a/audio/sfx/unknown_80633.asm b/audio/sfx/unknown_80633.asm new file mode 100644 index 00000000..9be59347 --- /dev/null +++ b/audio/sfx/unknown_80633.asm @@ -0,0 +1,20 @@ +SFX_80633_4_Ch4: + dutycycle 250 + unknownsfx0x20 6, 131, 71, 2 + unknownsfx0x20 15, 98, 38, 2 + unknownsfx0x20 4, 82, 69, 2 + unknownsfx0x20 9, 99, 6, 2 + unknownsfx0x20 15, 130, 37, 2 + unknownsfx0x20 15, 66, 7, 2 +SFX_8064d_4_Ch5: + endchannel + +SFX_8064e_4_Ch7: + unknownnoise0x20 8, 212, 140 + unknownnoise0x20 4, 226, 156 + unknownnoise0x20 15, 198, 140 + unknownnoise0x20 8, 228, 172 + unknownnoise0x20 15, 215, 156 + unknownnoise0x20 15, 242, 172 + endchannel + diff --git a/audio/sfx/unknown_80661.asm b/audio/sfx/unknown_80661.asm new file mode 100644 index 00000000..f6848664 --- /dev/null +++ b/audio/sfx/unknown_80661.asm @@ -0,0 +1,20 @@ +SFX_80661_4_Ch4: + dutycycle 240 + unknownsfx0x20 4, 243, 224, 6 + unknownsfx0x20 15, 228, 64, 6 + unknownsfx0x20 8, 193, 32, 6 + endchannel + +SFX_80670_4_Ch5: + dutycycle 10 + unknownsfx0x20 3, 195, 131, 6 + unknownsfx0x20 14, 180, 2, 6 + unknownsfx0x20 8, 161, 1, 6 + endchannel + +SFX_8067f_4_Ch7: + unknownnoise0x20 4, 211, 92 + unknownnoise0x20 15, 230, 76 + unknownnoise0x20 8, 177, 92 + endchannel + diff --git a/audio/sfx/unknown_80689.asm b/audio/sfx/unknown_80689.asm new file mode 100644 index 00000000..0e2c573a --- /dev/null +++ b/audio/sfx/unknown_80689.asm @@ -0,0 +1,17 @@ +SFX_80689_4_Ch4: + dutycycle 10 + unknownsfx0x20 6, 226, 0, 5 + unknownsfx0x20 6, 227, 128, 5 + unknownsfx0x20 6, 211, 112, 5 + unknownsfx0x20 8, 161, 96, 5 + endchannel + +SFX_8069c_4_Ch5: + dutycycle 245 + unknownsfx0x20 6, 226, 130, 4 + unknownsfx0x20 6, 211, 1, 5 + unknownsfx0x20 6, 178, 226, 4 + unknownsfx0x20 8, 129, 193, 4 +SFX_806ae_4_Ch7: + endchannel + diff --git a/audio/sfx/unknown_806af.asm b/audio/sfx/unknown_806af.asm new file mode 100644 index 00000000..3cb97c62 --- /dev/null +++ b/audio/sfx/unknown_806af.asm @@ -0,0 +1,36 @@ +SFX_806af_4_Ch4: + dutycycle 204 + unknownsfx0x20 4, 241, 0, 7 + unknownsfx0x20 4, 225, 128, 7 + unknownsfx0x20 4, 209, 64, 7 + unknownsfx0x20 4, 225, 64, 7 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 209, 0, 7 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 209, 130, 7 + unknownsfx0x20 4, 193, 66, 7 + unknownsfx0x20 8, 177, 65, 7 + endchannel + +SFX_806da_4_Ch5: + dutycycle 68 + unknownsfx0x20 12, 8, 0, 0 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 225, 130, 7 + unknownsfx0x20 4, 209, 65, 7 + unknownsfx0x20 4, 225, 65, 7 + unknownsfx0x20 4, 241, 130, 7 + unknownsfx0x20 8, 209, 1, 7 + endchannel + +SFX_806f9_4_Ch7: + unknownnoise0x20 15, 8, 0 + unknownnoise0x20 4, 8, 0 + unknownnoise0x20 4, 209, 76 + unknownnoise0x20 4, 177, 44 + unknownnoise0x20 4, 209, 60 + unknownnoise0x20 4, 177, 60 + unknownnoise0x20 4, 193, 44 + unknownnoise0x20 8, 161, 76 + endchannel + diff --git a/audio/sfx/unknown_80712.asm b/audio/sfx/unknown_80712.asm new file mode 100644 index 00000000..689f12ad --- /dev/null +++ b/audio/sfx/unknown_80712.asm @@ -0,0 +1,27 @@ +SFX_80712_4_Ch4: + dutycycle 204 + unknownsfx0x20 8, 245, 0, 6 + unknownsfx0x20 2, 210, 56, 6 + unknownsfx0x20 2, 194, 48, 6 + unknownsfx0x20 2, 194, 40, 6 + unknownsfx0x20 2, 178, 32, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 2, 162, 24, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 8, 193, 32, 6 + endchannel + +SFX_80739_4_Ch5: + dutycycle 68 + unknownsfx0x20 12, 195, 192, 5 + unknownsfx0x20 3, 177, 249, 5 + unknownsfx0x20 2, 161, 241, 5 + unknownsfx0x20 2, 161, 233, 5 + unknownsfx0x20 2, 145, 225, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 2, 129, 209, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 8, 145, 225, 5 +SFX_8075f_4_Ch7: + endchannel + diff --git a/audio/sfx/unknown_80760.asm b/audio/sfx/unknown_80760.asm new file mode 100644 index 00000000..47d28da0 --- /dev/null +++ b/audio/sfx/unknown_80760.asm @@ -0,0 +1,15 @@ +SFX_80760_4_Ch4: + duty 0 + unknownsfx0x20 8, 245, 128, 4 + unknownsfx0x20 2, 225, 224, 5 + unknownsfx0x20 8, 209, 220, 5 + endchannel + +SFX_8076f_4_Ch5: + dutycycle 165 + unknownsfx0x20 7, 149, 65, 4 + unknownsfx0x20 2, 129, 33, 5 + unknownsfx0x20 8, 97, 26, 5 +SFX_8077d_4_Ch7: + endchannel + diff --git a/audio/sfx/unknown_8077e.asm b/audio/sfx/unknown_8077e.asm new file mode 100644 index 00000000..2047af78 --- /dev/null +++ b/audio/sfx/unknown_8077e.asm @@ -0,0 +1,39 @@ +SFX_8077e_4_Ch4: + dutycycle 136 + unknownsfx0x20 5, 242, 80, 6 + unknownsfx0x20 9, 209, 96, 6 + unknownsfx0x20 5, 226, 18, 6 + unknownsfx0x20 9, 193, 34, 6 + unknownsfx0x20 5, 242, 16, 6 + unknownsfx0x20 6, 209, 32, 6 + loopchannel 2, SFX_8077e_4_Ch4 + endchannel + +SFX_8079d_4_Ch5: + dutycycle 64 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 5, 242, 81, 6 + unknownsfx0x20 9, 209, 97, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 12, 209, 33, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 4, 209, 33, 6 + endchannel + +SFX_807cc_4_Ch7: + unknownnoise0x20 6, 210, 28 + unknownnoise0x20 9, 177, 44 + unknownnoise0x20 8, 194, 44 + unknownnoise0x20 9, 177, 60 + unknownnoise0x20 6, 194, 44 + unknownnoise0x20 9, 162, 60 + unknownnoise0x20 7, 194, 44 + unknownnoise0x20 5, 161, 60 + unknownnoise0x20 9, 194, 44 + unknownnoise0x20 4, 161, 60 + endchannel + diff --git a/audio/sfx/unknown_807eb.asm b/audio/sfx/unknown_807eb.asm new file mode 100644 index 00000000..8554695e --- /dev/null +++ b/audio/sfx/unknown_807eb.asm @@ -0,0 +1,23 @@ +SFX_807eb_4_Ch4: + dutycycle 160 + unknownsfx0x20 4, 243, 0, 6 + unknownsfx0x20 8, 213, 96, 7 + unknownsfx0x20 3, 226, 32, 7 + unknownsfx0x20 8, 209, 16, 7 + endchannel + +SFX_807fe_4_Ch5: + dutycycle 90 + unknownsfx0x20 5, 179, 241, 6 + unknownsfx0x20 7, 197, 82, 7 + unknownsfx0x20 3, 162, 17, 7 + unknownsfx0x20 8, 177, 1, 6 + endchannel + +SFX_80811_4_Ch7: + unknownnoise0x20 3, 162, 60 + unknownnoise0x20 12, 148, 44 + unknownnoise0x20 3, 130, 28 + unknownnoise0x20 8, 113, 44 + endchannel + diff --git a/audio/sfx/unknown_8081e.asm b/audio/sfx/unknown_8081e.asm new file mode 100644 index 00000000..1581d121 --- /dev/null +++ b/audio/sfx/unknown_8081e.asm @@ -0,0 +1,34 @@ +SFX_8081e_4_Ch4: + dutycycle 240 + unknownsfx0x20 8, 247, 224, 6 + unknownsfx0x20 6, 230, 229, 6 + unknownsfx0x20 3, 244, 224, 6 + unknownsfx0x20 3, 246, 208, 6 + unknownsfx0x20 3, 227, 192, 6 + unknownsfx0x20 4, 242, 176, 6 + unknownsfx0x20 15, 162, 200, 6 + endchannel + +SFX_8083d_4_Ch5: + dutycycle 5 + unknownsfx0x20 3, 8, 0, 0 + unknownsfx0x20 8, 167, 161, 6 + unknownsfx0x20 6, 134, 163, 6 + unknownsfx0x20 3, 116, 161, 6 + unknownsfx0x20 3, 118, 145, 6 + unknownsfx0x20 3, 131, 130, 6 + unknownsfx0x20 4, 162, 113, 6 + unknownsfx0x20 15, 114, 137, 6 + endchannel + +SFX_80860_4_Ch7: + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 8, 215, 60 + unknownnoise0x20 5, 197, 59 + unknownnoise0x20 3, 212, 44 + unknownnoise0x20 2, 182, 60 + unknownnoise0x20 3, 164, 44 + unknownnoise0x20 8, 145, 60 + endchannel + diff --git a/audio/sfx/unknown_80879.asm b/audio/sfx/unknown_80879.asm new file mode 100644 index 00000000..23839d60 --- /dev/null +++ b/audio/sfx/unknown_80879.asm @@ -0,0 +1,22 @@ +SFX_80879_4_Ch4: + dutycycle 240 + unknownsfx0x20 15, 246, 101, 5 + unknownsfx0x20 10, 228, 124, 5 + unknownsfx0x20 3, 194, 92, 5 + unknownsfx0x20 15, 178, 60, 5 + endchannel + +SFX_8088c_4_Ch5: + dutycycle 90 + unknownsfx0x20 14, 214, 3, 5 + unknownsfx0x20 9, 180, 27, 5 + unknownsfx0x20 4, 146, 250, 4 + unknownsfx0x20 15, 162, 219, 4 + endchannel + +SFX_8089f_4_Ch7: + unknownnoise0x20 12, 230, 76 + unknownnoise0x20 11, 215, 92 + unknownnoise0x20 15, 194, 76 + endchannel + diff --git a/audio/sfx/unknown_808a9.asm b/audio/sfx/unknown_808a9.asm new file mode 100644 index 00000000..efa4a0d6 --- /dev/null +++ b/audio/sfx/unknown_808a9.asm @@ -0,0 +1,31 @@ +SFX_808a9_4_Ch4: + dutycycle 240 + unknownsfx0x20 4, 247, 160, 6 + unknownsfx0x20 8, 230, 164, 6 + unknownsfx0x20 4, 214, 160, 6 + unknownsfx0x20 12, 211, 32, 6 + unknownsfx0x20 8, 195, 36, 6 + unknownsfx0x20 4, 194, 32, 6 + unknownsfx0x20 8, 177, 16, 6 + endchannel + +SFX_808c8_4_Ch5: + dutycycle 90 + unknownsfx0x20 4, 231, 1, 6 + unknownsfx0x20 8, 214, 3, 6 + unknownsfx0x20 4, 198, 1, 6 + unknownsfx0x20 12, 195, 129, 5 + unknownsfx0x20 8, 179, 131, 5 + unknownsfx0x20 4, 178, 130, 5 + unknownsfx0x20 8, 161, 113, 5 + endchannel + +SFX_808e7_4_Ch7: + unknownnoise0x20 7, 214, 92 + unknownnoise0x20 8, 230, 76 + unknownnoise0x20 4, 212, 92 + unknownnoise0x20 4, 212, 76 + unknownnoise0x20 7, 195, 76 + unknownnoise0x20 8, 161, 92 + endchannel + diff --git a/audio/sfx/unknown_808fa.asm b/audio/sfx/unknown_808fa.asm new file mode 100644 index 00000000..4bd5839f --- /dev/null +++ b/audio/sfx/unknown_808fa.asm @@ -0,0 +1,16 @@ +SFX_808fa_4_Ch4: + dutycycle 27 + unknownsfx0x20 7, 210, 64, 7 + unknownsfx0x20 15, 229, 96, 7 + unknownsfx0x20 15, 193, 48, 7 + endchannel + +SFX_80909_4_Ch5: + dutycycle 129 + unknownsfx0x20 2, 194, 1, 7 + unknownsfx0x20 4, 194, 8, 7 + unknownsfx0x20 15, 215, 65, 7 + unknownsfx0x20 15, 162, 1, 7 +SFX_8091b_4_Ch7: + endchannel + diff --git a/audio/sfx/unknown_8091c.asm b/audio/sfx/unknown_8091c.asm new file mode 100644 index 00000000..c4fa4c20 --- /dev/null +++ b/audio/sfx/unknown_8091c.asm @@ -0,0 +1,20 @@ +SFX_8091c_4_Ch4: + dutycycle 240 + unknownsfx0x20 15, 215, 128, 7 + unknownsfx0x20 4, 230, 160, 7 + unknownsfx0x20 15, 210, 64, 7 + endchannel + +SFX_8092b_4_Ch5: + dutycycle 90 + unknownsfx0x20 15, 199, 83, 7 + unknownsfx0x20 5, 182, 114, 7 + unknownsfx0x20 15, 194, 17, 7 + endchannel + +SFX_8093a_4_Ch7: + unknownnoise0x20 13, 246, 76 + unknownnoise0x20 4, 230, 60 + unknownnoise0x20 15, 242, 76 + endchannel + diff --git a/audio/sfx/unknown_80944.asm b/audio/sfx/unknown_80944.asm new file mode 100644 index 00000000..e16cec26 --- /dev/null +++ b/audio/sfx/unknown_80944.asm @@ -0,0 +1,25 @@ +SFX_80944_4_Ch4: + dutycycle 240 + unknownsfx0x20 6, 247, 192, 6 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 4, 244, 240, 6 + unknownsfx0x20 4, 228, 224, 6 + unknownsfx0x20 8, 209, 208, 6 + endchannel + +SFX_8095b_4_Ch5: + dutycycle 10 + unknownsfx0x20 7, 230, 129, 6 + unknownsfx0x20 14, 213, 193, 6 + unknownsfx0x20 4, 196, 177, 6 + unknownsfx0x20 4, 212, 161, 6 + unknownsfx0x20 8, 193, 145, 6 + endchannel + +SFX_80972_4_Ch7: + unknownnoise0x20 10, 166, 60 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 5, 163, 60 + unknownnoise0x20 8, 145, 44 + endchannel + diff --git a/audio/sfx/unknown_8097f.asm b/audio/sfx/unknown_8097f.asm new file mode 100644 index 00000000..b178821c --- /dev/null +++ b/audio/sfx/unknown_8097f.asm @@ -0,0 +1,23 @@ +SFX_8097f_4_Ch4: + dutycycle 165 + unknownsfx0x20 12, 242, 64, 4 + unknownsfx0x20 15, 227, 160, 4 + unknownsfx0x20 4, 210, 144, 4 + unknownsfx0x20 8, 209, 128, 4 + endchannel + +SFX_80992_4_Ch5: + dutycycle 238 + unknownsfx0x20 11, 210, 56, 4 + unknownsfx0x20 14, 198, 152, 4 + unknownsfx0x20 3, 178, 136, 4 + unknownsfx0x20 8, 177, 120, 4 + endchannel + +SFX_809a5_4_Ch7: + unknownnoise0x20 10, 230, 108 + unknownnoise0x20 15, 210, 92 + unknownnoise0x20 3, 194, 108 + unknownnoise0x20 8, 209, 92 + endchannel + diff --git a/audio/sfx/unknown_809b2.asm b/audio/sfx/unknown_809b2.asm new file mode 100644 index 00000000..095f7134 --- /dev/null +++ b/audio/sfx/unknown_809b2.asm @@ -0,0 +1,29 @@ +SFX_809b2_4_Ch4: + dutycycle 51 + unknownsfx0x20 15, 246, 192, 5 + unknownsfx0x20 8, 227, 188, 5 + unknownsfx0x20 6, 210, 208, 5 + unknownsfx0x20 6, 178, 224, 5 + unknownsfx0x20 6, 194, 240, 5 + unknownsfx0x20 8, 177, 0, 6 + endchannel + +SFX_809cd_4_Ch5: + dutycycle 153 + unknownsfx0x20 14, 198, 177, 4 + unknownsfx0x20 7, 195, 173, 4 + unknownsfx0x20 5, 178, 193, 4 + unknownsfx0x20 8, 146, 209, 4 + unknownsfx0x20 6, 162, 225, 4 + unknownsfx0x20 8, 145, 241, 4 + endchannel + +SFX_809e8_4_Ch7: + unknownnoise0x20 10, 230, 92 + unknownnoise0x20 10, 214, 108 + unknownnoise0x20 4, 194, 76 + unknownnoise0x20 6, 211, 92 + unknownnoise0x20 8, 179, 76 + unknownnoise0x20 8, 161, 92 + endchannel + diff --git a/audio/sfx/unknown_809fb.asm b/audio/sfx/unknown_809fb.asm new file mode 100644 index 00000000..7424d61b --- /dev/null +++ b/audio/sfx/unknown_809fb.asm @@ -0,0 +1,20 @@ +SFX_809fb_4_Ch4: + dutycycle 240 + unknownsfx0x20 8, 228, 144, 7 + unknownsfx0x20 15, 245, 192, 7 + unknownsfx0x20 8, 209, 216, 7 + endchannel + +SFX_80a0a_4_Ch5: + dutycycle 165 + unknownsfx0x20 10, 196, 113, 7 + unknownsfx0x20 15, 182, 162, 7 + unknownsfx0x20 8, 161, 183, 7 + endchannel + +SFX_80a19_4_Ch7: + unknownnoise0x20 8, 228, 76 + unknownnoise0x20 14, 196, 60 + unknownnoise0x20 8, 209, 44 + endchannel + diff --git a/audio/sfx/unknown_80a23.asm b/audio/sfx/unknown_80a23.asm new file mode 100644 index 00000000..c20a37d4 --- /dev/null +++ b/audio/sfx/unknown_80a23.asm @@ -0,0 +1,37 @@ +SFX_80a23_4_Ch4: + dutycycle 240 + unknownsfx0x20 6, 242, 0, 6 + unknownsfx0x20 6, 226, 64, 6 + unknownsfx0x20 6, 210, 128, 6 + unknownsfx0x20 6, 226, 192, 6 + unknownsfx0x20 6, 210, 0, 7 + unknownsfx0x20 6, 194, 64, 7 + unknownsfx0x20 6, 178, 128, 7 + unknownsfx0x20 8, 161, 192, 7 + endchannel + +SFX_80a46_4_Ch5: + dutycycle 17 + unknownsfx0x20 3, 8, 1, 0 + unknownsfx0x20 6, 194, 193, 5 + unknownsfx0x20 6, 178, 2, 6 + unknownsfx0x20 6, 162, 65, 6 + unknownsfx0x20 6, 178, 130, 6 + unknownsfx0x20 6, 162, 194, 6 + unknownsfx0x20 6, 146, 1, 7 + unknownsfx0x20 6, 162, 66, 7 + unknownsfx0x20 8, 129, 129, 7 + endchannel + +SFX_80a6d_4_Ch7: + unknownnoise0x20 6, 8, 1 + unknownnoise0x20 5, 226, 92 + unknownnoise0x20 5, 194, 76 + unknownnoise0x20 5, 210, 60 + unknownnoise0x20 5, 178, 44 + unknownnoise0x20 5, 194, 28 + unknownnoise0x20 5, 162, 27 + unknownnoise0x20 5, 146, 26 + unknownnoise0x20 8, 129, 24 + endchannel + diff --git a/audio/sfx/unknown_80a89.asm b/audio/sfx/unknown_80a89.asm new file mode 100644 index 00000000..b79cf7c3 --- /dev/null +++ b/audio/sfx/unknown_80a89.asm @@ -0,0 +1,29 @@ +SFX_80a89_4_Ch4: + dutycycle 240 + unknownsfx0x20 4, 243, 128, 7 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 8, 211, 16, 7 + unknownsfx0x20 4, 194, 0, 7 + unknownsfx0x20 4, 210, 240, 6 + unknownsfx0x20 8, 193, 224, 6 + endchannel + +SFX_80aa4_4_Ch5: + dutycycle 90 + unknownsfx0x20 6, 195, 1, 7 + unknownsfx0x20 14, 183, 129, 6 + unknownsfx0x20 7, 179, 146, 6 + unknownsfx0x20 3, 162, 129, 6 + unknownsfx0x20 4, 178, 114, 6 + unknownsfx0x20 8, 161, 97, 6 + endchannel + +SFX_80abf_4_Ch7: + unknownnoise0x20 6, 227, 92 + unknownnoise0x20 14, 214, 76 + unknownnoise0x20 6, 198, 60 + unknownnoise0x20 3, 179, 76 + unknownnoise0x20 3, 162, 92 + unknownnoise0x20 8, 177, 108 + endchannel + diff --git a/audio/sfx/unknown_80ad2.asm b/audio/sfx/unknown_80ad2.asm new file mode 100644 index 00000000..db7b45b2 --- /dev/null +++ b/audio/sfx/unknown_80ad2.asm @@ -0,0 +1,23 @@ +SFX_80ad2_4_Ch4: + dutycycle 15 + unknownsfx0x20 15, 247, 0, 5 + unknownsfx0x20 15, 231, 8, 5 + unknownsfx0x20 8, 180, 128, 4 + unknownsfx0x20 15, 162, 96, 4 + endchannel + +SFX_80ae5_4_Ch5: + dutycycle 68 + unknownsfx0x20 14, 215, 129, 4 + unknownsfx0x20 14, 199, 137, 4 + unknownsfx0x20 10, 180, 1, 4 + unknownsfx0x20 15, 194, 225, 3 + endchannel + +SFX_80af8_4_Ch7: + unknownnoise0x20 14, 247, 124 + unknownnoise0x20 12, 246, 108 + unknownnoise0x20 9, 228, 124 + unknownnoise0x20 15, 226, 108 + endchannel + diff --git a/audio/sfx/unknown_80b05.asm b/audio/sfx/unknown_80b05.asm new file mode 100644 index 00000000..68ca90f5 --- /dev/null +++ b/audio/sfx/unknown_80b05.asm @@ -0,0 +1,30 @@ +SFX_80b05_4_Ch4: + dutycycle 245 + unknownsfx0x20 7, 214, 225, 7 + unknownsfx0x20 6, 198, 226, 7 + unknownsfx0x20 9, 214, 225, 7 + unknownsfx0x20 7, 198, 224, 7 + unknownsfx0x20 5, 182, 226, 7 + unknownsfx0x20 7, 198, 225, 7 + unknownsfx0x20 6, 182, 224, 7 + unknownsfx0x20 8, 161, 223, 7 + endchannel + +SFX_80b28_4_Ch5: + dutycycle 68 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 6, 179, 199, 7 + unknownsfx0x20 10, 196, 195, 7 + unknownsfx0x20 8, 180, 199, 7 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 15, 162, 197, 7 + endchannel + +SFX_80b43_4_Ch7: + unknownnoise0x20 13, 25, 124 + unknownnoise0x20 13, 247, 140 + unknownnoise0x20 12, 214, 124 + unknownnoise0x20 8, 196, 108 + unknownnoise0x20 15, 179, 92 + endchannel + diff --git a/audio/sfx/unknown_80b53.asm b/audio/sfx/unknown_80b53.asm new file mode 100644 index 00000000..3033d299 --- /dev/null +++ b/audio/sfx/unknown_80b53.asm @@ -0,0 +1,29 @@ +SFX_80b53_4_Ch4: + dutycycle 240 + unknownsfx0x20 6, 247, 64, 7 + unknownsfx0x20 12, 230, 68, 7 + unknownsfx0x20 6, 213, 80, 7 + unknownsfx0x20 4, 195, 96, 7 + unknownsfx0x20 3, 195, 128, 7 + unknownsfx0x20 8, 209, 160, 7 + endchannel + +SFX_80b6e_4_Ch5: + dutycycle 10 + unknownsfx0x20 6, 199, 1, 7 + unknownsfx0x20 11, 182, 2, 7 + unknownsfx0x20 6, 165, 17, 7 + unknownsfx0x20 4, 147, 33, 7 + unknownsfx0x20 3, 163, 65, 7 + unknownsfx0x20 8, 145, 98, 7 + endchannel + +SFX_80b89_4_Ch7: + unknownnoise0x20 3, 226, 60 + unknownnoise0x20 8, 214, 76 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 12, 199, 76 + unknownnoise0x20 2, 226, 60 + unknownnoise0x20 8, 209, 44 + endchannel + diff --git a/audio/sfx/unknown_80b9c.asm b/audio/sfx/unknown_80b9c.asm new file mode 100644 index 00000000..5e54107e --- /dev/null +++ b/audio/sfx/unknown_80b9c.asm @@ -0,0 +1,28 @@ +SFX_80b9c_4_Ch4: + dutycycle 244 + unknownsfx0x20 15, 240, 5, 7 + unknownsfx0x20 10, 224, 0, 7 + unknownsfx0x20 6, 180, 16, 7 + unknownsfx0x20 4, 211, 0, 7 + unknownsfx0x20 6, 178, 32, 6 + unknownsfx0x20 8, 161, 36, 6 + endchannel + +SFX_80bb7_4_Ch5: + dutycycle 34 + unknownsfx0x20 15, 176, 195, 6 + unknownsfx0x20 10, 160, 193, 6 + unknownsfx0x20 6, 132, 210, 6 + unknownsfx0x20 4, 147, 193, 6 + unknownsfx0x20 6, 130, 225, 5 + unknownsfx0x20 8, 97, 232, 5 + endchannel + +SFX_80bd2_4_Ch7: + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 15, 214, 60 + unknownnoise0x20 10, 197, 74 + unknownnoise0x20 1, 178, 91 + unknownnoise0x20 15, 194, 76 + endchannel + diff --git a/audio/sfx/unknown_80be2.asm b/audio/sfx/unknown_80be2.asm new file mode 100644 index 00000000..4660d8f2 --- /dev/null +++ b/audio/sfx/unknown_80be2.asm @@ -0,0 +1,33 @@ +SFX_80be2_4_Ch4: + dutycycle 80 + unknownsfx0x20 10, 245, 128, 6 + unknownsfx0x20 3, 226, 160, 6 + unknownsfx0x20 3, 242, 192, 6 + unknownsfx0x20 3, 226, 224, 6 + unknownsfx0x20 3, 210, 0, 7 + unknownsfx0x20 3, 194, 224, 6 + unknownsfx0x20 3, 210, 192, 6 + unknownsfx0x20 8, 193, 160, 6 + endchannel + +SFX_80c05_4_Ch5: + dutycycle 15 + unknownsfx0x20 9, 213, 49, 6 + unknownsfx0x20 3, 210, 82, 6 + unknownsfx0x20 3, 226, 113, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 178, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 113, 6 + unknownsfx0x20 8, 177, 81, 6 + endchannel + +SFX_80c28_4_Ch7: + unknownnoise0x20 6, 227, 76 + unknownnoise0x20 4, 195, 60 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 4, 196, 44 + unknownnoise0x20 6, 180, 60 + unknownnoise0x20 8, 193, 44 + endchannel + diff --git a/audio/sfx/unknown_80c3b.asm b/audio/sfx/unknown_80c3b.asm new file mode 100644 index 00000000..f6106ebf --- /dev/null +++ b/audio/sfx/unknown_80c3b.asm @@ -0,0 +1,23 @@ +SFX_80c3b_4_Ch4: + dutycycle 165 + unknownsfx0x20 3, 244, 65, 6 + unknownsfx0x20 13, 214, 33, 7 + unknownsfx0x20 8, 244, 25, 7 + unknownsfx0x20 8, 193, 26, 7 + endchannel + +SFX_80c4e_4_Ch5: + dutycycle 204 + unknownsfx0x20 4, 244, 128, 5 + unknownsfx0x20 14, 230, 224, 6 + unknownsfx0x20 8, 213, 216, 6 + unknownsfx0x20 8, 209, 220, 6 + endchannel + +SFX_80c61_4_Ch7: + unknownnoise0x20 5, 196, 70 + unknownnoise0x20 13, 165, 68 + unknownnoise0x20 8, 196, 69 + unknownnoise0x20 8, 177, 68 + endchannel + diff --git a/audio/sfx/unknown_80c6e.asm b/audio/sfx/unknown_80c6e.asm new file mode 100644 index 00000000..54c4b3f9 --- /dev/null +++ b/audio/sfx/unknown_80c6e.asm @@ -0,0 +1,23 @@ +SFX_80c6e_4_Ch4: + dutycycle 240 + unknownsfx0x20 13, 241, 17, 5 + unknownsfx0x20 13, 225, 21, 5 + unknownsfx0x20 13, 225, 17, 5 + unknownsfx0x20 8, 209, 17, 5 + endchannel + +SFX_80c81_4_Ch5: + dutycycle 21 + unknownsfx0x20 12, 225, 12, 5 + unknownsfx0x20 12, 209, 16, 5 + unknownsfx0x20 14, 193, 12, 5 + unknownsfx0x20 8, 193, 10, 5 + endchannel + +SFX_80c94_4_Ch7: + unknownnoise0x20 14, 242, 101 + unknownnoise0x20 13, 226, 85 + unknownnoise0x20 14, 210, 86 + unknownnoise0x20 8, 209, 102 + endchannel + diff --git a/audio/sfx/unknown_80ca1.asm b/audio/sfx/unknown_80ca1.asm new file mode 100644 index 00000000..df3b29be --- /dev/null +++ b/audio/sfx/unknown_80ca1.asm @@ -0,0 +1,25 @@ +SFX_80ca1_4_Ch4: + dutycycle 27 + unknownsfx0x20 3, 243, 100, 5 + unknownsfx0x20 2, 226, 68, 5 + unknownsfx0x20 5, 209, 34, 5 + unknownsfx0x20 2, 178, 132, 4 + unknownsfx0x20 8, 209, 162, 4 + unknownsfx0x20 3, 243, 36, 5 + unknownsfx0x20 4, 228, 228, 4 + unknownsfx0x20 8, 209, 2, 5 + endchannel + +SFX_80cc4_4_Ch5: + dutycycle 204 + unknownsfx0x20 3, 211, 96, 5 + unknownsfx0x20 2, 194, 64, 5 + unknownsfx0x20 5, 193, 32, 5 + unknownsfx0x20 2, 146, 128, 4 + unknownsfx0x20 8, 193, 160, 4 + unknownsfx0x20 3, 211, 32, 5 + unknownsfx0x20 3, 196, 224, 4 + unknownsfx0x20 8, 193, 0, 5 +SFX_80ce6_4_Ch7: + endchannel + diff --git a/audio/sfx/unknown_80ce7.asm b/audio/sfx/unknown_80ce7.asm new file mode 100644 index 00000000..6b5a2163 --- /dev/null +++ b/audio/sfx/unknown_80ce7.asm @@ -0,0 +1,24 @@ +SFX_80ce7_4_Ch4: + dutycycle 17 + unknownsfx0x20 2, 61, 129, 3 + unknownsfx0x20 7, 245, 1, 6 + unknownsfx0x20 1, 194, 129, 4 + unknownsfx0x20 8, 145, 129, 3 + endchannel + +SFX_80cfa_4_Ch5: + dutycycle 238 + unknownsfx0x20 2, 62, 176, 5 + unknownsfx0x20 7, 213, 93, 7 + unknownsfx0x20 1, 178, 176, 6 + unknownsfx0x20 8, 97, 176, 5 + endchannel + +SFX_80d0d_4_Ch7: + unknownnoise0x20 2, 146, 73 + unknownnoise0x20 7, 181, 41 + unknownnoise0x20 1, 162, 57 + unknownnoise0x20 8, 145, 73 + endchannel + + diff --git a/audio/sfx/unknown_80e5a.asm b/audio/sfx/unknown_80e5a.asm new file mode 100644 index 00000000..76cf48d4 --- /dev/null +++ b/audio/sfx/unknown_80e5a.asm @@ -0,0 +1,46 @@ +SFX_80e5a_4_Ch4: + executemusic + tempo 256 + volume 7, 7 + vibrato 6, 2, 6 + duty 2 + toggleperfectpitch + notetype 4, 11, 1 + octave 3 + G# 2 + G# 2 + G# 2 + notetype 12, 11, 3 + octave 4 + E_ 4 + endchannel + +SFX_80e71_4_Ch5: + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 4, 12, 1 + octave 4 + E_ 2 + E_ 2 + E_ 2 + notetype 12, 12, 3 + B_ 4 + endchannel + +SFX_80e81_4_Ch6: + executemusic + notetype 4, 1, 0 + octave 4 + B_ 1 + rest 1 + B_ 1 + rest 1 + B_ 1 + rest 1 + notetype 12, 1, 0 + octave 4 + B_ 2 + rest 2 + endchannel + diff --git a/audio/sfx/unknown_80e71.asm b/audio/sfx/unknown_80e71.asm new file mode 100644 index 00000000..1b8241fb --- /dev/null +++ b/audio/sfx/unknown_80e71.asm @@ -0,0 +1,45 @@ +SFX_80e91_4_Ch4: + executemusic + tempo 256 + volume 7, 7 + vibrato 6, 2, 6 + duty 2 + toggleperfectpitch + notetype 4, 11, 1 + octave 3 + G# 2 + G# 2 + G# 2 + notetype 12, 11, 3 + octave 4 + E_ 4 + endchannel + +SFX_80ea8_4_Ch5: + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 4, 12, 1 + octave 4 + E_ 2 + E_ 2 + E_ 2 + notetype 12, 12, 3 + B_ 4 + endchannel + +SFX_80eb8_4_Ch6: + executemusic + notetype 4, 1, 0 + octave 4 + B_ 1 + rest 1 + B_ 1 + rest 1 + B_ 1 + rest 1 + notetype 12, 1, 0 + octave 4 + B_ 2 + rest 2 + endchannel diff --git a/audio/sfx/unknown_80e91.asm b/audio/sfx/unknown_80e91.asm new file mode 100644 index 00000000..2b180d9d --- /dev/null +++ b/audio/sfx/unknown_80e91.asm @@ -0,0 +1,46 @@ +SFX_80e91_4_Ch4: + executemusic + tempo 256 + volume 7, 7 + vibrato 6, 2, 6 + duty 2 + toggleperfectpitch + notetype 4, 11, 1 + octave 3 + G# 2 + G# 2 + G# 2 + notetype 12, 11, 3 + octave 4 + E_ 4 + endchannel + +SFX_80ea8_4_Ch5: + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 4, 12, 1 + octave 4 + E_ 2 + E_ 2 + E_ 2 + notetype 12, 12, 3 + B_ 4 + endchannel + +SFX_80eb8_4_Ch6: + executemusic + notetype 4, 1, 0 + octave 4 + B_ 1 + rest 1 + B_ 1 + rest 1 + B_ 1 + rest 1 + notetype 12, 1, 0 + octave 4 + B_ 2 + rest 2 + endchannel + diff --git a/audio/unknown_832b9.bin b/audio/unknown_832b9.bin Binary files differnew file mode 100755 index 00000000..96a64283 --- /dev/null +++ b/audio/unknown_832b9.bin |