diff options
49 files changed, 309 insertions, 309 deletions
diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm index 5a762b30..68807104 100755 --- a/audio/headers/musicheaders1.asm +++ b/audio/headers/musicheaders1.asm @@ -1,184 +1,184 @@ Music_PalletTown:: db ( $80 | CH0 ) - dw Music_PalletTown_Ch1 + dw Music_PalletTown_Ch0 db CH1 - dw Music_PalletTown_Ch2 + dw Music_PalletTown_Ch1 db CH2 - dw Music_PalletTown_Ch3 + dw Music_PalletTown_Ch2 Music_Pokecenter:: db ( $80 | CH0 ) - dw Music_Pokecenter_Ch1 + dw Music_Pokecenter_Ch0 db CH1 - dw Music_Pokecenter_Ch2 + dw Music_Pokecenter_Ch1 db CH2 - dw Music_Pokecenter_Ch3 + dw Music_Pokecenter_Ch2 Music_Gym:: db ( $80 | CH0 ) - dw Music_Gym_Ch1 + dw Music_Gym_Ch0 db CH1 - dw Music_Gym_Ch2 + dw Music_Gym_Ch1 db CH2 - dw Music_Gym_Ch3 + dw Music_Gym_Ch2 ; Viridian City, Pewter City, Saffron City Music_Cities1:: db ( $C0 | CH0 ) - dw Music_Cities1_Ch1 + dw Music_Cities1_Ch0 db CH1 - dw Music_Cities1_Ch2 + dw Music_Cities1_Ch1 db CH2 - dw Music_Cities1_Ch3 + dw Music_Cities1_Ch2 db CH3 - dw Music_Cities1_Ch4 + dw Music_Cities1_Ch3 ; Cerulean City, Fuchsia City Music_Cities2:: db ( $80 | CH0 ) - dw Music_Cities2_Ch1 + dw Music_Cities2_Ch0 db CH1 - dw Music_Cities2_Ch2 + dw Music_Cities2_Ch1 db CH2 - dw Music_Cities2_Ch3 + dw Music_Cities2_Ch2 Music_Celadon:: db ( $80 | CH0 ) - dw Music_Celadon_Ch1 + dw Music_Celadon_Ch0 db CH1 - dw Music_Celadon_Ch2 + dw Music_Celadon_Ch1 db CH2 - dw Music_Celadon_Ch3 + dw Music_Celadon_Ch2 Music_Cinnabar:: db ( $80 | CH0 ) - dw Music_Cinnabar_Ch1 + dw Music_Cinnabar_Ch0 db CH1 - dw Music_Cinnabar_Ch2 + dw Music_Cinnabar_Ch1 db CH2 - dw Music_Cinnabar_Ch3 + dw Music_Cinnabar_Ch2 Music_Vermilion:: db ( $C0 | CH0 ) - dw Music_Vermilion_Ch1 + dw Music_Vermilion_Ch0 db CH1 - dw Music_Vermilion_Ch2 + dw Music_Vermilion_Ch1 db CH2 - dw Music_Vermilion_Ch3 + dw Music_Vermilion_Ch2 db CH3 - dw Music_Vermilion_Ch4 + dw Music_Vermilion_Ch3 Music_Lavender:: db ( $C0 | CH0 ) - dw Music_Lavender_Ch1 + dw Music_Lavender_Ch0 db CH1 - dw Music_Lavender_Ch2 + dw Music_Lavender_Ch1 db CH2 - dw Music_Lavender_Ch3 + dw Music_Lavender_Ch2 db CH3 - dw Music_Lavender_Ch4 + dw Music_Lavender_Ch3 Music_SSAnne:: db ( $80 | CH0 ) - dw Music_SSAnne_Ch1 + dw Music_SSAnne_Ch0 db CH1 - dw Music_SSAnne_Ch2 + dw Music_SSAnne_Ch1 db CH2 - dw Music_SSAnne_Ch3 + dw Music_SSAnne_Ch2 Music_MeetProfOak:: db ( $80 | CH0 ) - dw Music_MeetProfOak_Ch1 + dw Music_MeetProfOak_Ch0 db CH1 - dw Music_MeetProfOak_Ch2 + dw Music_MeetProfOak_Ch1 db CH2 - dw Music_MeetProfOak_Ch3 + dw Music_MeetProfOak_Ch2 Music_MeetRival:: db ( $80 | CH0 ) - dw Music_MeetRival_Ch1 + dw Music_MeetRival_Ch0 db CH1 - dw Music_MeetRival_Ch2 + dw Music_MeetRival_Ch1 db CH2 - dw Music_MeetRival_Ch3 + dw Music_MeetRival_Ch2 Music_MuseumGuy:: db ( $C0 | CH0 ) - dw Music_MuseumGuy_Ch1 + dw Music_MuseumGuy_Ch0 db CH1 - dw Music_MuseumGuy_Ch2 + dw Music_MuseumGuy_Ch1 db CH2 - dw Music_MuseumGuy_Ch3 + dw Music_MuseumGuy_Ch2 db CH3 - dw Music_MuseumGuy_Ch4 + dw Music_MuseumGuy_Ch3 Music_SafariZone:: db ( $80 | CH0 ) - dw Music_SafariZone_Ch1 + dw Music_SafariZone_Ch0 db CH1 - dw Music_SafariZone_Ch2 + dw Music_SafariZone_Ch1 db CH2 - dw Music_SafariZone_Ch3 + dw Music_SafariZone_Ch2 Music_PkmnHealed:: db ( $80 | CH0 ) - dw Music_PkmnHealed_Ch1 + dw Music_PkmnHealed_Ch0 db CH1 - dw Music_PkmnHealed_Ch2 + dw Music_PkmnHealed_Ch1 db CH2 - dw Music_PkmnHealed_Ch3 + dw Music_PkmnHealed_Ch2 ; Routes 1 and 2 Music_Routes1:: db ( $C0 | CH0 ) - dw Music_Routes1_Ch1 + dw Music_Routes1_Ch0 db CH1 - dw Music_Routes1_Ch2 + dw Music_Routes1_Ch1 db CH2 - dw Music_Routes1_Ch3 + dw Music_Routes1_Ch2 db CH3 - dw Music_Routes1_Ch4 + dw Music_Routes1_Ch3 ; Routes 24 and 25 Music_Routes2:: db ( $C0 | CH0 ) - dw Music_Routes2_Ch1 + dw Music_Routes2_Ch0 db CH1 - dw Music_Routes2_Ch2 + dw Music_Routes2_Ch1 db CH2 - dw Music_Routes2_Ch3 + dw Music_Routes2_Ch2 db CH3 - dw Music_Routes2_Ch4 + dw Music_Routes2_Ch3 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 Music_Routes3:: db ( $C0 | CH0 ) - dw Music_Routes3_Ch1 + dw Music_Routes3_Ch0 db CH1 - dw Music_Routes3_Ch2 + dw Music_Routes3_Ch1 db CH2 - dw Music_Routes3_Ch3 + dw Music_Routes3_Ch2 db CH3 - dw Music_Routes3_Ch4 + dw Music_Routes3_Ch3 ; Routes 11, 12, 13, 14, 15 Music_Routes4:: db ( $C0 | CH0 ) - dw Music_Routes4_Ch1 + dw Music_Routes4_Ch0 db CH1 - dw Music_Routes4_Ch2 + dw Music_Routes4_Ch1 db CH2 - dw Music_Routes4_Ch3 + dw Music_Routes4_Ch2 db CH3 - dw Music_Routes4_Ch4 + dw Music_Routes4_Ch3 ; Route 23, Indigo Plateau Music_IndigoPlateau:: db ( $C0 | CH0 ) - dw Music_IndigoPlateau_Ch1 + dw Music_IndigoPlateau_Ch0 db CH1 - dw Music_IndigoPlateau_Ch2 + dw Music_IndigoPlateau_Ch1 db CH2 - dw Music_IndigoPlateau_Ch3 + dw Music_IndigoPlateau_Ch2 db CH3 - dw Music_IndigoPlateau_Ch4 + dw Music_IndigoPlateau_Ch3 diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index 8adc039a..9e2be3ec 100755 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -1,55 +1,55 @@ Music_GymLeaderBattle:: db ( $80 | CH0 ) - dw Music_GymLeaderBattle_Ch1 + dw Music_GymLeaderBattle_Ch0 db CH1 - dw Music_GymLeaderBattle_Ch2 + dw Music_GymLeaderBattle_Ch1 db CH2 - dw Music_GymLeaderBattle_Ch3 + dw Music_GymLeaderBattle_Ch2 Music_TrainerBattle:: db ( $80 | CH0 ) - dw Music_TrainerBattle_Ch1 + dw Music_TrainerBattle_Ch0 db CH1 - dw Music_TrainerBattle_Ch2 + dw Music_TrainerBattle_Ch1 db CH2 - dw Music_TrainerBattle_Ch3 + dw Music_TrainerBattle_Ch2 Music_WildBattle:: db ( $80 | CH0 ) - dw Music_WildBattle_Ch1 + dw Music_WildBattle_Ch0 db CH1 - dw Music_WildBattle_Ch2 + dw Music_WildBattle_Ch1 db CH2 - dw Music_WildBattle_Ch3 + dw Music_WildBattle_Ch2 Music_FinalBattle:: db ( $80 | CH0 ) - dw Music_FinalBattle_Ch1 + dw Music_FinalBattle_Ch0 db CH1 - dw Music_FinalBattle_Ch2 + dw Music_FinalBattle_Ch1 db CH2 - dw Music_FinalBattle_Ch3 + dw Music_FinalBattle_Ch2 Music_DefeatedTrainer:: db ( $80 | CH0 ) - dw Music_DefeatedTrainer_Ch1 + dw Music_DefeatedTrainer_Ch0 db CH1 - dw Music_DefeatedTrainer_Ch2 + dw Music_DefeatedTrainer_Ch1 db CH2 - dw Music_DefeatedTrainer_Ch3 + dw Music_DefeatedTrainer_Ch2 Music_DefeatedWildMon:: db ( $80 | CH0 ) - dw Music_DefeatedWildMon_Ch1 + dw Music_DefeatedWildMon_Ch0 db CH1 - dw Music_DefeatedWildMon_Ch2 + dw Music_DefeatedWildMon_Ch1 db CH2 - dw Music_DefeatedWildMon_Ch3 + dw Music_DefeatedWildMon_Ch2 Music_DefeatedGymLeader:: db ( $80 | CH0 ) - dw Music_DefeatedGymLeader_Ch1 + dw Music_DefeatedGymLeader_Ch0 db CH1 - dw Music_DefeatedGymLeader_Ch2 + dw Music_DefeatedGymLeader_Ch1 db CH2 - dw Music_DefeatedGymLeader_Ch3 + dw Music_DefeatedGymLeader_Ch2 diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index 1c54b266..09404e2d 100755 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -1,158 +1,158 @@ Music_TitleScreen:: db ( $C0 | CH0 ) - dw Music_TitleScreen_Ch1 + dw Music_TitleScreen_Ch0 db CH1 - dw Music_TitleScreen_Ch2 + dw Music_TitleScreen_Ch1 db CH2 - dw Music_TitleScreen_Ch3 + dw Music_TitleScreen_Ch2 db CH3 - dw Music_TitleScreen_Ch4 + dw Music_TitleScreen_Ch3 Music_Credits:: db ( $80 | CH0 ) - dw Music_Credits_Ch1 + dw Music_Credits_Ch0 db CH1 - dw Music_Credits_Ch2 + dw Music_Credits_Ch1 db CH2 - dw Music_Credits_Ch3 + dw Music_Credits_Ch2 Music_HallOfFame:: db ( $80 | CH0 ) - dw Music_HallOfFame_Ch1 + dw Music_HallOfFame_Ch0 db CH1 - dw Music_HallOfFame_Ch2 + dw Music_HallOfFame_Ch1 db CH2 - dw Music_HallOfFame_Ch3 + dw Music_HallOfFame_Ch2 Music_OaksLab:: db ( $80 | CH0 ) - dw Music_OaksLab_Ch1 + dw Music_OaksLab_Ch0 db CH1 - dw Music_OaksLab_Ch2 + dw Music_OaksLab_Ch1 db CH2 - dw Music_OaksLab_Ch3 + dw Music_OaksLab_Ch2 Music_JigglypuffSong:: db $40 - dw Music_JigglypuffSong_Ch1 + dw Music_JigglypuffSong_Ch0 db CH1 - dw Music_JigglypuffSong_Ch2 + dw Music_JigglypuffSong_Ch1 Music_BikeRiding:: db ( $C0 | CH0 ) - dw Music_BikeRiding_Ch1 + dw Music_BikeRiding_Ch0 db CH1 - dw Music_BikeRiding_Ch2 + dw Music_BikeRiding_Ch1 db CH2 - dw Music_BikeRiding_Ch3 + dw Music_BikeRiding_Ch2 db CH3 - dw Music_BikeRiding_Ch4 + dw Music_BikeRiding_Ch3 Music_Surfing:: db ( $80 | CH0 ) - dw Music_Surfing_Ch1 + dw Music_Surfing_Ch0 db CH1 - dw Music_Surfing_Ch2 + dw Music_Surfing_Ch1 db CH2 - dw Music_Surfing_Ch3 + dw Music_Surfing_Ch2 Music_GameCorner:: db ( $80 | CH0 ) - dw Music_GameCorner_Ch1 + dw Music_GameCorner_Ch0 db CH1 - dw Music_GameCorner_Ch2 + dw Music_GameCorner_Ch1 db CH2 - dw Music_GameCorner_Ch3 + dw Music_GameCorner_Ch2 Music_IntroBattle:: db ( $C0 | CH0 ) - dw Music_IntroBattle_Ch1 + dw Music_IntroBattle_Ch0 db CH1 - dw Music_IntroBattle_Ch2 + dw Music_IntroBattle_Ch1 db CH2 - dw Music_IntroBattle_Ch3 + dw Music_IntroBattle_Ch2 db CH3 - dw Music_IntroBattle_Ch4 + dw Music_IntroBattle_Ch3 ; Power Plant, Unknown Dungeon, Rocket HQ Music_Dungeon1:: db ( $C0 | CH0 ) - dw Music_Dungeon1_Ch1 + dw Music_Dungeon1_Ch0 db CH1 - dw Music_Dungeon1_Ch2 + dw Music_Dungeon1_Ch1 db CH2 - dw Music_Dungeon1_Ch3 + dw Music_Dungeon1_Ch2 db CH3 - dw Music_Dungeon1_Ch4 + dw Music_Dungeon1_Ch3 ; Viridian Forest, Seafoam Islands Music_Dungeon2:: db ( $C0 | CH0 ) - dw Music_Dungeon2_Ch1 + dw Music_Dungeon2_Ch0 db CH1 - dw Music_Dungeon2_Ch2 + dw Music_Dungeon2_Ch1 db CH2 - dw Music_Dungeon2_Ch3 + dw Music_Dungeon2_Ch2 db CH3 - dw Music_Dungeon2_Ch4 + dw Music_Dungeon2_Ch3 ; Mt. Moon, Rock Tunnel, Victory Road Music_Dungeon3:: db ( $C0 | CH0 ) - dw Music_Dungeon3_Ch1 + dw Music_Dungeon3_Ch0 db CH1 - dw Music_Dungeon3_Ch2 + dw Music_Dungeon3_Ch1 db CH2 - dw Music_Dungeon3_Ch3 + dw Music_Dungeon3_Ch2 db CH3 - dw Music_Dungeon3_Ch4 + dw Music_Dungeon3_Ch3 Music_CinnabarMansion:: db ( $C0 | CH0 ) - dw Music_CinnabarMansion_Ch1 + dw Music_CinnabarMansion_Ch0 db CH1 - dw Music_CinnabarMansion_Ch2 + dw Music_CinnabarMansion_Ch1 db CH2 - dw Music_CinnabarMansion_Ch3 + dw Music_CinnabarMansion_Ch2 db CH3 - dw Music_CinnabarMansion_Ch4 + dw Music_CinnabarMansion_Ch3 Music_PokemonTower:: db ( $80 | CH0 ) - dw Music_PokemonTower_Ch1 + dw Music_PokemonTower_Ch0 db CH1 - dw Music_PokemonTower_Ch2 + dw Music_PokemonTower_Ch1 db CH2 - dw Music_PokemonTower_Ch3 + dw Music_PokemonTower_Ch2 Music_SilphCo:: db ( $80 | CH0 ) - dw Music_SilphCo_Ch1 + dw Music_SilphCo_Ch0 db CH1 - dw Music_SilphCo_Ch2 + dw Music_SilphCo_Ch1 db CH2 - dw Music_SilphCo_Ch3 + dw Music_SilphCo_Ch2 Music_MeetEvilTrainer:: db ( $80 | CH0 ) - dw Music_MeetEvilTrainer_Ch1 + dw Music_MeetEvilTrainer_Ch0 db CH1 - dw Music_MeetEvilTrainer_Ch2 + dw Music_MeetEvilTrainer_Ch1 db CH2 - dw Music_MeetEvilTrainer_Ch3 + dw Music_MeetEvilTrainer_Ch2 Music_MeetFemaleTrainer:: db ( $80 | CH0 ) - dw Music_MeetFemaleTrainer_Ch1 + dw Music_MeetFemaleTrainer_Ch0 db CH1 - dw Music_MeetFemaleTrainer_Ch2 + dw Music_MeetFemaleTrainer_Ch1 db CH2 - dw Music_MeetFemaleTrainer_Ch3 + dw Music_MeetFemaleTrainer_Ch2 Music_MeetMaleTrainer:: db ( $80 | CH0 ) - dw Music_MeetMaleTrainer_Ch1 + dw Music_MeetMaleTrainer_Ch0 db CH1 - dw Music_MeetMaleTrainer_Ch2 + dw Music_MeetMaleTrainer_Ch1 db CH2 - dw Music_MeetMaleTrainer_Ch3 + dw Music_MeetMaleTrainer_Ch2 diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm index b5378a94..87c7b5c2 100644 --- a/audio/music/bikeriding.asm +++ b/audio/music/bikeriding.asm @@ -1,4 +1,4 @@ -Music_BikeRiding_Ch1:: +Music_BikeRiding_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -153,7 +153,7 @@ Music_BikeRiding_branch_7dbc9:: loopchannel 0, Music_BikeRiding_branch_7dbc9 -Music_BikeRiding_Ch2:: +Music_BikeRiding_Ch1:: duty 2 vibrato 6, 1, 5 notetype 12, 12, 3 @@ -302,7 +302,7 @@ Music_BikeRiding_branch_7dc75:: loopchannel 0, Music_BikeRiding_branch_7dc75 -Music_BikeRiding_Ch3:: +Music_BikeRiding_Ch2:: notetype 12, 1, 3 rest 2 @@ -643,7 +643,7 @@ Music_BikeRiding_branch_7dd17:: loopchannel 0, Music_BikeRiding_branch_7dd17 -Music_BikeRiding_Ch4:: +Music_BikeRiding_Ch3:: dspeed 12 rest 2 diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm index 3f015d8d..a1699301 100644 --- a/audio/music/celadon.asm +++ b/audio/music/celadon.asm @@ -1,4 +1,4 @@ -Music_Celadon_Ch1:: +Music_Celadon_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -107,7 +107,7 @@ Music_Celadon_branch_b6d4:: loopchannel 0, Music_Celadon_branch_b6d4 -Music_Celadon_Ch2:: +Music_Celadon_Ch1:: duty 3 notetype 12, 12, 2 octave 4 @@ -226,7 +226,7 @@ Music_Celadon_branch_b74a:: loopchannel 0, Music_Celadon_branch_b74a -Music_Celadon_Ch3:: +Music_Celadon_Ch2:: notetype 12, 1, 3 rest 8 octave 5 diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm index 4fe93c31..c6b3564d 100644 --- a/audio/music/cinnabar.asm +++ b/audio/music/cinnabar.asm @@ -1,4 +1,4 @@ -Music_Cinnabar_Ch1:: +Music_Cinnabar_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -85,7 +85,7 @@ Music_Cinnabar_branch_b878:: loopchannel 0, Music_Cinnabar_branch_b878 -Music_Cinnabar_Ch2:: +Music_Cinnabar_Ch1:: duty 3 vibrato 10, 2, 3 @@ -179,7 +179,7 @@ Music_Cinnabar_branch_b8d9:: loopchannel 0, Music_Cinnabar_branch_b8d9 -Music_Cinnabar_Ch3:: +Music_Cinnabar_Ch2:: notetype 12, 1, 0 Music_Cinnabar_branch_b93f:: diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm index 438c2f18..bb54a456 100644 --- a/audio/music/cinnabarmansion.asm +++ b/audio/music/cinnabarmansion.asm @@ -1,4 +1,4 @@ -Music_CinnabarMansion_Ch1:: +Music_CinnabarMansion_Ch0:: tempo 144 volume 7, 7 vibrato 11, 2, 5 @@ -38,7 +38,7 @@ Music_CinnabarMansion_branch_7ed19:: loopchannel 0, Music_CinnabarMansion_branch_7ed19 -Music_CinnabarMansion_Ch2:: +Music_CinnabarMansion_Ch1:: duty 2 toggleperfectpitch vibrato 10, 2, 4 @@ -95,7 +95,7 @@ Music_CinnabarMansion_branch_7ed6c:: endchannel -Music_CinnabarMansion_Ch3:: +Music_CinnabarMansion_Ch2:: notetype 12, 1, 1 Music_CinnabarMansion_branch_7ed80:: @@ -143,7 +143,7 @@ Music_CinnabarMansion_branch_7ed80:: loopchannel 0, Music_CinnabarMansion_branch_7ed80 -Music_CinnabarMansion_Ch4:: +Music_CinnabarMansion_Ch3:: dspeed 6 rest 16 rest 16 diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm index eb9ccde5..984202f6 100644 --- a/audio/music/cities1.asm +++ b/audio/music/cities1.asm @@ -2,7 +2,7 @@ Music_Cities1_branch_aa6f:: tempo 232 loopchannel 0, Music_Cities1_branch_aa79 -Music_Cities1_Ch1:: +Music_Cities1_Ch0:: tempo 144 Music_Cities1_branch_aa79:: @@ -268,7 +268,7 @@ Music_Cities1_branch_ab8a:: endchannel -Music_Cities1_Ch2:: +Music_Cities1_Ch1:: vibrato 5, 1, 5 callchannel Music_Cities1_branch_ac00 octave 4 @@ -357,7 +357,7 @@ Music_Cities1_Ch2:: G# 1 notetype 12, 10, 4 A_ 1 - loopchannel 0, Music_Cities1_Ch2 + loopchannel 0, Music_Cities1_Ch1 Music_Cities1_branch_ac00:: duty 2 @@ -401,7 +401,7 @@ Music_Cities1_branch_ac00:: endchannel -Music_Cities1_Ch3:: +Music_Cities1_Ch2:: notetype 12, 1, 1 toggleperfectpitch @@ -579,7 +579,7 @@ Music_Cities1_branch_acce:: endchannel -Music_Cities1_Ch4:: +Music_Cities1_Ch3:: dspeed 12 callchannel Music_Cities1_branch_ad36 @@ -609,7 +609,7 @@ Music_Cities1_branch_acf3:: triangle1 6 snare6 6 snare6 4 - loopchannel 0, Music_Cities1_Ch4 + loopchannel 0, Music_Cities1_Ch3 Music_Cities1_branch_ad36:: snare6 6 diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm index 897fb8c9..fb167999 100644 --- a/audio/music/cities2.asm +++ b/audio/music/cities2.asm @@ -1,4 +1,4 @@ -Music_Cities2_Ch1:: +Music_Cities2_Ch0:: tempo 148 volume 7, 7 duty 3 @@ -94,7 +94,7 @@ Music_Cities2_branch_b51a:: loopchannel 0, Music_Cities2_branch_b51a -Music_Cities2_Ch2:: +Music_Cities2_Ch1:: duty 3 vibrato 8, 2, 3 notetype 12, 12, 2 @@ -280,7 +280,7 @@ Music_Cities2_branch_b58b:: loopchannel 0, Music_Cities2_branch_b58b -Music_Cities2_Ch3:: +Music_Cities2_Ch2:: notetype 12, 1, 1 rest 16 octave 4 diff --git a/audio/music/credits.asm b/audio/music/credits.asm index d9a5ec35..f092326b 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -1,4 +1,4 @@ -Music_Credits_Ch1:: +Music_Credits_Ch0:: tempo 140 volume 7, 7 duty 3 @@ -284,7 +284,7 @@ Music_Credits_Ch1:: endchannel -Music_Credits_Ch2:: +Music_Credits_Ch1:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 5 @@ -574,7 +574,7 @@ Music_Credits_Ch2:: endchannel -Music_Credits_Ch3:: +Music_Credits_Ch2:: notetype 12, 1, 0 octave 5 C# 6 diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm index 7f0d046d..1ea6c1ff 100644 --- a/audio/music/defeatedgymleader.asm +++ b/audio/music/defeatedgymleader.asm @@ -1,4 +1,4 @@ -Music_DefeatedGymLeader_Ch1:: +Music_DefeatedGymLeader_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -162,7 +162,7 @@ Music_DefeatedGymLeader_branch_23ccc:: loopchannel 0, Music_DefeatedGymLeader_branch_23ccc -Music_DefeatedGymLeader_Ch2:: +Music_DefeatedGymLeader_Ch1:: duty 2 vibrato 24, 2, 4 notetype 12, 12, 4 @@ -352,7 +352,7 @@ Music_DefeatedGymLeader_branch_23d84:: loopchannel 0, Music_DefeatedGymLeader_branch_23d84 -Music_DefeatedGymLeader_Ch3:: +Music_DefeatedGymLeader_Ch2:: notetype 12, 1, 0 vibrato 16, 1, 2 octave 4 diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm index 8ad51afa..87c5d2c9 100644 --- a/audio/music/defeatedtrainer.asm +++ b/audio/music/defeatedtrainer.asm @@ -1,4 +1,4 @@ -Music_DefeatedTrainer_Ch1:: +Music_DefeatedTrainer_Ch0:: tempo 224 volume 7, 7 duty 2 @@ -95,7 +95,7 @@ Music_DefeatedTrainer_branch_23a76:: loopchannel 0, Music_DefeatedTrainer_branch_23a76 -Music_DefeatedTrainer_Ch2:: +Music_DefeatedTrainer_Ch1:: duty 2 notetype 4, 12, 3 octave 4 @@ -172,7 +172,7 @@ Music_DefeatedTrainer_branch_23ad2:: loopchannel 0, Music_DefeatedTrainer_branch_23ad2 -Music_DefeatedTrainer_Ch3:: +Music_DefeatedTrainer_Ch2:: notetype 4, 1, 0 octave 5 D_ 2 diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm index 92326a84..ea3f733f 100644 --- a/audio/music/defeatedwildmon.asm +++ b/audio/music/defeatedwildmon.asm @@ -1,4 +1,4 @@ -Music_DefeatedWildMon_Ch1:: +Music_DefeatedWildMon_Ch0:: tempo 112 volume 7, 7 executemusic @@ -67,7 +67,7 @@ Music_DefeatedWildMon_branch_23b8b:: loopchannel 0, Music_DefeatedWildMon_branch_23b8b -Music_DefeatedWildMon_Ch2:: +Music_DefeatedWildMon_Ch1:: executemusic duty 2 notetype 12, 12, 3 @@ -142,7 +142,7 @@ Music_DefeatedWildMon_branch_23bce:: loopchannel 0, Music_DefeatedWildMon_branch_23bce -Music_DefeatedWildMon_Ch3:: +Music_DefeatedWildMon_Ch2:: executemusic notetype 12, 2, 0 octave 5 diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index c84fc694..c6f6b105 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -1,4 +1,4 @@ -Music_Dungeon1_Ch1:: +Music_Dungeon1_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -226,7 +226,7 @@ Music_Dungeon1_branch_7dfd5:: endchannel -Music_Dungeon1_Ch2:: +Music_Dungeon1_Ch1:: vibrato 11, 1, 5 duty 3 notetype 12, 0, 15 @@ -441,7 +441,7 @@ Music_Dungeon1_branch_7e0cd:: endchannel -Music_Dungeon1_Ch3:: +Music_Dungeon1_Ch2:: notetype 12, 1, 1 vibrato 8, 2, 6 rest 14 @@ -596,7 +596,7 @@ Music_Dungeon1_branch_7e177:: endchannel -Music_Dungeon1_Ch4:: +Music_Dungeon1_Ch3:: dspeed 12 rest 14 cymbal1 1 diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm index 44e9d5bf..d5f459fb 100644 --- a/audio/music/dungeon2.asm +++ b/audio/music/dungeon2.asm @@ -1,4 +1,4 @@ -Music_Dungeon2_Ch1:: +Music_Dungeon2_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -70,7 +70,7 @@ Music_Dungeon2_branch_7e892:: loopchannel 0, Music_Dungeon2_branch_7e892 -Music_Dungeon2_Ch2:: +Music_Dungeon2_Ch1:: vibrato 11, 1, 5 Music_Dungeon2_branch_7e8db:: @@ -162,7 +162,7 @@ Music_Dungeon2_branch_7e8db:: loopchannel 0, Music_Dungeon2_branch_7e8db -Music_Dungeon2_Ch3:: +Music_Dungeon2_Ch2:: notetype 12, 1, 3 vibrato 8, 2, 6 @@ -302,7 +302,7 @@ Music_Dungeon2_branch_7e9d1:: endchannel -Music_Dungeon2_Ch4:: +Music_Dungeon2_Ch3:: dspeed 12 Music_Dungeon2_branch_7e9dd:: diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm index 767ca626..f9742a26 100644 --- a/audio/music/dungeon3.asm +++ b/audio/music/dungeon3.asm @@ -1,4 +1,4 @@ -Music_Dungeon3_Ch1:: +Music_Dungeon3_Ch0:: tempo 160 volume 7, 7 duty 3 @@ -335,7 +335,7 @@ Music_Dungeon3_branch_7eafc:: endchannel -Music_Dungeon3_Ch2:: +Music_Dungeon3_Ch1:: vibrato 11, 1, 5 duty 3 @@ -607,7 +607,7 @@ Music_Dungeon3_branch_7eb6d:: loopchannel 0, Music_Dungeon3_branch_7eb6d -Music_Dungeon3_Ch3:: +Music_Dungeon3_Ch2:: notetype 12, 1, 2 rest 16 rest 16 @@ -707,10 +707,10 @@ Music_Dungeon3_Ch3:: rest 16 rest 16 rest 10 - loopchannel 0, Music_Dungeon3_Ch3 + loopchannel 0, Music_Dungeon3_Ch2 -Music_Dungeon3_Ch4:: +Music_Dungeon3_Ch3:: dspeed 12 rest 16 rest 16 diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm index 9a13f00f..adb0f8b9 100644 --- a/audio/music/finalbattle.asm +++ b/audio/music/finalbattle.asm @@ -1,4 +1,4 @@ -Music_FinalBattle_Ch1:: +Music_FinalBattle_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -381,7 +381,7 @@ Music_FinalBattle_branch_23429:: loopchannel 0, Music_FinalBattle_branch_23429 -Music_FinalBattle_Ch2:: +Music_FinalBattle_Ch1:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -738,7 +738,7 @@ Music_FinalBattle_branch_23710:: endchannel -Music_FinalBattle_Ch3:: +Music_FinalBattle_Ch2:: notetype 12, 1, 1 octave 4 E_ 4 diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index 52b85e08..832bade6 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -1,4 +1,4 @@ -Music_GameCorner_Ch1:: +Music_GameCorner_Ch0:: tempo 120 volume 7, 7 duty 3 @@ -183,7 +183,7 @@ Music_GameCorner_branch_7e222:: loopchannel 0, Music_GameCorner_branch_7e222 -Music_GameCorner_Ch2:: +Music_GameCorner_Ch1:: duty 2 vibrato 10, 2, 3 notetype 12, 12, 6 @@ -343,7 +343,7 @@ Music_GameCorner_branch_7e2fa:: loopchannel 0, Music_GameCorner_branch_7e2fa -Music_GameCorner_Ch3:: +Music_GameCorner_Ch2:: notetype 12, 1, 3 octave 5 C# 1 diff --git a/audio/music/gym.asm b/audio/music/gym.asm index b314336d..ad99bddd 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -1,4 +1,4 @@ -Music_Gym_Ch1:: +Music_Gym_Ch0:: tempo 138 volume 7, 7 duty 3 @@ -165,7 +165,7 @@ Music_Gym_branch_bcd8:: loopchannel 0, Music_Gym_branch_bcd8 -Music_Gym_Ch2:: +Music_Gym_Ch1:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 7 @@ -288,7 +288,7 @@ Music_Gym_branch_bd82:: loopchannel 0, Music_Gym_branch_bd82 -Music_Gym_Ch3:: +Music_Gym_Ch2:: notetype 12, 1, 1 rest 16 rest 10 diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm index 1eb2951d..6c1cffb5 100644 --- a/audio/music/gymleaderbattle.asm +++ b/audio/music/gymleaderbattle.asm @@ -1,4 +1,4 @@ -Music_GymLeaderBattle_Ch1:: +Music_GymLeaderBattle_Ch0:: tempo 104 volume 7, 7 duty 3 @@ -547,7 +547,7 @@ Music_GymLeaderBattle_branch_223b0:: loopchannel 0, Music_GymLeaderBattle_branch_223b0 -Music_GymLeaderBattle_Ch2:: +Music_GymLeaderBattle_Ch1:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 3 @@ -848,7 +848,7 @@ Music_GymLeaderBattle_branch_225e0:: loopchannel 0, Music_GymLeaderBattle_branch_225e0 -Music_GymLeaderBattle_Ch3:: +Music_GymLeaderBattle_Ch2:: vibrato 0, 2, 0 notetype 12, 1, 3 rest 12 diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 69f926f6..098c82c8 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -1,4 +1,4 @@ -Music_HallOfFame_Ch1:: +Music_HallOfFame_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -31,7 +31,7 @@ Music_HallOfFame_branch_7fbc5:: loopchannel 0, Music_HallOfFame_branch_7fbc5 -Music_HallOfFame_Ch2:: +Music_HallOfFame_Ch1:: vibrato 8, 2, 5 duty 3 @@ -63,7 +63,7 @@ Music_HallOfFame_branch_7fbdf:: loopchannel 0, Music_HallOfFame_branch_7fbdf -Music_HallOfFame_Ch3:: +Music_HallOfFame_Ch2:: notetype 12, 1, 2 Music_HallOfFame_branch_7fbfe:: @@ -93,4 +93,4 @@ Music_HallOfFame_branch_7fbfe:: G_ 4 E_ 4 G_ 4 - loopchannel 0, Music_HallOfFame_Ch3 + loopchannel 0, Music_HallOfFame_Ch2 diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index 61623e39..f139775b 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -1,4 +1,4 @@ -Music_IndigoPlateau_Ch1:: +Music_IndigoPlateau_Ch0:: tempo 132 volume 7, 7 duty 3 @@ -86,7 +86,7 @@ Music_IndigoPlateau_branch_a659:: endchannel -Music_IndigoPlateau_Ch2:: +Music_IndigoPlateau_Ch1:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -147,7 +147,7 @@ Music_IndigoPlateau_branch_a6af:: endchannel -Music_IndigoPlateau_Ch3:: +Music_IndigoPlateau_Ch2:: notetype 12, 1, 0 octave 4 D_ 2 @@ -225,7 +225,7 @@ Music_IndigoPlateau_branch_a6fe:: endchannel -Music_IndigoPlateau_Ch4:: +Music_IndigoPlateau_Ch3:: dspeed 6 mutedsnare2 16 mutedsnare2 16 diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm index fd4a8e35..2aad0d88 100644 --- a/audio/music/introbattle.asm +++ b/audio/music/introbattle.asm @@ -1,4 +1,4 @@ -Music_IntroBattle_Ch1:: +Music_IntroBattle_Ch0:: tempo 98 volume 7, 7 duty 3 @@ -90,7 +90,7 @@ Music_IntroBattle_Ch1:: endchannel -Music_IntroBattle_Ch2:: +Music_IntroBattle_Ch1:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 2 @@ -165,7 +165,7 @@ Music_IntroBattle_Ch2:: endchannel -Music_IntroBattle_Ch3:: +Music_IntroBattle_Ch2:: notetype 12, 1, 0 rest 8 octave 4 @@ -229,7 +229,7 @@ Music_IntroBattle_Ch3:: endchannel -Music_IntroBattle_Ch4:: +Music_IntroBattle_Ch3:: dspeed 6 mutedsnare4 1 mutedsnare4 1 diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm index 9a01246b..0b791a30 100644 --- a/audio/music/jigglypuffsong.asm +++ b/audio/music/jigglypuffsong.asm @@ -1,4 +1,4 @@ -Music_JigglypuffSong_Ch1:: +Music_JigglypuffSong_Ch0:: tempo 144 volume 7, 7 vibrato 8, 2, 4 @@ -21,7 +21,7 @@ Music_JigglypuffSong_Ch1:: endchannel -Music_JigglypuffSong_Ch2:: +Music_JigglypuffSong_Ch1:: vibrato 5, 1, 5 duty 2 dutycycle 10 diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm index 7b60cc24..da58e489 100644 --- a/audio/music/lavender.asm +++ b/audio/music/lavender.asm @@ -1,4 +1,4 @@ -Music_Lavender_Ch1:: +Music_Lavender_Ch0:: tempo 152 volume 7, 7 duty 1 @@ -62,7 +62,7 @@ Music_Lavender_branch_bb6b:: loopchannel 0, Music_Lavender_branch_bb6b -Music_Lavender_Ch2:: +Music_Lavender_Ch1:: vibrato 0, 3, 4 duty 3 notetype 12, 9, 1 @@ -76,7 +76,7 @@ Music_Lavender_branch_bba5:: loopchannel 0, Music_Lavender_branch_bba5 -Music_Lavender_Ch3:: +Music_Lavender_Ch2:: vibrato 4, 1, 1 notetype 12, 3, 5 rest 16 @@ -186,7 +186,7 @@ Music_Lavender_branch_bbb9:: loopchannel 0, Music_Lavender_branch_bbb9 -Music_Lavender_Ch4:: +Music_Lavender_Ch3:: dspeed 12 rest 16 rest 16 diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm index 2378a03a..941b0c34 100644 --- a/audio/music/meeteviltrainer.asm +++ b/audio/music/meeteviltrainer.asm @@ -1,4 +1,4 @@ -Music_MeetEvilTrainer_Ch1:: +Music_MeetEvilTrainer_Ch0:: tempo 124 volume 7, 7 duty 2 @@ -21,7 +21,7 @@ Music_MeetEvilTrainer_branch_7f6ae:: loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae -Music_MeetEvilTrainer_Ch2:: +Music_MeetEvilTrainer_Ch1:: duty 1 notetype 12, 11, 6 octave 3 @@ -60,7 +60,7 @@ Music_MeetEvilTrainer_branch_7f6c2:: loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 -Music_MeetEvilTrainer_Ch3:: +Music_MeetEvilTrainer_Ch2:: notetype 12, 1, 0 rest 8 octave 4 diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm index 0f24f99e..2a5659b4 100644 --- a/audio/music/meetfemaletrainer.asm +++ b/audio/music/meetfemaletrainer.asm @@ -1,4 +1,4 @@ -Music_MeetFemaleTrainer_Ch1:: +Music_MeetFemaleTrainer_Ch0:: tempo 124 volume 7, 7 duty 1 @@ -26,7 +26,7 @@ Music_MeetFemaleTrainer_branch_7f70c:: loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c -Music_MeetFemaleTrainer_Ch2:: +Music_MeetFemaleTrainer_Ch1:: duty 2 notetype 12, 12, 2 octave 3 @@ -71,7 +71,7 @@ Music_MeetFemaleTrainer_branch_7f726:: loopchannel 0, Music_MeetFemaleTrainer_branch_7f726 -Music_MeetFemaleTrainer_Ch3:: +Music_MeetFemaleTrainer_Ch2:: notetype 12, 1, 0 rest 8 octave 5 diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm index 92047849..c13e40cb 100644 --- a/audio/music/meetmaletrainer.asm +++ b/audio/music/meetmaletrainer.asm @@ -1,4 +1,4 @@ -Music_MeetMaleTrainer_Ch1:: +Music_MeetMaleTrainer_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -32,7 +32,7 @@ Music_MeetMaleTrainer_branch_7f78f:: loopchannel 0, Music_MeetMaleTrainer_branch_7f78f -Music_MeetMaleTrainer_Ch2:: +Music_MeetMaleTrainer_Ch1:: duty 3 vibrato 24, 2, 2 notetype 12, 12, 4 @@ -75,7 +75,7 @@ Music_MeetMaleTrainer_branch_7f7b5:: loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 -Music_MeetMaleTrainer_Ch3:: +Music_MeetMaleTrainer_Ch2:: notetype 12, 1, 0 rest 6 octave 4 diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm index 6532a187..5c6ea13d 100644 --- a/audio/music/meetprofoak.asm +++ b/audio/music/meetprofoak.asm @@ -1,4 +1,4 @@ -Music_MeetProfOak_Ch1:: +Music_MeetProfOak_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -74,7 +74,7 @@ Music_MeetProfOak_branch_af85:: loopchannel 0, Music_MeetProfOak_branch_af85 -Music_MeetProfOak_Ch2:: +Music_MeetProfOak_Ch1:: vibrato 8, 1, 1 duty 2 notetype 12, 12, 4 @@ -208,7 +208,7 @@ Music_MeetProfOak_branch_b005:: loopchannel 0, Music_MeetProfOak_branch_b005 -Music_MeetProfOak_Ch3:: +Music_MeetProfOak_Ch2:: notetype 12, 1, 2 rest 10 octave 4 diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm index 153523af..a6391247 100644 --- a/audio/music/meetrival.asm +++ b/audio/music/meetrival.asm @@ -2,7 +2,7 @@ Music_MeetRival_branch_b119:: tempo 100 loopchannel 0, Music_MeetRival_branch_b123 -Music_MeetRival_Ch1:: +Music_MeetRival_Ch0:: tempo 112 Music_MeetRival_branch_b123:: @@ -143,7 +143,7 @@ Music_MeetRival_branch_b1a5:: loopchannel 0, Music_MeetRival_branch_b140 -Music_MeetRival_Ch2:: +Music_MeetRival_Ch1:: duty 3 vibrato 10, 2, 6 notetype 12, 12, 7 @@ -248,7 +248,7 @@ Music_MeetRival_branch_b21d:: loopchannel 0, Music_MeetRival_branch_b1d8 -Music_MeetRival_Ch3:: +Music_MeetRival_Ch2:: notetype 12, 1, 4 octave 5 D_ 2 diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm index cb08fcf4..e41b37bd 100644 --- a/audio/music/museumguy.asm +++ b/audio/music/museumguy.asm @@ -1,4 +1,4 @@ -Music_MuseumGuy_Ch1:: +Music_MuseumGuy_Ch0:: tempo 128 volume 7, 7 duty 2 @@ -54,7 +54,7 @@ Music_MuseumGuy_branch_adec:: endchannel -Music_MuseumGuy_Ch2:: +Music_MuseumGuy_Ch1:: duty 2 notetype 12, 12, 1 octave 4 @@ -165,7 +165,7 @@ Music_MuseumGuy_branch_ae26:: loopchannel 0, Music_MuseumGuy_branch_ae26 -Music_MuseumGuy_Ch3:: +Music_MuseumGuy_Ch2:: notetype 12, 1, 0 rest 16 octave 4 @@ -261,7 +261,7 @@ Music_MuseumGuy_branch_aec1:: endchannel -Music_MuseumGuy_Ch4:: +Music_MuseumGuy_Ch3:: dspeed 12 rest 16 rest 16 diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm index 7214264c..87245350 100644 --- a/audio/music/oakslab.asm +++ b/audio/music/oakslab.asm @@ -1,4 +1,4 @@ -Music_OaksLab_Ch1:: +Music_OaksLab_Ch0:: tempo 140 volume 7, 7 duty 3 @@ -69,7 +69,7 @@ Music_OaksLab_branch_7eed0:: loopchannel 0, Music_OaksLab_branch_7eed0 -Music_OaksLab_Ch2:: +Music_OaksLab_Ch1:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 4 @@ -144,7 +144,7 @@ Music_OaksLab_branch_7ef16:: loopchannel 0, Music_OaksLab_branch_7ef16 -Music_OaksLab_Ch3:: +Music_OaksLab_Ch2:: notetype 12, 1, 1 rest 2 octave 4 diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 0c8b7dbc..5ad31f81 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -1,4 +1,4 @@ -Music_PalletTown_Ch1:: +Music_PalletTown_Ch0:: tempo 160 volume 7, 7 duty 2 @@ -148,7 +148,7 @@ Music_PalletTown_branch_a7ce:: endchannel -Music_PalletTown_Ch2:: +Music_PalletTown_Ch1:: duty 2 Music_PalletTown_branch_a861:: @@ -262,7 +262,7 @@ Music_PalletTown_branch_a861:: endchannel -Music_PalletTown_Ch3:: +Music_PalletTown_Ch2:: vibrato 24, 2, 8 notetype 12, 1, 2 diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm index 2b7b545b..9d3cd3d0 100644 --- a/audio/music/pkmnhealed.asm +++ b/audio/music/pkmnhealed.asm @@ -1,4 +1,4 @@ -Music_PkmnHealed_Ch1:: +Music_PkmnHealed_Ch0:: tempo 144 volume 7, 7 duty 2 @@ -19,7 +19,7 @@ Music_PkmnHealed_Ch1:: endchannel -Music_PkmnHealed_Ch2:: +Music_PkmnHealed_Ch1:: duty 2 notetype 12, 12, 3 octave 4 @@ -33,7 +33,7 @@ Music_PkmnHealed_Ch2:: endchannel -Music_PkmnHealed_Ch3:: +Music_PkmnHealed_Ch2:: notetype 12, 1, 0 octave 4 E_ 2 diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm index 5de546ad..83d161d7 100644 --- a/audio/music/pokecenter.asm +++ b/audio/music/pokecenter.asm @@ -1,4 +1,4 @@ -Music_Pokecenter_Ch1:: +Music_Pokecenter_Ch0:: tempo 144 volume 7, 7 duty 3 @@ -149,7 +149,7 @@ Music_Pokecenter_branch_be61:: loopchannel 0, Music_Pokecenter_branch_be61 -Music_Pokecenter_Ch2:: +Music_Pokecenter_Ch1:: vibrato 8, 2, 5 Music_Pokecenter_branch_befc:: @@ -248,7 +248,7 @@ Music_Pokecenter_branch_bf60:: endchannel -Music_Pokecenter_Ch3:: +Music_Pokecenter_Ch2:: notetype 12, 1, 0 Music_Pokecenter_branch_bf72:: diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm index afae9a75..0f17ddeb 100644 --- a/audio/music/pokemontower.asm +++ b/audio/music/pokemontower.asm @@ -1,4 +1,4 @@ -Music_PokemonTower_Ch1:: +Music_PokemonTower_Ch0:: tempo 152 volume 7, 7 duty 3 @@ -140,7 +140,7 @@ Music_PokemonTower_branch_7f05a:: loopchannel 0, Music_PokemonTower_branch_7f05a -Music_PokemonTower_Ch2:: +Music_PokemonTower_Ch1:: vibrato 20, 3, 4 duty 3 notetype 12, 10, 0 @@ -292,7 +292,7 @@ Music_PokemonTower_branch_7f0ee:: loopchannel 0, Music_PokemonTower_branch_7f0ee -Music_PokemonTower_Ch3:: +Music_PokemonTower_Ch2:: vibrato 4, 1, 1 notetype 12, 1, 3 rest 8 diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm index bab18261..fc3227ce 100644 --- a/audio/music/routes1.asm +++ b/audio/music/routes1.asm @@ -1,4 +1,4 @@ -Music_Routes1_Ch1:: +Music_Routes1_Ch0:: tempo 152 volume 7, 7 vibrato 4, 2, 3 @@ -106,7 +106,7 @@ Music_Routes1_branch_9be9:: endchannel -Music_Routes1_Ch2:: +Music_Routes1_Ch1:: duty 2 Music_Routes1_branch_9c53:: @@ -234,7 +234,7 @@ Music_Routes1_branch_9c8d:: endchannel -Music_Routes1_Ch3:: +Music_Routes1_Ch2:: vibrato 8, 2, 5 notetype 12, 1, 3 @@ -309,7 +309,7 @@ Music_Routes1_branch_9cdd:: endchannel -Music_Routes1_Ch4:: +Music_Routes1_Ch3:: dspeed 12 rest 4 mutedsnare1 2 @@ -400,5 +400,5 @@ Music_Routes1_Ch4:: rest 2 mutedsnare1 2 mutedsnare1 2 - loopchannel 0, Music_Routes1_Ch4 + loopchannel 0, Music_Routes1_Ch3 endchannel diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm index 42b4deda..ae5b22d1 100644 --- a/audio/music/routes2.asm +++ b/audio/music/routes2.asm @@ -1,4 +1,4 @@ -Music_Routes2_Ch1:: +Music_Routes2_Ch0:: tempo 152 volume 7, 7 vibrato 9, 2, 5 @@ -142,7 +142,7 @@ Music_Routes2_branch_9dc3:: endchannel -Music_Routes2_Ch2:: +Music_Routes2_Ch1:: vibrato 8, 2, 6 duty 3 @@ -216,7 +216,7 @@ Music_Routes2_branch_9e54:: endchannel -Music_Routes2_Ch3:: +Music_Routes2_Ch2:: vibrato 9, 2, 8 Music_Routes2_branch_9e9e:: @@ -324,7 +324,7 @@ Music_Routes2_branch_9e9e:: endchannel -Music_Routes2_Ch4:: +Music_Routes2_Ch3:: dspeed 12 snare3 2 rest 2 @@ -421,5 +421,5 @@ Music_Routes2_Ch4:: rest 3 snare3 3 rest 3 - loopchannel 0, Music_Routes2_Ch4 + loopchannel 0, Music_Routes2_Ch3 endchannel diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm index d0d1672e..b384308b 100644 --- a/audio/music/routes3.asm +++ b/audio/music/routes3.asm @@ -1,4 +1,4 @@ -Music_Routes3_Ch1:: +Music_Routes3_Ch0:: tempo 148 volume 7, 7 duty 3 @@ -77,7 +77,7 @@ Music_Routes3_branch_9fc3:: loopchannel 0, Music_Routes3_branch_9fc3 -Music_Routes3_Ch2:: +Music_Routes3_Ch1:: vibrato 8, 2, 3 duty 2 notetype 12, 12, 7 @@ -178,7 +178,7 @@ Music_Routes3_branch_a01a:: loopchannel 0, Music_Routes3_branch_a01a -Music_Routes3_Ch3:: +Music_Routes3_Ch2:: vibrato 4, 1, 0 notetype 6, 1, 2 octave 4 @@ -354,7 +354,7 @@ Music_Routes3_branch_a0a3:: loopchannel 0, Music_Routes3_branch_a0a3 -Music_Routes3_Ch4:: +Music_Routes3_Ch3:: dspeed 6 mutedsnare4 1 mutedsnare4 1 diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm index 9bbf44ea..a9149f05 100644 --- a/audio/music/routes4.asm +++ b/audio/music/routes4.asm @@ -1,4 +1,4 @@ -Music_Routes4_Ch1:: +Music_Routes4_Ch0:: tempo 148 volume 7, 7 duty 3 @@ -138,7 +138,7 @@ Music_Routes4_branch_a28a:: loopchannel 0, Music_Routes4_branch_a28a -Music_Routes4_Ch2:: +Music_Routes4_Ch1:: vibrato 12, 2, 4 duty 1 notetype 12, 9, 2 @@ -288,7 +288,7 @@ Music_Routes4_branch_a325:: loopchannel 0, Music_Routes4_branch_a325 -Music_Routes4_Ch3:: +Music_Routes4_Ch2:: notetype 12, 1, 0 octave 4 E_ 1 @@ -506,7 +506,7 @@ Music_Routes4_branch_a3d7:: loopchannel 0, Music_Routes4_branch_a3d7 -Music_Routes4_Ch4:: +Music_Routes4_Ch3:: dspeed 12 rest 16 rest 12 diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm index 45d84fd0..e2853646 100644 --- a/audio/music/safarizone.asm +++ b/audio/music/safarizone.asm @@ -1,4 +1,4 @@ -Music_SafariZone_Ch1:: +Music_SafariZone_Ch0:: tempo 132 volume 7, 7 vibrato 6, 3, 4 @@ -39,7 +39,7 @@ Music_SafariZone_branch_bc5f:: endchannel -Music_SafariZone_Ch2:: +Music_SafariZone_Ch1:: duty 2 vibrato 8, 2, 5 notetype 12, 10, 2 @@ -73,7 +73,7 @@ Music_SafariZone_branch_bc89:: endchannel -Music_SafariZone_Ch3:: +Music_SafariZone_Ch2:: notetype 12, 1, 0 rest 8 diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm index 2b6d8134..3e1ff3fc 100644 --- a/audio/music/silphco.asm +++ b/audio/music/silphco.asm @@ -1,4 +1,4 @@ -Music_SilphCo_Ch1:: +Music_SilphCo_Ch0:: tempo 160 volume 7, 7 duty 3 @@ -395,7 +395,7 @@ Music_SilphCo_branch_7f3f0:: endchannel -Music_SilphCo_Ch2:: +Music_SilphCo_Ch1:: vibrato 10, 3, 2 duty 3 notetype 6, 12, 3 @@ -780,7 +780,7 @@ Music_SilphCo_branch_7f42e:: loopchannel 0, Music_SilphCo_branch_7f42e -Music_SilphCo_Ch3:: +Music_SilphCo_Ch2:: vibrato 8, 1, 1 notetype 12, 1, 1 rest 12 diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm index ea6b1a0f..1356c8b1 100644 --- a/audio/music/ssanne.asm +++ b/audio/music/ssanne.asm @@ -1,4 +1,4 @@ -Music_SSAnne_Ch1:: +Music_SSAnne_Ch0:: tempo 128 volume 7, 7 duty 1 @@ -107,7 +107,7 @@ Music_SSAnne_branch_b3b2:: loopchannel 0, Music_SSAnne_branch_b3b2 -Music_SSAnne_Ch2:: +Music_SSAnne_Ch1:: duty 0 vibrato 12, 2, 4 @@ -282,7 +282,7 @@ Music_SSAnne_branch_b41e:: loopchannel 0, Music_SSAnne_branch_b41e -Music_SSAnne_Ch3:: +Music_SSAnne_Ch2:: notetype 12, 1, 3 rest 16 rest 12 @@ -335,4 +335,4 @@ Music_SSAnne_Ch3:: F# 8 G# 8 B_ 8 - loopchannel 0, Music_SSAnne_Ch3 + loopchannel 0, Music_SSAnne_Ch2 diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm index 03ebfed0..c4507a55 100644 --- a/audio/music/surfing.asm +++ b/audio/music/surfing.asm @@ -1,4 +1,4 @@ -Music_Surfing_Ch1:: +Music_Surfing_Ch0:: tempo 160 volume 7, 7 duty 3 @@ -116,7 +116,7 @@ Music_Surfing_branch_7fa30:: loopchannel 0, Music_Surfing_branch_7fa30 -Music_Surfing_Ch2:: +Music_Surfing_Ch1:: duty 3 vibrato 16, 2, 5 notetype 12, 12, 6 @@ -203,7 +203,7 @@ Music_Surfing_branch_7faae:: loopchannel 0, Music_Surfing_branch_7faae -Music_Surfing_Ch3:: +Music_Surfing_Ch2:: notetype 12, 1, 0 rest 12 octave 5 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index b28474eb..2d41b082 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -1,4 +1,4 @@ -Music_TitleScreen_Ch1:: +Music_TitleScreen_Ch0:: tempo 144 volume 7, 7 vibrato 9, 3, 4 @@ -154,7 +154,7 @@ Music_TitleScreen_branch_7e55c:: endchannel -Music_TitleScreen_Ch2:: +Music_TitleScreen_Ch1:: vibrato 16, 4, 6 duty 1 notetype 12, 14, 1 @@ -321,7 +321,7 @@ Music_TitleScreen_branch_7e636:: endchannel -Music_TitleScreen_Ch3:: +Music_TitleScreen_Ch2:: notetype 12, 1, 0 octave 3 G_ 1 @@ -459,7 +459,7 @@ Music_TitleScreen_branch_7e6e5:: endchannel -Music_TitleScreen_Ch4:: +Music_TitleScreen_Ch3:: dspeed 6 rest 4 snare3 1 diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm index 395f05de..5bd2c5f8 100644 --- a/audio/music/trainerbattle.asm +++ b/audio/music/trainerbattle.asm @@ -1,4 +1,4 @@ -Music_TrainerBattle_Ch1:: +Music_TrainerBattle_Ch0:: tempo 112 volume 7, 7 duty 3 @@ -649,7 +649,7 @@ Music_TrainerBattle_branch_22962:: loopchannel 0, Music_TrainerBattle_branch_22962 -Music_TrainerBattle_Ch2:: +Music_TrainerBattle_Ch1:: duty 3 vibrato 10, 2, 5 notetype 12, 12, 2 @@ -953,7 +953,7 @@ Music_TrainerBattle_branch_22bfc:: loopchannel 0, Music_TrainerBattle_branch_22bfc -Music_TrainerBattle_Ch3:: +Music_TrainerBattle_Ch2:: vibrato 0, 2, 0 notetype 12, 1, 4 octave 3 diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm index 10ca4beb..fb541581 100644 --- a/audio/music/unusedsong.asm +++ b/audio/music/unusedsong.asm @@ -1,4 +1,4 @@ -Music_UnusedSong_Ch1:: +Music_UnusedSong_Ch0:: tempo 144 volume 7, 7 vibrato 5, 1, 6 @@ -182,7 +182,7 @@ Music_UnusedSong_branch_a91b:: endchannel -Music_UnusedSong_Ch2:: +Music_UnusedSong_Ch1:: tempo 144 volume 7, 7 toggleperfectpitch diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm index 94f87b25..c89c9b3b 100644 --- a/audio/music/vermilion.asm +++ b/audio/music/vermilion.asm @@ -1,4 +1,4 @@ -Music_Vermilion_Ch1:: +Music_Vermilion_Ch0:: tempo 156 volume 7, 7 duty 3 @@ -111,7 +111,7 @@ Music_Vermilion_branch_b9f6:: loopchannel 0, Music_Vermilion_branch_b9f6 -Music_Vermilion_Ch2:: +Music_Vermilion_Ch1:: duty 3 vibrato 10, 2, 3 @@ -178,7 +178,7 @@ Music_Vermilion_branch_ba66:: loopchannel 0, Music_Vermilion_branch_ba66 -Music_Vermilion_Ch3:: +Music_Vermilion_Ch2:: notetype 12, 1, 0 Music_Vermilion_branch_baa8:: @@ -282,7 +282,7 @@ Music_Vermilion_branch_baa8:: loopchannel 0, Music_Vermilion_branch_baa8 -Music_Vermilion_Ch4:: +Music_Vermilion_Ch3:: dspeed 12 Music_Vermilion_branch_bb0e:: diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm index 3a88678f..e9aad529 100644 --- a/audio/music/wildbattle.asm +++ b/audio/music/wildbattle.asm @@ -1,4 +1,4 @@ -Music_WildBattle_Ch1:: +Music_WildBattle_Ch0:: tempo 104 volume 7, 7 duty 3 @@ -300,7 +300,7 @@ Music_WildBattle_branch_230e0:: loopchannel 0, Music_WildBattle_branch_230e0 -Music_WildBattle_Ch2:: +Music_WildBattle_Ch1:: duty 3 vibrato 8, 2, 5 notetype 12, 12, 3 @@ -462,7 +462,7 @@ Music_WildBattle_branch_23225:: loopchannel 0, Music_WildBattle_branch_23225 -Music_WildBattle_Ch3:: +Music_WildBattle_Ch2:: vibrato 0, 2, 0 notetype 12, 1, 1 octave 4 |