From 362bba7642431d87371cb86c9442e7636fcd287b Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Tue, 3 Sep 2019 22:36:02 -0500 Subject: [PATCH] Rename dnote to drum_note and dspeed to drum_speed --- audio/engine_1.asm | 10 +- audio/engine_2.asm | 10 +- audio/engine_3.asm | 10 +- audio/music/bikeriding.asm | 30 +-- audio/music/cinnabarmansion.asm | 32 +-- audio/music/cities1.asm | 88 +++---- audio/music/dungeon1.asm | 66 ++--- audio/music/dungeon2.asm | 18 +- audio/music/dungeon3.asm | 2 +- audio/music/indigoplateau.asm | 134 +++++----- audio/music/introbattle.asm | 188 ++++++------- audio/music/lavender.asm | 6 +- audio/music/museumguy.asm | 128 ++++----- audio/music/routes1.asm | 110 ++++---- audio/music/routes2.asm | 148 +++++------ audio/music/routes3.asm | 310 +++++++++++----------- audio/music/routes4.asm | 334 ++++++++++++------------ audio/music/titlescreen.asm | 280 ++++++++++---------- audio/music/vermilion.asm | 52 ++-- audio/music/yellow/yellowunusedsong.asm | 236 ++++++++--------- macros/audio_macros.asm | 8 +- 21 files changed, 1100 insertions(+), 1100 deletions(-) diff --git a/audio/engine_1.asm b/audio/engine_1.asm index a8389819..11962d55 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -647,8 +647,8 @@ Audio1_note: jr nz, Audio1_note_length ; if not noise channel ld a, d and $f0 - cp $b0 ; is this command a dnote? - jr z, .dnote + cp $b0 ; is this command a drum_note? + jr z, .drum_note jr nc, Audio1_note_length ; no ; this executes when on the noise channel and @@ -657,7 +657,7 @@ Audio1_note: ; and the lower nybble is the length minus 1 (0-15) ; however, this doesn't work for instrument #2 because the command id ; is captured by the noise_note command (command id $2x) - ; this essentially acts like a dnote command that is only 1 byte + ; this essentially acts like a drum_note command that is only 1 byte ; instead of 2 and can only be used with instruments 1 and 3 through 10 ; this is unused by the game swap a @@ -670,12 +670,12 @@ Audio1_note: push bc jr .playDnote -.dnote +.drum_note ld a, d and $f push af push bc - call Audio1_GetNextMusicByte ; get dnote instrument + call Audio1_GetNextMusicByte ; get drum_note instrument .playDnote ld d, a ld a, [wDisableChannelOutputWhenSfxEnds] diff --git a/audio/engine_2.asm b/audio/engine_2.asm index df719c67..026ade7c 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -658,8 +658,8 @@ Audio2_note: jr nz, Audio2_note_length ; if not noise channel ld a, d and $f0 - cp $b0 ; is this command a dnote? - jr z, .dnote + cp $b0 ; is this command a drum_note? + jr z, .drum_note jr nc, Audio2_note_length ; no ; this executes when on the noise channel and @@ -668,7 +668,7 @@ Audio2_note: ; and the lower nybble is the length minus 1 (0-15) ; however, this doesn't work for instrument #2 because the command id ; is captured by the noise_note command (command id $2x) - ; this essentially acts like a dnote command that is only 1 byte + ; this essentially acts like a drum_note command that is only 1 byte ; instead of 2 and can only be used with instruments 1 and 3 through 10 ; this is unused by the game swap a @@ -681,12 +681,12 @@ Audio2_note: push bc jr .playDnote -.dnote +.drum_note ld a, d and $f push af push bc - call Audio2_GetNextMusicByte ; get dnote instrument + call Audio2_GetNextMusicByte ; get drum_note instrument .playDnote ld d, a ld a, [wDisableChannelOutputWhenSfxEnds] diff --git a/audio/engine_3.asm b/audio/engine_3.asm index f329c0c3..4085dd3c 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -647,8 +647,8 @@ Audio3_note: jr nz, Audio3_note_length ; if not noise channel ld a, d and $f0 - cp $b0 ; is this command a dnote? - jr z, .dnote + cp $b0 ; is this command a drum_note? + jr z, .drum_note jr nc, Audio3_note_length ; no ; this executes when on the noise channel and @@ -657,7 +657,7 @@ Audio3_note: ; and the lower nybble is the length minus 1 (0-15) ; however, this doesn't work for instrument #2 because the command id ; is captured by the noise_note command (command id $2x) - ; this essentially acts like a dnote command that is only 1 byte + ; this essentially acts like a drum_note command that is only 1 byte ; instead of 2 and can only be used with instruments 1 and 3 through 10 ; this is unused by the game swap a @@ -670,12 +670,12 @@ Audio3_note: push bc jr .playDnote -.dnote +.drum_note ld a, d and $f push af push bc - call Audio3_GetNextMusicByte ; get dnote instrument + call Audio3_GetNextMusicByte ; get drum_note instrument .playDnote ld d, a ld a, [wDisableChannelOutputWhenSfxEnds] diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm index ef293f54..302e5cf9 100644 --- a/audio/music/bikeriding.asm +++ b/audio/music/bikeriding.asm @@ -644,7 +644,7 @@ Music_BikeRiding_branch_7dd17:: Music_BikeRiding_Ch4:: - dspeed 12 + drum_speed 12 rest 2 Music_BikeRiding_branch_7de6a:: @@ -671,34 +671,34 @@ Music_BikeRiding_branch_7de6a:: Music_BikeRiding_branch_7dea7:: rest 2 - dnote 16, 2 + drum_note 16, 2 rest 2 - dnote 16, 2 + drum_note 16, 2 rest 2 - dnote 16, 2 + drum_note 16, 2 rest 2 - dnote 16, 2 + drum_note 16, 2 sound_ret Music_BikeRiding_branch_7deb4:: rest 2 - dnote 16, 2 + drum_note 16, 2 rest 2 - dnote 16, 2 + drum_note 16, 2 rest 2 - dnote 16, 2 - dnote 16, 2 - dnote 16, 2 + drum_note 16, 2 + drum_note 16, 2 + drum_note 16, 2 sound_ret Music_BikeRiding_branch_7dec2:: rest 2 - dnote 16, 2 + drum_note 16, 2 rest 2 - dnote 16, 2 + drum_note 16, 2 rest 2 - dnote 16, 2 + drum_note 16, 2 rest 2 - dnote 16, 1 - dnote 16, 1 + drum_note 16, 1 + drum_note 16, 1 sound_ret diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm index 165c4e98..ac6c08c3 100644 --- a/audio/music/cinnabarmansion.asm +++ b/audio/music/cinnabarmansion.asm @@ -144,29 +144,29 @@ Music_CinnabarMansion_branch_7ed80:: Music_CinnabarMansion_Ch4:: - dspeed 6 + drum_speed 6 rest 16 rest 16 rest 16 rest 16 Music_CinnabarMansion_branch_7edb5:: - dnote 12, 2 - dnote 12, 2 - dnote 13, 4 - dnote 12, 2 - dnote 12, 2 - dnote 13, 4 - dnote 12, 2 - dnote 12, 2 - dnote 13, 4 - dnote 12, 2 - dnote 12, 2 - dnote 14, 4 - dnote 12, 2 - dnote 12, 2 + drum_note 12, 2 + drum_note 12, 2 + drum_note 13, 4 + drum_note 12, 2 + drum_note 12, 2 + drum_note 13, 4 + drum_note 12, 2 + drum_note 12, 2 + drum_note 13, 4 + drum_note 12, 2 + drum_note 12, 2 + drum_note 14, 4 + drum_note 12, 2 + drum_note 12, 2 rest 2 rest 10 rest 8 - dnote 14, 8 + drum_note 14, 8 sound_loop 0, Music_CinnabarMansion_branch_7edb5 diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm index 006546ef..00ca3b5f 100644 --- a/audio/music/cities1.asm +++ b/audio/music/cities1.asm @@ -580,7 +580,7 @@ Music_Cities1_branch_acce:: Music_Cities1_Ch4:: - dspeed 12 + drum_speed 12 sound_call Music_Cities1_branch_ad36 Music_Cities1_branch_acf3:: @@ -591,67 +591,67 @@ Music_Cities1_branch_acf3:: sound_call Music_Cities1_branch_ad36 sound_call Music_Cities1_branch_ad5f sound_call Music_Cities1_branch_ad52 - dnote 6, 6 - dnote 6, 6 - dnote 7, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 sound_call Music_Cities1_branch_ad6e sound_call Music_Cities1_branch_ad5f sound_call Music_Cities1_branch_ad52 sound_call Music_Cities1_branch_ad6e sound_call Music_Cities1_branch_ad52 - dnote 6, 6 - dnote 6, 6 - dnote 7, 2 - dnote 6, 2 - dnote 6, 6 - dnote 6, 6 - dnote 6, 4 - dnote 6, 6 - dnote 8, 6 - dnote 8, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 6, 2 + drum_note 6, 6 + drum_note 6, 6 + drum_note 6, 4 + drum_note 6, 6 + drum_note 8, 6 + drum_note 8, 4 sound_loop 0, Music_Cities1_Ch4 Music_Cities1_branch_ad36:: - dnote 8, 6 - dnote 8, 6 - dnote 8, 4 - dnote 8, 6 - dnote 8, 6 - dnote 8, 2 - dnote 8, 2 + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 2 + drum_note 8, 2 sound_ret Music_Cities1_branch_ad45:: - dnote 8, 6 - dnote 8, 6 - dnote 8, 4 - dnote 8, 6 - dnote 8, 6 - dnote 8, 4 + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 sound_ret Music_Cities1_branch_ad52:: - dnote 6, 6 - dnote 6, 6 - dnote 7, 4 - dnote 6, 6 - dnote 6, 6 - dnote 7, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 sound_ret Music_Cities1_branch_ad5f:: - dnote 6, 6 - dnote 6, 6 - dnote 7, 4 - dnote 6, 6 - dnote 6, 6 - dnote 7, 2 - dnote 6, 2 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 6, 2 sound_ret Music_Cities1_branch_ad6e:: - dnote 6, 6 - dnote 6, 6 - dnote 7, 2 - dnote 7, 2 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 7, 2 sound_ret diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index 76b8d168..49c6f89c 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -597,27 +597,27 @@ Music_Dungeon1_branch_7e177:: Music_Dungeon1_Ch4:: - dspeed 12 + drum_speed 12 rest 14 - dnote 12, 1 - dnote 12, 1 + drum_note 12, 1 + drum_note 12, 1 Music_Dungeon1_branch_7e190:: sound_call Music_Dungeon1_branch_7e1f1 sound_loop 3, Music_Dungeon1_branch_7e190 - dnote 13, 4 - dnote 12, 4 - dnote 13, 4 - dnote 12, 2 - dnote 12, 2 + drum_note 13, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 12, 2 + drum_note 12, 2 Music_Dungeon1_branch_7e1a1:: sound_call Music_Dungeon1_branch_7e1f1 sound_loop 3, Music_Dungeon1_branch_7e1a1 - dnote 13, 4 - dnote 12, 4 - dnote 13, 4 - dnote 13, 4 + drum_note 13, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 13, 4 Music_Dungeon1_branch_7e1b0:: sound_call Music_Dungeon1_branch_7e1fa @@ -628,12 +628,12 @@ Music_Dungeon1_branch_7e1ba:: sound_call Music_Dungeon1_branch_7e1fa sound_loop 3, Music_Dungeon1_branch_7e1ba sound_call Music_Dungeon1_branch_7e202 - dnote 9, 4 - dnote 10, 4 - dnote 10, 4 + drum_note 9, 4 + drum_note 10, 4 + drum_note 10, 4 rest 2 - dnote 9, 2 - dnote 13, 4 + drum_note 9, 2 + drum_note 13, 4 Music_Dungeon1_branch_7e1cf:: rest 16 @@ -643,33 +643,33 @@ Music_Dungeon1_branch_7e1cf:: Music_Dungeon1_branch_7e1d5:: sound_call Music_Dungeon1_branch_7e1fa sound_loop 3, Music_Dungeon1_branch_7e1d5 - dnote 12, 4 - dnote 12, 4 - dnote 12, 4 + drum_note 12, 4 + drum_note 12, 4 + drum_note 12, 4 rest 2 - dnote 12, 1 - dnote 12, 1 + drum_note 12, 1 + drum_note 12, 1 sound_call Music_Dungeon1_branch_7e1f1 sound_call Music_Dungeon1_branch_7e1f1 sound_loop 0, Music_Dungeon1_branch_7e190 Music_Dungeon1_branch_7e1f1:: - dnote 13, 4 - dnote 12, 4 - dnote 13, 4 - dnote 12, 4 + drum_note 13, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 12, 4 sound_ret Music_Dungeon1_branch_7e1fa:: - dnote 12, 1 - dnote 12, 1 + drum_note 12, 1 + drum_note 12, 1 rest 10 - dnote 14, 4 + drum_note 14, 4 sound_ret Music_Dungeon1_branch_7e202:: - dnote 9, 4 - dnote 10, 4 - dnote 10, 4 - dnote 11, 4 + drum_note 9, 4 + drum_note 10, 4 + drum_note 10, 4 + drum_note 11, 4 sound_ret diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm index e213e2a4..2167bfd7 100644 --- a/audio/music/dungeon2.asm +++ b/audio/music/dungeon2.asm @@ -303,15 +303,15 @@ Music_Dungeon2_branch_7e9d1:: Music_Dungeon2_Ch4:: - dspeed 12 + drum_speed 12 Music_Dungeon2_branch_7e9dd:: - dnote 12, 4 - dnote 13, 4 - dnote 12, 4 - dnote 10, 4 - dnote 12, 4 - dnote 13, 4 - dnote 11, 4 - dnote 9, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 12, 4 + drum_note 10, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 11, 4 + drum_note 9, 4 sound_loop 0, Music_Dungeon2_branch_7e9dd diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm index a72dea34..81b2ead8 100644 --- a/audio/music/dungeon3.asm +++ b/audio/music/dungeon3.asm @@ -711,7 +711,7 @@ Music_Dungeon3_Ch3:: Music_Dungeon3_Ch4:: - dspeed 12 + drum_speed 12 rest 16 rest 16 rest 16 diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index d341ecd6..cc3c2cef 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -226,19 +226,19 @@ Music_IndigoPlateau_branch_a6fe:: Music_IndigoPlateau_Ch4:: - dspeed 6 - dnote 17, 16 - dnote 17, 16 - dnote 17, 16 - dnote 17, 8 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 + drum_speed 6 + drum_note 17, 16 + drum_note 17, 16 + drum_note 17, 16 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 Music_IndigoPlateau_branch_a728:: sound_call Music_IndigoPlateau_branch_a791 @@ -255,67 +255,67 @@ Music_IndigoPlateau_branch_a728:: sound_call Music_IndigoPlateau_branch_a7a8 sound_call Music_IndigoPlateau_branch_a77e sound_call Music_IndigoPlateau_branch_a7a8 - dnote 17, 16 - dnote 17, 8 - dnote 18, 8 - dnote 17, 16 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 1 - dnote 17, 1 - dnote 17, 1 - dnote 17, 1 + drum_note 17, 16 + drum_note 17, 8 + drum_note 18, 8 + drum_note 17, 16 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 1 sound_loop 0, Music_IndigoPlateau_branch_a728 Music_IndigoPlateau_branch_a77e:: - dnote 17, 4 - dnote 18, 4 - dnote 19, 4 - dnote 18, 4 - dnote 17, 4 - dnote 18, 4 - dnote 19, 4 - dnote 19, 2 - dnote 18, 2 + drum_note 17, 4 + drum_note 18, 4 + drum_note 19, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 18, 4 + drum_note 19, 4 + drum_note 19, 2 + drum_note 18, 2 sound_ret Music_IndigoPlateau_branch_a791:: - dnote 17, 4 - dnote 18, 4 - dnote 19, 4 - dnote 18, 4 - dnote 17, 4 - dnote 18, 4 - dnote 19, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 + drum_note 17, 4 + drum_note 18, 4 + drum_note 19, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 18, 4 + drum_note 19, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 sound_ret Music_IndigoPlateau_branch_a7a8:: - dnote 17, 4 - dnote 18, 4 - dnote 17, 4 - dnote 18, 4 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 + drum_note 17, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 sound_ret diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm index b2709b76..681631f6 100644 --- a/audio/music/introbattle.asm +++ b/audio/music/introbattle.asm @@ -230,100 +230,100 @@ Music_IntroBattle_Ch3:: Music_IntroBattle_Ch4:: - dspeed 6 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 1 - dnote 17, 1 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 17, 4 - dnote 17, 8 - dnote 17, 4 - dnote 17, 4 - dnote 17, 8 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 17, 4 - dnote 17, 8 - dnote 17, 4 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 16 - dnote 17, 16 - dnote 17, 16 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 1 - dnote 17, 1 - dnote 17, 1 - dnote 17, 1 - dnote 17, 4 - dnote 17, 4 - dnote 17, 8 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 17, 4 - dnote 17, 8 - dnote 17, 4 - dnote 17, 8 - dnote 17, 4 - dnote 17, 16 - dnote 17, 16 - dnote 17, 2 + drum_speed 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 16 + drum_note 17, 16 + drum_note 17, 16 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 16 + drum_note 17, 16 + drum_note 17, 2 rest 16 rest 14 sound_ret diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm index 5d9d2ba5..70fff2e5 100644 --- a/audio/music/lavender.asm +++ b/audio/music/lavender.asm @@ -187,13 +187,13 @@ Music_Lavender_branch_bbb9:: Music_Lavender_Ch4:: - dspeed 12 + drum_speed 12 rest 16 rest 16 rest 16 rest 16 Music_Lavender_branch_bc26:: - dnote 7, 8 - dnote 7, 8 + drum_note 7, 8 + drum_note 7, 8 sound_loop 0, Music_Lavender_branch_bc26 diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm index 54517752..60ebd553 100644 --- a/audio/music/museumguy.asm +++ b/audio/music/museumguy.asm @@ -262,76 +262,76 @@ Music_MuseumGuy_branch_aec1:: Music_MuseumGuy_Ch4:: - dspeed 12 + drum_speed 12 rest 16 rest 16 rest 16 rest 16 rest 16 rest 14 - dspeed 6 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 + drum_speed 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 Music_MuseumGuy_branch_aee1:: - dnote 17, 4 - dnote 17, 6 - dnote 17, 2 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 17, 6 - dnote 19, 1 - dnote 19, 1 - dnote 17, 4 - dnote 17, 6 - dnote 17, 2 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 6 - dnote 17, 2 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 17, 2 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 4 - dnote 17, 4 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 6 - dnote 19, 1 - dnote 19, 1 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 + drum_note 17, 4 + drum_note 17, 6 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 17, 6 + drum_note 17, 2 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 6 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 2 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 sound_loop 0, Music_MuseumGuy_branch_aee1 diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm index 29d0d5ac..cdefb6ee 100644 --- a/audio/music/routes1.asm +++ b/audio/music/routes1.asm @@ -310,95 +310,95 @@ Music_Routes1_branch_9cdd:: Music_Routes1_Ch4:: - dspeed 12 + drum_speed 12 rest 4 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - dnote 15, 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - dnote 15, 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - dnote 15, 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - dnote 15, 2 - dnote 15, 2 + drum_note 15, 2 + drum_note 15, 2 sound_loop 0, Music_Routes1_Ch4 sound_ret diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm index 94098fc6..e6782df3 100644 --- a/audio/music/routes2.asm +++ b/audio/music/routes2.asm @@ -325,101 +325,101 @@ Music_Routes2_branch_9e9e:: Music_Routes2_Ch4:: - dspeed 12 - dnote 3, 2 + drum_speed 12 + drum_note 3, 2 rest 2 - dnote 3, 1 + drum_note 3, 1 rest 5 - dnote 3, 1 - dnote 3, 1 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 rest 2 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 3 - dnote 3, 3 - dspeed 12 - dnote 3, 1 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 + drum_note 3, 3 + drum_speed 12 + drum_note 3, 1 rest 3 - dnote 3, 2 + drum_note 3, 2 rest 2 - dnote 3, 2 + drum_note 3, 2 rest 4 - dnote 3, 1 - dnote 3, 1 - dnote 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 rest 2 - dnote 3, 2 + drum_note 3, 2 rest 2 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 3 - dnote 3, 3 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 3 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 + drum_note 3, 3 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - dspeed 12 - dnote 3, 1 + drum_speed 12 + drum_note 3, 1 rest 5 - dnote 3, 1 - dnote 3, 1 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 rest 2 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 3 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - dspeed 12 - dnote 3, 1 + drum_speed 12 + drum_note 3, 1 rest 3 - dnote 3, 2 + drum_note 3, 2 rest 2 - dnote 3, 2 + drum_note 3, 2 rest 4 - dnote 3, 1 - dnote 3, 1 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 rest 2 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 3 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - dnote 3, 3 - dnote 3, 3 - dnote 3, 3 + drum_note 3, 3 + drum_note 3, 3 + drum_note 3, 3 rest 3 - dspeed 12 - dnote 3, 1 + drum_speed 12 + drum_note 3, 1 rest 5 - dnote 3, 1 - dnote 3, 1 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 rest 2 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 3 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - dnote 3, 3 + drum_note 3, 3 rest 3 sound_loop 0, Music_Routes2_Ch4 sound_ret diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm index d83ec8c0..26a41590 100644 --- a/audio/music/routes3.asm +++ b/audio/music/routes3.asm @@ -355,161 +355,161 @@ Music_Routes3_branch_a0a3:: Music_Routes3_Ch4:: - dspeed 6 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 8 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 18, 2 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 18, 2 - dnote 17, 4 - dnote 18, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 + drum_speed 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 18, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 18, 2 + drum_note 17, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 Music_Routes3_branch_a17a:: - dnote 17, 12 - dnote 17, 2 - dnote 18, 2 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 8 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 18, 2 - dnote 17, 4 - dnote 17, 10 - dnote 19, 1 - dnote 19, 1 - dnote 17, 12 - dnote 17, 2 - dnote 19, 2 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 8 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 10 - dnote 19, 1 - dnote 19, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 8 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 10 - dnote 19, 1 - dnote 19, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 8 - dnote 18, 1 - dnote 19, 1 - dnote 18, 1 - dnote 19, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 8 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 12 - dnote 17, 2 - dnote 17, 2 - dnote 17, 4 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 18, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 18, 2 + drum_note 17, 4 + drum_note 17, 10 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 19, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 10 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 10 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 sound_loop 0, Music_Routes3_branch_a17a diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm index 962cd36b..50679f54 100644 --- a/audio/music/routes4.asm +++ b/audio/music/routes4.asm @@ -507,175 +507,175 @@ Music_Routes4_branch_a3d7:: Music_Routes4_Ch4:: - dspeed 12 + drum_speed 12 rest 16 rest 12 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 Music_Routes4_branch_a4a8:: - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 18, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 17, 2 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 18, 1 - dnote 18, 1 - dnote 19, 1 - dnote 19, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 17, 2 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 17, 2 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 18, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 4 - dnote 17, 2 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 17, 2 - dnote 19, 1 - dnote 18, 1 - dnote 17, 4 - dnote 19, 1 - dnote 19, 1 - dnote 18, 1 - dnote 18, 1 - dnote 17, 2 - dnote 17, 2 - dnote 17, 2 - dnote 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 18, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 18, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 sound_loop 0, Music_Routes4_branch_a4a8 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index b814cba3..a70b2761 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -460,218 +460,218 @@ Music_TitleScreen_branch_7e6e5:: Music_TitleScreen_Ch4:: - dspeed 6 + drum_speed 6 rest 4 - dnote 3, 1 - dnote 3, 1 - dnote 4, 1 - dnote 4, 1 - dspeed 12 - dnote 2, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 2, 1 - dnote 2, 1 - dnote 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 3 - dspeed 8 - dnote 3, 2 - dnote 4, 2 - dnote 2, 2 - dnote 3, 2 - dnote 2, 2 - dnote 1, 2 + drum_speed 8 + drum_note 3, 2 + drum_note 4, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 1, 2 Music_TitleScreen_branch_7e716:: - dspeed 12 - dnote 2, 1 + drum_speed 12 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 2, 1 - dnote 2, 1 - dnote 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 rest 3 sound_call Music_TitleScreen_branch_7e834 sound_call Music_TitleScreen_branch_7e834 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 2, 1 - dnote 2, 1 - dnote 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 rest 1 - dnote 3, 1 - dnote 2, 1 + drum_note 3, 1 + drum_note 2, 1 sound_call Music_TitleScreen_branch_7e842 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 2, 1 - dnote 3, 1 - dnote 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 1 - dnote 2, 1 + drum_note 2, 1 rest 1 sound_call Music_TitleScreen_branch_7e842 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 2, 1 - dnote 3, 1 - dnote 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 1 - dspeed 6 - dnote 3, 1 - dnote 3, 1 - dnote 4, 1 - dnote 4, 1 - dspeed 12 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 sound_call Music_TitleScreen_branch_7e834 sound_call Music_TitleScreen_branch_7e842 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 2, 1 - dnote 3, 1 - dnote 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 3, 1 - dnote 2, 1 - dnote 2, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 1 - dnote 3, 1 - dnote 2, 1 + drum_note 3, 1 + drum_note 2, 1 sound_call Music_TitleScreen_branch_7e834 sound_call Music_TitleScreen_branch_7e842 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 3, 1 - dnote 2, 1 - dnote 2, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 1 - dnote 4, 1 - dnote 3, 1 - dnote 2, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - dnote 3, 1 + drum_note 3, 1 rest 5 - dnote 2, 1 - dnote 4, 1 - dnote 2, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 2, 1 rest 1 - dspeed 6 - dnote 3, 1 - dnote 3, 1 - dnote 4, 1 - dnote 4, 1 - dspeed 12 - dnote 1, 1 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 + drum_note 1, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 3, 1 - dnote 2, 1 - dnote 1, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 1, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 3, 1 + drum_note 3, 1 rest 5 - dnote 3, 1 - dnote 2, 1 - dnote 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 3, 1 + drum_note 3, 1 rest 5 - dnote 2, 1 - dnote 3, 1 - dnote 4, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 4, 1 rest 1 - dnote 3, 1 - dnote 2, 1 - dnote 2, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 3 - dnote 3, 1 + drum_note 3, 1 rest 5 - dnote 2, 1 - dnote 3, 1 - dnote 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - dnote 5, 1 + drum_note 5, 1 rest 5 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 3, 1 - dnote 2, 1 - dnote 1, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 1, 1 rest 5 - dnote 2, 1 - dnote 3, 1 - dnote 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 1 - dnote 1, 1 + drum_note 1, 1 rest 1 - dspeed 8 - dnote 2, 4 - dnote 3, 4 - dnote 1, 4 - dspeed 12 - dnote 5, 1 + drum_speed 8 + drum_note 2, 4 + drum_note 3, 4 + drum_note 1, 4 + drum_speed 12 + drum_note 5, 1 rest 5 - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 3, 1 - dnote 2, 1 - dnote 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 rest 5 - dnote 2, 1 - dnote 3, 1 - dnote 1, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 1, 1 rest 1 - dnote 3, 1 - dnote 2, 1 - dspeed 8 - dnote 2, 4 - dnote 3, 4 - dnote 2, 4 + drum_note 3, 1 + drum_note 2, 1 + drum_speed 8 + drum_note 2, 4 + drum_note 3, 4 + drum_note 2, 4 sound_loop 0, Music_TitleScreen_branch_7e716 Music_TitleScreen_branch_7e834:: - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 2, 1 - dnote 3, 1 - dnote 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 sound_ret Music_TitleScreen_branch_7e842:: - dnote 2, 1 + drum_note 2, 1 rest 3 - dnote 2, 1 + drum_note 2, 1 rest 5 - dnote 3, 1 - dnote 2, 1 - dnote 2, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 3 sound_ret diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm index d45a2b1d..2788cde9 100644 --- a/audio/music/vermilion.asm +++ b/audio/music/vermilion.asm @@ -283,23 +283,23 @@ Music_Vermilion_branch_baa8:: Music_Vermilion_Ch4:: - dspeed 12 + drum_speed 12 Music_Vermilion_branch_bb0e:: sound_call Music_Vermilion_branch_bb3f - dnote 6, 2 - dnote 6, 1 - dnote 6, 1 - dnote 6, 2 - dnote 6, 1 - dnote 6, 1 - dnote 6, 2 - dnote 6, 1 - dnote 6, 1 - dnote 6, 1 - dnote 6, 1 - dnote 6, 1 - dnote 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 1 sound_loop 4, Music_Vermilion_branch_bb0e sound_call Music_Vermilion_branch_bb3f sound_call Music_Vermilion_branch_bb3f @@ -308,16 +308,16 @@ Music_Vermilion_branch_bb0e:: sound_loop 0, Music_Vermilion_branch_bb0e Music_Vermilion_branch_bb3f:: - dnote 6, 2 - dnote 6, 1 - dnote 6, 1 - dnote 6, 2 - dnote 6, 1 - dnote 6, 1 - dnote 6, 2 - dnote 6, 1 - dnote 6, 1 - dnote 6, 2 - dnote 6, 1 - dnote 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 sound_ret diff --git a/audio/music/yellow/yellowunusedsong.asm b/audio/music/yellow/yellowunusedsong.asm index 111c182d..f1e4d18f 100644 --- a/audio/music/yellow/yellowunusedsong.asm +++ b/audio/music/yellow/yellowunusedsong.asm @@ -203,124 +203,124 @@ Music_YellowUnusedSong_branch_83075:: Music_YellowUnusedSong_Ch4:: - dspeed 12 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dnote 3, 4 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 4 - dnote 3, 4 + drum_speed 12 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + 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 Music_YellowUnusedSong_branch_830c3:: - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - 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, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dnote 3, 4 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 4 - dnote 3, 2 - dnote 3, 2 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dnote 3, 4 - dspeed 8 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dspeed 12 - dnote 3, 4 - dnote 3, 4 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 2 - dnote 3, 4 - dnote 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + 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, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + 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, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + 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 sound_loop 0, Music_YellowUnusedSong_branch_830c3 diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm index 643114da..95b9ecbc 100755 --- a/macros/audio_macros.asm +++ b/macros/audio_macros.asm @@ -92,16 +92,16 @@ note: MACRO ENDM ; arguments: instrument [1, 19], length [1, 16] -dnote: MACRO +drum_note: MACRO db $B0 | (\2 - 1) db \1 ENDM ; arguments: instrument, length [1, 16] -; like dnote but one 1 byte instead of 2 +; like drum_note but one 1 byte instead of 2 ; can only be used with instruments 1-10, excluding 2 ; unused -dnote_short: MACRO +drum_note_short: MACRO db (\1 << 4) | (\2 - 1) ENDM @@ -124,7 +124,7 @@ note_type: MACRO ENDM ; arguments: speed [0, 15] -dspeed: MACRO +drum_speed: MACRO db $D0 | \1 ENDM