Rename dnote to drum_note and dspeed to drum_speed

audio/music/aftertherivalfight.asm

@@ -55,12 +55,12 @@ Music_AfterTheRivalFight_Ch3:
 Music_AfterTheRivalFight_Ch4:
 	toggle_noise 3
 	stereo_panning 0, 1
-	dspeed 12
-	dnote 3, 4
-	dnote 3, 4
-	dnote 4, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
+	drum_speed 12
+	drum_note 3, 4
+	drum_note 3, 4
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
 	sound_loop 0, Music_AfterTheRivalFight_branch_f5118
 

audio/music/azaleatown.asm

@@ -627,29 +627,29 @@ Music_AzaleaTown_branch_f5acf:
 
 Music_AzaleaTown_Ch4:
 	toggle_noise 3
-	dspeed 12
-	dnote 6, 2
+	drum_speed 12
+	drum_note 6, 2
 Music_AzaleaTown_branch_f5aea:
-	dnote 4, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 4, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 4, 2
-	dnote 3, 2
-	dnote 8, 1
-	dnote 8, 1
-	dnote 4, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 4, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 4, 2
-	dnote 3, 2
-	dnote 7, 2
+	drum_note 4, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 4, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 4, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 4, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 7, 2
 	sound_loop 0, Music_AzaleaTown_branch_f5aea
 

audio/music/battletowerlobby.asm

@@ -300,11 +300,11 @@ Music_BattleTowerLobby_branch_1795b1:
 Music_BattleTowerLobby_Ch4:
 	toggle_noise 0
 Music_BattleTowerLobby_branch_179612:
-	dspeed 12
+	drum_speed 12
 	rest 2
-	dnote 6, 4
-	dnote 6, 4
-	dnote 6, 2
-	dnote 6, 4
+	drum_note 6, 4
+	drum_note 6, 4
+	drum_note 6, 2
+	drum_note 6, 4
 	sound_loop 0, Music_BattleTowerLobby_branch_179612
 

audio/music/battletowertheme.asm

@@ -585,18 +585,18 @@ Music_BattleTowerTheme_branch_178afe:
 
 Music_BattleTowerTheme_Ch4:
 	toggle_noise 3
-	dspeed 12
+	drum_speed 12
 Music_BattleTowerTheme_branch_178b11:
 	sound_call Music_BattleTowerTheme_branch_178b58
-	dnote 3, 2
-	dnote 3, 4
-	dnote 3, 1
-	dnote 3, 1
-	dnote 3, 4
-	dnote 3, 1
-	dnote 2, 1
-	dnote 3, 1
-	dnote 2, 1
+	drum_note 3, 2
+	drum_note 3, 4
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 4
+	drum_note 3, 1
+	drum_note 2, 1
+	drum_note 3, 1
+	drum_note 2, 1
 Music_BattleTowerTheme_branch_178b1d:
 	sound_call Music_BattleTowerTheme_branch_178b58
 	sound_call Music_BattleTowerTheme_branch_178b61
@@ -604,84 +604,84 @@ Music_BattleTowerTheme_branch_178b1d:
 	sound_call Music_BattleTowerTheme_branch_178b6c
 	sound_call Music_BattleTowerTheme_branch_178b61
 	sound_call Music_BattleTowerTheme_branch_178b6c
-	dnote 3, 2
-	dnote 3, 4
-	dnote 3, 1
-	dnote 3, 1
-	dnote 3, 8
+	drum_note 3, 2
+	drum_note 3, 4
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 8
 Music_BattleTowerTheme_branch_178b35:
 	sound_call Music_BattleTowerTheme_branch_178b76
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 1
-	dnote 3, 1
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 1
-	dnote 2, 1
-	dnote 3, 1
-	dnote 2, 1
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 2, 1
+	drum_note 3, 1
+	drum_note 2, 1
 	sound_loop 3, Music_BattleTowerTheme_branch_178b35
 	sound_call Music_BattleTowerTheme_branch_178b76
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 1
-	dnote 3, 1
-	dnote 3, 4
-	dnote 3, 1
-	dnote 2, 1
-	dnote 3, 1
-	dnote 2, 1
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 4
+	drum_note 3, 1
+	drum_note 2, 1
+	drum_note 3, 1
+	drum_note 2, 1
 	sound_loop 0, Music_BattleTowerTheme_branch_178b11
 
 Music_BattleTowerTheme_branch_178b58:
-	dnote 3, 2
-	dnote 3, 4
-	dnote 3, 1
-	dnote 3, 1
-	dnote 3, 2
-	dnote 3, 4
-	dnote 3, 1
-	dnote 3, 1
+	drum_note 3, 2
+	drum_note 3, 4
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 2
+	drum_note 3, 4
+	drum_note 3, 1
+	drum_note 3, 1
 	sound_ret
 
 Music_BattleTowerTheme_branch_178b61:
