2 files changed, 14 insertions, 46 deletions

diff --git a/music/blue/sfx_1f_5d.asm b/music/blue/sfx_1f_5d.asm
index 5d10f3d1..8b1ce426 100644
--- a/music/blue/sfx_1f_5d.asm
+++ b/music/blue/sfx_1f_5d.asm
@@ -1,52 +1,20 @@
 SFX_1f_5d_Ch1: ; 7c45e (1f:445e)
 	duty 2
-	note D_, 4
-	octave 4
-	note C_, 1
-	note C_, 7
-	note D_, 4
-	octave 4
-	note G#, 1
-	note C_, 7
-	note D_, 4
-	octave 4
-	rest 1
-	note C_, 7
-	note D_, 4
-	octave 4
-	note C_, 1
-	note C_, 8
-	note D_, 16
-	unknownmusic0xf2
-	octave 8
-	note C_, 8
+	unknownsfx0x20 3, 228, 0, 6
+	unknownsfx0x20 3, 228, 128, 6
+	unknownsfx0x20 3, 228, 192, 6
+	unknownsfx0x20 3, 228, 0, 7
+	unknownsfx0x20 15, 242, 224, 7
 	endchannel
 
 
 SFX_1f_5d_Ch2: ; 7c475 (1f:4475)
 	duty 2
-	note D_, 4
-	note C_, 9
-	note C_, 1
-	note C_, 1
-	note D_, 4
-	rest 5
-	note C_, 2
-	note C_, 7
-	note D_, 4
-	rest 5
-	note G#, 2
-	note C_, 7
-	note D_, 4
-	rest 5
-	rest 2
-	note C_, 7
-	note D_, 4
-	rest 5
-	note C_, 2
-	note C_, 8
-	note D_, 16
-	notetype 2, 14, 1
-	note C_, 8
+	unknownsfx0x20 3, 8, 0, 0
+	unknownsfx0x20 3, 196, 1, 6
+	unknownsfx0x20 3, 196, 129, 6
+	unknownsfx0x20 3, 196, 193, 6
+	unknownsfx0x20 3, 196, 1, 7
+	unknownsfx0x20 15, 210, 225, 7
 	endchannel
 ; 0x7c490
\ No newline at end of file
diff --git a/music/yellow/intro.asm b/music/yellow/yellowintro.asm
index dc84df74..ee716901 100644
--- a/music/yellow/intro.asm
+++ b/music/yellow/yellowintro.asm
@@ -1,4 +1,4 @@
-Music_IntroBattle_Ch1: ; 7f65c (1f:765c)
+Music_YellowIntro_Ch1: ; 7f65c (1f:765c)
 	tempo 0, 116
 	stereopanning 119
 	duty 3
@@ -100,7 +100,7 @@ Music_IntroBattle_Ch1: ; 7f65c (1f:765c)
 	endchannel
 
 
-Music_IntroBattle_Ch2: ; 7f6d3 (1f:76d3)
+Music_YellowIntro_Ch2: ; 7f6d3 (1f:76d3)
 	duty 2
 	vibrato 6, 1, 5
 	notetype 12, 12, 2
@@ -203,7 +203,7 @@ Music_IntroBattle_Ch2: ; 7f6d3 (1f:76d3)
 	endchannel
 
 
-Music_IntroBattle_Ch3: ; 7f749 (1f:7749)
+Music_YellowIntro_Ch3: ; 7f749 (1f:7749)
 	notetype 12, 1, 0
 	octave 4
 	note E_, 1