Better noise instrument names

17 files changed, 813 insertions, 813 deletions

diff --git a/macros.asm b/macros.asm
index d45fa47..90b61b1 100755
--- a/macros.asm
+++ b/macros.asm
@@ -34,12 +34,12 @@ A#		EQU $B
 B_		EQU $C
 
 ; instruments
-noise1 EQU $1
-noise3 EQU $3
-noise5 EQU $5
-noise7 EQU $7
-noise9 EQU $9
-noisec EQU $c
+bass   EQU $1
+snare1 EQU $3 ; medium length
+snare2 EQU $5 ; medium length
+snare3 EQU $7 ; short
+snare4 EQU $9 ; long
+snare5 EQU $C ; long
 
 note: MACRO
 	db (\1 << 4) | (\2 - 1)
diff --git a/music/battletheme1.asm b/music/battletheme1.asm
index f83deb1..382c36c 100644
--- a/music/battletheme1.asm
+++ b/music/battletheme1.asm
@@ -1837,36 +1837,36 @@ Music_BattleTheme1_Ch4: ; f5c9a (3d:5c9a)
 	musicdx 1
 	MainLoop
 	Loop 3
-	note noise1, 2
-	note noise7, 1
-	note noise9, 1
-	note noise7, 1
-	note noise1, 1
-	note noise5, 2
-	note noise7, 1
-	note noise1, 1
-	note noise9, 2
-	note noise3, 1
-	note noise9, 1
-	rest 1
-	note noise7, 1
+	note bass, 2
+	note snare3, 1
+	note snare4, 1
+	note snare3, 1
+	note bass, 1
+	note snare2, 2
+	note snare3, 1
+	note bass, 1
+	note snare4, 2
+	note snare1, 1
+	note snare4, 1
+	rest 1
+	note snare3, 1
 	EndLoop
-	note noise1, 2
-	note noise7, 1
-	note noise9, 1
-	note noise7, 1
-	note noise1, 1
-	note noise5, 2
-	note noise7, 1
-	note noise3, 1
-	note noise9, 1
+	note bass, 2
+	note snare3, 1
+	note snare4, 1
+	note snare3, 1
+	note bass, 1
+	note snare2, 2
+	note snare3, 1
+	note snare1, 1
+	note snare4, 1
 	Speed 1
-	note noise5, 4
-	note noise5, 3
+	note snare2, 4
+	note snare2, 3
 	Speed 7
-	note noise3, 1
-	note noise3, 1
-	note noise3, 2
+	note snare1, 1
+	note snare1, 1
+	note snare1, 2
 	Loop 3
 	music_call Branch_f5d39
 	EndLoop
@@ -1878,50 +1878,50 @@ Music_BattleTheme1_Ch4: ; f5c9a (3d:5c9a)
 	Loop 15
 	music_call Branch_f5d39
 	EndLoop
-	note noise1, 2
-	note noise7, 1
-	note noise9, 1
-	note noise3, 2
-	note noise9, 2
-	note noise7, 1
-	note noise3, 1
-	note noise9, 1
+	note bass, 2
+	note snare3, 1
+	note snare4, 1
+	note snare1, 2
+	note snare4, 2
+	note snare3, 1
+	note snare1, 1
+	note snare4, 1
 	Speed 1
-	note noise5, 4
-	note noise5, 3
+	note snare2, 4
+	note snare2, 3
 	Speed 7
 	Loop 4
-	note noise3, 1
+	note snare1, 1
 	EndLoop
 	Loop 5
-	note noise1, 1
-	note noise7, 1
-	note noise9, 1
-	note noise3, 1
-	note noise7, 1
-	note noise1, 1
-	note noise9, 2
-	note noise7, 1
-	note noise1, 1
-	note noise7, 2
-	note noise3, 2
-	note noise9, 2
+	note bass, 1
+	note snare3, 1
+	note snare4, 1
+	note snare1, 1
+	note snare3, 1
+	note bass, 1
+	note snare4, 2
+	note snare3, 1
+	note bass, 1
+	note snare3, 2
+	note snare1, 2
+	note snare4, 2
 	EndLoop
-	note noise1, 2
-	note noise7, 1
-	note noise3, 1
-	note noise7, 1
-	note noise1, 1
-	note noise9, 2
-	note noise7, 1
-	note noise1, 1
-	note noise9, 1
+	note bass, 2
+	note snare3, 1
+	note snare1, 1
+	note snare3, 1
+	note bass, 1
+	note snare4, 2
+	note snare3, 1
+	note bass, 1
+	note snare4, 1
 	Speed 1
-	note noise5, 4
-	note noise5, 3
+	note snare2, 4
+	note snare2, 3
 	Speed 7
 	Loop 4
-	note noise3, 1
+	note snare1, 1
 	EndLoop
 	Loop 3
 	music_call Branch_f5d39
@@ -1938,64 +1938,64 @@ Music_BattleTheme1_Ch4: ; f5c9a (3d:5c9a)
 	Loop 2
 	music_call Branch_f5d39
 	EndLoop
-	note noise1, 2
-	note noise7, 1
-	note noise9, 1
-	note noise3, 2
-	note noise9, 2
-	note noise1, 1
-	note noise7, 1
-	note noise9, 2
-	note noise3, 2
-	note noisec, 14
-	note noise3, 4
+	note bass, 2
+	note snare3, 1
+	note snare4, 1
+	note snare1, 2
+	note snare4, 2
+	note bass, 1
+	note snare3, 1
+	note snare4, 2
+	note snare1, 2
+	note snare5, 14
+	note snare1, 4
 	EndMainLoop
 
 Branch_f5d39:
-	note noise1, 2
-	note noise7, 1
-	note noise9, 1
-	note noise3, 2
-	note noise9, 2
-	note noise1, 1
-	note noise7, 1
-	note noise9, 2
-	note noise3, 1
-	note noise9, 1
-	rest 1
-	note noise7, 1
+	note bass, 2
+	note snare3, 1
+	note snare4, 1
+	note snare1, 2
+	note snare4, 2
+	note bass, 1
+	note snare3, 1
+	note snare4, 2
+	note snare1, 1
+	note snare4, 1
+	rest 1
+	note snare3, 1
 	music_ret
 
 Branch_f5d46:
-	note noise1, 2
-	note noise7, 1
-	note noise9, 1
-	note noise3, 2
-	note noise9, 2
-	note noise7, 1
-	note noise3, 1
-	note noise9, 1
+	note bass, 2
+	note snare3, 1
+	note snare4, 1
+	note snare1, 2
+	note snare4, 2
+	note snare3, 1
+	note snare1, 1
+	note snare4, 1
 	Speed 1
-	note noise5, 4
-	note noise5, 3
+	note snare2, 4
+	note snare2, 3
 	Speed 7
-	note noise3, 1
-	note noise3, 1
-	note noise3, 2
+	note snare1, 1
+	note snare1, 1
+	note snare1, 2
 	music_ret
 
 Branch_f5d58:
-	note noise1, 2
-	note noise7, 1
-	note noise9, 1
-	note noise3, 2
-	note noise9, 1
+	note bass, 2
+	note snare3, 1
+	note snare4, 1
+	note snare1, 2
+	note snare4, 1
 	Speed 1
-	note noise5, 4
-	note noise5, 3
+	note snare2, 4
+	note snare2, 3
 	Speed 7
 	Loop 8
-	note noise3, 1
+	note snare1, 1
 	EndLoop
 	music_ret
 ; 0xf5d68
\ No newline at end of file
diff --git a/music/battletheme2.asm b/music/battletheme2.asm
index 5bdccbd..e8cd59b 100644
--- a/music/battletheme2.asm
+++ b/music/battletheme2.asm
@@ -1108,19 +1108,19 @@ Music_BattleTheme2_Ch4: ; f62f3 (3d:62f3)
 	rest 12
 	rest 6
 	Loop 6
-	note noise3, 1
+	note snare1, 1
 	EndLoop
 	Loop 3
 	music_call Branch_f637c
 	EndLoop
-	note noise1, 1
-	note noise7, 1
-	note noise7, 1
-	note noise3, 1
-	note noise7, 1
-	note noise9, 1
+	note bass, 1
+	note snare3, 1
+	note snare3, 1
+	note snare1, 1
+	note snare3, 1
+	note snare4, 1
 	Loop 6
-	note noise3, 1
+	note snare1, 1
 	EndLoop
 	Loop 15
 	music_call Branch_f637c
@@ -1129,48 +1129,48 @@ Music_BattleTheme2_Ch4: ; f62f3 (3d:62f3)
 	Loop 3
 	music_call Branch_f637c
 	Loop 6
-	note noise3, 1
+	note snare1, 1
 	EndLoop
-	note noise3, 2
-	note noisec, 3
-	note noise3, 1
+	note snare1, 2
+	note snare5, 3
+	note snare1, 1
 	EndLoop
-	note noise1, 1
-	note noise7, 1
-	note noise7, 1
-	note noise3, 1
-	note noise7, 1
-	note noise7, 1
-	note noise1, 1
-	note noise7, 1
+	note bass, 1
+	note snare3, 1
+	note snare3, 1
+	note snare1, 1
+	note snare3, 1
+	note snare3, 1
+	note bass, 1
+	note snare3, 1
 	Speed 1
-	note noise7, 4
-	note noise5, 5
+	note snare3, 4
+	note snare2, 5
 	Speed 9
-	note noise3, 3
+	note snare1, 3
 	Loop 12
-	note noise3, 1
+	note snare1, 1
 	EndLoop
 	Loop 3
 	music_call Branch_f637c
 	music_call Branch_f6389
 	EndLoop
 	music_call Branch_f637c
-	note noise1, 1
-	note noise3, 1
-	note noise1, 1
-	note noise3, 1
-	note noise3, 1
-	note noise1, 1
-	note noise1, 1
-	note noise3, 1
+	note bass, 1
+	note snare1, 1
+	note bass, 1
+	note snare1, 1
+	note snare1, 1
+	note bass, 1
+	note bass, 1
+	note snare1, 1
 	Speed 1
-	note noise5, 4
-	note noise5, 5
+	note snare2, 4
+	note snare2, 5
 	Speed 9
-	note noise3, 1
-	note noise3, 1
-	note noise3, 1
+	note snare1, 1
+	note snare1, 1
+	note snare1, 1
 	Loop 4
 	music_call Branch_f637c
 	music_call Branch_f6389
@@ -1180,59 +1180,59 @@ Music_BattleTheme2_Ch4: ; f62f3 (3d:62f3)
 	Loop 3
 	music_call Branch_f637c
 	Loop 6
-	note noise3, 1
+	note snare1, 1
 	EndLoop
-	note noise3, 2
-	note noisec, 3
-	note noise3, 1
+	note snare1, 2
+	note snare5, 3
+	note snare1, 1
 	EndLoop
 	music_call Branch_f637c
 	Loop 12
-	note noise3, 1
+	note snare1, 1
 	EndLoop
-	note noisec, 12
+	note snare5, 12
 	rest 12
 	EndMainLoop
 
 Branch_f637c:
-	note noise1, 1
-	note noise7, 1
-	note noise7, 1
-	note noise3, 1
-	note noise7, 1
-	note noise7, 1
-	note noise1, 1
-	note noise7, 1
-	note noise7, 1
-	note noise3, 1
-	note noise7, 1
-	note noise9, 1
+	note bass, 1
+	note snare3, 1
+	note snare3, 1
+	note snare1, 1
+	note snare3, 1
+	note snare3, 1
+	note bass, 1
+	note snare3, 1
+	note snare3, 1
+	note snare1, 1
+	note snare3, 1
+	note snare4, 1
 	music_ret
 
 Branch_f6389:
-	note noise1, 1
-	note noise7, 1
-	note noise7, 1
-	note noise3, 1
-	note noise7, 1
-	note noise7, 1
-	note noise1, 1
-	note noise7, 1
-	note noise7, 1
-	note noise3, 1
-	note noise7, 1
-	note noise3, 1
+	note bass, 1
+	note snare3, 1
+	note snare3, 1
+	note snare1, 1
+	note snare3, 1
+	note snare3, 1
+	note bass, 1
+	note snare3, 1
+	note snare3, 1
+	note snare1, 1
+	note snare3, 1
+	note snare1, 1
 	music_ret
 
 Branch_f6396:
-	note noise1, 1
-	note noise7, 1
-	note noise7, 1
-	note noise3, 1
-	note noise7, 1
-	note noise7, 1
+	note bass, 1
+	note snare3, 1
+	note snare3, 1
+	note snare1, 1
+	note snare3, 1
+	note snare3, 1
 	Loop 6
-	note noise3, 1
+	note snare1, 1
 	EndLoop
 	music_ret
 ; 0xf63a1
\ No newline at end of file
diff --git a/music/battletheme3.asm b/music/battletheme3.asm
index d4f7c01..b24341d 100644
--- a/music/battletheme3.asm
+++ b/music/battletheme3.asm
@@ -1223,306 +1223,306 @@ Music_BattleTheme3_Ch4: ; f6a3f (3d:6a3f)
 	MainLoop
 	Loop 2
 	Loop 4
-	note noise9, 1
-	note noise7, 1
-	note noise7, 1
+	note snare4, 1
+	note snare3, 1
+	note snare3, 1
 	EndLoop
-	note noise9, 1
-	note noise7, 1
-	note noise9, 1
-	note noise7, 1
+	note snare4, 1
+	note snare3, 1
+	note snare4, 1
+	note snare3, 1
 	EndLoop
 	Loop 4
-	note noise3, 1
-	note noise1, 1
-	note noise1, 1
+	note snare1, 1
+	note bass, 1
+	note bass, 1
 	EndLoop