-	dnote 3, 2
-	dnote 3, 4
-	dnote 3, 1
-	dnote 3, 1
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 1
-	dnote 2, 1
-	dnote 3, 1
-	dnote 2, 1
+	drum_note 3, 2
+	drum_note 3, 4
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 2, 1
+	drum_note 3, 1
+	drum_note 2, 1
 	sound_ret
 
 Music_BattleTowerTheme_branch_178b6c:
-	dnote 3, 2
-	dnote 3, 4
-	dnote 3, 1
-	dnote 3, 1
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 1
-	dnote 3, 1
+	drum_note 3, 2
+	drum_note 3, 4
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 3, 1
 	sound_ret
 
 Music_BattleTowerTheme_branch_178b76:
-	dnote 3, 2
-	dnote 2, 2
-	dnote 3, 2
-	dnote 3, 1
-	dnote 2, 1
-	dnote 3, 2
-	dnote 2, 2
-	dnote 3, 2
-	dnote 3, 1
-	dnote 2, 1
+	drum_note 3, 2
+	drum_note 2, 2
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 2, 1
+	drum_note 3, 2
+	drum_note 2, 2
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 2, 1
 	sound_ret
 

audio/music/bicycle.asm

@@ -497,20 +497,20 @@ Music_Bicycle_branch_ee333:
 
 Music_Bicycle_Ch4:
 	toggle_noise 0
-	dspeed 12
+	drum_speed 12
 	rest 16
 	rest 16
 Music_Bicycle_branch_ee34b:
 	rest 2
 Music_Bicycle_branch_ee34c:
 	stereo_panning 1, 0
-	dnote 6, 4
+	drum_note 6, 4
 	sound_loop 12, Music_Bicycle_branch_ee34c
-	dnote 6, 4
-	dnote 6, 4
+	drum_note 6, 4
+	drum_note 6, 4
 	stereo_panning 1, 1
-	dnote 6, 2
-	dnote 6, 2
-	dnote 6, 2
+	drum_note 6, 2
+	drum_note 6, 2
+	drum_note 6, 2
 	sound_loop 0, Music_Bicycle_branch_ee34b
 

audio/music/buenaspassword.asm

@@ -560,12 +560,12 @@ Music_BuenasPassword_branch_1783bc:
 
 Music_BuenasPassword_Ch4:
 	toggle_noise 3
-	dspeed 12
-	dnote 4, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 1
-	dnote 3, 1
+	drum_speed 12
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 3, 1
 Music_BuenasPassword_branch_1783d9:
 	sound_call Music_BuenasPassword_branch_17840c
 	sound_call Music_BuenasPassword_branch_17840c
@@ -576,58 +576,58 @@ Music_BuenasPassword_branch_1783d9:
 	sound_call Music_BuenasPassword_branch_17840c
 	sound_call Music_BuenasPassword_branch_17840c
 	stereo_panning 1, 1
-	dnote 4, 2
+	drum_note 4, 2
 	stereo_panning 1, 0
-	dnote 8, 2
+	drum_note 8, 2
 	stereo_panning 1, 1
-	dnote 3, 2
+	drum_note 3, 2
 	stereo_panning 0, 1
-	dnote 8, 1
-	dnote 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
 	stereo_panning 1, 0
-	dnote 8, 2
+	drum_note 8, 2
 	stereo_panning 1, 1
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 1
-	dnote 3, 1
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 3, 1
 	sound_loop 0, Music_BuenasPassword_branch_1783d9
 
 Music_BuenasPassword_branch_17840c:
 	stereo_panning 1, 1
-	dnote 4, 2
+	drum_note 4, 2
 	stereo_panning 1, 0
-	dnote 8, 2
+	drum_note 8, 2
 	stereo_panning 1, 1
-	dnote 3, 2
+	drum_note 3, 2
 	stereo_panning 0, 1
-	dnote 8, 1
-	dnote 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
 	stereo_panning 1, 0
-	dnote 8, 2
+	drum_note 8, 2
 	stereo_panning 1, 1
-	dnote 4, 2
-	dnote 3, 2
+	drum_note 4, 2
+	drum_note 3, 2
 	stereo_panning 0, 1
-	dnote 8, 2
+	drum_note 8, 2
 	sound_ret
 
 Music_BuenasPassword_branch_178424:
 	stereo_panning 1, 1
-	dnote 4, 2
+	drum_note 4, 2
 	stereo_panning 1, 0
-	dnote 8, 2
+	drum_note 8, 2
 	stereo_panning 1, 1
-	dnote 3, 2
+	drum_note 3, 2
 	stereo_panning 0, 1
-	dnote 8, 1
-	dnote 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
 	stereo_panning 1, 0
-	dnote 8, 2
+	drum_note 8, 2
 	stereo_panning 1, 1
-	dnote 4, 2
-	dnote 3, 2
-	dnote 3, 1
-	dnote 3, 1
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 3, 1
 	sound_ret
 

audio/music/bugcatchingcontest.asm

