Rename dnote to drum_note and dspeed to drum_speed

audio/engine_1.asm

@@ -647,8 +647,8 @@ Audio1_note:
 	jr nz, Audio1_note_length ; if not noise channel
 	ld a, d
 	and $f0
-	cp $b0 ; is this command a dnote?
-	jr z, .dnote
+	cp $b0 ; is this command a drum_note?
+	jr z, .drum_note
 	jr nc, Audio1_note_length ; no
 
 	; this executes when on the noise channel and
@@ -657,7 +657,7 @@ Audio1_note:
 	; and the lower nybble is the length minus 1 (0-15)
 	; however, this doesn't work for instrument #2 because the command id
 	; is captured by the noise_note command (command id $2x)
-	; this essentially acts like a dnote command that is only 1 byte
+	; this essentially acts like a drum_note command that is only 1 byte
 	; instead of 2 and can only be used with instruments 1 and 3 through 10
 	; this is unused by the game
 	swap a
@@ -670,12 +670,12 @@ Audio1_note:
 	push bc
 	jr .playDnote
 
-.dnote
+.drum_note
 	ld a, d
 	and $f
 	push af
 	push bc
-	call Audio1_GetNextMusicByte ; get dnote instrument
+	call Audio1_GetNextMusicByte ; get drum_note instrument
 .playDnote
 	ld d, a
 	ld a, [wDisableChannelOutputWhenSfxEnds]

audio/engine_2.asm

@@ -658,8 +658,8 @@ Audio2_note:
 	jr nz, Audio2_note_length ; if not noise channel
 	ld a, d
 	and $f0
-	cp $b0 ; is this command a dnote?
-	jr z, .dnote
+	cp $b0 ; is this command a drum_note?
+	jr z, .drum_note
 	jr nc, Audio2_note_length ; no
 
 	; this executes when on the noise channel and
@@ -668,7 +668,7 @@ Audio2_note:
 	; and the lower nybble is the length minus 1 (0-15)
 	; however, this doesn't work for instrument #2 because the command id
 	; is captured by the noise_note command (command id $2x)
-	; this essentially acts like a dnote command that is only 1 byte
+	; this essentially acts like a drum_note command that is only 1 byte
 	; instead of 2 and can only be used with instruments 1 and 3 through 10
 	; this is unused by the game
 	swap a
@@ -681,12 +681,12 @@ Audio2_note:
 	push bc
 	jr .playDnote
 
-.dnote
+.drum_note
 	ld a, d
 	and $f
 	push af
 	push bc
-	call Audio2_GetNextMusicByte ; get dnote instrument
+	call Audio2_GetNextMusicByte ; get drum_note instrument
 .playDnote
 	ld d, a
 	ld a, [wDisableChannelOutputWhenSfxEnds]

audio/engine_3.asm

@@ -647,8 +647,8 @@ Audio3_note:
 	jr nz, Audio3_note_length ; if not noise channel
 	ld a, d
 	and $f0
-	cp $b0 ; is this command a dnote?
-	jr z, .dnote
+	cp $b0 ; is this command a drum_note?
+	jr z, .drum_note
 	jr nc, Audio3_note_length ; no
 
 	; this executes when on the noise channel and
@@ -657,7 +657,7 @@ Audio3_note:
 	; and the lower nybble is the length minus 1 (0-15)
 	; however, this doesn't work for instrument #2 because the command id
 	; is captured by the noise_note command (command id $2x)
-	; this essentially acts like a dnote command that is only 1 byte
+	; this essentially acts like a drum_note command that is only 1 byte
 	; instead of 2 and can only be used with instruments 1 and 3 through 10
 	; this is unused by the game
 	swap a
@@ -670,12 +670,12 @@ Audio3_note:
 	push bc
 	jr .playDnote
 
-.dnote
+.drum_note
 	ld a, d
 	and $f
 	push af
 	push bc
-	call Audio3_GetNextMusicByte ; get dnote instrument
+	call Audio3_GetNextMusicByte ; get drum_note instrument
 .playDnote
 	ld d, a
 	ld a, [wDisableChannelOutputWhenSfxEnds]

audio/music/bikeriding.asm

@@ -644,7 +644,7 @@ Music_BikeRiding_branch_7dd17::
 
 
 Music_BikeRiding_Ch4::
-	dspeed 12
+	drum_speed 12
 	rest 2
 
 Music_BikeRiding_branch_7de6a::
@@ -671,34 +671,34 @@ Music_BikeRiding_branch_7de6a::
 
 Music_BikeRiding_branch_7dea7::
 	rest 2
-	dnote 16, 2
+	drum_note 16, 2
 	rest 2
-	dnote 16, 2
+	drum_note 16, 2
 	rest 2
-	dnote 16, 2
+	drum_note 16, 2
 	rest 2
-	dnote 16, 2
+	drum_note 16, 2
 	sound_ret
 
 Music_BikeRiding_branch_7deb4::
 	rest 2
-	dnote 16, 2
+	drum_note 16, 2
 	rest 2
-	dnote 16, 2
+	drum_note 16, 2
 	rest 2
-	dnote 16, 2
-	dnote 16, 2
-	dnote 16, 2
+	drum_note 16, 2
+	drum_note 16, 2
+	drum_note 16, 2
 	sound_ret
 
 Music_BikeRiding_branch_7dec2::
 	rest 2