-	note noise3, 1
-	note noise1, 1
-	note noise3, 1
-	note noise1, 1
+	note snare1, 1
+	note bass, 1
+	note snare1, 1
+	note bass, 1
 	Loop 4
-	note noise3, 1
-	note noise1, 1
-	note noise1, 1
+	note snare1, 1
+	note bass, 1
+	note bass, 1
 	EndLoop
-	note noise3, 1
+	note snare1, 1
 	Speed 1
-	note noise7, 5
-	note noise5, 6
+	note snare3, 5
+	note snare2, 6
 	Speed 11
-	note noise3, 1
-	note noise3, 1
+	note snare1, 1
+	note snare1, 1
 	Loop 3
 	music_call Branch_f6b40
 	EndLoop
-	note noise1, 2
-	note noise7, 1
-	note noise1, 1
-	note noise3, 2
-	note noise7, 1
-	note noise1, 1
-	note noise7, 1
-	note noise1, 1
-	note noise9, 2
-	note noise3, 1
+	note bass, 2
+	note snare3, 1
+	note bass, 1
+	note snare1, 2
+	note snare3, 1
+	note bass, 1
+	note snare3, 1
+	note bass, 1
+	note snare4, 2
+	note snare1, 1
 	Speed 1
-	note noise7, 5
-	note noise5, 6
+	note snare3, 5
+	note snare2, 6
 	Speed 11
-	note noise3, 1
-	note noise3, 1
+	note snare1, 1
+	note snare1, 1
 	Loop 7
 	music_call Branch_f6b40
 	EndLoop
-	note noise1, 2
-	note noise7, 1
-	note noise1, 1
-	note noise3, 2
-	note noise7, 1
-	note noise1, 1
-	note noise7, 1
-	note noise1, 1
-	note noise9, 2
-	note noise3, 1
+	note bass, 2
+	note snare3, 1
+	note bass, 1
+	note snare1, 2
+	note snare3, 1
+	note bass, 1
+	note snare3, 1
+	note bass, 1
+	note snare4, 2
+	note snare1, 1
 	Speed 1
-	note noise7, 5
-	note noise5, 6
+	note snare3, 5
+	note snare2, 6
 	Speed 11
-	note noise3, 1
-	note noise3, 1
+	note snare1, 1
+	note snare1, 1
 	music_call Branch_f6b7e
 	Speed 1
-	note noise7, 5
-	note noise5, 6
+	note snare3, 5
+	note snare2, 6
 	Speed 11
-	note noise3, 1
-	note noise1, 1
+	note snare1, 1
+	note bass, 1
 	music_call Branch_f6b7e
 	Speed 1
-	note noise7, 5
-	note noise5, 6
+	note snare3, 5
+	note snare2, 6
 	Speed 11
-	note noise3, 2
+	note snare1, 2
 	Loop 7
 	music_call Branch_f6b40
 	EndLoop
-	note noise1, 2
-	note noise7, 1
-	note noise1, 1
-	note noise3, 2
-	note noise7, 1
-	note noise1, 1
-	note noise7, 1
-	note noise1, 1
-	note noise9, 2
-	note noise3, 1
+	note bass, 2
+	note snare3, 1
+	note bass, 1
+	note snare1, 2
+	note snare3, 1
+	note bass, 1
+	note snare3, 1
+	note bass, 1
+	note snare4, 2
+	note snare1, 1
 	Speed 1
-	note noise7, 5
-	note noise5, 6
-	note noise3, 5
-	note noise3, 6
-	note noise3, 5
-	note noise3, 6
+	note snare3, 5
+	note snare2, 6
+	note snare1, 5
+	note snare1, 6
+	note snare1, 5
+	note snare1, 6
 	Speed 11
 	music_call Branch_f6b4d
-	note noise7, 1
-	note noise3, 1
-	note noise1, 1
+	note snare3, 1
+	note snare1, 1
+	note bass, 1
 	music_call Branch_f6b4d
 	Speed 1
-	note noise7, 5
-	note noise5, 6
+	note snare3, 5
+	note snare2, 6
 	Speed 11
-	note noise3, 1
-	note noise1, 1
+	note snare1, 1
+	note bass, 1
 	music_call Branch_f6b4d
-	note noise7, 1
-	note noise3, 1
-	note noise1, 1
+	note snare3, 1
+	note snare1, 1
+	note bass, 1
 	music_call Branch_f6b4d
 	Speed 1
-	note noise7, 5
-	note noise5, 6
+	note snare3, 5
+	note snare2, 6
 	Speed 11
-	note noise3, 2
-	note noisec, 8
+	note snare1, 2
+	note snare5, 8
 	rest 4
 	Speed 1
-	note noise5, 3
-	note noise5, 2
-	note noise3, 6
-	note noise3, 5
-	note noise3, 6
-	note noise3, 5
-	note noise3, 6
+	note snare2, 3
+	note snare2, 2
+	note snare1, 6
+	note snare1, 5
+	note snare1, 6
+	note snare1, 5
+	note snare1, 6
 	Speed 11
-	note noise3, 1
+	note snare1, 1
 	Loop 7
 	music_call Branch_f6b65
 	Speed 1
-	note noise1, 6
+	note bass, 6
 	EndLoop
 	music_call Branch_f6b65
 	Speed 1
-	note noise3, 6
+	note snare1, 6
 	Loop 15
 	music_call Branch_f6b65
 	Speed 1
-	note noise1, 6
+	note bass, 6
 	EndLoop
 	Speed 11
-	note noise1, 1
+	note bass, 1
 	Speed 1
-	note noise7, 5
-	note noise1, 6
+	note snare3, 5
+	note bass, 6
 	Speed 11
-	note noise3, 1
+	note snare1, 1
 	Speed 1
-	note noise7, 5
-	note noise9, 6
-	note noise7, 5
-	note noise5, 6
-	note noise7, 5
-	note noise1, 6
-	note noise3, 5
-	note noise3, 6
-	note noise3, 5
-	note noise3, 6
+	note snare3, 5
+	note snare4, 6
+	note snare3, 5
+	note snare2, 6
+	note snare3, 5
+	note bass, 6
+	note snare1, 5
+	note snare1, 6
+	note snare1, 5
+	note snare1, 6
 	music_call Branch_f6b9a
-	note noise1, 1
+	note bass, 1
 	Speed 1
-	note noise7, 5
-	note noise5, 6
-	note noise3, 5
-	note noise3, 6
-	note noise3, 5
-	note noise3, 6
+	note snare3, 5
+	note snare2, 6
+	note snare1, 5
+	note snare1, 6
+	note snare1, 5
+	note snare1, 6
 	music_call Branch_f6b9a
 	Speed 1
-	note noise1, 5
-	note noise5, 6
-	note noise3, 5
-	note noise3, 6
-	note noise3, 5
-	note noise3, 6
-	note noise3, 5
-	note noise3, 6
+	note bass, 5
+	note snare2, 6
+	note snare1, 5
+	note snare1, 6
+	note snare1, 5
+	note snare1, 6
+	note snare1, 5
+	note snare1, 6
 	Speed 11
 	EndMainLoop
 
 Branch_f6b40:
-	note noise1, 2
-	note noise7, 1
-	note noise1, 1
-	note noise3, 2
-	note noise7, 1
-	note noise1, 1
-	note noise7, 1
-	note noise1, 1
-	note noise9, 2
-	note noise3, 2
-	note noise7, 1
-	note noise3, 1
+	note bass, 2
+	note snare3, 1
+	note bass, 1
+	note snare1, 2
+	note snare3, 1
+	note bass, 1
+	note snare3, 1
+	note bass, 1
+	note snare4, 2
+	note snare1, 2
+	note snare3, 1
+	note snare1, 1
 	music_ret
 
 Branch_f6b4d:
-	note noise1, 1
-	note noise3, 1
-	note noise7, 1
-	note noise1, 1
-	note noise3, 1
-	note noise9, 1
-	note noise1, 1
-	note noise3, 1
-	note noise7, 1
-	note noise1, 1
-	note noise3, 1
-	note noise9, 1
-	note noise1, 1
-	note noise3, 1
-	note noise7, 1
-	note noise1, 1
-	note noise3, 1
-	note noise9, 1
-	note noise1, 1
-	note noise3, 1
-	note noise7, 1
-	note noise1, 1
-	note noise3, 1
+	note bass, 1
+	note snare1, 1
+	note snare3, 1
+	note bass, 1
+	note snare1, 1
+	note snare4, 1
+	note bass, 1
+	note snare1, 1
+	note snare3, 1
+	note bass, 1
+	note snare1, 1
+	note snare4, 1
+	note bass, 1
+	note snare1, 1
+	note snare3, 1
+	note bass, 1
+	note snare1, 1
+	note snare4, 1
+	note bass, 1
+	note snare1, 1
+	note snare3, 1
+	note bass, 1
+	note snare1, 1
 	music_ret
 
 Branch_f6b65:
 	Speed 11
-	note noise1, 1
+	note bass, 1
 	Speed 1
-	note noise7, 5
-	note noise1, 6
+	note snare3, 5
+	note bass, 6
 	Speed 11
-	note noise3, 1
+	note snare1, 1
 	Speed 1
-	note noise7, 5
-	note noise9, 6
-	note noise7, 5
-	note noise5, 6
-	note noise7, 5
-	note noise1, 6
+	note snare3, 5
+	note snare4, 6
+	note snare3, 5
+	note snare2, 6
+	note snare3, 5
+	note bass, 6
 	Speed 11
-	note noise3, 1
+	note snare1, 1
 	Speed 1
-	note noise7, 5
+	note snare3, 5
 	music_ret
 
 Branch_f6b7e:
-	note noise1, 2
-	note noise7, 1
-	note noise3, 1
-	note noise7, 1
-	note noise9, 1
-	note noise3, 1
-	note noise1, 1
-	note noise3, 1
-	note noise9, 1
-	note noise1, 1
-	note noise3, 1
-	note noise3, 1
-	note noise1, 1
-	note noise3, 1
-	note noise1, 1
-	note noise1, 2
-	note noise7, 1
-	note noise3, 1
-	note noise7, 1
-	note noise9, 1
-	note noise3, 1
-	note noise1, 1
-	note noise3, 1
-	note noise9, 1
-	note noise1, 1
-	note noise3, 1
-	note noise3, 1
+	note bass, 2
+	note snare3, 1
+	note snare1, 1
+	note snare3, 1
+	note snare4, 1
+	note snare1, 1
+	note bass, 1
+	note snare1, 1
+	note snare4, 1
+	note bass, 1
+	note snare1, 1
+	note snare1, 1
+	note bass, 1
+	note snare1, 1
+	note bass, 1
+	note bass, 2
+	note snare3, 1
+	note snare1, 1
+	note snare3, 1
+	note snare4, 1
+	note snare1, 1
+	note bass, 1
+	note snare1, 1
+	note snare4, 1
+	note bass, 1
+	note snare1, 1
+	note snare1, 1
 	music_ret
 
 Branch_f6b9a:
 	Speed 11
 	Loop 3
 	Loop 5
-	note noise1, 1
+	note bass, 1
 	Speed 1
-	note noise7, 5
-	note noise5, 6
+	note snare3, 5
+	note snare2, 6
 	Speed 11
-	note noise3, 1
+	note snare1, 1
 	EndLoop
-	note noise1, 1
+	note bass, 1
 	EndLoop
 	Loop 4
-	note noise1, 1
+	note bass, 1
 	Speed 1
-	note noise7, 5
-	note noise5, 6
+	note snare3, 5
+	note snare2, 6
 	Speed 11
-	note noise3, 1
+	note snare1, 1
 	EndLoop
 	music_ret
 ; 0xf6bb7
\ No newline at end of file
diff --git a/music/cardpop.asm b/music/cardpop.asm
index 4954080..52ae065 100644
--- a/music/cardpop.asm
+++ b/music/cardpop.asm
@@ -270,30 +270,30 @@ Music_CardPop_Ch4: ; f717d (3d:717d)
 	musicdx 1
 	Loop 11
 	music_call Branch_f7196
-	note noise9, 4
-	note noise3, 2
-	note noise7, 2
-	note noise9, 2
-	note noise3, 2
+	note snare4, 4
+	note snare1, 2
+	note snare3, 2
+	note snare4, 2
+	note snare1, 2
 	EndLoop
 	music_call Branch_f7196
-	note noise9, 2
-	note noise5, 1
-	note noise5, 1
+	note snare4, 2
+	note snare2, 1
+	note snare2, 1
 	Loop 4
-	note noise3, 2
+	note snare1, 2
 	EndLoop
 	EndMainLoop
 
 Branch_f7196:
-	note noise1, 2
-	note noise7, 2
-	note noise9, 4
-	note noise3, 2
-	note noise7, 2
-	note noise9, 2
-	note noise3, 2
-	note noise1, 2
-	note noise3, 2
+	note bass, 2
+	note snare3, 2
+	note snare4, 4
+	note snare1, 2
+	note snare3, 2
+	note snare4, 2
+	note snare1, 2
+	note bass, 2
+	note snare1, 2
 	music_ret
 ; 0xf71a0
\ No newline at end of file
diff --git a/music/challengehall.asm b/music/challengehall.asm
index cb141c6..a2377a2 100644
--- a/music/challengehall.asm
+++ b/music/challengehall.asm
@@ -1038,50 +1038,50 @@ Music_ChallengeHall_Ch4: ; f9ba9 (3e:5ba9)
 	EndLoop
 	MainLoop
 	Speed 1
-	note noise3, 4
-	note noise5, 3
-	note noise5, 4
-	note noise5, 4
+	note snare1, 4
+	note snare2, 3
+	note snare2, 4
+	note snare2, 4
 	Loop 7
-	note noise5, 4
-	note noise5, 3
-	note noise5, 4
-	note noise5, 4
+	note snare2, 4
+	note snare2, 3
+	note snare2, 4
+	note snare2, 4
 	EndLoop