@@ -587,83 +587,83 @@ Music_BugCatchingContest_branch_f7dda:
 
 Music_BugCatchingContest_Ch4:
 	toggle_noise 4
-	dspeed 6
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 5, 2
-	dnote 5, 2
+	drum_speed 6
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 5, 2
+	drum_note 5, 2
 	sound_call Music_BugCatchingContest_branch_f7ee2
 Music_BugCatchingContest_branch_f7eaf:
-	dnote 3, 4
-	dnote 3, 4
-	dnote 3, 2
-	dnote 2, 2
-	dnote 3, 2
-	dnote 2, 2
-	dnote 3, 4
-	dnote 3, 4
-	dnote 3, 2
-	dnote 2, 2
-	dnote 3, 2
-	dnote 2, 2
-	dnote 3, 4
-	dnote 3, 4
-	dnote 3, 2
-	dnote 2, 2
-	dnote 3, 2
-	dnote 2, 2
-	dnote 3, 4
-	dnote 3, 4
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
+	drum_note 3, 4
+	drum_note 3, 4
+	drum_note 3, 2
+	drum_note 2, 2
+	drum_note 3, 2
+	drum_note 2, 2
+	drum_note 3, 4
+	drum_note 3, 4
+	drum_note 3, 2
+	drum_note 2, 2
+	drum_note 3, 2
+	drum_note 2, 2
+	drum_note 3, 4
+	drum_note 3, 4
+	drum_note 3, 2
+	drum_note 2, 2
+	drum_note 3, 2
+	drum_note 2, 2
+	drum_note 3, 4
+	drum_note 3, 4
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
 	sound_loop 5, Music_BugCatchingContest_branch_f7eaf
-	dnote 3, 4
-	dnote 3, 4
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 4
-	dnote 3, 4
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
+	drum_note 3, 4
+	drum_note 3, 4
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 4
+	drum_note 3, 4
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
 	sound_call Music_BugCatchingContest_branch_f7ee2
 	sound_loop 0, Music_BugCatchingContest_branch_f7eaf
 
 Music_BugCatchingContest_branch_f7ee2:
-	dnote 3, 4
-	dnote 12, 8
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 4
-	dnote 12, 8
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 4
-	dnote 12, 8
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 4
-	dnote 12, 8
-	dnote 3, 2
-	dnote 3, 2
+	drum_note 3, 4
+	drum_note 12, 8
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 4
+	drum_note 12, 8
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 4
+	drum_note 12, 8
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 4
+	drum_note 12, 8
+	drum_note 3, 2
+	drum_note 3, 2
 	sound_ret
 

audio/music/burnedtower.asm

@@ -245,17 +245,17 @@ Music_BurnedTower_branch_f6bc3:
 
 Music_BurnedTower_Ch4:
 	toggle_noise 0
-	dspeed 12
+	drum_speed 12
 Music_BurnedTower_branch_f6be1:
 	rest 16
 	sound_loop 4, Music_BurnedTower_branch_f6be1
 	rest 2
 Music_BurnedTower_branch_f6be7:
 	stereo_panning 1, 0
-	dnote 8, 2
-	dnote 9, 2
-	dnote 8, 4
-	dnote 9, 2
-	dnote 8, 4
+	drum_note 8, 2
+	drum_note 9, 2
+	drum_note 8, 4
+	drum_note 9, 2
+	drum_note 8, 4
 	sound_loop 0, Music_BurnedTower_branch_f6be7
 

audio/music/cherrygrovecity.asm

@@ -285,23 +285,23 @@ Music_CherrygroveCity_branch_f5be4:
 
 Music_CherrygroveCity_Ch4:
 	toggle_noise 3
-	dspeed 12
+	drum_speed 12
 	rest 16
 Music_CherrygroveCity_branch_f5c4d:
-	dnote 2, 2
+	drum_note 2, 2
 	rest 2
-	dnote 8, 2
-	dnote 2, 2
-	dnote 2, 2
-	dnote 7, 2
-	dnote 2, 4
-	dnote 2, 2
+	drum_note 8, 2
+	drum_note 2, 2
+	drum_note 2, 2
+	drum_note 7, 2
+	drum_note 2, 4
+	drum_note 2, 2
 	rest 2
-	dnote 8, 2
-	dnote 2, 1
-	dnote 2, 1
-	dnote 7, 4
-	dnote 2, 2
-	dnote 8, 2
+	drum_note 8, 2
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 7, 4
+	drum_note 2, 2
+	drum_note 8, 2
 	sound_loop 0, Music_CherrygroveCity_branch_f5c4d
 

audio/music/clair.asm

@@ -390,46 +390,46 @@ Music_Clair_branch_1fc3c:
 
 Music_Clair_Ch4:
 	toggle_noise 3
-	dspeed 12
+	drum_speed 12
 	stereo_panning 1, 0
-	dnote 12, 8
-	dnote 12, 8
-	dnote 12, 6
+	drum_note 12, 8
+	drum_note 12, 8
+	drum_note 12, 6
 	stereo_panning 1, 1