-	dnote 16, 2
+	drum_note 16, 2
 	rest 2
-	dnote 16, 2
+	drum_note 16, 2
 	rest 2
-	dnote 16, 2
+	drum_note 16, 2
 	rest 2
-	dnote 16, 1
-	dnote 16, 1
+	drum_note 16, 1
+	drum_note 16, 1
 	sound_ret

audio/music/cinnabarmansion.asm

@@ -144,29 +144,29 @@ Music_CinnabarMansion_branch_7ed80::
 
 
 Music_CinnabarMansion_Ch4::
-	dspeed 6
+	drum_speed 6
 	rest 16
 	rest 16
 	rest 16
 	rest 16
 
 Music_CinnabarMansion_branch_7edb5::
-	dnote 12, 2
-	dnote 12, 2
-	dnote 13, 4
-	dnote 12, 2
-	dnote 12, 2
-	dnote 13, 4
-	dnote 12, 2
-	dnote 12, 2
-	dnote 13, 4
-	dnote 12, 2
-	dnote 12, 2
-	dnote 14, 4
-	dnote 12, 2
-	dnote 12, 2
+	drum_note 12, 2
+	drum_note 12, 2
+	drum_note 13, 4
+	drum_note 12, 2
+	drum_note 12, 2
+	drum_note 13, 4
+	drum_note 12, 2
+	drum_note 12, 2
+	drum_note 13, 4
+	drum_note 12, 2
+	drum_note 12, 2
+	drum_note 14, 4
+	drum_note 12, 2
+	drum_note 12, 2
 	rest 2
 	rest 10
 	rest 8
-	dnote 14, 8
+	drum_note 14, 8
 	sound_loop 0, Music_CinnabarMansion_branch_7edb5

audio/music/cities1.asm

@@ -580,7 +580,7 @@ Music_Cities1_branch_acce::
 
 
 Music_Cities1_Ch4::
-	dspeed 12
+	drum_speed 12
 	sound_call Music_Cities1_branch_ad36
 
 Music_Cities1_branch_acf3::
@@ -591,67 +591,67 @@ Music_Cities1_branch_acf3::
 	sound_call Music_Cities1_branch_ad36
 	sound_call Music_Cities1_branch_ad5f
 	sound_call Music_Cities1_branch_ad52
-	dnote 6, 6
-	dnote 6, 6
-	dnote 7, 4
+	drum_note 6, 6
+	drum_note 6, 6
+	drum_note 7, 4
 	sound_call Music_Cities1_branch_ad6e
 	sound_call Music_Cities1_branch_ad5f
 	sound_call Music_Cities1_branch_ad52
 	sound_call Music_Cities1_branch_ad6e
 	sound_call Music_Cities1_branch_ad52
-	dnote 6, 6
-	dnote 6, 6
-	dnote 7, 2
-	dnote 6, 2
-	dnote 6, 6
-	dnote 6, 6
-	dnote 6, 4
-	dnote 6, 6
-	dnote 8, 6
-	dnote 8, 4
+	drum_note 6, 6
+	drum_note 6, 6
+	drum_note 7, 2
+	drum_note 6, 2
+	drum_note 6, 6
+	drum_note 6, 6
+	drum_note 6, 4
+	drum_note 6, 6
+	drum_note 8, 6
+	drum_note 8, 4
 	sound_loop 0, Music_Cities1_Ch4
 
 Music_Cities1_branch_ad36::
-	dnote 8, 6
-	dnote 8, 6
-	dnote 8, 4
-	dnote 8, 6
-	dnote 8, 6
-	dnote 8, 2
-	dnote 8, 2
+	drum_note 8, 6
+	drum_note 8, 6
+	drum_note 8, 4
+	drum_note 8, 6
+	drum_note 8, 6
+	drum_note 8, 2
+	drum_note 8, 2
 	sound_ret
 
 Music_Cities1_branch_ad45::
-	dnote 8, 6
-	dnote 8, 6
-	dnote 8, 4
-	dnote 8, 6
-	dnote 8, 6
-	dnote 8, 4
+	drum_note 8, 6
+	drum_note 8, 6
+	drum_note 8, 4
+	drum_note 8, 6
+	drum_note 8, 6
+	drum_note 8, 4
 	sound_ret
 
 Music_Cities1_branch_ad52::
-	dnote 6, 6
-	dnote 6, 6
-	dnote 7, 4
-	dnote 6, 6
-	dnote 6, 6
-	dnote 7, 4
+	drum_note 6, 6
+	drum_note 6, 6
+	drum_note 7, 4
+	drum_note 6, 6
+	drum_note 6, 6
+	drum_note 7, 4
 	sound_ret
 
 Music_Cities1_branch_ad5f::
-	dnote 6, 6
-	dnote 6, 6
-	dnote 7, 4
-	dnote 6, 6
-	dnote 6, 6
-	dnote 7, 2
-	dnote 6, 2
+	drum_note 6, 6
+	drum_note 6, 6
+	drum_note 7, 4
+	drum_note 6, 6
+	drum_note 6, 6
+	drum_note 7, 2
+	drum_note 6, 2
 	sound_ret
 
 Music_Cities1_branch_ad6e::
-	dnote 6, 6
-	dnote 6, 6
-	dnote 7, 2
-	dnote 7, 2
+	drum_note 6, 6
+	drum_note 6, 6
+	drum_note 7, 2
+	drum_note 7, 2
 	sound_ret