-	note noise3, 15
-	note noise3, 7
-	note noise3, 8
-	note noise3, 15
-	note noise3, 15
-	note noise3, 15
-	note noise3, 4
-	note noise5, 3
-	note noise5, 4
-	note noise5, 4
-	note noise3, 15
-	note noise3, 15
+	note snare1, 15
+	note snare1, 7
+	note snare1, 8
+	note snare1, 15
+	note snare1, 15
+	note snare1, 15
+	note snare1, 4
+	note snare2, 3
+	note snare2, 4
+	note snare2, 4
+	note snare1, 15
+	note snare1, 15
 	Loop 15
-	note noise1, 15
-	note noise3, 15
-	note noise1, 15
-	note noise3, 15
-	note noise1, 15
-	note noise3, 4
-	note noise5, 3
-	note noise5, 4
-	note noise5, 4
-	note noise1, 15
-	note noise3, 15
+	note bass, 15
+	note snare1, 15
+	note bass, 15
+	note snare1, 15
+	note bass, 15
+	note snare1, 4
+	note snare2, 3
+	note snare2, 4
+	note snare2, 4
+	note bass, 15
+	note snare1, 15
 	EndLoop
-	note noise1, 15
-	note noise3, 4
-	note noise5, 3
-	note noise5, 4
-	note noise5, 4
-	note noise3, 15
-	note noise3, 15
+	note bass, 15
+	note snare1, 4
+	note snare2, 3
+	note snare2, 4
+	note snare2, 4
+	note snare1, 15
+	note snare1, 15
 	Speed 10
-	note noise3, 3
+	note snare1, 3
 	rest 3
 	EndMainLoop
 ; 0xf9be5
\ No newline at end of file
diff --git a/music/club1.asm b/music/club1.asm
index b24ce8e..7965c27 100644
--- a/music/club1.asm
+++ b/music/club1.asm
@@ -873,48 +873,48 @@ Branch_fa01a:
 Music_Club1_Ch4: ; fa044 (3e:6044)
 	Speed 5
 	musicdx 1
-	note noise1, 2
-	rest 2
-	note noise1, 2
-	note noise3, 2
-	note noise7, 2
-	note noise9, 2
-	note noise1, 2
-	rest 2
-	note noise1, 2
-	note noise3, 2
-	note noise7, 2
-	note noise9, 2
-	note noise3, 4
-	note noise5, 1
-	note noise5, 1
-	note noise3, 4
-	note noise3, 2
+	note bass, 2
+	rest 2
+	note bass, 2
+	note snare1, 2
+	note snare3, 2
+	note snare4, 2
+	note bass, 2
+	rest 2
+	note bass, 2
+	note snare1, 2
+	note snare3, 2
+	note snare4, 2
+	note snare1, 4
+	note snare2, 1
+	note snare2, 1
+	note snare1, 4
+	note snare1, 2
 	rest 4
-	note noise5, 1
-	note noise5, 1
-	note noise3, 4
-	note noise3, 2
+	note snare2, 1
+	note snare2, 1
+	note snare1, 4
+	note snare1, 2
 	MainLoop
 	music_call Branch_fa06f
-	note noise1, 4
+	note bass, 4
 	Loop 4
-	note noise3, 2
+	note snare1, 2
 	EndLoop
 	music_call Branch_fa06f
-	note noise1, 4
-	note noise5, 1
-	note noise5, 1
-	note noise3, 4
-	note noise3, 2
+	note bass, 4
+	note snare2, 1
+	note snare2, 1
+	note snare1, 4
+	note snare1, 2
 	EndMainLoop
 
 Branch_fa06f:
 	Loop 15
-	note noise1, 4
-	note noise7, 2
-	note noise3, 4
-	note noise7, 2
+	note bass, 4
+	note snare3, 2
+	note snare1, 4
+	note snare3, 2
 	EndLoop
 	music_ret
 ; 0xfa077
\ No newline at end of file
diff --git a/music/club3.asm b/music/club3.asm
index 36d7239..69b0296 100644
--- a/music/club3.asm
+++ b/music/club3.asm
@@ -1068,35 +1068,35 @@ Music_Club3_Ch4: ; fa772 (3e:6772)
 	MainLoop
 	Loop 3
 	music_call Branch_fa796
-	note noise3, 2
-	note noise9, 2
+	note snare1, 2
+	note snare4, 2
 	music_call Branch_fa796
-	note noise3, 2
-	note noise7, 1
-	note noise3, 1
+	note snare1, 2
+	note snare3, 1
+	note snare1, 1
 	EndLoop
 	music_call Branch_fa796
-	note noise3, 2
-	note noise9, 2
+	note snare1, 2
+	note snare4, 2
 	music_call Branch_fa796
-	note noise3, 1
+	note snare1, 1
 	Speed 1
-	note noise7, 5
-	note noise3, 4
+	note snare3, 5
+	note snare1, 4
 	Speed 9
-	note noise3, 1
-	note noise3, 1
+	note snare1, 1
+	note snare1, 1
 	EndMainLoop
 
 Branch_fa796:
-	note noise1, 2
-	note noise7, 2
-	note noise3, 2
-	note noise7, 1
-	note noise3, 1
-	note noise7, 1
-	note noise1, 1
-	note noise9, 1
-	note noise1, 1
+	note bass, 2
+	note snare3, 2
+	note snare1, 2
+	note snare3, 1
+	note snare1, 1
+	note snare3, 1
+	note bass, 1
+	note snare4, 1
+	note bass, 1
 	music_ret
 ; 0xfa7a0
\ No newline at end of file
diff --git a/music/credits.asm b/music/credits.asm
index 6d1aa68..1102808 100644
--- a/music/credits.asm
+++ b/music/credits.asm
@@ -2305,28 +2305,28 @@ Music_Credits_Ch4: ; fbe51 (3e:7e51)
 	Speed 1
 	musicdx 1
 	Loop 8
-	note noise5, 13
+	note snare2, 13
 	EndLoop
 	Loop 4
-	note noise3, 13
+	note snare1, 13
 	EndLoop
 	Loop 4
-	note noise3, 6
-	note noise3, 7
+	note snare1, 6
+	note snare1, 7
 	EndLoop
 	music_call Branch_fbe86
 	Loop 7
 	music_call Branch_fbed1
 	EndLoop
-	note noise1, 13
-	note noise7, 13
-	note noise3, 13
-	note noise7, 6
-	note noise5, 4
-	note noise5, 3
+	note bass, 13
+	note snare3, 13
+	note snare1, 13
+	note snare3, 6
+	note snare2, 4
+	note snare2, 3
 	Loop 4
-	note noise3, 6
-	note noise3, 7
+	note snare1, 6
+	note snare1, 7
 	EndLoop
 	music_call Branch_fbe86
 	Loop 2