-	dnote 4, 1
-	dnote 4, 1
-	dnote 3, 2
-	dnote 4, 1
-	dnote 4, 1
-	dnote 3, 2
-	dnote 3, 1
-	dnote 3, 1
+	drum_note 4, 1
+	drum_note 4, 1
+	drum_note 3, 2
+	drum_note 4, 1
+	drum_note 4, 1
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 3, 1
 Music_Clair_branch_1fc5e:
 	stereo_panning 1, 1
 	sound_call Music_Clair_branch_1fc6e
-	dnote 8, 1
+	drum_note 8, 1
 	stereo_panning 1, 1
 	sound_call Music_Clair_branch_1fc6e
-	dnote 7, 1
+	drum_note 7, 1
 	sound_loop 0, Music_Clair_branch_1fc5e
 
 Music_Clair_branch_1fc6e:
-	dnote 4, 2
+	drum_note 4, 2
 	stereo_panning 1, 0
-	dnote 8, 2
+	drum_note 8, 2
 	stereo_panning 1, 1
-	dnote 3, 2
+	drum_note 3, 2
 	stereo_panning 1, 0
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 2
 	stereo_panning 1, 1
-	dnote 4, 1
+	drum_note 4, 1
 	stereo_panning 1, 0
-	dnote 8, 1
+	drum_note 8, 1
 	stereo_panning 1, 1
-	dnote 3, 2
+	drum_note 3, 2
 	stereo_panning 1, 0
-	dnote 8, 1
+	drum_note 8, 1
 	sound_ret
 

audio/music/contestresults.asm

@@ -153,23 +153,23 @@ Music_ContestResults_branch_efbd2:
 
 Music_ContestResults_Ch4:
 	toggle_noise 4
-	dspeed 6
+	drum_speed 6
 Music_ContestResults_branch_efbed:
-	dnote 2, 4
-	dnote 2, 4
-	dnote 2, 2
-	dnote 2, 2
-	dnote 2, 2
-	dnote 2, 2
-	dnote 2, 4
-	dnote 2, 4
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
+	drum_note 2, 4
+	drum_note 2, 4
+	drum_note 2, 2
+	drum_note 2, 2
+	drum_note 2, 2
+	drum_note 2, 2
+	drum_note 2, 4
+	drum_note 2, 4
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
 	sound_loop 0, Music_ContestResults_branch_efbed
 

audio/music/credits.asm

@@ -1430,32 +1430,32 @@ Music_Credits_branch_1f94b:
 
 Music_Credits_Ch4:
 	toggle_noise 3
-	dspeed 12
-	dnote 9, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 9, 1
-	dnote 8, 1
-	dnote 12, 2
-	dnote 9, 1
-	dnote 8, 1
-	dnote 9, 1
-	dnote 8, 1
-	dnote 11, 4
-	dnote 11, 4
+	drum_speed 12
+	drum_note 9, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 9, 1
+	drum_note 8, 1
+	drum_note 12, 2
+	drum_note 9, 1
+	drum_note 8, 1
+	drum_note 9, 1
+	drum_note 8, 1
+	drum_note 11, 4
+	drum_note 11, 4
 	sound_call Music_Credits_branch_1fa4d
 	sound_call Music_Credits_branch_1fa4d
 	sound_call Music_Credits_branch_1fa4d
@@ -1465,212 +1465,212 @@ Music_Credits_Ch4:
 	sound_call Music_Credits_branch_1fa4d
 	sound_call Music_Credits_branch_1fa6d
 Music_Credits_branch_1f9a8:
-	dnote 11, 2
-	dnote 8, 1
-	dnote 8, 1
-	dnote 3, 2
-	dnote 8, 1
-	dnote 8, 1
-	dnote 11, 2
-	dnote 8, 1
-	dnote 8, 1
-	dnote 3, 2
-	dnote 7, 2
+	drum_note 11, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 3, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 11, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 3, 2
+	drum_note 7, 2
 	sound_loop 7, Music_Credits_branch_1f9a8
-	dnote 9, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 7, 2
-	dnote 3, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 8, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 3, 1
-	dnote 3, 1
+	drum_note 9, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 7, 2
+	drum_note 3, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 8, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 3, 1
+	drum_note 3, 1
 Music_Credits_branch_1f9c6:
-	dnote 11, 2
-	dnote 8, 1
-	dnote 8, 1
-	dnote 3, 2
-	dnote 8, 1
-	dnote 8, 1
-	dnote 11, 2
-	dnote 8, 1
-	dnote 8, 1
-	dnote 3, 2
-	dnote 7, 2
+	drum_note 11, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 3, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 11, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 3, 2
+	drum_note 7, 2
 	sound_loop 7, Music_Credits_branch_1f9c6
