Disassemble yellow sounds

1 files changed, 69 insertions, 138 deletions

diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm
index a6449436..01102f74 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