@@ -2334,7 +2334,7 @@ Music_Credits_Ch4: ; fbe51 (3e:7e51)
 	EndLoop
 	music_call Branch_fbeea
 	Speed 13
-	note noisec, 8
+	note snare5, 8
 	rest 3
 	music_end
 
@@ -2342,17 +2342,17 @@ Branch_fbe86:
 	Loop 6
 	music_call Branch_fbed1
 	EndLoop
-	note noise1, 13
-	note noise7, 13
-	note noise3, 13
-	note noise7, 6
-	note noise7, 7
-	note noise1, 13
-	note noise7, 13
-	note noise3, 13
-	Speed 13
-	note noisec, 7
-	note noise3, 2
+	note bass, 13
+	note snare3, 13
+	note snare1, 13
+	note snare3, 6
+	note snare3, 7
+	note bass, 13
+	note snare3, 13
+	note snare1, 13
+	Speed 13
+	note snare5, 7
+	note snare1, 2
 	Speed 1
 	Loop 15
 	music_call Branch_fbed1
@@ -2369,18 +2369,18 @@ Branch_fbe86:
 	Loop 7
 	music_call Branch_fbed1
 	EndLoop
-	note noise1, 13
-	note noise7, 13
-	note noise3, 13
-	note noise7, 6
-	note noise7, 7
-	note noise1, 13
-	note noise7, 6
-	note noise5, 4
-	note noise5, 3
-	note noise3, 6
-	note noise3, 7
-	note noise3, 13
+	note bass, 13
+	note snare3, 13
+	note snare1, 13
+	note snare3, 6
+	note snare3, 7
+	note bass, 13
+	note snare3, 6
+	note snare2, 4
+	note snare2, 3
+	note snare1, 6
+	note snare1, 7
+	note snare1, 13
 	Loop 5
 	music_call Branch_fbed1
 	EndLoop
@@ -2388,44 +2388,44 @@ Branch_fbe86:
 	music_ret
 
 Branch_fbed1:
-	note noise1, 13
-	note noise7, 13
-	note noise3, 13
-	note noise7, 6
-	note noise7, 7
-	note noise1, 13
-	note noise7, 13
-	note noise3, 13
-	note noise9, 13
+	note bass, 13
+	note snare3, 13
+	note snare1, 13
+	note snare3, 6
+	note snare3, 7
+	note bass, 13
+	note snare3, 13
+	note snare1, 13
+	note snare4, 13
 	music_ret
 
 Branch_fbedb:
-	note noise1, 13
-	note noise7, 6
-	note noise5, 7
-	note noise3, 6
-	note noise3, 7
+	note bass, 13
+	note snare3, 6
+	note snare2, 7
+	note snare1, 6
+	note snare1, 7
 	Loop 2
-	note noise3, 6
-	note noise5, 4
-	note noise5, 3
-	note noise3, 6
-	note noise3, 7
+	note snare1, 6
+	note snare2, 4
+	note snare2, 3
+	note snare1, 6
+	note snare1, 7
 	EndLoop
-	note noise3, 13
+	note snare1, 13
 	music_ret
 
 Branch_fbeea:
-	note noise1, 13
-	note noise7, 13
-	note noise3, 13
-	note noise7, 6
-	note noise5, 4
-	note noise5, 3
+	note bass, 13
+	note snare3, 13
+	note snare1, 13
+	note snare3, 6
+	note snare2, 4
+	note snare2, 3
 	Loop 3
-	note noise3, 6
-	note noise3, 7
+	note snare1, 6
+	note snare1, 7
 	EndLoop
-	note noise3, 13
+	note snare1, 13
 	music_ret
 ; 0xfbef7
\ No newline at end of file
diff --git a/music/deckmachine.asm b/music/deckmachine.asm
index 3570889..cc9d462 100644
--- a/music/deckmachine.asm
+++ b/music/deckmachine.asm
@@ -230,29 +230,29 @@ Music_DeckMachine_Ch4: ; f7018 (3d:7018)
 	MainLoop
 	Loop 9
 	music_call Branch_f7031
-	note noise9, 15
-	note noise3, 7
-	note noise7, 8
-	note noise9, 15
+	note snare4, 15
+	note snare1, 7
+	note snare3, 8
+	note snare4, 15
 	EndLoop
 	music_call Branch_f7031
-	note noise9, 7
-	note noise5, 4
-	note noise5, 4
-	note noise3, 7
-	note noise3, 8
-	note noise3, 7
-	note noise3, 8
+	note snare4, 7
+	note snare2, 4
+	note snare2, 4
+	note snare1, 7
+	note snare1, 8
+	note snare1, 7
+	note snare1, 8
 	EndMainLoop
 
 Branch_f7031:
-	note noise1, 7
-	note noise7, 8
-	note noise9, 15
-	note noise3, 7
-	note noise7, 8
-	note noise9, 15
-	note noise1, 7
-	note noise7, 8
+	note bass, 7
+	note snare3, 8
+	note snare4, 15
+	note snare1, 7
+	note snare3, 8
+	note snare4, 15
+	note bass, 7
+	note snare3, 8
 	music_ret
 ; 0xf703a
\ No newline at end of file
diff --git a/music/imakuni.asm b/music/imakuni.asm
index 6511db1..94600ad 100644
--- a/music/imakuni.asm
+++ b/music/imakuni.asm
@@ -476,64 +476,64 @@ Music_Imakuni_Ch4: ; fafa4 (3e:6fa4)
 	Speed 1
 	musicdx 1
 	Loop 10
-	note noise1, 15
-	note noise7, 7
-	note noise1, 8
-	note noise3, 15
-	note noise1, 15
-	note noise7, 7
-	note noise7, 8
-	note noise9, 15
-	note noise7, 7
-	note noise7, 8
-	note noise9, 15
-	note noise7, 15
-	note noise1, 15
-	note noise3, 15
-	note noise9, 15
-	note noise1, 7
-	note noise7, 8
-	note noise3, 15
-	note noise3, 15
-	note noise7, 7
-	note noise3, 8
+	note bass, 15
+	note snare3, 7
+	note bass, 8
+	note snare1, 15
+	note bass, 15
+	note snare3, 7
+	note snare3, 8
+	note snare4, 15
+	note snare3, 7
+	note snare3, 8
+	note snare4, 15
+	note snare3, 15
+	note bass, 15
+	note snare1, 15
+	note snare4, 15
+	note bass, 7
+	note snare3, 8
+	note snare1, 15
+	note snare1, 15
+	note snare3, 7
+	note snare1, 8
 	EndLoop
 	Loop 2
 	Speed 11
-	note noisec, 2
+	note snare5, 2
 	Speed 1
-	note noise3, 8
-	note noise3, 15
-	note noise3, 15
-	note noise3, 7
-	note noise3, 8
-	note noise3, 7
-	note noise3, 8
+	note snare1, 8
+	note snare1, 15
+	note snare1, 15
+	note snare1, 7
+	note snare1, 8
+	note snare1, 7
+	note snare1, 8
 	Speed 3