-	dnote 9, 1
-	dnote 8, 1
-	dnote 7, 2
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 11, 4
-	dnote 2, 4
-	dnote 9, 1
-	dnote 8, 1
-	dnote 12, 2
-	dnote 9, 1
-	dnote 8, 1
-	dnote 12, 2
-	dnote 11, 4
-	dnote 11, 4
+	drum_note 9, 1
+	drum_note 8, 1
+	drum_note 7, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 11, 4
+	drum_note 2, 4
+	drum_note 9, 1
+	drum_note 8, 1
+	drum_note 12, 2
+	drum_note 9, 1
+	drum_note 8, 1
+	drum_note 12, 2
+	drum_note 11, 4
+	drum_note 11, 4
 	sound_call Music_Credits_branch_1fa4d
 	sound_call Music_Credits_branch_1fa4d
 	sound_call Music_Credits_branch_1fa4d
 	sound_call Music_Credits_branch_1fa6d
 Music_Credits_branch_1f9f2:
-	dnote 11, 2
-	dnote 8, 1
-	dnote 8, 1
-	dnote 3, 2
-	dnote 8, 1
-	dnote 8, 1
-	dnote 11, 2
-	dnote 8, 1
-	dnote 8, 1
-	dnote 3, 2
-	dnote 7, 2
+	drum_note 11, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 3, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 11, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 3, 2
+	drum_note 7, 2
 	sound_loop 7, Music_Credits_branch_1f9f2
-	dnote 9, 1
-	dnote 8, 1
-	dnote 7, 2
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 7
-	dspeed 8
-	dnote 11, 1
-	dnote 11, 1
-	dnote 11, 1
-	dspeed 12
-	dnote 12, 16
+	drum_note 9, 1
+	drum_note 8, 1
+	drum_note 7, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 7
+	drum_speed 8
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_speed 12
+	drum_note 12, 16
 	rest 16
-	dnote 12, 15
+	drum_note 12, 15
 	rest 1
-	dnote 12, 8
-	dnote 12, 8
-	dnote 12, 16
+	drum_note 12, 8
+	drum_note 12, 8
+	drum_note 12, 16
 	rest 16
-	dnote 12, 16
-	dnote 12, 8
-	dnote 12, 6
-	dnote 3, 1
-	dnote 3, 1
-	dnote 12, 12
-	dspeed 8
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
-	dspeed 12
-	dnote 12, 12
-	dspeed 8
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 12, 12
-	dspeed 12
-	dnote 3, 1
+	drum_note 12, 16
+	drum_note 12, 8
+	drum_note 12, 6
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 12, 12
+	drum_speed 8
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_speed 12
+	drum_note 12, 12
+	drum_speed 8
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 12, 12
+	drum_speed 12
+	drum_note 3, 1
 	rest 1
-	dnote 3, 1
+	drum_note 3, 1
 	rest 1
-	dspeed 8
-	dnote 2, 2
-	dnote 2, 2
-	dnote 3, 2
-	dspeed 12
-	dnote 3, 1
+	drum_speed 8
+	drum_note 2, 2
+	drum_note 2, 2
+	drum_note 3, 2
+	drum_speed 12
+	drum_note 3, 1
 	rest 3
-	dnote 3, 1
+	drum_note 3, 1
 	rest 3
-	dspeed 8
-	dnote 2, 2
-	dnote 2, 2
-	dnote 2, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
-	dspeed 12
-	dnote 3, 1
+	drum_speed 8
+	drum_note 2, 2
+	drum_note 2, 2
+	drum_note 2, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_speed 12
+	drum_note 3, 1
 	rest 7
-	dnote 11, 8
+	drum_note 11, 8
 	rest 16
 	rest 16
 	rest 16
 	sound_ret
 
 Music_Credits_branch_1fa4d:
-	dnote 9, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 9, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 8, 1
-	dnote 7, 2
+	drum_note 9, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 9, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 8, 1
+	drum_note 7, 2
 	sound_ret
 
 Music_Credits_branch_1fa6d:
-	dnote 9, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 8, 1
-	dnote 9, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 8, 1
-	dnote 9, 1
-	dnote 3, 1
-	dnote 7, 2
-	dnote 3, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 3, 1
-	dnote 11, 1
-	dnote 3, 1
+	drum_note 9, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 8, 1
+	drum_note 9, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 8, 1
+	drum_note 9, 1
+	drum_note 3, 1
+	drum_note 7, 2
+	drum_note 3, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 11, 1
+	drum_note 3, 1
 	sound_ret
 

audio/music/crystalopening.asm

@@ -244,116 +244,116 @@ Music_CrystalOpening_Ch3:
 Music_CrystalOpening_Ch4:
 	stereo_panning 0, 1
 	toggle_noise 3
-	dspeed 12
+	drum_speed 12
 	rest 16
 	rest 12
 	octave 2
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 3, 4
-	dspeed 8
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 3, 6
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 3, 3
-	dspeed 12
-	dnote 2, 1
-	dnote 2, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 2
-	dnote 2, 1
-	dnote 2, 1
-	dnote 8, 2
-	dnote 3, 1
-	dnote 2, 1
-	dnote 10, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 3, 1
-	dnote 8, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 3, 4
+	drum_speed 8
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 3, 6
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 3, 3
+	drum_speed 12
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 2
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 8, 2
+	drum_note 3, 1
+	drum_note 2, 1
+	drum_note 10, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 8, 1
 	rest 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 10, 1
