ref: e0583934874a8fddb1204efd4357146be617cb1f
parent: fc051f21300bc2cfdbbb013fb7dbf6bd3b0e9b2d
author: dannye <[email protected]>
date: Tue Sep 3 18:36:32 EDT 2019
Rename dnote to drum_note and dspeed to drum_speed
--- a/audio/music/aftertherivalfight.asm
+++ b/audio/music/aftertherivalfight.asm
@@ -55,12 +55,12 @@
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
--- a/audio/music/azaleatown.asm
+++ b/audio/music/azaleatown.asm
@@ -627,29 +627,29 @@
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
--- a/audio/music/battletowerlobby.asm
+++ b/audio/music/battletowerlobby.asm
@@ -300,11 +300,11 @@
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
--- a/audio/music/battletowertheme.asm
+++ b/audio/music/battletowertheme.asm
@@ -585,18 +585,18 @@
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 @@
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
--- a/audio/music/bicycle.asm
+++ b/audio/music/bicycle.asm
@@ -497,7 +497,7 @@
Music_Bicycle_Ch4:
toggle_noise 0
- dspeed 12
+ drum_speed 12
rest 16
rest 16
Music_Bicycle_branch_ee34b:
@@ -504,13 +504,13 @@
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
--- a/audio/music/buenaspassword.asm
+++ b/audio/music/buenaspassword.asm
@@ -560,12 +560,12 @@
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 @@
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
--- a/audio/music/bugcatchingcontest.asm
+++ b/audio/music/bugcatchingcontest.asm
@@ -587,83 +587,83 @@
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
--- a/audio/music/burnedtower.asm
+++ b/audio/music/burnedtower.asm
@@ -245,7 +245,7 @@
Music_BurnedTower_Ch4:
toggle_noise 0
- dspeed 12
+ drum_speed 12
Music_BurnedTower_branch_f6be1:
rest 16
sound_loop 4, Music_BurnedTower_branch_f6be1
@@ -252,10 +252,10 @@
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
--- a/audio/music/cherrygrovecity.asm
+++ b/audio/music/cherrygrovecity.asm
@@ -285,23 +285,23 @@
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
--- a/audio/music/clair.asm
+++ b/audio/music/clair.asm
@@ -390,46 +390,46 @@
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
--- a/audio/music/contestresults.asm
+++ b/audio/music/contestresults.asm
@@ -153,23 +153,23 @@
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
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -1430,32 +1430,32 @@
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,142 +1465,142 @@
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
@@ -1607,70 +1607,70 @@
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
--- a/audio/music/crystalopening.asm
+++ b/audio/music/crystalopening.asm
@@ -244,116 +244,116 @@
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
--- a/audio/music/darkcave.asm
+++ b/audio/music/darkcave.asm
@@ -459,27 +459,27 @@
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
--- a/audio/music/dragonsden.asm
+++ b/audio/music/dragonsden.asm
@@ -157,16 +157,16 @@
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
--- a/audio/music/elmslab.asm
+++ b/audio/music/elmslab.asm
@@ -530,10 +530,10 @@
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
--- a/audio/music/evolution.asm
+++ b/audio/music/evolution.asm
@@ -187,15 +187,15 @@
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
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -658,151 +658,151 @@
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
--- a/audio/music/goldenrodcity.asm
+++ b/audio/music/goldenrodcity.asm
@@ -387,90 +387,90 @@
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
--- a/audio/music/goldsilveropening2.asm
+++ b/audio/music/goldsilveropening2.asm
@@ -185,35 +185,35 @@
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
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -505,64 +505,64 @@
Music_Gym_Ch4:
toggle_noise 4
Music_Gym_branch_f4ac7:
- dspeed 12
- dnote 3, 2
- dnote 2, 1
- dnote 2, 1
- dnote 12, 4
- dnote 3, 2
- dnote 2, 1
- dnote 2, 1
- dnote 12, 4
- dnote 3, 2
- dnote 2, 1
- dnote 2, 1
- dnote 3, 2
- dnote 2, 1
- dnote 2, 1
- dnote 11, 1
- dnote 4, 1
- dnote 4, 1
- dnote 4, 1
- dnote 2, 1
- dnote 2, 1
- dnote 3, 1
- dnote 3, 1
- dspeed 6
+ drum_speed 12
+ drum_note 3, 2
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 12, 4
+ drum_note 3, 2
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 12, 4
+ drum_note 3, 2
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 3, 2
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 11, 1
+ drum_note 4, 1
+ drum_note 4, 1
+ drum_note 4, 1
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_speed 6
Music_Gym_branch_f4ae1:
- dnote 3, 6
- dnote 3, 6
- dnote 3, 4
- dnote 3, 2
- dnote 3, 2
- 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
- dnote 3, 6
- dnote 3, 6
- dnote 3, 4
- dnote 3, 2
- dnote 3, 2
- dnote 3, 4
- dnote 12, 8
+ drum_note 3, 6
+ drum_note 3, 6
+ drum_note 3, 4
+ drum_note 3, 2
+ drum_note 3, 2
+ 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
+ drum_note 3, 6
+ drum_note 3, 6
+ drum_note 3, 4
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 3, 4
+ drum_note 12, 8
sound_loop 4, Music_Gym_branch_f4ae1
Music_Gym_branch_f4afa:
- dnote 4, 4
- dnote 7, 4
- dnote 3, 4
- dnote 4, 2
- dnote 3, 2
- dnote 4, 2
- dnote 3, 2
- dnote 4, 4
- dnote 3, 4
- dnote 7, 4
+ drum_note 4, 4
+ drum_note 7, 4
+ drum_note 3, 4
+ drum_note 4, 2
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 3, 2
+ drum_note 4, 4
+ drum_note 3, 4
+ drum_note 7, 4
sound_loop 8, Music_Gym_branch_f4afa
sound_loop 0, Music_Gym_branch_f4ac7
--- a/audio/music/gymleadervictory.asm
+++ b/audio/music/gymleadervictory.asm
@@ -382,40 +382,40 @@
Music_GymLeaderVictory_Ch4:
toggle_noise 4
- dspeed 12
- dnote 12, 16
- dnote 12, 16
+ drum_speed 12
+ drum_note 12, 16
+ drum_note 12, 16
Music_GymLeaderVictory_branch_f47eb:
sound_call Music_GymLeaderVictory_branch_f480b
- dnote 4, 6
- dnote 4, 2
- dnote 4, 8
+ drum_note 4, 6
+ drum_note 4, 2
+ drum_note 4, 8
sound_call Music_GymLeaderVictory_branch_f480b
- dnote 4, 6
- dnote 4, 2
- dnote 4, 4
- dnote 2, 1
- dnote 2, 1
- dnote 2, 1
- dnote 2, 1
+ drum_note 4, 6
+ drum_note 4, 2
+ drum_note 4, 4
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 2, 1
Music_GymLeaderVictory_branch_f47fb:
- dnote 4, 2
- dnote 8, 2
- dnote 3, 2
- dnote 4, 2
- dnote 8, 2
- dnote 4, 2
- dnote 3, 2
- dnote 8, 2
+ drum_note 4, 2
+ drum_note 8, 2
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 8, 2
+ drum_note 4, 2
+ drum_note 3, 2
+ drum_note 8, 2
sound_loop 16, Music_GymLeaderVictory_branch_f47fb
sound_loop 0, Music_GymLeaderVictory_branch_f47eb
Music_GymLeaderVictory_branch_f480b:
- dnote 4, 6
- dnote 4, 2
- dnote 4, 4
- dnote 3, 2
- dnote 4, 2
+ drum_note 4, 6
+ drum_note 4, 2
+ drum_note 4, 4
+ drum_note 3, 2
+ drum_note 4, 2
sound_loop 3, Music_GymLeaderVictory_branch_f480b
sound_ret
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -137,37 +137,37 @@
Music_HallOfFame_Ch4:
toggle_noise 5
- dspeed 12
+ drum_speed 12
rest 16
rest 16
rest 16
rest 16
- dspeed 6
+ drum_speed 6
Music_HallOfFame_branch_f0677:
stereo_panning 0, 1
- dnote 11, 4
- dnote 11, 8
- dnote 11, 4
- dnote 11, 4
- dnote 11, 4
+ drum_note 11, 4
+ drum_note 11, 8
+ drum_note 11, 4
+ drum_note 11, 4
+ drum_note 11, 4
stereo_panning 1, 0
- dnote 10, 2
- dnote 10, 2
- dnote 11, 2
- dnote 11, 2
- dnote 11, 4
- dnote 11, 4
- dnote 11, 8
- dnote 11, 4
- dnote 11, 4
+ drum_note 10, 2
+ drum_note 10, 2
+ drum_note 11, 2
+ drum_note 11, 2
+ drum_note 11, 4
+ drum_note 11, 4
+ drum_note 11, 8
+ drum_note 11, 4
+ drum_note 11, 4
stereo_panning 0, 1
- dnote 11, 1
- dnote 11, 1
- dnote 10, 1
- dnote 10, 1
- dnote 11, 1
- dnote 11, 1
- dnote 11, 1
- dnote 11, 1
+ drum_note 11, 1
+ drum_note 11, 1
+ drum_note 10, 1
+ drum_note 10, 1
+ drum_note 11, 1
+ drum_note 11, 1
+ drum_note 11, 1
+ drum_note 11, 1
sound_loop 0, Music_HallOfFame_branch_f0677
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -151,34 +151,34 @@
Music_IndigoPlateau_Ch4:
stereo_panning 1, 0
toggle_noise 0
- dspeed 12
+ drum_speed 12
Music_IndigoPlateau_branch_ee92a:
- dnote 4, 4
- dnote 3, 2
- dnote 4, 2
- dnote 4, 2
- dnote 4, 2
- dnote 3, 4
- dnote 3, 2
- dnote 3, 2
- dspeed 6
- dnote 3, 1
- dnote 3, 1
- dnote 4, 1
- dnote 4, 1
- dnote 4, 1
- dnote 4, 1
- dnote 3, 1
- dnote 3, 1
- dspeed 12
- dnote 4, 4
- dnote 3, 2
- dnote 4, 2
- dnote 4, 2
- dnote 3, 2
- dnote 2, 4
- dnote 3, 2
- dnote 3, 2
- dnote 2, 4
+ drum_note 4, 4
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 4, 2
+ drum_note 4, 2
+ drum_note 3, 4
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_speed 6
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 4, 1
+ drum_note 4, 1
+ drum_note 4, 1
+ drum_note 4, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_speed 12
+ drum_note 4, 4
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 4, 2
+ drum_note 3, 2
+ drum_note 2, 4
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 2, 4
sound_loop 0, Music_IndigoPlateau_branch_ee92a
--- a/audio/music/lakeofrage.asm
+++ b/audio/music/lakeofrage.asm
@@ -299,26 +299,26 @@
Music_LakeOfRage_Ch4:
stereo_panning 1, 0
toggle_noise 3
- dspeed 12
+ drum_speed 12
Music_LakeOfRage_branch_ee83b:
- dnote 3, 2
- dnote 3, 1
- dnote 3, 1
- dnote 8, 2
- dnote 3, 2
- dnote 3, 1
- dnote 3, 1
- dnote 7, 6
- dnote 3, 2
- dnote 3, 1
- dnote 3, 1
- dnote 8, 2
- dnote 3, 2
- dnote 3, 1
- dnote 3, 1
- dnote 7, 3
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
+ drum_note 3, 2
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 8, 2
+ drum_note 3, 2
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 7, 6
+ drum_note 3, 2
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 8, 2
+ drum_note 3, 2
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 7, 3
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
sound_loop 0, Music_LakeOfRage_branch_ee83b
--- a/audio/music/lighthouse.asm
+++ b/audio/music/lighthouse.asm
@@ -291,21 +291,21 @@
Music_Lighthouse_Ch4:
toggle_noise 0
- dspeed 12
+ drum_speed 12
Music_Lighthouse_branch_ee6b1:
stereo_panning 0, 1
- dnote 9, 4
- dnote 6, 2
- dnote 9, 4
- dnote 6, 2
- dnote 10, 2
- dnote 11, 2
+ drum_note 9, 4
+ drum_note 6, 2
+ drum_note 9, 4
+ drum_note 6, 2
+ drum_note 10, 2
+ drum_note 11, 2
stereo_panning 1, 1
- dnote 9, 2
- dnote 6, 4
- dnote 9, 2
- dnote 6, 4
- dnote 9, 2
- dnote 10, 2
+ drum_note 9, 2
+ drum_note 6, 4
+ drum_note 9, 2
+ drum_note 6, 4
+ drum_note 9, 2
+ drum_note 10, 2
sound_loop 0, Music_Lighthouse_branch_ee6b1
--- a/audio/music/lookbeauty.asm
+++ b/audio/music/lookbeauty.asm
@@ -296,7 +296,7 @@
Music_LookBeauty_Ch4:
toggle_noise 3
- dspeed 12
+ drum_speed 12
rest 16
rest 16
Music_LookBeauty_branch_eef91:
@@ -307,21 +307,21 @@
sound_loop 0, Music_LookBeauty_branch_eef91
Music_LookBeauty_branch_eefa1:
- dnote 7, 2
- dnote 8, 2
- dnote 3, 2
- dnote 8, 2
- dnote 8, 2
- dnote 3, 2
- dnote 8, 2
- dnote 8, 2
- dnote 7, 2
- dnote 3, 2
- dnote 8, 2
- dnote 3, 2
- dnote 8, 2
- dnote 8, 2
- dnote 3, 2
- dnote 8, 2
+ drum_note 7, 2
+ drum_note 8, 2
+ drum_note 3, 2
+ drum_note 8, 2
+ drum_note 8, 2
+ drum_note 3, 2
+ drum_note 8, 2
+ drum_note 8, 2
+ drum_note 7, 2
+ drum_note 3, 2
+ drum_note 8, 2
+ drum_note 3, 2
+ drum_note 8, 2
+ drum_note 8, 2
+ drum_note 3, 2
+ drum_note 8, 2
sound_ret
--- a/audio/music/lookhiker.asm
+++ b/audio/music/lookhiker.asm
@@ -104,13 +104,13 @@
Music_LookHiker_Ch4:
toggle_noise 3
- dspeed 12
- dnote 6, 4
+ drum_speed 12
+ drum_note 6, 4
rest 16
Music_LookHiker_branch_f749a:
- dnote 4, 2
- dnote 8, 2
- dnote 3, 2
- dnote 8, 2
+ drum_note 4, 2
+ drum_note 8, 2
+ drum_note 3, 2
+ drum_note 8, 2
sound_loop 0, Music_LookHiker_branch_f749a
--- a/audio/music/looklass.asm
+++ b/audio/music/looklass.asm
@@ -100,17 +100,17 @@
Music_LookLass_Ch4:
toggle_noise 4
- dspeed 12
- dnote 1, 16
+ drum_speed 12
+ drum_note 1, 16
Music_LookLass_branch_ed81f:
- dspeed 6
- dnote 3, 8
- dnote 2, 8
- dnote 2, 8
- dnote 2, 4
- dnote 3, 1
- dnote 2, 1
- dnote 2, 1
- dnote 2, 1
+ drum_speed 6
+ drum_note 3, 8
+ drum_note 2, 8
+ drum_note 2, 8
+ drum_note 2, 4
+ drum_note 3, 1
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 2, 1
sound_loop 0, Music_LookLass_branch_ed81f
--- a/audio/music/lookmysticalman.asm
+++ b/audio/music/lookmysticalman.asm
@@ -535,12 +535,12 @@
Music_LookMysticalMan_Ch4:
toggle_noise 3
- dspeed 12
- dnote 4, 2
- dnote 4, 2
- dnote 3, 2
- dnote 3, 1
- dnote 3, 1
+ drum_speed 12
+ drum_note 4, 2
+ drum_note 4, 2
+ drum_note 3, 2
+ drum_note 3, 1
+ drum_note 3, 1
Music_LookMysticalMan_branch_178697:
sound_call Music_LookMysticalMan_branch_1786d3
sound_call Music_LookMysticalMan_branch_1786d9
@@ -550,61 +550,61 @@
sound_call Music_LookMysticalMan_branch_1786d3
sound_call Music_LookMysticalMan_branch_1786d9
sound_call Music_LookMysticalMan_branch_1786d3
- dnote 3, 2
- dnote 4, 2
- dnote 3, 2
- dnote 4, 1
- dnote 3, 1
- dnote 3, 2
- dnote 4, 2
- dnote 3, 2
- dnote 3, 1
- dnote 3, 1
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 3, 2
+ drum_note 4, 1
+ drum_note 3, 1
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 3, 2
+ drum_note 3, 1
+ drum_note 3, 1
Music_LookMysticalMan_branch_1786ba:
- dnote 3, 2
- dnote 4, 2
- dnote 3, 3
- dnote 4, 1
- dnote 4, 2
- dnote 4, 2
- dnote 3, 2
- dnote 4, 2
- dnote 3, 2
- dnote 4, 2
- dnote 3, 3
- dnote 4, 1
- dnote 4, 2
- dnote 3, 2
- dnote 3, 2
- dnote 3, 1
- dnote 3, 1
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 3, 3
+ drum_note 4, 1
+ drum_note 4, 2
+ drum_note 4, 2
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 3, 3
+ drum_note 4, 1
+ drum_note 4, 2
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 3, 1
+ drum_note 3, 1
sound_loop 2, Music_LookMysticalMan_branch_1786ba
sound_loop 0, Music_LookMysticalMan_branch_178697
Music_LookMysticalMan_branch_1786d3:
- dnote 4, 4
- dnote 3, 3
- dnote 4, 3
- dnote 4, 2
- dnote 3, 4
+ drum_note 4, 4
+ drum_note 3, 3
+ drum_note 4, 3
+ drum_note 4, 2
+ drum_note 3, 4
sound_ret
Music_LookMysticalMan_branch_1786d9:
- dnote 4, 4
- dnote 3, 3
- dnote 3, 3
- dnote 4, 2
- dnote 3, 4
+ drum_note 4, 4
+ drum_note 3, 3
+ drum_note 3, 3
+ drum_note 4, 2
+ drum_note 3, 4
sound_ret
Music_LookMysticalMan_branch_1786df:
- dnote 4, 4
- dnote 3, 2
- dnote 4, 1
- dnote 3, 3
- dnote 3, 2
- dnote 4, 2
- dnote 3, 1
- dnote 3, 1
+ drum_note 4, 4
+ drum_note 3, 2
+ drum_note 4, 1
+ drum_note 3, 3
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 3, 1
+ drum_note 3, 1
sound_ret
--- a/audio/music/lookrival.asm
+++ b/audio/music/lookrival.asm
@@ -324,31 +324,31 @@
Music_LookRival_Ch4:
stereo_panning 1, 0
toggle_noise 3
- dspeed 12
+ drum_speed 12
rest 8
rest 16
- dnote 4, 2
- dnote 3, 4
- dnote 3, 6
- dnote 3, 4
- dnote 4, 4
- dnote 4, 4
- dnote 3, 2
- dnote 3, 2
- dnote 3, 2
- dnote 3, 2
+ drum_note 4, 2
+ drum_note 3, 4
+ drum_note 3, 6
+ drum_note 3, 4
+ drum_note 4, 4
+ drum_note 4, 4
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 3, 2
Music_LookRival_branch_f5118:
Music_AfterTheRivalFight_branch_f5118:
- dnote 4, 4
- dnote 3, 2
- dnote 4, 4
- dnote 4, 2
- dnote 3, 4
- dnote 4, 4
- dnote 3, 2
- dnote 4, 4
- dnote 4, 2
- dnote 3, 2
- dnote 3, 2
+ drum_note 4, 4
+ drum_note 3, 2
+ drum_note 4, 4
+ drum_note 4, 2
+ drum_note 3, 4
+ drum_note 4, 4
+ drum_note 3, 2
+ drum_note 4, 4
+ drum_note 4, 2
+ drum_note 3, 2
+ drum_note 3, 2
sound_loop 0, Music_LookRival_branch_f5118
--- a/audio/music/lookrocket.asm
+++ b/audio/music/lookrocket.asm
@@ -359,7 +359,7 @@
Music_LookRocket_Ch4:
toggle_noise 3
- dspeed 12
+ drum_speed 12
rest 2
sound_call Music_LookRocket_branch_f765c
Music_LookRocket_branch_f7640:
@@ -375,24 +375,24 @@
Music_LookRocket_branch_f765c:
Music_RocketTheme_branch_f765c:
- dnote 1, 8
- dnote 3, 2
- dnote 4, 2
- dnote 2, 1
- dnote 2, 1
- dnote 3, 1
- dnote 3, 1
+ drum_note 1, 8
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 3, 1
+ drum_note 3, 1
sound_ret
Music_LookRocket_branch_f7664:
Music_RocketTheme_branch_f7664:
- 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_ret
--- a/audio/music/magnettrain.asm
+++ b/audio/music/magnettrain.asm
@@ -225,59 +225,59 @@
Music_MagnetTrain_Ch4:
toggle_noise 3
- dspeed 12
- dnote 12, 12
- dnote 3, 2
- dnote 11, 1
- dnote 11, 1
- dspeed 6
- dnote 4, 4
- dnote 7, 4
- dnote 4, 4
- dnote 7, 4
- dnote 11, 4
- dnote 7, 4
- dnote 11, 4
- dnote 3, 2
- dnote 3, 2
+ drum_speed 12
+ drum_note 12, 12
+ drum_note 3, 2
+ drum_note 11, 1
+ drum_note 11, 1
+ drum_speed 6
+ drum_note 4, 4
+ drum_note 7, 4
+ drum_note 4, 4
+ drum_note 7, 4
+ drum_note 11, 4
+ drum_note 7, 4
+ drum_note 11, 4
+ drum_note 3, 2
+ drum_note 3, 2
sound_call Music_MagnetTrain_branch_ef71e
sound_call Music_MagnetTrain_branch_ef71e
- dspeed 12
- dnote 12, 16
+ drum_speed 12
+ drum_note 12, 16
sound_ret
; unused
Music_MagnetTrain_branch_ef711:
- dnote 9, 1
- dnote 8, 1
- dnote 8, 1
- dnote 9, 1
- dnote 8, 1
- dnote 8, 1
- dnote 9, 1
- dnote 8, 1
- dnote 8, 1
- dnote 9, 1
- dnote 8, 1
- dnote 8, 1
+ drum_note 9, 1
+ drum_note 8, 1
+ drum_note 8, 1
+ drum_note 9, 1
+ drum_note 8, 1
+ drum_note 8, 1
+ drum_note 9, 1
+ drum_note 8, 1
+ drum_note 8, 1
+ drum_note 9, 1
+ drum_note 8, 1
+ drum_note 8, 1
sound_ret
Music_MagnetTrain_branch_ef71e:
- dnote 9, 2
- dnote 8, 2
- dnote 8, 2
- dnote 8, 2
- dnote 9, 2
- dnote 8, 2
- dnote 8, 2
- dnote 8, 2
- dnote 9, 2
- dnote 8, 2
- dnote 8, 2
- dnote 8, 2
- dnote 9, 2
- dnote 8, 2
- dnote 8, 2
- dnote 8, 2
+ drum_note 9, 2
+ drum_note 8, 2
+ drum_note 8, 2
+ drum_note 8, 2
+ drum_note 9, 2
+ drum_note 8, 2
+ drum_note 8, 2
+ drum_note 8, 2
+ drum_note 9, 2
+ drum_note 8, 2
+ drum_note 8, 2
+ drum_note 8, 2
+ drum_note 9, 2
+ drum_note 8, 2
+ drum_note 8, 2
+ drum_note 8, 2
sound_ret
--- a/audio/music/mainmenu.asm
+++ b/audio/music/mainmenu.asm
@@ -114,31 +114,31 @@
Music_MainMenu_Ch4:
stereo_panning 0, 1
toggle_noise 3
- dspeed 12
+ drum_speed 12
rest 8
rest 16
rest 16
rest 16
rest 12
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
Music_MainMenu_branch_f79a5:
- dnote 3, 6
- dnote 3, 1
- dnote 3, 1
- dnote 3, 2
- dnote 3, 2
- dnote 3, 4
- dnote 3, 6
- dnote 3, 1
- dnote 3, 1
- dnote 3, 2
- dnote 3, 2
- dnote 4, 1
- dnote 4, 1
- dnote 3, 1
- dnote 3, 1
+ drum_note 3, 6
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 3, 4
+ drum_note 3, 6
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 4, 1
+ drum_note 4, 1
+ drum_note 3, 1
+ drum_note 3, 1
sound_loop 0, Music_MainMenu_branch_f79a5
--- a/audio/music/mobileadapter.asm
+++ b/audio/music/mobileadapter.asm
@@ -607,52 +607,52 @@
Music_MobileAdapter_Ch4:
toggle_noise 3
stereo_panning 1, 0
- dspeed 12
+ drum_speed 12
rest 2
rest 10
- 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
Music_MobileAdapter_branch_1ff38:
sound_call Music_MobileAdapter_branch_1ff60
sound_call Music_MobileAdapter_branch_1ff60
Music_MobileAdapter_branch_1ff3e:
rest 4
- dnote 3, 8
- dnote 3, 8
- dnote 3, 4
- dnote 3, 1
- dnote 3, 3
- dnote 3, 4
+ drum_note 3, 8
+ drum_note 3, 8
+ drum_note 3, 4
+ drum_note 3, 1
+ drum_note 3, 3
+ drum_note 3, 4
sound_loop 2, Music_MobileAdapter_branch_1ff3e
Music_MobileAdapter_branch_1ff49:
rest 4
- dnote 3, 4
+ drum_note 3, 4
sound_loop 11, Music_MobileAdapter_branch_1ff49
rest 2
- 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
rest 4
- dnote 3, 8
- dnote 3, 8
- dnote 3, 6
- dnote 3, 2
- dnote 3, 2
- dnote 3, 1
- dnote 3, 1
+ drum_note 3, 8
+ drum_note 3, 8
+ drum_note 3, 6
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 3, 1
+ drum_note 3, 1
sound_loop 0, Music_MobileAdapter_branch_1ff38
Music_MobileAdapter_branch_1ff60:
rest 4
- dnote 3, 4
+ drum_note 3, 4
sound_loop 7, Music_MobileAdapter_branch_1ff60
rest 2
- 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_ret
--- a/audio/music/mobilecenter.asm
+++ b/audio/music/mobilecenter.asm
@@ -454,32 +454,32 @@
Music_MobileCenter_Ch4:
toggle_noise 3
stereo_panning 0, 1
- dspeed 12
- dnote 10, 8
- dnote 10, 4
- dnote 2, 1
- dnote 2, 1
- dnote 2, 1
- dnote 2, 1
+ drum_speed 12
+ drum_note 10, 8
+ drum_note 10, 4
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 2, 1
Music_MobileCenter_branch_179813:
- dnote 10, 2
- dnote 2, 2
- dnote 2, 2
- dnote 2, 2
- dnote 10, 2
- dnote 2, 2
- dnote 3, 2
- dnote 2, 2
+ drum_note 10, 2
+ drum_note 2, 2
+ drum_note 2, 2
+ drum_note 2, 2
+ drum_note 10, 2
+ drum_note 2, 2
+ drum_note 3, 2
+ drum_note 2, 2
sound_loop 3, Music_MobileCenter_branch_179813
- 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
+ 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
sound_loop 0, Music_MobileCenter_branch_179813
--- a/audio/music/mom.asm
+++ b/audio/music/mom.asm
@@ -79,32 +79,32 @@
Music_Mom_Ch4:
toggle_noise 3
- dspeed 12
+ drum_speed 12
rest 6
Music_Mom_branch_f6c56:
- dnote 4, 1
+ drum_note 4, 1
rest 1
- dnote 7, 2
- dnote 3, 1
+ drum_note 7, 2
+ drum_note 3, 1
rest 1
- dnote 8, 1
+ drum_note 8, 1
rest 1
- dnote 8, 1
+ drum_note 8, 1
rest 1
- dnote 7, 4
- dnote 3, 1
+ drum_note 7, 4
+ drum_note 3, 1
rest 1
- dnote 4, 1
+ drum_note 4, 1
rest 1
- dnote 7, 4
- dnote 3, 1
+ drum_note 7, 4
+ drum_note 3, 1
rest 1
- dnote 8, 1
+ drum_note 8, 1
rest 1
- dnote 8, 1
+ drum_note 8, 1
rest 1
- dnote 3, 2
- dnote 4, 1
+ drum_note 3, 2
+ drum_note 4, 1
rest 1
sound_loop 0, Music_Mom_branch_f6c56
--- a/audio/music/mtmoon.asm
+++ b/audio/music/mtmoon.asm
@@ -120,20 +120,20 @@
Music_MtMoon_Ch4:
toggle_noise 5
- dspeed 12
+ drum_speed 12
Music_MtMoon_branch_edbc3:
stereo_panning 0, 1
- dnote 11, 4
- dnote 11, 8
- dnote 11, 4
+ drum_note 11, 4
+ drum_note 11, 8
+ drum_note 11, 4
stereo_panning 1, 0
- dnote 11, 4
- dnote 11, 4
- dnote 11, 4
+ drum_note 11, 4
+ drum_note 11, 4
+ drum_note 11, 4
stereo_panning 0, 1
- dnote 11, 4
- dnote 11, 4
+ drum_note 11, 4
+ drum_note 11, 4
stereo_panning 1, 0
- dnote 11, 8
+ drum_note 11, 8
sound_loop 0, Music_MtMoon_branch_edbc3
--- a/audio/music/nationalpark.asm
+++ b/audio/music/nationalpark.asm
@@ -618,42 +618,42 @@
Music_NationalPark_Ch4:
toggle_noise 3
- dspeed 12
+ drum_speed 12
rest 2
Music_NationalPark_branch_f57bd:
rest 16
sound_loop 23, Music_NationalPark_branch_f57bd
rest 8
- dnote 11, 2
- dnote 3, 2
- dnote 11, 1
- dnote 3, 1
- dnote 12, 2
+ drum_note 11, 2
+ drum_note 3, 2
+ drum_note 11, 1
+ drum_note 3, 1
+ drum_note 12, 2
Music_NationalPark_branch_f57c8:
- 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 12, 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 12, 2
sound_loop 7, Music_NationalPark_branch_f57c8
- dnote 11, 2
- dnote 8, 1
- dnote 8, 1
- dnote 3, 2
- dnote 8, 1
- dnote 8, 1
- dnote 11, 2
- dnote 4, 1
- dnote 4, 1
- dnote 3, 1
- dnote 3, 1
- dnote 11, 1
- dnote 4, 1
+ 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 4, 1
+ drum_note 4, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 11, 1
+ drum_note 4, 1
sound_loop 0, Music_NationalPark_branch_f57bd
--- a/audio/music/pokemoncenter.asm
+++ b/audio/music/pokemoncenter.asm
@@ -394,13 +394,13 @@
Music_PokemonCenter_Ch4:
toggle_noise 3
- dspeed 12
+ drum_speed 12
stereo_panning 1, 1
Music_PokemonCenter_branch_ed792:
- dnote 8, 6
- dnote 8, 4
- dnote 8, 2
- dnote 8, 2
- dnote 8, 2
+ drum_note 8, 6
+ drum_note 8, 4
+ drum_note 8, 2
+ drum_note 8, 2
+ drum_note 8, 2
sound_loop 0, Music_PokemonCenter_branch_ed792
--- a/audio/music/pokemonchannel.asm
+++ b/audio/music/pokemonchannel.asm
@@ -203,31 +203,31 @@
Music_PokemonChannel_Ch4:
toggle_noise 3
- dspeed 12
+ drum_speed 12
Music_PokemonChannel_branch_ee54d:
- dnote 11, 3
- dnote 11, 1
- dnote 3, 2
- dnote 1, 4
- dnote 3, 2
- dnote 3, 2
- dnote 11, 1
- dnote 3, 1
+ drum_note 11, 3
+ drum_note 11, 1
+ drum_note 3, 2
+ drum_note 1, 4
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 11, 1
+ drum_note 3, 1
sound_loop 2, Music_PokemonChannel_branch_ee54d
- dnote 9, 2
- dnote 11, 2
- dnote 9, 1
- dnote 9, 1
- dnote 9, 1
- dnote 9, 1
- dnote 1, 4
- dnote 9, 1
- dnote 9, 1
- dnote 9, 1
- dnote 9, 1
- dnote 12, 4
- dnote 3, 4
- dnote 11, 4
- dnote 11, 4
+ drum_note 9, 2
+ drum_note 11, 2
+ drum_note 9, 1
+ drum_note 9, 1
+ drum_note 9, 1
+ drum_note 9, 1
+ drum_note 1, 4
+ drum_note 9, 1
+ drum_note 9, 1
+ drum_note 9, 1
+ drum_note 9, 1
+ drum_note 12, 4
+ drum_note 3, 4
+ drum_note 11, 4
+ drum_note 11, 4
sound_ret
--- a/audio/music/pokemonmarch.asm
+++ b/audio/music/pokemonmarch.asm
@@ -397,22 +397,22 @@
Music_PokemonMarch_Ch4:
stereo_panning 1, 0
toggle_noise 5
- dspeed 8
+ drum_speed 8
sound_call Music_PokemonMarch_branch_f704c
Music_PokemonMarch_branch_f7003:
sound_call Music_PokemonMarch_branch_f7042
- dnote 1, 4
- dnote 1, 2
- dnote 1, 4
- dnote 1, 2
- dnote 1, 4
- dnote 1, 5
- dspeed 6
- dnote 3, 1
- dnote 3, 1
- dnote 2, 1
- dnote 2, 1
- dspeed 8
+ drum_note 1, 4
+ drum_note 1, 2
+ drum_note 1, 4
+ drum_note 1, 2
+ drum_note 1, 4
+ drum_note 1, 5
+ drum_speed 6
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_speed 8
sound_call Music_PokemonMarch_branch_f7042
sound_call Music_PokemonMarch_branch_f704c
sound_call Music_PokemonMarch_branch_f7042
@@ -421,41 +421,41 @@
sound_call Music_PokemonMarch_branch_f704c
sound_call Music_PokemonMarch_branch_f7042
sound_call Music_PokemonMarch_branch_f704c
- dnote 2, 4
- dnote 2, 2
- dnote 2, 4
- dnote 2, 2
- dnote 2, 6
- dnote 1, 2
- dspeed 4
+ drum_note 2, 4
+ drum_note 2, 2
+ drum_note 2, 4
+ drum_note 2, 2
+ drum_note 2, 6
+ drum_note 1, 2
+ drum_speed 4
rest 5
- dspeed 6
- dnote 3, 1
- dnote 3, 1
- dspeed 8
+ drum_speed 6
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_speed 8
sound_call Music_PokemonMarch_branch_f704c
sound_loop 0, Music_PokemonMarch_branch_f7003
Music_PokemonMarch_branch_f7042:
- dnote 1, 4
- dnote 1, 2
- dnote 1, 4
- dnote 1, 2
- dnote 1, 4
- dnote 3, 2
- dnote 3, 2
- dnote 2, 2
- dnote 2, 2
+ drum_note 1, 4
+ drum_note 1, 2
+ drum_note 1, 4
+ drum_note 1, 2
+ drum_note 1, 4
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 2, 2
+ drum_note 2, 2
sound_ret
Music_PokemonMarch_branch_f704c:
- dnote 1, 4
- dnote 1, 2
- dnote 1, 4
- dnote 1, 4
- dnote 1, 4
- dnote 2, 2
- dnote 3, 2
- dnote 2, 2
+ drum_note 1, 4
+ drum_note 1, 2
+ drum_note 1, 4
+ drum_note 1, 4
+ drum_note 1, 4
+ drum_note 2, 2
+ drum_note 3, 2
+ drum_note 2, 2
sound_ret
--- a/audio/music/rockethideout.asm
+++ b/audio/music/rockethideout.asm
@@ -275,35 +275,35 @@
Music_RocketHideout_Ch4:
toggle_noise 0
- dspeed 12
+ drum_speed 12
stereo_panning 0, 1
rest 16
rest 16
- dnote 3, 1
- dnote 3, 1
- dnote 4, 1
- dnote 4, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 4, 1
+ drum_note 4, 1
sound_call Music_RocketHideout_branch_eecdb
Music_RocketHideout_branch_eecc7:
sound_call Music_RocketHideout_branch_eecdb
- dnote 5, 4
+ drum_note 5, 4
sound_call Music_RocketHideout_branch_eecdb
- dnote 6, 4
+ drum_note 6, 4
sound_call Music_RocketHideout_branch_eecdb
- dnote 11, 4
+ drum_note 11, 4
sound_call Music_RocketHideout_branch_eecdb
- dnote 7, 4
+ drum_note 7, 4
sound_loop 0, Music_RocketHideout_branch_eecc7
Music_RocketHideout_branch_eecdb:
stereo_panning 1, 0
- dnote 4, 1
- dnote 4, 1
+ drum_note 4, 1
+ drum_note 4, 1
stereo_panning 0, 1
- dnote 10, 4
- dnote 4, 1
- dnote 4, 1
+ drum_note 10, 4
+ drum_note 4, 1
+ drum_note 4, 1
stereo_panning 1, 0
- dnote 10, 4
+ drum_note 10, 4
sound_ret
--- a/audio/music/rockettheme.asm
+++ b/audio/music/rockettheme.asm
@@ -445,7 +445,7 @@
Music_RocketTheme_Ch4:
toggle_noise 3
- dspeed 12
+ drum_speed 12
rest 2
Music_RocketTheme_branch_f78c3:
sound_call Music_RocketTheme_branch_f765c
@@ -458,14 +458,14 @@
sound_call Music_RocketTheme_branch_f7664
sound_call Music_RocketTheme_branch_f765c
Music_RocketTheme_branch_f78de:
- 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 11, Music_RocketTheme_branch_f78de
sound_call Music_RocketTheme_branch_f7664
sound_call Music_RocketTheme_branch_f7664
--- a/audio/music/route12.asm
+++ b/audio/music/route12.asm
@@ -392,61 +392,61 @@
Music_Route12_Ch4:
toggle_noise 4
stereo_panning 1, 0
- dspeed 12
- dnote 12, 10
- dnote 2, 1
- dnote 2, 1
- dnote 3, 4
- dnote 12, 6
- dnote 2, 1
- dnote 2, 1
- dnote 3, 4
- dspeed 6
+ drum_speed 12
+ drum_note 12, 10
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 3, 4
+ drum_note 12, 6
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 3, 4
+ drum_speed 6
sound_call Music_Route12_branch_ec717
Music_Route12_branch_ec6e1:
- dnote 3, 4
- dnote 3, 8
- dnote 2, 2
- dnote 2, 2
- dnote 3, 8
+ drum_note 3, 4
+ drum_note 3, 8
+ drum_note 2, 2
+ drum_note 2, 2
+ drum_note 3, 8
sound_call Music_Route12_branch_ec717
sound_loop 8, Music_Route12_branch_ec6e1
Music_Route12_branch_ec6ed:
- dspeed 12
- dnote 12, 10
- dnote 3, 1
- dnote 3, 1
- dnote 3, 6
- dnote 2, 1
- dnote 2, 1
- dnote 3, 6
- dnote 2, 1
- dnote 2, 1
- dnote 3, 4
+ drum_speed 12
+ drum_note 12, 10
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 6
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 3, 6
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 3, 4
sound_loop 2, Music_Route12_branch_ec6ed
- dnote 12, 16
- dspeed 6
+ drum_note 12, 16
+ drum_speed 6
sound_call Music_Route12_branch_ec717
sound_call Music_Route12_branch_ec717
- dnote 12, 16
+ drum_note 12, 16
Music_Route12_branch_ec707:
- dnote 3, 4
- dnote 3, 8
- dnote 2, 2
- dnote 2, 2
- dnote 3, 8
+ drum_note 3, 4
+ drum_note 3, 8
+ drum_note 2, 2
+ drum_note 2, 2
+ drum_note 3, 8
sound_call Music_Route12_branch_ec717
sound_loop 2, Music_Route12_branch_ec707
sound_loop 0, Music_Route12_branch_ec6e1
Music_Route12_branch_ec717:
- 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 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_ret
--- a/audio/music/route2.asm
+++ b/audio/music/route2.asm
@@ -452,65 +452,65 @@
Music_Route2_Ch4:
toggle_noise 5
- dspeed 12
+ drum_speed 12
Music_Route2_branch_edae0:
- dnote 10, 4
- dnote 10, 4
- dnote 10, 2
- dnote 12, 2
- dnote 10, 2
- dnote 12, 2
+ drum_note 10, 4
+ drum_note 10, 4
+ drum_note 10, 2
+ drum_note 12, 2
+ drum_note 10, 2
+ drum_note 12, 2
sound_loop 3, Music_Route2_branch_edae0
- dnote 10, 4
- dnote 10, 4
- dnote 10, 2
- dnote 10, 2
- dnote 4, 4
+ drum_note 10, 4
+ drum_note 10, 4
+ drum_note 10, 2
+ drum_note 10, 2
+ drum_note 4, 4
Music_Route2_branch_edaef:
- dnote 10, 4
- dnote 10, 4
- dnote 10, 2
- dnote 10, 2
- dnote 12, 2
- dnote 10, 2
+ drum_note 10, 4
+ drum_note 10, 4
+ drum_note 10, 2
+ drum_note 10, 2
+ drum_note 12, 2
+ drum_note 10, 2
sound_loop 4, Music_Route2_branch_edaef
Music_Route2_branch_edaf9:
- dnote 12, 4
- dnote 10, 2
- dnote 12, 2
- dnote 10, 2
- dnote 12, 2
- dnote 10, 2
- dnote 12, 2
+ drum_note 12, 4
+ drum_note 10, 2
+ drum_note 12, 2
+ drum_note 10, 2
+ drum_note 12, 2
+ drum_note 10, 2
+ drum_note 12, 2
sound_loop 7, Music_Route2_branch_edaf9
- dnote 12, 4
- dnote 10, 4
- dnote 10, 2
- dnote 10, 2
- dnote 4, 4
+ drum_note 12, 4
+ drum_note 10, 4
+ drum_note 10, 2
+ drum_note 10, 2
+ drum_note 4, 4
Music_Route2_branch_edb09:
- dnote 12, 4
- dnote 1, 4
- dnote 12, 2
- dnote 12, 2
- dnote 1, 4
+ drum_note 12, 4
+ drum_note 1, 4
+ drum_note 12, 2
+ drum_note 12, 2
+ drum_note 1, 4
sound_loop 3, Music_Route2_branch_edb09
- dnote 12, 4
- dnote 1, 4
- dnote 2, 2
- dnote 1, 2
- dnote 2, 4
+ drum_note 12, 4
+ drum_note 1, 4
+ drum_note 2, 2
+ drum_note 1, 2
+ drum_note 2, 4
Music_Route2_branch_edb17:
- dnote 12, 4
- dnote 1, 4
- dnote 12, 2
- dnote 12, 2
- dnote 1, 4
+ drum_note 12, 4
+ drum_note 1, 4
+ drum_note 12, 2
+ drum_note 12, 2
+ drum_note 1, 4
sound_loop 3, Music_Route2_branch_edb17
- dnote 12, 4
- dnote 1, 4
- dnote 3, 2
- dnote 3, 2
- dnote 4, 4
+ drum_note 12, 4
+ drum_note 1, 4
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 4, 4
sound_loop 0, Music_Route2_branch_edaef
--- a/audio/music/route26.asm
+++ b/audio/music/route26.asm
@@ -549,119 +549,119 @@
Music_Route26_Ch4:
toggle_noise 4
- dspeed 12
+ drum_speed 12
Music_Route26_branch_ef23c:
- dnote 12, 6
- dnote 3, 1
- dnote 3, 1
+ drum_note 12, 6
+ drum_note 3, 1
+ drum_note 3, 1
sound_loop 3, Music_Route26_branch_ef23c
sound_call Music_Route26_branch_ef2b0
Music_Route26_branch_ef246:
- dspeed 6
+ drum_speed 6
sound_call Music_Route26_branch_ef29a
sound_call Music_Route26_branch_ef29a
sound_call Music_Route26_branch_ef2a8
- dnote 3, 12
- dnote 3, 2
- dnote 3, 2
- dspeed 8
- dnote 3, 2
- dnote 2, 2
- dnote 2, 2
- dnote 3, 2
- dnote 3, 2
- dnote 5, 2
- dspeed 6
+ drum_note 3, 12
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_speed 8
+ drum_note 3, 2
+ drum_note 2, 2
+ drum_note 2, 2
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 5, 2
+ drum_speed 6
sound_call Music_Route26_branch_ef29a
sound_call Music_Route26_branch_ef29a
- dspeed 8
+ drum_speed 8
Music_Route26_branch_ef266:
- dnote 3, 2
- dnote 3, 2
- dnote 3, 2
- dnote 12, 6
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 12, 6
sound_loop 4, Music_Route26_branch_ef266
- dspeed 6
+ drum_speed 6
sound_call Music_Route26_branch_ef2a8
sound_call Music_Route26_branch_ef2a8
sound_call Music_Route26_branch_ef29a
sound_call Music_Route26_branch_ef2a8
Music_Route26_branch_ef27c:
- dspeed 6
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
- dspeed 8
- dnote 3, 2
- dnote 3, 2
- dnote 3, 2
- dnote 12, 12
+ drum_speed 6
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_speed 8
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 12, 12
sound_loop 2, Music_Route26_branch_ef27c
- dspeed 12
- dnote 12, 16
+ drum_speed 12
+ drum_note 12, 16
sound_call Music_Route26_branch_ef2b0
sound_loop 0, Music_Route26_branch_ef246
Music_Route26_branch_ef29a:
- dnote 5, 12
- dnote 3, 2
- dnote 3, 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 5, 12
+ drum_note 3, 2
+ drum_note 3, 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_ret
Music_Route26_branch_ef2a8:
- dnote 5, 12
- dnote 3, 2
- dnote 3, 2
- dnote 3, 4
- dnote 3, 4
- dnote 5, 4
- dnote 3, 4
+ drum_note 5, 12
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 3, 4
+ drum_note 3, 4
+ drum_note 5, 4
+ drum_note 3, 4
sound_ret
Music_Route26_branch_ef2b0:
- 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 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
- dspeed 8
- dnote 3, 2
- dnote 3, 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 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_speed 8
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 5, 2
sound_ret
--- a/audio/music/route29.asm
+++ b/audio/music/route29.asm
@@ -504,19 +504,19 @@
Music_Route29_Ch4:
stereo_panning 0, 1
toggle_noise 0
- dspeed 12
+ drum_speed 12
rest 2
Music_Route29_branch_f05b0:
rest 2
- dnote 6, 2
- dnote 6, 6
- dnote 6, 2
- dnote 6, 2
- dnote 6, 2
+ drum_note 6, 2
+ drum_note 6, 6
+ drum_note 6, 2
+ drum_note 6, 2
+ drum_note 6, 2
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_Route29_branch_f05b0
--- a/audio/music/route3.asm
+++ b/audio/music/route3.asm
@@ -480,24 +480,24 @@
Music_Route3_Ch4:
toggle_noise 4
- dspeed 12
+ drum_speed 12
rest 10
Music_Route3_branch_ec4f0:
- dspeed 12
- dnote 3, 2
- dnote 3, 4
- dnote 3, 1
- dnote 3, 1
- dnote 3, 2
- dnote 3, 2
- 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
+ drum_speed 12
+ 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_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
sound_loop 0, Music_Route3_branch_ec4f0
--- a/audio/music/route30.asm
+++ b/audio/music/route30.asm
@@ -578,7 +578,7 @@
Music_Route30_Ch4:
toggle_noise 3
- dspeed 12
+ drum_speed 12
sound_call Music_Route30_branch_efeb8
sound_call Music_Route30_branch_efec1
Music_Route30_branch_efe84:
@@ -601,71 +601,71 @@
sound_loop 0, Music_Route30_branch_efe84
Music_Route30_branch_efeb8:
- dnote 3, 2
- dnote 7, 2
- dnote 7, 2
- dnote 3, 1
- dnote 3, 1
- dnote 3, 2
- dnote 3, 2
- dnote 3, 4
+ drum_note 3, 2
+ drum_note 7, 2
+ drum_note 7, 2
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 3, 4
sound_ret
Music_Route30_branch_efec1:
- dnote 3, 2
- dnote 7, 2
- dnote 7, 2
- dnote 3, 1
- dnote 3, 1
- dnote 3, 2
- dnote 3, 2
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
+ drum_note 3, 2
+ drum_note 7, 2
+ drum_note 7, 2
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
sound_ret
Music_Route30_branch_efecd:
- dnote 3, 2
- dnote 7, 2
- dnote 7, 2
- dnote 3, 1
- dnote 3, 1
- dnote 3, 2
- dnote 3, 2
- dnote 3, 2
- dnote 3, 2
+ drum_note 3, 2
+ drum_note 7, 2
+ drum_note 7, 2
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 3, 2
sound_ret
Music_Route30_branch_efed7:
- dnote 3, 2
- dnote 7, 2
- dnote 7, 2
- dnote 3, 1
- dnote 3, 1
- dnote 3, 2
- dnote 7, 2
- dnote 3, 2
- dnote 3, 2
+ drum_note 3, 2
+ drum_note 7, 2
+ drum_note 7, 2
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 2
+ drum_note 7, 2
+ drum_note 3, 2
+ drum_note 3, 2
sound_ret
Music_Route30_branch_efee1:
- dnote 3, 2
- dnote 7, 2
- dnote 7, 2
- dnote 3, 1
- dnote 3, 1
- dnote 3, 2
- dnote 3, 2
- dspeed 6
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
- dspeed 12
+ drum_note 3, 2
+ drum_note 7, 2
+ drum_note 7, 2
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_speed 6
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_speed 12
sound_ret
--- a/audio/music/route36.asm
+++ b/audio/music/route36.asm
@@ -469,7 +469,7 @@
Music_Route36_Ch4:
toggle_noise 1
- dspeed 12
+ drum_speed 12
sound_call Music_Route36_branch_e9734
sound_call Music_Route36_branch_e9741
Music_Route36_branch_e9713:
@@ -479,44 +479,44 @@
sound_call Music_Route36_branch_e9741
sound_loop 2, Music_Route36_branch_e9713
Music_Route36_branch_e9723:
- dnote 11, 4
- dnote 10, 2
- dnote 6, 4
- dnote 12, 1
- dnote 12, 1
- dnote 10, 4
+ drum_note 11, 4
+ drum_note 10, 2
+ drum_note 6, 4
+ drum_note 12, 1
+ drum_note 12, 1
+ drum_note 10, 4
sound_loop 11, Music_Route36_branch_e9723
sound_call Music_Route36_branch_e9741
sound_loop 0, Music_Route36_branch_e9713
Music_Route36_branch_e9734:
- dnote 10, 4
- dnote 10, 6
- dnote 11, 1
- dnote 11, 1
- dnote 10, 2
- dnote 11, 2
+ drum_note 10, 4
+ drum_note 10, 6
+ drum_note 11, 1
+ drum_note 11, 1
+ drum_note 10, 2
+ drum_note 11, 2
sound_ret
Music_Route36_branch_e973b:
- dnote 10, 4
- dnote 10, 6
- dnote 12, 1
- dnote 11, 1
- dnote 10, 4
+ drum_note 10, 4
+ drum_note 10, 6
+ drum_note 12, 1
+ drum_note 11, 1
+ drum_note 10, 4
sound_ret
Music_Route36_branch_e9741:
- dnote 10, 4
- dnote 10, 6
- dnote 11, 1
- dnote 11, 1
- dnote 10, 2
- dspeed 6
- dnote 11, 1
- dnote 11, 1
- dnote 10, 1
- dnote 10, 1
- dspeed 12
+ drum_note 10, 4
+ drum_note 10, 6
+ drum_note 11, 1
+ drum_note 11, 1
+ drum_note 10, 2
+ drum_speed 6
+ drum_note 11, 1
+ drum_note 11, 1
+ drum_note 10, 1
+ drum_note 10, 1
+ drum_speed 12
sound_ret
--- a/audio/music/route37.asm
+++ b/audio/music/route37.asm
@@ -397,33 +397,33 @@
stereo_panning 0, 1
toggle_noise 0
Music_Route37_branch_eeb51:
- dspeed 12
+ drum_speed 12
sound_call Music_Route37_branch_eeb6b
- dnote 3, 1
- dnote 4, 1
- dnote 4, 1
- dnote 3, 1
+ drum_note 3, 1
+ drum_note 4, 1
+ drum_note 4, 1
+ drum_note 3, 1
sound_call Music_Route37_branch_eeb6b
- dspeed 6
- dnote 4, 1
- dnote 4, 1
- dnote 4, 1
- dnote 4, 1
- dnote 4, 1
- dnote 3, 1
- dnote 3, 1
- dnote 3, 1
+ drum_speed 6
+ drum_note 4, 1
+ drum_note 4, 1
+ drum_note 4, 1
+ drum_note 4, 1
+ drum_note 4, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 3, 1
sound_loop 0, Music_Route37_branch_eeb51
Music_Route37_branch_eeb6b:
- dnote 3, 2
- dnote 4, 1
- dnote 4, 1
- dnote 3, 2
- dnote 4, 1
- dnote 4, 1
- dnote 3, 2
- dnote 4, 1
- dnote 4, 1
+ drum_note 3, 2
+ 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 4, 1
+ drum_note 4, 1
sound_ret
--- a/audio/music/showmearound.asm
+++ b/audio/music/showmearound.asm
@@ -300,12 +300,12 @@
Music_ShowMeAround_Ch4:
toggle_noise 3
- dspeed 12
+ drum_speed 12
rest 16
rest 8
- dnote 3, 2
- dnote 4, 2
- dnote 7, 4
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 7, 4
Music_ShowMeAround_branch_edd39:
sound_call Music_ShowMeAround_branch_edd4f
sound_call Music_ShowMeAround_branch_edd4f
@@ -316,36 +316,36 @@
sound_loop 0, Music_ShowMeAround_branch_edd39
Music_ShowMeAround_branch_edd4f:
- dnote 4, 2
- dnote 7, 2
- dnote 3, 2
- dnote 8, 2
- dnote 8, 2
- dnote 7, 4
- dnote 3, 2
- dnote 4, 2
- dnote 7, 4
- dnote 3, 2
- dnote 8, 2
- dnote 8, 2
- dnote 3, 2
- dnote 4, 2
+ drum_note 4, 2
+ drum_note 7, 2
+ drum_note 3, 2
+ drum_note 8, 2
+ drum_note 8, 2
+ drum_note 7, 4
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 7, 4
+ drum_note 3, 2
+ drum_note 8, 2
+ drum_note 8, 2
+ drum_note 3, 2
+ drum_note 4, 2
sound_ret
Music_ShowMeAround_branch_edd5e:
- dnote 4, 2
- dnote 7, 2
- dnote 3, 2
- dnote 8, 2
- dnote 8, 2
- dnote 7, 4
- dnote 3, 2
- dnote 4, 2
- dnote 7, 4
- dnote 3, 2
- dnote 3, 2
- dnote 3, 2
- dnote 3, 2
- dnote 7, 2
+ drum_note 4, 2
+ drum_note 7, 2
+ drum_note 3, 2
+ drum_note 8, 2
+ drum_note 8, 2
+ drum_note 7, 4
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 7, 4
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 7, 2
sound_ret
--- a/audio/music/sprouttower.asm
+++ b/audio/music/sprouttower.asm
@@ -221,24 +221,24 @@
Music_SproutTower_Ch4:
toggle_noise 0
- dspeed 12
+ drum_speed 12
rest 4
Music_SproutTower_branch_f6a7f:
- dnote 7, 4
+ drum_note 7, 4
stereo_panning 1, 0
- dnote 4, 4
- dnote 7, 2
+ drum_note 4, 4
+ drum_note 7, 2
stereo_panning 0, 1
- dnote 4, 2
+ drum_note 4, 2
stereo_panning 1, 1
- dnote 7, 4
- dnote 7, 4
+ drum_note 7, 4
+ drum_note 7, 4
stereo_panning 0, 1
- dnote 4, 4
- dnote 7, 2
+ drum_note 4, 4
+ drum_note 7, 2
stereo_panning 1, 0
- dnote 4, 2
+ drum_note 4, 2
stereo_panning 1, 1
- dnote 7, 4
+ drum_note 7, 4
sound_loop 0, Music_SproutTower_branch_f6a7f
--- a/audio/music/ssaqua.asm
+++ b/audio/music/ssaqua.asm
@@ -1082,25 +1082,25 @@
Music_SSAqua_Ch4:
toggle_noise 3
- dspeed 12
+ drum_speed 12
rest 2
Music_SSAqua_branch_eb24e:
- 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 9, 1
- dnote 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 8, 1
+ drum_note 8, 1
+ drum_note 9, 1
+ drum_note 8, 1
sound_loop 12, Music_SSAqua_branch_eb24e
sound_call Music_SSAqua_branch_eb2ae
sound_call Music_SSAqua_branch_eb2ae
@@ -1129,45 +1129,45 @@
sound_loop 0, Music_SSAqua_branch_eb24e
Music_SSAqua_branch_eb2ae:
- 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 8, 1
- dnote 8, 1
+ 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 8, 1
+ drum_note 8, 1
sound_ret
Music_SSAqua_branch_eb2bb:
- 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_ret
Music_SSAqua_branch_eb2c7:
- dnote 11, 2
- dnote 8, 1
- dnote 8, 1
- dnote 3, 2
- dnote 8, 1
- dnote 8, 1
- dnote 3, 1
- dnote 3, 1
- dnote 3, 2
- dnote 3, 2
- dnote 1, 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 3, 1
+ drum_note 3, 1
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 1, 2
sound_ret
--- a/audio/music/tintower.asm
+++ b/audio/music/tintower.asm
@@ -261,33 +261,33 @@
Music_TinTower_Ch4:
toggle_noise 0
- dspeed 12
+ drum_speed 12
Music_TinTower_branch_f694c:
stereo_panning 0, 1
- dnote 8, 2
+ drum_note 8, 2
stereo_panning 1, 0
- dnote 8, 1
- dnote 8, 1
+ drum_note 8, 1
+ drum_note 8, 1
stereo_panning 0, 1
- dnote 8, 2
+ drum_note 8, 2
stereo_panning 1, 0
- dnote 6, 4
+ drum_note 6, 4
stereo_panning 0, 1
- dnote 8, 2
- dnote 8, 2
- dnote 6, 2
+ drum_note 8, 2
+ drum_note 8, 2
+ drum_note 6, 2
stereo_panning 1, 0
- dnote 8, 2
+ drum_note 8, 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 0, 1
- dnote 6, 4
+ drum_note 6, 4
stereo_panning 1, 0
- dnote 8, 2
- dnote 8, 2
- dnote 6, 2
+ drum_note 8, 2
+ drum_note 8, 2
+ drum_note 6, 2
sound_loop 0, Music_TinTower_branch_f694c
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -896,275 +896,275 @@
Music_TitleScreen_Ch4:
toggle_noise 5
stereo_panning 1, 0
- dspeed 12
+ drum_speed 12
rest 4
- dnote 1, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 1
- dnote 1, 1
- dnote 1, 6
- dnote 1, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 1
- dnote 1, 1
- dnote 1, 3
- dnote 1, 1
- dnote 1, 1
- dnote 1, 1
- dnote 1, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 1
- dnote 1, 1
- dnote 1, 4
- dnote 4, 2
- dnote 1, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 1
- dnote 1, 1
- dnote 1, 2
- dspeed 6
- dnote 3, 1
- dnote 3, 1
- dnote 2, 1
- dnote 2, 1
- dnote 2, 1
- dnote 2, 1
- dnote 1, 1
- dnote 1, 1
- dspeed 12
+ drum_note 1, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 6
+ drum_note 1, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 3
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 4
+ drum_note 4, 2
+ drum_note 1, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 2
+ drum_speed 6
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_speed 12
sound_call Music_TitleScreen_branch_ebd77
sound_call Music_TitleScreen_branch_ebd81
sound_call Music_TitleScreen_branch_ebd81
- dnote 1, 2
- dnote 4, 2
- dnote 1, 2
- dnote 4, 2
- dnote 4, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 2
- dspeed 6
- dnote 2, 1
- dnote 2, 1
- dnote 1, 1
- dnote 1, 1
- dspeed 12
+ drum_note 1, 2
+ drum_note 4, 2
+ drum_note 1, 2
+ drum_note 4, 2
+ drum_note 4, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 2
+ drum_speed 6
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_speed 12
sound_call Music_TitleScreen_branch_ebd77
- dnote 1, 2
- dnote 4, 2
- dnote 1, 2
- dnote 6, 2
- dnote 4, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 2
- dnote 1, 2
+ drum_note 1, 2
+ drum_note 4, 2
+ drum_note 1, 2
+ drum_note 6, 2
+ drum_note 4, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 2
+ drum_note 1, 2
sound_call Music_TitleScreen_branch_ebd81
- dnote 1, 2
- dnote 4, 2
- dnote 1, 2
- dnote 4, 2
- dnote 4, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 2
- dnote 1, 1
- dnote 1, 1
+ drum_note 1, 2
+ drum_note 4, 2
+ drum_note 1, 2
+ drum_note 4, 2
+ drum_note 4, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 2
+ drum_note 1, 1
+ drum_note 1, 1
sound_call Music_TitleScreen_branch_ebd77
sound_call Music_TitleScreen_branch_ebd81
sound_call Music_TitleScreen_branch_ebd81
- dnote 1, 2
- dnote 4, 2
- dnote 1, 2
- dnote 4, 2
- dnote 4, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 2
- dspeed 6
- dnote 2, 1
- dnote 3, 1
- dnote 3, 1
- dnote 2, 1
- dspeed 12
+ drum_note 1, 2
+ drum_note 4, 2
+ drum_note 1, 2
+ drum_note 4, 2
+ drum_note 4, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 2
+ drum_speed 6
+ drum_note 2, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 2, 1
+ drum_speed 12
sound_call Music_TitleScreen_branch_ebd77
sound_call Music_TitleScreen_branch_ebd81
- dnote 1, 2
- dnote 4, 2
- dnote 1, 2
- dnote 6, 2
- dnote 4, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 2
- dnote 4, 2
- dnote 1, 2
- dnote 4, 2
- dnote 4, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 2
- dspeed 6
- dnote 3, 1
- dnote 3, 1
- dnote 2, 1
- dnote 2, 1
- dspeed 12
- dnote 10, 2
- dnote 4, 4
- dnote 10, 4
- dnote 4, 2
- dnote 10, 4
- dnote 10, 2
- dnote 4, 4
- dnote 10, 4
- dnote 4, 2
- dnote 10, 2
- dnote 10, 2
- dnote 10, 2
- dnote 4, 4
- dnote 10, 4
- dnote 4, 2
- dnote 10, 4
- dnote 10, 4
- dnote 10, 4
- dnote 10, 2
- dnote 3, 1
- dnote 3, 1
- dnote 2, 1
- dnote 2, 1
- dnote 1, 1
- dnote 1, 1
+ drum_note 1, 2
+ drum_note 4, 2
+ drum_note 1, 2
+ drum_note 6, 2
+ drum_note 4, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 2
+ drum_note 4, 2
+ drum_note 1, 2
+ drum_note 4, 2
+ drum_note 4, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 2
+ drum_speed 6
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_speed 12
+ drum_note 10, 2
+ drum_note 4, 4
+ drum_note 10, 4
+ drum_note 4, 2
+ drum_note 10, 4
+ drum_note 10, 2
+ drum_note 4, 4
+ drum_note 10, 4
+ drum_note 4, 2
+ drum_note 10, 2
+ drum_note 10, 2
+ drum_note 10, 2
+ drum_note 4, 4
+ drum_note 10, 4
+ drum_note 4, 2
+ drum_note 10, 4
+ drum_note 10, 4
+ drum_note 10, 4
+ drum_note 10, 2
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 1, 1
+ drum_note 1, 1
sound_call Music_TitleScreen_branch_ebd8b
sound_call Music_TitleScreen_branch_ebd93
- dnote 2, 1
- dnote 3, 1
- dnote 3, 1
- dnote 2, 1
- dspeed 12
+ drum_note 2, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 2, 1
+ drum_speed 12
sound_call Music_TitleScreen_branch_ebd8b
sound_call Music_TitleScreen_branch_ebd93
- dnote 3, 1
- dnote 3, 1
- dnote 2, 1
- dnote 2, 1
- dspeed 12
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_speed 12
sound_call Music_TitleScreen_branch_ebd8b
sound_call Music_TitleScreen_branch_ebd93
- dnote 2, 1
- dnote 2, 1
- dnote 2, 1
- dnote 2, 1
- dspeed 12
- dnote 9, 16
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_speed 12
+ drum_note 9, 16
Music_TitleScreen_branch_ebd40:
rest 16
sound_loop 6, Music_TitleScreen_branch_ebd40
rest 12
- dspeed 6
- dnote 3, 1
- dnote 2, 1
- dnote 3, 1
- dnote 2, 1
- dnote 3, 1
- dnote 2, 1
- dnote 1, 1
- dnote 1, 1
- dspeed 12
- dnote 1, 4
- dnote 1, 6
- dnote 1, 1
- dnote 1, 1
- dnote 1, 4
- dnote 1, 4
- dnote 1, 6
- dnote 1, 1
- dnote 1, 1
- dnote 1, 4
- dnote 1, 4
- dnote 1, 6
- dnote 1, 1
- dnote 1, 1
- dnote 1, 4
- dnote 1, 4
- dnote 1, 4
- dspeed 8
- dnote 1, 2
- dnote 1, 2
- dnote 1, 2
- dspeed 6
- dnote 2, 1
- dnote 2, 1
- dnote 3, 1
- dnote 3, 1
- dnote 2, 1
- dnote 2, 1
- dnote 1, 1
- dnote 1, 1
- dspeed 12
- dnote 1, 4
- dnote 12, 4
+ drum_speed 6
+ drum_note 3, 1
+ drum_note 2, 1
+ drum_note 3, 1
+ drum_note 2, 1
+ drum_note 3, 1
+ drum_note 2, 1
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_speed 12
+ drum_note 1, 4
+ drum_note 1, 6
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 4
+ drum_note 1, 4
+ drum_note 1, 6
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 4
+ drum_note 1, 4
+ drum_note 1, 6
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 4
+ drum_note 1, 4
+ drum_note 1, 4
+ drum_speed 8
+ drum_note 1, 2
+ drum_note 1, 2
+ drum_note 1, 2
+ drum_speed 6
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 2, 1
+ drum_note 2, 1
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_speed 12
+ drum_note 1, 4
+ drum_note 12, 4
sound_ret
Music_TitleScreen_branch_ebd77:
- dnote 1, 2
- dnote 4, 2
- dnote 1, 2
- dnote 4, 2
- dnote 6, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 2
- dnote 4, 2
+ drum_note 1, 2
+ drum_note 4, 2
+ drum_note 1, 2
+ drum_note 4, 2
+ drum_note 6, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 2
+ drum_note 4, 2
sound_ret
Music_TitleScreen_branch_ebd81:
- dnote 1, 2
- dnote 4, 2
- dnote 1, 2
- dnote 6, 2
- dnote 4, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 2
- dnote 4, 2
+ drum_note 1, 2
+ drum_note 4, 2
+ drum_note 1, 2
+ drum_note 6, 2
+ drum_note 4, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 2
+ drum_note 4, 2
sound_ret
Music_TitleScreen_branch_ebd8b:
- dnote 1, 2
- dnote 1, 1
- dnote 1, 1
+ drum_note 1, 2
+ drum_note 1, 1
+ drum_note 1, 1
sound_loop 4, Music_TitleScreen_branch_ebd8b
sound_ret
Music_TitleScreen_branch_ebd93:
- dnote 1, 2
- dnote 1, 1
- dnote 1, 1
- dnote 1, 2
- dnote 1, 1
- dnote 1, 1
- dspeed 8
- dnote 1, 4
- dnote 1, 4
+ drum_note 1, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_note 1, 2
+ drum_note 1, 1
+ drum_note 1, 1
+ drum_speed 8
+ drum_note 1, 4
+ drum_note 1, 4
sound_ret
--- a/audio/music/unioncave.asm
+++ b/audio/music/unioncave.asm
@@ -239,21 +239,21 @@
Music_UnionCave_Ch4:
toggle_noise 1
- dspeed 12
+ drum_speed 12
Music_UnionCave_branch_f5da9:
stereo_panning 1, 0
- dnote 5, 4
+ drum_note 5, 4
stereo_panning 1, 1
- dnote 6, 4
+ drum_note 6, 4
stereo_panning 0, 1
- dnote 9, 4
+ drum_note 9, 4
rest 8
stereo_panning 0, 1
- dnote 5, 4
+ drum_note 5, 4
stereo_panning 1, 1
- dnote 6, 4
+ drum_note 6, 4
stereo_panning 1, 0
- dnote 9, 4
+ drum_note 9, 4
rest 8
sound_loop 0, Music_UnionCave_branch_f5da9
sound_loop 0, Music_UnionCave_branch_f5da9
--- a/audio/music/victoryroad.asm
+++ b/audio/music/victoryroad.asm
@@ -175,25 +175,25 @@
Music_VictoryRoad_Ch4:
toggle_noise 0
- dspeed 12
+ drum_speed 12
Music_VictoryRoad_branch_f6d63:
- dnote 3, 2
- dnote 3, 2
- dnote 4, 1
- dnote 3, 3
- dnote 4, 1
- dnote 3, 3
- dnote 4, 1
- dnote 3, 3
- dnote 3, 2
- dnote 3, 2
- dnote 4, 1
- dnote 3, 3
- dnote 4, 1
- dnote 4, 1
- dnote 3, 2
- dnote 4, 1
- dnote 3, 2
- dnote 4, 1
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 4, 1
+ drum_note 3, 3
+ drum_note 4, 1
+ drum_note 3, 3
+ drum_note 4, 1
+ drum_note 3, 3
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 4, 1
+ drum_note 3, 3
+ drum_note 4, 1
+ drum_note 4, 1
+ drum_note 3, 2
+ drum_note 4, 1
+ drum_note 3, 2
+ drum_note 4, 1
sound_loop 0, Music_VictoryRoad_branch_f6d63
--- a/audio/music/violetcity.asm
+++ b/audio/music/violetcity.asm
@@ -708,23 +708,23 @@
Music_VioletCity_Ch4:
toggle_noise 3
- dspeed 12
- dnote 4, 2
- dnote 3, 2
- dnote 4, 1
- dnote 4, 1
- dnote 3, 2
- dnote 3, 4
- dnote 7, 4
+ drum_speed 12
+ drum_note 4, 2
+ drum_note 3, 2
+ drum_note 4, 1
+ drum_note 4, 1
+ drum_note 3, 2
+ drum_note 3, 4
+ drum_note 7, 4
sound_call Music_VioletCity_branch_f036c
sound_call Music_VioletCity_branch_f036c
sound_call Music_VioletCity_branch_f036c
- dnote 3, 2
- dnote 4, 1
- dnote 4, 1
- dnote 3, 2
- dnote 1, 8
- dnote 4, 2
+ drum_note 3, 2
+ drum_note 4, 1
+ drum_note 4, 1
+ drum_note 3, 2
+ drum_note 1, 8
+ drum_note 4, 2
Music_VioletCity_branch_f0338:
sound_call Music_VioletCity_branch_f037a
sound_call Music_VioletCity_branch_f037a
@@ -745,32 +745,32 @@
sound_loop 0, Music_VioletCity_branch_f0338
Music_VioletCity_branch_f036c:
- dnote 3, 1
- dnote 3, 1
- dnote 4, 1
- dnote 4, 1
- dnote 3, 2
- dnote 8, 2
- dnote 8, 1
- dnote 8, 1
- dnote 7, 2
- dnote 8, 1
- dnote 8, 1
- dnote 8, 1
- dnote 8, 1
+ drum_note 3, 1
+ drum_note 3, 1
+ drum_note 4, 1
+ drum_note 4, 1
+ drum_note 3, 2
+ drum_note 8, 2
+ drum_note 8, 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
sound_ret
Music_VioletCity_branch_f037a:
- dnote 4, 2
- dnote 8, 1
- dnote 8, 1
- dnote 8, 1
+ drum_note 4, 2
+ drum_note 8, 1
+ drum_note 8, 1
+ drum_note 8, 1
rest 1
- dnote 4, 1
- dnote 4, 1
+ drum_note 4, 1
+ drum_note 4, 1
rest 2
- dnote 4, 2
- dnote 3, 2
- dnote 4, 2
+ drum_note 4, 2
+ drum_note 3, 2
+ drum_note 4, 2
sound_ret
--- a/audio/music/viridiancity.asm
+++ b/audio/music/viridiancity.asm
@@ -690,7 +690,7 @@
Music_ViridianCity_Ch4:
toggle_noise 3
- dspeed 12
+ drum_speed 12
sound_call Music_ViridianCity_branch_f431d
sound_call Music_ViridianCity_branch_f432c
Music_ViridianCity_branch_f42e9:
@@ -713,72 +713,72 @@
sound_loop 0, Music_ViridianCity_branch_f42e9
Music_ViridianCity_branch_f431d:
- dnote 5, 2
- dnote 5, 2
- dnote 3, 2
- dnote 5, 4
- dnote 3, 2
- dnote 5, 2
- dnote 7, 2
- dnote 5, 2
- dnote 5, 2
- dnote 3, 4
- dnote 5, 2
- dnote 3, 2
- dnote 5, 2
- dnote 7, 2
+ drum_note 5, 2
+ drum_note 5, 2
+ drum_note 3, 2
+ drum_note 5, 4
+ drum_note 3, 2
+ drum_note 5, 2
+ drum_note 7, 2
+ drum_note 5, 2
+ drum_note 5, 2
+ drum_note 3, 4
+ drum_note 5, 2
+ drum_note 3, 2
+ drum_note 5, 2
+ drum_note 7, 2
sound_ret
Music_ViridianCity_branch_f432c:
- dnote 5, 2
- dnote 5, 2
- dnote 3, 2
- dnote 5, 4
- dnote 3, 2
- dnote 5, 2
- dnote 7, 2
- dnote 5, 2
- dnote 5, 2
- dnote 7, 4
- dnote 3, 2
- dnote 3, 2
- dnote 11, 2
- dnote 11, 2
+ drum_note 5, 2
+ drum_note 5, 2
+ drum_note 3, 2
+ drum_note 5, 4
+ drum_note 3, 2
+ drum_note 5, 2
+ drum_note 7, 2
+ drum_note 5, 2
+ drum_note 5, 2
+ drum_note 7, 4
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 11, 2
+ drum_note 11, 2
sound_ret
Music_ViridianCity_branch_f433b:
- dnote 4, 2
- dnote 7, 2
- dnote 3, 2
- dnote 4, 2
- dnote 4, 2
- dnote 7, 2
- dnote 3, 4
- dnote 4, 2
- dnote 7, 2
- dnote 3, 2
- dnote 4, 2
- dnote 4, 2
- dnote 7, 2
- dnote 3, 2
- dnote 4, 2
+ drum_note 4, 2
+ drum_note 7, 2
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 4, 2
+ drum_note 7, 2
+ drum_note 3, 4
+ drum_note 4, 2
+ drum_note 7, 2
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 4, 2
+ drum_note 7, 2
+ drum_note 3, 2
+ drum_note 4, 2
sound_ret
Music_ViridianCity_branch_f434b:
- dnote 4, 2
- dnote 7, 2
- dnote 3, 2
- dnote 4, 2
- dnote 4, 2
- dnote 7, 2
- dnote 3, 4
- dnote 4, 2
- dnote 7, 2
- dnote 3, 2
- dnote 4, 2
- dnote 4, 2
- dnote 3, 2
- dnote 3, 2
- dnote 7, 2
+ drum_note 4, 2
+ drum_note 7, 2
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 4, 2
+ drum_note 7, 2
+ drum_note 3, 4
+ drum_note 4, 2
+ drum_note 7, 2
+ drum_note 3, 2
+ drum_note 4, 2
+ drum_note 4, 2
+ drum_note 3, 2
+ drum_note 3, 2
+ drum_note 7, 2
sound_ret
--- a/audio/sfx.asm
+++ b/audio/sfx.asm
@@ -542,7 +542,7 @@
Sfx_DexFanfare5079_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 12
+ drum_speed 12
note C_, 12
sound_ret
@@ -608,7 +608,7 @@
Sfx_KeyItem_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 12
+ drum_speed 12
note C_, 16
sound_ret
@@ -687,7 +687,7 @@
Sfx_DexFanfare2049_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 12
+ drum_speed 12
note C_, 16
rest 16
sound_ret
@@ -762,7 +762,7 @@
Sfx_Item_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 12
+ drum_speed 12
note C_, 16
rest 16
sound_ret
@@ -840,7 +840,7 @@
Sfx_CaughtMon_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 12
+ drum_speed 12
note C_, 16
rest 16
sound_ret
@@ -931,7 +931,7 @@
Sfx_DexFanfare80109_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 12
+ drum_speed 12
note C_, 16
rest 16
sound_ret
@@ -1015,7 +1015,7 @@
Sfx_Unused_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 12
+ drum_speed 12
note C_, 16
rest 16
sound_ret
@@ -1107,7 +1107,7 @@
Sfx_RegisterPhoneNumber_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 12
+ drum_speed 12
note C_, 2
rest 16
rest 16
@@ -1269,9 +1269,9 @@
Sfx_GetEggFromDayCareLady_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 8
+ drum_speed 8
rest 2
- dspeed 12
+ drum_speed 12
rest 16
rest 12
sound_ret
@@ -1381,7 +1381,7 @@
Sfx_MoveDeleted_Ch8:
toggle_sfx
sfx_toggle_noise 3
- dspeed 12
+ drum_speed 12
note F_, 8
rest 16
rest 16
@@ -1496,7 +1496,7 @@
Sfx_2ndPlace_Ch8:
toggle_sfx
sfx_toggle_noise 3
- dspeed 8
+ drum_speed 8
Sfx_2ndPlace_branch_f0fd7:
note C#, 1
sound_loop 6, Sfx_2ndPlace_branch_f0fd7
@@ -1607,7 +1607,7 @@
Sfx_1stPlace_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 6
+ drum_speed 6
note D_, 4
note D_, 4
note D_, 4
@@ -1618,7 +1618,7 @@
note D_, 4
note D_, 4
note D_, 4
- dspeed 12
+ drum_speed 12
note B_, 10
rest 6
sound_ret
@@ -1749,7 +1749,7 @@
Sfx_ChooseACard_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 6
+ drum_speed 6
note D_, 2
note C#, 2
note B_, 4
@@ -1861,7 +1861,7 @@
Sfx_GetTm_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 6
+ drum_speed 6
note D_, 4
note C#, 2
note D_, 2
@@ -2019,7 +2019,7 @@
Sfx_GetBadge_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 6
+ drum_speed 6
Sfx_GetBadge_branch_f1220:
note B_, 12
note D_, 1
@@ -2142,7 +2142,7 @@
Sfx_QuitSlots_Ch8:
toggle_sfx
sfx_toggle_noise 3
- dspeed 8
+ drum_speed 8
note D#, 6
note D_, 4
note D#, 2
@@ -3099,7 +3099,7 @@
Sfx_DexFanfareLessThan20_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 12
+ drum_speed 12
note C#, 6
rest 16
rest 12
@@ -3206,7 +3206,7 @@
Sfx_DexFanfare140169_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 12
+ drum_speed 12
note C_, 4
Sfx_DexFanfare140169_branch_f1945:
note D_, 4
@@ -3315,7 +3315,7 @@
Sfx_DexFanfare170199_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 8
+ drum_speed 8
note D_, 2
note D_, 2
note D_, 4
@@ -3328,7 +3328,7 @@
note C#, 1
note C#, 1
note C#, 1
- dspeed 12
+ drum_speed 12
note B_, 16
sound_ret
@@ -3438,7 +3438,7 @@
Sfx_DexFanfare200229_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 8
+ drum_speed 8
note C#, 1
note C#, 1
note C#, 1
@@ -3606,7 +3606,7 @@
Sfx_DexFanfare230Plus_Ch8:
toggle_sfx
sfx_toggle_noise 4
- dspeed 8
+ drum_speed 8
note D_, 2
note D_, 2
note D_, 2
@@ -5031,7 +5031,7 @@
Sfx_Fanfare2_Ch8:
toggle_sfx
- dspeed 6
+ drum_speed 6
note C_, 1
octave 5
note C#, 2
@@ -5038,7 +5038,7 @@
rest 2
note C#, 2
rest 2
- dspeed 4
+ drum_speed 4
note C_, 1
note C#, 2
rest 2
@@ -5117,7 +5117,7 @@
Sfx_Fanfare_Ch8:
toggle_sfx
- dspeed 6
+ drum_speed 6
note C_, 1
octave 4
note A#, 4
@@ -5129,7 +5129,7 @@
rest 4
note D#, 4
rest 4
- dspeed 4
+ drum_speed 4
note C_, 1
note F_, 4
note D#, 4
--- a/macros/scripts/audio.asm
+++ b/macros/scripts/audio.asm
@@ -1,11 +1,11 @@
channel_count: MACRO
-num_channels = \1 - 1
+_num_channels = \1 - 1
ENDM
channel: MACRO
- dn (num_channels << 2), \1 - 1 ; channel id
+ dn (_num_channels << 2), \1 - 1 ; channel id
dw \2 ; address
-num_channels = 0
+_num_channels = 0
ENDM
note: MACRO
@@ -12,7 +12,7 @@
dn (\1), (\2) - 1 ; pitch, length
ENDM
-dnote: MACRO
+drum_note: MACRO
note \1, \2 ; drum instrument, length
ENDM
@@ -65,7 +65,7 @@
ENDM
; only valid on the noise channel
-dspeed: MACRO
+drum_speed: MACRO
note_type \1 ; note length
ENDM