-	note noisec, 10
+	note snare5, 10
 	EndLoop
 	Speed 1
-	note noise3, 15
-	note noise7, 7
-	note noise3, 8
-	note noise9, 15
-	note noise3, 15
-	note noise7, 7
-	note noise3, 8
-	note noise9, 15
-	note noise3, 15
-	note noise7, 7
-	note noise3, 8
-	note noise9, 15
-	note noise3, 15
-	note noise7, 7
-	note noise3, 8
-	note noise9, 15
-	note noise3, 15
-	note noise7, 4
-	note noise7, 4
-	note noise3, 7
-	note noise3, 15
-	note noise3, 15
+	note snare1, 15
+	note snare3, 7
+	note snare1, 8
+	note snare4, 15
+	note snare1, 15
+	note snare3, 7
+	note snare1, 8
+	note snare4, 15
+	note snare1, 15
+	note snare3, 7
+	note snare1, 8
+	note snare4, 15
+	note snare1, 15
+	note snare3, 7
+	note snare1, 8
+	note snare4, 15
+	note snare1, 15
+	note snare3, 4
+	note snare3, 4
+	note snare1, 7
+	note snare1, 15
+	note snare1, 15
 	EndMainLoop
 ; 0xfafea
\ No newline at end of file
diff --git a/music/overworld.asm b/music/overworld.asm
index 1154621..0c80dfe 100644
--- a/music/overworld.asm
+++ b/music/overworld.asm
@@ -1393,19 +1393,19 @@ Music_Overworld_Ch4: ; f78af (3d:78af)
 	music_call Branch_f78fb
 	MainLoop
 	music_call Branch_f78ee
-	note noise1, 3
-	note noise7, 2
-	note noise1, 1
-	note noise3, 3
-	note noise7, 2
-	note noise9, 1
-	note noise1, 2
-	note noise7, 1
-	note noise7, 3
-	note noise3, 1
-	note noise7, 1
-	note noise7, 1
-	note noise3, 3
+	note bass, 3
+	note snare3, 2
+	note bass, 1
+	note snare1, 3
+	note snare3, 2
+	note snare4, 1
+	note bass, 2
+	note snare3, 1
+	note snare3, 3
+	note snare1, 1
+	note snare3, 1
+	note snare3, 1
+	note snare1, 3
 	Loop 3
 	music_call Branch_f78ee
 	music_call Branch_f78fb
@@ -1423,51 +1423,51 @@ Music_Overworld_Ch4: ; f78af (3d:78af)
 	EndMainLoop
 
 Branch_f78ee:
-	note noise1, 3
-	note noise7, 2
-	note noise1, 1
-	note noise3, 3
-	note noise7, 2
-	note noise9, 1
-	note noise1, 2
-	note noise7, 1
-	note noise7, 3
-	note noise3, 3
-	note noise7, 2
-	note noise9, 1
+	note bass, 3
+	note snare3, 2
+	note bass, 1
+	note snare1, 3
+	note snare3, 2
+	note snare4, 1
+	note bass, 2
+	note snare3, 1
+	note snare3, 3
+	note snare1, 3
+	note snare3, 2
+	note snare4, 1
 	music_ret
 
 Branch_f78fb:
-	note noise1, 3
-	note noise7, 2
-	note noise1, 1
-	note noise3, 3
-	note noise7, 2
-	note noise9, 1
-	note noise1, 2
-	note noise7, 1
-	note noise7, 3
-	note noise3, 1
-	note noise7, 1
-	note noise7, 1
-	note noise7, 2
-	note noise9, 1
+	note bass, 3
+	note snare3, 2
+	note bass, 1
+	note snare1, 3
+	note snare3, 2
+	note snare4, 1
+	note bass, 2
+	note snare3, 1
+	note snare3, 3
+	note snare1, 1
+	note snare3, 1
+	note snare3, 1
+	note snare3, 2
+	note snare4, 1
 	music_ret
 
 Branch_f790a:
-	note noise1, 3
-	note noise7, 2
-	note noise1, 1
-	note noise3, 3
-	note noise7, 2
-	note noise9, 1
-	note noise1, 2
-	note noise7, 1
-	note noise7, 3
-	note noise3, 1
-	note noise7, 1
-	note noise7, 1
-	note noise3, 2
-	note noise3, 1
+	note bass, 3
+	note snare3, 2
+	note bass, 1
+	note snare1, 3
+	note snare3, 2
+	note snare4, 1
+	note bass, 2
+	note snare3, 1
+	note snare3, 3
+	note snare1, 1
+	note snare3, 1
+	note snare3, 1
+	note snare1, 2
+	note snare1, 1
 	music_ret
 ; 0xf7919
\ No newline at end of file
diff --git a/music/pausemenu.asm b/music/pausemenu.asm
index 7c76830..8a4d1a8 100644
--- a/music/pausemenu.asm
+++ b/music/pausemenu.asm
@@ -550,33 +550,33 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8)
 	MainLoop
 	Loop 2
 	Loop 7
-	note noise1, 1
-	note noise7, 1
-	note noise9, 2
-	note noise3, 1
-	note noise7, 1
-	note noise9, 1
-	note noise5, 1
-	note noise1, 1
-	note noise7, 1
-	note noise9, 2
-	note noise3, 1
-	note noise7, 1
-	note noise9, 1
-	note noise3, 1
+	note bass, 1
+	note snare3, 1
+	note snare4, 2
+	note snare1, 1
+	note snare3, 1
+	note snare4, 1
+	note snare2, 1
+	note bass, 1
+	note snare3, 1
+	note snare4, 2
+	note snare1, 1
+	note snare3, 1
+	note snare4, 1
+	note snare1, 1
 	EndLoop
-	note noise1, 1
-	note noise7, 1
-	note noise9, 2
-	note noise3, 1
-	note noise7, 1
-	note noise9, 1
+	note bass, 1
+	note snare3, 1
+	note snare4, 2
+	note snare1, 1
+	note snare3, 1
+	note snare4, 1
 	Speed 1
-	note noise5, 4
-	note noise5, 3
+	note snare2, 4
+	note snare2, 3
 	Speed 7
 	Loop 8
-	note noise3, 1
+	note snare1, 1
 	EndLoop
 	EndLoop
 	EndMainLoop
diff --git a/music/pcmainmenu.asm b/music/pcmainmenu.asm
index c210c4c..4c7956b 100644
--- a/music/pcmainmenu.asm
+++ b/music/pcmainmenu.asm
@@ -347,31 +347,31 @@ Music_PCMainMenu_Ch4: ; f922b (3e:522b)
 	MainLoop
 	Loop 7
 	music_call Branch_f9248
-	note noise7, 1
-	note noise1, 1
-	note noise3, 2
-	note noise7, 1
-	note noise9, 1
+	note snare3, 1
+	note bass, 1
+	note snare1, 2
+	note snare3, 1
+	note snare4, 1
 	EndLoop
 	music_call Branch_f9248