-	dnote 8, 1
-	dnote 2, 1
-	dnote 3, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 3, 1
-	dnote 10, 2
-	dnote 2, 2
-	dnote 2, 2
-	dnote 2, 2
-	dnote 10, 2
-	dnote 3, 2
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 3, 4
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 3, 4
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 10, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 2, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 10, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 2, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 2, 1
-	dnote 10, 1
-	dnote 8, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 3, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 3, 1
-	dnote 10, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 2, 1
-	dnote 2, 1
-	dnote 8, 1
-	dnote 3, 1
-	dnote 2, 1
-	dnote 2, 2
-	dnote 3, 2
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 10, 1
+	drum_note 8, 1
+	drum_note 2, 1
+	drum_note 3, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 10, 2
+	drum_note 2, 2
+	drum_note 2, 2
+	drum_note 2, 2
+	drum_note 10, 2
+	drum_note 3, 2
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 3, 4
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 3, 4
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 10, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 2, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 10, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 2, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 2, 1
+	drum_note 10, 1
+	drum_note 8, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 3, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 3, 1
+	drum_note 10, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 2, 1
+	drum_note 2, 1
+	drum_note 8, 1
+	drum_note 3, 1
+	drum_note 2, 1
+	drum_note 2, 2
+	drum_note 3, 2
 	rest 2
-	dnote 3, 2
-	dnote 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
 	rest 6
 	rest 16
 	rest 16

audio/music/darkcave.asm

@@ -459,27 +459,27 @@ Music_DarkCave_branch_ea4ce:
 
 Music_DarkCave_Ch4:
 	toggle_noise 3
-	dspeed 12
+	drum_speed 12
 Music_DarkCave_branch_ea4ee:
 	stereo_panning 1, 1
-	dnote 4, 8
-	dnote 4, 8
-	dnote 4, 4
+	drum_note 4, 8
+	drum_note 4, 8
+	drum_note 4, 4
 	stereo_panning 1, 0
-	dnote 2, 4
+	drum_note 2, 4
 	stereo_panning 0, 1
-	dnote 2, 2
-	dnote 2, 2
+	drum_note 2, 2
+	drum_note 2, 2
 	stereo_panning 1, 0
-	dnote 2, 4
+	drum_note 2, 4
 	stereo_panning 1, 1
-	dnote 4, 8
-	dnote 4, 8
-	dnote 4, 4
+	drum_note 4, 8
+	drum_note 4, 8
+	drum_note 4, 4
 	stereo_panning 0, 1
-	dnote 2, 8
+	drum_note 2, 8
 	stereo_panning 1, 0
-	dnote 2, 2
-	dnote 2, 2
+	drum_note 2, 2
+	drum_note 2, 2
 	sound_loop 0, Music_DarkCave_branch_ea4ee
 

audio/music/dragonsden.asm

@@ -157,16 +157,16 @@ Music_DragonsDen_branch_eed99:
 
 Music_DragonsDen_Ch4:
 	toggle_noise 0
-	dspeed 12
+	drum_speed 12
 	rest 16
 	rest 16
 Music_DragonsDen_branch_eedbd:
 	stereo_panning 1, 0
-	dnote 6, 4
+	drum_note 6, 4
 	stereo_panning 0, 1
-	dnote 7, 4
-	dnote 7, 4
+	drum_note 7, 4
+	drum_note 7, 4
 	stereo_panning 1, 0
-	dnote 7, 4
+	drum_note 7, 4
 	sound_loop 0, Music_DragonsDen_branch_eedbd
 

audio/music/elmslab.asm

@@ -530,10 +530,10 @@ Music_ElmsLab_branch_ea216:
 Music_ElmsLab_Ch4:
 	stereo_panning 1, 0
 	toggle_noise 0
-	dspeed 12
+	drum_speed 12
 	rest 16
 	rest 2
 Music_ElmsLab_branch_ea2b9:
-	dnote 8, 4
+	drum_note 8, 4
 	sound_loop 0, Music_ElmsLab_branch_ea2b9
 

audio/music/evolution.asm

@@ -187,15 +187,15 @@ Music_Evolution_branch_f07d5:
 
 Music_Evolution_Ch4:
 	toggle_noise 5
-	dspeed 12
+	drum_speed 12
 	rest 8
 Music_Evolution_branch_f07f0:
 	stereo_panning 1, 0
-	dnote 11, 6
-	dnote 11, 4
+	drum_note 11, 6
+	drum_note 11, 4
 	stereo_panning 0, 1
-	dnote 5, 2
-	dnote 5, 2
-	dnote 5, 2
+	drum_note 5, 2
+	drum_note 5, 2
+	drum_note 5, 2
 	sound_loop 0, Music_Evolution_branch_f07f0
 

audio/music/gamecorner.asm

@@ -658,151 +658,151 @@ Music_GameCorner_branch_ee03f:
 
 Music_GameCorner_Ch4:
 	toggle_noise 3
-	dspeed 12
-	dspeed 8
-	dnote 3, 1
-	dnote 3, 1
-	dnote 3, 1
-	dspeed 12
-	dnote 3, 1
-	dnote 3, 1
-	dnote 3, 2
-	dnote 3, 1
-	dnote 3, 1
+	drum_speed 12
+	drum_speed 8
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_speed 12
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 3, 1
 Music_GameCorner_branch_ee07f:
 	sound_call Music_GameCorner_branch_ee106
 Music_GameCorner_branch_ee082:
-	dnote 11, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
-	dnote 11, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
+	drum_note 11, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
+	drum_note 11, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
 	sound_loop 6, Music_GameCorner_branch_ee082
 	sound_call Music_GameCorner_branch_ee10f
 Music_GameCorner_branch_ee091:
-	dnote 11, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
-	dnote 11, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
+	drum_note 11, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
+	drum_note 11, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
 	sound_loop 3, Music_GameCorner_branch_ee091
 	rest 12
-	dnote 3, 1
-	dnote 3, 1
-	dnote 7, 2
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 7, 2
 	sound_call Music_GameCorner_branch_ee106
 Music_GameCorner_branch_ee0a4:
-	dnote 11, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
-	dnote 11, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
+	drum_note 11, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
+	drum_note 11, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
 	sound_loop 6, Music_GameCorner_branch_ee0a4
 	sound_call Music_GameCorner_branch_ee10f
 Music_GameCorner_branch_ee0b3:
-	dnote 11, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
-	dnote 11, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
+	drum_note 11, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
+	drum_note 11, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
 	sound_loop 3, Music_GameCorner_branch_ee0b3
-	dnote 11, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
-	dnote 4, 2
-	dnote 7, 2
-	dnote 3, 1
-	dnote 3, 1
-	dnote 3, 1
-	dnote 3, 1
+	drum_note 11, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
+	drum_note 4, 2
+	drum_note 7, 2
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 1
 Music_GameCorner_branch_ee0c9:
-	dnote 11, 2
-	dnote 7, 1
-	dnote 4, 1
-	dnote 3, 1
-	dnote 4, 1
-	dnote 7, 1
-	dnote 4, 1
-	dnote 4, 1
-	dnote 3, 1
-	dnote 7, 1
-	dnote 4, 1
-	dnote 3, 2
-	dnote 7, 2
+	drum_note 11, 2
+	drum_note 7, 1
+	drum_note 4, 1
+	drum_note 3, 1
+	drum_note 4, 1
+	drum_note 7, 1
+	drum_note 4, 1
+	drum_note 4, 1
+	drum_note 3, 1
+	drum_note 7, 1
+	drum_note 4, 1
+	drum_note 3, 2
+	drum_note 7, 2
 	sound_loop 3, Music_GameCorner_branch_ee0c9
-	dnote 11, 2
-	dnote 7, 1
-	dnote 4, 1
-	dnote 3, 1
-	dnote 4, 1
-	dnote 7, 1
-	dnote 4, 1
-	dnote 4, 1
-	dnote 3, 1
-	dnote 7, 1
-	dnote 4, 1
-	dnote 3, 2
-	dnote 3, 1
-	dnote 3, 1
+	drum_note 11, 2
+	drum_note 7, 1
+	drum_note 4, 1
+	drum_note 3, 1
+	drum_note 4, 1
+	drum_note 7, 1
+	drum_note 4, 1
+	drum_note 4, 1
+	drum_note 3, 1
+	drum_note 7, 1
+	drum_note 4, 1
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 3, 1
 Music_GameCorner_branch_ee0e8:
-	dnote 11, 2
-	dnote 7, 1
-	dnote 4, 1
-	dnote 3, 1
-	dnote 4, 1
-	dnote 7, 1
-	dnote 4, 1
-	dnote 4, 1
-	dnote 3, 1
-	dnote 7, 1
-	dnote 4, 1
-	dnote 3, 2
-	dnote 7, 2
+	drum_note 11, 2
+	drum_note 7, 1
+	drum_note 4, 1
+	drum_note 3, 1
+	drum_note 4, 1
+	drum_note 7, 1
+	drum_note 4, 1
+	drum_note 4, 1
+	drum_note 3, 1
+	drum_note 7, 1
+	drum_note 4, 1
+	drum_note 3, 2
+	drum_note 7, 2
 	sound_loop 3, Music_GameCorner_branch_ee0e8