-	note noise9, 1
+	note snare4, 1
 	Speed 1
-	note noise5, 4
-	note noise5, 3
+	note snare2, 4
+	note snare2, 3
 	Speed 7
-	note noise3, 2
-	note noise3, 1
-	note noise3, 1
+	note snare1, 2
+	note snare1, 1
+	note snare1, 1
 	EndMainLoop
 
 Branch_f9248:
-	note noise1, 2
-	note noise7, 1
-	note noise7, 1
-	note noise3, 2
-	note noise7, 1
-	note noise9, 1
-	note noise1, 1
-	note noise5, 1
+	note bass, 2
+	note snare3, 1
+	note snare3, 1
+	note snare1, 2
+	note snare3, 1
+	note snare4, 1
+	note bass, 1
+	note snare2, 1
 	music_ret
 ; 0xf9251
\ No newline at end of file
diff --git a/music/pokemondome.asm b/music/pokemondome.asm
index f3547dd..2fcc3d7 100644
--- a/music/pokemondome.asm
+++ b/music/pokemondome.asm
@@ -775,25 +775,25 @@ Branch_f9613:
 Music_PokemonDome_Ch4: ; f9629 (3e:5629)
 	Speed 7
 	musicdx 1
-	note noisec, 8
+	note snare5, 8
 	Speed 1
-	note noise3, 4
-	note noise5, 3
+	note snare1, 4
+	note snare2, 3
 	Loop 7
-	note noise5, 4
-	note noise5, 3
+	note snare2, 4
+	note snare2, 3
 	EndLoop
 	MainLoop
 	Loop 2
 	Speed 7
-	note noise3, 2
-	note noise3, 2
+	note snare1, 2
+	note snare1, 2
 	rest 2
 	Speed 1
-	note noise3, 4
-	note noise5, 3
-	note noise5, 4
-	note noise5, 3
+	note snare1, 4
+	note snare2, 3
+	note snare2, 4
+	note snare2, 3
 	EndLoop
 	EndMainLoop
 ; 0xf9646
\ No newline at end of file
diff --git a/music/ronald.asm b/music/ronald.asm
index 398d720..773b01c 100644
--- a/music/ronald.asm
+++ b/music/ronald.asm
@@ -1130,88 +1130,88 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0)
 	MainLoop
 	Loop 3
 	music_call Branch_fad46
-	note noise7, 13
+	note snare3, 13
 	music_call Branch_fad4f
-	note noise5, 7
-	note noise1, 6
-	note noise5, 7
-	note noise9, 6
-	note noise1, 7
-	note noise3, 13
-	note noise7, 6
-	note noise5, 7
+	note snare2, 7
+	note bass, 6
+	note snare2, 7
+	note snare4, 6
+	note bass, 7
+	note snare1, 13
+	note snare3, 6
+	note snare2, 7
 	EndLoop
 	music_call Branch_fad46
-	note noise7, 13
+	note snare3, 13
 	music_call Branch_fad4f
-	note noise5, 7
-	note noise1, 13
-	note noise9, 6
-	note noise5, 3
-	note noise5, 4
+	note snare2, 7
+	note bass, 13
+	note snare4, 6
+	note snare2, 3
+	note snare2, 4
 	Loop 2
-	note noise3, 6
-	note noise3, 7
+	note snare1, 6
+	note snare1, 7
 	EndLoop
 	Loop 2
 	Loop 7
 	music_call Branch_fad46
-	note noise7, 13
+	note snare3, 13
 	music_call Branch_fad4f
-	note noise5, 7
-	note noise1, 6
-	note noise5, 7
-	note noise9, 6
-	note noise1, 7
-	note noise3, 13
-	note noise7, 6
-	note noise5, 7
+	note snare2, 7
+	note bass, 6
+	note snare2, 7
+	note snare4, 6
+	note bass, 7
+	note snare1, 13
+	note snare3, 6
+	note snare2, 7
 	EndLoop
 	music_call Branch_fad46
-	note noise7, 13
+	note snare3, 13
 	music_call Branch_fad4f
-	note noise5, 3
-	note noise5, 4
+	note snare2, 3
+	note snare2, 4
 	Loop 4
-	note noise3, 6
-	note noise3, 7
+	note snare1, 6
+	note snare1, 7
 	EndLoop
 	EndLoop
 	Loop 6
 	music_call Branch_fad46
-	note noise7, 13
+	note snare3, 13
 	EndLoop
 	music_call Branch_fad46
 	Speed 13
-	note noisec, 4
+	note snare5, 4
 	Speed 1
 	rest 6
-	note noise5, 3
-	note noise5, 4
-	note noise3, 6
-	note noise3, 7
+	note snare2, 3
+	note snare2, 4
+	note snare1, 6
+	note snare1, 7
 	Loop 2
-	note noise5, 6
-	note noise3, 7
+	note snare2, 6
+	note snare1, 7
 	EndLoop
-	note noise3, 6
-	note noise5, 7
+	note snare1, 6
+	note snare2, 7
 	EndMainLoop
 
 Branch_fad46:
 	music_call Branch_fad4f
-	note noise5, 7
-	note noise1, 13
-	note noise9, 6
-	note noise1, 7
-	note noise3, 13
+	note snare2, 7
+	note bass, 13
+	note snare4, 6
+	note bass, 7
+	note snare1, 13
 	music_ret
 
 Branch_fad4f:
-	note noise1, 13
-	note noise9, 6
-	note noise1, 7
-	note noise3, 13
-	note noise1, 6
+	note bass, 13
+	note snare4, 6
+	note bass, 7
+	note snare1, 13
+	note bass, 6
 	music_ret
 ; 0xfad55
\ No newline at end of file
diff --git a/music/titlescreen.asm b/music/titlescreen.asm
index 3ec188f..7f4b4f3 100644
--- a/music/titlescreen.asm
+++ b/music/titlescreen.asm
@@ -519,30 +519,30 @@ Music_TitleScreen_Ch4: ; f52fa (3d:52fa)
 	Loop 10
 	music_call Branch_f5312
 	EndLoop
-	note noise3, 8
+	note snare1, 8
 	music_end
 
 Branch_f5312:
 	Speed 7
-	note noise3, 2
-	note noise5, 2
-	note noise3, 2
+	note snare1, 2
+	note snare2, 2
+	note snare1, 2
 	Speed 1
-	note noise5, 4
-	note noise5, 3
-	note noise5, 4
-	note noise5, 3
+	note snare2, 4
+	note snare2, 3
+	note snare2, 4
+	note snare2, 3
 	music_ret
 
 Branch_f531e:
 	Speed 7
-	note noise3, 2
-	note noise3, 2
+	note snare1, 2
+	note snare1, 2
 	rest 2
 	Speed 1
-	note noise3, 4
-	note noise5, 3
-	note noise5, 4
-	note noise5, 3
+	note snare1, 4
+	note snare2, 3
+	note snare2, 4
+	note snare2, 3
 	music_ret
 ; 0xf532a
\ No newline at end of file