-	dnote 3, 1
-	dnote 3, 1
-	dnote 3, 2
-	dnote 11, 1
-	dnote 7, 2
-	dnote 7, 5
-	dnote 3, 1
-	dnote 3, 1
-	dnote 4, 2
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 2
+	drum_note 11, 1
+	drum_note 7, 2
+	drum_note 7, 5
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 4, 2
 	sound_loop 0, Music_GameCorner_branch_ee07f
 
 Music_GameCorner_branch_ee106:
-	dnote 1, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
-	dnote 11, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
+	drum_note 1, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
+	drum_note 11, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
 	sound_ret
 
 Music_GameCorner_branch_ee10f:
-	dnote 11, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
-	dnote 11, 2
-	dnote 7, 2
-	dnote 3, 1
-	dnote 3, 1
-	dnote 7, 2
+	drum_note 11, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
+	drum_note 11, 2
+	drum_note 7, 2
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 7, 2
 	sound_ret
 

audio/music/goldenrodcity.asm

@@ -387,90 +387,90 @@ Music_GoldenrodCity_branch_eb5d2:
 
 Music_GoldenrodCity_Ch4:
 	toggle_noise 3
-	dspeed 12
+	drum_speed 12
 	rest 16
 	rest 16
 	rest 16
 	rest 8
-	dnote 3, 2
-	dnote 7, 2
-	dnote 3, 1
-	dnote 3, 1
-	dnote 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 7, 2
 Music_GoldenrodCity_branch_eb613:
-	dnote 4, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
-	dnote 4, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
+	drum_note 4, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
+	drum_note 4, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
 	sound_loop 3, Music_GoldenrodCity_branch_eb613
 	sound_call Music_GoldenrodCity_branch_eb663
 	sound_call Music_GoldenrodCity_branch_eb66d
-	dnote 8, 1
-	dnote 8, 1
-	dnote 7, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 7, 2
 	sound_call Music_GoldenrodCity_branch_eb66d
-	dnote 3, 2
-	dnote 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
 	sound_call Music_GoldenrodCity_branch_eb66d
-	dnote 3, 1
-	dnote 3, 1
-	dnote 7, 2
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 7, 2
 	sound_call Music_GoldenrodCity_branch_eb66d
-	dnote 3, 2
-	dnote 3, 1
-	dnote 3, 1
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 3, 1
 	sound_call Music_GoldenrodCity_branch_eb66d
-	dnote 8, 1
-	dnote 8, 1
-	dnote 7, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 7, 2
 	sound_call Music_GoldenrodCity_branch_eb66d
-	dnote 3, 2
-	dnote 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
 	sound_call Music_GoldenrodCity_branch_eb66d
-	dnote 3, 1
-	dnote 3, 1
-	dnote 7, 2
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 7, 2
 	sound_call Music_GoldenrodCity_branch_eb66d
-	dnote 3, 2
-	dnote 3, 1
-	dnote 3, 1
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 3, 1
 Music_GoldenrodCity_branch_eb650:
-	dnote 4, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
-	dnote 4, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
+	drum_note 4, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
+	drum_note 4, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
 	sound_loop 3, Music_GoldenrodCity_branch_eb650
 	sound_call Music_GoldenrodCity_branch_eb663
 	sound_loop 0, Music_GoldenrodCity_branch_eb613
 
 Music_GoldenrodCity_branch_eb663:
-	dnote 4, 2
-	dnote 7, 2
-	dnote 3, 2
-	dnote 7, 2
-	dnote 4, 2
-	dnote 7, 2
-	dnote 3, 1
-	dnote 3, 1
-	dnote 7, 2
+	drum_note 4, 2
+	drum_note 7, 2
+	drum_note 3, 2
+	drum_note 7, 2
+	drum_note 4, 2
+	drum_note 7, 2
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 7, 2
 	sound_ret
 
 Music_GoldenrodCity_branch_eb66d:
-	dnote 4, 2
-	dnote 3, 1
-	dnote 4, 3
-	dnote 4, 2
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
-	dnote 8, 1
+	drum_note 4, 2
+	drum_note 3, 1
+	drum_note 4, 3
+	drum_note 4, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
 	sound_ret
 

audio/music/goldsilveropening2.asm

@@ -185,35 +185,35 @@ Music_GoldSilverOpening2_Ch3:
 
 Music_GoldSilverOpening2_Ch4:
 	toggle_noise 0
-	dspeed 6
-	dnote 4, 2
-	dnote 4, 2
-	dnote 4, 2
-	dnote 4, 2
-	dnote 4, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
-	dspeed 12
+	drum_speed 6
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_speed 12
 Music_GoldSilverOpening2_branch_f73f8:
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 2, 4
-	dnote 4, 2
-	dnote 4, 2
-	dnote 4, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 2, 6
-	dspeed 6
-	dnote 4, 2
-	dnote 4, 2
-	dnote 4, 2
-	dnote 4, 2
-	dspeed 12
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 2, 4
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 2, 6
+	drum_speed 6
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_speed 12
 	sound_loop 4, Music_GoldSilverOpening2_branch_f73f8
-	dnote 1, 16
+	drum_note 1, 16
 	sound_ret