From 20c4116788d4d29b14c85ffce77e65faf89716b7 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Sat, 27 Jul 2019 23:21:39 -0500
Subject: Update audio macro names change audio channel numbers from 0-7 back
 to 1-8 change all note macros back to single note macro todo: fix comments
 with old macro names, update noise macros/instrument names

---
 macros/audio_macros.asm | 107 +++++++++++++++++-------------------------------
 1 file changed, 38 insertions(+), 69 deletions(-)

(limited to 'macros')

diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm
index d4914002..ae67491f 100755
--- a/macros/audio_macros.asm
+++ b/macros/audio_macros.asm
@@ -4,16 +4,16 @@ StopAllMusic: MACRO
 	call PlaySound
 ENDM
 
-Ch0    EQU 0
-Ch1    EQU 1
-Ch2    EQU 2
-Ch3    EQU 3
-Ch4    EQU 4
-Ch5    EQU 5
-Ch6    EQU 6
-Ch7    EQU 7
-
-audio: MACRO
+Ch1    EQU 0
+Ch2    EQU 1
+Ch3    EQU 2
+Ch4    EQU 3
+Ch5    EQU 4
+Ch6    EQU 5
+Ch7    EQU 6
+Ch8    EQU 7
+
+audio_header: MACRO
 	db (_NARG - 2) << 6 | \2
 	dw \1_\2
 	IF _NARG > 2
@@ -31,7 +31,7 @@ audio: MACRO
 ENDM
 
 ;format: length [0, 7], pitch change [-7, 7]
-pitchenvelope: MACRO
+pitch_sweep: MACRO
 	db $10
 	IF \2 > 0
 		db (\1 << 4) | \2
@@ -41,7 +41,7 @@ pitchenvelope: MACRO
 ENDM
 
 ;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch
-squarenote: MACRO
+square_note: MACRO
 	db $20 | \1
 	IF \3 < 0
 		db (\2 << 4) | (%1000 | (\3 * -1))
@@ -52,7 +52,7 @@ squarenote: MACRO
 ENDM
 
 ;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch
-noisenote: MACRO
+noise_note: MACRO
 	db $20 | \1
 	IF \3 < 0
 		db (\2 << 4) | (%1000 | (\3 * -1))
@@ -62,53 +62,22 @@ noisenote: MACRO
 	db \4
 ENDM
 
-;format: pitch length (in 16ths)
-C_: MACRO
-	db $00 | (\1 - 1)
-ENDM
-
-C#: MACRO
-	db $10 | (\1 - 1)
-ENDM
-
-D_: MACRO
-	db $20 | (\1 - 1)
-ENDM
-
-D#: MACRO
-	db $30 | (\1 - 1)
-ENDM
-
-E_: MACRO
-	db $40 | (\1 - 1)
-ENDM
-
-F_: MACRO
-	db $50 | (\1 - 1)
-ENDM
+C_ EQU $0
+C# EQU $1
+D_ EQU $2
+D# EQU $3
+E_ EQU $4
+F_ EQU $5
+F# EQU $6
+G_ EQU $7
+G# EQU $8
+A_ EQU $9
+A# EQU $A
+B_ EQU $B
 
-F#: MACRO
-	db $60 | (\1 - 1)
-ENDM
-
-G_: MACRO
-	db $70 | (\1 - 1)
-ENDM
-
-G#: MACRO
-	db $80 | (\1 - 1)
-ENDM
-
-A_: MACRO
-	db $90 | (\1 - 1)
-ENDM
-
-A#: MACRO
-	db $A0 | (\1 - 1)
-ENDM
-
-B_: MACRO
-	db $B0 | (\1 - 1)
+;format: pitch length (in 16ths)
+note: MACRO
+	db (\1 << 4) | (\2 - 1)
 ENDM
 
 ;format: instrument length (in 16ths)
@@ -213,7 +182,7 @@ rest: MACRO
 ENDM
 
 ; format: notetype speed, volume, fade
-notetype: MACRO
+note_type: MACRO
 	db $D0 | \1
 	db (\2 << 4) | \3
 ENDM
@@ -226,7 +195,7 @@ octave: MACRO
 	db $E8 - \1
 ENDM
 
-toggleperfectpitch: MACRO
+toggle_perfect_pitch: MACRO
 	db $E8
 ENDM
 
@@ -237,13 +206,13 @@ vibrato: MACRO
 	db (\2 << 4) | \3
 ENDM
 
-pitchbend: MACRO
+pitch_slide: MACRO
 	db $EB
 	db \1
 	db \2
 ENDM
 
-duty: MACRO
+duty_cycle: MACRO
 	db $EC
 	db \1
 ENDM
@@ -254,7 +223,7 @@ tempo: MACRO
 	db \1 % $100
 ENDM
 
-stereopanning: MACRO
+stereo_panning: MACRO
 	db $EE
 	db \1
 ENDM
@@ -264,28 +233,28 @@ volume: MACRO
 	db (\1 << 4) | \2
 ENDM
 
-executemusic: MACRO
+execute_music: MACRO
 	db $F8
 ENDM
 
-dutycycle: MACRO
+duty_cycle_pattern: MACRO
 	db $FC
 	db \1
 ENDM
 
 ;format: callchannel address
-callchannel: MACRO
+sound_call: MACRO
 	db $FD
 	dw \1
 ENDM
 
 ;format: loopchannel count, address
-loopchannel: MACRO
+sound_loop: MACRO
 	db $FE
 	db \1
 	dw \2
 ENDM
 
-endchannel: MACRO
+sound_ret: MACRO
 	db $FF
 ENDM
-- 
cgit v1.3.1-sl0p


From 6574881cdac656d23697be57ab048c90b0969949 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Sun, 28 Jul 2019 17:29:35 -0500
Subject: Use generic names for noise instruments coming up with satisfactory
 names is hard, besides this will improve compatibility with crystal

---
 audio.asm                               | 114 ++--
 audio/headers/sfxheaders1.asm           |  76 +--
 audio/headers/sfxheaders2.asm           |  76 +--
 audio/headers/sfxheaders3.asm           |  76 +--
 audio/music/bikeriding.asm              |  28 +-
 audio/music/cinnabarmansion.asm         |  30 +-
 audio/music/cities1.asm                 |  86 +--
 audio/music/dungeon1.asm                |  64 +--
 audio/music/dungeon2.asm                |  16 +-
 audio/music/indigoplateau.asm           | 132 ++---
 audio/music/introbattle.asm             | 186 +++----
 audio/music/lavender.asm                |   4 +-
 audio/music/museumguy.asm               | 124 ++---
 audio/music/routes1.asm                 | 108 ++--
 audio/music/routes2.asm                 | 128 ++---
 audio/music/routes3.asm                 | 308 +++++------
 audio/music/routes4.asm                 | 332 ++++++------
 audio/music/titlescreen.asm             | 258 ++++-----
 audio/music/vermilion.asm               |  50 +-
 audio/music/yellow/meetjessiejames.asm  | 398 +++++++-------
 audio/music/yellow/surfingpikachu.asm   | 904 ++++++++++++++++----------------
 audio/music/yellow/yellowintro.asm      | 588 ++++++++++-----------
 audio/music/yellow/yellowunusedsong.asm | 510 +++++++++---------
 audio/sfx/cymbal1_1.asm                 |   3 -
 audio/sfx/cymbal1_2.asm                 |   3 -
 audio/sfx/cymbal1_3.asm                 |   3 -
 audio/sfx/cymbal2_1.asm                 |   3 -
 audio/sfx/cymbal2_2.asm                 |   3 -
 audio/sfx/cymbal2_3.asm                 |   3 -
 audio/sfx/cymbal3_1.asm                 |   3 -
 audio/sfx/cymbal3_2.asm                 |   3 -
 audio/sfx/cymbal3_3.asm                 |   3 -
 audio/sfx/muted_snare1_1.asm            |   4 -
 audio/sfx/muted_snare1_2.asm            |   4 -
 audio/sfx/muted_snare1_3.asm            |   4 -
 audio/sfx/muted_snare2_1.asm            |   3 -
 audio/sfx/muted_snare2_2.asm            |   3 -
 audio/sfx/muted_snare2_3.asm            |   3 -
 audio/sfx/muted_snare3_1.asm            |   3 -
 audio/sfx/muted_snare3_2.asm            |   3 -
 audio/sfx/muted_snare3_3.asm            |   3 -
 audio/sfx/muted_snare4_1.asm            |   3 -
 audio/sfx/muted_snare4_2.asm            |   3 -
 audio/sfx/muted_snare4_3.asm            |   3 -
 audio/sfx/noise_instrument01_1.asm      |   3 +
 audio/sfx/noise_instrument01_2.asm      |   3 +
 audio/sfx/noise_instrument01_3.asm      |   3 +
 audio/sfx/noise_instrument02_1.asm      |   3 +
 audio/sfx/noise_instrument02_2.asm      |   3 +
 audio/sfx/noise_instrument02_3.asm      |   3 +
 audio/sfx/noise_instrument03_1.asm      |   3 +
 audio/sfx/noise_instrument03_2.asm      |   3 +
 audio/sfx/noise_instrument03_3.asm      |   3 +
 audio/sfx/noise_instrument04_1.asm      |   3 +
 audio/sfx/noise_instrument04_2.asm      |   3 +
 audio/sfx/noise_instrument04_3.asm      |   3 +
 audio/sfx/noise_instrument05_1.asm      |   8 +
 audio/sfx/noise_instrument05_2.asm      |   8 +
 audio/sfx/noise_instrument05_3.asm      |   8 +
 audio/sfx/noise_instrument06_1.asm      |   3 +
 audio/sfx/noise_instrument06_2.asm      |   3 +
 audio/sfx/noise_instrument06_3.asm      |   3 +
 audio/sfx/noise_instrument07_1.asm      |   4 +
 audio/sfx/noise_instrument07_2.asm      |   4 +
 audio/sfx/noise_instrument07_3.asm      |   4 +
 audio/sfx/noise_instrument08_1.asm      |   3 +
 audio/sfx/noise_instrument08_2.asm      |   3 +
 audio/sfx/noise_instrument08_3.asm      |   3 +
 audio/sfx/noise_instrument09_1.asm      |   3 +
 audio/sfx/noise_instrument09_2.asm      |   3 +
 audio/sfx/noise_instrument09_3.asm      |   3 +
 audio/sfx/noise_instrument10_1.asm      |   3 +
 audio/sfx/noise_instrument10_2.asm      |   3 +
 audio/sfx/noise_instrument10_3.asm      |   3 +
 audio/sfx/noise_instrument11_1.asm      |   3 +
 audio/sfx/noise_instrument11_2.asm      |   3 +
 audio/sfx/noise_instrument11_3.asm      |   3 +
 audio/sfx/noise_instrument12_1.asm      |   3 +
 audio/sfx/noise_instrument12_2.asm      |   3 +
 audio/sfx/noise_instrument12_3.asm      |   3 +
 audio/sfx/noise_instrument13_1.asm      |   3 +
 audio/sfx/noise_instrument13_2.asm      |   3 +
 audio/sfx/noise_instrument13_3.asm      |   3 +
 audio/sfx/noise_instrument14_1.asm      |   3 +
 audio/sfx/noise_instrument14_2.asm      |   3 +
 audio/sfx/noise_instrument14_3.asm      |   3 +
 audio/sfx/noise_instrument15_1.asm      |   4 +
 audio/sfx/noise_instrument15_2.asm      |   4 +
 audio/sfx/noise_instrument15_3.asm      |   4 +
 audio/sfx/noise_instrument16_1.asm      |   4 +
 audio/sfx/noise_instrument16_2.asm      |   4 +
 audio/sfx/noise_instrument16_3.asm      |   4 +
 audio/sfx/noise_instrument17_1.asm      |   3 +
 audio/sfx/noise_instrument17_2.asm      |   3 +
 audio/sfx/noise_instrument17_3.asm      |   3 +
 audio/sfx/noise_instrument18_1.asm      |   3 +
 audio/sfx/noise_instrument18_2.asm      |   3 +
 audio/sfx/noise_instrument18_3.asm      |   3 +
 audio/sfx/noise_instrument19_1.asm      |   3 +
 audio/sfx/noise_instrument19_2.asm      |   3 +
 audio/sfx/noise_instrument19_3.asm      |   3 +
 audio/sfx/snare1_1.asm                  |   3 -
 audio/sfx/snare1_2.asm                  |   3 -
 audio/sfx/snare1_3.asm                  |   3 -
 audio/sfx/snare2_1.asm                  |   3 -
 audio/sfx/snare2_2.asm                  |   3 -
 audio/sfx/snare2_3.asm                  |   3 -
 audio/sfx/snare3_1.asm                  |   3 -
 audio/sfx/snare3_2.asm                  |   3 -
 audio/sfx/snare3_3.asm                  |   3 -
 audio/sfx/snare4_1.asm                  |   3 -
 audio/sfx/snare4_2.asm                  |   3 -
 audio/sfx/snare4_3.asm                  |   3 -
 audio/sfx/snare5_1.asm                  |   8 -
 audio/sfx/snare5_2.asm                  |   8 -
 audio/sfx/snare5_3.asm                  |   8 -
 audio/sfx/snare6_1.asm                  |   3 -
 audio/sfx/snare6_2.asm                  |   3 -
 audio/sfx/snare6_3.asm                  |   3 -
 audio/sfx/snare7_1.asm                  |   3 -
 audio/sfx/snare7_2.asm                  |   3 -
 audio/sfx/snare7_3.asm                  |   3 -
 audio/sfx/snare8_1.asm                  |   3 -
 audio/sfx/snare8_2.asm                  |   3 -
 audio/sfx/snare8_3.asm                  |   3 -
 audio/sfx/snare9_1.asm                  |   3 -
 audio/sfx/snare9_2.asm                  |   3 -
 audio/sfx/snare9_3.asm                  |   3 -
 audio/sfx/triangle1_1.asm               |   3 -
 audio/sfx/triangle1_2.asm               |   3 -
 audio/sfx/triangle1_3.asm               |   3 -
 audio/sfx/triangle2_1.asm               |   4 -
 audio/sfx/triangle2_2.asm               |   4 -
 audio/sfx/triangle2_3.asm               |   4 -
 audio/sfx/triangle3_1.asm               |   4 -
 audio/sfx/triangle3_2.asm               |   4 -
 audio/sfx/triangle3_3.asm               |   4 -
 constants/music_constants.asm           |  40 +-
 macros/audio_macros.asm                 | 112 +---
 139 files changed, 2524 insertions(+), 2614 deletions(-)
 delete mode 100644 audio/sfx/cymbal1_1.asm
 delete mode 100644 audio/sfx/cymbal1_2.asm
 delete mode 100644 audio/sfx/cymbal1_3.asm
 delete mode 100644 audio/sfx/cymbal2_1.asm
 delete mode 100644 audio/sfx/cymbal2_2.asm
 delete mode 100644 audio/sfx/cymbal2_3.asm
 delete mode 100644 audio/sfx/cymbal3_1.asm
 delete mode 100644 audio/sfx/cymbal3_2.asm
 delete mode 100644 audio/sfx/cymbal3_3.asm
 delete mode 100644 audio/sfx/muted_snare1_1.asm
 delete mode 100644 audio/sfx/muted_snare1_2.asm
 delete mode 100644 audio/sfx/muted_snare1_3.asm
 delete mode 100644 audio/sfx/muted_snare2_1.asm
 delete mode 100644 audio/sfx/muted_snare2_2.asm
 delete mode 100644 audio/sfx/muted_snare2_3.asm
 delete mode 100644 audio/sfx/muted_snare3_1.asm
 delete mode 100644 audio/sfx/muted_snare3_2.asm
 delete mode 100644 audio/sfx/muted_snare3_3.asm
 delete mode 100644 audio/sfx/muted_snare4_1.asm
 delete mode 100644 audio/sfx/muted_snare4_2.asm
 delete mode 100644 audio/sfx/muted_snare4_3.asm
 create mode 100644 audio/sfx/noise_instrument01_1.asm
 create mode 100644 audio/sfx/noise_instrument01_2.asm
 create mode 100644 audio/sfx/noise_instrument01_3.asm
 create mode 100644 audio/sfx/noise_instrument02_1.asm
 create mode 100644 audio/sfx/noise_instrument02_2.asm
 create mode 100644 audio/sfx/noise_instrument02_3.asm
 create mode 100644 audio/sfx/noise_instrument03_1.asm
 create mode 100644 audio/sfx/noise_instrument03_2.asm
 create mode 100644 audio/sfx/noise_instrument03_3.asm
 create mode 100644 audio/sfx/noise_instrument04_1.asm
 create mode 100644 audio/sfx/noise_instrument04_2.asm
 create mode 100644 audio/sfx/noise_instrument04_3.asm
 create mode 100644 audio/sfx/noise_instrument05_1.asm
 create mode 100644 audio/sfx/noise_instrument05_2.asm
 create mode 100644 audio/sfx/noise_instrument05_3.asm
 create mode 100644 audio/sfx/noise_instrument06_1.asm
 create mode 100644 audio/sfx/noise_instrument06_2.asm
 create mode 100644 audio/sfx/noise_instrument06_3.asm
 create mode 100644 audio/sfx/noise_instrument07_1.asm
 create mode 100644 audio/sfx/noise_instrument07_2.asm
 create mode 100644 audio/sfx/noise_instrument07_3.asm
 create mode 100644 audio/sfx/noise_instrument08_1.asm
 create mode 100644 audio/sfx/noise_instrument08_2.asm
 create mode 100644 audio/sfx/noise_instrument08_3.asm
 create mode 100644 audio/sfx/noise_instrument09_1.asm
 create mode 100644 audio/sfx/noise_instrument09_2.asm
 create mode 100644 audio/sfx/noise_instrument09_3.asm
 create mode 100644 audio/sfx/noise_instrument10_1.asm
 create mode 100644 audio/sfx/noise_instrument10_2.asm
 create mode 100644 audio/sfx/noise_instrument10_3.asm
 create mode 100644 audio/sfx/noise_instrument11_1.asm
 create mode 100644 audio/sfx/noise_instrument11_2.asm
 create mode 100644 audio/sfx/noise_instrument11_3.asm
 create mode 100644 audio/sfx/noise_instrument12_1.asm
 create mode 100644 audio/sfx/noise_instrument12_2.asm
 create mode 100644 audio/sfx/noise_instrument12_3.asm
 create mode 100644 audio/sfx/noise_instrument13_1.asm
 create mode 100644 audio/sfx/noise_instrument13_2.asm
 create mode 100644 audio/sfx/noise_instrument13_3.asm
 create mode 100644 audio/sfx/noise_instrument14_1.asm
 create mode 100644 audio/sfx/noise_instrument14_2.asm
 create mode 100644 audio/sfx/noise_instrument14_3.asm
 create mode 100644 audio/sfx/noise_instrument15_1.asm
 create mode 100644 audio/sfx/noise_instrument15_2.asm
 create mode 100644 audio/sfx/noise_instrument15_3.asm
 create mode 100644 audio/sfx/noise_instrument16_1.asm
 create mode 100644 audio/sfx/noise_instrument16_2.asm
 create mode 100644 audio/sfx/noise_instrument16_3.asm
 create mode 100644 audio/sfx/noise_instrument17_1.asm
 create mode 100644 audio/sfx/noise_instrument17_2.asm
 create mode 100644 audio/sfx/noise_instrument17_3.asm
 create mode 100644 audio/sfx/noise_instrument18_1.asm
 create mode 100644 audio/sfx/noise_instrument18_2.asm
 create mode 100644 audio/sfx/noise_instrument18_3.asm
 create mode 100644 audio/sfx/noise_instrument19_1.asm
 create mode 100644 audio/sfx/noise_instrument19_2.asm
 create mode 100644 audio/sfx/noise_instrument19_3.asm
 delete mode 100644 audio/sfx/snare1_1.asm
 delete mode 100644 audio/sfx/snare1_2.asm
 delete mode 100644 audio/sfx/snare1_3.asm
 delete mode 100644 audio/sfx/snare2_1.asm
 delete mode 100644 audio/sfx/snare2_2.asm
 delete mode 100644 audio/sfx/snare2_3.asm
 delete mode 100644 audio/sfx/snare3_1.asm
 delete mode 100644 audio/sfx/snare3_2.asm
 delete mode 100644 audio/sfx/snare3_3.asm
 delete mode 100644 audio/sfx/snare4_1.asm
 delete mode 100644 audio/sfx/snare4_2.asm
 delete mode 100644 audio/sfx/snare4_3.asm
 delete mode 100644 audio/sfx/snare5_1.asm
 delete mode 100644 audio/sfx/snare5_2.asm
 delete mode 100644 audio/sfx/snare5_3.asm
 delete mode 100644 audio/sfx/snare6_1.asm
 delete mode 100644 audio/sfx/snare6_2.asm
 delete mode 100644 audio/sfx/snare6_3.asm
 delete mode 100644 audio/sfx/snare7_1.asm
 delete mode 100644 audio/sfx/snare7_2.asm
 delete mode 100644 audio/sfx/snare7_3.asm
 delete mode 100644 audio/sfx/snare8_1.asm
 delete mode 100644 audio/sfx/snare8_2.asm
 delete mode 100644 audio/sfx/snare8_3.asm
 delete mode 100644 audio/sfx/snare9_1.asm
 delete mode 100644 audio/sfx/snare9_2.asm
 delete mode 100644 audio/sfx/snare9_3.asm
 delete mode 100644 audio/sfx/triangle1_1.asm
 delete mode 100644 audio/sfx/triangle1_2.asm
 delete mode 100644 audio/sfx/triangle1_3.asm
 delete mode 100644 audio/sfx/triangle2_1.asm
 delete mode 100644 audio/sfx/triangle2_2.asm
 delete mode 100644 audio/sfx/triangle2_3.asm
 delete mode 100644 audio/sfx/triangle3_1.asm
 delete mode 100644 audio/sfx/triangle3_2.asm
 delete mode 100644 audio/sfx/triangle3_3.asm

(limited to 'macros')

diff --git a/audio.asm b/audio.asm
index 4305657c..70d81649 100644
--- a/audio.asm
+++ b/audio.asm
@@ -23,25 +23,25 @@ INCLUDE "audio/headers/musicheaders3.asm"
 
 SECTION "Sound Effects 1", ROMX ; BANK $02
 
-INCLUDE "audio/sfx/snare1_1.asm"
-INCLUDE "audio/sfx/snare2_1.asm"
-INCLUDE "audio/sfx/snare3_1.asm"
-INCLUDE "audio/sfx/snare4_1.asm"
-INCLUDE "audio/sfx/snare5_1.asm"
-INCLUDE "audio/sfx/triangle1_1.asm"
-INCLUDE "audio/sfx/triangle2_1.asm"
-INCLUDE "audio/sfx/snare6_1.asm"
-INCLUDE "audio/sfx/snare7_1.asm"
-INCLUDE "audio/sfx/snare8_1.asm"
-INCLUDE "audio/sfx/snare9_1.asm"
-INCLUDE "audio/sfx/cymbal1_1.asm"
-INCLUDE "audio/sfx/cymbal2_1.asm"
-INCLUDE "audio/sfx/cymbal3_1.asm"
-INCLUDE "audio/sfx/muted_snare1_1.asm"
-INCLUDE "audio/sfx/triangle3_1.asm"
-INCLUDE "audio/sfx/muted_snare2_1.asm"
-INCLUDE "audio/sfx/muted_snare3_1.asm"
-INCLUDE "audio/sfx/muted_snare4_1.asm"
+INCLUDE "audio/sfx/noise_instrument01_1.asm"
+INCLUDE "audio/sfx/noise_instrument02_1.asm"
+INCLUDE "audio/sfx/noise_instrument03_1.asm"
+INCLUDE "audio/sfx/noise_instrument04_1.asm"
+INCLUDE "audio/sfx/noise_instrument05_1.asm"
+INCLUDE "audio/sfx/noise_instrument06_1.asm"
+INCLUDE "audio/sfx/noise_instrument07_1.asm"
+INCLUDE "audio/sfx/noise_instrument08_1.asm"
+INCLUDE "audio/sfx/noise_instrument09_1.asm"
+INCLUDE "audio/sfx/noise_instrument10_1.asm"
+INCLUDE "audio/sfx/noise_instrument11_1.asm"
+INCLUDE "audio/sfx/noise_instrument12_1.asm"
+INCLUDE "audio/sfx/noise_instrument13_1.asm"
+INCLUDE "audio/sfx/noise_instrument14_1.asm"
+INCLUDE "audio/sfx/noise_instrument15_1.asm"
+INCLUDE "audio/sfx/noise_instrument16_1.asm"
+INCLUDE "audio/sfx/noise_instrument17_1.asm"
+INCLUDE "audio/sfx/noise_instrument18_1.asm"
+INCLUDE "audio/sfx/noise_instrument19_1.asm"
 
 Audio1_WavePointers: INCLUDE "audio/wave_instruments.asm"
 
@@ -122,25 +122,25 @@ INCLUDE "audio/sfx/cry22_1.asm"
 
 SECTION "Sound Effects 2", ROMX ; BANK $08
 
-INCLUDE "audio/sfx/snare1_2.asm"
-INCLUDE "audio/sfx/snare2_2.asm"
-INCLUDE "audio/sfx/snare3_2.asm"
-INCLUDE "audio/sfx/snare4_2.asm"
-INCLUDE "audio/sfx/snare5_2.asm"
-INCLUDE "audio/sfx/triangle1_2.asm"
-INCLUDE "audio/sfx/triangle2_2.asm"
-INCLUDE "audio/sfx/snare6_2.asm"
-INCLUDE "audio/sfx/snare7_2.asm"
-INCLUDE "audio/sfx/snare8_2.asm"
-INCLUDE "audio/sfx/snare9_2.asm"
-INCLUDE "audio/sfx/cymbal1_2.asm"
-INCLUDE "audio/sfx/cymbal2_2.asm"
-INCLUDE "audio/sfx/cymbal3_2.asm"
-INCLUDE "audio/sfx/muted_snare1_2.asm"
-INCLUDE "audio/sfx/triangle3_2.asm"
-INCLUDE "audio/sfx/muted_snare2_2.asm"
-INCLUDE "audio/sfx/muted_snare3_2.asm"
-INCLUDE "audio/sfx/muted_snare4_2.asm"
+INCLUDE "audio/sfx/noise_instrument01_2.asm"
+INCLUDE "audio/sfx/noise_instrument02_2.asm"
+INCLUDE "audio/sfx/noise_instrument03_2.asm"
+INCLUDE "audio/sfx/noise_instrument04_2.asm"
+INCLUDE "audio/sfx/noise_instrument05_2.asm"
+INCLUDE "audio/sfx/noise_instrument06_2.asm"
+INCLUDE "audio/sfx/noise_instrument07_2.asm"
+INCLUDE "audio/sfx/noise_instrument08_2.asm"
+INCLUDE "audio/sfx/noise_instrument09_2.asm"
+INCLUDE "audio/sfx/noise_instrument10_2.asm"
+INCLUDE "audio/sfx/noise_instrument11_2.asm"
+INCLUDE "audio/sfx/noise_instrument12_2.asm"
+INCLUDE "audio/sfx/noise_instrument13_2.asm"
+INCLUDE "audio/sfx/noise_instrument14_2.asm"
+INCLUDE "audio/sfx/noise_instrument15_2.asm"
+INCLUDE "audio/sfx/noise_instrument16_2.asm"
+INCLUDE "audio/sfx/noise_instrument17_2.asm"
+INCLUDE "audio/sfx/noise_instrument18_2.asm"
+INCLUDE "audio/sfx/noise_instrument19_2.asm"
 
 Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm"
 
@@ -247,25 +247,25 @@ INCLUDE "audio/sfx/cry22_2.asm"
 
 SECTION "Sound Effects 3", ROMX ; BANK $1f
 
-INCLUDE "audio/sfx/snare1_3.asm"
-INCLUDE "audio/sfx/snare2_3.asm"
-INCLUDE "audio/sfx/snare3_3.asm"
-INCLUDE "audio/sfx/snare4_3.asm"
-INCLUDE "audio/sfx/snare5_3.asm"
-INCLUDE "audio/sfx/triangle1_3.asm"
-INCLUDE "audio/sfx/triangle2_3.asm"
-INCLUDE "audio/sfx/snare6_3.asm"
-INCLUDE "audio/sfx/snare7_3.asm"
-INCLUDE "audio/sfx/snare8_3.asm"
-INCLUDE "audio/sfx/snare9_3.asm"
-INCLUDE "audio/sfx/cymbal1_3.asm"
-INCLUDE "audio/sfx/cymbal2_3.asm"
-INCLUDE "audio/sfx/cymbal3_3.asm"
-INCLUDE "audio/sfx/muted_snare1_3.asm"
-INCLUDE "audio/sfx/triangle3_3.asm"
-INCLUDE "audio/sfx/muted_snare2_3.asm"
-INCLUDE "audio/sfx/muted_snare3_3.asm"
-INCLUDE "audio/sfx/muted_snare4_3.asm"
+INCLUDE "audio/sfx/noise_instrument01_3.asm"
+INCLUDE "audio/sfx/noise_instrument02_3.asm"
+INCLUDE "audio/sfx/noise_instrument03_3.asm"
+INCLUDE "audio/sfx/noise_instrument04_3.asm"
+INCLUDE "audio/sfx/noise_instrument05_3.asm"
+INCLUDE "audio/sfx/noise_instrument06_3.asm"
+INCLUDE "audio/sfx/noise_instrument07_3.asm"
+INCLUDE "audio/sfx/noise_instrument08_3.asm"
+INCLUDE "audio/sfx/noise_instrument09_3.asm"
+INCLUDE "audio/sfx/noise_instrument10_3.asm"
+INCLUDE "audio/sfx/noise_instrument11_3.asm"
+INCLUDE "audio/sfx/noise_instrument12_3.asm"
+INCLUDE "audio/sfx/noise_instrument13_3.asm"
+INCLUDE "audio/sfx/noise_instrument14_3.asm"
+INCLUDE "audio/sfx/noise_instrument15_3.asm"
+INCLUDE "audio/sfx/noise_instrument16_3.asm"
+INCLUDE "audio/sfx/noise_instrument17_3.asm"
+INCLUDE "audio/sfx/noise_instrument18_3.asm"
+INCLUDE "audio/sfx/noise_instrument19_3.asm"
 
 Audio3_WavePointers: INCLUDE "audio/wave_instruments.asm"
 
diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm
index cc50dddd..2d5eca4a 100644
--- a/audio/headers/sfxheaders1.asm
+++ b/audio/headers/sfxheaders1.asm
@@ -1,62 +1,62 @@
 SFX_Headers_1::
 	db $ff, $ff, $ff ; padding
 
-SFX_Snare1_1::
-	audio_header SFX_Snare1_1, Ch8
+SFX_Noise_Instrument01_1::
+	audio_header SFX_Noise_Instrument01_1, Ch8
 
-SFX_Snare2_1::
-	audio_header SFX_Snare2_1, Ch8
+SFX_Noise_Instrument02_1::
+	audio_header SFX_Noise_Instrument02_1, Ch8
 
-SFX_Snare3_1::
-	audio_header SFX_Snare3_1, Ch8
+SFX_Noise_Instrument03_1::
+	audio_header SFX_Noise_Instrument03_1, Ch8
 
-SFX_Snare4_1::
-	audio_header SFX_Snare4_1, Ch8
+SFX_Noise_Instrument04_1::
+	audio_header SFX_Noise_Instrument04_1, Ch8
 
-SFX_Snare5_1::
-	audio_header SFX_Snare5_1, Ch8
+SFX_Noise_Instrument05_1::
+	audio_header SFX_Noise_Instrument05_1, Ch8
 
-SFX_Triangle1_1::
-	audio_header SFX_Triangle1_1, Ch8
+SFX_Noise_Instrument06_1::
+	audio_header SFX_Noise_Instrument06_1, Ch8
 
-SFX_Triangle2_1::
-	audio_header SFX_Triangle2_1, Ch8
+SFX_Noise_Instrument07_1::
+	audio_header SFX_Noise_Instrument07_1, Ch8
 
-SFX_Snare6_1::
-	audio_header SFX_Snare6_1, Ch8
+SFX_Noise_Instrument08_1::
+	audio_header SFX_Noise_Instrument08_1, Ch8
 
-SFX_Snare7_1::
-	audio_header SFX_Snare7_1, Ch8
+SFX_Noise_Instrument09_1::
+	audio_header SFX_Noise_Instrument09_1, Ch8
 
-SFX_Snare8_1::
-	audio_header SFX_Snare8_1, Ch8
+SFX_Noise_Instrument10_1::
+	audio_header SFX_Noise_Instrument10_1, Ch8
 
-SFX_Snare9_1::
-	audio_header SFX_Snare9_1, Ch8
+SFX_Noise_Instrument11_1::
+	audio_header SFX_Noise_Instrument11_1, Ch8
 
-SFX_Cymbal1_1::
-	audio_header SFX_Cymbal1_1, Ch8
+SFX_Noise_Instrument12_1::
+	audio_header SFX_Noise_Instrument12_1, Ch8
 
-SFX_Cymbal2_1::
-	audio_header SFX_Cymbal2_1, Ch8
+SFX_Noise_Instrument13_1::
+	audio_header SFX_Noise_Instrument13_1, Ch8
 
-SFX_Cymbal3_1::
-	audio_header SFX_Cymbal3_1, Ch8
+SFX_Noise_Instrument14_1::
+	audio_header SFX_Noise_Instrument14_1, Ch8
 
-SFX_Muted_Snare1_1::
-	audio_header SFX_Muted_Snare1_1, Ch8
+SFX_Noise_Instrument15_1::
+	audio_header SFX_Noise_Instrument15_1, Ch8
 
-SFX_Triangle3_1::
-	audio_header SFX_Triangle3_1, Ch8
+SFX_Noise_Instrument16_1::
+	audio_header SFX_Noise_Instrument16_1, Ch8
 
-SFX_Muted_Snare2_1::
-	audio_header SFX_Muted_Snare2_1, Ch8
+SFX_Noise_Instrument17_1::
+	audio_header SFX_Noise_Instrument17_1, Ch8
 
-SFX_Muted_Snare3_1::
-	audio_header SFX_Muted_Snare3_1, Ch8
+SFX_Noise_Instrument18_1::
+	audio_header SFX_Noise_Instrument18_1, Ch8
 
-SFX_Muted_Snare4_1::
-	audio_header SFX_Muted_Snare4_1, Ch8
+SFX_Noise_Instrument19_1::
+	audio_header SFX_Noise_Instrument19_1, Ch8
 
 SFX_Cry00_1::
 	audio_header SFX_Cry00_1, Ch5, Ch6, Ch8
diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm
index 7e76325d..912d137e 100644
--- a/audio/headers/sfxheaders2.asm
+++ b/audio/headers/sfxheaders2.asm
@@ -1,62 +1,62 @@
 SFX_Headers_2::
 	db $ff, $ff, $ff ; padding
 
-SFX_Snare1_2::
-	audio_header SFX_Snare1_2, Ch8
+SFX_Noise_Instrument01_2::
+	audio_header SFX_Noise_Instrument01_2, Ch8
 
-SFX_Snare2_2::
-	audio_header SFX_Snare2_2, Ch8
+SFX_Noise_Instrument02_2::
+	audio_header SFX_Noise_Instrument02_2, Ch8
 
-SFX_Snare3_2::
-	audio_header SFX_Snare3_2, Ch8
+SFX_Noise_Instrument03_2::
+	audio_header SFX_Noise_Instrument03_2, Ch8
 
-SFX_Snare4_2::
-	audio_header SFX_Snare4_2, Ch8
+SFX_Noise_Instrument04_2::
+	audio_header SFX_Noise_Instrument04_2, Ch8
 
-SFX_Snare5_2::
-	audio_header SFX_Snare5_2, Ch8
+SFX_Noise_Instrument05_2::
+	audio_header SFX_Noise_Instrument05_2, Ch8
 
-SFX_Triangle1_2::
-	audio_header SFX_Triangle1_2, Ch8
+SFX_Noise_Instrument06_2::
+	audio_header SFX_Noise_Instrument06_2, Ch8
 
-SFX_Triangle2_2::
-	audio_header SFX_Triangle2_2, Ch8
+SFX_Noise_Instrument07_2::
+	audio_header SFX_Noise_Instrument07_2, Ch8
 
-SFX_Snare6_2::
-	audio_header SFX_Snare6_2, Ch8
+SFX_Noise_Instrument08_2::
+	audio_header SFX_Noise_Instrument08_2, Ch8
 
-SFX_Snare7_2::
-	audio_header SFX_Snare7_2, Ch8
+SFX_Noise_Instrument09_2::
+	audio_header SFX_Noise_Instrument09_2, Ch8
 
-SFX_Snare8_2::
-	audio_header SFX_Snare8_2, Ch8
+SFX_Noise_Instrument10_2::
+	audio_header SFX_Noise_Instrument10_2, Ch8
 
-SFX_Snare9_2::
-	audio_header SFX_Snare9_2, Ch8
+SFX_Noise_Instrument11_2::
+	audio_header SFX_Noise_Instrument11_2, Ch8
 
-SFX_Cymbal1_2::
-	audio_header SFX_Cymbal1_2, Ch8
+SFX_Noise_Instrument12_2::
+	audio_header SFX_Noise_Instrument12_2, Ch8
 
-SFX_Cymbal2_2::
-	audio_header SFX_Cymbal2_2, Ch8
+SFX_Noise_Instrument13_2::
+	audio_header SFX_Noise_Instrument13_2, Ch8
 
-SFX_Cymbal3_2::
-	audio_header SFX_Cymbal3_2, Ch8
+SFX_Noise_Instrument14_2::
+	audio_header SFX_Noise_Instrument14_2, Ch8
 
-SFX_Muted_Snare1_2::
-	audio_header SFX_Muted_Snare1_2, Ch8
+SFX_Noise_Instrument15_2::
+	audio_header SFX_Noise_Instrument15_2, Ch8
 
-SFX_Triangle3_2::
-	audio_header SFX_Triangle3_2, Ch8
+SFX_Noise_Instrument16_2::
+	audio_header SFX_Noise_Instrument16_2, Ch8
 
-SFX_Muted_Snare2_2::
-	audio_header SFX_Muted_Snare2_2, Ch8
+SFX_Noise_Instrument17_2::
+	audio_header SFX_Noise_Instrument17_2, Ch8
 
-SFX_Muted_Snare3_2::
-	audio_header SFX_Muted_Snare3_2, Ch8
+SFX_Noise_Instrument18_2::
+	audio_header SFX_Noise_Instrument18_2, Ch8
 
-SFX_Muted_Snare4_2::
-	audio_header SFX_Muted_Snare4_2, Ch8
+SFX_Noise_Instrument19_2::
+	audio_header SFX_Noise_Instrument19_2, Ch8
 
 SFX_Cry00_2::
 	audio_header SFX_Cry00_2, Ch5, Ch6, Ch8
diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm
index 6fb67546..2732767f 100644
--- a/audio/headers/sfxheaders3.asm
+++ b/audio/headers/sfxheaders3.asm
@@ -1,62 +1,62 @@
 SFX_Headers_3::
 	db $ff, $ff, $ff ; padding
 
-SFX_Snare1_3::
-	audio_header SFX_Snare1_3, Ch8
+SFX_Noise_Instrument01_3::
+	audio_header SFX_Noise_Instrument01_3, Ch8
 
-SFX_Snare2_3::
-	audio_header SFX_Snare2_3, Ch8
+SFX_Noise_Instrument02_3::
+	audio_header SFX_Noise_Instrument02_3, Ch8
 
-SFX_Snare3_3::
-	audio_header SFX_Snare3_3, Ch8
+SFX_Noise_Instrument03_3::
+	audio_header SFX_Noise_Instrument03_3, Ch8
 
-SFX_Snare4_3::
-	audio_header SFX_Snare4_3, Ch8
+SFX_Noise_Instrument04_3::
+	audio_header SFX_Noise_Instrument04_3, Ch8
 
-SFX_Snare5_3::
-	audio_header SFX_Snare5_3, Ch8
+SFX_Noise_Instrument05_3::
+	audio_header SFX_Noise_Instrument05_3, Ch8
 
-SFX_Triangle1_3::
-	audio_header SFX_Triangle1_3, Ch8
+SFX_Noise_Instrument06_3::
+	audio_header SFX_Noise_Instrument06_3, Ch8
 
-SFX_Triangle2_3::
-	audio_header SFX_Triangle2_3, Ch8
+SFX_Noise_Instrument07_3::
+	audio_header SFX_Noise_Instrument07_3, Ch8
 
-SFX_Snare6_3::
-	audio_header SFX_Snare6_3, Ch8
+SFX_Noise_Instrument08_3::
+	audio_header SFX_Noise_Instrument08_3, Ch8
 
-SFX_Snare7_3::
-	audio_header SFX_Snare7_3, Ch8
+SFX_Noise_Instrument09_3::
+	audio_header SFX_Noise_Instrument09_3, Ch8
 
-SFX_Snare8_3::
-	audio_header SFX_Snare8_3, Ch8
+SFX_Noise_Instrument10_3::
+	audio_header SFX_Noise_Instrument10_3, Ch8
 
-SFX_Snare9_3::
-	audio_header SFX_Snare9_3, Ch8
+SFX_Noise_Instrument11_3::
+	audio_header SFX_Noise_Instrument11_3, Ch8
 
-SFX_Cymbal1_3::
-	audio_header SFX_Cymbal1_3, Ch8
+SFX_Noise_Instrument12_3::
+	audio_header SFX_Noise_Instrument12_3, Ch8
 
-SFX_Cymbal2_3::
-	audio_header SFX_Cymbal2_3, Ch8
+SFX_Noise_Instrument13_3::
+	audio_header SFX_Noise_Instrument13_3, Ch8
 
-SFX_Cymbal3_3::
-	audio_header SFX_Cymbal3_3, Ch8
+SFX_Noise_Instrument14_3::
+	audio_header SFX_Noise_Instrument14_3, Ch8
 
-SFX_Muted_Snare1_3::
-	audio_header SFX_Muted_Snare1_3, Ch8
+SFX_Noise_Instrument15_3::
+	audio_header SFX_Noise_Instrument15_3, Ch8
 
-SFX_Triangle3_3::
-	audio_header SFX_Triangle3_3, Ch8
+SFX_Noise_Instrument16_3::
+	audio_header SFX_Noise_Instrument16_3, Ch8
 
-SFX_Muted_Snare2_3::
-	audio_header SFX_Muted_Snare2_3, Ch8
+SFX_Noise_Instrument17_3::
+	audio_header SFX_Noise_Instrument17_3, Ch8
 
-SFX_Muted_Snare3_3::
-	audio_header SFX_Muted_Snare3_3, Ch8
+SFX_Noise_Instrument18_3::
+	audio_header SFX_Noise_Instrument18_3, Ch8
 
-SFX_Muted_Snare4_3::
-	audio_header SFX_Muted_Snare4_3, Ch8
+SFX_Noise_Instrument19_3::
+	audio_header SFX_Noise_Instrument19_3, Ch8
 
 SFX_Cry00_3::
 	audio_header SFX_Cry00_3, Ch5, Ch6, Ch8
diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm
index 58f1b7a5..43c8618e 100644
--- a/audio/music/bikeriding.asm
+++ b/audio/music/bikeriding.asm
@@ -671,34 +671,34 @@ Music_BikeRiding_branch_7de6a::
 
 Music_BikeRiding_branch_7dea7::
 	rest 2
-	triangle3 2
+	dnote 16, 2
 	rest 2
-	triangle3 2
+	dnote 16, 2
 	rest 2
-	triangle3 2
+	dnote 16, 2
 	rest 2
-	triangle3 2
+	dnote 16, 2
 	sound_ret
 
 Music_BikeRiding_branch_7deb4::
 	rest 2
-	triangle3 2
+	dnote 16, 2
 	rest 2
-	triangle3 2
+	dnote 16, 2
 	rest 2
-	triangle3 2
-	triangle3 2
-	triangle3 2
+	dnote 16, 2
+	dnote 16, 2
+	dnote 16, 2
 	sound_ret
 
 Music_BikeRiding_branch_7dec2::
 	rest 2
-	triangle3 2
+	dnote 16, 2
 	rest 2
-	triangle3 2
+	dnote 16, 2
 	rest 2
-	triangle3 2
+	dnote 16, 2
 	rest 2
-	triangle3 1
-	triangle3 1
+	dnote 16, 1
+	dnote 16, 1
 	sound_ret
diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm
index ff3de714..165c4e98 100644
--- a/audio/music/cinnabarmansion.asm
+++ b/audio/music/cinnabarmansion.asm
@@ -151,22 +151,22 @@ Music_CinnabarMansion_Ch4::
 	rest 16
 
 Music_CinnabarMansion_branch_7edb5::
-	cymbal1 2
-	cymbal1 2
-	cymbal2 4
-	cymbal1 2
-	cymbal1 2
-	cymbal2 4
-	cymbal1 2
-	cymbal1 2
-	cymbal2 4
-	cymbal1 2
-	cymbal1 2
-	cymbal3 4
-	cymbal1 2
-	cymbal1 2
+	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
 	rest 2
 	rest 10
 	rest 8
-	cymbal3 8
+	dnote 14, 8
 	sound_loop 0, Music_CinnabarMansion_branch_7edb5
diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm
index 3aef872b..006546ef 100644
--- a/audio/music/cities1.asm
+++ b/audio/music/cities1.asm
@@ -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
-	triangle1 6
-	triangle1 6
-	triangle2 4
+	dnote 6, 6
+	dnote 6, 6
+	dnote 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
-	triangle1 6
-	triangle1 6
-	triangle2 2
-	triangle1 2
-	triangle1 6
-	triangle1 6
-	triangle1 4
-	triangle1 6
-	snare6 6
-	snare6 4
+	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
 	sound_loop 0, Music_Cities1_Ch4
 
 Music_Cities1_branch_ad36::
-	snare6 6
-	snare6 6
-	snare6 4
-	snare6 6
-	snare6 6
-	snare6 2
-	snare6 2
+	dnote 8, 6
+	dnote 8, 6
+	dnote 8, 4
+	dnote 8, 6
+	dnote 8, 6
+	dnote 8, 2
+	dnote 8, 2
 	sound_ret
 
 Music_Cities1_branch_ad45::
-	snare6 6
-	snare6 6
-	snare6 4
-	snare6 6
-	snare6 6
-	snare6 4
+	dnote 8, 6
+	dnote 8, 6
+	dnote 8, 4
+	dnote 8, 6
+	dnote 8, 6
+	dnote 8, 4
 	sound_ret
 
 Music_Cities1_branch_ad52::
-	triangle1 6
-	triangle1 6
-	triangle2 4
-	triangle1 6
-	triangle1 6
-	triangle2 4
+	dnote 6, 6
+	dnote 6, 6
+	dnote 7, 4
+	dnote 6, 6
+	dnote 6, 6
+	dnote 7, 4
 	sound_ret
 
 Music_Cities1_branch_ad5f::
-	triangle1 6
-	triangle1 6
-	triangle2 4
-	triangle1 6
-	triangle1 6
-	triangle2 2
-	triangle1 2
+	dnote 6, 6
+	dnote 6, 6
+	dnote 7, 4
+	dnote 6, 6
+	dnote 6, 6
+	dnote 7, 2
+	dnote 6, 2
 	sound_ret
 
 Music_Cities1_branch_ad6e::
-	triangle1 6
-	triangle1 6
-	triangle2 2
-	triangle2 2
+	dnote 6, 6
+	dnote 6, 6
+	dnote 7, 2
+	dnote 7, 2
 	sound_ret
diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm
index a28b31e6..996a3ea6 100644
--- a/audio/music/dungeon1.asm
+++ b/audio/music/dungeon1.asm
@@ -599,25 +599,25 @@ Music_Dungeon1_branch_7e177::
 Music_Dungeon1_Ch4::
 	dspeed 12
 	rest 14
-	cymbal1 1
-	cymbal1 1
+	dnote 12, 1
+	dnote 12, 1
 
 Music_Dungeon1_branch_7e190::
 	sound_call Music_Dungeon1_branch_7e1f1
 	sound_loop 3, Music_Dungeon1_branch_7e190
-	cymbal2 4
-	cymbal1 4
-	cymbal2 4
-	cymbal1 2
-	cymbal1 2
+	dnote 13, 4
+	dnote 12, 4
+	dnote 13, 4
+	dnote 12, 2
+	dnote 12, 2
 
 Music_Dungeon1_branch_7e1a1::
 	sound_call Music_Dungeon1_branch_7e1f1
 	sound_loop 3, Music_Dungeon1_branch_7e1a1
-	cymbal2 4
-	cymbal1 4
-	cymbal2 4
-	cymbal2 4
+	dnote 13, 4
+	dnote 12, 4
+	dnote 13, 4
+	dnote 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
-	snare7 4
-	snare8 4
-	snare8 4
+	dnote 9, 4
+	dnote 10, 4
+	dnote 10, 4
 	rest 2
-	snare7 2
-	cymbal2 4
+	dnote 9, 2
+	dnote 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
-	cymbal1 4
-	cymbal1 4
-	cymbal1 4
+	dnote 12, 4
+	dnote 12, 4
+	dnote 12, 4
 	rest 2
-	cymbal1 1
-	cymbal1 1
+	dnote 12, 1
+	dnote 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::
-	cymbal2 4
-	cymbal1 4
-	cymbal2 4
-	cymbal1 4
+	dnote 13, 4
+	dnote 12, 4
+	dnote 13, 4
+	dnote 12, 4
 	sound_ret
 
 Music_Dungeon1_branch_7e1fa::
-	cymbal1 1
-	cymbal1 1
+	dnote 12, 1
+	dnote 12, 1
 	rest 10
-	cymbal3 4
+	dnote 14, 4
 	sound_ret
 
 Music_Dungeon1_branch_7e202::
-	snare7 4
-	snare8 4
-	snare8 4
-	snare9 4
+	dnote 9, 4
+	dnote 10, 4
+	dnote 10, 4
+	dnote 11, 4
 	sound_ret
diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm
index 807c2f40..86cb7ad2 100644
--- a/audio/music/dungeon2.asm
+++ b/audio/music/dungeon2.asm
@@ -306,12 +306,12 @@ Music_Dungeon2_Ch4::
 	dspeed 12
 
 Music_Dungeon2_branch_7e9dd::
-	cymbal1 4
-	cymbal2 4
-	cymbal1 4
-	snare8 4
-	cymbal1 4
-	cymbal2 4
-	snare9 4
-	snare7 4
+	dnote 12, 4
+	dnote 13, 4
+	dnote 12, 4
+	dnote 10, 4
+	dnote 12, 4
+	dnote 13, 4
+	dnote 11, 4
+	dnote 9, 4
 	sound_loop 0, Music_Dungeon2_branch_7e9dd
diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm
index f2ef8a7e..d237a329 100644
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -227,18 +227,18 @@ Music_IndigoPlateau_branch_a6fe::
 
 Music_IndigoPlateau_Ch4::
 	dspeed 6
-	mutedsnare2 16
-	mutedsnare2 16
-	mutedsnare2 16
-	mutedsnare2 8
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
+	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
 
 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
-	mutedsnare2 16
-	mutedsnare2 8
-	mutedsnare3 8
-	mutedsnare2 16
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 1
-	mutedsnare2 1
-	mutedsnare2 1
-	mutedsnare2 1
+	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
 	sound_loop 0, Music_IndigoPlateau_branch_a728
 
 Music_IndigoPlateau_branch_a77e::
-	mutedsnare2 4
-	mutedsnare3 4
-	mutedsnare4 4
-	mutedsnare3 4
-	mutedsnare2 4
-	mutedsnare3 4
-	mutedsnare4 4
-	mutedsnare4 2
-	mutedsnare3 2
+	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
 	sound_ret
 
 Music_IndigoPlateau_branch_a791::
-	mutedsnare2 4
-	mutedsnare3 4
-	mutedsnare4 4
-	mutedsnare3 4
-	mutedsnare2 4
-	mutedsnare3 4
-	mutedsnare4 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
+	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
 	sound_ret
 
 Music_IndigoPlateau_branch_a7a8::
-	mutedsnare2 4
-	mutedsnare3 4
-	mutedsnare2 4
-	mutedsnare3 4
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
+	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
 	sound_ret
diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm
index 4885e389..fdea3ee1 100644
--- a/audio/music/introbattle.asm
+++ b/audio/music/introbattle.asm
@@ -231,99 +231,99 @@ Music_IntroBattle_Ch3::
 
 Music_IntroBattle_Ch4::
 	dspeed 6
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 1
-	mutedsnare2 1
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare2 8
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare2 8
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare2 8
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 16
-	mutedsnare2 16
-	mutedsnare2 16
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 1
-	mutedsnare2 1
-	mutedsnare2 1
-	mutedsnare2 1
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare2 8
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare2 8
-	mutedsnare2 4
-	mutedsnare2 8
-	mutedsnare2 4
-	mutedsnare2 16
-	mutedsnare2 16
-	mutedsnare2 2
+	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
 	rest 16
 	rest 14
 	sound_ret
diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm
index 671df650..5d9d2ba5 100644
--- a/audio/music/lavender.asm
+++ b/audio/music/lavender.asm
@@ -194,6 +194,6 @@ Music_Lavender_Ch4::
 	rest 16
 
 Music_Lavender_branch_bc26::
-	triangle2 8
-	triangle2 8
+	dnote 7, 8
+	dnote 7, 8
 	sound_loop 0, Music_Lavender_branch_bc26
diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm
index 80e4afd0..54517752 100644
--- a/audio/music/museumguy.asm
+++ b/audio/music/museumguy.asm
@@ -270,68 +270,68 @@ Music_MuseumGuy_Ch4::
 	rest 16
 	rest 14
 	dspeed 6
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
+	dnote 19, 1
+	dnote 19, 1
+	dnote 18, 1
+	dnote 18, 1
 
 Music_MuseumGuy_branch_aee1::
-	mutedsnare2 4
-	mutedsnare2 6
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare2 2
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare2 6
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare2 4
-	mutedsnare2 6
-	mutedsnare2 2
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 6
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare2 2
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare2 2
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare2 2
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 6
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
+	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
 	sound_loop 0, Music_MuseumGuy_branch_aee1
diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm
index 9f326c39..29d0d5ac 100644
--- a/audio/music/routes1.asm
+++ b/audio/music/routes1.asm
@@ -312,93 +312,93 @@ Music_Routes1_branch_9cdd::
 Music_Routes1_Ch4::
 	dspeed 12
 	rest 4
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
-	mutedsnare1 2
+	dnote 15, 2
+	dnote 15, 2
 	rest 4
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
-	mutedsnare1 2
-	mutedsnare1 2
-	mutedsnare1 2
+	dnote 15, 2
+	dnote 15, 2
+	dnote 15, 2
+	dnote 15, 2
 	rest 4
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
-	mutedsnare1 2
+	dnote 15, 2
+	dnote 15, 2
 	rest 4
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
-	mutedsnare1 2
-	mutedsnare1 2
+	dnote 15, 2
+	dnote 15, 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
-	mutedsnare1 2
+	dnote 15, 2
+	dnote 15, 2
 	rest 4
-	mutedsnare1 2
-	mutedsnare1 2
-	mutedsnare1 2
+	dnote 15, 2
+	dnote 15, 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
-	mutedsnare1 2
+	dnote 15, 2
+	dnote 15, 2
 	rest 4
-	mutedsnare1 2
-	mutedsnare1 2
-	mutedsnare1 2
+	dnote 15, 2
+	dnote 15, 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
-	mutedsnare1 2
+	dnote 15, 2
+	dnote 15, 2
 	rest 4
-	mutedsnare1 2
-	mutedsnare1 2
-	mutedsnare1 2
+	dnote 15, 2
+	dnote 15, 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
-	mutedsnare1 2
-	mutedsnare1 2
+	dnote 15, 2
+	dnote 15, 2
+	dnote 15, 2
 	rest 2
-	mutedsnare1 2
-	mutedsnare1 2
+	dnote 15, 2
+	dnote 15, 2
 	sound_loop 0, Music_Routes1_Ch4
 	sound_ret
diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm
index 0115466e..94098fc6 100644
--- a/audio/music/routes2.asm
+++ b/audio/music/routes2.asm
@@ -326,100 +326,100 @@ Music_Routes2_branch_9e9e::
 
 Music_Routes2_Ch4::
 	dspeed 12
-	snare3 2
+	dnote 3, 2
 	rest 2
-	snare3 1
+	dnote 3, 1
 	rest 5
-	snare3 1
-	snare3 1
-	snare3 2
-	snare3 2
-	snare3 2
+	dnote 3, 1
+	dnote 3, 1
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
 	rest 2
 	dspeed 8
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 3
-	snare3 3
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 3
+	dnote 3, 3
 	dspeed 12
-	snare3 1
+	dnote 3, 1
 	rest 3
-	snare3 2
+	dnote 3, 2
 	rest 2
-	snare3 2
+	dnote 3, 2
 	rest 4
-	snare3 1
-	snare3 1
-	snare3 2
+	dnote 3, 1
+	dnote 3, 1
+	dnote 3, 2
 	rest 2
-	snare3 2
+	dnote 3, 2
 	rest 2
 	dspeed 8
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 3
-	snare3 3
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 3
+	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
 	rest 3
 	dspeed 12
-	snare3 1
+	dnote 3, 1
 	rest 5
-	snare3 1
-	snare3 1
-	snare3 2
-	snare3 2
-	snare3 2
+	dnote 3, 1
+	dnote 3, 1
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
 	rest 2
 	dspeed 8
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 3
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 3
 	rest 3
 	dspeed 12
-	snare3 1
+	dnote 3, 1
 	rest 3
-	snare3 2
+	dnote 3, 2
 	rest 2
-	snare3 2
+	dnote 3, 2
 	rest 4
-	snare3 1
-	snare3 1
-	snare3 2
-	snare3 2
-	snare3 2
+	dnote 3, 1
+	dnote 3, 1
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
 	rest 2
 	dspeed 8
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 3
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 3
 	rest 3
-	snare3 3
-	snare3 3
-	snare3 3
+	dnote 3, 3
+	dnote 3, 3
+	dnote 3, 3
 	rest 3
 	dspeed 12
-	snare3 1
+	dnote 3, 1
 	rest 5
-	snare3 1
-	snare3 1
-	snare3 2
-	snare3 2
-	snare3 2
+	dnote 3, 1
+	dnote 3, 1
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
 	rest 2
 	dspeed 8
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 3
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 3
 	rest 3
-	snare3 3
+	dnote 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 96aa2625..0cd4e769 100644
--- a/audio/music/routes3.asm
+++ b/audio/music/routes3.asm
@@ -356,160 +356,160 @@ Music_Routes3_branch_a0a3::
 
 Music_Routes3_Ch4::
 	dspeed 6
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 8
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 12
-	mutedsnare2 2
-	mutedsnare3 2
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 12
-	mutedsnare2 2
-	mutedsnare3 2
-	mutedsnare2 4
-	mutedsnare3 4
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
+	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
 
 Music_Routes3_branch_a17a::
-	mutedsnare2 12
-	mutedsnare2 2
-	mutedsnare3 2
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 12
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare2 8
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 12
-	mutedsnare2 2
-	mutedsnare3 2
-	mutedsnare2 4
-	mutedsnare2 10
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare2 12
-	mutedsnare2 2
-	mutedsnare4 2
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 12
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare2 8
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 12
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare2 10
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare2 12
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare2 8
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 12
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 12
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare2 10
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare2 12
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare2 8
-	mutedsnare3 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare4 1
-	mutedsnare2 12
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare2 8
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 12
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 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 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
 	sound_loop 0, Music_Routes3_branch_a17a
diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm
index 39f2ea89..41bc9e04 100644
--- a/audio/music/routes4.asm
+++ b/audio/music/routes4.asm
@@ -510,172 +510,172 @@ Music_Routes4_Ch4::
 	dspeed 12
 	rest 16
 	rest 12
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
+	dnote 19, 1
+	dnote 19, 1
+	dnote 18, 1
+	dnote 18, 1
 
 Music_Routes4_branch_a4a8::
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 2
-	mutedsnare3 2
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 4
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 4
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 4
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 4
-	mutedsnare2 2
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare2 4
-	mutedsnare4 1
-	mutedsnare4 1
-	mutedsnare3 1
-	mutedsnare3 1
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 2
-	mutedsnare2 2
+	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
 	sound_loop 0, Music_Routes4_branch_a4a8
diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm
index 9483b20d..c12bd1de 100644
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -462,216 +462,216 @@ Music_TitleScreen_branch_7e6e5::
 Music_TitleScreen_Ch4::
 	dspeed 6
 	rest 4
-	snare3 1
-	snare3 1
-	snare4 1
-	snare4 1
+	dnote 3, 1
+	dnote 3, 1
+	dnote 4, 1
+	dnote 4, 1
 	dspeed 12
-	snare2 1
+	dnote 2, 1
 	rest 3
-	snare2 1
+	dnote 2, 1
 	rest 5
-	snare2 1
-	snare2 1
-	snare2 1
+	dnote 2, 1
+	dnote 2, 1
+	dnote 2, 1
 	rest 3
-	snare2 1
+	dnote 2, 1
 	rest 3
-	snare2 1
+	dnote 2, 1
 	rest 3
 	dspeed 8
-	snare3 2
-	snare4 2
-	snare2 2
-	snare3 2
-	snare2 2
-	snare1 2
+	dnote 3, 2
+	dnote 4, 2
+	dnote 2, 2
+	dnote 3, 2
+	dnote 2, 2
+	dnote 1, 2
 
 Music_TitleScreen_branch_7e716::
 	dspeed 12
-	snare2 1
+	dnote 2, 1
 	rest 3
-	snare2 1
+	dnote 2, 1
 	rest 5
-	snare2 1
-	snare2 1
-	snare3 1
+	dnote 2, 1
+	dnote 2, 1
+	dnote 3, 1
 	rest 3
 	sound_call Music_TitleScreen_branch_7e834
 	sound_call Music_TitleScreen_branch_7e834
-	snare2 1
+	dnote 2, 1
 	rest 3
-	snare2 1
+	dnote 2, 1
 	rest 5
-	snare2 1
-	snare2 1
-	snare3 1
+	dnote 2, 1
+	dnote 2, 1
+	dnote 3, 1
 	rest 1
-	snare3 1
-	snare2 1
+	dnote 3, 1
+	dnote 2, 1
 	sound_call Music_TitleScreen_branch_7e842
-	snare2 1
+	dnote 2, 1
 	rest 3
-	snare2 1
+	dnote 2, 1
 	rest 5
-	snare2 1
-	snare3 1
-	snare2 1
+	dnote 2, 1
+	dnote 3, 1
+	dnote 2, 1
 	rest 1
-	snare2 1
+	dnote 2, 1
 	rest 1
 	sound_call Music_TitleScreen_branch_7e842
-	snare2 1
+	dnote 2, 1
 	rest 3
-	snare2 1
+	dnote 2, 1
 	rest 5
-	snare2 1
-	snare3 1
-	snare2 1
+	dnote 2, 1
+	dnote 3, 1
+	dnote 2, 1
 	rest 1
 	dspeed 6
-	snare3 1
-	snare3 1
-	snare4 1
-	snare4 1
+	dnote 3, 1
+	dnote 3, 1
+	dnote 4, 1
+	dnote 4, 1
 	dspeed 12
 	sound_call Music_TitleScreen_branch_7e834
 	sound_call Music_TitleScreen_branch_7e842
-	snare2 1
+	dnote 2, 1
 	rest 3
-	snare2 1
+	dnote 2, 1
 	rest 5
-	snare2 1
-	snare3 1
-	snare2 1
+	dnote 2, 1
+	dnote 3, 1
+	dnote 2, 1
 	rest 3
-	snare2 1
+	dnote 2, 1
 	rest 3
-	snare2 1
+	dnote 2, 1
 	rest 5
-	snare3 1
-	snare2 1
-	snare2 1
+	dnote 3, 1
+	dnote 2, 1
+	dnote 2, 1
 	rest 1
-	snare3 1
-	snare2 1
+	dnote 3, 1
+	dnote 2, 1
 	sound_call Music_TitleScreen_branch_7e834
 	sound_call Music_TitleScreen_branch_7e842
-	snare2 1
+	dnote 2, 1
 	rest 3
-	snare2 1
+	dnote 2, 1
 	rest 5
-	snare3 1
-	snare2 1
-	snare2 1
+	dnote 3, 1
+	dnote 2, 1
+	dnote 2, 1
 	rest 1
-	snare4 1
-	snare3 1
-	snare2 1
+	dnote 4, 1
+	dnote 3, 1
+	dnote 2, 1
 	rest 3
-	snare3 1
+	dnote 3, 1
 	rest 5
-	snare2 1
-	snare4 1
-	snare2 1
+	dnote 2, 1
+	dnote 4, 1
+	dnote 2, 1
 	rest 1
 	dspeed 6
-	snare3 1
-	snare3 1
-	snare4 1
-	snare4 1
+	dnote 3, 1
+	dnote 3, 1
+	dnote 4, 1
+	dnote 4, 1
 	dspeed 12
-	snare1 1
+	dnote 1, 1
 	rest 3
-	snare2 1
+	dnote 2, 1
 	rest 5
-	snare3 1
-	snare2 1
-	snare1 1
+	dnote 3, 1
+	dnote 2, 1
+	dnote 1, 1
 	rest 3
-	snare2 1
+	dnote 2, 1
 	rest 3
-	snare3 1
+	dnote 3, 1
 	rest 5
-	snare3 1
-	snare2 1
-	snare3 1
+	dnote 3, 1
+	dnote 2, 1
+	dnote 3, 1
 	rest 3
-	snare2 1
+	dnote 2, 1
 	rest 3
-	snare3 1
+	dnote 3, 1
 	rest 5
-	snare2 1
-	snare3 1
-	snare4 1
+	dnote 2, 1
+	dnote 3, 1
+	dnote 4, 1
 	rest 1
-	snare3 1
-	snare2 1
-	snare2 1
+	dnote 3, 1
+	dnote 2, 1
+	dnote 2, 1
 	rest 3
-	snare3 1
+	dnote 3, 1
 	rest 5
-	snare2 1
-	snare3 1
-	snare2 1
+	dnote 2, 1
+	dnote 3, 1
+	dnote 2, 1
 	rest 3
-	snare5 1
+	dnote 5, 1
 	rest 5
-	snare2 1
+	dnote 2, 1
 	rest 3
-	snare3 1
-	snare2 1
-	snare1 1
+	dnote 3, 1
+	dnote 2, 1
+	dnote 1, 1
 	rest 5
-	snare2 1
-	snare3 1
-	snare2 1
+	dnote 2, 1
+	dnote 3, 1
+	dnote 2, 1
 	rest 1
-	snare1 1
+	dnote 1, 1
 	rest 1
 	dspeed 8
-	snare2 4
-	snare3 4
-	snare1 4
+	dnote 2, 4
+	dnote 3, 4
+	dnote 1, 4
 	dspeed 12
-	snare5 1
+	dnote 5, 1
 	rest 5
-	snare2 1
+	dnote 2, 1
 	rest 3
-	snare3 1
-	snare2 1
-	snare3 1
+	dnote 3, 1
+	dnote 2, 1
+	dnote 3, 1
 	rest 5
-	snare2 1
-	snare3 1
-	snare1 1
+	dnote 2, 1
+	dnote 3, 1
+	dnote 1, 1
 	rest 1
-	snare3 1
-	snare2 1
+	dnote 3, 1
+	dnote 2, 1
 	dspeed 8
-	snare2 4
-	snare3 4
-	snare2 4
+	dnote 2, 4
+	dnote 3, 4
+	dnote 2, 4
 	sound_loop 0, Music_TitleScreen_branch_7e716
 
 Music_TitleScreen_branch_7e834::
-	snare2 1
+	dnote 2, 1
 	rest 3
-	snare2 1
+	dnote 2, 1
 	rest 5
-	snare2 1
-	snare3 1
-	snare2 1
+	dnote 2, 1
+	dnote 3, 1
+	dnote 2, 1
 	rest 3
 	sound_ret
 
 Music_TitleScreen_branch_7e842::
-	snare2 1
+	dnote 2, 1
 	rest 3
-	snare2 1
+	dnote 2, 1
 	rest 5
-	snare3 1
-	snare2 1
-	snare2 1
+	dnote 3, 1
+	dnote 2, 1
+	dnote 2, 1
 	rest 3
 	sound_ret
diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm
index 1858d138..d45a2b1d 100644
--- a/audio/music/vermilion.asm
+++ b/audio/music/vermilion.asm
@@ -287,19 +287,19 @@ Music_Vermilion_Ch4::
 
 Music_Vermilion_branch_bb0e::
 	sound_call Music_Vermilion_branch_bb3f
-	triangle1 2
-	triangle1 1
-	triangle1 1
-	triangle1 2
-	triangle1 1
-	triangle1 1
-	triangle1 2
-	triangle1 1
-	triangle1 1
-	triangle1 1
-	triangle1 1
-	triangle1 1
-	triangle1 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
+	dnote 6, 1
+	dnote 6, 1
+	dnote 6, 1
+	dnote 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::
-	triangle1 2
-	triangle1 1
-	triangle1 1
-	triangle1 2
-	triangle1 1
-	triangle1 1
-	triangle1 2
-	triangle1 1
-	triangle1 1
-	triangle1 2
-	triangle1 1
-	triangle1 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
+	dnote 6, 2
+	dnote 6, 1
+	dnote 6, 1
 	sound_ret
diff --git a/audio/music/yellow/meetjessiejames.asm b/audio/music/yellow/meetjessiejames.asm
index 086fef53..7f1f4598 100644
--- a/audio/music/yellow/meetjessiejames.asm
+++ b/audio/music/yellow/meetjessiejames.asm
@@ -1,309 +1,309 @@
 Music_MeetJessieJames_Ch1::
 	tempo 144
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 8, 1, 4
-	notetype 12, 11, 2
+	note_type 12, 11, 2
 	octave 3
-	G# 1
-	G_ 1
-	F# 2
-	F_ 2
-	E_ 2
-	D# 2
-	D_ 2
-	C# 2
-	C_ 2
-	notetype 12, 11, 6
-	D# 12
-	C_ 4
+	note G#, 1
+	note G_, 1
+	note F#, 2
+	note F_, 2
+	note E_, 2
+	note D#, 2
+	note D_, 2
+	note C#, 2
+	note C_, 2
+	note_type 12, 11, 6
+	note D#, 12
+	note C_, 4
 
 Music_MeetJessieJames_branch_83187::
-	notetype 12, 11, 2
+	note_type 12, 11, 2
 	octave 4
-	D_ 16
+	note D_, 16
 	rest 12
-	notetype 12, 11, 4
+	note_type 12, 11, 4
 	octave 3
-	A# 4
+	note A#, 4
 	rest 16
 	rest 8
-	notetype 12, 11, 2
+	note_type 12, 11, 2
 	octave 2
-	A_ 2
+	note A_, 2
 	octave 3
-	A# 2
-	A_ 4
-	D_ 1
-	D# 1
-	D# 2
-	D# 2
-	D_ 2
-	D# 2
-	D_ 2
-	D# 2
-	F_ 2
-	D_ 1
-	D# 1
-	D# 2
-	D# 2
-	D_ 2
+	note A#, 2
+	note A_, 4
+	note D_, 1
+	note D#, 1
+	note D#, 2
+	note D#, 2
+	note D_, 2
+	note D#, 2
+	note D_, 2
+	note D#, 2
+	note F_, 2
+	note D_, 1
+	note D#, 1
+	note D#, 2
+	note D#, 2
+	note D_, 2
 	octave 2
-	A# 4
-	notetype 12, 11, 4
+	note A#, 4
+	note_type 12, 11, 4
 	octave 3
-	B_ 4
-	notetype 12, 11, 2
-	D_ 1
-	D# 1
-	D# 2
-	D# 2
-	D_ 2
-	D# 2
-	D_ 2
-	D# 2
-	F_ 2
-	D_ 1
-	D# 1
-	D# 2
-	D# 2
-	D_ 2
+	note B_, 4
+	note_type 12, 11, 2
+	note D_, 1
+	note D#, 1
+	note D#, 2
+	note D#, 2
+	note D_, 2
+	note D#, 2
+	note D_, 2
+	note D#, 2
+	note F_, 2
+	note D_, 1
+	note D#, 1
+	note D#, 2
+	note D#, 2
+	note D_, 2
 	octave 2
-	A# 2
+	note A#, 2
 	octave 3
-	B_ 2
-	notetype 12, 11, 4
-	A# 4
-	loopchannel 0, Music_MeetJessieJames_branch_83187
+	note B_, 2
+	note_type 12, 11, 4
+	note A#, 4
+	sound_loop 0, Music_MeetJessieJames_branch_83187
 
 
 Music_MeetJessieJames_Ch2::
-	duty 3
+	duty_cycle 3
 	vibrato 6, 1, 5
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 	octave 4
-	D_ 1
-	C# 1
-	C_ 2
+	note D_, 1
+	note C#, 1
+	note C_, 2
 	octave 3
-	B_ 2
-	A# 2
-	A_ 2
-	G# 2
-	G_ 2
-	F# 2
-	notetype 12, 12, 7
-	A_ 12
+	note B_, 2
+	note A#, 2
+	note A_, 2
+	note G#, 2
+	note G_, 2
+	note F#, 2
+	note_type 12, 12, 7
+	note A_, 12
 	octave 4
-	C# 4
+	note C#, 4
 
 Music_MeetJessieJames_branch_831df::
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 	octave 3
-	C# 1
-	D_ 1
-	D_ 2
-	D_ 2
-	C# 2
-	D_ 2
-	C# 2
-	D_ 2
-	E_ 2
-	C# 1
-	D_ 1
-	D_ 2
-	D_ 2
-	C# 2
+	note C#, 1
+	note D_, 1
+	note D_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note C#, 1
+	note D_, 1
+	note D_, 2
+	note D_, 2
+	note C#, 2
 	octave 2
-	A_ 4
-	notetype 12, 12, 5
+	note A_, 4
+	note_type 12, 12, 5
 	octave 4
-	C# 4
-	notetype 12, 12, 2
-	D_ 1
+	note C#, 4
+	note_type 12, 12, 2
+	note D_, 1
 	octave 3
-	D_ 1
-	D_ 2
-	D_ 2
-	C# 2
-	D_ 2
-	C# 2
-	D_ 2
-	E_ 2
-	C# 1
-	D_ 1
-	D_ 2
-	D_ 2
-	C# 2
-	notetype 12, 12, 6
+	note D_, 1
+	note D_, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note C#, 2
+	note D_, 2
+	note E_, 2
+	note C#, 1
+	note D_, 1
+	note D_, 2
+	note D_, 2
+	note C#, 2
+	note_type 12, 12, 6
 	octave 4
-	D_ 8
-	notetype 12, 12, 2
-	D# 6
-	F_ 4
-	D# 4
+	note D_, 8
+	note_type 12, 12, 2
+	note D#, 6
+	note F_, 4
+	note D#, 4
 	octave 3
-	A# 2
+	note A#, 2
 	octave 4
-	D# 6
-	F_ 4
-	D# 2
-	notetype 12, 12, 5
-	D_ 4
-	notetype 12, 12, 2
-	D# 6
-	F_ 4
-	D# 4
+	note D#, 6
+	note F_, 4
+	note D#, 2
+	note_type 12, 12, 5
+	note D_, 4
+	note_type 12, 12, 2
+	note D#, 6
+	note F_, 4
+	note D#, 4
 	octave 3
-	A# 2
+	note A#, 2
 	octave 4
-	D# 4
-	F_ 4
-	notetype 12, 12, 5
-	D# 8
-	loopchannel 0, Music_MeetJessieJames_branch_831df
+	note D#, 4
+	note F_, 4
+	note_type 12, 12, 5
+	note D#, 8
+	sound_loop 0, Music_MeetJessieJames_branch_831df
 
 
 Music_MeetJessieJames_Ch3::
-	notetype 12, 1, 0
+	note_type 12, 1, 0
 	rest 16
 	rest 8
 	octave 4
-	D_ 2
+	note D_, 2
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	C_ 2
-	D# 2
+	note C_, 2
+	note D#, 2
 
 Music_MeetJessieJames_branch_83235::
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A# 2
-	A_ 2
-	D# 2
-	D_ 1
+	note A#, 2
+	note A_, 2
+	note D#, 2
+	note D_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
 	octave 3
-	A_ 2
+	note A_, 2
 	octave 4
-	C_ 2
-	D_ 2
-	D# 1
+	note C_, 2
+	note D_, 2
+	note D#, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
 	octave 3
-	A# 1
+	note A#, 1
 	rest 1
 	octave 4
-	C# 1
+	note C#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	A# 1
+	note A#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
 	octave 3
-	A# 1
+	note A#, 1
 	rest 1
 	octave 4
-	C# 1
+	note C#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	loopchannel 0, Music_MeetJessieJames_branch_83235
-	endchannel
+	sound_loop 0, Music_MeetJessieJames_branch_83235
+	sound_ret
diff --git a/audio/music/yellow/surfingpikachu.asm b/audio/music/yellow/surfingpikachu.asm
index 1ee3f760..8e161443 100644
--- a/audio/music/yellow/surfingpikachu.asm
+++ b/audio/music/yellow/surfingpikachu.asm
@@ -1,690 +1,690 @@
 Music_SurfingPikachu_Ch1::
 	tempo 117
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 8, 1, 4
-	notetype 12, 11, 3
-	octave 3
-	E_ 6
-	notetype 12, 11, 2
-	F# 2
-	notetype 12, 11, 3
-	E_ 6
-	notetype 12, 11, 2
-	F# 16
+	note_type 12, 11, 3
+	octave 3
+	note E_, 6
+	note_type 12, 11, 2
+	note F#, 2
+	note_type 12, 11, 3
+	note E_, 6
+	note_type 12, 11, 2
+	note F#, 16
 	rest 2
-	notetype 12, 11, 3
-	E_ 6
-	notetype 12, 11, 2
-	A_ 2
-	notetype 12, 11, 3
-	E_ 6
-	notetype 12, 11, 2
-	A_ 14
-	notetype 12, 11, 2
-	D# 2
-	C# 1
-	D# 1
+	note_type 12, 11, 3
+	note E_, 6
+	note_type 12, 11, 2
+	note A_, 2
+	note_type 12, 11, 3
+	note E_, 6
+	note_type 12, 11, 2
+	note A_, 14
+	note_type 12, 11, 2
+	note D#, 2
+	note C#, 1
+	note D#, 1
 	octave 2
-	B_ 6
-	octave 3
-	E_ 4
-	E_ 4
-	E_ 8
-	G# 4
-	G# 4
-	G# 2
+	note B_, 6
+	octave 3
+	note E_, 4
+	note E_, 4
+	note E_, 8
+	note G#, 4
+	note G#, 4
+	note G#, 2
 
 Music_SurfingPikachu_branch_82d1a::
-	notetype 12, 11, 3
-	octave 3
-	G# 4
-	E_ 4
-	F# 4
-	E_ 2
-	A_ 2
-	G# 2
-	F# 2
-	G# 2
-	F# 2
-	E_ 2
-	D# 2
-	E_ 2
-	D# 2
-	C# 6
-	F# 2
-	A_ 8
+	note_type 12, 11, 3
+	octave 3
+	note G#, 4
+	note E_, 4
+	note F#, 4
+	note E_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note E_, 2
+	note D#, 2
+	note C#, 6
+	note F#, 2
+	note A_, 8
 	octave 2
-	B_ 6
-	octave 3
-	E_ 2
-	G# 8
-	G# 4
-	E_ 4
-	F# 4
-	E_ 2
-	A_ 2
-	G# 2
-	F# 2
-	G# 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	G# 2
-	F# 6
-	E_ 2
-	F# 1
+	note B_, 6
+	octave 3
+	note E_, 2
+	note G#, 8
+	note G#, 4
+	note E_, 4
+	note F#, 4
+	note E_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note G#, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note G#, 2
+	note F#, 6
+	note E_, 2
+	note F#, 1
 	rest 3
-	A_ 4
-	duty 0
-	notetype 12, 11, 2
-	G# 1
-	F# 1
-	G# 2
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	E_ 2
-	D# 2
-	F# 2
-	F# 2
-	D# 2
-	F# 2
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	B_ 1
-	A# 1
-	B_ 2
-	G# 2
-	E_ 2
-	G# 2
-	G_ 2
-	G# 2
-	A_ 2
-	octave 4
-	C# 2
-	C_ 2
-	C# 3
-	octave 3
-	F# 1
-	A_ 2
-	G# 2
-	F# 2
-	A_ 2
-	E_ 3
-	E_ 1
-	B_ 2
-	A_ 2
-	G# 6
-	E_ 1
-	F_ 1
-	F# 2
-	F# 2
-	D# 2
-	F# 2
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	B_ 1
-	A# 1
-	B_ 2
-	G# 2
-	E_ 2
-	G# 2
-	G_ 2
-	G# 2
-	A_ 2
-	octave 4
-	C# 2
-	C_ 2
-	C# 3
-	octave 3
-	F# 1
-	A_ 2
-	G# 2
-	A_ 2
-	octave 4
-	D# 2
-	E_ 2
-	E_ 1
-	D# 1
-	E_ 1
-	D# 1
-	E_ 1
-	D# 1
-	E_ 8
-	duty 3
-	loopchannel 0, Music_SurfingPikachu_branch_82d1a
+	note A_, 4
+	duty_cycle 0
+	note_type 12, 11, 2
+	note G#, 1
+	note F#, 1
+	note G#, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note F#, 2
+	note F#, 2
+	note D#, 2
+	note F#, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note B_, 1
+	note A#, 1
+	note B_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note G_, 2
+	note G#, 2
+	note A_, 2
+	octave 4
+	note C#, 2
+	note C_, 2
+	note C#, 3
+	octave 3
+	note F#, 1
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note A_, 2
+	note E_, 3
+	note E_, 1
+	note B_, 2
+	note A_, 2
+	note G#, 6
+	note E_, 1
+	note F_, 1
+	note F#, 2
+	note F#, 2
+	note D#, 2
+	note F#, 2
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note B_, 1
+	note A#, 1
+	note B_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note G_, 2
+	note G#, 2
+	note A_, 2
+	octave 4
+	note C#, 2
+	note C_, 2
+	note C#, 3
+	octave 3
+	note F#, 1
+	note A_, 2
+	note G#, 2
+	note A_, 2
+	octave 4
+	note D#, 2
+	note E_, 2
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
+	note D#, 1
+	note E_, 8
+	duty_cycle 3
+	sound_loop 0, Music_SurfingPikachu_branch_82d1a
 
 
 Music_SurfingPikachu_Ch2::
-	duty 3
+	duty_cycle 3
 	vibrato 6, 1, 5
-	notetype 12, 12, 4
-	octave 3
-	B_ 6
-	notetype 12, 12, 2
-	octave 4
-	E_ 2
-	notetype 12, 12, 4
-	octave 3
-	B_ 6
-	notetype 12, 12, 2
-	octave 4
-	E_ 2
-	notetype 12, 11, 2
-	octave 3
-	B_ 2
-	octave 4
-	C# 2
-	D# 2
-	C# 2
-	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	F# 2
-	notetype 12, 12, 4
-	octave 4
-	C# 6
-	notetype 12, 12, 2
-	F# 2
-	notetype 12, 12, 4
-	C# 6
-	notetype 12, 12, 2
-	F# 2
-	notetype 12, 11, 2
-	C# 2
-	D# 2
-	E_ 2
-	D# 2
-	C# 2
-	octave 3
-	B_ 2
-	A_ 2
-	G# 2
-	notetype 12, 12, 2
-	E_ 6
-	B_ 4
-	B_ 4
-	B_ 8
-	B_ 4
-	B_ 4
-	B_ 2
+	note_type 12, 12, 4
+	octave 3
+	note B_, 6
+	note_type 12, 12, 2
+	octave 4
+	note E_, 2
+	note_type 12, 12, 4
+	octave 3
+	note B_, 6
+	note_type 12, 12, 2
+	octave 4
+	note E_, 2
+	note_type 12, 11, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note C#, 2
+	note D#, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note_type 12, 12, 4
+	octave 4
+	note C#, 6
+	note_type 12, 12, 2
+	note F#, 2
+	note_type 12, 12, 4
+	note C#, 6
+	note_type 12, 12, 2
+	note F#, 2
+	note_type 12, 11, 2
+	note C#, 2
+	note D#, 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	octave 3
+	note B_, 2
+	note A_, 2
+	note G#, 2
+	note_type 12, 12, 2
+	note E_, 6
+	note B_, 4
+	note B_, 4
+	note B_, 8
+	note B_, 4
+	note B_, 4
+	note B_, 2
 
 Music_SurfingPikachu_branch_82de0::
-	notetype 12, 12, 6
+	note_type 12, 12, 6
 	octave 4
-	E_ 4
+	note E_, 4
 	octave 3
-	B_ 4
-	A_ 4
+	note B_, 4
+	note A_, 4
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	B_ 6
-	A_ 2
-	G# 8
-	F# 6
-	A_ 2
+	note B_, 6
+	note A_, 2
+	note G#, 8
+	note F#, 6
+	note A_, 2
 	octave 4
-	C# 8
+	note C#, 8
 	octave 3
-	E_ 6
-	G# 2
-	B_ 8
+	note E_, 6
+	note G#, 2
+	note B_, 8
 	octave 4
-	E_ 4
+	note E_, 4
 	octave 3
-	B_ 4
-	A_ 4
+	note B_, 4
+	note A_, 4
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	B_ 6
+	note B_, 6
 	octave 4
-	D# 2
-	E_ 8
-	D# 6
-	C# 2
-	D# 1
+	note D#, 2
+	note E_, 8
+	note D#, 6
+	note C#, 2
+	note D#, 1
 	rest 3
-	F# 4
-	E_ 10
-	notetype 12, 12, 6
-	duty 2
-	E_ 2
-	D# 2
-	C# 2
-	octave 3
-	B_ 6
-	octave 4
-	C# 2
-	D# 4
-	octave 3
-	B_ 4
-	octave 4
-	E_ 6
-	F# 2
-	G# 8
-	A_ 6
-	G# 2
-	A_ 4
-	F# 4
-	G# 10
-	E_ 2
-	D# 2
-	C# 2
-	octave 3
-	B_ 6
-	octave 4
-	C# 2
-	D# 4
-	octave 3
-	B_ 4
-	octave 4
-	E_ 6
-	F# 2
-	G# 8
-	A_ 4
-	F# 4
-	D# 4
+	note F#, 4
+	note E_, 10
+	note_type 12, 12, 6
+	duty_cycle 2
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	octave 3
+	note B_, 6
+	octave 4
+	note C#, 2
+	note D#, 4
+	octave 3
+	note B_, 4
+	octave 4
+	note E_, 6
+	note F#, 2
+	note G#, 8
+	note A_, 6
+	note G#, 2
+	note A_, 4
+	note F#, 4
+	note G#, 10
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	octave 3
+	note B_, 6
+	octave 4
+	note C#, 2
+	note D#, 4
+	octave 3
+	note B_, 4
+	octave 4
+	note E_, 6
+	note F#, 2
+	note G#, 8
+	note A_, 4
+	note F#, 4
+	note D#, 4
 	octave 5
-	C# 4
+	note C#, 4
 	octave 4
-	B_ 8
-	notetype 12, 12, 2
+	note B_, 8
+	note_type 12, 12, 2
 	octave 5
-	E_ 4
-	notetype 12, 12, 6
-	duty 3
+	note E_, 4
+	note_type 12, 12, 6
+	duty_cycle 3
 	octave 3
-	B_ 1
-	A# 1
-	B_ 1
+	note B_, 1
+	note A#, 1
+	note B_, 1
 	octave 4
-	C# 1
-	loopchannel 0, Music_SurfingPikachu_branch_82de0
+	note C#, 1
+	sound_loop 0, Music_SurfingPikachu_branch_82de0
 
 
 Music_SurfingPikachu_Ch3::
-	notetype 12, 1, 0
+	note_type 12, 1, 0
 	octave 4
-	B_ 6
+	note B_, 6
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	B_ 6
+	note B_, 6
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	A_ 6
+	note A_, 6
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	A_ 6
+	note A_, 6
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
 
 Music_SurfingPikachu_branch_82ea0::
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	C# 1
-	C_ 1
-	C# 1
+	note C#, 1
+	note C_, 1
+	note C#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	E_ 1
-	D# 1
-	E_ 1
+	note E_, 1
+	note D#, 1
+	note E_, 1
 	rest 1
 	octave 4
-	D# 1
+	note D#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C# 1
+	note C#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	B_ 1
-	A# 1
-	B_ 1
+	note B_, 1
+	note A#, 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C# 1
+	note C#, 1
 	rest 1
-	D_ 1
+	note D_, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	loopchannel 0, Music_SurfingPikachu_branch_82ea0
+	sound_loop 0, Music_SurfingPikachu_branch_82ea0
diff --git a/audio/music/yellow/yellowintro.asm b/audio/music/yellow/yellowintro.asm
index c809d10f..bb741a22 100644
--- a/audio/music/yellow/yellowintro.asm
+++ b/audio/music/yellow/yellowintro.asm
@@ -1,484 +1,484 @@
 Music_YellowIntro_Ch1::
 	tempo 116
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 8, 1, 4
-	notetype 12, 11, 2
+	note_type 12, 11, 2
 	octave 3
-	G# 2
-	B_ 4
-	B_ 4
-	B_ 4
-	B_ 4
-	B_ 4
-	B_ 3
-	A# 1
-	B_ 2
-	B_ 10
-	notetype 12, 11, 6
-	octave 4
-	C# 1
-	C_ 1
-	C# 10
+	note G#, 2
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	note B_, 4
+	note B_, 3
+	note A#, 1
+	note B_, 2
+	note B_, 10
+	note_type 12, 11, 6
+	octave 4
+	note C#, 1
+	note C_, 1
+	note C#, 10
 	octave 3
-	G# 1
-	G_ 1
-	G# 4
-	B_ 4
-	octave 4
-	E_ 4
-	F# 8
-	E_ 8
+	note G#, 1
+	note G_, 1
+	note G#, 4
+	note B_, 4
+	octave 4
+	note E_, 4
+	note F#, 8
+	note E_, 8
 	octave 3
-	A_ 4
-	B_ 4
+	note A_, 4
+	note B_, 4
 	octave 4
-	C# 4
+	note C#, 4
 	octave 3
-	B_ 4
-	G# 6
-	notetype 12, 11, 2
-	B_ 2
-	notetype 12, 11, 6
-	G# 6
-	notetype 12, 11, 2
-	B_ 2
-	notetype 12, 11, 6
-	octave 4
-	E_ 6
-	notetype 12, 11, 2
-	G# 2
-	notetype 12, 11, 6
-	E_ 6
-	notetype 12, 11, 2
-	G# 2
-	notetype 12, 11, 6
+	note B_, 4
+	note G#, 6
+	note_type 12, 11, 2
+	note B_, 2
+	note_type 12, 11, 6
+	note G#, 6
+	note_type 12, 11, 2
+	note B_, 2
+	note_type 12, 11, 6
+	octave 4
+	note E_, 6
+	note_type 12, 11, 2
+	note G#, 2
+	note_type 12, 11, 6
+	note E_, 6
+	note_type 12, 11, 2
+	note G#, 2
+	note_type 12, 11, 6
 	octave 3
-	A_ 4
-	F# 4
-	A_ 4
-	B_ 4
-	F# 4
-	G# 4
-	A_ 2
-	G# 2
-	F# 2
-	D# 2
-	notetype 12, 11, 3
-	B_ 2
-	octave 4
-	E_ 4
-	E_ 4
-	E_ 4
-	E_ 2
-	C# 2
-	F# 4
-	F# 3
-	D# 1
-	F# 2
-	F# 8
-	notetype 12, 11, 6
-	F# 1
-	F_ 1
-	F# 8
+	note A_, 4
+	note F#, 4
+	note A_, 4
+	note B_, 4
+	note F#, 4
+	note G#, 4
+	note A_, 2
+	note G#, 2
+	note F#, 2
+	note D#, 2
+	note_type 12, 11, 3
+	note B_, 2
+	octave 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 2
+	note C#, 2
+	note F#, 4
+	note F#, 3
+	note D#, 1
+	note F#, 2
+	note F#, 8
+	note_type 12, 11, 6
+	note F#, 1
+	note F_, 1
+	note F#, 8
 	octave 3
-	B_ 1
-	A# 1
-	B_ 8
-	octave 4
-	F# 1
-	F_ 1
-	F# 2
-	notetype 12, 11, 3
-	F# 1
-	E_ 1
-	D# 1
-	C# 1
-	notetype 12, 11, 2
+	note B_, 1
+	note A#, 1
+	note B_, 8
+	octave 4
+	note F#, 1
+	note F_, 1
+	note F#, 2
+	note_type 12, 11, 3
+	note F#, 1
+	note E_, 1
+	note D#, 1
+	note C#, 1
+	note_type 12, 11, 2
 	octave 3
-	B_ 16
-	endchannel
+	note B_, 16
+	sound_ret
 
 
 Music_YellowIntro_Ch2::
-	duty 2
+	duty_cycle 2
 	vibrato 6, 1, 5
-	notetype 12, 12, 2
+	note_type 12, 12, 2
 	octave 3
-	B_ 2
-	octave 4
-	E_ 4
-	E_ 4
-	E_ 4
-	E_ 4
-	E_ 4
-	E_ 3
-	D# 1
-	E_ 2
-	E_ 4
-	notetype 12, 12, 5
-	G# 1
-	G_ 1
-	G# 10
+	note B_, 2
+	octave 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 4
+	note E_, 3
+	note D#, 1
+	note E_, 2
+	note E_, 4
+	note_type 12, 12, 5
+	note G#, 1
+	note G_, 1
+	note G#, 10
 	octave 3
-	B_ 1
-	A# 1
-	B_ 6
-	notetype 12, 12, 7
-	octave 4
-	E_ 4
-	G# 4
-	B_ 4
+	note B_, 1
+	note A#, 1
+	note B_, 6
+	note_type 12, 12, 7
+	octave 4
+	note E_, 4
+	note G#, 4
+	note B_, 4
 	octave 5
-	C# 16
+	note C#, 16
 	octave 4
-	A_ 4
-	G# 4
-	F# 4
-	E_ 4
+	note A_, 4
+	note G#, 4
+	note F#, 4
+	note E_, 4
 	octave 3
-	B_ 6
-	notetype 12, 12, 2
+	note B_, 6
+	note_type 12, 12, 2
 	octave 4
-	E_ 2
-	notetype 12, 12, 7
+	note E_, 2
+	note_type 12, 12, 7
 	octave 3
-	B_ 6
-	notetype 12, 12, 2
-	octave 4
-	E_ 2
-	notetype 12, 12, 7
-	G# 6
-	notetype 12, 12, 2
-	B_ 2
-	notetype 12, 12, 7
-	G# 6
-	notetype 12, 12, 2
-	B_ 2
-	notetype 12, 12, 7
-	C# 4
+	note B_, 6
+	note_type 12, 12, 2
+	octave 4
+	note E_, 2
+	note_type 12, 12, 7
+	note G#, 6
+	note_type 12, 12, 2
+	note B_, 2
+	note_type 12, 12, 7
+	note G#, 6
+	note_type 12, 12, 2
+	note B_, 2
+	note_type 12, 12, 7
+	note C#, 4
 	octave 3
-	A_ 4
-	octave 4
-	C# 4
-	D# 4
-	E_ 2
-	D# 2
-	C# 2
-	D# 4
-	D# 2
-	C# 2
+	note A_, 4
+	octave 4
+	note C#, 4
+	note D#, 4
+	note E_, 2
+	note D#, 2
+	note C#, 2
+	note D#, 4
+	note D#, 2
+	note C#, 2
 	octave 3
-	B_ 2
-	notetype 12, 12, 3
-	octave 4
-	E_ 2
-	G# 4
-	G# 4
-	G# 4
-	G# 2
-	F# 2
-	A_ 4
-	A_ 3
-	F# 1
-	A_ 2
-	A_ 4
-	notetype 12, 12, 7
-	B_ 1
-	A# 1
-	B_ 8
-	B_ 1
-	A# 1
-	B_ 8
-	B_ 1
-	A# 1
-	B_ 6
-	notetype 12, 12, 3
-	B_ 1
-	A_ 1
-	G# 1
-	F# 1
-	notetype 12, 12, 2
-	E_ 16
-	endchannel
+	note B_, 2
+	note_type 12, 12, 3
+	octave 4
+	note E_, 2
+	note G#, 4
+	note G#, 4
+	note G#, 4
+	note G#, 2
+	note F#, 2
+	note A_, 4
+	note A_, 3
+	note F#, 1
+	note A_, 2
+	note A_, 4
+	note_type 12, 12, 7
+	note B_, 1
+	note A#, 1
+	note B_, 8
+	note B_, 1
+	note A#, 1
+	note B_, 8
+	note B_, 1
+	note A#, 1
+	note B_, 6
+	note_type 12, 12, 3
+	note B_, 1
+	note A_, 1
+	note G#, 1
+	note F#, 1
+	note_type 12, 12, 2
+	note E_, 16
+	sound_ret
 
 
 Music_YellowIntro_Ch3::
-	notetype 12, 1, 0
+	note_type 12, 1, 0
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 3
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 4
-	C# 1
+	note C#, 1
 	rest 1
-	D# 1
+	note D#, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	F# 1
+	note F#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	C# 1
+	note C#, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 1
 	octave 4
-	B_ 1
+	note B_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	G# 1
+	note G#, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	E_ 1
+	note E_, 1
 	rest 1
-	B_ 1
+	note B_, 1
 	rest 1
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 5
-	E_ 1
+	note E_, 1
 	rest 1
 	octave 4
-	A_ 1
+	note A_, 1
 	rest 1
 	octave 5
-	F# 1
+	note F#, 1
 	rest 1
 	octave 4
-	F# 1
+	note F#, 1
 	rest 1
 	octave 5
-	C# 1
+	note C#, 1
 	rest 3
-	F# 1
+	note F#, 1
 	rest 1
 	octave 4
-	F# 1
-	G# 1
-	A_ 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
 	octave 5
-	C# 1
-	E_ 1
+	note C#, 1
+	note E_, 1
 	rest 15
-	endchannel
+	sound_ret
diff --git a/audio/music/yellow/yellowunusedsong.asm b/audio/music/yellow/yellowunusedsong.asm
index f65ca164..111c182d 100644
--- a/audio/music/yellow/yellowunusedsong.asm
+++ b/audio/music/yellow/yellowunusedsong.asm
@@ -1,51 +1,51 @@
 Music_YellowUnusedSong_Ch1::
 	tempo 140
 	volume 7, 7
-	duty 3
+	duty_cycle 3
 	vibrato 8, 1, 4
-	notetype 8, 11, 2
+	note_type 8, 11, 2
 	octave 3
-	A_ 6
-	A_ 2
-	A_ 2
-	A_ 2
-	A# 6
-	A# 6
-	G_ 6
-	G_ 6
-	A_ 6
-	E_ 6
-	A_ 6
-	A_ 2
-	A_ 2
-	A_ 2
-	A# 6
-	A# 6
-	A_ 6
-	G_ 6
-	A_ 12
+	note A_, 6
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A#, 6
+	note A#, 6
+	note G_, 6
+	note G_, 6
+	note A_, 6
+	note E_, 6
+	note A_, 6
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A#, 6
+	note A#, 6
+	note A_, 6
+	note G_, 6
+	note A_, 12
 
 Music_YellowUnusedSong_branch_82fde::
-	A_ 6
-	A_ 2
-	A_ 2
-	A_ 2
-	A# 6
-	A# 6
-	G_ 6
-	G_ 6
-	A_ 6
-	E_ 6
-	A_ 6
-	A_ 2
-	A_ 2
-	A_ 2
-	A# 6
-	A# 6
-	G_ 6
+	note A_, 6
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A#, 6
+	note A#, 6
+	note G_, 6
+	note G_, 6
+	note A_, 6
+	note E_, 6
+	note A_, 6
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A#, 6
+	note A#, 6
+	note G_, 6
 	octave 4
-	D# 6
-	D_ 12
+	note D#, 6
+	note D_, 12
 	rest 16
 	rest 16
 	rest 16
@@ -53,274 +53,274 @@ Music_YellowUnusedSong_branch_82fde::
 	rest 16
 	rest 16
 	octave 3
-	A_ 6
-	A_ 2
-	A_ 2
-	A_ 2
-	A# 6
-	A# 6
-	G_ 6
-	G_ 6
-	A_ 6
-	E_ 6
-	A_ 6
-	A_ 2
-	A_ 2
-	A_ 2
-	A# 6
-	A# 6
-	A_ 6
-	G_ 6
-	A_ 12
-	loopchannel 0, Music_YellowUnusedSong_branch_82fde
+	note A_, 6
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A#, 6
+	note A#, 6
+	note G_, 6
+	note G_, 6
+	note A_, 6
+	note E_, 6
+	note A_, 6
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A#, 6
+	note A#, 6
+	note A_, 6
+	note G_, 6
+	note A_, 12
+	sound_loop 0, Music_YellowUnusedSong_branch_82fde
 
 
 Music_YellowUnusedSong_Ch2::
-	duty 2
-	notetype 8, 12, 2
+	duty_cycle 2
+	note_type 8, 12, 2
 	octave 4
-	D_ 6
-	D_ 2
-	D_ 2
-	D_ 2
-	D# 6
-	D# 6
-	C_ 6
-	C_ 6
-	D_ 6
+	note D_, 6
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D#, 6
+	note D#, 6
+	note C_, 6
+	note C_, 6
+	note D_, 6
 	octave 3
-	A_ 6
+	note A_, 6
 	octave 4
-	D_ 6
-	D_ 2
-	D_ 2
-	D_ 2
-	D# 6
-	D# 6
-	D_ 6
-	A# 6
-	A_ 12
+	note D_, 6
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D#, 6
+	note D#, 6
+	note D_, 6
+	note A#, 6
+	note A_, 12
 
 Music_YellowUnusedSong_branch_8302a::
-	D_ 6
-	D_ 2
-	D_ 2
-	D_ 2
-	D# 6
-	D# 6
-	C_ 6
-	C_ 6
-	D_ 6
+	note D_, 6
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D#, 6
+	note D#, 6
+	note C_, 6
+	note C_, 6
+	note D_, 6
 	octave 3
-	A_ 6
+	note A_, 6
 	octave 4
-	D_ 6
-	D_ 2
-	D_ 2
-	D_ 2
-	D# 6
-	D# 6
-	C_ 6
-	G# 6
-	G_ 12
-	notetype 8, 9, 0
+	note D_, 6
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D#, 6
+	note D#, 6
+	note C_, 6
+	note G#, 6
+	note G_, 12
+	note_type 8, 9, 0
 	octave 3
-	D# 16
-	D# 8
-	D# 16
-	D# 8
+	note D#, 16
+	note D#, 8
+	note D#, 16
+	note D#, 8
 	octave 2
-	A# 16
-	A# 8
+	note A#, 16
+	note A#, 8
 	octave 3
-	D# 12
-	F_ 12
-	notetype 8, 12, 2
+	note D#, 12
+	note F_, 12
+	note_type 8, 12, 2
 	octave 4
-	D_ 6
-	D_ 2
-	D_ 2
-	D_ 2
-	D# 6
-	D# 6
-	C_ 6
-	C_ 6
-	D_ 6
+	note D_, 6
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D#, 6
+	note D#, 6
+	note C_, 6
+	note C_, 6
+	note D_, 6
 	octave 3
-	A_ 6
+	note A_, 6
 	octave 4
-	D_ 6
-	D_ 2
-	D_ 2
-	D_ 2
-	D# 6
-	D# 6
-	D_ 6
-	A# 6
-	A_ 12
-	loopchannel 0, Music_YellowUnusedSong_branch_8302a
+	note D_, 6
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D#, 6
+	note D#, 6
+	note D_, 6
+	note A#, 6
+	note A_, 12
+	sound_loop 0, Music_YellowUnusedSong_branch_8302a
 
 
 Music_YellowUnusedSong_Ch3::
-	notetype 12, 1, 0
+	note_type 12, 1, 0
 	vibrato 2, 1, 5
 	rest 16
 	rest 12
 	octave 4
-	C_ 4
-	D_ 8
-	D# 8
-	G_ 8
-	A# 8
+	note C_, 4
+	note D_, 8
+	note D#, 8
+	note G_, 8
+	note A#, 8
 
 Music_YellowUnusedSong_branch_83075::
-	A_ 8
-	A# 8
-	G_ 8
-	A_ 4
-	D_ 4
-	A_ 8
-	A# 8
+	note A_, 8
+	note A#, 8
+	note G_, 8
+	note A_, 4
+	note D_, 4
+	note A_, 8
+	note A#, 8
 	octave 5
-	C# 8
-	D_ 8
-	D# 16
-	D# 16
+	note C#, 8
+	note D_, 8
+	note D#, 16
+	note D#, 16
 	octave 4
-	A# 16
+	note A#, 16
 	octave 5
-	D# 8
-	F_ 8
+	note D#, 8
+	note F_, 8
 	octave 4
-	D_ 16
-	D_ 16
+	note D_, 16
+	note D_, 16
 	octave 4
-	D_ 8
-	D# 8
-	G_ 8
-	A# 8
-	loopchannel 0, Music_YellowUnusedSong_branch_83075
+	note D_, 8
+	note D#, 8
+	note G_, 8
+	note A#, 8
+	sound_loop 0, Music_YellowUnusedSong_branch_83075
 
 
 Music_YellowUnusedSong_Ch4::
 	dspeed 12
-	snare3 4
+	dnote 3, 4
 	dspeed 8
-	snare3 2
-	snare3 2
-	snare3 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
 	dspeed 12
-	snare3 4
-	snare3 4
-	snare3 4
-	snare3 4
-	snare3 4
-	snare3 4
-	snare3 4
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 4
 	dspeed 8
-	snare3 2
-	snare3 2
-	snare3 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
 	dspeed 12
-	snare3 4
-	snare3 4
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 4
-	snare3 4
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 4
+	dnote 3, 4
 
 Music_YellowUnusedSong_branch_830c3::
-	snare3 4
+	dnote 3, 4
 	dspeed 8
-	snare3 2
-	snare3 2
-	snare3 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
 	dspeed 12
-	snare3 4
-	snare3 4
-	snare3 4
-	snare3 4
-	snare3 4
-	snare3 4
-	snare3 4
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 4
 	dspeed 8
-	snare3 2
-	snare3 2
-	snare3 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
 	dspeed 12
-	snare3 4
-	snare3 4
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 4
-	snare3 4
-	snare3 4
+	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
-	snare3 2
-	snare3 2
-	snare3 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
 	dspeed 12
-	snare3 4
+	dnote 3, 4
 	dspeed 8
-	snare3 2
-	snare3 2
-	snare3 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
 	dspeed 12
-	snare3 4
+	dnote 3, 4
 	dspeed 8
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 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
+	dnote 3, 2
 	dspeed 12
-	snare3 4
+	dnote 3, 4
 	dspeed 8
-	snare3 2
-	snare3 2
-	snare3 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
 	dspeed 12
-	snare3 4
-	snare3 4
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 4
-	snare3 2
-	snare3 2
-	snare3 4
+	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
-	snare3 2
-	snare3 2
-	snare3 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
 	dspeed 12
-	snare3 4
-	snare3 4
-	snare3 4
-	snare3 4
-	snare3 4
-	snare3 4
-	snare3 4
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 4
 	dspeed 8
-	snare3 2
-	snare3 2
-	snare3 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
 	dspeed 12
-	snare3 4
-	snare3 4
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 2
-	snare3 4
-	snare3 4
-	loopchannel 0, Music_YellowUnusedSong_branch_830c3
+	dnote 3, 4
+	dnote 3, 4
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 2
+	dnote 3, 4
+	dnote 3, 4
+	sound_loop 0, Music_YellowUnusedSong_branch_830c3
diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm
deleted file mode 100644
index 693bb0c5..00000000
--- a/audio/sfx/cymbal1_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Cymbal1_1_Ch8:
-	noise_note 0, 10, 1, 16
-	sound_ret
diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm
deleted file mode 100644
index 206d44ae..00000000
--- a/audio/sfx/cymbal1_2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Cymbal1_2_Ch8:
-	noise_note 0, 10, 1, 16
-	sound_ret
diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm
deleted file mode 100644
index 9389cc6f..00000000
--- a/audio/sfx/cymbal1_3.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Cymbal1_3_Ch8:
-	noise_note 0, 10, 1, 16
-	sound_ret
diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm
deleted file mode 100644
index 3f050d96..00000000
--- a/audio/sfx/cymbal2_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Cymbal2_1_Ch8:
-	noise_note 0, 10, 2, 17
-	sound_ret
diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm
deleted file mode 100644
index ab0a2edd..00000000
--- a/audio/sfx/cymbal2_2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Cymbal2_2_Ch8:
-	noise_note 0, 10, 2, 17
-	sound_ret
diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm
deleted file mode 100644
index 26f7048a..00000000
--- a/audio/sfx/cymbal2_3.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Cymbal2_3_Ch8:
-	noise_note 0, 10, 2, 17
-	sound_ret
diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm
deleted file mode 100644
index 179de2f0..00000000
--- a/audio/sfx/cymbal3_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Cymbal3_1_Ch8:
-	noise_note 0, 10, 2, 80
-	sound_ret
diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm
deleted file mode 100644
index 09e3b6e1..00000000
--- a/audio/sfx/cymbal3_2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Cymbal3_2_Ch8:
-	noise_note 0, 10, 2, 80
-	sound_ret
diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm
deleted file mode 100644
index a7af3bb0..00000000
--- a/audio/sfx/cymbal3_3.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Cymbal3_3_Ch8:
-	noise_note 0, 10, 2, 80
-	sound_ret
diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm
deleted file mode 100644
index 52eb96d7..00000000
--- a/audio/sfx/muted_snare1_1.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_Muted_Snare1_1_Ch8:
-	noise_note 0, 10, 1, 24
-	noise_note 0, 3, 1, 51
-	sound_ret
diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm
deleted file mode 100644
index c3e29c16..00000000
--- a/audio/sfx/muted_snare1_2.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_Muted_Snare1_2_Ch8:
-	noise_note 0, 10, 1, 24
-	noise_note 0, 3, 1, 51
-	sound_ret
diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm
deleted file mode 100644
index a83ecd94..00000000
--- a/audio/sfx/muted_snare1_3.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_Muted_Snare1_3_Ch8:
-	noise_note 0, 10, 1, 24
-	noise_note 0, 3, 1, 51
-	sound_ret
diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm
deleted file mode 100644
index a8066238..00000000
--- a/audio/sfx/muted_snare2_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Muted_Snare2_1_Ch8:
-	noise_note 0, 9, 1, 34
-	sound_ret
diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm
deleted file mode 100644
index 32bb41f5..00000000
--- a/audio/sfx/muted_snare2_2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Muted_Snare2_2_Ch8:
-	noise_note 0, 9, 1, 34
-	sound_ret
diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm
deleted file mode 100644
index 5c3b743e..00000000
--- a/audio/sfx/muted_snare2_3.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Muted_Snare2_3_Ch8:
-	noise_note 0, 9, 1, 34
-	sound_ret
diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm
deleted file mode 100644
index 0538f8d5..00000000
--- a/audio/sfx/muted_snare3_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Muted_Snare3_1_Ch8:
-	noise_note 0, 7, 1, 34
-	sound_ret
diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm
deleted file mode 100644
index 20c3772c..00000000
--- a/audio/sfx/muted_snare3_2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Muted_Snare3_2_Ch8:
-	noise_note 0, 7, 1, 34
-	sound_ret
diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm
deleted file mode 100644
index 2ac3f874..00000000
--- a/audio/sfx/muted_snare3_3.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Muted_Snare3_3_Ch8:
-	noise_note 0, 7, 1, 34
-	sound_ret
diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm
deleted file mode 100644
index 575829ae..00000000
--- a/audio/sfx/muted_snare4_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Muted_Snare4_1_Ch8:
-	noise_note 0, 6, 1, 34
-	sound_ret
diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm
deleted file mode 100644
index 19744539..00000000
--- a/audio/sfx/muted_snare4_2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Muted_Snare4_2_Ch8:
-	noise_note 0, 6, 1, 34
-	sound_ret
diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm
deleted file mode 100644
index 188f9bff..00000000
--- a/audio/sfx/muted_snare4_3.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Muted_Snare4_3_Ch8:
-	noise_note 0, 6, 1, 34
-	sound_ret
diff --git a/audio/sfx/noise_instrument01_1.asm b/audio/sfx/noise_instrument01_1.asm
new file mode 100644
index 00000000..e545b030
--- /dev/null
+++ b/audio/sfx/noise_instrument01_1.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument01_1_Ch8:
+	noise_note 0, 12, 1, 51
+	sound_ret
diff --git a/audio/sfx/noise_instrument01_2.asm b/audio/sfx/noise_instrument01_2.asm
new file mode 100644
index 00000000..3f4d2bb0
--- /dev/null
+++ b/audio/sfx/noise_instrument01_2.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument01_2_Ch8:
+	noise_note 0, 12, 1, 51
+	sound_ret
diff --git a/audio/sfx/noise_instrument01_3.asm b/audio/sfx/noise_instrument01_3.asm
new file mode 100644
index 00000000..ac360f2e
--- /dev/null
+++ b/audio/sfx/noise_instrument01_3.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument01_3_Ch8:
+	noise_note 0, 12, 1, 51
+	sound_ret
diff --git a/audio/sfx/noise_instrument02_1.asm b/audio/sfx/noise_instrument02_1.asm
new file mode 100644
index 00000000..12a7d226
--- /dev/null
+++ b/audio/sfx/noise_instrument02_1.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument02_1_Ch8:
+	noise_note 0, 11, 1, 51
+	sound_ret
diff --git a/audio/sfx/noise_instrument02_2.asm b/audio/sfx/noise_instrument02_2.asm
new file mode 100644
index 00000000..354bbdbc
--- /dev/null
+++ b/audio/sfx/noise_instrument02_2.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument02_2_Ch8:
+	noise_note 0, 11, 1, 51
+	sound_ret
diff --git a/audio/sfx/noise_instrument02_3.asm b/audio/sfx/noise_instrument02_3.asm
new file mode 100644
index 00000000..2f7f0d6f
--- /dev/null
+++ b/audio/sfx/noise_instrument02_3.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument02_3_Ch8:
+	noise_note 0, 11, 1, 51
+	sound_ret
diff --git a/audio/sfx/noise_instrument03_1.asm b/audio/sfx/noise_instrument03_1.asm
new file mode 100644
index 00000000..b75b6479
--- /dev/null
+++ b/audio/sfx/noise_instrument03_1.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument03_1_Ch8:
+	noise_note 0, 10, 1, 51
+	sound_ret
diff --git a/audio/sfx/noise_instrument03_2.asm b/audio/sfx/noise_instrument03_2.asm
new file mode 100644
index 00000000..3551baef
--- /dev/null
+++ b/audio/sfx/noise_instrument03_2.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument03_2_Ch8:
+	noise_note 0, 10, 1, 51
+	sound_ret
diff --git a/audio/sfx/noise_instrument03_3.asm b/audio/sfx/noise_instrument03_3.asm
new file mode 100644
index 00000000..c132ab64
--- /dev/null
+++ b/audio/sfx/noise_instrument03_3.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument03_3_Ch8:
+	noise_note 0, 10, 1, 51
+	sound_ret
diff --git a/audio/sfx/noise_instrument04_1.asm b/audio/sfx/noise_instrument04_1.asm
new file mode 100644
index 00000000..303f1f1f
--- /dev/null
+++ b/audio/sfx/noise_instrument04_1.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument04_1_Ch8:
+	noise_note 0, 8, 1, 51
+	sound_ret
diff --git a/audio/sfx/noise_instrument04_2.asm b/audio/sfx/noise_instrument04_2.asm
new file mode 100644
index 00000000..b43ae39d
--- /dev/null
+++ b/audio/sfx/noise_instrument04_2.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument04_2_Ch8:
+	noise_note 0, 8, 1, 51
+	sound_ret
diff --git a/audio/sfx/noise_instrument04_3.asm b/audio/sfx/noise_instrument04_3.asm
new file mode 100644
index 00000000..fcd27433
--- /dev/null
+++ b/audio/sfx/noise_instrument04_3.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument04_3_Ch8:
+	noise_note 0, 8, 1, 51
+	sound_ret
diff --git a/audio/sfx/noise_instrument05_1.asm b/audio/sfx/noise_instrument05_1.asm
new file mode 100644
index 00000000..d119b958
--- /dev/null
+++ b/audio/sfx/noise_instrument05_1.asm
@@ -0,0 +1,8 @@
+SFX_Noise_Instrument05_1_Ch8:
+	noise_note 7, 8, 4, 55
+	noise_note 6, 8, 4, 54
+	noise_note 5, 8, 3, 53
+	noise_note 4, 8, 3, 52
+	noise_note 3, 8, 2, 51
+	noise_note 2, 8, 1, 50
+	sound_ret
diff --git a/audio/sfx/noise_instrument05_2.asm b/audio/sfx/noise_instrument05_2.asm
new file mode 100644
index 00000000..1a0e63b5
--- /dev/null
+++ b/audio/sfx/noise_instrument05_2.asm
@@ -0,0 +1,8 @@
+SFX_Noise_Instrument05_2_Ch8:
+	noise_note 7, 8, 4, 55
+	noise_note 6, 8, 4, 54
+	noise_note 5, 8, 3, 53
+	noise_note 4, 8, 3, 52
+	noise_note 3, 8, 2, 51
+	noise_note 2, 8, 1, 50
+	sound_ret
diff --git a/audio/sfx/noise_instrument05_3.asm b/audio/sfx/noise_instrument05_3.asm
new file mode 100644
index 00000000..a0fec98f
--- /dev/null
+++ b/audio/sfx/noise_instrument05_3.asm
@@ -0,0 +1,8 @@
+SFX_Noise_Instrument05_3_Ch8:
+	noise_note 7, 8, 4, 55
+	noise_note 6, 8, 4, 54
+	noise_note 5, 8, 3, 53
+	noise_note 4, 8, 3, 52
+	noise_note 3, 8, 2, 51
+	noise_note 2, 8, 1, 50
+	sound_ret
diff --git a/audio/sfx/noise_instrument06_1.asm b/audio/sfx/noise_instrument06_1.asm
new file mode 100644
index 00000000..1412fc39
--- /dev/null
+++ b/audio/sfx/noise_instrument06_1.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument06_1_Ch8:
+	noise_note 0, 5, 1, 42
+	sound_ret
diff --git a/audio/sfx/noise_instrument06_2.asm b/audio/sfx/noise_instrument06_2.asm
new file mode 100644
index 00000000..bb591031
--- /dev/null
+++ b/audio/sfx/noise_instrument06_2.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument06_2_Ch8:
+	noise_note 0, 5, 1, 42
+	sound_ret
diff --git a/audio/sfx/noise_instrument06_3.asm b/audio/sfx/noise_instrument06_3.asm
new file mode 100644
index 00000000..b5110d40
--- /dev/null
+++ b/audio/sfx/noise_instrument06_3.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument06_3_Ch8:
+	noise_note 0, 5, 1, 42
+	sound_ret
diff --git a/audio/sfx/noise_instrument07_1.asm b/audio/sfx/noise_instrument07_1.asm
new file mode 100644
index 00000000..24f481bc
--- /dev/null
+++ b/audio/sfx/noise_instrument07_1.asm
@@ -0,0 +1,4 @@
+SFX_Noise_Instrument07_1_Ch8:
+	noise_note 1, 4, 1, 43
+	noise_note 0, 6, 1, 42
+	sound_ret
diff --git a/audio/sfx/noise_instrument07_2.asm b/audio/sfx/noise_instrument07_2.asm
new file mode 100644
index 00000000..87057ed1
--- /dev/null
+++ b/audio/sfx/noise_instrument07_2.asm
@@ -0,0 +1,4 @@
+SFX_Noise_Instrument07_2_Ch8:
+	noise_note 1, 4, 1, 43
+	noise_note 0, 6, 1, 42
+	sound_ret
diff --git a/audio/sfx/noise_instrument07_3.asm b/audio/sfx/noise_instrument07_3.asm
new file mode 100644
index 00000000..3beb3f2c
--- /dev/null
+++ b/audio/sfx/noise_instrument07_3.asm
@@ -0,0 +1,4 @@
+SFX_Noise_Instrument07_3_Ch8:
+	noise_note 1, 4, 1, 43
+	noise_note 0, 6, 1, 42
+	sound_ret
diff --git a/audio/sfx/noise_instrument08_1.asm b/audio/sfx/noise_instrument08_1.asm
new file mode 100644
index 00000000..60db9e0f
--- /dev/null
+++ b/audio/sfx/noise_instrument08_1.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument08_1_Ch8:
+	noise_note 0, 8, 1, 16
+	sound_ret
diff --git a/audio/sfx/noise_instrument08_2.asm b/audio/sfx/noise_instrument08_2.asm
new file mode 100644
index 00000000..89e5b445
--- /dev/null
+++ b/audio/sfx/noise_instrument08_2.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument08_2_Ch8:
+	noise_note 0, 8, 1, 16
+	sound_ret
diff --git a/audio/sfx/noise_instrument08_3.asm b/audio/sfx/noise_instrument08_3.asm
new file mode 100644
index 00000000..c63be9b4
--- /dev/null
+++ b/audio/sfx/noise_instrument08_3.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument08_3_Ch8:
+	noise_note 0, 8, 1, 16
+	sound_ret
diff --git a/audio/sfx/noise_instrument09_1.asm b/audio/sfx/noise_instrument09_1.asm
new file mode 100644
index 00000000..047f5469
--- /dev/null
+++ b/audio/sfx/noise_instrument09_1.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument09_1_Ch8:
+	noise_note 0, 8, 2, 35
+	sound_ret
diff --git a/audio/sfx/noise_instrument09_2.asm b/audio/sfx/noise_instrument09_2.asm
new file mode 100644
index 00000000..093f912e
--- /dev/null
+++ b/audio/sfx/noise_instrument09_2.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument09_2_Ch8:
+	noise_note 0, 8, 2, 35
+	sound_ret
diff --git a/audio/sfx/noise_instrument09_3.asm b/audio/sfx/noise_instrument09_3.asm
new file mode 100644
index 00000000..2ab061db
--- /dev/null
+++ b/audio/sfx/noise_instrument09_3.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument09_3_Ch8:
+	noise_note 0, 8, 2, 35
+	sound_ret
diff --git a/audio/sfx/noise_instrument10_1.asm b/audio/sfx/noise_instrument10_1.asm
new file mode 100644
index 00000000..1628fb88
--- /dev/null
+++ b/audio/sfx/noise_instrument10_1.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument10_1_Ch8:
+	noise_note 0, 8, 2, 37
+	sound_ret
diff --git a/audio/sfx/noise_instrument10_2.asm b/audio/sfx/noise_instrument10_2.asm
new file mode 100644
index 00000000..e1ed23ce
--- /dev/null
+++ b/audio/sfx/noise_instrument10_2.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument10_2_Ch8:
+	noise_note 0, 8, 2, 37
+	sound_ret
diff --git a/audio/sfx/noise_instrument10_3.asm b/audio/sfx/noise_instrument10_3.asm
new file mode 100644
index 00000000..a175ad17
--- /dev/null
+++ b/audio/sfx/noise_instrument10_3.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument10_3_Ch8:
+	noise_note 0, 8, 2, 37
+	sound_ret
diff --git a/audio/sfx/noise_instrument11_1.asm b/audio/sfx/noise_instrument11_1.asm
new file mode 100644
index 00000000..e2f8729e
--- /dev/null
+++ b/audio/sfx/noise_instrument11_1.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument11_1_Ch8:
+	noise_note 0, 8, 2, 38
+	sound_ret
diff --git a/audio/sfx/noise_instrument11_2.asm b/audio/sfx/noise_instrument11_2.asm
new file mode 100644
index 00000000..925c421a
--- /dev/null
+++ b/audio/sfx/noise_instrument11_2.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument11_2_Ch8:
+	noise_note 0, 8, 2, 38
+	sound_ret
diff --git a/audio/sfx/noise_instrument11_3.asm b/audio/sfx/noise_instrument11_3.asm
new file mode 100644
index 00000000..72f54e99
--- /dev/null
+++ b/audio/sfx/noise_instrument11_3.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument11_3_Ch8:
+	noise_note 0, 8, 2, 38
+	sound_ret
diff --git a/audio/sfx/noise_instrument12_1.asm b/audio/sfx/noise_instrument12_1.asm
new file mode 100644
index 00000000..f1e6379a
--- /dev/null
+++ b/audio/sfx/noise_instrument12_1.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument12_1_Ch8:
+	noise_note 0, 10, 1, 16
+	sound_ret
diff --git a/audio/sfx/noise_instrument12_2.asm b/audio/sfx/noise_instrument12_2.asm
new file mode 100644
index 00000000..f9c2e1a9
--- /dev/null
+++ b/audio/sfx/noise_instrument12_2.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument12_2_Ch8:
+	noise_note 0, 10, 1, 16
+	sound_ret
diff --git a/audio/sfx/noise_instrument12_3.asm b/audio/sfx/noise_instrument12_3.asm
new file mode 100644
index 00000000..b5347639
--- /dev/null
+++ b/audio/sfx/noise_instrument12_3.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument12_3_Ch8:
+	noise_note 0, 10, 1, 16
+	sound_ret
diff --git a/audio/sfx/noise_instrument13_1.asm b/audio/sfx/noise_instrument13_1.asm
new file mode 100644
index 00000000..50569b26
--- /dev/null
+++ b/audio/sfx/noise_instrument13_1.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument13_1_Ch8:
+	noise_note 0, 10, 2, 17
+	sound_ret
diff --git a/audio/sfx/noise_instrument13_2.asm b/audio/sfx/noise_instrument13_2.asm
new file mode 100644
index 00000000..5a5120f6
--- /dev/null
+++ b/audio/sfx/noise_instrument13_2.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument13_2_Ch8:
+	noise_note 0, 10, 2, 17
+	sound_ret
diff --git a/audio/sfx/noise_instrument13_3.asm b/audio/sfx/noise_instrument13_3.asm
new file mode 100644
index 00000000..848746d7
--- /dev/null
+++ b/audio/sfx/noise_instrument13_3.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument13_3_Ch8:
+	noise_note 0, 10, 2, 17
+	sound_ret
diff --git a/audio/sfx/noise_instrument14_1.asm b/audio/sfx/noise_instrument14_1.asm
new file mode 100644
index 00000000..9621ef42
--- /dev/null
+++ b/audio/sfx/noise_instrument14_1.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument14_1_Ch8:
+	noise_note 0, 10, 2, 80
+	sound_ret
diff --git a/audio/sfx/noise_instrument14_2.asm b/audio/sfx/noise_instrument14_2.asm
new file mode 100644
index 00000000..d413fb1f
--- /dev/null
+++ b/audio/sfx/noise_instrument14_2.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument14_2_Ch8:
+	noise_note 0, 10, 2, 80
+	sound_ret
diff --git a/audio/sfx/noise_instrument14_3.asm b/audio/sfx/noise_instrument14_3.asm
new file mode 100644
index 00000000..bc115181
--- /dev/null
+++ b/audio/sfx/noise_instrument14_3.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument14_3_Ch8:
+	noise_note 0, 10, 2, 80
+	sound_ret
diff --git a/audio/sfx/noise_instrument15_1.asm b/audio/sfx/noise_instrument15_1.asm
new file mode 100644
index 00000000..308746c0
--- /dev/null
+++ b/audio/sfx/noise_instrument15_1.asm
@@ -0,0 +1,4 @@
+SFX_Noise_Instrument15_1_Ch8:
+	noise_note 0, 10, 1, 24
+	noise_note 0, 3, 1, 51
+	sound_ret
diff --git a/audio/sfx/noise_instrument15_2.asm b/audio/sfx/noise_instrument15_2.asm
new file mode 100644
index 00000000..c1f63942
--- /dev/null
+++ b/audio/sfx/noise_instrument15_2.asm
@@ -0,0 +1,4 @@
+SFX_Noise_Instrument15_2_Ch8:
+	noise_note 0, 10, 1, 24
+	noise_note 0, 3, 1, 51
+	sound_ret
diff --git a/audio/sfx/noise_instrument15_3.asm b/audio/sfx/noise_instrument15_3.asm
new file mode 100644
index 00000000..f77872ae
--- /dev/null
+++ b/audio/sfx/noise_instrument15_3.asm
@@ -0,0 +1,4 @@
+SFX_Noise_Instrument15_3_Ch8:
+	noise_note 0, 10, 1, 24
+	noise_note 0, 3, 1, 51
+	sound_ret
diff --git a/audio/sfx/noise_instrument16_1.asm b/audio/sfx/noise_instrument16_1.asm
new file mode 100644
index 00000000..ac830985
--- /dev/null
+++ b/audio/sfx/noise_instrument16_1.asm
@@ -0,0 +1,4 @@
+SFX_Noise_Instrument16_1_Ch8:
+	noise_note 2, 9, 1, 40
+	noise_note 0, 7, 1, 24
+	sound_ret
diff --git a/audio/sfx/noise_instrument16_2.asm b/audio/sfx/noise_instrument16_2.asm
new file mode 100644
index 00000000..e61531bf
--- /dev/null
+++ b/audio/sfx/noise_instrument16_2.asm
@@ -0,0 +1,4 @@
+SFX_Noise_Instrument16_2_Ch8:
+	noise_note 2, 9, 1, 40
+	noise_note 0, 7, 1, 24
+	sound_ret
diff --git a/audio/sfx/noise_instrument16_3.asm b/audio/sfx/noise_instrument16_3.asm
new file mode 100644
index 00000000..99dbca77
--- /dev/null
+++ b/audio/sfx/noise_instrument16_3.asm
@@ -0,0 +1,4 @@
+SFX_Noise_Instrument16_3_Ch8:
+	noise_note 2, 9, 1, 40
+	noise_note 0, 7, 1, 24
+	sound_ret
diff --git a/audio/sfx/noise_instrument17_1.asm b/audio/sfx/noise_instrument17_1.asm
new file mode 100644
index 00000000..41565402
--- /dev/null
+++ b/audio/sfx/noise_instrument17_1.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument17_1_Ch8:
+	noise_note 0, 9, 1, 34
+	sound_ret
diff --git a/audio/sfx/noise_instrument17_2.asm b/audio/sfx/noise_instrument17_2.asm
new file mode 100644
index 00000000..f89ec777
--- /dev/null
+++ b/audio/sfx/noise_instrument17_2.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument17_2_Ch8:
+	noise_note 0, 9, 1, 34
+	sound_ret
diff --git a/audio/sfx/noise_instrument17_3.asm b/audio/sfx/noise_instrument17_3.asm
new file mode 100644
index 00000000..9330fbc0
--- /dev/null
+++ b/audio/sfx/noise_instrument17_3.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument17_3_Ch8:
+	noise_note 0, 9, 1, 34
+	sound_ret
diff --git a/audio/sfx/noise_instrument18_1.asm b/audio/sfx/noise_instrument18_1.asm
new file mode 100644
index 00000000..e77e331d
--- /dev/null
+++ b/audio/sfx/noise_instrument18_1.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument18_1_Ch8:
+	noise_note 0, 7, 1, 34
+	sound_ret
diff --git a/audio/sfx/noise_instrument18_2.asm b/audio/sfx/noise_instrument18_2.asm
new file mode 100644
index 00000000..e937f9f6
--- /dev/null
+++ b/audio/sfx/noise_instrument18_2.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument18_2_Ch8:
+	noise_note 0, 7, 1, 34
+	sound_ret
diff --git a/audio/sfx/noise_instrument18_3.asm b/audio/sfx/noise_instrument18_3.asm
new file mode 100644
index 00000000..59a5d069
--- /dev/null
+++ b/audio/sfx/noise_instrument18_3.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument18_3_Ch8:
+	noise_note 0, 7, 1, 34
+	sound_ret
diff --git a/audio/sfx/noise_instrument19_1.asm b/audio/sfx/noise_instrument19_1.asm
new file mode 100644
index 00000000..2fa183d6
--- /dev/null
+++ b/audio/sfx/noise_instrument19_1.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument19_1_Ch8:
+	noise_note 0, 6, 1, 34
+	sound_ret
diff --git a/audio/sfx/noise_instrument19_2.asm b/audio/sfx/noise_instrument19_2.asm
new file mode 100644
index 00000000..49d09fcc
--- /dev/null
+++ b/audio/sfx/noise_instrument19_2.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument19_2_Ch8:
+	noise_note 0, 6, 1, 34
+	sound_ret
diff --git a/audio/sfx/noise_instrument19_3.asm b/audio/sfx/noise_instrument19_3.asm
new file mode 100644
index 00000000..a90b3e4b
--- /dev/null
+++ b/audio/sfx/noise_instrument19_3.asm
@@ -0,0 +1,3 @@
+SFX_Noise_Instrument19_3_Ch8:
+	noise_note 0, 6, 1, 34
+	sound_ret
diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm
deleted file mode 100644
index a6e569a5..00000000
--- a/audio/sfx/snare1_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare1_1_Ch8:
-	noise_note 0, 12, 1, 51
-	sound_ret
diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm
deleted file mode 100644
index 336c9f22..00000000
--- a/audio/sfx/snare1_2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare1_2_Ch8:
-	noise_note 0, 12, 1, 51
-	sound_ret
diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm
deleted file mode 100644
index 84108aed..00000000
--- a/audio/sfx/snare1_3.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare1_3_Ch8:
-	noise_note 0, 12, 1, 51
-	sound_ret
diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm
deleted file mode 100644
index fddcfe01..00000000
--- a/audio/sfx/snare2_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare2_1_Ch8:
-	noise_note 0, 11, 1, 51
-	sound_ret
diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm
deleted file mode 100644
index 522abb40..00000000
--- a/audio/sfx/snare2_2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare2_2_Ch8:
-	noise_note 0, 11, 1, 51
-	sound_ret
diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm
deleted file mode 100644
index c41fadbb..00000000
--- a/audio/sfx/snare2_3.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare2_3_Ch8:
-	noise_note 0, 11, 1, 51
-	sound_ret
diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm
deleted file mode 100644
index 0c9cfbdb..00000000
--- a/audio/sfx/snare3_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare3_1_Ch8:
-	noise_note 0, 10, 1, 51
-	sound_ret
diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm
deleted file mode 100644
index d5990157..00000000
--- a/audio/sfx/snare3_2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare3_2_Ch8:
-	noise_note 0, 10, 1, 51
-	sound_ret
diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm
deleted file mode 100644
index 807cfd03..00000000
--- a/audio/sfx/snare3_3.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare3_3_Ch8:
-	noise_note 0, 10, 1, 51
-	sound_ret
diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm
deleted file mode 100644
index fe2552d9..00000000
--- a/audio/sfx/snare4_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare4_1_Ch8:
-	noise_note 0, 8, 1, 51
-	sound_ret
diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm
deleted file mode 100644
index 0913ba2b..00000000
--- a/audio/sfx/snare4_2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare4_2_Ch8:
-	noise_note 0, 8, 1, 51
-	sound_ret
diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm
deleted file mode 100644
index 3aeeb49b..00000000
--- a/audio/sfx/snare4_3.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare4_3_Ch8:
-	noise_note 0, 8, 1, 51
-	sound_ret
diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm
deleted file mode 100644
index 21d4996d..00000000
--- a/audio/sfx/snare5_1.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SFX_Snare5_1_Ch8:
-	noise_note 7, 8, 4, 55
-	noise_note 6, 8, 4, 54
-	noise_note 5, 8, 3, 53
-	noise_note 4, 8, 3, 52
-	noise_note 3, 8, 2, 51
-	noise_note 2, 8, 1, 50
-	sound_ret
diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm
deleted file mode 100644
index c37865a0..00000000
--- a/audio/sfx/snare5_2.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SFX_Snare5_2_Ch8:
-	noise_note 7, 8, 4, 55
-	noise_note 6, 8, 4, 54
-	noise_note 5, 8, 3, 53
-	noise_note 4, 8, 3, 52
-	noise_note 3, 8, 2, 51
-	noise_note 2, 8, 1, 50
-	sound_ret
diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm
deleted file mode 100644
index d49211d0..00000000
--- a/audio/sfx/snare5_3.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-SFX_Snare5_3_Ch8:
-	noise_note 7, 8, 4, 55
-	noise_note 6, 8, 4, 54
-	noise_note 5, 8, 3, 53
-	noise_note 4, 8, 3, 52
-	noise_note 3, 8, 2, 51
-	noise_note 2, 8, 1, 50
-	sound_ret
diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm
deleted file mode 100644
index 03a63d40..00000000
--- a/audio/sfx/snare6_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare6_1_Ch8:
-	noise_note 0, 8, 1, 16
-	sound_ret
diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm
deleted file mode 100644
index 7adad3fb..00000000
--- a/audio/sfx/snare6_2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare6_2_Ch8:
-	noise_note 0, 8, 1, 16
-	sound_ret
diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm
deleted file mode 100644
index 9a6b7be3..00000000
--- a/audio/sfx/snare6_3.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare6_3_Ch8:
-	noise_note 0, 8, 1, 16
-	sound_ret
diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm
deleted file mode 100644
index 1e216fea..00000000
--- a/audio/sfx/snare7_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare7_1_Ch8:
-	noise_note 0, 8, 2, 35
-	sound_ret
diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm
deleted file mode 100644
index 11a13239..00000000
--- a/audio/sfx/snare7_2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare7_2_Ch8:
-	noise_note 0, 8, 2, 35
-	sound_ret
diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm
deleted file mode 100644
index c9d96902..00000000
--- a/audio/sfx/snare7_3.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare7_3_Ch8:
-	noise_note 0, 8, 2, 35
-	sound_ret
diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm
deleted file mode 100644
index 9dcc4381..00000000
--- a/audio/sfx/snare8_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare8_1_Ch8:
-	noise_note 0, 8, 2, 37
-	sound_ret
diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm
deleted file mode 100644
index 020de92f..00000000
--- a/audio/sfx/snare8_2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare8_2_Ch8:
-	noise_note 0, 8, 2, 37
-	sound_ret
diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm
deleted file mode 100644
index ecb6a9a7..00000000
--- a/audio/sfx/snare8_3.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare8_3_Ch8:
-	noise_note 0, 8, 2, 37
-	sound_ret
diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm
deleted file mode 100644
index 674efb12..00000000
--- a/audio/sfx/snare9_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare9_1_Ch8:
-	noise_note 0, 8, 2, 38
-	sound_ret
diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm
deleted file mode 100644
index 9d8f307d..00000000
--- a/audio/sfx/snare9_2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare9_2_Ch8:
-	noise_note 0, 8, 2, 38
-	sound_ret
diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm
deleted file mode 100644
index 6bfd1973..00000000
--- a/audio/sfx/snare9_3.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Snare9_3_Ch8:
-	noise_note 0, 8, 2, 38
-	sound_ret
diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm
deleted file mode 100644
index df952676..00000000
--- a/audio/sfx/triangle1_1.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Triangle1_1_Ch8:
-	noise_note 0, 5, 1, 42
-	sound_ret
diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm
deleted file mode 100644
index a90cec67..00000000
--- a/audio/sfx/triangle1_2.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Triangle1_2_Ch8:
-	noise_note 0, 5, 1, 42
-	sound_ret
diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm
deleted file mode 100644
index e897dd61..00000000
--- a/audio/sfx/triangle1_3.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_Triangle1_3_Ch8:
-	noise_note 0, 5, 1, 42
-	sound_ret
diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm
deleted file mode 100644
index df7e39ed..00000000
--- a/audio/sfx/triangle2_1.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_Triangle2_1_Ch8:
-	noise_note 1, 4, 1, 43
-	noise_note 0, 6, 1, 42
-	sound_ret
diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm
deleted file mode 100644
index 39934efa..00000000
--- a/audio/sfx/triangle2_2.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_Triangle2_2_Ch8:
-	noise_note 1, 4, 1, 43
-	noise_note 0, 6, 1, 42
-	sound_ret
diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm
deleted file mode 100644
index 370e13e7..00000000
--- a/audio/sfx/triangle2_3.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_Triangle2_3_Ch8:
-	noise_note 1, 4, 1, 43
-	noise_note 0, 6, 1, 42
-	sound_ret
diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm
deleted file mode 100644
index 18b140e2..00000000
--- a/audio/sfx/triangle3_1.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_Triangle3_1_Ch8:
-	noise_note 2, 9, 1, 40
-	noise_note 0, 7, 1, 24
-	sound_ret
diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm
deleted file mode 100644
index c03be804..00000000
--- a/audio/sfx/triangle3_2.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_Triangle3_2_Ch8:
-	noise_note 2, 9, 1, 40
-	noise_note 0, 7, 1, 24
-	sound_ret
diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm
deleted file mode 100644
index 95a047ae..00000000
--- a/audio/sfx/triangle3_3.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-SFX_Triangle3_3_Ch8:
-	noise_note 2, 9, 1, 40
-	noise_note 0, 7, 1, 24
-	sound_ret
diff --git a/constants/music_constants.asm b/constants/music_constants.asm
index 5eb05b61..9cf72b26 100644
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -95,25 +95,25 @@ ENDM
 	music_const MUSIC_MEET_MALE_TRAINER,   Music_MeetMaleTrainer
 
 	; AUDIO_1 AUDIO_2 AUDIO_3
-	music_const SFX_SNARE_1,            SFX_Snare1_1
-	music_const SFX_SNARE_2,            SFX_Snare2_1
-	music_const SFX_SNARE_3,            SFX_Snare3_1
-	music_const SFX_SNARE_4,            SFX_Snare4_1
-	music_const SFX_SNARE_5,            SFX_Snare5_1
-	music_const SFX_TRIANGLE_1,         SFX_Triangle1_1
-	music_const SFX_TRIANGLE_2,         SFX_Triangle2_1
-	music_const SFX_SNARE_6,            SFX_Snare6_1
-	music_const SFX_SNARE_7,            SFX_Snare7_1
-	music_const SFX_SNARE_8,            SFX_Snare8_1
-	music_const SFX_SNARE_9,            SFX_Snare9_1
-	music_const SFX_CYMBAL_1,           SFX_Cymbal1_1
-	music_const SFX_CYMBAL_2,           SFX_Cymbal2_1
-	music_const SFX_CYMBAL_3,           SFX_Cymbal3_1
-	music_const SFX_MUTED_SNARE_1,      SFX_Muted_Snare1_1
-	music_const SFX_TRIANGLE_3,         SFX_Triangle3_1
-	music_const SFX_MUTED_SNARE_2,      SFX_Muted_Snare2_1
-	music_const SFX_MUTED_SNARE_3,      SFX_Muted_Snare3_1
-	music_const SFX_MUTED_SNARE_4,      SFX_Muted_Snare4_1
+	music_const SFX_NOISE_INSTRUMENT01, SFX_Noise_Instrument01_1
+	music_const SFX_NOISE_INSTRUMENT02, SFX_Noise_Instrument02_1
+	music_const SFX_NOISE_INSTRUMENT03, SFX_Noise_Instrument03_1
+	music_const SFX_NOISE_INSTRUMENT04, SFX_Noise_Instrument04_1
+	music_const SFX_NOISE_INSTRUMENT05, SFX_Noise_Instrument05_1
+	music_const SFX_NOISE_INSTRUMENT06, SFX_Noise_Instrument06_1
+	music_const SFX_NOISE_INSTRUMENT07, SFX_Noise_Instrument07_1
+	music_const SFX_NOISE_INSTRUMENT08, SFX_Noise_Instrument08_1
+	music_const SFX_NOISE_INSTRUMENT09, SFX_Noise_Instrument09_1
+	music_const SFX_NOISE_INSTRUMENT10, SFX_Noise_Instrument10_1
+	music_const SFX_NOISE_INSTRUMENT11, SFX_Noise_Instrument11_1
+	music_const SFX_NOISE_INSTRUMENT12, SFX_Noise_Instrument12_1
+	music_const SFX_NOISE_INSTRUMENT13, SFX_Noise_Instrument13_1
+	music_const SFX_NOISE_INSTRUMENT14, SFX_Noise_Instrument14_1
+	music_const SFX_NOISE_INSTRUMENT15, SFX_Noise_Instrument15_1
+	music_const SFX_NOISE_INSTRUMENT16, SFX_Noise_Instrument16_1
+	music_const SFX_NOISE_INSTRUMENT17, SFX_Noise_Instrument17_1
+	music_const SFX_NOISE_INSTRUMENT18, SFX_Noise_Instrument18_1
+	music_const SFX_NOISE_INSTRUMENT19, SFX_Noise_Instrument19_1
 	music_const SFX_CRY_00,             SFX_Cry00_1
 	music_const SFX_CRY_01,             SFX_Cry01_1
 	music_const SFX_CRY_02,             SFX_Cry02_1
@@ -194,7 +194,7 @@ ENDM
 	music_const SFX_SAVE,               SFX_Save_1
 
 	; AUDIO_1
-	music_const SFX_POKEFLUTE,           SFX_Pokeflute
+	music_const SFX_POKEFLUTE,          SFX_Pokeflute
 	music_const SFX_SAFARI_ZONE_PA,     SFX_Safari_Zone_PA
 
 	; AUDIO_2
diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm
index ae67491f..a4cd6c3b 100755
--- a/macros/audio_macros.asm
+++ b/macros/audio_macros.asm
@@ -40,7 +40,7 @@ pitch_sweep: MACRO
 	ENDC
 ENDM
 
-;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch
+;format: length [0, 15], volume [0, 15], volume change [-7, 7], frequency
 square_note: MACRO
 	db $20 | \1
 	IF \3 < 0
@@ -51,7 +51,7 @@ square_note: MACRO
 	dw \4
 ENDM
 
-;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch
+;format: length [0, 15], volume [0, 15], volume change [-7, 7], frequency
 noise_note: MACRO
 	db $20 | \1
 	IF \3 < 0
@@ -75,113 +75,23 @@ A_ EQU $9
 A# EQU $A
 B_ EQU $B
 
-;format: pitch length (in 16ths)
+;format: pitch, length (in 16ths)
 note: MACRO
 	db (\1 << 4) | (\2 - 1)
 ENDM
 
-;format: instrument length (in 16ths)
-snare1: MACRO
-	db $B0 | (\1 - 1)
-	db $01
-ENDM
-
-snare2: MACRO
-	db $B0 | (\1 - 1)
-	db $02
-ENDM
-
-snare3: MACRO
-	db $B0 | (\1 - 1)
-	db $03
-ENDM
-
-snare4: MACRO
-	db $B0 | (\1 - 1)
-	db $04
-ENDM
-
-snare5: MACRO
-	db $B0 | (\1 - 1)
-	db $05
-ENDM
-
-triangle1: MACRO
-	db $B0 | (\1 - 1)
-	db $06
-ENDM
-
-triangle2: MACRO
-	db $B0 | (\1 - 1)
-	db $07
-ENDM
-
-snare6: MACRO
-	db $B0 | (\1 - 1)
-	db $08
-ENDM
-
-snare7: MACRO
-	db $B0 | (\1 - 1)
-	db $09
-ENDM
-
-snare8: MACRO
-	db $B0 | (\1 - 1)
-	db $0A
-ENDM
-
-snare9: MACRO
-	db $B0 | (\1 - 1)
-	db $0B
-ENDM
-
-cymbal1: MACRO
-	db $B0 | (\1 - 1)
-	db $0C
-ENDM
-
-cymbal2: MACRO
-	db $B0 | (\1 - 1)
-	db $0D
-ENDM
-
-cymbal3: MACRO
-	db $B0 | (\1 - 1)
-	db $0E
-ENDM
-
-mutedsnare1: MACRO
-	db $B0 | (\1 - 1)
-	db $0F
-ENDM
-
-triangle3: MACRO
-	db $B0 | (\1 - 1)
-	db $10
-ENDM
-
-mutedsnare2: MACRO
-	db $B0 | (\1 - 1)
-	db $11
-ENDM
-
-mutedsnare3: MACRO
-	db $B0 | (\1 - 1)
-	db $12
-ENDM
-
-mutedsnare4: MACRO
-	db $B0 | (\1 - 1)
-	db $13
+;format: instrument, length (in 16ths)
+dnote: MACRO
+	db $B0 | (\2 - 1)
+	db \1
 ENDM
 
-;format: rest length (in 16ths)
+;format: length (in 16ths)
 rest: MACRO
 	db $C0 | (\1 - 1)
 ENDM
 
-; format: notetype speed, volume, fade
+;format: speed, volume, fade
 note_type: MACRO
 	db $D0 | \1
 	db (\2 << 4) | \3
@@ -242,13 +152,13 @@ duty_cycle_pattern: MACRO
 	db \1
 ENDM
 
-;format: callchannel address
+;format: address
 sound_call: MACRO
 	db $FD
 	dw \1
 ENDM
 
-;format: loopchannel count, address
+;format: count, address
 sound_loop: MACRO
 	db $FE
 	db \1
-- 
cgit v1.3.1-sl0p


From 969b43d443090da42a4d0d73129298f6b6d69d5a Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Sat, 17 Aug 2019 14:40:34 -0500
Subject: Update labels to match new audio macro names and synchronize engine_2
 and engine_3 with engine_1

---
 audio/engine_1.asm                     |  402 +++++------
 audio/engine_2.asm                     | 1163 +++++++++++++++++---------------
 audio/engine_3.asm                     | 1115 +++++++++++++++---------------
 audio/music/yellow/meetjessiejames.asm |    1 -
 constants/music_constants.asm          |   28 +-
 macros/audio_macros.asm                |    8 +
 wram.asm                               |   20 +-
 7 files changed, 1439 insertions(+), 1298 deletions(-)

(limited to 'macros')

diff --git a/audio/engine_1.asm b/audio/engine_1.asm
index 8b021acf..a8389819 100644
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -57,25 +57,25 @@ Audio1_ApplyMusicAffects:
 .startChecks
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit BIT_ROTATE_DUTY, [hl]
+	bit BIT_ROTATE_DUTY_CYCLE, [hl]
 	jr z, .checkForExecuteMusic
-	call Audio1_ApplyDutyCycle
+	call Audio1_ApplyDutyCyclePattern
 .checkForExecuteMusic
 	ld b, 0
 	ld hl, wChannelFlags2
 	add hl, bc
 	bit BIT_EXECUTE_MUSIC, [hl]
-	jr nz, .checkForPitchBend
+	jr nz, .checkForPitchSlide
 	ld hl, wChannelFlags1
 	add hl, bc
 	bit BIT_NOISE_OR_SFX, [hl]
-	jr nz, .skipPitchBendVibrato
-.checkForPitchBend
+	jr nz, .skipPitchSlideVibrato
+.checkForPitchSlide
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit BIT_PITCH_BEND_ON, [hl]
+	bit BIT_PITCH_SLIDE_ON, [hl]
 	jr z, .checkVibratoDelay
-	jp Audio1_ApplyPitchBend
+	jp Audio1_ApplyPitchSlide
 .checkVibratoDelay
 	ld hl, wChannelVibratoDelayCounters
 	add hl, bc
@@ -83,7 +83,7 @@ Audio1_ApplyMusicAffects:
 	and a ; check if delay is over
 	jr z, .checkForVibrato
 	dec [hl] ; otherwise, dec delay
-.skipPitchBendVibrato
+.skipPitchSlideVibrato
 	ret
 .checkForVibrato
 	ld hl, wChannelVibratoExtents
@@ -142,7 +142,7 @@ Audio1_ApplyMusicAffects:
 	ret
 
 ; this routine executes all music commands that take up no time,
-; like tempo changes, duty changes etc. and doesn't return
+; like tempo changes, duty cycle changes etc. and doesn't return
 ; until the first note is reached
 Audio1_PlayNextNote:
 ; reload the vibrato delay counter
@@ -155,20 +155,20 @@ Audio1_PlayNextNote:
 
 	ld hl, wChannelFlags1
 	add hl, bc
-	res BIT_PITCH_BEND_ON, [hl]
-	res BIT_PITCH_BEND_DECREASING, [hl]
-	call Audio1_endchannel
+	res BIT_PITCH_SLIDE_ON, [hl]
+	res BIT_PITCH_SLIDE_DECREASING, [hl]
+	call Audio1_sound_ret
 	ret
 
-Audio1_endchannel:
+Audio1_sound_ret:
 	call Audio1_GetNextMusicByte
 	ld d, a
-	cp $ff ; is this command an endchannel?
-	jp nz, Audio1_callchannel ; no
+	cp $ff ; is this command a sound_ret?
+	jp nz, Audio1_sound_call ; no
 	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit BIT_CHANNEL_CALL, [hl]
+	bit BIT_SOUND_CALL, [hl]
 	jr nz, .returnFromCall
 	ld a, c
 	cp Ch4
@@ -187,15 +187,15 @@ Audio1_endchannel:
 	ld a, $80
 	ld [rNR30], a
 .skipSfxChannel3
-	jr nz, .asm_9222
+	jr nz, .dontDisable
 	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
-	jr z, .asm_9222
+	jr z, .dontDisable
 	xor a
 	ld [wDisableChannelOutputWhenSfxEnds], a
 	jr .disableChannelOutput
-.asm_9222
-	jr .asm_9248
+.dontDisable
+	jr .afterDisable
 .returnFromCall
 	res 1, [hl]
 	ld d, $0
@@ -215,19 +215,19 @@ Audio1_endchannel:
 	inc de
 	ld a, [de]
 	ld [hl], a ; loads channel address to return to
-	jp Audio1_endchannel
+	jp Audio1_sound_ret
 .disableChannelOutput
 	ld hl, Audio1_HWChannelDisableMasks
 	add hl, bc
 	ld a, [rNR51]
 	and [hl]
 	ld [rNR51], a
-.asm_9248
+.afterDisable
 	ld a, [wChannelSoundIDs + Ch5]
 	cp CRY_SFX_START
-	jr nc, .asm_9251
+	jr nc, .maybeCry
 	jr .skipCry
-.asm_9251
+.maybeCry
 	ld a, [wChannelSoundIDs + Ch5]
 	cp CRY_SFX_END
 	jr z, .skipCry
@@ -236,10 +236,10 @@ Audio1_endchannel:
 .cry
 	ld a, c
 	cp Ch5
-	jr z, .asm_9265
+	jr z, .skipRewind
 	call Audio1_GoBackOneCommandIfCry
 	ret c
-.asm_9265
+.skipRewind
 	ld a, [wSavedVolume]
 	ld [rNR50], a
 	xor a
@@ -250,9 +250,9 @@ Audio1_endchannel:
 	ld [hl], b
 	ret
 
-Audio1_callchannel:
-	cp $fd ; is this command a callchannel?
-	jp nz, Audio1_loopchannel ; no
+Audio1_sound_call:
+	cp $fd ; is this command a sound_call?
+	jp nz, Audio1_sound_loop ; no
 	call Audio1_GetNextMusicByte
 	push af
 	call Audio1_GetNextMusicByte
@@ -284,12 +284,12 @@ Audio1_callchannel:
 	ld b, $0
 	ld hl, wChannelFlags1
 	add hl, bc
-	set BIT_CHANNEL_CALL, [hl] ; set the call flag
-	jp Audio1_endchannel
+	set BIT_SOUND_CALL, [hl] ; set the call flag
+	jp Audio1_sound_ret
 
-Audio1_loopchannel:
-	cp $fe ; is this command a loopchannel?
-	jp nz, Audio1_notetype ; no
+Audio1_sound_loop:
+	cp $fe ; is this command a sound_loop?
+	jp nz, Audio1_note_type ; no
 	call Audio1_GetNextMusicByte
 	ld e, a
 	and a
@@ -304,7 +304,7 @@ Audio1_loopchannel:
 	ld [hl], a
 	call Audio1_GetNextMusicByte ; skip pointer
 	call Audio1_GetNextMusicByte
-	jp Audio1_endchannel
+	jp Audio1_sound_ret
 .loopAgain ; inc loop count
 	inc a
 	ld [hl], a
@@ -323,12 +323,12 @@ Audio1_loopchannel:
 	pop af
 	ld [hli], a
 	ld [hl], b
-	jp Audio1_endchannel
+	jp Audio1_sound_ret
 
-Audio1_notetype:
+Audio1_note_type:
 	and $f0
-	cp $d0 ; is this command a notetype?
-	jp nz, Audio1_toggleperfectpitch ; no
+	cp $d0 ; is this command a note_type?
+	jp nz, Audio1_toggle_perfect_pitch ; no
 	ld a, d
 	and $f
 	ld b, $0
@@ -367,11 +367,11 @@ Audio1_notetype:
 	add hl, bc
 	ld [hl], d
 .noiseChannel
-	jp Audio1_endchannel
+	jp Audio1_sound_ret
 
-Audio1_toggleperfectpitch:
+Audio1_toggle_perfect_pitch:
 	ld a, d
-	cp $e8 ; is this command a toggleperfectpitch?
+	cp $e8 ; is this command a toggle_perfect_pitch?
 	jr nz, Audio1_vibrato ; no
 	ld b, 0
 	ld hl, wChannelFlags1
@@ -379,11 +379,11 @@ Audio1_toggleperfectpitch:
 	ld a, [hl]
 	xor $1
 	ld [hl], a ; flip bit 0 of wChannelFlags1
-	jp Audio1_endchannel
+	jp Audio1_sound_ret
 
 Audio1_vibrato:
 	cp $ea ; is this command a vibrato?
-	jr nz, Audio1_pitchbend ; no
+	jr nz, Audio1_pitch_slide ; no
 	call Audio1_GetNextMusicByte
 	ld b, 0
 	ld hl, wChannelVibratoDelayCounters
@@ -427,14 +427,14 @@ Audio1_vibrato:
 	or d
 	ld [hl], a
 
-	jp Audio1_endchannel
+	jp Audio1_sound_ret
 
-Audio1_pitchbend:
-	cp $eb ; is this command a pitchbend?
-	jr nz, Audio1_duty ; no
+Audio1_pitch_slide:
+	cp $eb ; is this command a pitch_slide?
+	jr nz, Audio1_duty_cycle ; no
 	call Audio1_GetNextMusicByte
 	ld b, 0
-	ld hl, wChannelPitchBendLengthModifiers
+	ld hl, wChannelPitchSlideLengthModifiers
 	add hl, bc
 	ld [hl], a
 	call Audio1_GetNextMusicByte
@@ -446,36 +446,36 @@ Audio1_pitchbend:
 	and $f
 	call Audio1_CalculateFrequency
 	ld b, 0
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
 	ld [hl], d
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, bc
 	ld [hl], e
 	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
-	set BIT_PITCH_BEND_ON, [hl]
+	set BIT_PITCH_SLIDE_ON, [hl]
 	call Audio1_GetNextMusicByte
 	ld d, a
-	jp Audio1_notelength
+	jp Audio1_note_length
 
-Audio1_duty:
-	cp $ec ; is this command a duty?
+Audio1_duty_cycle:
+	cp $ec ; is this command a duty_cycle?
 	jr nz, Audio1_tempo ; no
 	call Audio1_GetNextMusicByte
 	rrca
 	rrca
 	and $c0
 	ld b, 0
-	ld hl, wChannelDuties
+	ld hl, wChannelDutyCycles
 	add hl, bc
-	ld [hl], a ; store duty
-	jp Audio1_endchannel
+	ld [hl], a ; store duty cycle
+	jp Audio1_sound_ret
 
 Audio1_tempo:
 	cp $ed ; is this command a tempo?
-	jr nz, Audio1_stereopanning ; no
+	jr nz, Audio1_stereo_panning ; no
 	ld a, c
 	cp Ch5
 	jr nc, .sfxChannel
@@ -500,19 +500,19 @@ Audio1_tempo:
 	ld [wChannelNoteDelayCountersFractionalPart + 6], a
 	ld [wChannelNoteDelayCountersFractionalPart + 7], a
 .musicChannelDone
-	jp Audio1_endchannel
+	jp Audio1_sound_ret
 
-Audio1_stereopanning:
-	cp $ee ; is this command a stereopanning?
+Audio1_stereo_panning:
+	cp $ee ; is this command a stereo_panning?
 	jr nz, Audio1_unknownmusic0xef ; no
 	call Audio1_GetNextMusicByte
 	ld [wStereoPanning], a ; store panning
-	jp Audio1_endchannel
+	jp Audio1_sound_ret
 
 ; this appears to never be used
 Audio1_unknownmusic0xef:
 	cp $ef ; is this command an unknownmusic0xef?
-	jr nz, Audio1_dutycycle ; no
+	jr nz, Audio1_duty_cycle_pattern ; no
 	call Audio1_GetNextMusicByte
 	push bc
 	call Audio1_PlaySound
@@ -525,72 +525,72 @@ Audio1_unknownmusic0xef:
 	xor a
 	ld [wChannelSoundIDs + Ch8], a
 .skip
-	jp Audio1_endchannel
+	jp Audio1_sound_ret
 
-Audio1_dutycycle:
-	cp $fc ; is this command a dutycycle?
+Audio1_duty_cycle_pattern:
+	cp $fc ; is this command a duty_cycle_pattern?
 	jr nz, Audio1_volume ; no
 	call Audio1_GetNextMusicByte
 	ld b, 0
-	ld hl, wChannelDutyCycles
+	ld hl, wChannelDutyCyclePatterns
 	add hl, bc
-	ld [hl], a ; store full cycle
-	and $c0
-	ld hl, wChannelDuties
+	ld [hl], a ; store full pattern
+	and %11000000
+	ld hl, wChannelDutyCycles
 	add hl, bc
-	ld [hl], a ; store first duty
+	ld [hl], a ; store first duty cycle
 	ld hl, wChannelFlags1
 	add hl, bc
-	set BIT_ROTATE_DUTY, [hl]
-	jp Audio1_endchannel
+	set BIT_ROTATE_DUTY_CYCLE, [hl]
+	jp Audio1_sound_ret
 
 Audio1_volume:
 	cp $f0 ; is this command a volume?
-	jr nz, Audio1_executemusic ; no
+	jr nz, Audio1_execute_music ; no
 	call Audio1_GetNextMusicByte
 	ld [rNR50], a ; store volume
-	jp Audio1_endchannel
+	jp Audio1_sound_ret
 
-Audio1_executemusic:
-	cp $f8 ; is this command an executemusic?
+Audio1_execute_music:
+	cp $f8 ; is this command an execute_music?
 	jr nz, Audio1_octave ; no
 	ld b, $0
 	ld hl, wChannelFlags2
 	add hl, bc
 	set BIT_EXECUTE_MUSIC, [hl]
-	jp Audio1_endchannel
+	jp Audio1_sound_ret
 
 Audio1_octave:
 	and $f0
 	cp $e0 ; is this command an octave?
-	jr nz, Audio1_sfxnote ; no
+	jr nz, Audio1_sfx_note ; no
 	ld hl, wChannelOctaves
 	ld b, 0
 	add hl, bc
 	ld a, d
 	and $f
 	ld [hl], a ; store low nibble as octave
-	jp Audio1_endchannel
+	jp Audio1_sound_ret
 
-; sfxnote is either squarenote or noisenote depending on the channel
-Audio1_sfxnote:
-	cp $20 ; is this command a sfxnote?
-	jr nz, Audio1_pitchenvelope
+; sfx_note is either square_note or noise_note depending on the channel
+Audio1_sfx_note:
+	cp $20 ; is this command a sfx_note?
+	jr nz, Audio1_pitch_sweep
 	ld a, c
 	cp Ch4 ; is this a noise or sfx channel?
-	jr c, Audio1_pitchenvelope ; no
+	jr c, Audio1_pitch_sweep ; no
 	ld b, 0
 	ld hl, wChannelFlags2
 	add hl, bc
-	bit BIT_EXECUTE_MUSIC, [hl] ; is executemusic being used?
-	jr nz, Audio1_pitchenvelope ; yes
-	call Audio1_notelength
+	bit BIT_EXECUTE_MUSIC, [hl] ; is execute_music being used?
+	jr nz, Audio1_pitch_sweep ; yes
+	call Audio1_note_length
 
-; This code seems to do the same thing as what Audio1_ApplyDutyAndSoundLength
+; This code seems to do the same thing as what Audio1_ApplyDutyCycleAndSoundLength
 ; does below.
 	ld d, a
 	ld b, 0
-	ld hl, wChannelDuties
+	ld hl, wChannelDutyCycles
 	add hl, bc
 	ld a, [hl]
 	or d
@@ -619,18 +619,18 @@ Audio1_sfxnote:
 .skip
 	ld d, a
 	push de
-	call Audio1_ApplyDutyAndSoundLength
+	call Audio1_ApplyDutyCycleAndSoundLength
 	call Audio1_EnableChannelOutput
 	pop de
 	call Audio1_ApplyWavePatternAndFrequency
 	ret
 
-Audio1_pitchenvelope:
+Audio1_pitch_sweep:
 	ld a, c
 	cp Ch5
 	jr c, Audio1_note ; if not a sfx
 	ld a, d
-	cp $10 ; is this command a pitchenvelope?
+	cp $10 ; is this command a pitch_sweep?
 	jr nz, Audio1_note ; no
 	ld b, $0
 	ld hl, wChannelFlags2
@@ -639,17 +639,27 @@ Audio1_pitchenvelope:
 	jr nz, Audio1_note ; no
 	call Audio1_GetNextMusicByte
 	ld [rNR10], a
-	jp Audio1_endchannel
+	jp Audio1_sound_ret
 
 Audio1_note:
 	ld a, c
 	cp Ch4
-	jr nz, Audio1_notelength ; if not noise channel
+	jr nz, Audio1_note_length ; if not noise channel
 	ld a, d
 	and $f0
 	cp $b0 ; is this command a dnote?
-	jr z, Audio1_dnote
-	jr nc, Audio1_notelength ; no
+	jr z, .dnote
+	jr nc, Audio1_note_length ; no
+
+	; this executes when on the noise channel and
+	; the command id is less than $b0
+	; in this case, the upper nybble is used as the noise instrument ($1-$a)
+	; 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
+	; instead of 2 and can only be used with instruments 1 and 3 through 10
+	; this is unused by the game
 	swap a
 	ld b, a
 	ld a, d
@@ -658,26 +668,26 @@ Audio1_note:
 	ld a, b
 	push de
 	push bc
-	jr asm_94fd
+	jr .playDnote
 
-Audio1_dnote:
+.dnote
 	ld a, d
 	and $f
 	push af
 	push bc
 	call Audio1_GetNextMusicByte ; get dnote instrument
-asm_94fd
+.playDnote
 	ld d, a
 	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
-	jr nz, .asm_9508
+	jr nz, .skipDnote
 	ld a, d
 	call Audio1_PlaySound
-.asm_9508
+.skipDnote
 	pop bc
 	pop de
 
-Audio1_notelength:
+Audio1_note_length:
 	ld a, d
 	push af
 	and $f
@@ -727,15 +737,15 @@ Audio1_notelength:
 	ld hl, wChannelFlags2
 	add hl, bc
 	bit BIT_EXECUTE_MUSIC, [hl]
-	jr nz, Audio1_notepitch
+	jr nz, Audio1_note_pitch
 	ld hl, wChannelFlags1
 	add hl, bc
 	bit BIT_NOISE_OR_SFX, [hl]
-	jr z, Audio1_notepitch
+	jr z, Audio1_note_pitch
 	pop hl
 	ret
 
-Audio1_notepitch:
+Audio1_note_pitch:
 	pop af
 	and $f0
 	cp $c0 ; compare to rest
@@ -784,10 +794,10 @@ Audio1_notepitch:
 	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit BIT_PITCH_BEND_ON, [hl]
-	jr z, .skipPitchBend
-	call Audio1_InitPitchBendVars
-.skipPitchBend
+	bit BIT_PITCH_SLIDE_ON, [hl]
+	jr z, .skipPitchSlide
+	call Audio1_InitPitchSlideVars
+.skipPitchSlide
 	push de
 	ld a, c
 	cp Ch5
@@ -812,13 +822,13 @@ Audio1_notepitch:
 	ld b, REG_VOLUME_ENVELOPE
 	call Audio1_GetRegisterPointer
 	ld [hl], d
-	call Audio1_ApplyDutyAndSoundLength
+	call Audio1_ApplyDutyCycleAndSoundLength
 	call Audio1_EnableChannelOutput
 	pop de
 	ld b, $0
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit BIT_PERFECT_PITCH, [hl] ; has toggleperfectpitch been used?
+	bit BIT_PERFECT_PITCH, [hl] ; has toggle_perfect_pitch been used?
 	jr z, .skipFrequencyInc
 	inc e                       ; if yes, increment the frequency by 1
 	jr nc, .skipFrequencyInc
@@ -867,7 +877,7 @@ Audio1_EnableChannelOutput:
 	ld [rNR51], a
 	ret
 
-Audio1_ApplyDutyAndSoundLength:
+Audio1_ApplyDutyCycleAndSoundLength:
 	ld b, 0
 	ld hl, wChannelNoteDelayCounters ; use the note delay as sound length
 	add hl, bc
@@ -877,11 +887,11 @@ Audio1_ApplyDutyAndSoundLength:
 	jr z, .skipDuty ; if music channel 3
 	cp Ch7
 	jr z, .skipDuty ; if sfx channel 3
-; include duty (except on channel 3 which doesn't have it)
+; include duty cycle (except on channel 3 which doesn't have it)
 	ld a, d
 	and $3f
 	ld d, a
-	ld hl, wChannelDuties
+	ld hl, wChannelDutyCycles
 	add hl, bc
 	ld a, [hl]
 	or d
@@ -1022,29 +1032,29 @@ Audio1_IsCry:
 	scf
 	ret
 
-Audio1_ApplyPitchBend:
+Audio1_ApplyPitchSlide:
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit BIT_PITCH_BEND_DECREASING, [hl]
+	bit BIT_PITCH_SLIDE_DECREASING, [hl]
 	jp nz, .frequencyDecreasing
 ; frequency increasing
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, bc
 	ld e, [hl]
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, bc
 	ld d, [hl]
-	ld hl, wChannelPitchBendFrequencySteps
+	ld hl, wChannelPitchSlideFrequencySteps
 	add hl, bc
 	ld l, [hl]
 	ld h, b
 	add hl, de
 	ld d, h
 	ld e, l
-	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
+	ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart
 	add hl, bc
 	push hl
-	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
+	ld hl, wChannelPitchSlideFrequencyStepsFractionalPart
 	add hl, bc
 	ld a, [hl]
 	pop hl
@@ -1056,26 +1066,26 @@ Audio1_ApplyPitchBend:
 	ld a, 0
 	adc d
 	ld d, a
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
 	ld a, [hl]
 	cp d
 	jp c, .reachedTargetFrequency
 	jr nz, .applyUpdatedFrequency
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, bc
 	ld a, [hl]
 	cp e
 	jp c, .reachedTargetFrequency
 	jr .applyUpdatedFrequency
 .frequencyDecreasing
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, bc
 	ld a, [hl]
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, bc
 	ld d, [hl]
-	ld hl, wChannelPitchBendFrequencySteps
+	ld hl, wChannelPitchSlideFrequencySteps
 	add hl, bc
 	ld e, [hl]
 	sub e
@@ -1083,7 +1093,7 @@ Audio1_ApplyPitchBend:
 	ld a, d
 	sbc b
 	ld d, a
-	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
+	ld hl, wChannelPitchSlideFrequencyStepsFractionalPart
 	add hl, bc
 	ld a, [hl]
 	add a
@@ -1094,22 +1104,22 @@ Audio1_ApplyPitchBend:
 	ld a, d
 	sbc b
 	ld d, a
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
 	ld a, d
 	cp [hl]
 	jr c, .reachedTargetFrequency
 	jr nz, .applyUpdatedFrequency
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, bc
 	ld a, e
 	cp [hl]
 	jr c, .reachedTargetFrequency
 .applyUpdatedFrequency
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, bc
 	ld [hl], e
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, bc
 	ld [hl], d
 	ld b, REG_FREQUENCY_LO
@@ -1119,38 +1129,38 @@ Audio1_ApplyPitchBend:
 	ld [hl], d
 	ret
 .reachedTargetFrequency
-; Turn off pitch bend when the target frequency has been reached.
+; Turn off pitch slide when the target frequency has been reached.
 	ld hl, wChannelFlags1
 	add hl, bc
-	res BIT_PITCH_BEND_ON, [hl]
-	res BIT_PITCH_BEND_DECREASING, [hl]
+	res BIT_PITCH_SLIDE_ON, [hl]
+	res BIT_PITCH_SLIDE_DECREASING, [hl]
 	ret
 
-Audio1_InitPitchBendVars:
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+Audio1_InitPitchSlideVars:
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, bc
 	ld [hl], d
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, bc
 	ld [hl], e
 	ld hl, wChannelNoteDelayCounters
 	add hl, bc
 	ld a, [hl]
-	ld hl, wChannelPitchBendLengthModifiers
+	ld hl, wChannelPitchSlideLengthModifiers
 	add hl, bc
 	sub [hl]
 	jr nc, .next
 	ld a, 1
 .next
 	ld [hl], a
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, bc
 	ld a, e
 	sub [hl]
 	ld e, a
 	ld a, d
 	sbc b
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
 	sub [hl]
 	jr c, .targetFrequencyGreater
@@ -1158,18 +1168,18 @@ Audio1_InitPitchBendVars:
 	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
-	set BIT_PITCH_BEND_DECREASING, [hl]
+	set BIT_PITCH_SLIDE_DECREASING, [hl]
 	jr .next2
 .targetFrequencyGreater
 ; If the target frequency is greater, subtract the current frequency from
 ; the target frequency to get the absolute difference.
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, bc
 	ld d, [hl]
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, bc
 	ld e, [hl]
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, bc
 	ld a, [hl]
 	sub e
@@ -1184,7 +1194,7 @@ Audio1_InitPitchBendVars:
 	sbc b
 	ld d, a
 
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
 	ld a, [hl]
 	sub d
@@ -1192,10 +1202,10 @@ Audio1_InitPitchBendVars:
 	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
-	res BIT_PITCH_BEND_DECREASING, [hl]
+	res BIT_PITCH_SLIDE_DECREASING, [hl]
 
 .next2
-	ld hl, wChannelPitchBendLengthModifiers
+	ld hl, wChannelPitchSlideLengthModifiers
 	add hl, bc
 .divideLoop
 	inc b
@@ -1214,20 +1224,20 @@ Audio1_InitPitchBendVars:
 	add [hl]
 	ld d, b ; d = quotient + 1
 	ld b, 0
-	ld hl, wChannelPitchBendFrequencySteps
+	ld hl, wChannelPitchSlideFrequencySteps
 	add hl, bc
 	ld [hl], d ; store quotient + 1
-	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
+	ld hl, wChannelPitchSlideFrequencyStepsFractionalPart
 	add hl, bc
 	ld [hl], a ; store remainder - dividend
-	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
+	ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart
 	add hl, bc
 	ld [hl], a ; store remainder - dividend
 	ret
 
-Audio1_ApplyDutyCycle:
+Audio1_ApplyDutyCyclePattern:
 	ld b, 0
-	ld hl, wChannelDutyCycles
+	ld hl, wChannelDutyCyclePatterns
 	add hl, bc
 	ld a, [hl]
 	rlca
@@ -1322,7 +1332,7 @@ Audio1_PlaySound::
 	ld [wSoundID], a
 	cp $ff
 	jp z, .stopAllAudio
-	cp MAX_SFX_ID
+	cp MAX_SFX_ID_1
 	jp z, .playSfx
 	jp c, .playSfx
 	cp $fe
@@ -1346,10 +1356,10 @@ Audio1_PlaySound::
 	call .FillMem
 	ld hl, wChannelFlags1
 	call .FillMem
-	ld hl, wChannelDuties
-	call .FillMem
 	ld hl, wChannelDutyCycles
 	call .FillMem
+	ld hl, wChannelDutyCyclePatterns
+	call .FillMem
 	ld hl, wChannelVibratoDelayCounters
 	call .FillMem
 	ld hl, wChannelVibratoExtents
@@ -1362,21 +1372,21 @@ Audio1_PlaySound::
 	call .FillMem
 	ld hl, wChannelFlags2
 	call .FillMem
-	ld hl, wChannelPitchBendLengthModifiers
+	ld hl, wChannelPitchSlideLengthModifiers
 	call .FillMem
-	ld hl, wChannelPitchBendFrequencySteps
+	ld hl, wChannelPitchSlideFrequencySteps
 	call .FillMem
-	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
+	ld hl, wChannelPitchSlideFrequencyStepsFractionalPart
 	call .FillMem
-	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
+	ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart
 	call .FillMem
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	call .FillMem
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	call .FillMem
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	call .FillMem
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	call .FillMem
 	ld a, $1
 	ld hl, wChannelLoopCounters
@@ -1441,26 +1451,26 @@ Audio1_PlaySound::
 	add hl, de
 	ld a, [hl]
 	and a
-	jr z, .asm_99a3
+	jr z, .playChannel
 	ld a, e
-	cp $7
-	jr nz, .asm_999a
+	cp Ch8
+	jr nz, .notNoiseChannel
 	ld a, [wSoundID]
-	cp $14
-	jr nc, .asm_9993
+	cp NOISE_INSTRUMENTS_END
+	jr nc, .notNoiseInstrument
 	ret
-.asm_9993
+.notNoiseInstrument
 	ld a, [hl]
-	cp $14
-	jr z, .asm_99a3
-	jr c, .asm_99a3
-.asm_999a
+	cp NOISE_INSTRUMENTS_END
+	jr z, .playChannel
+	jr c, .playChannel
+.notNoiseChannel
 	ld a, [wSoundID]
 	cp [hl]
-	jr z, .asm_99a3
-	jr c, .asm_99a3
+	jr z, .playChannel
+	jr c, .playChannel
 	ret
-.asm_99a3
+.playChannel
 	xor a
 	push de
 	ld h, d
@@ -1483,10 +1493,10 @@ Audio1_PlaySound::
 	ld hl, wChannelFlags1
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelDuties
+	ld hl, wChannelDutyCycles
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelDutyCycles
+	ld hl, wChannelDutyCyclePatterns
 	add hl, de
 	ld [hl], a
 	ld hl, wChannelVibratoDelayCounters
@@ -1504,28 +1514,28 @@ Audio1_PlaySound::
 	ld hl, wChannelVibratoDelayCounterReloadValues
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendLengthModifiers
+	ld hl, wChannelPitchSlideLengthModifiers
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendFrequencySteps
+	ld hl, wChannelPitchSlideFrequencySteps
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
+	ld hl, wChannelPitchSlideFrequencyStepsFractionalPart
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
+	ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, de
 	ld [hl], a
 	ld hl, wChannelFlags2
@@ -1543,10 +1553,10 @@ Audio1_PlaySound::
 	ld [hl], a
 	ld a, e
 	cp Ch5
-	jr nz, .asm_9a2b
+	jr nz, .skipSweepDisable
 	ld a, $8
 	ld [rNR10], a ; sweep off
-.asm_9a2b
+.skipSweepDisable
 	ld a, c
 	and a
 	jp z, .playSoundCommon
@@ -1667,9 +1677,9 @@ Audio1_PlaySound::
 	jr nz, .commandPointerLoop
 	ld a, [wSoundID]
 	cp CRY_SFX_START
-	jr nc, .asm_9aeb
+	jr nc, .maybeCry
 	jr .done
-.asm_9aeb
+.maybeCry
 	ld a, [wSoundID]
 	cp CRY_SFX_END
 	jr z, .done
@@ -1682,10 +1692,10 @@ Audio1_PlaySound::
 	ld [hli], a
 	ld [hl], a
 	ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer
-	ld de, Audio1_CryEndchannel
+	ld de, Audio1_CryRet
 	ld [hl], e
 	inc hl
-	ld [hl], d ; overwrite pointer to point to endchannel
+	ld [hl], d ; overwrite pointer to point to sound_ret
 	ld a, [wSavedVolume]
 	and a
 	jr nz, .done
@@ -1696,7 +1706,7 @@ Audio1_PlaySound::
 .done
 	ret
 
-Audio1_CryEndchannel:
+Audio1_CryRet:
 	sound_ret
 
 Audio1_HWChannelBaseAddresses:
@@ -1725,5 +1735,3 @@ Audio1_Pitches:
 	dw $FB58 ; A_
 	dw $FB9B ; A#
 	dw $FBDA ; B_
-
-
diff --git a/audio/engine_2.asm b/audio/engine_2.asm
index 4f7f6277..df719c67 100644
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -1,9 +1,11 @@
 ; The second of three duplicated sound engines.
+; This copy has a few differences relating to battle sound effects
+; and the low health alarm that plays in battle
 
 Audio2_UpdateMusic::
 	ld c, Ch1
 .loop
-	ld b, $0
+	ld b, 0
 	ld hl, wChannelSoundIDs
 	add hl, bc
 	ld a, [hl]
@@ -19,7 +21,7 @@ Audio2_UpdateMusic::
 	jr nz, .nextChannel
 	set 7, a
 	ld [wMuteAudioAndPauseMusic], a
-	xor a
+	xor a ; disable all channels' output
 	ld [rNR51], a
 	ld [rNR30], a
 	ld a, $80
@@ -29,19 +31,13 @@ Audio2_UpdateMusic::
 	call Audio2_ApplyMusicAffects
 .nextChannel
 	ld a, c
-	inc c
+	inc c ; inc channel number
 	cp Ch8
 	jr nz, .loop
 	ret
 
 ; this routine checks flags for music effects currently applied
 ; to the channel and calls certain functions based on flags.
-; known flags for wChannelFlags1:
-;   0: toggleperfectpitch has been used
-;   1: call has been used
-;   3: a toggle used only by this routine for vibrato
-;   4: pitchbend flag
-;   6: dutycycle flag
 Audio2_ApplyMusicAffects:
 	ld b, $0
 	ld hl, wChannelNoteDelayCounters ; delay until next note
@@ -63,36 +59,36 @@ Audio2_ApplyMusicAffects:
 .startChecks
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 6, [hl] ; dutycycle
+	bit BIT_ROTATE_DUTY_CYCLE, [hl]
 	jr z, .checkForExecuteMusic
-	call Audio2_ApplyDutyCycle
+	call Audio2_ApplyDutyCyclePattern
 .checkForExecuteMusic
-	ld b, $0
+	ld b, 0
 	ld hl, wChannelFlags2
 	add hl, bc
-	bit 0, [hl]
-	jr nz, .checkForPitchBend
+	bit BIT_EXECUTE_MUSIC, [hl]
+	jr nz, .checkForPitchSlide
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 2, [hl]
-	jr nz, .disablePitchBendVibrato
-.checkForPitchBend
+	bit BIT_NOISE_OR_SFX, [hl]
+	jr nz, .skipPitchSlideVibrato
+.checkForPitchSlide
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 4, [hl] ; pitchbend
+	bit BIT_PITCH_SLIDE_ON, [hl]
 	jr z, .checkVibratoDelay
-	jp Audio2_ApplyPitchBend
+	jp Audio2_ApplyPitchSlide
 .checkVibratoDelay
-	ld hl, wChannelVibratoDelayCounters ; vibrato delay
+	ld hl, wChannelVibratoDelayCounters
 	add hl, bc
 	ld a, [hl]
 	and a ; check if delay is over
 	jr z, .checkForVibrato
 	dec [hl] ; otherwise, dec delay
-.disablePitchBendVibrato
+.skipPitchSlideVibrato
 	ret
 .checkForVibrato
-	ld hl, wChannelVibratoExtents ; vibrato rate
+	ld hl, wChannelVibratoExtents
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -105,33 +101,35 @@ Audio2_ApplyMusicAffects:
 	ld a, [hl]
 	and $f
 	and a
-	jr z, .vibratoAlreadyDone
-	dec [hl] ; apply vibrato pitch change
+	jr z, .applyVibrato
+	dec [hl] ; decrement counter
 	ret
-.vibratoAlreadyDone
+.applyVibrato
 	ld a, [hl]
 	swap [hl]
 	or [hl]
-	ld [hl], a ; reset the vibrato value and start again
+	ld [hl], a ; reload the counter
 	ld hl, wChannelFrequencyLowBytes
 	add hl, bc
 	ld e, [hl] ; get note pitch
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 3, [hl] ; this is the only code that sets/resets bit three so
-	jr z, .unset ; it continuously alternates which path it takes
-	res 3, [hl]
+; This is the only code that sets/resets the vibrato direction bit, so it
+; continuously alternates which path it takes.
+	bit BIT_VIBRATO_DIRECTION, [hl]
+	jr z, .unset
+	res BIT_VIBRATO_DIRECTION, [hl]
 	ld a, d
 	and $f
 	ld d, a
 	ld a, e
 	sub d
 	jr nc, .noCarry
-	ld a, $0
+	ld a, 0
 .noCarry
 	jr .done
 .unset
-	set 3, [hl]
+	set BIT_VIBRATO_DIRECTION, [hl]
 	ld a, d
 	and $f0
 	swap a
@@ -140,70 +138,75 @@ Audio2_ApplyMusicAffects:
 	ld a, $ff
 .done
 	ld d, a
-	ld b, $3
-	call Audio2_21ff7
+	ld b, REG_FREQUENCY_LO
+	call Audio2_GetRegisterPointer
 	ld [hl], d
 	ret
 
 ; this routine executes all music commands that take up no time,
-; like tempo changes, duty changes etc. and doesn't return
+; like tempo changes, duty cycle changes etc. and doesn't return
 ; until the first note is reached
 Audio2_PlayNextNote:
+; reload the vibrato delay counter
 	ld hl, wChannelVibratoDelayCounterReloadValues
 	add hl, bc
 	ld a, [hl]
 	ld hl, wChannelVibratoDelayCounters
 	add hl, bc
 	ld [hl], a
+
 	ld hl, wChannelFlags1
 	add hl, bc
-	res 4, [hl]
-	res 5, [hl]
+	res BIT_PITCH_SLIDE_ON, [hl]
+	res BIT_PITCH_SLIDE_DECREASING, [hl]
+	; --- this section is only present in this copy of the sound engine
 	ld a, c
 	cp Ch5
 	jr nz, .beginChecks
-	ld a, [wLowHealthAlarm] ;low health alarm enabled?
+	ld a, [wLowHealthAlarm] ; low health alarm enabled?
 	bit 7, a
 	ret nz
 .beginChecks
-	call Audio2_endchannel
+	; ---
+	call Audio2_sound_ret
 	ret
 
-Audio2_endchannel:
+Audio2_sound_ret:
 	call Audio2_GetNextMusicByte
 	ld d, a
-	cp $ff ; is this command an endchannel?
-	jp nz, Audio2_callchannel ; no
-	ld b, $0 ; yes
+	cp $ff ; is this command a sound_ret?
+	jp nz, Audio2_sound_call ; no
+	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 1, [hl]
+	bit BIT_SOUND_CALL, [hl]
 	jr nz, .returnFromCall
 	ld a, c
 	cp Ch4
 	jr nc, .noiseOrSfxChannel
-	jr .asm_219c0
+	jr .disableChannelOutput
 .noiseOrSfxChannel
-	res 2, [hl]
+	res BIT_NOISE_OR_SFX, [hl]
 	ld hl, wChannelFlags2
 	add hl, bc
-	res 0, [hl]
+	res BIT_EXECUTE_MUSIC, [hl]
 	cp Ch7
-	jr nz, .notSfxChannel3
+	jr nz, .skipSfxChannel3
+; restart hardware channel 3 (wave channel) output
 	ld a, $0
 	ld [rNR30], a
 	ld a, $80
 	ld [rNR30], a
-.notSfxChannel3
-	jr nz, .asm_219a3
+.skipSfxChannel3
+	jr nz, .dontDisable
 	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
-	jr z, .asm_219a3
+	jr z, .dontDisable
 	xor a
 	ld [wDisableChannelOutputWhenSfxEnds], a
-	jr .asm_219c0
-.asm_219a3
-	jr .asm_219c9
+	jr .disableChannelOutput
+.dontDisable
+	jr .afterDisable
 .returnFromCall
 	res 1, [hl]
 	ld d, $0
@@ -223,45 +226,45 @@ Audio2_endchannel:
 	inc de
 	ld a, [de]
 	ld [hl], a ; loads channel address to return to
-	jp Audio2_endchannel
-.asm_219c0
-	ld hl, Unknown_222de
+	jp Audio2_sound_ret
+.disableChannelOutput
+	ld hl, Audio2_HWChannelDisableMasks
 	add hl, bc
 	ld a, [rNR51]
 	and [hl]
 	ld [rNR51], a
-.asm_219c9
+.afterDisable
 	ld a, [wChannelSoundIDs + Ch5]
-	cp $14
-	jr nc, .asm_219d2
-	jr .asm_219ef
-.asm_219d2
+	cp CRY_SFX_START
+	jr nc, .maybeCry
+	jr .skipCry
+.maybeCry
 	ld a, [wChannelSoundIDs + Ch5]
-	cp $86
-	jr z, .asm_219ef
-	jr c, .asm_219dd
-	jr .asm_219ef
-.asm_219dd
+	cp CRY_SFX_END
+	jr z, .skipCry
+	jr c, .cry
+	jr .skipCry
+.cry
 	ld a, c
 	cp Ch5
-	jr z, .asm_219e6
-	call Audio2_21e6d
+	jr z, .skipRewind
+	call Audio2_GoBackOneCommandIfCry
 	ret c
-.asm_219e6
+.skipRewind
 	ld a, [wSavedVolume]
 	ld [rNR50], a
 	xor a
 	ld [wSavedVolume], a
-.asm_219ef
+.skipCry
 	ld hl, wChannelSoundIDs
 	add hl, bc
 	ld [hl], b
 	ret
 
-Audio2_callchannel:
-	cp $fd ; is this command a callchannel?
-	jp nz, Audio2_loopchannel ; no
-	call Audio2_GetNextMusicByte ; yes
+Audio2_sound_call:
+	cp $fd ; is this command a sound_call?
+	jp nz, Audio2_sound_loop ; no
+	call Audio2_GetNextMusicByte
 	push af
 	call Audio2_GetNextMusicByte
 	ld d, a
@@ -292,17 +295,17 @@ Audio2_callchannel:
 	ld b, $0
 	ld hl, wChannelFlags1
 	add hl, bc
-	set 1, [hl] ; set the call flag
-	jp Audio2_endchannel
+	set BIT_SOUND_CALL, [hl] ; set the call flag
+	jp Audio2_sound_ret
 
-Audio2_loopchannel:
-	cp $fe ; is this command a loopchannel?
-	jp nz, Audio2_notetype ; no
-	call Audio2_GetNextMusicByte ; yes
+Audio2_sound_loop:
+	cp $fe ; is this command a sound_loop?
+	jp nz, Audio2_note_type ; no
+	call Audio2_GetNextMusicByte
 	ld e, a
 	and a
 	jr z, .infiniteLoop
-	ld b, $0
+	ld b, 0
 	ld hl, wChannelLoopCounters
 	add hl, bc
 	ld a, [hl]
@@ -312,7 +315,7 @@ Audio2_loopchannel:
 	ld [hl], a
 	call Audio2_GetNextMusicByte ; skip pointer
 	call Audio2_GetNextMusicByte
-	jp Audio2_endchannel
+	jp Audio2_sound_ret
 .loopAgain ; inc loop count
 	inc a
 	ld [hl], a
@@ -331,13 +334,13 @@ Audio2_loopchannel:
 	pop af
 	ld [hli], a
 	ld [hl], b
-	jp Audio2_endchannel
+	jp Audio2_sound_ret
 
-Audio2_notetype:
+Audio2_note_type:
 	and $f0
-	cp $d0 ; is this command a notetype?
-	jp nz, Audio2_toggleperfectpitch ; no
-	ld a, d ; yes
+	cp $d0 ; is this command a note_type?
+	jp nz, Audio2_toggle_perfect_pitch ; no
+	ld a, d
 	and $f
 	ld b, $0
 	ld hl, wChannelNoteSpeeds
@@ -352,15 +355,15 @@ Audio2_notetype:
 	cp Ch3
 	jr z, .musicChannel3
 	cp Ch7
-	jr nz, .notChannel3
+	jr nz, .skipChannel3
 	ld hl, wSfxWaveInstrument
-	jr .sfxChannel3
+	jr .channel3
 .musicChannel3
 	ld hl, wMusicWaveInstrument
-.sfxChannel3
+.channel3
 	ld a, d
 	and $f
-	ld [hl], a ; store low nibble of param as duty
+	ld [hl], a ; store low nibble of param as wave instrument
 	ld a, d
 	and $30
 	sla a
@@ -369,31 +372,31 @@ Audio2_notetype:
 
 	; if channel 3, store high nibble as volume
 	; else, store volume (high nibble) and fade (low nibble)
-.notChannel3
-	ld b, $0
+.skipChannel3
+	ld b, 0
 	ld hl, wChannelVolumes
 	add hl, bc
 	ld [hl], d
 .noiseChannel
-	jp Audio2_endchannel
+	jp Audio2_sound_ret
 
-Audio2_toggleperfectpitch:
+Audio2_toggle_perfect_pitch:
 	ld a, d
-	cp $e8 ; is this command a toggleperfectpitch?
+	cp $e8 ; is this command a toggle_perfect_pitch?
 	jr nz, Audio2_vibrato ; no
-	ld b, $0 ; yes
+	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
 	ld a, [hl]
 	xor $1
 	ld [hl], a ; flip bit 0 of wChannelFlags1
-	jp Audio2_endchannel
+	jp Audio2_sound_ret
 
 Audio2_vibrato:
 	cp $ea ; is this command a vibrato?
-	jr nz, Audio2_pitchbend ; no
-	call Audio2_GetNextMusicByte ; yes
-	ld b, $0
+	jr nz, Audio2_pitch_slide ; no
+	call Audio2_GetNextMusicByte
+	ld b, 0
 	ld hl, wChannelVibratoDelayCounters
 	add hl, bc
 	ld [hl], a ; store delay
@@ -402,9 +405,16 @@ Audio2_vibrato:
 	ld [hl], a ; store delay
 	call Audio2_GetNextMusicByte
 	ld d, a
+
+; The high nybble of the command byte is the extent of the vibrato.
+; Let n be the extent.
+; The upper nybble of the channel's byte in the wChannelVibratoExtents
+; array will store the extent above the note: (n / 2) + (n % 2).
+; The lower nybble will store the extent below the note: (n / 2).
+; These two values add to the total extent, n.
 	and $f0
 	swap a
-	ld b, $0
+	ld b, 0
 	ld hl, wChannelVibratoExtents
 	add hl, bc
 	srl a
@@ -412,7 +422,13 @@ Audio2_vibrato:
 	adc b
 	swap a
 	or e
-	ld [hl], a ; store rate as both high and low nibbles
+	ld [hl], a
+
+; The low nybble of the command byte is the rate of the vibrato.
+; The high and low nybbles of the channel's byte in the wChannelVibratoRates
+; array are both initialised to this value because the high nybble is the
+; counter reload value and the low nybble is the counter itself, which should
+; start at its value upon reload.
 	ld a, d
 	and $f
 	ld d, a
@@ -420,17 +436,18 @@ Audio2_vibrato:
 	add hl, bc
 	swap a
 	or d
-	ld [hl], a ; store depth as both high and low nibbles
-	jp Audio2_endchannel
+	ld [hl], a
 
-Audio2_pitchbend:
-	cp $eb ; is this command a pitchbend?
-	jr nz, Audio2_duty ; no
-	call Audio2_GetNextMusicByte ; yes
-	ld b, $0
-	ld hl, wChannelPitchBendLengthModifiers
+	jp Audio2_sound_ret
+
+Audio2_pitch_slide:
+	cp $eb ; is this command a pitch_slide?
+	jr nz, Audio2_duty_cycle ; no
+	call Audio2_GetNextMusicByte
+	ld b, 0
+	ld hl, wChannelPitchSlideLengthModifiers
 	add hl, bc
-	ld [hl], a ; store first param
+	ld [hl], a
 	call Audio2_GetNextMusicByte
 	ld d, a
 	and $f0
@@ -438,39 +455,39 @@ Audio2_pitchbend:
 	ld b, a
 	ld a, d
 	and $f
-	call Audio2_22017
-	ld b, $0
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	call Audio2_CalculateFrequency
+	ld b, 0
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
-	ld [hl], d ; store unknown part of second param
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	ld [hl], d
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, bc
-	ld [hl], e ; store unknown part of second param
-	ld b, $0
+	ld [hl], e
+	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
-	set 4, [hl] ; set pitchbend flag
+	set BIT_PITCH_SLIDE_ON, [hl]
 	call Audio2_GetNextMusicByte
 	ld d, a
-	jp Audio2_notelength
+	jp Audio2_note_length
 
-Audio2_duty:
-	cp $ec ; is this command a duty?
+Audio2_duty_cycle:
+	cp $ec ; is this command a duty_cycle?
 	jr nz, Audio2_tempo ; no
-	call Audio2_GetNextMusicByte ; yes
+	call Audio2_GetNextMusicByte
 	rrca
 	rrca
 	and $c0
-	ld b, $0
-	ld hl, wChannelDuties
+	ld b, 0
+	ld hl, wChannelDutyCycles
 	add hl, bc
-	ld [hl], a ; store duty
-	jp Audio2_endchannel
+	ld [hl], a ; store duty cycle
+	jp Audio2_sound_ret
 
 Audio2_tempo:
 	cp $ed ; is this command a tempo?
-	jr nz, Audio2_stereopanning ; no
-	ld a, c ; yes
+	jr nz, Audio2_stereo_panning ; no
+	ld a, c
 	cp Ch5
 	jr nc, .sfxChannel
 	call Audio2_GetNextMusicByte
@@ -494,20 +511,20 @@ Audio2_tempo:
 	ld [wChannelNoteDelayCountersFractionalPart + 6], a
 	ld [wChannelNoteDelayCountersFractionalPart + 7], a
 .musicChannelDone
-	jp Audio2_endchannel
+	jp Audio2_sound_ret
 
-Audio2_stereopanning:
-	cp $ee ; is this command a stereopanning?
+Audio2_stereo_panning:
+	cp $ee ; is this command a stereo_panning?
 	jr nz, Audio2_unknownmusic0xef ; no
-	call Audio2_GetNextMusicByte ; yes
+	call Audio2_GetNextMusicByte
 	ld [wStereoPanning], a ; store panning
-	jp Audio2_endchannel
+	jp Audio2_sound_ret
 
 ; this appears to never be used
 Audio2_unknownmusic0xef:
 	cp $ef ; is this command an unknownmusic0xef?
-	jr nz, Audio2_dutycycle ; no
-	call Audio2_GetNextMusicByte ; yes
+	jr nz, Audio2_duty_cycle_pattern ; no
+	call Audio2_GetNextMusicByte
 	push bc
 	call Audio2_PlaySound
 	pop bc
@@ -519,124 +536,141 @@ Audio2_unknownmusic0xef:
 	xor a
 	ld [wChannelSoundIDs + Ch8], a
 .skip
-	jp Audio2_endchannel
+	jp Audio2_sound_ret
 
-Audio2_dutycycle:
-	cp $fc ; is this command a dutycycle?
+Audio2_duty_cycle_pattern:
+	cp $fc ; is this command a duty_cycle_pattern?
 	jr nz, Audio2_volume ; no
-	call Audio2_GetNextMusicByte ; yes
-	ld b, $0
-	ld hl, wChannelDutyCycles
+	call Audio2_GetNextMusicByte
+	ld b, 0
+	ld hl, wChannelDutyCyclePatterns
 	add hl, bc
-	ld [hl], a ; store full cycle
-	and $c0
-	ld hl, wChannelDuties
+	ld [hl], a ; store full pattern
+	and %11000000
+	ld hl, wChannelDutyCycles
 	add hl, bc
-	ld [hl], a ; store first duty
+	ld [hl], a ; store first duty cycle
 	ld hl, wChannelFlags1
 	add hl, bc
-	set 6, [hl] ; set dutycycle flag
-	jp Audio2_endchannel
+	set BIT_ROTATE_DUTY_CYCLE, [hl]
+	jp Audio2_sound_ret
 
 Audio2_volume:
 	cp $f0 ; is this command a volume?
-	jr nz, Audio2_executemusic ; no
-	call Audio2_GetNextMusicByte ; yes
+	jr nz, Audio2_execute_music ; no
+	call Audio2_GetNextMusicByte
 	ld [rNR50], a ; store volume
-	jp Audio2_endchannel
+	jp Audio2_sound_ret
 
-Audio2_executemusic:
-	cp $f8 ; is this command an executemusic?
+Audio2_execute_music:
+	cp $f8 ; is this command an execute_music?
 	jr nz, Audio2_octave ; no
-	ld b, $0 ; yes
+	ld b, $0
 	ld hl, wChannelFlags2
 	add hl, bc
-	set 0, [hl]
-	jp Audio2_endchannel
+	set BIT_EXECUTE_MUSIC, [hl]
+	jp Audio2_sound_ret
 
 Audio2_octave:
 	and $f0
 	cp $e0 ; is this command an octave?
-	jr nz, Audio2_sfxnote ; no
-	ld hl, wChannelOctaves ; yes
-	ld b, $0
+	jr nz, Audio2_sfx_note ; no
+	ld hl, wChannelOctaves
+	ld b, 0
 	add hl, bc
 	ld a, d
 	and $f
 	ld [hl], a ; store low nibble as octave
-	jp Audio2_endchannel
+	jp Audio2_sound_ret
 
-; sfxnote is either squarenote or noisenote depending on the channel
-Audio2_sfxnote:
-	cp $20 ; is this command an sfxnote?
-	jr nz, Audio2_pitchenvelope ; no
+; sfx_note is either square_note or noise_note depending on the channel
+Audio2_sfx_note:
+	cp $20 ; is this command a sfx_note?
+	jr nz, Audio2_pitch_sweep
 	ld a, c
 	cp Ch4 ; is this a noise or sfx channel?
-	jr c, Audio2_pitchenvelope ; no
-	ld b, $0
+	jr c, Audio2_pitch_sweep ; no
+	ld b, 0
 	ld hl, wChannelFlags2
 	add hl, bc
-	bit 0, [hl]
-	jr nz, Audio2_pitchenvelope ; no
-	call Audio2_notelength
+	bit BIT_EXECUTE_MUSIC, [hl] ; is execute_music being used?
+	jr nz, Audio2_pitch_sweep ; yes
+	call Audio2_note_length
+
+; This code seems to do the same thing as what Audio2_ApplyDutyCycleAndSoundLength
+; does below.
 	ld d, a
-	ld b, $0
-	ld hl, wChannelDuties
+	ld b, 0
+	ld hl, wChannelDutyCycles
 	add hl, bc
 	ld a, [hl]
 	or d
 	ld d, a
-	ld b, $1
-	call Audio2_21ff7
+	ld b, REG_DUTY_SOUND_LEN
+	call Audio2_GetRegisterPointer
 	ld [hl], d
+
 	call Audio2_GetNextMusicByte
 	ld d, a
-	ld b, $2
-	call Audio2_21ff7
+	ld b, REG_VOLUME_ENVELOPE
+	call Audio2_GetRegisterPointer
 	ld [hl], d
 	call Audio2_GetNextMusicByte
 	ld e, a
 	ld a, c
 	cp Ch8
-	ld a, $0
-	jr z, .sfxNoiseChannel ; only two params for noise channel
+	ld a, 0
+	jr z, .skip
+; Channels 1 through 3 have 2 registers that control frequency, but the noise
+; channel a single register (the polynomial counter) that controls frequency,
+; so this command has one less byte on the noise channel.
 	push de
 	call Audio2_GetNextMusicByte
 	pop de
-.sfxNoiseChannel
+.skip
 	ld d, a
 	push de
-	call Audio2_21daa
-	call Audio2_21d79
+	call Audio2_ApplyDutyCycleAndSoundLength
+	call Audio2_EnableChannelOutput
 	pop de
-	call Audio2_21dcc
+	call Audio2_ApplyWavePatternAndFrequency
 	ret
 
-Audio2_pitchenvelope:
+Audio2_pitch_sweep:
 	ld a, c
 	cp Ch5
 	jr c, Audio2_note ; if not a sfx
 	ld a, d
-	cp $10 ; is this command a pitchenvelope?
+	cp $10 ; is this command a pitch_sweep?
 	jr nz, Audio2_note ; no
 	ld b, $0
 	ld hl, wChannelFlags2
 	add hl, bc
-	bit 0, [hl]
+	bit BIT_EXECUTE_MUSIC, [hl]
 	jr nz, Audio2_note ; no
-	call Audio2_GetNextMusicByte ; yes
+	call Audio2_GetNextMusicByte
 	ld [rNR10], a
-	jp Audio2_endchannel
+	jp Audio2_sound_ret
 
 Audio2_note:
 	ld a, c
 	cp Ch4
-	jr nz, Audio2_notelength ; if not noise channel
+	jr nz, Audio2_note_length ; if not noise channel
 	ld a, d
 	and $f0
 	cp $b0 ; is this command a dnote?
-	jr z, Audio2_dnote ; yes
-	jr nc, Audio2_notelength ; no
+	jr z, .dnote
+	jr nc, Audio2_note_length ; no
+
+	; this executes when on the noise channel and
+	; the command id is less than $b0
+	; in this case, the upper nybble is used as the noise instrument ($1-$a)
+	; 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
+	; instead of 2 and can only be used with instruments 1 and 3 through 10
+	; this is unused by the game
 	swap a
 	ld b, a
 	ld a, d
@@ -645,38 +679,38 @@ Audio2_note:
 	ld a, b
 	push de
 	push bc
-	jr asm_21c7e
+	jr .playDnote
 
-Audio2_dnote:
+.dnote
 	ld a, d
 	and $f
 	push af
 	push bc
 	call Audio2_GetNextMusicByte ; get dnote instrument
-asm_21c7e
+.playDnote
 	ld d, a
 	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
-	jr nz, .asm_21c89
+	jr nz, .skipDnote
 	ld a, d
 	call Audio2_PlaySound
-.asm_21c89
+.skipDnote
 	pop bc
 	pop de
 
-Audio2_notelength:
+Audio2_note_length:
 	ld a, d
 	push af
 	and $f
 	inc a
-	ld b, $0
-	ld e, a ; store note length (in 16ths)
+	ld b, 0
+	ld e, a  ; store note length (in 16ths)
 	ld d, b
 	ld hl, wChannelNoteSpeeds
 	add hl, bc
 	ld a, [hl]
 	ld l, b
-	call Audio2_22006
+	call Audio2_MultiplyAdd
 	ld a, c
 	cp Ch5
 	jr nc, .sfxChannel
@@ -690,20 +724,20 @@ Audio2_notelength:
 	ld e, $0
 	cp Ch8
 	jr z, .skip ; if noise channel
-	call Audio2_21e2f
+	call Audio2_SetSfxTempo
 	ld a, [wSfxTempo]
 	ld d, a
 	ld a, [wSfxTempo + 1]
 	ld e, a
 .skip
-	ld a, l
-	ld b, $0
+	ld a, l ; a = note_length * note_speed
+	ld b, 0
 	ld hl, wChannelNoteDelayCountersFractionalPart
 	add hl, bc
 	ld l, [hl]
-	call Audio2_22006
+	call Audio2_MultiplyAdd
 	ld e, l
-	ld d, h
+	ld d, h ; de = note_delay_frac_part + (note_length * note_speed * tempo)
 	ld hl, wChannelNoteDelayCountersFractionalPart
 	add hl, bc
 	ld [hl], e
@@ -713,192 +747,198 @@ Audio2_notelength:
 	ld [hl], a
 	ld hl, wChannelFlags2
 	add hl, bc
-	bit 0, [hl]
-	jr nz, Audio2_notepitch
+	bit BIT_EXECUTE_MUSIC, [hl]
+	jr nz, Audio2_note_pitch
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 2, [hl]
-	jr z, Audio2_notepitch
+	bit BIT_NOISE_OR_SFX, [hl]
+	jr z, Audio2_note_pitch
 	pop hl
 	ret
 
-Audio2_notepitch:
+Audio2_note_pitch:
 	pop af
 	and $f0
 	cp $c0 ; compare to rest
 	jr nz, .notRest
 	ld a, c
 	cp Ch5
-	jr nc, .sfxChannel
+	jr nc, .next
+; If this isn't an SFX channel, try the corresponding SFX channel.
 	ld hl, wChannelSoundIDs + Ch5
 	add hl, bc
 	ld a, [hl]
 	and a
 	jr nz, .done
 	; fall through
-.sfxChannel
+.next
 	ld a, c
 	cp Ch3
-	jr z, .musicChannel3
+	jr z, .channel3
 	cp Ch7
-	jr nz, .notSfxChannel3
-.musicChannel3
-	ld b, $0
-	ld hl, Unknown_222de
+	jr nz, .notChannel3
+.channel3
+	ld b, 0
+	ld hl, Audio2_HWChannelDisableMasks
 	add hl, bc
 	ld a, [rNR51]
 	and [hl]
-	ld [rNR51], a
+	ld [rNR51], a ; disable hardware channel 3's output
 	jr .done
-.notSfxChannel3
-	ld b, $2
-	call Audio2_21ff7
-	ld a, $8
+.notChannel3
+	ld b, REG_VOLUME_ENVELOPE
+	call Audio2_GetRegisterPointer
+	ld a, $8 ; fade in sound
 	ld [hli], a
 	inc hl
-	ld a, $80
+	ld a, $80 ; restart sound
 	ld [hl], a
 .done
 	ret
 .notRest
 	swap a
-	ld b, $0
+	ld b, 0
 	ld hl, wChannelOctaves
 	add hl, bc
 	ld b, [hl]
-	call Audio2_22017
-	ld b, $0
+	call Audio2_CalculateFrequency
+	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 4, [hl]
-	jr z, .asm_21d39
-	call Audio2_21f4e
-.asm_21d39
+	bit BIT_PITCH_SLIDE_ON, [hl]
+	jr z, .skipPitchSlide
+	call Audio2_InitPitchSlideVars
+.skipPitchSlide
 	push de
 	ld a, c
 	cp Ch5
-	jr nc, .skip ; if sfx channel
+	jr nc, .sfxChannel ; if sfx channel
+; If this isn't an SFX channel, try the corresponding SFX channel.
 	ld hl, wChannelSoundIDs + Ch5
-	ld d, $0
+	ld d, 0
 	ld e, a
 	add hl, de
 	ld a, [hl]
 	and a
-	jr nz, .asm_21d4c
-	jr .skip
-.asm_21d4c
+	jr nz, .noSfx
+	jr .sfxChannel
+.noSfx
 	pop de
 	ret
-.skip
-	ld b, $0
+.sfxChannel
+	ld b, 0
 	ld hl, wChannelVolumes
 	add hl, bc
 	ld d, [hl]
-	ld b, $2
-	call Audio2_21ff7
+	ld b, REG_VOLUME_ENVELOPE
+	call Audio2_GetRegisterPointer
 	ld [hl], d
-	call Audio2_21daa
-	call Audio2_21d79
+	call Audio2_ApplyDutyCycleAndSoundLength
+	call Audio2_EnableChannelOutput
 	pop de
 	ld b, $0
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 0, [hl]   ; has toggleperfectpitch been used?
-	jr z, .skip2
-	inc e         ; if yes, increment the pitch by 1
-	jr nc, .skip2
+	bit BIT_PERFECT_PITCH, [hl] ; has toggle_perfect_pitch been used?
+	jr z, .skipFrequencyInc
+	inc e                       ; if yes, increment the frequency by 1
+	jr nc, .skipFrequencyInc
 	inc d
-.skip2
+.skipFrequencyInc
 	ld hl, wChannelFrequencyLowBytes
 	add hl, bc
 	ld [hl], e
-	call Audio2_21dcc
+	call Audio2_ApplyWavePatternAndFrequency
 	ret
 
-Audio2_21d79:
-	ld b, $0
-	ld hl, Unknown_222e6
+Audio2_EnableChannelOutput:
+	ld b, 0
+	ld hl, Audio2_HWChannelEnableMasks
 	add hl, bc
 	ld a, [rNR51]
-	or [hl]
+	or [hl] ; set this channel's bits
 	ld d, a
 	ld a, c
 	cp Ch8
-	jr z, .sfxNoiseChannel
+	jr z, .noiseChannelOrNoSfx
 	cp Ch5
 	jr nc, .skip ; if sfx channel
+; If this isn't an SFX channel, try the corresponding SFX channel.
 	ld hl, wChannelSoundIDs + Ch5
 	add hl, bc
 	ld a, [hl]
 	and a
 	jr nz, .skip
-.sfxNoiseChannel
+.noiseChannelOrNoSfx
+; If this is the SFX noise channel or a music channel whose corresponding
+; SFX channel is off, apply stereo panning.
 	ld a, [wStereoPanning]
-	ld hl, Unknown_222e6
+	ld hl, Audio2_HWChannelEnableMasks
 	add hl, bc
 	and [hl]
 	ld d, a
 	ld a, [rNR51]
-	ld hl, Unknown_222de
+	ld hl, Audio2_HWChannelDisableMasks
 	add hl, bc
-	and [hl]
-	or d
+	and [hl] ; reset this channel's output bits
+	or d ; set this channel's output bits that enabled in [wStereoPanning]
 	ld d, a
 .skip
 	ld a, d
 	ld [rNR51], a
 	ret
 
-Audio2_21daa:
-	ld b, $0
-	ld hl, wChannelNoteDelayCounters
+Audio2_ApplyDutyCycleAndSoundLength:
+	ld b, 0
+	ld hl, wChannelNoteDelayCounters ; use the note delay as sound length
 	add hl, bc
 	ld d, [hl]
 	ld a, c
 	cp Ch3
-	jr z, .channel3 ; if music channel 3
+	jr z, .skipDuty ; if music channel 3
 	cp Ch7
-	jr z, .channel3 ; if sfx channel 3
+	jr z, .skipDuty ; if sfx channel 3
+; include duty cycle (except on channel 3 which doesn't have it)
 	ld a, d
 	and $3f
 	ld d, a
-	ld hl, wChannelDuties
+	ld hl, wChannelDutyCycles
 	add hl, bc
 	ld a, [hl]
 	or d
 	ld d, a
-.channel3
-	ld b, $1
-	call Audio2_21ff7
+.skipDuty
+	ld b, REG_DUTY_SOUND_LEN
+	call Audio2_GetRegisterPointer
 	ld [hl], d
 	ret
 
-Audio2_21dcc:
+Audio2_ApplyWavePatternAndFrequency:
 	ld a, c
 	cp Ch3
 	jr z, .channel3
 	cp Ch7
-	jr nz, .notSfxChannel3
+	jr nz, .notChannel3
 	; fall through
 .channel3
 	push de
 	ld de, wMusicWaveInstrument
 	cp Ch3
-	jr z, .musicChannel3
+	jr z, .next
 	ld de, wSfxWaveInstrument
-.musicChannel3
+.next
 	ld a, [de]
 	add a
-	ld d, $0
+	ld d, 0
 	ld e, a
 	ld hl, Audio2_WavePointers
 	add hl, de
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
-	ld hl, $ff30
+	ld hl, $ff30 ; wave pattern RAM
 	ld b, $f
-	ld a, $0
+	ld a, $0 ; stop hardware channel 3
 	ld [rNR30], a
 .loop
 	ld a, [de]
@@ -908,196 +948,207 @@ Audio2_21dcc:
 	dec b
 	and a
 	jr nz, .loop
-	ld a, $80
+	ld a, $80 ; start hardware channel 3
 	ld [rNR30], a
 	pop de
-.notSfxChannel3
+.notChannel3
 	ld a, d
-	or $80
-	and $c7
+	or $80 ; use counter mode (i.e. disable output when the counter reaches 0)
+	and $c7 ; zero the unused bits in the register
 	ld d, a
-	ld b, $3
-	call Audio2_21ff7
-	ld [hl], e
+	ld b, REG_FREQUENCY_LO
+	call Audio2_GetRegisterPointer
+	ld [hl], e ; store frequency low byte
 	inc hl
-	ld [hl], d
+	ld [hl], d ; store frequency high byte
+	; --- this section is only present in this copy of the sound engine
 	ld a, c
 	cp Ch5
 	jr c, .musicChannel
-	call Audio2_21e56
+	call Audio2_ApplyFrequencyModifier
 .musicChannel
+	; ---
 	ret
 
-Audio2_21e19:
+; --- this section is only present in this copy of the sound engine
+; unused
+Audio2_ResetCryModifiers:
 	ld a, c
 	cp Ch5
-	jr nz, .asm_21e2e
+	jr nz, .skip
 	ld a, [wLowHealthAlarm]
 	bit 7, a
-	jr z, .asm_21e2e
+	jr z, .skip
 	xor a
 	ld [wFrequencyModifier], a
 	ld a, $80
 	ld [wTempoModifier], a
-.asm_21e2e
+.skip
 	ret
+; ---
 
-Audio2_21e2f:
-	call Audio2_21e8b
-	jr c, .asm_21e39
-	call Audio2_21e9f
-	jr nc, .asm_21e4c
-.asm_21e39
-	ld d, $0
+Audio2_SetSfxTempo:
+	call Audio2_IsCry
+	jr c, .skipCryCheck
+	call Audio2_IsBattleSFX
+	jr nc, .notCry
+.skipCryCheck
+	ld d, 0
 	ld a, [wTempoModifier]
 	add $80
-	jr nc, .asm_21e43
+	jr nc, .next
 	inc d
-.asm_21e43
+.next
 	ld [wSfxTempo + 1], a
 	ld a, d
 	ld [wSfxTempo], a
-	jr .asm_21e55
-.asm_21e4c
+	jr .done
+.notCry
 	xor a
 	ld [wSfxTempo + 1], a
 	ld a, $1
 	ld [wSfxTempo], a
-.asm_21e55
+.done
 	ret
 
-Audio2_21e56:
-	call Audio2_21e8b
-	jr c, .asm_21e60
-	call Audio2_21e9f
-	jr nc, .asm_21e6c
-.asm_21e60
+Audio2_ApplyFrequencyModifier:
+	call Audio2_IsCry
+	jr c, .skipCryCheck
+	call Audio2_IsBattleSFX
+	jr nc, .done
+.skipCryCheck
+; if playing a cry, add the cry's frequency modifier
 	ld a, [wFrequencyModifier]
 	add e
-	jr nc, .asm_21e67
+	jr nc, .noCarry
 	inc d
-.asm_21e67
+.noCarry
 	dec hl
 	ld e, a
 	ld [hl], e
 	inc hl
 	ld [hl], d
-.asm_21e6c
+.done
 	ret
 
-Audio2_21e6d:
-	call Audio2_21e8b
-	jr nc, .asm_21e88
+Audio2_GoBackOneCommandIfCry:
+	call Audio2_IsCry
+	jr nc, .done
 	ld hl, wChannelCommandPointers
 	ld e, c
-	ld d, $0
+	ld d, 0
 	sla e
 	rl d
 	add hl, de
 	ld a, [hl]
-	sub $1
+	sub 1
 	ld [hl], a
 	inc hl
 	ld a, [hl]
-	sbc $0
+	sbc 0
 	ld [hl], a
 	scf
 	ret
-.asm_21e88
+.done
 	scf
 	ccf
 	ret
 
-Audio2_21e8b:
+Audio2_IsCry:
+; Returns whether the currently playing audio is a cry in carry.
 	ld a, [wChannelSoundIDs + Ch5]
-	cp $14
-	jr nc, .asm_21e94
-	jr .asm_21e9a
-.asm_21e94
-	cp $86
-	jr z, .asm_21e9a
-	jr c, .asm_21e9d
-.asm_21e9a
+	cp CRY_SFX_START
+	jr nc, .next
+	jr .no
+.next
+	cp CRY_SFX_END
+	jr z, .no
+	jr c, .yes
+.no
 	scf
 	ccf
 	ret
-.asm_21e9d
+.yes
 	scf
 	ret
 
-Audio2_21e9f:
+; --- this section is only present in this copy of the sound engine
+Audio2_IsBattleSFX:
+; Returns whether the currently playing audio is a cry in carry.
 	ld a, [wChannelSoundIDs + Ch8]
 	ld b, a
 	ld a, [wChannelSoundIDs + Ch5]
 	or b
-	cp $9d
-	jr nc, .asm_21ead
-	jr .asm_21eb3
-.asm_21ead
-	cp $ea
-	jr z, .asm_21eb3
-	jr c, .asm_21eb6
-.asm_21eb3
+	cp BATTLE_SFX_START
+	jr nc, .next
+	jr .no
+.next
+	cp BATTLE_SFX_END
+	jr z, .no
+	jr c, .yes
+.no
 	scf
 	ccf
 	ret
-.asm_21eb6
+.yes
 	scf
 	ret
+; ---
 
-Audio2_ApplyPitchBend:
+Audio2_ApplyPitchSlide:
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 5, [hl]
-	jp nz, .asm_21eff
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	bit BIT_PITCH_SLIDE_DECREASING, [hl]
+	jp nz, .frequencyDecreasing
+; frequency increasing
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, bc
 	ld e, [hl]
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, bc
 	ld d, [hl]
-	ld hl, wChannelPitchBendFrequencySteps
+	ld hl, wChannelPitchSlideFrequencySteps
 	add hl, bc
 	ld l, [hl]
 	ld h, b
 	add hl, de
 	ld d, h
 	ld e, l
-	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
+	ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart
 	add hl, bc
 	push hl
-	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
+	ld hl, wChannelPitchSlideFrequencyStepsFractionalPart
 	add hl, bc
 	ld a, [hl]
 	pop hl
 	add [hl]
 	ld [hl], a
-	ld a, $0
+	ld a, 0
 	adc e
 	ld e, a
-	ld a, $0
+	ld a, 0
 	adc d
 	ld d, a
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
 	ld a, [hl]
 	cp d
-	jp c, .asm_21f45
-	jr nz, .asm_21f32
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	jp c, .reachedTargetFrequency
+	jr nz, .applyUpdatedFrequency
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, bc
 	ld a, [hl]
 	cp e
-	jp c, .asm_21f45
-	jr .asm_21f32
-.asm_21eff
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	jp c, .reachedTargetFrequency
+	jr .applyUpdatedFrequency
+.frequencyDecreasing
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, bc
 	ld a, [hl]
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, bc
 	ld d, [hl]
-	ld hl, wChannelPitchBendFrequencySteps
+	ld hl, wChannelPitchSlideFrequencySteps
 	add hl, bc
 	ld e, [hl]
 	sub e
@@ -1105,7 +1156,7 @@ Audio2_ApplyPitchBend:
 	ld a, d
 	sbc b
 	ld d, a
-	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
+	ld hl, wChannelPitchSlideFrequencyStepsFractionalPart
 	add hl, bc
 	ld a, [hl]
 	add a
@@ -1116,129 +1167,140 @@ Audio2_ApplyPitchBend:
 	ld a, d
 	sbc b
 	ld d, a
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
 	ld a, d
 	cp [hl]
-	jr c, .asm_21f45
-	jr nz, .asm_21f32
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	jr c, .reachedTargetFrequency
+	jr nz, .applyUpdatedFrequency
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, bc
 	ld a, e
 	cp [hl]
-	jr c, .asm_21f45
-.asm_21f32
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	jr c, .reachedTargetFrequency
+.applyUpdatedFrequency
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, bc
 	ld [hl], e
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, bc
 	ld [hl], d
-	ld b, $3
-	call Audio2_21ff7
+	ld b, REG_FREQUENCY_LO
+	call Audio2_GetRegisterPointer
 	ld a, e
 	ld [hli], a
 	ld [hl], d
 	ret
-.asm_21f45
+.reachedTargetFrequency
+; Turn off pitch slide when the target frequency has been reached.
 	ld hl, wChannelFlags1
 	add hl, bc
-	res 4, [hl]
-	res 5, [hl]
+	res BIT_PITCH_SLIDE_ON, [hl]
+	res BIT_PITCH_SLIDE_DECREASING, [hl]
 	ret
 
-Audio2_21f4e:
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+Audio2_InitPitchSlideVars:
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, bc
 	ld [hl], d
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, bc
 	ld [hl], e
 	ld hl, wChannelNoteDelayCounters
 	add hl, bc
 	ld a, [hl]
-	ld hl, wChannelPitchBendLengthModifiers
+	ld hl, wChannelPitchSlideLengthModifiers
 	add hl, bc
 	sub [hl]
-	jr nc, .asm_21f66
-	ld a, $1
-.asm_21f66
+	jr nc, .next
+	ld a, 1
+.next
 	ld [hl], a
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, bc
 	ld a, e
 	sub [hl]
 	ld e, a
 	ld a, d
 	sbc b
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
 	sub [hl]
-	jr c, .asm_21f82
+	jr c, .targetFrequencyGreater
 	ld d, a
-	ld b, $0
+	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
-	set 5, [hl]
-	jr .asm_21fa5
-.asm_21f82
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	set BIT_PITCH_SLIDE_DECREASING, [hl]
+	jr .next2
+.targetFrequencyGreater
+; If the target frequency is greater, subtract the current frequency from
+; the target frequency to get the absolute difference.
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, bc
 	ld d, [hl]
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, bc
 	ld e, [hl]
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, bc
 	ld a, [hl]
 	sub e
 	ld e, a
+
+; Bug. Instead of borrowing from the high byte of the target frequency as it
+; should, it borrows from the high byte of the current frequency instead.
+; This means that the result will be 0x200 greater than it should be if the
+; low byte of the current frequency is greater than the low byte of the
+; target frequency.
 	ld a, d
 	sbc b
 	ld d, a
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
 	ld a, [hl]
 	sub d
 	ld d, a
-	ld b, $0
+	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
-	res 5, [hl]
-.asm_21fa5
-	ld hl, wChannelPitchBendLengthModifiers
+	res BIT_PITCH_SLIDE_DECREASING, [hl]
+
+.next2
+	ld hl, wChannelPitchSlideLengthModifiers
 	add hl, bc
-.asm_21fa9
+.divideLoop
 	inc b
 	ld a, e
 	sub [hl]
 	ld e, a
-	jr nc, .asm_21fa9
+	jr nc, .divideLoop
 	ld a, d
 	and a
-	jr z, .asm_21fb7
+	jr z, .doneDividing
 	dec a
 	ld d, a
-	jr .asm_21fa9
-.asm_21fb7
-	ld a, e
+	jr .divideLoop
+.doneDividing
+	ld a, e ; a = remainder - dividend
 	add [hl]
-	ld d, b
-	ld b, $0
-	ld hl, wChannelPitchBendFrequencySteps
+	ld d, b ; d = quotient + 1
+	ld b, 0
+	ld hl, wChannelPitchSlideFrequencySteps
 	add hl, bc
-	ld [hl], d
-	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
+	ld [hl], d ; store quotient + 1
+	ld hl, wChannelPitchSlideFrequencyStepsFractionalPart
 	add hl, bc
-	ld [hl], a
-	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
+	ld [hl], a ; store remainder - dividend
+	ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart
 	add hl, bc
-	ld [hl], a
+	ld [hl], a ; store remainder - dividend
 	ret
 
-Audio2_ApplyDutyCycle:
-	ld b, $0
-	ld hl, wChannelDutyCycles
+Audio2_ApplyDutyCyclePattern:
+	ld b, 0
+	ld hl, wChannelDutyCyclePatterns
 	add hl, bc
 	ld a, [hl]
 	rlca
@@ -1246,8 +1308,8 @@ Audio2_ApplyDutyCycle:
 	ld [hl], a
 	and $c0
 	ld d, a
-	ld b, $1
-	call Audio2_21ff7
+	ld b, REG_DUTY_SOUND_LEN
+	call Audio2_GetRegisterPointer
 	ld a, [hl]
 	and $3f
 	or d
@@ -1255,7 +1317,7 @@ Audio2_ApplyDutyCycle:
 	ret
 
 Audio2_GetNextMusicByte:
-	ld d, $0
+	ld d, 0
 	ld a, c
 	add a
 	ld e, a
@@ -1272,9 +1334,10 @@ Audio2_GetNextMusicByte:
 	ld [hl], d
 	ret
 
-Audio2_21ff7:
+Audio2_GetRegisterPointer:
+; hl = address of hardware sound register b for software channel c
 	ld a, c
-	ld hl, Unknown_222d6
+	ld hl, Audio2_HWChannelBaseAddresses
 	add l
 	jr nc, .noCarry
 	inc h
@@ -1286,13 +1349,14 @@ Audio2_21ff7:
 	ld h, $ff
 	ret
 
-Audio2_22006:
-	ld h, $0
+Audio2_MultiplyAdd:
+; hl = l + (a * de)
+	ld h, 0
 .loop
 	srl a
-	jr nc, .noCarry
+	jr nc, .skipAdd
 	add hl, de
-.noCarry
+.skipAdd
 	sla e
 	rl d
 	and a
@@ -1301,8 +1365,9 @@ Audio2_22006:
 .done
 	ret
 
-Audio2_22017:
-	ld h, $0
+Audio2_CalculateFrequency:
+; return the frequency for note a, octave b in de
+	ld h, 0
 	ld l, a
 	add hl, hl
 	ld d, h
@@ -1314,14 +1379,14 @@ Audio2_22017:
 	ld d, [hl]
 	ld a, b
 .loop
-	cp Ch8
+	cp 7
 	jr z, .done
 	sra d
 	rr e
 	inc a
 	jr .loop
 .done
-	ld a, $8
+	ld a, 8
 	add d
 	ld d, a
 	ret
@@ -1329,14 +1394,15 @@ Audio2_22017:
 Audio2_PlaySound::
 	ld [wSoundID], a
 	cp $ff
-	jp z, Audio2_221f3
-	cp $e9
-	jp z, Audio2_2210d
-	jp c, Audio2_2210d
+	jp z, .stopAllAudio
+	cp MAX_SFX_ID_2
+	jp z, .playSfx
+	jp c, .playSfx
 	cp $fe
-	jr z, .asm_2204c
-	jp nc, Audio2_2210d
-.asm_2204c
+	jr z, .playMusic
+	jp nc, .playSfx
+
+.playMusic
 	xor a
 	ld [wUnusedC000], a
 	ld [wDisableChannelOutputWhenSfxEnds], a
@@ -1345,53 +1411,53 @@ Audio2_PlaySound::
 	ld [wSfxWaveInstrument], a
 	ld d, $8
 	ld hl, wChannelReturnAddresses
-	call FillAudioRAM2
+	call .FillMem
 	ld hl, wChannelCommandPointers
-	call FillAudioRAM2
+	call .FillMem
 	ld d, $4
 	ld hl, wChannelSoundIDs
-	call FillAudioRAM2
+	call .FillMem
 	ld hl, wChannelFlags1
-	call FillAudioRAM2
-	ld hl, wChannelDuties
-	call FillAudioRAM2
+	call .FillMem
 	ld hl, wChannelDutyCycles
-	call FillAudioRAM2
+	call .FillMem
+	ld hl, wChannelDutyCyclePatterns
+	call .FillMem
 	ld hl, wChannelVibratoDelayCounters
-	call FillAudioRAM2
+	call .FillMem
 	ld hl, wChannelVibratoExtents
-	call FillAudioRAM2
+	call .FillMem
 	ld hl, wChannelVibratoRates
-	call FillAudioRAM2
+	call .FillMem
 	ld hl, wChannelFrequencyLowBytes
-	call FillAudioRAM2
+	call .FillMem
 	ld hl, wChannelVibratoDelayCounterReloadValues
-	call FillAudioRAM2
+	call .FillMem
 	ld hl, wChannelFlags2
-	call FillAudioRAM2
-	ld hl, wChannelPitchBendLengthModifiers
-	call FillAudioRAM2
-	ld hl, wChannelPitchBendFrequencySteps
-	call FillAudioRAM2
-	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
-	call FillAudioRAM2
-	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
-	call FillAudioRAM2
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
-	call FillAudioRAM2
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
-	call FillAudioRAM2
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
-	call FillAudioRAM2
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
-	call FillAudioRAM2
+	call .FillMem
+	ld hl, wChannelPitchSlideLengthModifiers
+	call .FillMem
+	ld hl, wChannelPitchSlideFrequencySteps
+	call .FillMem
+	ld hl, wChannelPitchSlideFrequencyStepsFractionalPart
+	call .FillMem
+	ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart
+	call .FillMem
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
+	call .FillMem
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
+	call .FillMem
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
+	call .FillMem
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
+	call .FillMem
 	ld a, $1
 	ld hl, wChannelLoopCounters
-	call FillAudioRAM2
+	call .FillMem
 	ld hl, wChannelNoteDelayCounters
-	call FillAudioRAM2
+	call .FillMem
 	ld hl, wChannelNoteSpeeds
-	call FillAudioRAM2
+	call .FillMem
 	ld [wMusicTempo], a
 	ld a, $ff
 	ld [wStereoPanning], a
@@ -1399,7 +1465,7 @@ Audio2_PlaySound::
 	ld [rNR50], a
 	ld a, $8
 	ld [rNR10], a
-	ld a, $0
+	ld a, 0
 	ld [rNR51], a
 	xor a
 	ld [rNR30], a
@@ -1407,12 +1473,12 @@ Audio2_PlaySound::
 	ld [rNR30], a
 	ld a, $77
 	ld [rNR50], a
-	jp Audio2_2224e
+	jp .playSoundCommon
 
-Audio2_2210d:
+.playSfx
 	ld l, a
 	ld e, a
-	ld h, $0
+	ld h, 0
 	ld d, h
 	add hl, hl
 	add hl, de
@@ -1427,13 +1493,13 @@ Audio2_2210d:
 	rlca
 	rlca
 	ld c, a
-.asm_22126
+.sfxChannelLoop
 	ld d, c
 	ld a, c
 	add a
 	add c
 	ld c, a
-	ld b, $0
+	ld b, 0
 	ld a, [wSfxHeaderPointer]
 	ld h, a
 	ld a, [wSfxHeaderPointer + 1]
@@ -1442,32 +1508,32 @@ Audio2_2210d:
 	ld c, d
 	ld a, [hl]
 	and $f
-	ld e, a
-	ld d, $0
+	ld e, a ; software channel ID
+	ld d, 0
 	ld hl, wChannelSoundIDs
 	add hl, de
 	ld a, [hl]
 	and a
-	jr z, .asm_22162
+	jr z, .playChannel
 	ld a, e
-	cp $7
-	jr nz, .asm_22159
+	cp Ch8
+	jr nz, .notNoiseChannel
 	ld a, [wSoundID]
-	cp $14
-	jr nc, .asm_22152
+	cp NOISE_INSTRUMENTS_END
+	jr nc, .notNoiseInstrument
 	ret
-.asm_22152
+.notNoiseInstrument
 	ld a, [hl]
-	cp $14
-	jr z, .asm_22162
-	jr c, .asm_22162
-.asm_22159
+	cp NOISE_INSTRUMENTS_END
+	jr z, .playChannel
+	jr c, .playChannel
+.notNoiseChannel
 	ld a, [wSoundID]
 	cp [hl]
-	jr z, .asm_22162
-	jr c, .asm_22162
+	jr z, .playChannel
+	jr c, .playChannel
 	ret
-.asm_22162
+.playChannel
 	xor a
 	push de
 	ld h, d
@@ -1490,10 +1556,10 @@ Audio2_2210d:
 	ld hl, wChannelFlags1
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelDuties
+	ld hl, wChannelDutyCycles
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelDutyCycles
+	ld hl, wChannelDutyCyclePatterns
 	add hl, de
 	ld [hl], a
 	ld hl, wChannelVibratoDelayCounters
@@ -1511,28 +1577,28 @@ Audio2_2210d:
 	ld hl, wChannelVibratoDelayCounterReloadValues
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendLengthModifiers
+	ld hl, wChannelPitchSlideLengthModifiers
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendFrequencySteps
+	ld hl, wChannelPitchSlideFrequencySteps
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
+	ld hl, wChannelPitchSlideFrequencyStepsFractionalPart
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
+	ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, de
 	ld [hl], a
 	ld hl, wChannelFlags2
@@ -1549,35 +1615,35 @@ Audio2_2210d:
 	add hl, de
 	ld [hl], a
 	ld a, e
-	cp $4
-	jr nz, .asm_221ea
+	cp Ch5
+	jr nz, .skipSweepDisable
 	ld a, $8
-	ld [rNR10], a
-.asm_221ea
+	ld [rNR10], a ; sweep off
+.skipSweepDisable
 	ld a, c
 	and a
-	jp z, Audio2_2224e
+	jp z, .playSoundCommon
 	dec c
-	jp .asm_22126
+	jp .sfxChannelLoop
 
-Audio2_221f3:
+.stopAllAudio
 	ld a, $80
-	ld [rNR52], a
-	ld [rNR30], a
+	ld [rNR52], a ; sound hardware on
+	ld [rNR30], a ; wave playback on
 	xor a
-	ld [rNR51], a
-	ld [rNR32], a
+	ld [rNR51], a ; no sound output
+	ld [rNR32], a ; mute channel 3 (wave channel)
 	ld a, $8
-	ld [rNR10], a
-	ld [rNR12], a
-	ld [rNR22], a
-	ld [rNR42], a
+	ld [rNR10], a ; sweep off
+	ld [rNR12], a ; mute channel 1 (pulse channel 1)
+	ld [rNR22], a ; mute channel 2 (pulse channel 2)
+	ld [rNR42], a ; mute channel 4 (noise channel)
 	ld a, $40
-	ld [rNR14], a
+	ld [rNR14], a ; counter mode
 	ld [rNR24], a
 	ld [rNR44], a
 	ld a, $77
-	ld [rNR50], a
+	ld [rNR50], a ; full volume
 	xor a
 	ld [wUnusedC000], a
 	ld [wDisableChannelOutputWhenSfxEnds], a
@@ -1588,11 +1654,11 @@ Audio2_221f3:
 	ld [wSfxWaveInstrument], a
 	ld d, $a0
 	ld hl, wChannelCommandPointers
-	call FillAudioRAM2
+	call .FillMem
 	ld a, $1
 	ld d, $18
 	ld hl, wChannelNoteDelayCounters
-	call FillAudioRAM2
+	call .FillMem
 	ld [wMusicTempo], a
 	ld [wSfxTempo], a
 	ld a, $ff
@@ -1600,7 +1666,7 @@ Audio2_221f3:
 	ret
 
 ; fills d bytes at hl with a
-FillAudioRAM2:
+.FillMem
 	ld b, d
 .loop
 	ld [hli], a
@@ -1608,11 +1674,11 @@ FillAudioRAM2:
 	jr nz, .loop
 	ret
 
-Audio2_2224e:
+.playSoundCommon
 	ld a, [wSoundID]
 	ld l, a
 	ld e, a
-	ld h, $0
+	ld h, 0
 	ld d, h
 	add hl, hl
 	add hl, de
@@ -1632,31 +1698,31 @@ Audio2_2224e:
 	ld b, c
 	inc b
 	inc de
-	ld c, $0
-.asm_22270
+	ld c, 0
+.commandPointerLoop
 	cp c
-	jr z, .asm_22278
+	jr z, .next
 	inc c
 	inc hl
 	inc hl
-	jr .asm_22270
-.asm_22278
+	jr .commandPointerLoop
+.next
 	push hl
 	push bc
 	push af
-	ld b, $0
+	ld b, 0
 	ld c, a
 	ld hl, wChannelSoundIDs
 	add hl, bc
 	ld a, [wSoundID]
 	ld [hl], a
 	pop af
-	cp $3
-	jr c, .asm_22291
+	cp Ch4
+	jr c, .skipSettingFlag
 	ld hl, wChannelFlags1
 	add hl, bc
-	set 2, [hl]
-.asm_22291
+	set BIT_NOISE_OR_SFX, [hl]
+.skipSettingFlag
 	pop bc
 	pop hl
 	ld a, [de] ; get channel pointer
@@ -1671,52 +1737,53 @@ Audio2_2224e:
 	and a
 	ld a, [de]
 	inc de
-	jr nz, .asm_22270
+	jr nz, .commandPointerLoop
 	ld a, [wSoundID]
-	cp $14
-	jr nc, .asm_222aa
-	jr .asm_222d4
-.asm_222aa
+	cp CRY_SFX_START
+	jr nc, .maybeCry
+	jr .done
+.maybeCry
 	ld a, [wSoundID]
-	cp $86
-	jr z, .asm_222d4
-	jr c, .asm_222b5
-	jr .asm_222d4
-.asm_222b5
+	cp CRY_SFX_END
+	jr z, .done
+	jr c, .cry
+	jr .done
+.cry
 	ld hl, wChannelSoundIDs + Ch5
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx noise channel pointer
-	ld de, Noise2_endchannel
+	ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer
+	ld de, Audio2_CryRet
 	ld [hl], e
 	inc hl
-	ld [hl], d ; overwrite pointer to point to endchannel
+	ld [hl], d ; overwrite pointer to point to sound_ret
 	ld a, [wSavedVolume]
 	and a
-	jr nz, .asm_222d4
+	jr nz, .done
 	ld a, [rNR50]
 	ld [wSavedVolume], a
 	ld a, $77
-	ld [rNR50], a
-.asm_222d4
+	ld [rNR50], a ; full volume
+.done
 	ret
 
-Noise2_endchannel:
+Audio2_CryRet:
 	sound_ret
 
-Unknown_222d6:
-	db $10, $15, $1A, $1F ; channels 0-3
-	db $10, $15, $1A, $1F ; channels 4-7
+Audio2_HWChannelBaseAddresses:
+; the low bytes of each HW channel's base address
+	db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 0-3
+	db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 4-7
 
-Unknown_222de:
-	db $EE, $DD, $BB, $77 ; channels 0-3
-	db $EE, $DD, $BB, $77 ; channels 4-7
+Audio2_HWChannelDisableMasks:
+	db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 0-3
+	db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 4-7
 
-Unknown_222e6:
-	db $11, $22, $44, $88 ; channels 0-3
-	db $11, $22, $44, $88 ; channels 4-7
+Audio2_HWChannelEnableMasks:
+	db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3
+	db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7
 
 Audio2_Pitches:
 	dw $F82C ; C_
@@ -1731,5 +1798,3 @@ Audio2_Pitches:
 	dw $FB58 ; A_
 	dw $FB9B ; A#
 	dw $FBDA ; B_
-
-
diff --git a/audio/engine_3.asm b/audio/engine_3.asm
index cf435740..f329c0c3 100644
--- a/audio/engine_3.asm
+++ b/audio/engine_3.asm
@@ -3,7 +3,7 @@
 Audio3_UpdateMusic::
 	ld c, Ch1
 .loop
-	ld b, $0
+	ld b, 0
 	ld hl, wChannelSoundIDs
 	add hl, bc
 	ld a, [hl]
@@ -19,7 +19,7 @@ Audio3_UpdateMusic::
 	jr nz, .nextChannel
 	set 7, a
 	ld [wMuteAudioAndPauseMusic], a
-	xor a
+	xor a ; disable all channels' output
 	ld [rNR51], a
 	ld [rNR30], a
 	ld a, $80
@@ -36,18 +36,12 @@ Audio3_UpdateMusic::
 
 ; this routine checks flags for music effects currently applied
 ; to the channel and calls certain functions based on flags.
-; known flags for wChannelFlags1:
-;   0: toggleperfectpitch has been used
-;   1: call has been used
-;   3: a toggle used only by this routine for vibrato
-;   4: pitchbend flag
-;   6: dutycycle flag
 Audio3_ApplyMusicAffects:
 	ld b, $0
 	ld hl, wChannelNoteDelayCounters ; delay until next note
 	add hl, bc
 	ld a, [hl]
-	cp $1 ; if delay is 1, play next note
+	cp $1 ; if the delay is 1, play next note
 	jp z, Audio3_PlayNextNote
 	dec a ; otherwise, decrease the delay timer
 	ld [hl], a
@@ -63,36 +57,36 @@ Audio3_ApplyMusicAffects:
 .startChecks
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 6, [hl] ; dutycycle
+	bit BIT_ROTATE_DUTY_CYCLE, [hl]
 	jr z, .checkForExecuteMusic
-	call Audio3_ApplyDutyCycle
+	call Audio3_ApplyDutyCyclePattern
 .checkForExecuteMusic
-	ld b, $0
+	ld b, 0
 	ld hl, wChannelFlags2
 	add hl, bc
-	bit 0, [hl]
-	jr nz, .checkForPitchBend
+	bit BIT_EXECUTE_MUSIC, [hl]
+	jr nz, .checkForPitchSlide
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 2, [hl]
-	jr nz, .disablePitchBendVibrato
-.checkForPitchBend
+	bit BIT_NOISE_OR_SFX, [hl]
+	jr nz, .skipPitchSlideVibrato
+.checkForPitchSlide
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 4, [hl] ; pitchbend
+	bit BIT_PITCH_SLIDE_ON, [hl]
 	jr z, .checkVibratoDelay
-	jp Audio3_ApplyPitchBend
+	jp Audio3_ApplyPitchSlide
 .checkVibratoDelay
-	ld hl, wChannelVibratoDelayCounters ; vibrato delay
+	ld hl, wChannelVibratoDelayCounters
 	add hl, bc
 	ld a, [hl]
 	and a ; check if delay is over
 	jr z, .checkForVibrato
 	dec [hl] ; otherwise, dec delay
-.disablePitchBendVibrato
+.skipPitchSlideVibrato
 	ret
 .checkForVibrato
-	ld hl, wChannelVibratoExtents ; vibrato rate
+	ld hl, wChannelVibratoExtents
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -105,33 +99,35 @@ Audio3_ApplyMusicAffects:
 	ld a, [hl]
 	and $f
 	and a
-	jr z, .vibratoAlreadyDone
-	dec [hl] ; apply vibrato pitch change
+	jr z, .applyVibrato
+	dec [hl] ; decrement counter
 	ret
-.vibratoAlreadyDone
+.applyVibrato
 	ld a, [hl]
 	swap [hl]
 	or [hl]
-	ld [hl], a ; reset the vibrato value and start again
+	ld [hl], a ; reload the counter
 	ld hl, wChannelFrequencyLowBytes
 	add hl, bc
 	ld e, [hl] ; get note pitch
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 3, [hl] ; this is the only code that sets/resets bit three so
-	jr z, .unset ; it continuously alternates which path it takes
-	res 3, [hl]
+; This is the only code that sets/resets the vibrato direction bit, so it
+; continuously alternates which path it takes.
+	bit BIT_VIBRATO_DIRECTION, [hl]
+	jr z, .unset
+	res BIT_VIBRATO_DIRECTION, [hl]
 	ld a, d
 	and $f
 	ld d, a
 	ld a, e
 	sub d
 	jr nc, .noCarry
-	ld a, $0
+	ld a, 0
 .noCarry
 	jr .done
 .unset
-	set 3, [hl]
+	set BIT_VIBRATO_DIRECTION, [hl]
 	ld a, d
 	and $f0
 	swap a
@@ -140,63 +136,66 @@ Audio3_ApplyMusicAffects:
 	ld a, $ff
 .done
 	ld d, a
-	ld b, $3
-	call Audio3_7d8ac
+	ld b, REG_FREQUENCY_LO
+	call Audio3_GetRegisterPointer
 	ld [hl], d
 	ret
 
 ; this routine executes all music commands that take up no time,
-; like tempo changes, duty changes etc. and doesn't return
+; like tempo changes, duty cycle changes etc. and doesn't return
 ; until the first note is reached
 Audio3_PlayNextNote:
+; reload the vibrato delay counter
 	ld hl, wChannelVibratoDelayCounterReloadValues
 	add hl, bc
 	ld a, [hl]
 	ld hl, wChannelVibratoDelayCounters
 	add hl, bc
 	ld [hl], a
+
 	ld hl, wChannelFlags1
 	add hl, bc
-	res 4, [hl]
-	res 5, [hl]
-	call Audio3_endchannel
+	res BIT_PITCH_SLIDE_ON, [hl]
+	res BIT_PITCH_SLIDE_DECREASING, [hl]
+	call Audio3_sound_ret
 	ret
 
-Audio3_endchannel:
+Audio3_sound_ret:
 	call Audio3_GetNextMusicByte
 	ld d, a
-	cp $ff ; is this command an endchannel?
-	jp nz, Audio3_callchannel ; no
-	ld b, $0 ; yes
+	cp $ff ; is this command a sound_ret?
+	jp nz, Audio3_sound_call ; no
+	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 1, [hl]
+	bit BIT_SOUND_CALL, [hl]
 	jr nz, .returnFromCall
 	ld a, c
 	cp Ch4
 	jr nc, .noiseOrSfxChannel
-	jr .asm_7d2b3
+	jr .disableChannelOutput
 .noiseOrSfxChannel
-	res 2, [hl]
+	res BIT_NOISE_OR_SFX, [hl]
 	ld hl, wChannelFlags2
 	add hl, bc
-	res 0, [hl]
+	res BIT_EXECUTE_MUSIC, [hl]
 	cp Ch7
-	jr nz, .notSfxChannel3
+	jr nz, .skipSfxChannel3
+; restart hardware channel 3 (wave channel) output
 	ld a, $0
 	ld [rNR30], a
 	ld a, $80
 	ld [rNR30], a
-.notSfxChannel3
-	jr nz, .asm_7d296
+.skipSfxChannel3
+	jr nz, .dontDisable
 	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
-	jr z, .asm_7d296
+	jr z, .dontDisable
 	xor a
 	ld [wDisableChannelOutputWhenSfxEnds], a
-	jr .asm_7d2b3
-.asm_7d296
-	jr .asm_7d2bc
+	jr .disableChannelOutput
+.dontDisable
+	jr .afterDisable
 .returnFromCall
 	res 1, [hl]
 	ld d, $0
@@ -216,45 +215,45 @@ Audio3_endchannel:
 	inc de
 	ld a, [de]
 	ld [hl], a ; loads channel address to return to
-	jp Audio3_endchannel
-.asm_7d2b3
-	ld hl, Unknown_7db93
+	jp Audio3_sound_ret
+.disableChannelOutput
+	ld hl, Audio3_HWChannelDisableMasks
 	add hl, bc
 	ld a, [rNR51]
 	and [hl]
 	ld [rNR51], a
-.asm_7d2bc
+.afterDisable
 	ld a, [wChannelSoundIDs + Ch5]
-	cp $14
-	jr nc, .asm_7d2c5
-	jr .asm_7d2e2
-.asm_7d2c5
+	cp CRY_SFX_START
+	jr nc, .maybeCry
+	jr .skipCry
+.maybeCry
 	ld a, [wChannelSoundIDs + Ch5]
-	cp $86
-	jr z, .asm_7d2e2
-	jr c, .asm_7d2d0
-	jr .asm_7d2e2
-.asm_7d2d0
+	cp CRY_SFX_END
+	jr z, .skipCry
+	jr c, .cry
+	jr .skipCry
+.cry
 	ld a, c
 	cp Ch5
-	jr z, .asm_7d2d9
-	call Audio3_7d73b
+	jr z, .skipRewind
+	call Audio3_GoBackOneCommandIfCry
 	ret c
-.asm_7d2d9
+.skipRewind
 	ld a, [wSavedVolume]
 	ld [rNR50], a
 	xor a
 	ld [wSavedVolume], a
-.asm_7d2e2
+.skipCry
 	ld hl, wChannelSoundIDs
 	add hl, bc
 	ld [hl], b
 	ret
 
-Audio3_callchannel:
-	cp $fd ; is this command a callchannel?
-	jp nz, Audio3_loopchannel ; no
-	call Audio3_GetNextMusicByte ; yes
+Audio3_sound_call:
+	cp $fd ; is this command a sound_call?
+	jp nz, Audio3_sound_loop ; no
+	call Audio3_GetNextMusicByte
 	push af
 	call Audio3_GetNextMusicByte
 	ld d, a
@@ -285,27 +284,27 @@ Audio3_callchannel:
 	ld b, $0
 	ld hl, wChannelFlags1
 	add hl, bc
-	set 1, [hl] ; set the call flag
-	jp Audio3_endchannel
+	set BIT_SOUND_CALL, [hl] ; set the call flag
+	jp Audio3_sound_ret
 
-Audio3_loopchannel:
-	cp $fe ; is this command a loopchannel?
-	jp nz, Audio3_notetype ; no
-	call Audio3_GetNextMusicByte ; yes
+Audio3_sound_loop:
+	cp $fe ; is this command a sound_loop?
+	jp nz, Audio3_note_type ; no
+	call Audio3_GetNextMusicByte
 	ld e, a
 	and a
 	jr z, .infiniteLoop
-	ld b, $0
+	ld b, 0
 	ld hl, wChannelLoopCounters
 	add hl, bc
 	ld a, [hl]
 	cp e
 	jr nz, .loopAgain
-	ld a, $1 ; if no more loops to make
+	ld a, $1 ; if no more loops to make,
 	ld [hl], a
 	call Audio3_GetNextMusicByte ; skip pointer
 	call Audio3_GetNextMusicByte
-	jp Audio3_endchannel
+	jp Audio3_sound_ret
 .loopAgain ; inc loop count
 	inc a
 	ld [hl], a
@@ -324,13 +323,13 @@ Audio3_loopchannel:
 	pop af
 	ld [hli], a
 	ld [hl], b
-	jp Audio3_endchannel
+	jp Audio3_sound_ret
 
-Audio3_notetype:
+Audio3_note_type:
 	and $f0
-	cp $d0 ; is this command a notetype?
-	jp nz, Audio3_toggleperfectpitch ; no
-	ld a, d ; yes
+	cp $d0 ; is this command a note_type?
+	jp nz, Audio3_toggle_perfect_pitch ; no
+	ld a, d
 	and $f
 	ld b, $0
 	ld hl, wChannelNoteSpeeds
@@ -345,15 +344,15 @@ Audio3_notetype:
 	cp Ch3
 	jr z, .musicChannel3
 	cp Ch7
-	jr nz, .notChannel3
+	jr nz, .skipChannel3
 	ld hl, wSfxWaveInstrument
-	jr .sfxChannel3
+	jr .channel3
 .musicChannel3
 	ld hl, wMusicWaveInstrument
-.sfxChannel3
+.channel3
 	ld a, d
 	and $f
-	ld [hl], a ; store low nibble of param as duty
+	ld [hl], a ; store low nibble of param as wave instrument
 	ld a, d
 	and $30
 	sla a
@@ -362,31 +361,31 @@ Audio3_notetype:
 
 	; if channel 3, store high nibble as volume
 	; else, store volume (high nibble) and fade (low nibble)
-.notChannel3
-	ld b, $0
+.skipChannel3
+	ld b, 0
 	ld hl, wChannelVolumes
 	add hl, bc
 	ld [hl], d
 .noiseChannel
-	jp Audio3_endchannel
+	jp Audio3_sound_ret
 
-Audio3_toggleperfectpitch:
+Audio3_toggle_perfect_pitch:
 	ld a, d
-	cp $e8 ; is this command a toggleperfectpitch?
+	cp $e8 ; is this command a toggle_perfect_pitch?
 	jr nz, Audio3_vibrato ; no
-	ld b, $0 ; yes
+	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
 	ld a, [hl]
 	xor $1
 	ld [hl], a ; flip bit 0 of wChannelFlags1
-	jp Audio3_endchannel
+	jp Audio3_sound_ret
 
 Audio3_vibrato:
 	cp $ea ; is this command a vibrato?
-	jr nz, Audio3_pitchbend ; no
-	call Audio3_GetNextMusicByte ; yes
-	ld b, $0
+	jr nz, Audio3_pitch_slide ; no
+	call Audio3_GetNextMusicByte
+	ld b, 0
 	ld hl, wChannelVibratoDelayCounters
 	add hl, bc
 	ld [hl], a ; store delay
@@ -395,9 +394,16 @@ Audio3_vibrato:
 	ld [hl], a ; store delay
 	call Audio3_GetNextMusicByte
 	ld d, a
+
+; The high nybble of the command byte is the extent of the vibrato.
+; Let n be the extent.
+; The upper nybble of the channel's byte in the wChannelVibratoExtents
+; array will store the extent above the note: (n / 2) + (n % 2).
+; The lower nybble will store the extent below the note: (n / 2).
+; These two values add to the total extent, n.
 	and $f0
 	swap a
-	ld b, $0
+	ld b, 0
 	ld hl, wChannelVibratoExtents
 	add hl, bc
 	srl a
@@ -405,7 +411,13 @@ Audio3_vibrato:
 	adc b
 	swap a
 	or e
-	ld [hl], a ; store rate as both high and low nibbles
+	ld [hl], a
+
+; The low nybble of the command byte is the rate of the vibrato.
+; The high and low nybbles of the channel's byte in the wChannelVibratoRates
+; array are both initialised to this value because the high nybble is the
+; counter reload value and the low nybble is the counter itself, which should
+; start at its value upon reload.
 	ld a, d
 	and $f
 	ld d, a
@@ -413,17 +425,18 @@ Audio3_vibrato:
 	add hl, bc
 	swap a
 	or d
-	ld [hl], a ; store depth as both high and low nibbles
-	jp Audio3_endchannel
+	ld [hl], a
 
-Audio3_pitchbend:
-	cp $eb ; is this command a pitchbend?
-	jr nz, Audio3_duty ; no
-	call Audio3_GetNextMusicByte ; yes
-	ld b, $0
-	ld hl, wChannelPitchBendLengthModifiers
+	jp Audio3_sound_ret
+
+Audio3_pitch_slide:
+	cp $eb ; is this command a pitch_slide?
+	jr nz, Audio3_duty_cycle ; no
+	call Audio3_GetNextMusicByte
+	ld b, 0
+	ld hl, wChannelPitchSlideLengthModifiers
 	add hl, bc
-	ld [hl], a ; store first param
+	ld [hl], a
 	call Audio3_GetNextMusicByte
 	ld d, a
 	and $f0
@@ -431,39 +444,39 @@ Audio3_pitchbend:
 	ld b, a
 	ld a, d
 	and $f
-	call Audio3_7d8cc
-	ld b, $0
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	call Audio3_CalculateFrequency
+	ld b, 0
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
-	ld [hl], d ; store unknown part of second param
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	ld [hl], d
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, bc
-	ld [hl], e ; store unknown part of second param
-	ld b, $0
+	ld [hl], e
+	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
-	set 4, [hl] ; set pitchbend flag
+	set BIT_PITCH_SLIDE_ON, [hl]
 	call Audio3_GetNextMusicByte
 	ld d, a
-	jp Audio3_notelength
+	jp Audio3_note_length
 
-Audio3_duty:
-	cp $ec ; is this command a duty?
+Audio3_duty_cycle:
+	cp $ec ; is this command a duty_cycle?
 	jr nz, Audio3_tempo ; no
-	call Audio3_GetNextMusicByte ; yes
+	call Audio3_GetNextMusicByte
 	rrca
 	rrca
 	and $c0
-	ld b, $0
-	ld hl, wChannelDuties
+	ld b, 0
+	ld hl, wChannelDutyCycles
 	add hl, bc
-	ld [hl], a ; store duty
-	jp Audio3_endchannel
+	ld [hl], a ; store duty cycle
+	jp Audio3_sound_ret
 
 Audio3_tempo:
 	cp $ed ; is this command a tempo?
-	jr nz, Audio3_stereopanning ; no
-	ld a, c ; yes
+	jr nz, Audio3_stereo_panning ; no
+	ld a, c
 	cp Ch5
 	jr nc, .sfxChannel
 	call Audio3_GetNextMusicByte
@@ -487,20 +500,20 @@ Audio3_tempo:
 	ld [wChannelNoteDelayCountersFractionalPart + 6], a
 	ld [wChannelNoteDelayCountersFractionalPart + 7], a
 .musicChannelDone
-	jp Audio3_endchannel
+	jp Audio3_sound_ret
 
-Audio3_stereopanning:
-	cp $ee ; is this command a stereopanning?
+Audio3_stereo_panning:
+	cp $ee ; is this command a stereo_panning?
 	jr nz, Audio3_unknownmusic0xef ; no
-	call Audio3_GetNextMusicByte ; yes
+	call Audio3_GetNextMusicByte
 	ld [wStereoPanning], a ; store panning
-	jp Audio3_endchannel
+	jp Audio3_sound_ret
 
 ; this appears to never be used
 Audio3_unknownmusic0xef:
 	cp $ef ; is this command an unknownmusic0xef?
-	jr nz, Audio3_dutycycle ; no
-	call Audio3_GetNextMusicByte ; yes
+	jr nz, Audio3_duty_cycle_pattern ; no
+	call Audio3_GetNextMusicByte
 	push bc
 	call Audio3_PlaySound
 	pop bc
@@ -512,124 +525,141 @@ Audio3_unknownmusic0xef:
 	xor a
 	ld [wChannelSoundIDs + Ch8], a
 .skip
-	jp Audio3_endchannel
+	jp Audio3_sound_ret
 
-Audio3_dutycycle:
-	cp $fc ; is this command a dutycycle?
+Audio3_duty_cycle_pattern:
+	cp $fc ; is this command a duty_cycle_pattern?
 	jr nz, Audio3_volume ; no
-	call Audio3_GetNextMusicByte ; yes
-	ld b, $0
-	ld hl, wChannelDutyCycles
+	call Audio3_GetNextMusicByte
+	ld b, 0
+	ld hl, wChannelDutyCyclePatterns
 	add hl, bc
-	ld [hl], a ; store full cycle
-	and $c0
-	ld hl, wChannelDuties
+	ld [hl], a ; store full pattern
+	and %11000000
+	ld hl, wChannelDutyCycles
 	add hl, bc
-	ld [hl], a ; store first duty
+	ld [hl], a ; store first duty cycle
 	ld hl, wChannelFlags1
 	add hl, bc
-	set 6, [hl] ; set duty flag
-	jp Audio3_endchannel
+	set BIT_ROTATE_DUTY_CYCLE, [hl]
+	jp Audio3_sound_ret
 
 Audio3_volume:
 	cp $f0 ; is this command a volume?
-	jr nz, Audio3_executemusic ; no
-	call Audio3_GetNextMusicByte ; yes
+	jr nz, Audio3_execute_music ; no
+	call Audio3_GetNextMusicByte
 	ld [rNR50], a ; store volume
-	jp Audio3_endchannel
+	jp Audio3_sound_ret
 
-Audio3_executemusic:
-	cp $f8 ; is this command an executemusic?
+Audio3_execute_music:
+	cp $f8 ; is this command an execute_music?
 	jr nz, Audio3_octave ; no
-	ld b, $0 ; yes
+	ld b, $0
 	ld hl, wChannelFlags2
 	add hl, bc
-	set 0, [hl]
-	jp Audio3_endchannel
+	set BIT_EXECUTE_MUSIC, [hl]
+	jp Audio3_sound_ret
 
 Audio3_octave:
 	and $f0
 	cp $e0 ; is this command an octave?
-	jr nz, Audio3_sfxnote ; no
-	ld hl, wChannelOctaves ; yes
-	ld b, $0
+	jr nz, Audio3_sfx_note ; no
+	ld hl, wChannelOctaves
+	ld b, 0
 	add hl, bc
 	ld a, d
 	and $f
 	ld [hl], a ; store low nibble as octave
-	jp Audio3_endchannel
+	jp Audio3_sound_ret
 
-; sfxnote is either squarenote or noisenote depending on the channel
-Audio3_sfxnote:
-	cp $20 ; is this command an sfxnote?
-	jr nz, Audio3_pitchenvelope ; no
+; sfx_note is either square_note or noise_note depending on the channel
+Audio3_sfx_note:
+	cp $20 ; is this command a sfx_note?
+	jr nz, Audio3_pitch_sweep
 	ld a, c
 	cp Ch4 ; is this a noise or sfx channel?
-	jr c, Audio3_pitchenvelope ; no
-	ld b, $0
+	jr c, Audio3_pitch_sweep ; no
+	ld b, 0
 	ld hl, wChannelFlags2
 	add hl, bc
-	bit 0, [hl]
-	jr nz, Audio3_pitchenvelope ; no
-	call Audio3_notelength ; yes
+	bit BIT_EXECUTE_MUSIC, [hl] ; is execute_music being used?
+	jr nz, Audio3_pitch_sweep ; yes
+	call Audio3_note_length
+
+; This code seems to do the same thing as what Audio3_ApplyDutyCycleAndSoundLength
+; does below.
 	ld d, a
-	ld b, $0
-	ld hl, wChannelDuties
+	ld b, 0
+	ld hl, wChannelDutyCycles
 	add hl, bc
 	ld a, [hl]
 	or d
 	ld d, a
-	ld b, $1
-	call Audio3_7d8ac
+	ld b, REG_DUTY_SOUND_LEN
+	call Audio3_GetRegisterPointer
 	ld [hl], d
+
 	call Audio3_GetNextMusicByte
 	ld d, a
-	ld b, $2
-	call Audio3_7d8ac
+	ld b, REG_VOLUME_ENVELOPE
+	call Audio3_GetRegisterPointer
 	ld [hl], d
 	call Audio3_GetNextMusicByte
 	ld e, a
 	ld a, c
 	cp Ch8
-	ld a, $0
-	jr z, .sfxNoiseChannel ; only two params for noise channel
+	ld a, 0
+	jr z, .skip
+; Channels 1 through 3 have 2 registers that control frequency, but the noise
+; channel a single register (the polynomial counter) that controls frequency,
+; so this command has one less byte on the noise channel.
 	push de
 	call Audio3_GetNextMusicByte
 	pop de
-.sfxNoiseChannel
+.skip
 	ld d, a
 	push de
-	call Audio3_7d69d
-	call Audio3_7d66c
+	call Audio3_ApplyDutyCycleAndSoundLength
+	call Audio3_EnableChannelOutput
 	pop de
-	call Audio3_7d6bf
+	call Audio3_ApplyWavePatternAndFrequency
 	ret
 
-Audio3_pitchenvelope:
+Audio3_pitch_sweep:
 	ld a, c
 	cp Ch5
 	jr c, Audio3_note ; if not a sfx
 	ld a, d
-	cp $10 ; is this command an pitchenvelope?
+	cp $10 ; is this command a pitch_sweep?
 	jr nz, Audio3_note ; no
 	ld b, $0
 	ld hl, wChannelFlags2
 	add hl, bc
-	bit 0, [hl]
+	bit BIT_EXECUTE_MUSIC, [hl]
 	jr nz, Audio3_note ; no
-	call Audio3_GetNextMusicByte ; yes
+	call Audio3_GetNextMusicByte
 	ld [rNR10], a
-	jp Audio3_endchannel
+	jp Audio3_sound_ret
 
 Audio3_note:
 	ld a, c
 	cp Ch4
-	jr nz, Audio3_notelength ; if not noise channel
+	jr nz, Audio3_note_length ; if not noise channel
 	ld a, d
 	and $f0
 	cp $b0 ; is this command a dnote?
-	jr z, Audio3_dnote ; yes
-	jr nc, Audio3_notelength ; no
+	jr z, .dnote
+	jr nc, Audio3_note_length ; no
+
+	; this executes when on the noise channel and
+	; the command id is less than $b0
+	; in this case, the upper nybble is used as the noise instrument ($1-$a)
+	; 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
+	; instead of 2 and can only be used with instruments 1 and 3 through 10
+	; this is unused by the game
 	swap a
 	ld b, a
 	ld a, d
@@ -638,38 +668,38 @@ Audio3_note:
 	ld a, b
 	push de
 	push bc
-	jr asm_7d571
+	jr .playDnote
 
-Audio3_dnote:
+.dnote
 	ld a, d
 	and $f
 	push af
 	push bc
 	call Audio3_GetNextMusicByte ; get dnote instrument
-asm_7d571
+.playDnote
 	ld d, a
 	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
-	jr nz, .asm_7d57c
+	jr nz, .skipDnote
 	ld a, d
 	call Audio3_PlaySound
-.asm_7d57c
+.skipDnote
 	pop bc
 	pop de
 
-Audio3_notelength:
+Audio3_note_length:
 	ld a, d
 	push af
 	and $f
 	inc a
-	ld b, $0
+	ld b, 0
 	ld e, a  ; store note length (in 16ths)
 	ld d, b
 	ld hl, wChannelNoteSpeeds
 	add hl, bc
 	ld a, [hl]
 	ld l, b
-	call Audio3_7d8bb
+	call Audio3_MultiplyAdd
 	ld a, c
 	cp Ch5
 	jr nc, .sfxChannel
@@ -683,20 +713,20 @@ Audio3_notelength:
 	ld e, $0
 	cp Ch8
 	jr z, .skip ; if noise channel
-	call Audio3_7d707
+	call Audio3_SetSfxTempo
 	ld a, [wSfxTempo]
 	ld d, a
 	ld a, [wSfxTempo + 1]
 	ld e, a
 .skip
-	ld a, l
-	ld b, $0
+	ld a, l ; a = note_length * note_speed
+	ld b, 0
 	ld hl, wChannelNoteDelayCountersFractionalPart
 	add hl, bc
 	ld l, [hl]
-	call Audio3_7d8bb
+	call Audio3_MultiplyAdd
 	ld e, l
-	ld d, h
+	ld d, h ; de = note_delay_frac_part + (note_length * note_speed * tempo)
 	ld hl, wChannelNoteDelayCountersFractionalPart
 	add hl, bc
 	ld [hl], e
@@ -706,192 +736,198 @@ Audio3_notelength:
 	ld [hl], a
 	ld hl, wChannelFlags2
 	add hl, bc
-	bit 0, [hl]
-	jr nz, Audio3_notepitch
+	bit BIT_EXECUTE_MUSIC, [hl]
+	jr nz, Audio3_note_pitch
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 2, [hl]
-	jr z, Audio3_notepitch
+	bit BIT_NOISE_OR_SFX, [hl]
+	jr z, Audio3_note_pitch
 	pop hl
 	ret
 
-Audio3_notepitch:
+Audio3_note_pitch:
 	pop af
 	and $f0
 	cp $c0 ; compare to rest
 	jr nz, .notRest
 	ld a, c
 	cp Ch5
-	jr nc, .sfxChannel
+	jr nc, .next
+; If this isn't an SFX channel, try the corresponding SFX channel.
 	ld hl, wChannelSoundIDs + Ch5
 	add hl, bc
 	ld a, [hl]
 	and a
-	jr nz, .quit
+	jr nz, .done
 	; fall through
-.sfxChannel
+.next
 	ld a, c
 	cp Ch3
-	jr z, .musicChannel3
+	jr z, .channel3
 	cp Ch7
-	jr nz, .notSfxChannel3
-.musicChannel3
-	ld b, $0
-	ld hl, Unknown_7db93
+	jr nz, .notChannel3
+.channel3
+	ld b, 0
+	ld hl, Audio3_HWChannelDisableMasks
 	add hl, bc
 	ld a, [rNR51]
 	and [hl]
-	ld [rNR51], a
-	jr .quit
-.notSfxChannel3
-	ld b, $2
-	call Audio3_7d8ac
-	ld a, $8
+	ld [rNR51], a ; disable hardware channel 3's output
+	jr .done
+.notChannel3
+	ld b, REG_VOLUME_ENVELOPE
+	call Audio3_GetRegisterPointer
+	ld a, $8 ; fade in sound
 	ld [hli], a
 	inc hl
-	ld a, $80
+	ld a, $80 ; restart sound
 	ld [hl], a
-.quit
+.done
 	ret
 .notRest
 	swap a
-	ld b, $0
+	ld b, 0
 	ld hl, wChannelOctaves
 	add hl, bc
 	ld b, [hl]
-	call Audio3_7d8cc
-	ld b, $0
+	call Audio3_CalculateFrequency
+	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 4, [hl]
-	jr z, .asm_7d62c
-	call Audio3_7d803
-.asm_7d62c
+	bit BIT_PITCH_SLIDE_ON, [hl]
+	jr z, .skipPitchSlide
+	call Audio3_InitPitchSlideVars
+.skipPitchSlide
 	push de
 	ld a, c
 	cp Ch5
-	jr nc, .skip ; if sfx Channel
+	jr nc, .sfxChannel ; if sfx channel
+; If this isn't an SFX channel, try the corresponding SFX channel.
 	ld hl, wChannelSoundIDs + Ch5
-	ld d, $0
+	ld d, 0
 	ld e, a
 	add hl, de
 	ld a, [hl]
 	and a
-	jr nz, .done
-	jr .skip
-.done
+	jr nz, .noSfx
+	jr .sfxChannel
+.noSfx
 	pop de
 	ret
-.skip
-	ld b, $0
+.sfxChannel
+	ld b, 0
 	ld hl, wChannelVolumes
 	add hl, bc
 	ld d, [hl]
-	ld b, $2
-	call Audio3_7d8ac
+	ld b, REG_VOLUME_ENVELOPE
+	call Audio3_GetRegisterPointer
 	ld [hl], d
-	call Audio3_7d69d
-	call Audio3_7d66c
+	call Audio3_ApplyDutyCycleAndSoundLength
+	call Audio3_EnableChannelOutput
 	pop de
 	ld b, $0
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 0, [hl]   ; has toggleperfectpitch been used?
-	jr z, .skip2
-	inc e         ; if yes, increment the pitch by 1
-	jr nc, .skip2
+	bit BIT_PERFECT_PITCH, [hl] ; has toggle_perfect_pitch been used?
+	jr z, .skipFrequencyInc
+	inc e                       ; if yes, increment the frequency by 1
+	jr nc, .skipFrequencyInc
 	inc d
-.skip2
+.skipFrequencyInc
 	ld hl, wChannelFrequencyLowBytes
 	add hl, bc
 	ld [hl], e
-	call Audio3_7d6bf
+	call Audio3_ApplyWavePatternAndFrequency
 	ret
 
-Audio3_7d66c:
-	ld b, $0
-	ld hl, Unknown_7db9b
+Audio3_EnableChannelOutput:
+	ld b, 0
+	ld hl, Audio3_HWChannelEnableMasks
 	add hl, bc
 	ld a, [rNR51]
-	or [hl]
+	or [hl] ; set this channel's bits
 	ld d, a
 	ld a, c
 	cp Ch8
-	jr z, .sfxNoiseChannel
+	jr z, .noiseChannelOrNoSfx
 	cp Ch5
 	jr nc, .skip ; if sfx channel
+; If this isn't an SFX channel, try the corresponding SFX channel.
 	ld hl, wChannelSoundIDs + Ch5
 	add hl, bc
 	ld a, [hl]
 	and a
 	jr nz, .skip
-.sfxNoiseChannel
+.noiseChannelOrNoSfx
+; If this is the SFX noise channel or a music channel whose corresponding
+; SFX channel is off, apply stereo panning.
 	ld a, [wStereoPanning]
-	ld hl, Unknown_7db9b
+	ld hl, Audio3_HWChannelEnableMasks
 	add hl, bc
 	and [hl]
 	ld d, a
 	ld a, [rNR51]
-	ld hl, Unknown_7db93
+	ld hl, Audio3_HWChannelDisableMasks
 	add hl, bc
-	and [hl]
-	or d
+	and [hl] ; reset this channel's output bits
+	or d ; set this channel's output bits that enabled in [wStereoPanning]
 	ld d, a
 .skip
 	ld a, d
 	ld [rNR51], a
 	ret
 
-Audio3_7d69d:
-	ld b, $0
-	ld hl, wChannelNoteDelayCounters
+Audio3_ApplyDutyCycleAndSoundLength:
+	ld b, 0
+	ld hl, wChannelNoteDelayCounters ; use the note delay as sound length
 	add hl, bc
 	ld d, [hl]
 	ld a, c
 	cp Ch3
-	jr z, .channel3 ; if music channel 3
+	jr z, .skipDuty ; if music channel 3
 	cp Ch7
-	jr z, .channel3 ; if sfx channel 3
+	jr z, .skipDuty ; if sfx channel 3
+; include duty cycle (except on channel 3 which doesn't have it)
 	ld a, d
 	and $3f
 	ld d, a
-	ld hl, wChannelDuties
+	ld hl, wChannelDutyCycles
 	add hl, bc
 	ld a, [hl]
 	or d
 	ld d, a
-.channel3
-	ld b, $1
-	call Audio3_7d8ac
+.skipDuty
+	ld b, REG_DUTY_SOUND_LEN
+	call Audio3_GetRegisterPointer
 	ld [hl], d
 	ret
 
-Audio3_7d6bf:
+Audio3_ApplyWavePatternAndFrequency:
 	ld a, c
 	cp Ch3
 	jr z, .channel3
 	cp Ch7
-	jr nz, .notSfxChannel3
+	jr nz, .notChannel3
 	; fall through
 .channel3
 	push de
 	ld de, wMusicWaveInstrument
 	cp Ch3
-	jr z, .musicChannel3
+	jr z, .next
 	ld de, wSfxWaveInstrument
-.musicChannel3
+.next
 	ld a, [de]
 	add a
-	ld d, $0
+	ld d, 0
 	ld e, a
 	ld hl, Audio3_WavePointers
 	add hl, de
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
-	ld hl, $ff30
+	ld hl, $ff30 ; wave pattern RAM
 	ld b, $f
-	ld a, $0
+	ld a, $0 ; stop hardware channel 3
 	ld [rNR30], a
 .loop
 	ld a, [de]
@@ -901,152 +937,155 @@ Audio3_7d6bf:
 	dec b
 	and a
 	jr nz, .loop
-	ld a, $80
+	ld a, $80 ; start hardware channel 3
 	ld [rNR30], a
 	pop de
-.notSfxChannel3
+.notChannel3
 	ld a, d
-	or $80
-	and $c7
+	or $80 ; use counter mode (i.e. disable output when the counter reaches 0)
+	and $c7 ; zero the unused bits in the register
 	ld d, a
-	ld b, $3
-	call Audio3_7d8ac
-	ld [hl], e
+	ld b, REG_FREQUENCY_LO
+	call Audio3_GetRegisterPointer
+	ld [hl], e ; store frequency low byte
 	inc hl
-	ld [hl], d
-	call Audio3_7d729
+	ld [hl], d ; store frequency high byte
+	call Audio3_ApplyFrequencyModifier
 	ret
 
-Audio3_7d707:
-	call Audio3_7d759
-	jr nc, .asm_7d71f
-	ld d, $0
+Audio3_SetSfxTempo:
+	call Audio3_IsCry
+	jr nc, .notCry
+	ld d, 0
 	ld a, [wTempoModifier]
 	add $80
-	jr nc, .asm_7d716
+	jr nc, .next
 	inc d
-.asm_7d716
+.next
 	ld [wSfxTempo + 1], a
 	ld a, d
 	ld [wSfxTempo], a
-	jr .asm_7d728
-.asm_7d71f
+	jr .done
+.notCry
 	xor a
 	ld [wSfxTempo + 1], a
 	ld a, $1
 	ld [wSfxTempo], a
-.asm_7d728
+.done
 	ret
 
-Audio3_7d729:
-	call Audio3_7d759
-	jr nc, .asm_7d73a
+Audio3_ApplyFrequencyModifier:
+	call Audio3_IsCry
+	jr nc, .done
+; if playing a cry, add the cry's frequency modifier
 	ld a, [wFrequencyModifier]
 	add e
-	jr nc, .asm_7d735
+	jr nc, .noCarry
 	inc d
-.asm_7d735
+.noCarry
 	dec hl
 	ld e, a
 	ld [hl], e
 	inc hl
 	ld [hl], d
-.asm_7d73a
+.done
 	ret
 
-Audio3_7d73b:
-	call Audio3_7d759
-	jr nc, .asm_7d756
+Audio3_GoBackOneCommandIfCry:
+	call Audio3_IsCry
+	jr nc, .done
 	ld hl, wChannelCommandPointers
 	ld e, c
-	ld d, $0
+	ld d, 0
 	sla e
 	rl d
 	add hl, de
 	ld a, [hl]
-	sub $1
+	sub 1
 	ld [hl], a
 	inc hl
 	ld a, [hl]
-	sbc $0
+	sbc 0
 	ld [hl], a
 	scf
 	ret
-.asm_7d756
+.done
 	scf
 	ccf
 	ret
 
-Audio3_7d759:
+Audio3_IsCry:
+; Returns whether the currently playing audio is a cry in carry.
 	ld a, [wChannelSoundIDs + Ch5]
-	cp $14
-	jr nc, .asm_7d762
-	jr .asm_7d768
-.asm_7d762
-	cp $86
-	jr z, .asm_7d768
-	jr c, .asm_7d76b
-.asm_7d768
+	cp CRY_SFX_START
+	jr nc, .next
+	jr .no
+.next
+	cp CRY_SFX_END
+	jr z, .no
+	jr c, .yes
+.no
 	scf
 	ccf
 	ret
-.asm_7d76b
+.yes
 	scf
 	ret
 
-Audio3_ApplyPitchBend:
+Audio3_ApplyPitchSlide:
 	ld hl, wChannelFlags1
 	add hl, bc
-	bit 5, [hl]
-	jp nz, .asm_7d7b4
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	bit BIT_PITCH_SLIDE_DECREASING, [hl]
+	jp nz, .frequencyDecreasing
+; frequency increasing
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, bc
 	ld e, [hl]
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, bc
 	ld d, [hl]
-	ld hl, wChannelPitchBendFrequencySteps
+	ld hl, wChannelPitchSlideFrequencySteps
 	add hl, bc
 	ld l, [hl]
 	ld h, b
 	add hl, de
 	ld d, h
 	ld e, l
-	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
+	ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart
 	add hl, bc
 	push hl
-	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
+	ld hl, wChannelPitchSlideFrequencyStepsFractionalPart
 	add hl, bc
 	ld a, [hl]
 	pop hl
 	add [hl]
 	ld [hl], a
-	ld a, $0
+	ld a, 0
 	adc e
 	ld e, a
-	ld a, $0
+	ld a, 0
 	adc d
 	ld d, a
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
 	ld a, [hl]
 	cp d
-	jp c, .asm_7d7fa
-	jr nz, .asm_7d7e7
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	jp c, .reachedTargetFrequency
+	jr nz, .applyUpdatedFrequency
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, bc
 	ld a, [hl]
 	cp e
-	jp c, .asm_7d7fa
-	jr .asm_7d7e7
-.asm_7d7b4
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	jp c, .reachedTargetFrequency
+	jr .applyUpdatedFrequency
+.frequencyDecreasing
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, bc
 	ld a, [hl]
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, bc
 	ld d, [hl]
-	ld hl, wChannelPitchBendFrequencySteps
+	ld hl, wChannelPitchSlideFrequencySteps
 	add hl, bc
 	ld e, [hl]
 	sub e
@@ -1054,7 +1093,7 @@ Audio3_ApplyPitchBend:
 	ld a, d
 	sbc b
 	ld d, a
-	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
+	ld hl, wChannelPitchSlideFrequencyStepsFractionalPart
 	add hl, bc
 	ld a, [hl]
 	add a
@@ -1065,129 +1104,140 @@ Audio3_ApplyPitchBend:
 	ld a, d
 	sbc b
 	ld d, a
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
 	ld a, d
 	cp [hl]
-	jr c, .asm_7d7fa
-	jr nz, .asm_7d7e7
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	jr c, .reachedTargetFrequency
+	jr nz, .applyUpdatedFrequency
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, bc
 	ld a, e
 	cp [hl]
-	jr c, .asm_7d7fa
-.asm_7d7e7
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	jr c, .reachedTargetFrequency
+.applyUpdatedFrequency
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, bc
 	ld [hl], e
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, bc
 	ld [hl], d
-	ld b, $3
-	call Audio3_7d8ac
+	ld b, REG_FREQUENCY_LO
+	call Audio3_GetRegisterPointer
 	ld a, e
 	ld [hli], a
 	ld [hl], d
 	ret
-.asm_7d7fa
+.reachedTargetFrequency
+; Turn off pitch slide when the target frequency has been reached.
 	ld hl, wChannelFlags1
 	add hl, bc
-	res 4, [hl]
-	res 5, [hl]
+	res BIT_PITCH_SLIDE_ON, [hl]
+	res BIT_PITCH_SLIDE_DECREASING, [hl]
 	ret
 
-Audio3_7d803:
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+Audio3_InitPitchSlideVars:
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, bc
 	ld [hl], d
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, bc
 	ld [hl], e
 	ld hl, wChannelNoteDelayCounters
 	add hl, bc
 	ld a, [hl]
-	ld hl, wChannelPitchBendLengthModifiers
+	ld hl, wChannelPitchSlideLengthModifiers
 	add hl, bc
 	sub [hl]
-	jr nc, .asm_7d81b
-	ld a, $1
-.asm_7d81b
+	jr nc, .next
+	ld a, 1
+.next
 	ld [hl], a
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, bc
 	ld a, e
 	sub [hl]
 	ld e, a
 	ld a, d
 	sbc b
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
 	sub [hl]
-	jr c, .asm_7d837
+	jr c, .targetFrequencyGreater
 	ld d, a
-	ld b, $0
+	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
-	set 5, [hl]
-	jr .asm_7d85a
-.asm_7d837
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	set BIT_PITCH_SLIDE_DECREASING, [hl]
+	jr .next2
+.targetFrequencyGreater
+; If the target frequency is greater, subtract the current frequency from
+; the target frequency to get the absolute difference.
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, bc
 	ld d, [hl]
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, bc
 	ld e, [hl]
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, bc
 	ld a, [hl]
 	sub e
 	ld e, a
+
+; Bug. Instead of borrowing from the high byte of the target frequency as it
+; should, it borrows from the high byte of the current frequency instead.
+; This means that the result will be 0x200 greater than it should be if the
+; low byte of the current frequency is greater than the low byte of the
+; target frequency.
 	ld a, d
 	sbc b
 	ld d, a
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, bc
 	ld a, [hl]
 	sub d
 	ld d, a
-	ld b, $0
+	ld b, 0
 	ld hl, wChannelFlags1
 	add hl, bc
-	res 5, [hl]
-.asm_7d85a
-	ld hl, wChannelPitchBendLengthModifiers
+	res BIT_PITCH_SLIDE_DECREASING, [hl]
+
+.next2
+	ld hl, wChannelPitchSlideLengthModifiers
 	add hl, bc
-.asm_7d85e
+.divideLoop
 	inc b
 	ld a, e
 	sub [hl]
 	ld e, a
-	jr nc, .asm_7d85e
+	jr nc, .divideLoop
 	ld a, d
 	and a
-	jr z, .asm_7d86c
+	jr z, .doneDividing
 	dec a
 	ld d, a
-	jr .asm_7d85e
-.asm_7d86c
-	ld a, e
+	jr .divideLoop
+.doneDividing
+	ld a, e ; a = remainder - dividend
 	add [hl]
-	ld d, b
-	ld b, $0
-	ld hl, wChannelPitchBendFrequencySteps
+	ld d, b ; d = quotient + 1
+	ld b, 0
+	ld hl, wChannelPitchSlideFrequencySteps
 	add hl, bc
-	ld [hl], d
-	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
+	ld [hl], d ; store quotient + 1
+	ld hl, wChannelPitchSlideFrequencyStepsFractionalPart
 	add hl, bc
-	ld [hl], a
-	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
+	ld [hl], a ; store remainder - dividend
+	ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart
 	add hl, bc
-	ld [hl], a
+	ld [hl], a ; store remainder - dividend
 	ret
 
-Audio3_ApplyDutyCycle:
-	ld b, $0
-	ld hl, wChannelDutyCycles
+Audio3_ApplyDutyCyclePattern:
+	ld b, 0
+	ld hl, wChannelDutyCyclePatterns
 	add hl, bc
 	ld a, [hl]
 	rlca
@@ -1195,8 +1245,8 @@ Audio3_ApplyDutyCycle:
 	ld [hl], a
 	and $c0
 	ld d, a
-	ld b, $1
-	call Audio3_7d8ac
+	ld b, REG_DUTY_SOUND_LEN
+	call Audio3_GetRegisterPointer
 	ld a, [hl]
 	and $3f
 	or d
@@ -1204,7 +1254,7 @@ Audio3_ApplyDutyCycle:
 	ret
 
 Audio3_GetNextMusicByte:
-	ld d, $0
+	ld d, 0
 	ld a, c
 	add a
 	ld e, a
@@ -1221,9 +1271,10 @@ Audio3_GetNextMusicByte:
 	ld [hl], d
 	ret
 
-Audio3_7d8ac:
+Audio3_GetRegisterPointer:
+; hl = address of hardware sound register b for software channel c
 	ld a, c
-	ld hl, Unknown_7db8b
+	ld hl, Audio3_HWChannelBaseAddresses
 	add l
 	jr nc, .noCarry
 	inc h
@@ -1235,13 +1286,14 @@ Audio3_7d8ac:
 	ld h, $ff
 	ret
 
-Audio3_7d8bb:
-	ld h, $0
+Audio3_MultiplyAdd:
+; hl = l + (a * de)
+	ld h, 0
 .loop
 	srl a
-	jr nc, .noCarry
+	jr nc, .skipAdd
 	add hl, de
-.noCarry
+.skipAdd
 	sla e
 	rl d
 	and a
@@ -1250,8 +1302,9 @@ Audio3_7d8bb:
 .done
 	ret
 
-Audio3_7d8cc:
-	ld h, $0
+Audio3_CalculateFrequency:
+; return the frequency for note a, octave b in de
+	ld h, 0
 	ld l, a
 	add hl, hl
 	ld d, h
@@ -1263,14 +1316,14 @@ Audio3_7d8cc:
 	ld d, [hl]
 	ld a, b
 .loop
-	cp $7
+	cp 7
 	jr z, .done
 	sra d
 	rr e
 	inc a
 	jr .loop
 .done
-	ld a, $8
+	ld a, 8
 	add d
 	ld d, a
 	ret
@@ -1278,14 +1331,15 @@ Audio3_7d8cc:
 Audio3_PlaySound::
 	ld [wSoundID], a
 	cp $ff
-	jp z, Audio3_7daa8
-	cp $c2
-	jp z, Audio3_7d9c2
-	jp c, Audio3_7d9c2
+	jp z, .stopAllAudio
+	cp MAX_SFX_ID_3
+	jp z, .playSfx
+	jp c, .playSfx
 	cp $fe
-	jr z, .asm_7d901
-	jp nc, Audio3_7d9c2
-.asm_7d901
+	jr z, .playMusic
+	jp nc, .playSfx
+
+.playMusic
 	xor a
 	ld [wUnusedC000], a
 	ld [wDisableChannelOutputWhenSfxEnds], a
@@ -1294,53 +1348,53 @@ Audio3_PlaySound::
 	ld [wSfxWaveInstrument], a
 	ld d, $8
 	ld hl, wChannelReturnAddresses
-	call FillAudioRAM3
+	call .FillMem
 	ld hl, wChannelCommandPointers
-	call FillAudioRAM3
+	call .FillMem
 	ld d, $4
 	ld hl, wChannelSoundIDs
-	call FillAudioRAM3
+	call .FillMem
 	ld hl, wChannelFlags1
-	call FillAudioRAM3
-	ld hl, wChannelDuties
-	call FillAudioRAM3
+	call .FillMem
 	ld hl, wChannelDutyCycles
-	call FillAudioRAM3
+	call .FillMem
+	ld hl, wChannelDutyCyclePatterns
+	call .FillMem
 	ld hl, wChannelVibratoDelayCounters
-	call FillAudioRAM3
+	call .FillMem
 	ld hl, wChannelVibratoExtents
-	call FillAudioRAM3
+	call .FillMem
 	ld hl, wChannelVibratoRates
-	call FillAudioRAM3
+	call .FillMem
 	ld hl, wChannelFrequencyLowBytes
-	call FillAudioRAM3
+	call .FillMem
 	ld hl, wChannelVibratoDelayCounterReloadValues
-	call FillAudioRAM3
+	call .FillMem
 	ld hl, wChannelFlags2
-	call FillAudioRAM3
-	ld hl, wChannelPitchBendLengthModifiers
-	call FillAudioRAM3
-	ld hl, wChannelPitchBendFrequencySteps
-	call FillAudioRAM3
-	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
-	call FillAudioRAM3
-	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
-	call FillAudioRAM3
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
-	call FillAudioRAM3
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
-	call FillAudioRAM3
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
-	call FillAudioRAM3
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
-	call FillAudioRAM3
+	call .FillMem
+	ld hl, wChannelPitchSlideLengthModifiers
+	call .FillMem
+	ld hl, wChannelPitchSlideFrequencySteps
+	call .FillMem
+	ld hl, wChannelPitchSlideFrequencyStepsFractionalPart
+	call .FillMem
+	ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart
+	call .FillMem
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
+	call .FillMem
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
+	call .FillMem
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
+	call .FillMem
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
+	call .FillMem
 	ld a, $1
 	ld hl, wChannelLoopCounters
-	call FillAudioRAM3
+	call .FillMem
 	ld hl, wChannelNoteDelayCounters
-	call FillAudioRAM3
+	call .FillMem
 	ld hl, wChannelNoteSpeeds
-	call FillAudioRAM3
+	call .FillMem
 	ld [wMusicTempo], a
 	ld a, $ff
 	ld [wStereoPanning], a
@@ -1348,7 +1402,7 @@ Audio3_PlaySound::
 	ld [rNR50], a
 	ld a, $8
 	ld [rNR10], a
-	ld a, $0
+	ld a, 0
 	ld [rNR51], a
 	xor a
 	ld [rNR30], a
@@ -1356,12 +1410,12 @@ Audio3_PlaySound::
 	ld [rNR30], a
 	ld a, $77
 	ld [rNR50], a
-	jp Audio3_7db03
+	jp .playSoundCommon
 
-Audio3_7d9c2:
+.playSfx
 	ld l, a
 	ld e, a
-	ld h, $0
+	ld h, 0
 	ld d, h
 	add hl, hl
 	add hl, de
@@ -1376,13 +1430,13 @@ Audio3_7d9c2:
 	rlca
 	rlca
 	ld c, a
-.asm_7d9db
+.sfxChannelLoop
 	ld d, c
 	ld a, c
 	add a
 	add c
 	ld c, a
-	ld b, $0
+	ld b, 0
 	ld a, [wSfxHeaderPointer]
 	ld h, a
 	ld a, [wSfxHeaderPointer + 1]
@@ -1391,32 +1445,32 @@ Audio3_7d9c2:
 	ld c, d
 	ld a, [hl]
 	and $f
-	ld e, a
-	ld d, $0
+	ld e, a ; software channel ID
+	ld d, 0
 	ld hl, wChannelSoundIDs
 	add hl, de
 	ld a, [hl]
 	and a
-	jr z, .asm_7da17
+	jr z, .playChannel
 	ld a, e
-	cp $7
-	jr nz, .asm_7da0e
+	cp Ch8
+	jr nz, .notNoiseChannel
 	ld a, [wSoundID]
-	cp $14
-	jr nc, .asm_7da07
+	cp NOISE_INSTRUMENTS_END
+	jr nc, .notNoiseInstrument
 	ret
-.asm_7da07
+.notNoiseInstrument
 	ld a, [hl]
-	cp $14
-	jr z, .asm_7da17
-	jr c, .asm_7da17
-.asm_7da0e
+	cp NOISE_INSTRUMENTS_END
+	jr z, .playChannel
+	jr c, .playChannel
+.notNoiseChannel
 	ld a, [wSoundID]
 	cp [hl]
-	jr z, .asm_7da17
-	jr c, .asm_7da17
+	jr z, .playChannel
+	jr c, .playChannel
 	ret
-.asm_7da17
+.playChannel
 	xor a
 	push de
 	ld h, d
@@ -1439,10 +1493,10 @@ Audio3_7d9c2:
 	ld hl, wChannelFlags1
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelDuties
+	ld hl, wChannelDutyCycles
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelDutyCycles
+	ld hl, wChannelDutyCyclePatterns
 	add hl, de
 	ld [hl], a
 	ld hl, wChannelVibratoDelayCounters
@@ -1460,28 +1514,28 @@ Audio3_7d9c2:
 	ld hl, wChannelVibratoDelayCounterReloadValues
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendLengthModifiers
+	ld hl, wChannelPitchSlideLengthModifiers
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendFrequencySteps
+	ld hl, wChannelPitchSlideFrequencySteps
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendFrequencyStepsFractionalPart
+	ld hl, wChannelPitchSlideFrequencyStepsFractionalPart
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendCurrentFrequencyFractionalPart
+	ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyHighBytes
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendCurrentFrequencyLowBytes
+	ld hl, wChannelPitchSlideCurrentFrequencyLowBytes
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendTargetFrequencyHighBytes
+	ld hl, wChannelPitchSlideTargetFrequencyHighBytes
 	add hl, de
 	ld [hl], a
-	ld hl, wChannelPitchBendTargetFrequencyLowBytes
+	ld hl, wChannelPitchSlideTargetFrequencyLowBytes
 	add hl, de
 	ld [hl], a
 	ld hl, wChannelFlags2
@@ -1498,35 +1552,35 @@ Audio3_7d9c2:
 	add hl, de
 	ld [hl], a
 	ld a, e
-	cp $4
-	jr nz, .asm_7da9f
+	cp Ch5
+	jr nz, .skipSweepDisable
 	ld a, $8
-	ld [rNR10], a
-.asm_7da9f
+	ld [rNR10], a ; sweep off
+.skipSweepDisable
 	ld a, c
 	and a
-	jp z, Audio3_7db03
+	jp z, .playSoundCommon
 	dec c
-	jp .asm_7d9db
+	jp .sfxChannelLoop
 
-Audio3_7daa8:
+.stopAllAudio
 	ld a, $80
-	ld [rNR52], a
-	ld [rNR30], a
+	ld [rNR52], a ; sound hardware on
+	ld [rNR30], a ; wave playback on
 	xor a
-	ld [rNR51], a
-	ld [rNR32], a
+	ld [rNR51], a ; no sound output
+	ld [rNR32], a ; mute channel 3 (wave channel)
 	ld a, $8
-	ld [rNR10], a
-	ld [rNR12], a
-	ld [rNR22], a
-	ld [rNR42], a
+	ld [rNR10], a ; sweep off
+	ld [rNR12], a ; mute channel 1 (pulse channel 1)
+	ld [rNR22], a ; mute channel 2 (pulse channel 2)
+	ld [rNR42], a ; mute channel 4 (noise channel)
 	ld a, $40
-	ld [rNR14], a
+	ld [rNR14], a ; counter mode
 	ld [rNR24], a
 	ld [rNR44], a
 	ld a, $77
-	ld [rNR50], a
+	ld [rNR50], a ; full volume
 	xor a
 	ld [wUnusedC000], a
 	ld [wDisableChannelOutputWhenSfxEnds], a
@@ -1537,11 +1591,11 @@ Audio3_7daa8:
 	ld [wSfxWaveInstrument], a
 	ld d, $a0
 	ld hl, wChannelCommandPointers
-	call FillAudioRAM3
+	call .FillMem
 	ld a, $1
 	ld d, $18
 	ld hl, wChannelNoteDelayCounters
-	call FillAudioRAM3
+	call .FillMem
 	ld [wMusicTempo], a
 	ld [wSfxTempo], a
 	ld a, $ff
@@ -1549,7 +1603,7 @@ Audio3_7daa8:
 	ret
 
 ; fills d bytes at hl with a
-FillAudioRAM3:
+.FillMem
 	ld b, d
 .loop
 	ld [hli], a
@@ -1557,11 +1611,11 @@ FillAudioRAM3:
 	jr nz, .loop
 	ret
 
-Audio3_7db03:
+.playSoundCommon
 	ld a, [wSoundID]
 	ld l, a
 	ld e, a
-	ld h, $0
+	ld h, 0
 	ld d, h
 	add hl, hl
 	add hl, de
@@ -1581,31 +1635,31 @@ Audio3_7db03:
 	ld b, c
 	inc b
 	inc de
-	ld c, $0
-.asm_7db25
+	ld c, 0
+.commandPointerLoop
 	cp c
-	jr z, .asm_7db2d
+	jr z, .next
 	inc c
 	inc hl
 	inc hl
-	jr .asm_7db25
-.asm_7db2d
+	jr .commandPointerLoop
+.next
 	push hl
 	push bc
 	push af
-	ld b, $0
+	ld b, 0
 	ld c, a
 	ld hl, wChannelSoundIDs
 	add hl, bc
 	ld a, [wSoundID]
 	ld [hl], a
 	pop af
-	cp $3
-	jr c, .asm_7db46
+	cp Ch4
+	jr c, .skipSettingFlag
 	ld hl, wChannelFlags1
 	add hl, bc
-	set 2, [hl]
-.asm_7db46
+	set BIT_NOISE_OR_SFX, [hl]
+.skipSettingFlag
 	pop bc
 	pop hl
 	ld a, [de] ; get channel pointer
@@ -1620,52 +1674,53 @@ Audio3_7db03:
 	and a
 	ld a, [de]
 	inc de
-	jr nz, .asm_7db25
+	jr nz, .commandPointerLoop
 	ld a, [wSoundID]
-	cp $14
-	jr nc, .asm_7db5f
-	jr .asm_7db89
-.asm_7db5f
+	cp CRY_SFX_START
+	jr nc, .maybeCry
+	jr .done
+.maybeCry
 	ld a, [wSoundID]
-	cp $86
-	jr z, .asm_7db89
-	jr c, .asm_7db6a
-	jr .asm_7db89
-.asm_7db6a
+	cp CRY_SFX_END
+	jr z, .done
+	jr c, .cry
+	jr .done
+.cry
 	ld hl, wChannelSoundIDs + Ch5
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx noise channel pointer
-	ld de, Noise3_endchannel
+	ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer
+	ld de, Audio3_CryRet
 	ld [hl], e
 	inc hl
-	ld [hl], d ; overwrite pointer to point to endchannel
+	ld [hl], d ; overwrite pointer to point to sound_ret
 	ld a, [wSavedVolume]
 	and a
-	jr nz, .asm_7db89
+	jr nz, .done
 	ld a, [rNR50]
 	ld [wSavedVolume], a
 	ld a, $77
-	ld [rNR50], a
-.asm_7db89
+	ld [rNR50], a ; full volume
+.done
 	ret
 
-Noise3_endchannel:
+Audio3_CryRet:
 	sound_ret
 
-Unknown_7db8b:
-	db $10, $15, $1A, $1F ; channels 0-3
-	db $10, $15, $1A, $1F ; channels 4-7
+Audio3_HWChannelBaseAddresses:
+; the low bytes of each HW channel's base address
+	db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 0-3
+	db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 4-7
 
-Unknown_7db93:
-	db $EE, $DD, $BB, $77 ; channels 0-3
-	db $EE, $DD, $BB, $77 ; channels 4-7
+Audio3_HWChannelDisableMasks:
+	db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 0-3
+	db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 4-7
 
-Unknown_7db9b:
-	db $11, $22, $44, $88 ; channels 0-3
-	db $11, $22, $44, $88 ; channels 4-7
+Audio3_HWChannelEnableMasks:
+	db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3
+	db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7
 
 Audio3_Pitches:
 	dw $F82C ; C_
@@ -1680,5 +1735,3 @@ Audio3_Pitches:
 	dw $FB58 ; A_
 	dw $FB9B ; A#
 	dw $FBDA ; B_
-
-
diff --git a/audio/music/yellow/meetjessiejames.asm b/audio/music/yellow/meetjessiejames.asm
index 7f1f4598..d1f9f795 100644
--- a/audio/music/yellow/meetjessiejames.asm
+++ b/audio/music/yellow/meetjessiejames.asm
@@ -306,4 +306,3 @@ Music_MeetJessieJames_branch_83235::
 	note E_, 1
 	rest 1
 	sound_loop 0, Music_MeetJessieJames_branch_83235
-	sound_ret
diff --git a/constants/music_constants.asm b/constants/music_constants.asm
index 9cf72b26..de91352e 100644
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -20,19 +20,27 @@ REG_DUTY_SOUND_LEN  EQU 1
 REG_VOLUME_ENVELOPE EQU 2
 REG_FREQUENCY_LO    EQU 3
 
-MAX_SFX_ID EQU $B9
+MAX_SFX_ID_1 EQUS "SFX_SAFARI_ZONE_PA"
+MAX_SFX_ID_2 EQUS "SFX_SILPH_SCOPE"
+MAX_SFX_ID_3 EQUS "SFX_SHOOTING_STAR"
 
-CRY_SFX_START EQU $14
-CRY_SFX_END   EQU $86
+NOISE_INSTRUMENTS_START EQUS "SFX_NOISE_INSTRUMENT01"
+NOISE_INSTRUMENTS_END   EQUS "SFX_NOISE_INSTRUMENT19 + 1"
+
+CRY_SFX_START EQUS "SFX_CRY_00"
+CRY_SFX_END   EQUS "SFX_CRY_25 + 3"
+
+BATTLE_SFX_START EQUS "SFX_PECK"
+BATTLE_SFX_END   EQUS "SFX_SILPH_SCOPE + 1"
 
 ; wChannelFlags1 constants
-BIT_PERFECT_PITCH         EQU 0 ; controlled by toggleperfectpitch command
-BIT_CHANNEL_CALL          EQU 1 ; if in channel call
-BIT_NOISE_OR_SFX          EQU 2 ; if channel is the music noise channel or an SFX channel
-BIT_VIBRATO_DIRECTION     EQU 3 ; if the pitch is above or below normal (cycles)
-BIT_PITCH_BEND_ON         EQU 4 ; if pitch bend is active
-BIT_PITCH_BEND_DECREASING EQU 5 ; if the pitch bend frequency is decreasing (instead of increasing)
-BIT_ROTATE_DUTY           EQU 6 ; if rotating duty
+BIT_PERFECT_PITCH          EQU 0 ; controlled by toggle_perfect_pitch command
+BIT_SOUND_CALL             EQU 1 ; if in sound call
+BIT_NOISE_OR_SFX           EQU 2 ; if channel is the music noise channel or an SFX channel
+BIT_VIBRATO_DIRECTION      EQU 3 ; if the pitch is above or below normal (cycles)
+BIT_PITCH_SLIDE_ON         EQU 4 ; if pitch slide is active
+BIT_PITCH_SLIDE_DECREASING EQU 5 ; if the pitch slide frequency is decreasing (instead of increasing)
+BIT_ROTATE_DUTY_CYCLE      EQU 6 ; if rotating duty cycle
 
 ; wChannelFlags2 constant (only has one flag)
 BIT_EXECUTE_MUSIC EQU 0 ; if in execute music
diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm
index a4cd6c3b..a2282445 100755
--- a/macros/audio_macros.asm
+++ b/macros/audio_macros.asm
@@ -86,6 +86,14 @@ dnote: MACRO
 	db \1
 ENDM
 
+;format: instrument [1, 3-10], length (in 16ths)
+; like dnote but one 1 byte instead of 2
+; can only be used with instruments 1-10, excluding 2
+; unused
+dnote_short: MACRO
+	db (\1 << 4) | (\2 - 1)
+ENDM
+
 ;format: length (in 16ths)
 rest: MACRO
 	db $C0 | (\1 - 1)
diff --git a/wram.asm b/wram.asm
index 75331a61..95c6a8e5 100755
--- a/wram.asm
+++ b/wram.asm
@@ -101,10 +101,10 @@ wChannelFlags1:: ; c02e
 wChannelFlags2:: ; c036
 	ds 8
 
-wChannelDuties:: ; c03e
+wChannelDutyCycles:: ; c03e
 	ds 8
 
-wChannelDutyCycles:: ; c046
+wChannelDutyCyclePatterns:: ; c046
 	ds 8
 
 wChannelVibratoDelayCounters:: ; c04e
@@ -126,28 +126,28 @@ wChannelVibratoDelayCounterReloadValues:: ; c06e
 ; delay of the beginning of the vibrato from the start of the note
 	ds 8
 
-wChannelPitchBendLengthModifiers:: ; c076
+wChannelPitchSlideLengthModifiers:: ; c076
 	ds 8
 
-wChannelPitchBendFrequencySteps:: ; c07e
+wChannelPitchSlideFrequencySteps:: ; c07e
 	ds 8
 
-wChannelPitchBendFrequencyStepsFractionalPart:: ; c086
+wChannelPitchSlideFrequencyStepsFractionalPart:: ; c086
 	ds 8
 
-wChannelPitchBendCurrentFrequencyFractionalPart:: ; c08e
+wChannelPitchSlideCurrentFrequencyFractionalPart:: ; c08e
 	ds 8
 
-wChannelPitchBendCurrentFrequencyHighBytes:: ; c096
+wChannelPitchSlideCurrentFrequencyHighBytes:: ; c096
 	ds 8
 
-wChannelPitchBendCurrentFrequencyLowBytes:: ; c09e
+wChannelPitchSlideCurrentFrequencyLowBytes:: ; c09e
 	ds 8
 
-wChannelPitchBendTargetFrequencyHighBytes:: ; c0a6
+wChannelPitchSlideTargetFrequencyHighBytes:: ; c0a6
 	ds 8
 
-wChannelPitchBendTargetFrequencyLowBytes:: ; c0ae
+wChannelPitchSlideTargetFrequencyLowBytes:: ; c0ae
 	ds 8
 
 wChannelNoteDelayCounters:: ; c0b6
-- 
cgit v1.3.1-sl0p


From 8b0cd72a6095db7f1639dae81c3d8eefd5b814d8 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Sun, 18 Aug 2019 21:43:15 -0500
Subject: Finish cleaning up audio macro arguments and descriptions break up
 arguments for stereo_panning and duty_cycle_pattern note_type fade is signed
 properly document arguments for vibrato, tempo, pitch_slide etc

---
 audio/music/bikeriding.asm        |  2 +-
 audio/music/celadon.asm           |  2 +-
 audio/music/defeatedgymleader.asm |  4 +--
 audio/music/dungeon1.asm          | 10 +++---
 audio/music/dungeon2.asm          |  2 +-
 audio/music/finalbattle.asm       | 10 +++---
 audio/music/gymleaderbattle.asm   |  2 +-
 audio/music/indigoplateau.asm     |  6 ++--
 audio/music/introbattle.asm       |  6 ++--
 audio/music/jigglypuffsong.asm    |  4 +--
 audio/music/meeteviltrainer.asm   |  6 ++--
 audio/music/pkmnhealed.asm        | 10 +++---
 audio/music/pokemontower.asm      |  2 +-
 audio/music/routes3.asm           |  2 +-
 audio/music/routes4.asm           |  6 ++--
 audio/music/safarizone.asm        |  8 ++---
 audio/music/silphco.asm           | 16 ++++-----
 audio/music/titlescreen.asm       | 12 +++----
 audio/music/trainerbattle.asm     |  4 +--
 audio/music/wildbattle.asm        |  8 ++---
 audio/sfx/battle_27.asm           |  2 +-
 audio/sfx/battle_28.asm           |  2 +-
 audio/sfx/battle_29.asm           |  2 +-
 audio/sfx/battle_2a.asm           |  4 +--
 audio/sfx/battle_2b.asm           |  2 +-
 audio/sfx/battle_2c.asm           |  4 +--
 audio/sfx/battle_2e.asm           |  2 +-
 audio/sfx/battle_2f.asm           |  4 +--
 audio/sfx/battle_34.asm           |  4 +--
 audio/sfx/battle_36.asm           |  2 +-
 audio/sfx/cry00_1.asm             |  4 +--
 audio/sfx/cry00_2.asm             |  4 +--
 audio/sfx/cry00_3.asm             |  4 +--
 audio/sfx/cry01_1.asm             |  4 +--
 audio/sfx/cry01_2.asm             |  4 +--
 audio/sfx/cry01_3.asm             |  4 +--
 audio/sfx/cry02_1.asm             |  2 +-
 audio/sfx/cry02_2.asm             |  2 +-
 audio/sfx/cry02_3.asm             |  2 +-
 audio/sfx/cry03_1.asm             |  4 +--
 audio/sfx/cry03_2.asm             |  4 +--
 audio/sfx/cry03_3.asm             |  4 +--
 audio/sfx/cry04_1.asm             |  4 +--
 audio/sfx/cry04_2.asm             |  4 +--
 audio/sfx/cry04_3.asm             |  4 +--
 audio/sfx/cry05_1.asm             |  4 +--
 audio/sfx/cry05_2.asm             |  4 +--
 audio/sfx/cry05_3.asm             |  4 +--
 audio/sfx/cry06_1.asm             |  2 +-
 audio/sfx/cry06_2.asm             |  2 +-
 audio/sfx/cry06_3.asm             |  2 +-
 audio/sfx/cry07_1.asm             |  4 +--
 audio/sfx/cry07_2.asm             |  4 +--
 audio/sfx/cry07_3.asm             |  4 +--
 audio/sfx/cry08_1.asm             |  4 +--
 audio/sfx/cry08_2.asm             |  4 +--
 audio/sfx/cry08_3.asm             |  4 +--
 audio/sfx/cry09_1.asm             |  8 ++---
 audio/sfx/cry09_2.asm             |  8 ++---
 audio/sfx/cry09_3.asm             |  8 ++---
 audio/sfx/cry0a_1.asm             |  4 +--
 audio/sfx/cry0a_2.asm             |  4 +--
 audio/sfx/cry0a_3.asm             |  4 +--
 audio/sfx/cry0b_1.asm             |  4 +--
 audio/sfx/cry0b_2.asm             |  4 +--
 audio/sfx/cry0b_3.asm             |  4 +--
 audio/sfx/cry0c_1.asm             |  4 +--
 audio/sfx/cry0c_2.asm             |  4 +--
 audio/sfx/cry0c_3.asm             |  4 +--
 audio/sfx/cry0d_1.asm             |  4 +--
 audio/sfx/cry0d_2.asm             |  4 +--
 audio/sfx/cry0d_3.asm             |  4 +--
 audio/sfx/cry0e_1.asm             |  4 +--
 audio/sfx/cry0e_2.asm             |  4 +--
 audio/sfx/cry0e_3.asm             |  4 +--
 audio/sfx/cry0f_1.asm             |  4 +--
 audio/sfx/cry0f_2.asm             |  4 +--
 audio/sfx/cry0f_3.asm             |  4 +--
 audio/sfx/cry10_1.asm             |  4 +--
 audio/sfx/cry10_2.asm             |  4 +--
 audio/sfx/cry10_3.asm             |  4 +--
 audio/sfx/cry11_1.asm             |  4 +--
 audio/sfx/cry11_2.asm             |  4 +--
 audio/sfx/cry11_3.asm             |  4 +--
 audio/sfx/cry12_1.asm             |  4 +--
 audio/sfx/cry12_2.asm             |  4 +--
 audio/sfx/cry12_3.asm             |  4 +--
 audio/sfx/cry13_1.asm             |  4 +--
 audio/sfx/cry13_2.asm             |  4 +--
 audio/sfx/cry13_3.asm             |  4 +--
 audio/sfx/cry14_1.asm             |  4 +--
 audio/sfx/cry14_2.asm             |  4 +--
 audio/sfx/cry14_3.asm             |  4 +--
 audio/sfx/cry15_1.asm             |  4 +--
 audio/sfx/cry15_2.asm             |  4 +--
 audio/sfx/cry15_3.asm             |  4 +--
 audio/sfx/cry16_1.asm             |  4 +--
 audio/sfx/cry16_2.asm             |  4 +--
 audio/sfx/cry16_3.asm             |  4 +--
 audio/sfx/cry17_1.asm             |  4 +--
 audio/sfx/cry17_2.asm             |  4 +--
 audio/sfx/cry17_3.asm             |  4 +--
 audio/sfx/cry18_1.asm             |  4 +--
 audio/sfx/cry18_2.asm             |  4 +--
 audio/sfx/cry18_3.asm             |  4 +--
 audio/sfx/cry19_1.asm             |  4 +--
 audio/sfx/cry19_2.asm             |  4 +--
 audio/sfx/cry19_3.asm             |  4 +--
 audio/sfx/cry1a_1.asm             |  4 +--
 audio/sfx/cry1a_2.asm             |  4 +--
 audio/sfx/cry1a_3.asm             |  4 +--
 audio/sfx/cry1b_1.asm             |  4 +--
 audio/sfx/cry1b_2.asm             |  4 +--
 audio/sfx/cry1b_3.asm             |  4 +--
 audio/sfx/cry1c_1.asm             |  4 +--
 audio/sfx/cry1c_2.asm             |  4 +--
 audio/sfx/cry1c_3.asm             |  4 +--
 audio/sfx/cry1d_1.asm             |  4 +--
 audio/sfx/cry1d_2.asm             |  4 +--
 audio/sfx/cry1d_3.asm             |  4 +--
 audio/sfx/cry1e_1.asm             |  4 +--
 audio/sfx/cry1e_2.asm             |  4 +--
 audio/sfx/cry1e_3.asm             |  4 +--
 audio/sfx/cry1f_1.asm             |  4 +--
 audio/sfx/cry1f_2.asm             |  4 +--
 audio/sfx/cry1f_3.asm             |  4 +--
 audio/sfx/cry20_1.asm             |  4 +--
 audio/sfx/cry20_2.asm             |  4 +--
 audio/sfx/cry20_3.asm             |  4 +--
 audio/sfx/cry21_1.asm             |  4 +--
 audio/sfx/cry21_2.asm             |  4 +--
 audio/sfx/cry21_3.asm             |  4 +--
 audio/sfx/cry22_1.asm             |  4 +--
 audio/sfx/cry22_2.asm             |  4 +--
 audio/sfx/cry22_3.asm             |  4 +--
 audio/sfx/cry23_1.asm             |  4 +--
 audio/sfx/cry23_2.asm             |  4 +--
 audio/sfx/cry23_3.asm             |  4 +--
 audio/sfx/cry24_1.asm             |  4 +--
 audio/sfx/cry24_2.asm             |  4 +--
 audio/sfx/cry24_3.asm             |  4 +--
 audio/sfx/cry25_1.asm             |  4 +--
 audio/sfx/cry25_2.asm             |  4 +--
 audio/sfx/cry25_3.asm             |  4 +--
 audio/sfx/psybeam.asm             |  4 +--
 audio/sfx/shooting_star.asm       |  2 +-
 audio/sfx/unused_1.asm            |  4 +--
 audio/sfx/unused_2.asm            |  4 +--
 audio/sfx/unused_3.asm            |  4 +--
 macros/audio_macros.asm           | 69 ++++++++++++++++++++++++++++-----------
 150 files changed, 362 insertions(+), 331 deletions(-)

(limited to 'macros')

diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm
index 43c8618e..ef293f54 100644
--- a/audio/music/bikeriding.asm
+++ b/audio/music/bikeriding.asm
@@ -114,7 +114,7 @@ Music_BikeRiding_branch_7dbc9::
 	note B_, 1
 	octave 4
 	note C_, 4
-	note_type 12, 3, 13
+	note_type 12, 3, -5
 	note C_, 4
 	note_type 12, 11, 4
 	note F_, 6
diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm
index b64fc6dd..5f03fc51 100644
--- a/audio/music/celadon.asm
+++ b/audio/music/celadon.asm
@@ -3,7 +3,7 @@ Music_Celadon_Ch1::
 	volume 7, 7
 	duty_cycle 3
 	toggle_perfect_pitch
-	note_type 12, 2, 15
+	note_type 12, 2, -7
 	rest 8
 	octave 3
 	note D_, 8
diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm
index 94c9eae3..159bf42b 100644
--- a/audio/music/defeatedgymleader.asm
+++ b/audio/music/defeatedgymleader.asm
@@ -287,7 +287,7 @@ Music_DefeatedGymLeader_branch_23d84::
 	note G_, 6
 	note E_, 1
 	note G_, 1
-	note_type 12, 6, 15
+	note_type 12, 6, -7
 	octave 4
 	note C#, 8
 	note_type 12, 12, 7
@@ -318,7 +318,7 @@ Music_DefeatedGymLeader_branch_23d84::
 	note B_, 6
 	note G#, 1
 	note B_, 1
-	note_type 12, 4, 15
+	note_type 12, 4, -7
 	octave 4
 	note E_, 8
 	note_type 12, 11, 0
diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm
index 996a3ea6..76b8d168 100644
--- a/audio/music/dungeon1.asm
+++ b/audio/music/dungeon1.asm
@@ -4,12 +4,12 @@ Music_Dungeon1_Ch1::
 	duty_cycle 3
 	toggle_perfect_pitch
 	vibrato 10, 1, 4
-	note_type 12, 4, 13
+	note_type 12, 4, -5
 	rest 8
-	stereo_panning 237
+	stereo_panning %1110, %1101
 	octave 4
 	note F#, 8
-	stereo_panning 255
+	stereo_panning %1111, %1111
 
 Music_Dungeon1_branch_7dee5::
 	note_type 12, 11, 2
@@ -229,10 +229,10 @@ Music_Dungeon1_branch_7dfd5::
 Music_Dungeon1_Ch2::
 	vibrato 11, 1, 5
 	duty_cycle 3
-	note_type 12, 0, 15
+	note_type 12, 0, -7
 	octave 4
 	note G#, 8
-	note_type 12, 4, 13
+	note_type 12, 4, -5
 	octave 5
 	note D_, 8
 
diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm
index 86cb7ad2..e213e2a4 100644
--- a/audio/music/dungeon2.asm
+++ b/audio/music/dungeon2.asm
@@ -52,7 +52,7 @@ Music_Dungeon2_branch_7e892::
 	note A_, 4
 	note F#, 2
 	sound_loop 2, Music_Dungeon2_branch_7e892
-	note_type 12, 1, 15
+	note_type 12, 1, -7
 	octave 3
 	note E_, 16
 	note C_, 16
diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm
index 19fc01e5..6dec6bbb 100644
--- a/audio/music/finalbattle.asm
+++ b/audio/music/finalbattle.asm
@@ -147,7 +147,7 @@ Music_FinalBattle_branch_23429::
 	note F_, 4
 	note F#, 12
 	note A#, 4
-	note_type 12, 5, 14
+	note_type 12, 5, -6
 	note B_, 12
 	note_type 12, 11, 2
 	note E_, 3
@@ -475,7 +475,7 @@ Music_FinalBattle_Ch2::
 	octave 4
 	note E_, 1
 	note E_, 3
-	note_type 12, 4, 10
+	note_type 12, 4, -2
 	octave 3
 	note G#, 4
 
@@ -634,7 +634,7 @@ Music_FinalBattle_branch_235e6::
 	note F#, 12
 	note_type 12, 12, 7
 	note F#, 4
-	note_type 12, 1, 15
+	note_type 12, 1, -7
 	octave 3
 	note F#, 8
 	note_type 12, 9, 0
@@ -686,7 +686,7 @@ Music_FinalBattle_branch_235e6::
 	note_type 12, 12, 7
 	octave 4
 	note D_, 8
-	note_type 12, 4, 12
+	note_type 12, 4, -4
 	note C_, 8
 	note_type 12, 13, 7
 	note E_, 8
@@ -696,7 +696,7 @@ Music_FinalBattle_branch_235e6::
 	note B_, 8
 	note A#, 4
 	note B_, 12
-	note_type 12, 5, 13
+	note_type 12, 5, -5
 	octave 4
 	note D_, 8
 	note_type 12, 12, 0
diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm
index cebda01b..5befd665 100644
--- a/audio/music/gymleaderbattle.asm
+++ b/audio/music/gymleaderbattle.asm
@@ -779,7 +779,7 @@ Music_GymLeaderBattle_branch_225e0::
 	note_type 12, 11, 0
 	octave 3
 	note B_, 16
-	note_type 12, 3, 15
+	note_type 12, 3, -7
 	octave 4
 	note F#, 16
 	note_type 12, 12, 3
diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm
index d237a329..d341ecd6 100644
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -68,7 +68,7 @@ Music_IndigoPlateau_branch_a605::
 	note_type 12, 11, 7
 	octave 3
 	note F_, 8
-	note_type 12, 4, 14
+	note_type 12, 4, -6
 	octave 2
 	note A#, 8
 	sound_loop 0, Music_IndigoPlateau_branch_a605
@@ -95,7 +95,7 @@ Music_IndigoPlateau_Ch2::
 	note D_, 8
 	note D_, 8
 	note D_, 4
-	note_type 12, 5, 10
+	note_type 12, 5, -2
 	note D#, 4
 
 Music_IndigoPlateau_branch_a673::
@@ -129,7 +129,7 @@ Music_IndigoPlateau_branch_a673::
 	note D_, 8
 	octave 4
 	note C_, 8
-	note_type 12, 4, 13
+	note_type 12, 4, -5
 	octave 4
 	note D#, 8
 	sound_loop 0, Music_IndigoPlateau_branch_a673
diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm
index fdea3ee1..b2709b76 100644
--- a/audio/music/introbattle.asm
+++ b/audio/music/introbattle.asm
@@ -42,7 +42,7 @@ Music_IntroBattle_Ch1::
 	octave 2
 	note A_, 2
 	note A_, 2
-	note_type 12, 2, 9
+	note_type 12, 2, -1
 	octave 3
 	note G_, 4
 	note_type 12, 11, 0
@@ -52,7 +52,7 @@ Music_IntroBattle_Ch1::
 	note_type 12, 11, 7
 	octave 3
 	note F_, 8
-	note_type 12, 4, 15
+	note_type 12, 4, -7
 	octave 2
 	note F_, 8
 	note_type 12, 11, 1
@@ -157,7 +157,7 @@ Music_IntroBattle_Ch2::
 	note_type 12, 12, 5
 	octave 4
 	note C#, 4
-	note_type 12, 2, 15
+	note_type 12, 2, -7
 	note D_, 16
 	note_type 12, 12, 1
 	octave 5
diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm
index 3c0d5234..d8995fbd 100644
--- a/audio/music/jigglypuffsong.asm
+++ b/audio/music/jigglypuffsong.asm
@@ -3,7 +3,7 @@ Music_JigglypuffSong_Ch1::
 	volume 7, 7
 	vibrato 8, 2, 4
 	duty_cycle 2
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	toggle_perfect_pitch
 	note_type 13, 6, 7
 	octave 4
@@ -24,7 +24,7 @@ Music_JigglypuffSong_Ch1::
 Music_JigglypuffSong_Ch2::
 	vibrato 5, 1, 5
 	duty_cycle 2
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	note_type 12, 10, 7
 	octave 4
 	note E_, 8
diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm
index eb4f05ae..eb7b5944 100644
--- a/audio/music/meeteviltrainer.asm
+++ b/audio/music/meeteviltrainer.asm
@@ -8,7 +8,7 @@ Music_MeetEvilTrainer_Ch1::
 	octave 3
 	note D_, 2
 	note C#, 2
-	note_type 12, 4, 15
+	note_type 12, 4, -7
 	note D_, 4
 
 Music_MeetEvilTrainer_branch_7f6ae::
@@ -42,7 +42,7 @@ Music_MeetEvilTrainer_branch_7f6c2::
 	note B_, 4
 	note B_, 4
 	note B_, 4
-	note_type 12, 4, 15
+	note_type 12, 4, -7
 	note A#, 4
 	note_type 12, 12, 2
 	note G_, 2
@@ -54,7 +54,7 @@ Music_MeetEvilTrainer_branch_7f6c2::
 	note B_, 4
 	note B_, 4
 	note B_, 4
-	note_type 12, 3, 15
+	note_type 12, 3, -7
 	note A#, 4
 	note_type 12, 12, 2
 	sound_loop 0, Music_MeetEvilTrainer_branch_7f6c2
diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm
index f3b78d38..2fe9e4ce 100644
--- a/audio/music/pkmnhealed.asm
+++ b/audio/music/pkmnhealed.asm
@@ -5,16 +5,16 @@ Music_PkmnHealed_Ch1::
 	toggle_perfect_pitch
 	note_type 12, 8, 1
 	rest 2
-	pitch_slide 0, 75
+	pitch_slide 1, 4, B_
 	note B_, 2
-	pitch_slide 0, 84
+	pitch_slide 1, 3, E_
 	note B_, 2
-	pitch_slide 0, 68
+	pitch_slide 1, 4, E_
 	note E_, 2
 	rest 4
-	pitch_slide 0, 59
+	pitch_slide 1, 5, B_
 	note E_, 4
-	pitch_slide 0, 75
+	pitch_slide 1, 4, B_
 	note B_, 4
 	sound_ret
 
diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm
index 8f78c613..ef3a3b88 100644
--- a/audio/music/pokemontower.asm
+++ b/audio/music/pokemontower.asm
@@ -236,7 +236,7 @@ Music_PokemonTower_branch_7f0ee::
 	note A_, 4
 	note G#, 4
 	note F#, 4
-	note_type 12, 2, 15
+	note_type 12, 2, -7
 	octave 5
 	note D_, 16
 	note_type 12, 12, 0
diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm
index 0cd4e769..d83ec8c0 100644
--- a/audio/music/routes3.asm
+++ b/audio/music/routes3.asm
@@ -69,7 +69,7 @@ Music_Routes3_branch_9fc3::
 	note A_, 4
 	note F_, 4
 	note A_, 4
-	note_type 8, 4, 15
+	note_type 8, 4, -7
 	note A_, 12
 	note_type 8, 9, 0
 	note F_, 12
diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm
index 41bc9e04..962cd36b 100644
--- a/audio/music/routes4.asm
+++ b/audio/music/routes4.asm
@@ -9,7 +9,7 @@ Music_Routes4_Ch1::
 	note G#, 4
 	note G#, 4
 	note G#, 4
-	note_type 12, 7, 15
+	note_type 12, 7, -7
 	note G#, 4
 	note_type 12, 10, 2
 	note G#, 4
@@ -223,7 +223,7 @@ Music_Routes4_branch_a325::
 	note G#, 6
 	note_type 12, 7, 0
 	note G#, 6
-	note_type 12, 6, 15
+	note_type 12, 6, -7
 	note G#, 6
 	note_type 12, 12, 7
 	note G#, 4
@@ -233,7 +233,7 @@ Music_Routes4_branch_a325::
 	note F#, 4
 	note_type 8, 9, 0
 	note F#, 6
-	note_type 8, 7, 15
+	note_type 8, 7, -7
 	note F#, 6
 	duty_cycle 0
 	note_type 8, 9, 0
diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm
index 083d077a..0ca2f71a 100644
--- a/audio/music/safarizone.asm
+++ b/audio/music/safarizone.asm
@@ -6,13 +6,13 @@ Music_SafariZone_Ch1::
 	duty_cycle 2
 	note_type 12, 9, 2
 	octave 3
-	pitch_slide 0, 73
+	pitch_slide 1, 4, A_
 	note C_, 1
-	pitch_slide 0, 73
+	pitch_slide 1, 4, A_
 	note G_, 1
-	pitch_slide 0, 73
+	pitch_slide 1, 4, A_
 	note C_, 1
-	pitch_slide 0, 73
+	pitch_slide 1, 4, A_
 	note G_, 1
 	rest 4
 	duty_cycle 3
diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm
index 58af9209..3c7512ba 100644
--- a/audio/music/silphco.asm
+++ b/audio/music/silphco.asm
@@ -292,7 +292,7 @@ Music_SilphCo_branch_7f26d::
 	note A#, 1
 	octave 3
 	note C_, 1
-	note_type 6, 3, 15
+	note_type 6, 3, -7
 	note C_, 16
 	note_type 6, 10, 0
 	note C_, 11
@@ -303,7 +303,7 @@ Music_SilphCo_branch_7f26d::
 	note G#, 1
 	note F#, 1
 	note E_, 1
-	note_type 6, 3, 15
+	note_type 6, 3, -7
 	note E_, 16
 	note_type 6, 9, 0
 	note E_, 11
@@ -314,7 +314,7 @@ Music_SilphCo_branch_7f26d::
 	octave 3
 	note C_, 1
 	note D_, 1
-	note_type 6, 3, 15
+	note_type 6, 3, -7
 	note D_, 16
 	note_type 6, 10, 7
 	note D_, 11
@@ -477,7 +477,7 @@ Music_SilphCo_branch_7f42e::
 	note D_, 8
 	note D#, 8
 	duty_cycle 3
-	note_type 6, 6, 15
+	note_type 6, 6, -7
 	note E_, 16
 	note_type 6, 12, 0
 	note B_, 16
@@ -528,7 +528,7 @@ Music_SilphCo_branch_7f42e::
 	note F_, 8
 	note_type 6, 11, 7
 	note F_, 8
-	note_type 6, 8, 10
+	note_type 6, 8, -2
 	note F_, 4
 	note_type 6, 12, 4
 	duty_cycle 3
@@ -539,7 +539,7 @@ Music_SilphCo_branch_7f42e::
 	note F#, 8
 	note_type 6, 11, 0
 	note F#, 8
-	note_type 6, 9, 9
+	note_type 6, 9, -1
 	note F#, 4
 	note_type 6, 12, 4
 	note F#, 4
@@ -547,7 +547,7 @@ Music_SilphCo_branch_7f42e::
 	note F#, 4
 	note_type 6, 9, 0
 	note G_, 12
-	note_type 6, 5, 9
+	note_type 6, 5, -1
 	note G_, 8
 	note_type 6, 12, 4
 	note G_, 4
@@ -766,7 +766,7 @@ Music_SilphCo_branch_7f42e::
 	note_type 6, 8, 3
 	note G_, 2
 	rest 6
-	note_type 6, 4, 15
+	note_type 6, 4, -7
 	note G#, 8
 	note_type 6, 11, 4
 	note G_, 2
diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm
index c12bd1de..b814cba3 100644
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -237,7 +237,7 @@ Music_TitleScreen_branch_7e594::
 	note G_, 8
 	vibrato 16, 2, 6
 	duty_cycle 3
-	note_type 12, 0, 11
+	note_type 12, 0, -3
 	note G_, 8
 	note_type 12, 14, 7
 	note A_, 8
@@ -383,14 +383,14 @@ Music_TitleScreen_branch_7e664::
 	note A_, 3
 	sound_call Music_TitleScreen_branch_7e6e5
 	octave 5
-	pitch_slide 0, 66
+	pitch_slide 1, 4, D_
 	note D_, 4
 	rest 4
 	octave 6
-	pitch_slide 0, 50
+	pitch_slide 1, 5, D_
 	note D_, 4
 	octave 5
-	pitch_slide 0, 66
+	pitch_slide 1, 4, D_
 	note D_, 4
 	rest 2
 	note_type 8, 1, 0
@@ -400,11 +400,11 @@ Music_TitleScreen_branch_7e664::
 	note C#, 4
 	sound_call Music_TitleScreen_branch_7e6e5
 	octave 6
-	pitch_slide 0, 50
+	pitch_slide 1, 5, D_
 	note D_, 4
 	rest 4
 	octave 5
-	pitch_slide 0, 66
+	pitch_slide 1, 4, D_
 	note D_, 4
 	rest 6
 	note_type 8, 1, 0
diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm
index 17e82ea9..ba5d6d1b 100644
--- a/audio/music/trainerbattle.asm
+++ b/audio/music/trainerbattle.asm
@@ -735,7 +735,7 @@ Music_TrainerBattle_branch_22bfc::
 	note C_, 8
 	note_type 12, 3, 0
 	note C_, 8
-	note_type 12, 4, 14
+	note_type 12, 4, -6
 	note C_, 8
 	note_type 12, 12, 7
 	note C_, 8
@@ -827,7 +827,7 @@ Music_TrainerBattle_branch_22bfc::
 	note B_, 8
 	note_type 12, 6, 0
 	note B_, 8
-	note_type 12, 6, 9
+	note_type 12, 6, -1
 	note B_, 6
 	note_type 12, 9, 6
 	note B_, 6
diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm
index 582b55eb..f7cfab14 100644
--- a/audio/music/wildbattle.asm
+++ b/audio/music/wildbattle.asm
@@ -50,7 +50,7 @@ Music_WildBattle_Ch1::
 	note C#, 14
 	note E_, 6
 	note D#, 10
-	note_type 12, 4, 15
+	note_type 12, 4, -7
 	note C#, 10
 	note_type 12, 11, 1
 	note G_, 6
@@ -279,7 +279,7 @@ Music_WildBattle_branch_230e0::
 	note_type 12, 11, 7
 	octave 4
 	note C_, 16
-	note_type 12, 3, 15
+	note_type 12, 3, -7
 	note G_, 16
 	note_type 12, 11, 5
 	octave 3
@@ -416,7 +416,7 @@ Music_WildBattle_branch_23225::
 	note G#, 16
 	note_type 12, 11, 0
 	note G#, 16
-	note_type 12, 4, 14
+	note_type 12, 4, -6
 	note G_, 16
 	note_type 12, 12, 7
 	note G_, 16
@@ -438,7 +438,7 @@ Music_WildBattle_branch_23225::
 	note F_, 8
 	note_type 12, 12, 0
 	note G_, 16
-	note_type 12, 3, 15
+	note_type 12, 3, -7
 	octave 5
 	note C_, 16
 	note_type 12, 12, 5
diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm
index 19ce5bf7..1b505811 100644
--- a/audio/sfx/battle_27.asm
+++ b/audio/sfx/battle_27.asm
@@ -10,7 +10,7 @@ SFX_Battle_27_branch_2062a:
 
 
 SFX_Battle_27_Ch6:
-	duty_cycle_pattern 179
+	duty_cycle_pattern 2, 3, 0, 3
 	square_note 15, 2, -7, 1992
 
 SFX_Battle_27_branch_2063d:
diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm
index 38646a09..467e411d 100644
--- a/audio/sfx/battle_28.asm
+++ b/audio/sfx/battle_28.asm
@@ -7,7 +7,7 @@ SFX_Battle_28_Ch5:
 
 
 SFX_Battle_28_Ch6:
-	duty_cycle_pattern 179
+	duty_cycle_pattern 2, 3, 0, 3
 	square_note 0, 14, 1, 1985
 	square_note 0, 14, 1, 1793
 	sound_loop 12, SFX_Battle_28_Ch6
diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm
index f0d27ca7..c3999ec8 100644
--- a/audio/sfx/battle_29.asm
+++ b/audio/sfx/battle_29.asm
@@ -1,5 +1,5 @@
 SFX_Battle_29_Ch5:
-	duty_cycle_pattern 201
+	duty_cycle_pattern 3, 0, 2, 1
 	square_note 11, 15, 3, 288
 	square_note 9, 13, 3, 336
 	sound_loop 5, SFX_Battle_29_Ch5
diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm
index ea4196a8..1faf2dda 100644
--- a/audio/sfx/battle_2a.asm
+++ b/audio/sfx/battle_2a.asm
@@ -1,5 +1,5 @@
 SFX_Battle_2A_Ch5:
-	duty_cycle_pattern 57
+	duty_cycle_pattern 0, 3, 2, 1
 	square_note 4, 15, 4, 1536
 	square_note 3, 12, 4, 1280
 	square_note 5, 11, 5, 1536
@@ -10,7 +10,7 @@ SFX_Battle_2A_Ch5:
 
 
 SFX_Battle_2A_Ch6:
-	duty_cycle_pattern 141
+	duty_cycle_pattern 2, 0, 3, 1
 	square_note 5, 14, 4, 1504
 	square_note 4, 11, 4, 1248
 	square_note 6, 10, 5, 1512
diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm
index b9b20d1d..d60a96f6 100644
--- a/audio/sfx/battle_2b.asm
+++ b/audio/sfx/battle_2b.asm
@@ -1,5 +1,5 @@
 SFX_Battle_2B_Ch5:
-	duty_cycle_pattern 210
+	duty_cycle_pattern 3, 1, 0, 2
 	square_note 3, 8, 1, 768
 	square_note 3, 12, 1, 1024
 	square_note 3, 15, 1, 1280
diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm
index c6d47413..7530210f 100644
--- a/audio/sfx/battle_2c.asm
+++ b/audio/sfx/battle_2c.asm
@@ -1,5 +1,5 @@
 SFX_Battle_2C_Ch5:
-	duty_cycle_pattern 57
+	duty_cycle_pattern 0, 3, 2, 1
 	square_note 15, 15, 4, 1280
 	square_note 15, 12, 4, 1024
 	square_note 15, 14, 2, 1472
@@ -8,7 +8,7 @@ SFX_Battle_2C_Ch5:
 
 
 SFX_Battle_2C_Ch6:
-	duty_cycle_pattern 141
+	duty_cycle_pattern 2, 0, 3, 1
 	square_note 7, 14, 4, 1072
 	square_note 15, 11, 4, 816
 	square_note 15, 10, 2, 1080
diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm
index c509b8d5..ab5665fa 100644
--- a/audio/sfx/battle_2e.asm
+++ b/audio/sfx/battle_2e.asm
@@ -9,7 +9,7 @@ SFX_Battle_2E_Ch5:
 
 
 SFX_Battle_2E_Ch6:
-	duty_cycle_pattern 179
+	duty_cycle_pattern 2, 3, 0, 3
 	square_note 2, 14, 1, 770
 	square_note 3, 14, 1, 2034
 	square_note 4, 14, 1, 1538
diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm
index a3138abb..dd80e599 100644
--- a/audio/sfx/battle_2f.asm
+++ b/audio/sfx/battle_2f.asm
@@ -1,5 +1,5 @@
 SFX_Battle_2F_Ch5:
-	duty_cycle_pattern 43
+	duty_cycle_pattern 0, 2, 2, 3
 	square_note 3, 15, 1, 2032
 	square_note 4, 15, 2, 512
 	sound_loop 8, SFX_Battle_2F_Ch5
@@ -7,7 +7,7 @@ SFX_Battle_2F_Ch5:
 
 
 SFX_Battle_2F_Ch6:
-	duty_cycle_pattern 179
+	duty_cycle_pattern 2, 3, 0, 3
 	square_note 4, 14, 2, 514
 	square_note 4, 14, 1, 2018
 	sound_loop 9, SFX_Battle_2F_Ch6
diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm
index 4abbdbc3..654049e4 100644
--- a/audio/sfx/battle_34.asm
+++ b/audio/sfx/battle_34.asm
@@ -1,5 +1,5 @@
 SFX_Battle_34_Ch5:
-	duty_cycle_pattern 237
+	duty_cycle_pattern 3, 2, 3, 1
 	square_note 8, 15, -7, 1016
 	square_note 15, 15, -7, 1024
 	square_note 15, 15, 3, 1024
@@ -7,7 +7,7 @@ SFX_Battle_34_Ch5:
 
 
 SFX_Battle_34_Ch6:
-	duty_cycle_pattern 180
+	duty_cycle_pattern 2, 3, 1, 0
 	square_note 8, 14, -7, 960
 	square_note 15, 14, -7, 960
 	square_note 15, 14, 3, 960
diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm
index 2fd40bd3..773bf753 100644
--- a/audio/sfx/battle_36.asm
+++ b/audio/sfx/battle_36.asm
@@ -21,7 +21,7 @@ SFX_Battle_36_branch_20930:
 
 
 SFX_Battle_36_Ch6:
-	duty_cycle_pattern 179
+	duty_cycle_pattern 2, 3, 0, 3
 	square_note 2, 15, 1, 1921
 	square_note 2, 15, 1, 1793
 	square_note 2, 15, 1, 1937
diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm
index 087ea06f..22a41634 100644
--- a/audio/sfx/cry00_1.asm
+++ b/audio/sfx/cry00_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry00_1_Ch5:
-	duty_cycle_pattern 245
+	duty_cycle_pattern 3, 3, 1, 1
 	square_note 4, 15, 3, 1816
 	square_note 15, 14, 5, 1944
 	square_note 8, 9, 1, 1880
@@ -7,7 +7,7 @@ SFX_Cry00_1_Ch5:
 
 
 SFX_Cry00_1_Ch6:
-	duty_cycle_pattern 160
+	duty_cycle_pattern 2, 2, 0, 0
 	square_note 5, 11, 3, 1800
 	square_note 15, 12, 5, 1928
 	square_note 8, 7, 1, 1864
diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm
index 0469948a..97d17e8f 100644
--- a/audio/sfx/cry00_2.asm
+++ b/audio/sfx/cry00_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry00_2_Ch5:
-	duty_cycle_pattern 245
+	duty_cycle_pattern 3, 3, 1, 1
 	square_note 4, 15, 3, 1816
 	square_note 15, 14, 5, 1944
 	square_note 8, 9, 1, 1880
@@ -7,7 +7,7 @@ SFX_Cry00_2_Ch5:
 
 
 SFX_Cry00_2_Ch6:
-	duty_cycle_pattern 160
+	duty_cycle_pattern 2, 2, 0, 0
 	square_note 5, 11, 3, 1800
 	square_note 15, 12, 5, 1928
 	square_note 8, 7, 1, 1864
diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm
index f0389adf..e332c35e 100644
--- a/audio/sfx/cry00_3.asm
+++ b/audio/sfx/cry00_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry00_3_Ch5:
-	duty_cycle_pattern 245
+	duty_cycle_pattern 3, 3, 1, 1
 	square_note 4, 15, 3, 1816
 	square_note 15, 14, 5, 1944
 	square_note 8, 9, 1, 1880
@@ -7,7 +7,7 @@ SFX_Cry00_3_Ch5:
 
 
 SFX_Cry00_3_Ch6:
-	duty_cycle_pattern 160
+	duty_cycle_pattern 2, 2, 0, 0
 	square_note 5, 11, 3, 1800
 	square_note 15, 12, 5, 1928
 	square_note 8, 7, 1, 1864
diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm
index 4f4ec4fa..cb35392b 100644
--- a/audio/sfx/cry01_1.asm
+++ b/audio/sfx/cry01_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry01_1_Ch5:
-	duty_cycle_pattern 160
+	duty_cycle_pattern 2, 2, 0, 0
 	square_note 4, 15, 3, 1536
 	square_note 8, 13, 5, 1888
 	square_note 3, 14, 2, 1824
@@ -8,7 +8,7 @@ SFX_Cry01_1_Ch5:
 
 
 SFX_Cry01_1_Ch6:
-	duty_cycle_pattern 90
+	duty_cycle_pattern 1, 1, 2, 2
 	square_note 5, 11, 3, 1777
 	square_note 7, 12, 5, 1874
 	square_note 3, 10, 2, 1809
diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm
index 55be1d01..449adac7 100644
--- a/audio/sfx/cry01_2.asm
+++ b/audio/sfx/cry01_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry01_2_Ch5:
-	duty_cycle_pattern 160
+	duty_cycle_pattern 2, 2, 0, 0
 	square_note 4, 15, 3, 1536
 	square_note 8, 13, 5, 1888
 	square_note 3, 14, 2, 1824
@@ -8,7 +8,7 @@ SFX_Cry01_2_Ch5:
 
 
 SFX_Cry01_2_Ch6:
-	duty_cycle_pattern 90
+	duty_cycle_pattern 1, 1, 2, 2
 	square_note 5, 11, 3, 1777
 	square_note 7, 12, 5, 1874
 	square_note 3, 10, 2, 1809
diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm
index f89ed321..ef8e5e8c 100644
--- a/audio/sfx/cry01_3.asm
+++ b/audio/sfx/cry01_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry01_3_Ch5:
-	duty_cycle_pattern 160
+	duty_cycle_pattern 2, 2, 0, 0
 	square_note 4, 15, 3, 1536
 	square_note 8, 13, 5, 1888
 	square_note 3, 14, 2, 1824
@@ -8,7 +8,7 @@ SFX_Cry01_3_Ch5:
 
 
 SFX_Cry01_3_Ch6:
-	duty_cycle_pattern 90
+	duty_cycle_pattern 1, 1, 2, 2
 	square_note 5, 11, 3, 1777
 	square_note 7, 12, 5, 1874
 	square_note 3, 10, 2, 1809
diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm
index c1eeac36..3db37e97 100644
--- a/audio/sfx/cry02_1.asm
+++ b/audio/sfx/cry02_1.asm
@@ -7,7 +7,7 @@ SFX_Cry02_1_Ch5:
 
 
 SFX_Cry02_1_Ch6:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 7, 9, 5, 1089
 	square_note 2, 8, 1, 1313
 	square_note 8, 6, 1, 1306
diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm
index f3718e57..a623e071 100644
--- a/audio/sfx/cry02_2.asm
+++ b/audio/sfx/cry02_2.asm
@@ -7,7 +7,7 @@ SFX_Cry02_2_Ch5:
 
 
 SFX_Cry02_2_Ch6:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 7, 9, 5, 1089
 	square_note 2, 8, 1, 1313
 	square_note 8, 6, 1, 1306
diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm
index 2334ae7f..4e0861d1 100644
--- a/audio/sfx/cry02_3.asm
+++ b/audio/sfx/cry02_3.asm
@@ -7,7 +7,7 @@ SFX_Cry02_3_Ch5:
 
 
 SFX_Cry02_3_Ch6:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 7, 9, 5, 1089
 	square_note 2, 8, 1, 1313
 	square_note 8, 6, 1, 1306
diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm
index 5cb3de34..cb58c394 100644
--- a/audio/sfx/cry03_1.asm
+++ b/audio/sfx/cry03_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry03_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 4, 15, 7, 1544
 	square_note 6, 14, 6, 1536
 	square_note 6, 13, 7, 1520
@@ -11,7 +11,7 @@ SFX_Cry03_1_Ch5:
 
 
 SFX_Cry03_1_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 4, 12, 7, 1284
 	square_note 6, 10, 6, 1282
 	square_note 6, 9, 7, 1265
diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm
index 208492c1..2813ce1a 100644
--- a/audio/sfx/cry03_2.asm
+++ b/audio/sfx/cry03_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry03_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 4, 15, 7, 1544
 	square_note 6, 14, 6, 1536
 	square_note 6, 13, 7, 1520
@@ -11,7 +11,7 @@ SFX_Cry03_2_Ch5:
 
 
 SFX_Cry03_2_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 4, 12, 7, 1284
 	square_note 6, 10, 6, 1282
 	square_note 6, 9, 7, 1265
diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm
index 11ed4afa..ae561a7a 100644
--- a/audio/sfx/cry03_3.asm
+++ b/audio/sfx/cry03_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry03_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 4, 15, 7, 1544
 	square_note 6, 14, 6, 1536
 	square_note 6, 13, 7, 1520
@@ -11,7 +11,7 @@ SFX_Cry03_3_Ch5:
 
 
 SFX_Cry03_3_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 4, 12, 7, 1284
 	square_note 6, 10, 6, 1282
 	square_note 6, 9, 7, 1265
diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm
index 7099c7cb..24662192 100644
--- a/audio/sfx/cry04_1.asm
+++ b/audio/sfx/cry04_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry04_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 4, 15, 7, 1696
 	square_note 8, 14, 6, 1700
 	square_note 4, 13, 6, 1696
@@ -11,7 +11,7 @@ SFX_Cry04_1_Ch5:
 
 
 SFX_Cry04_1_Ch6:
-	duty_cycle_pattern 90
+	duty_cycle_pattern 1, 1, 2, 2
 	square_note 4, 14, 7, 1537
 	square_note 8, 13, 6, 1539
 	square_note 4, 12, 6, 1537
diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm
index f2f2a0c7..f18fd9cd 100644
--- a/audio/sfx/cry04_2.asm
+++ b/audio/sfx/cry04_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry04_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 4, 15, 7, 1696
 	square_note 8, 14, 6, 1700
 	square_note 4, 13, 6, 1696
@@ -11,7 +11,7 @@ SFX_Cry04_2_Ch5:
 
 
 SFX_Cry04_2_Ch6:
-	duty_cycle_pattern 90
+	duty_cycle_pattern 1, 1, 2, 2
 	square_note 4, 14, 7, 1537
 	square_note 8, 13, 6, 1539
 	square_note 4, 12, 6, 1537
diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm
index 9e155fb4..718af40f 100644
--- a/audio/sfx/cry04_3.asm
+++ b/audio/sfx/cry04_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry04_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 4, 15, 7, 1696
 	square_note 8, 14, 6, 1700
 	square_note 4, 13, 6, 1696
@@ -11,7 +11,7 @@ SFX_Cry04_3_Ch5:
 
 
 SFX_Cry04_3_Ch6:
-	duty_cycle_pattern 90
+	duty_cycle_pattern 1, 1, 2, 2
 	square_note 4, 14, 7, 1537
 	square_note 8, 13, 6, 1539
 	square_note 4, 12, 6, 1537
diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm
index 8db2db6a..1c3fce20 100644
--- a/audio/sfx/cry05_1.asm
+++ b/audio/sfx/cry05_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry05_1_Ch5:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 6, 14, 2, 1280
 	square_note 6, 14, 3, 1408
 	square_note 6, 13, 3, 1392
@@ -8,7 +8,7 @@ SFX_Cry05_1_Ch5:
 
 
 SFX_Cry05_1_Ch6:
-	duty_cycle_pattern 245
+	duty_cycle_pattern 3, 3, 1, 1
 	square_note 6, 14, 2, 1154
 	square_note 6, 13, 3, 1281
 	square_note 6, 11, 2, 1250
diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm
index d9fe5208..53f076f2 100644
--- a/audio/sfx/cry05_2.asm
+++ b/audio/sfx/cry05_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry05_2_Ch5:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 6, 14, 2, 1280
 	square_note 6, 14, 3, 1408
 	square_note 6, 13, 3, 1392
@@ -8,7 +8,7 @@ SFX_Cry05_2_Ch5:
 
 
 SFX_Cry05_2_Ch6:
-	duty_cycle_pattern 245
+	duty_cycle_pattern 3, 3, 1, 1
 	square_note 6, 14, 2, 1154
 	square_note 6, 13, 3, 1281
 	square_note 6, 11, 2, 1250
diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm
index 57479f06..2d5b02b8 100644
--- a/audio/sfx/cry05_3.asm
+++ b/audio/sfx/cry05_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry05_3_Ch5:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 6, 14, 2, 1280
 	square_note 6, 14, 3, 1408
 	square_note 6, 13, 3, 1392
@@ -8,7 +8,7 @@ SFX_Cry05_3_Ch5:
 
 
 SFX_Cry05_3_Ch6:
-	duty_cycle_pattern 245
+	duty_cycle_pattern 3, 3, 1, 1
 	square_note 6, 14, 2, 1154
 	square_note 6, 13, 3, 1281
 	square_note 6, 11, 2, 1250
diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm
index 5b184121..03b75b0a 100644
--- a/audio/sfx/cry06_1.asm
+++ b/audio/sfx/cry06_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry06_1_Ch5:
-	duty_cycle_pattern 250
+	duty_cycle_pattern 3, 3, 2, 2
 	square_note 6, 8, 3, 583
 	square_note 15, 6, 2, 550
 	square_note 4, 5, 2, 581
diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm
index 3d32921b..6ddbfeb0 100644
--- a/audio/sfx/cry06_2.asm
+++ b/audio/sfx/cry06_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry06_2_Ch5:
-	duty_cycle_pattern 250
+	duty_cycle_pattern 3, 3, 2, 2
 	square_note 6, 8, 3, 583
 	square_note 15, 6, 2, 550
 	square_note 4, 5, 2, 581
diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm
index c847b1ab..d509053b 100644
--- a/audio/sfx/cry06_3.asm
+++ b/audio/sfx/cry06_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry06_3_Ch5:
-	duty_cycle_pattern 250
+	duty_cycle_pattern 3, 3, 2, 2
 	square_note 6, 8, 3, 583
 	square_note 15, 6, 2, 550
 	square_note 4, 5, 2, 581
diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm
index 5918d4d8..3733e746 100644
--- a/audio/sfx/cry07_1.asm
+++ b/audio/sfx/cry07_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry07_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 4, 15, 3, 1760
 	square_note 15, 14, 4, 1600
 	square_note 8, 12, 1, 1568
@@ -7,7 +7,7 @@ SFX_Cry07_1_Ch5:
 
 
 SFX_Cry07_1_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 3, 12, 3, 1667
 	square_note 14, 11, 4, 1538
 	square_note 8, 10, 1, 1537
diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm
index fcd82c8d..6a134397 100644
--- a/audio/sfx/cry07_2.asm
+++ b/audio/sfx/cry07_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry07_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 4, 15, 3, 1760
 	square_note 15, 14, 4, 1600
 	square_note 8, 12, 1, 1568
@@ -7,7 +7,7 @@ SFX_Cry07_2_Ch5:
 
 
 SFX_Cry07_2_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 3, 12, 3, 1667
 	square_note 14, 11, 4, 1538
 	square_note 8, 10, 1, 1537
diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm
index a92dd02b..a8b60f38 100644
--- a/audio/sfx/cry07_3.asm
+++ b/audio/sfx/cry07_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry07_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 4, 15, 3, 1760
 	square_note 15, 14, 4, 1600
 	square_note 8, 12, 1, 1568
@@ -7,7 +7,7 @@ SFX_Cry07_3_Ch5:
 
 
 SFX_Cry07_3_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 3, 12, 3, 1667
 	square_note 14, 11, 4, 1538
 	square_note 8, 10, 1, 1537
diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm
index 044f4add..92f17fa8 100644
--- a/audio/sfx/cry08_1.asm
+++ b/audio/sfx/cry08_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry08_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 15, 6, 1381
 	square_note 10, 14, 4, 1404
 	square_note 3, 12, 2, 1372
@@ -8,7 +8,7 @@ SFX_Cry08_1_Ch5:
 
 
 SFX_Cry08_1_Ch6:
-	duty_cycle_pattern 90
+	duty_cycle_pattern 1, 1, 2, 2
 	square_note 14, 13, 6, 1283
 	square_note 9, 11, 4, 1307
 	square_note 4, 9, 2, 1274
diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm
index 50da09d9..53ac2891 100644
--- a/audio/sfx/cry08_2.asm
+++ b/audio/sfx/cry08_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry08_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 15, 6, 1381
 	square_note 10, 14, 4, 1404
 	square_note 3, 12, 2, 1372
@@ -8,7 +8,7 @@ SFX_Cry08_2_Ch5:
 
 
 SFX_Cry08_2_Ch6:
-	duty_cycle_pattern 90
+	duty_cycle_pattern 1, 1, 2, 2
 	square_note 14, 13, 6, 1283
 	square_note 9, 11, 4, 1307
 	square_note 4, 9, 2, 1274
diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm
index b18c8b75..81bcf360 100644
--- a/audio/sfx/cry08_3.asm
+++ b/audio/sfx/cry08_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry08_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 15, 6, 1381
 	square_note 10, 14, 4, 1404
 	square_note 3, 12, 2, 1372
@@ -8,7 +8,7 @@ SFX_Cry08_3_Ch5:
 
 
 SFX_Cry08_3_Ch6:
-	duty_cycle_pattern 90
+	duty_cycle_pattern 1, 1, 2, 2
 	square_note 14, 13, 6, 1283
 	square_note 9, 11, 4, 1307
 	square_note 4, 9, 2, 1274
diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm
index 02206052..f8c600bd 100644
--- a/audio/sfx/cry09_1.asm
+++ b/audio/sfx/cry09_1.asm
@@ -1,9 +1,9 @@
 SFX_Cry09_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 15, 7, 1952
 	square_note 6, 14, 6, 1955
 	square_note 10, 15, 4, 1952
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 10, 15, 6, 2008
 	square_note 4, 14, 3, 2007
 	square_note 15, 15, 2, 2008
@@ -11,12 +11,12 @@ SFX_Cry09_1_Ch5:
 
 
 SFX_Cry09_1_Ch6:
-	duty_cycle_pattern 5
+	duty_cycle_pattern 0, 0, 1, 1
 	square_note 2, 0, 8, 0
 	square_note 15, 10, 7, 1697
 	square_note 6, 8, 6, 1698
 	square_note 10, 7, 4, 1697
-	duty_cycle_pattern 95
+	duty_cycle_pattern 1, 1, 3, 3
 	square_note 10, 7, 6, 1750
 	square_note 4, 8, 3, 1753
 	square_note 15, 10, 2, 1751
diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm
index 545a77cc..12965e07 100644
--- a/audio/sfx/cry09_2.asm
+++ b/audio/sfx/cry09_2.asm
@@ -1,9 +1,9 @@
 SFX_Cry09_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 15, 7, 1952
 	square_note 6, 14, 6, 1955
 	square_note 10, 15, 4, 1952
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 10, 15, 6, 2008
 	square_note 4, 14, 3, 2007
 	square_note 15, 15, 2, 2008
@@ -11,12 +11,12 @@ SFX_Cry09_2_Ch5:
 
 
 SFX_Cry09_2_Ch6:
-	duty_cycle_pattern 5
+	duty_cycle_pattern 0, 0, 1, 1
 	square_note 2, 0, 8, 0
 	square_note 15, 10, 7, 1697
 	square_note 6, 8, 6, 1698
 	square_note 10, 7, 4, 1697
-	duty_cycle_pattern 95
+	duty_cycle_pattern 1, 1, 3, 3
 	square_note 10, 7, 6, 1750
 	square_note 4, 8, 3, 1753
 	square_note 15, 10, 2, 1751
diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm
index d842066c..2c85d750 100644
--- a/audio/sfx/cry09_3.asm
+++ b/audio/sfx/cry09_3.asm
@@ -1,9 +1,9 @@
 SFX_Cry09_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 15, 7, 1952
 	square_note 6, 14, 6, 1955
 	square_note 10, 15, 4, 1952
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 10, 15, 6, 2008
 	square_note 4, 14, 3, 2007
 	square_note 15, 15, 2, 2008
@@ -11,12 +11,12 @@ SFX_Cry09_3_Ch5:
 
 
 SFX_Cry09_3_Ch6:
-	duty_cycle_pattern 5
+	duty_cycle_pattern 0, 0, 1, 1
 	square_note 2, 0, 8, 0
 	square_note 15, 10, 7, 1697
 	square_note 6, 8, 6, 1698
 	square_note 10, 7, 4, 1697
-	duty_cycle_pattern 95
+	duty_cycle_pattern 1, 1, 3, 3
 	square_note 10, 7, 6, 1750
 	square_note 4, 8, 3, 1753
 	square_note 15, 10, 2, 1751
diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm
index fa1a0c31..bcb71844 100644
--- a/audio/sfx/cry0a_1.asm
+++ b/audio/sfx/cry0a_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry0A_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 8, 15, 7, 1760
 	square_note 6, 14, 6, 1765
 	square_note 3, 15, 4, 1760
@@ -11,7 +11,7 @@ SFX_Cry0A_1_Ch5:
 
 
 SFX_Cry0A_1_Ch6:
-	duty_cycle_pattern 5
+	duty_cycle_pattern 0, 0, 1, 1
 	square_note 3, 0, 8, 0
 	square_note 8, 10, 7, 1697
 	square_note 6, 8, 6, 1699
diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm
index af07ff25..fb365e91 100644
--- a/audio/sfx/cry0a_2.asm
+++ b/audio/sfx/cry0a_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry0A_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 8, 15, 7, 1760
 	square_note 6, 14, 6, 1765
 	square_note 3, 15, 4, 1760
@@ -11,7 +11,7 @@ SFX_Cry0A_2_Ch5:
 
 
 SFX_Cry0A_2_Ch6:
-	duty_cycle_pattern 5
+	duty_cycle_pattern 0, 0, 1, 1
 	square_note 3, 0, 8, 0
 	square_note 8, 10, 7, 1697
 	square_note 6, 8, 6, 1699
diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm
index f0bb527a..bf6dfcf1 100644
--- a/audio/sfx/cry0a_3.asm
+++ b/audio/sfx/cry0a_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry0A_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 8, 15, 7, 1760
 	square_note 6, 14, 6, 1765
 	square_note 3, 15, 4, 1760
@@ -11,7 +11,7 @@ SFX_Cry0A_3_Ch5:
 
 
 SFX_Cry0A_3_Ch6:
-	duty_cycle_pattern 5
+	duty_cycle_pattern 0, 0, 1, 1
 	square_note 3, 0, 8, 0
 	square_note 8, 10, 7, 1697
 	square_note 6, 8, 6, 1699
diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm
index 9b2104aa..51e445ab 100644
--- a/audio/sfx/cry0b_1.asm
+++ b/audio/sfx/cry0b_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry0B_1_Ch5:
-	duty_cycle_pattern 204
+	duty_cycle_pattern 3, 0, 3, 0
 	square_note 4, 15, 1, 1792
 	square_note 4, 14, 1, 1920
 	square_note 4, 13, 1, 1856
@@ -14,7 +14,7 @@ SFX_Cry0B_1_Ch5:
 
 
 SFX_Cry0B_1_Ch6:
-	duty_cycle_pattern 68
+	duty_cycle_pattern 1, 0, 1, 0
 	square_note 12, 0, 8, 0
 	square_note 4, 15, 1, 1793
 	square_note 4, 14, 1, 1922
diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm
index 37e17243..68cb0ba6 100644
--- a/audio/sfx/cry0b_2.asm
+++ b/audio/sfx/cry0b_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry0B_2_Ch5:
-	duty_cycle_pattern 204
+	duty_cycle_pattern 3, 0, 3, 0
 	square_note 4, 15, 1, 1792
 	square_note 4, 14, 1, 1920
 	square_note 4, 13, 1, 1856
@@ -14,7 +14,7 @@ SFX_Cry0B_2_Ch5:
 
 
 SFX_Cry0B_2_Ch6:
-	duty_cycle_pattern 68
+	duty_cycle_pattern 1, 0, 1, 0
 	square_note 12, 0, 8, 0
 	square_note 4, 15, 1, 1793
 	square_note 4, 14, 1, 1922
diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm
index 9e788f53..3328a8b6 100644
--- a/audio/sfx/cry0b_3.asm
+++ b/audio/sfx/cry0b_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry0B_3_Ch5:
-	duty_cycle_pattern 204
+	duty_cycle_pattern 3, 0, 3, 0
 	square_note 4, 15, 1, 1792
 	square_note 4, 14, 1, 1920
 	square_note 4, 13, 1, 1856
@@ -14,7 +14,7 @@ SFX_Cry0B_3_Ch5:
 
 
 SFX_Cry0B_3_Ch6:
-	duty_cycle_pattern 68
+	duty_cycle_pattern 1, 0, 1, 0
 	square_note 12, 0, 8, 0
 	square_note 4, 15, 1, 1793
 	square_note 4, 14, 1, 1922
diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm
index 67f30936..a59f9e8d 100644
--- a/audio/sfx/cry0c_1.asm
+++ b/audio/sfx/cry0c_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry0C_1_Ch5:
-	duty_cycle_pattern 204
+	duty_cycle_pattern 3, 0, 3, 0
 	square_note 8, 15, 5, 1536
 	square_note 2, 13, 2, 1592
 	square_note 2, 12, 2, 1584
@@ -13,7 +13,7 @@ SFX_Cry0C_1_Ch5:
 
 
 SFX_Cry0C_1_Ch6:
-	duty_cycle_pattern 68
+	duty_cycle_pattern 1, 0, 1, 0
 	square_note 12, 12, 3, 1472
 	square_note 3, 11, 1, 1529
 	square_note 2, 10, 1, 1521
diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm
index dd1a90c1..5be195a9 100644
--- a/audio/sfx/cry0c_2.asm
+++ b/audio/sfx/cry0c_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry0C_2_Ch5:
-	duty_cycle_pattern 204
+	duty_cycle_pattern 3, 0, 3, 0
 	square_note 8, 15, 5, 1536
 	square_note 2, 13, 2, 1592
 	square_note 2, 12, 2, 1584
@@ -13,7 +13,7 @@ SFX_Cry0C_2_Ch5:
 
 
 SFX_Cry0C_2_Ch6:
-	duty_cycle_pattern 68
+	duty_cycle_pattern 1, 0, 1, 0
 	square_note 12, 12, 3, 1472
 	square_note 3, 11, 1, 1529
 	square_note 2, 10, 1, 1521
diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm
index 024bab85..f75f7a64 100644
--- a/audio/sfx/cry0c_3.asm
+++ b/audio/sfx/cry0c_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry0C_3_Ch5:
-	duty_cycle_pattern 204
+	duty_cycle_pattern 3, 0, 3, 0
 	square_note 8, 15, 5, 1536
 	square_note 2, 13, 2, 1592
 	square_note 2, 12, 2, 1584
@@ -13,7 +13,7 @@ SFX_Cry0C_3_Ch5:
 
 
 SFX_Cry0C_3_Ch6:
-	duty_cycle_pattern 68
+	duty_cycle_pattern 1, 0, 1, 0
 	square_note 12, 12, 3, 1472
 	square_note 3, 11, 1, 1529
 	square_note 2, 10, 1, 1521
diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm
index ac9963f2..3bd1c4e5 100644
--- a/audio/sfx/cry0d_1.asm
+++ b/audio/sfx/cry0d_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry0D_1_Ch5:
-	duty_cycle_pattern 136
+	duty_cycle_pattern 2, 0, 2, 0
 	square_note 5, 15, 2, 1616
 	square_note 9, 13, 1, 1632
 	square_note 5, 14, 2, 1554
@@ -11,7 +11,7 @@ SFX_Cry0D_1_Ch5:
 
 
 SFX_Cry0D_1_Ch6:
-	duty_cycle_pattern 64
+	duty_cycle_pattern 1, 0, 0, 0
 	square_note 4, 0, 8, 0
 	square_note 5, 15, 2, 1617
 	square_note 9, 13, 1, 1633
diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm
index 8c6dd050..1c57d5dc 100644
--- a/audio/sfx/cry0d_2.asm
+++ b/audio/sfx/cry0d_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry0D_2_Ch5:
-	duty_cycle_pattern 136
+	duty_cycle_pattern 2, 0, 2, 0
 	square_note 5, 15, 2, 1616
 	square_note 9, 13, 1, 1632
 	square_note 5, 14, 2, 1554
@@ -11,7 +11,7 @@ SFX_Cry0D_2_Ch5:
 
 
 SFX_Cry0D_2_Ch6:
-	duty_cycle_pattern 64
+	duty_cycle_pattern 1, 0, 0, 0
 	square_note 4, 0, 8, 0
 	square_note 5, 15, 2, 1617
 	square_note 9, 13, 1, 1633
diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm
index 487faa53..be354add 100644
--- a/audio/sfx/cry0d_3.asm
+++ b/audio/sfx/cry0d_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry0D_3_Ch5:
-	duty_cycle_pattern 136
+	duty_cycle_pattern 2, 0, 2, 0
 	square_note 5, 15, 2, 1616
 	square_note 9, 13, 1, 1632
 	square_note 5, 14, 2, 1554
@@ -11,7 +11,7 @@ SFX_Cry0D_3_Ch5:
 
 
 SFX_Cry0D_3_Ch6:
-	duty_cycle_pattern 64
+	duty_cycle_pattern 1, 0, 0, 0
 	square_note 4, 0, 8, 0
 	square_note 5, 15, 2, 1617
 	square_note 9, 13, 1, 1633
diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm
index 3067b15a..183280e2 100644
--- a/audio/sfx/cry0e_1.asm
+++ b/audio/sfx/cry0e_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry0E_1_Ch5:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 4, 14, 1, 1792
 	square_note 4, 15, 2, 1920
 	square_note 2, 9, 2, 1856
@@ -8,7 +8,7 @@ SFX_Cry0E_1_Ch5:
 
 
 SFX_Cry0E_1_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 4, 11, 1, 1761
 	square_note 3, 12, 2, 1761
 	square_note 3, 6, 2, 1665
diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm
index b3849fc5..905adbb3 100644
--- a/audio/sfx/cry0e_2.asm
+++ b/audio/sfx/cry0e_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry0E_2_Ch5:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 4, 14, 1, 1792
 	square_note 4, 15, 2, 1920
 	square_note 2, 9, 2, 1856
@@ -8,7 +8,7 @@ SFX_Cry0E_2_Ch5:
 
 
 SFX_Cry0E_2_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 4, 11, 1, 1761
 	square_note 3, 12, 2, 1761
 	square_note 3, 6, 2, 1665
diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm
index 493f91e2..a17dc577 100644
--- a/audio/sfx/cry0e_3.asm
+++ b/audio/sfx/cry0e_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry0E_3_Ch5:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 4, 14, 1, 1792
 	square_note 4, 15, 2, 1920
 	square_note 2, 9, 2, 1856
@@ -8,7 +8,7 @@ SFX_Cry0E_3_Ch5:
 
 
 SFX_Cry0E_3_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 4, 11, 1, 1761
 	square_note 3, 12, 2, 1761
 	square_note 3, 6, 2, 1665
diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm
index 9dbef1fb..2cf79d6d 100644
--- a/audio/sfx/cry0f_1.asm
+++ b/audio/sfx/cry0f_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry0F_1_Ch5:
-	duty_cycle_pattern 241
+	duty_cycle_pattern 3, 3, 0, 1
 	square_note 4, 15, 7, 1984
 	square_note 12, 14, 6, 1986
 	square_note 6, 11, 5, 1664
@@ -10,7 +10,7 @@ SFX_Cry0F_1_Ch5:
 
 
 SFX_Cry0F_1_Ch6:
-	duty_cycle_pattern 204
+	duty_cycle_pattern 3, 0, 3, 0
 	square_note 3, 12, 7, 1921
 	square_note 12, 11, 6, 1920
 	square_note 6, 10, 5, 1601
diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm
index 7de545a4..39f70bfe 100644
--- a/audio/sfx/cry0f_2.asm
+++ b/audio/sfx/cry0f_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry0F_2_Ch5:
-	duty_cycle_pattern 241
+	duty_cycle_pattern 3, 3, 0, 1
 	square_note 4, 15, 7, 1984
 	square_note 12, 14, 6, 1986
 	square_note 6, 11, 5, 1664
@@ -10,7 +10,7 @@ SFX_Cry0F_2_Ch5:
 
 
 SFX_Cry0F_2_Ch6:
-	duty_cycle_pattern 204
+	duty_cycle_pattern 3, 0, 3, 0
 	square_note 3, 12, 7, 1921
 	square_note 12, 11, 6, 1920
 	square_note 6, 10, 5, 1601
diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm
index 0d3d68b0..f96df482 100644
--- a/audio/sfx/cry0f_3.asm
+++ b/audio/sfx/cry0f_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry0F_3_Ch5:
-	duty_cycle_pattern 241
+	duty_cycle_pattern 3, 3, 0, 1
 	square_note 4, 15, 7, 1984
 	square_note 12, 14, 6, 1986
 	square_note 6, 11, 5, 1664
@@ -10,7 +10,7 @@ SFX_Cry0F_3_Ch5:
 
 
 SFX_Cry0F_3_Ch6:
-	duty_cycle_pattern 204
+	duty_cycle_pattern 3, 0, 3, 0
 	square_note 3, 12, 7, 1921
 	square_note 12, 11, 6, 1920
 	square_note 6, 10, 5, 1601
diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm
index bcaa75ac..dc8d2b71 100644
--- a/audio/sfx/cry10_1.asm
+++ b/audio/sfx/cry10_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry10_1_Ch5:
-	duty_cycle_pattern 201
+	duty_cycle_pattern 3, 0, 2, 1
 	square_note 8, 15, 7, 1664
 	square_note 2, 15, 7, 1632
 	square_note 1, 14, 7, 1600
@@ -12,7 +12,7 @@ SFX_Cry10_1_Ch5:
 
 
 SFX_Cry10_1_Ch6:
-	duty_cycle_pattern 121
+	duty_cycle_pattern 1, 3, 2, 1
 	square_note 10, 14, 7, 1666
 	square_note 2, 14, 7, 1634
 	square_note 1, 13, 7, 1602
diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm
index 12c8322e..f026f7c1 100644
--- a/audio/sfx/cry10_2.asm
+++ b/audio/sfx/cry10_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry10_2_Ch5:
-	duty_cycle_pattern 201
+	duty_cycle_pattern 3, 0, 2, 1
 	square_note 8, 15, 7, 1664
 	square_note 2, 15, 7, 1632
 	square_note 1, 14, 7, 1600
@@ -12,7 +12,7 @@ SFX_Cry10_2_Ch5:
 
 
 SFX_Cry10_2_Ch6:
-	duty_cycle_pattern 121
+	duty_cycle_pattern 1, 3, 2, 1
 	square_note 10, 14, 7, 1666
 	square_note 2, 14, 7, 1634
 	square_note 1, 13, 7, 1602
diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm
index ac7b4655..4b494b60 100644
--- a/audio/sfx/cry10_3.asm
+++ b/audio/sfx/cry10_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry10_3_Ch5:
-	duty_cycle_pattern 201
+	duty_cycle_pattern 3, 0, 2, 1
 	square_note 8, 15, 7, 1664
 	square_note 2, 15, 7, 1632
 	square_note 1, 14, 7, 1600
@@ -12,7 +12,7 @@ SFX_Cry10_3_Ch5:
 
 
 SFX_Cry10_3_Ch6:
-	duty_cycle_pattern 121
+	duty_cycle_pattern 1, 3, 2, 1
 	square_note 10, 14, 7, 1666
 	square_note 2, 14, 7, 1634
 	square_note 1, 13, 7, 1602
diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm
index 5616317e..09fa8123 100644
--- a/audio/sfx/cry11_1.asm
+++ b/audio/sfx/cry11_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry11_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 6, 15, 7, 1952
 	square_note 8, 14, 6, 1956
 	square_note 4, 13, 6, 1952
@@ -11,7 +11,7 @@ SFX_Cry11_1_Ch5:
 
 
 SFX_Cry11_1_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 4, 0, 8, 0
 	square_note 6, 10, 7, 1857
 	square_note 8, 8, 6, 1859
diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm
index 9ff4396d..b51b01c1 100644
--- a/audio/sfx/cry11_2.asm
+++ b/audio/sfx/cry11_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry11_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 6, 15, 7, 1952
 	square_note 8, 14, 6, 1956
 	square_note 4, 13, 6, 1952
@@ -11,7 +11,7 @@ SFX_Cry11_2_Ch5:
 
 
 SFX_Cry11_2_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 4, 0, 8, 0
 	square_note 6, 10, 7, 1857
 	square_note 8, 8, 6, 1859
diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm
index 43b95fe8..1a8b0c10 100644
--- a/audio/sfx/cry11_3.asm
+++ b/audio/sfx/cry11_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry11_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 6, 15, 7, 1952
 	square_note 8, 14, 6, 1956
 	square_note 4, 13, 6, 1952
@@ -11,7 +11,7 @@ SFX_Cry11_3_Ch5:
 
 
 SFX_Cry11_3_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 4, 0, 8, 0
 	square_note 6, 10, 7, 1857
 	square_note 8, 8, 6, 1859
diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm
index c87d178d..d2ee5f6e 100644
--- a/audio/sfx/cry12_1.asm
+++ b/audio/sfx/cry12_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry12_1_Ch5:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 12, 15, 2, 1088
 	square_note 15, 14, 3, 1184
 	square_note 4, 13, 2, 1168
@@ -8,7 +8,7 @@ SFX_Cry12_1_Ch5:
 
 
 SFX_Cry12_1_Ch6:
-	duty_cycle_pattern 238
+	duty_cycle_pattern 3, 2, 3, 2
 	square_note 11, 13, 2, 1080
 	square_note 14, 12, 6, 1176
 	square_note 3, 11, 2, 1160
diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm
index 921b27be..8a4afa2a 100644
--- a/audio/sfx/cry12_2.asm
+++ b/audio/sfx/cry12_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry12_2_Ch5:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 12, 15, 2, 1088
 	square_note 15, 14, 3, 1184
 	square_note 4, 13, 2, 1168
@@ -8,7 +8,7 @@ SFX_Cry12_2_Ch5:
 
 
 SFX_Cry12_2_Ch6:
-	duty_cycle_pattern 238
+	duty_cycle_pattern 3, 2, 3, 2
 	square_note 11, 13, 2, 1080
 	square_note 14, 12, 6, 1176
 	square_note 3, 11, 2, 1160
diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm
index 98569ea8..b114cdf4 100644
--- a/audio/sfx/cry12_3.asm
+++ b/audio/sfx/cry12_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry12_3_Ch5:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 12, 15, 2, 1088
 	square_note 15, 14, 3, 1184
 	square_note 4, 13, 2, 1168
@@ -8,7 +8,7 @@ SFX_Cry12_3_Ch5:
 
 
 SFX_Cry12_3_Ch6:
-	duty_cycle_pattern 238
+	duty_cycle_pattern 3, 2, 3, 2
 	square_note 11, 13, 2, 1080
 	square_note 14, 12, 6, 1176
 	square_note 3, 11, 2, 1160
diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm
index 6392f327..7ba33d8d 100644
--- a/audio/sfx/cry13_1.asm
+++ b/audio/sfx/cry13_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry13_1_Ch5:
-	duty_cycle_pattern 51
+	duty_cycle_pattern 0, 3, 0, 3
 	square_note 15, 15, 6, 1472
 	square_note 8, 14, 3, 1468
 	square_note 6, 13, 2, 1488
@@ -10,7 +10,7 @@ SFX_Cry13_1_Ch5:
 
 
 SFX_Cry13_1_Ch6:
-	duty_cycle_pattern 153
+	duty_cycle_pattern 2, 1, 2, 1
 	square_note 14, 12, 6, 1201
 	square_note 7, 12, 3, 1197
 	square_note 5, 11, 2, 1217
diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm
index 0247bc39..31ba80a1 100644
--- a/audio/sfx/cry13_2.asm
+++ b/audio/sfx/cry13_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry13_2_Ch5:
-	duty_cycle_pattern 51
+	duty_cycle_pattern 0, 3, 0, 3
 	square_note 15, 15, 6, 1472
 	square_note 8, 14, 3, 1468
 	square_note 6, 13, 2, 1488
@@ -10,7 +10,7 @@ SFX_Cry13_2_Ch5:
 
 
 SFX_Cry13_2_Ch6:
-	duty_cycle_pattern 153
+	duty_cycle_pattern 2, 1, 2, 1
 	square_note 14, 12, 6, 1201
 	square_note 7, 12, 3, 1197
 	square_note 5, 11, 2, 1217
diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm
index 99871861..8ca4cb0b 100644
--- a/audio/sfx/cry13_3.asm
+++ b/audio/sfx/cry13_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry13_3_Ch5:
-	duty_cycle_pattern 51
+	duty_cycle_pattern 0, 3, 0, 3
 	square_note 15, 15, 6, 1472
 	square_note 8, 14, 3, 1468
 	square_note 6, 13, 2, 1488
@@ -10,7 +10,7 @@ SFX_Cry13_3_Ch5:
 
 
 SFX_Cry13_3_Ch6:
-	duty_cycle_pattern 153
+	duty_cycle_pattern 2, 1, 2, 1
 	square_note 14, 12, 6, 1201
 	square_note 7, 12, 3, 1197
 	square_note 5, 11, 2, 1217
diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm
index 99d8d8d3..d892918f 100644
--- a/audio/sfx/cry14_1.asm
+++ b/audio/sfx/cry14_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry14_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 8, 14, 4, 1936
 	square_note 15, 15, 5, 1984
 	square_note 8, 13, 1, 2008
@@ -7,7 +7,7 @@ SFX_Cry14_1_Ch5:
 
 
 SFX_Cry14_1_Ch6:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 10, 12, 4, 1905
 	square_note 15, 11, 6, 1954
 	square_note 8, 10, 1, 1975
diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm
index 28062bc7..040bfe10 100644
--- a/audio/sfx/cry14_2.asm
+++ b/audio/sfx/cry14_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry14_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 8, 14, 4, 1936
 	square_note 15, 15, 5, 1984
 	square_note 8, 13, 1, 2008
@@ -7,7 +7,7 @@ SFX_Cry14_2_Ch5:
 
 
 SFX_Cry14_2_Ch6:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 10, 12, 4, 1905
 	square_note 15, 11, 6, 1954
 	square_note 8, 10, 1, 1975
diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm
index 81bd63ca..142707c5 100644
--- a/audio/sfx/cry14_3.asm
+++ b/audio/sfx/cry14_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry14_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 8, 14, 4, 1936
 	square_note 15, 15, 5, 1984
 	square_note 8, 13, 1, 2008
@@ -7,7 +7,7 @@ SFX_Cry14_3_Ch5:
 
 
 SFX_Cry14_3_Ch6:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 10, 12, 4, 1905
 	square_note 15, 11, 6, 1954
 	square_note 8, 10, 1, 1975
diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm
index aaa6656e..473d46cb 100644
--- a/audio/sfx/cry15_1.asm
+++ b/audio/sfx/cry15_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry15_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 4, 15, 3, 1920
 	square_note 15, 14, 7, 1792
 	square_note 8, 13, 3, 1808
@@ -10,7 +10,7 @@ SFX_Cry15_1_Ch5:
 
 
 SFX_Cry15_1_Ch6:
-	duty_cycle_pattern 90
+	duty_cycle_pattern 1, 1, 2, 2
 	square_note 6, 12, 3, 1793
 	square_note 14, 11, 7, 1665
 	square_note 7, 11, 3, 1682
diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm
index 77ac9ffb..82398789 100644
--- a/audio/sfx/cry15_2.asm
+++ b/audio/sfx/cry15_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry15_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 4, 15, 3, 1920
 	square_note 15, 14, 7, 1792
 	square_note 8, 13, 3, 1808
@@ -10,7 +10,7 @@ SFX_Cry15_2_Ch5:
 
 
 SFX_Cry15_2_Ch6:
-	duty_cycle_pattern 90
+	duty_cycle_pattern 1, 1, 2, 2
 	square_note 6, 12, 3, 1793
 	square_note 14, 11, 7, 1665
 	square_note 7, 11, 3, 1682
diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm
index 2e6a9d71..dcd6683b 100644
--- a/audio/sfx/cry15_3.asm
+++ b/audio/sfx/cry15_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry15_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 4, 15, 3, 1920
 	square_note 15, 14, 7, 1792
 	square_note 8, 13, 3, 1808
@@ -10,7 +10,7 @@ SFX_Cry15_3_Ch5:
 
 
 SFX_Cry15_3_Ch6:
-	duty_cycle_pattern 90
+	duty_cycle_pattern 1, 1, 2, 2
 	square_note 6, 12, 3, 1793
 	square_note 14, 11, 7, 1665
 	square_note 7, 11, 3, 1682
diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm
index e0bf7c61..410ec4ad 100644
--- a/audio/sfx/cry16_1.asm
+++ b/audio/sfx/cry16_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry16_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 13, 7, 1920
 	square_note 4, 14, 6, 1952
 	square_note 15, 13, 2, 1856
@@ -7,7 +7,7 @@ SFX_Cry16_1_Ch5:
 
 
 SFX_Cry16_1_Ch6:
-	duty_cycle_pattern 90
+	duty_cycle_pattern 1, 1, 2, 2
 	square_note 15, 12, 7, 1875
 	square_note 5, 11, 6, 1906
 	square_note 15, 12, 2, 1809
diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm
index da03950f..a91355a6 100644
--- a/audio/sfx/cry16_2.asm
+++ b/audio/sfx/cry16_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry16_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 13, 7, 1920
 	square_note 4, 14, 6, 1952
 	square_note 15, 13, 2, 1856
@@ -7,7 +7,7 @@ SFX_Cry16_2_Ch5:
 
 
 SFX_Cry16_2_Ch6:
-	duty_cycle_pattern 90
+	duty_cycle_pattern 1, 1, 2, 2
 	square_note 15, 12, 7, 1875
 	square_note 5, 11, 6, 1906
 	square_note 15, 12, 2, 1809
diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm
index 248163fe..838a4241 100644
--- a/audio/sfx/cry16_3.asm
+++ b/audio/sfx/cry16_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry16_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 13, 7, 1920
 	square_note 4, 14, 6, 1952
 	square_note 15, 13, 2, 1856
@@ -7,7 +7,7 @@ SFX_Cry16_3_Ch5:
 
 
 SFX_Cry16_3_Ch6:
-	duty_cycle_pattern 90
+	duty_cycle_pattern 1, 1, 2, 2
 	square_note 15, 12, 7, 1875
 	square_note 5, 11, 6, 1906
 	square_note 15, 12, 2, 1809
diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm
index 699de068..dcfde2bc 100644
--- a/audio/sfx/cry17_1.asm
+++ b/audio/sfx/cry17_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry17_1_Ch5:
-	duty_cycle_pattern 15
+	duty_cycle_pattern 0, 0, 3, 3
 	square_note 15, 15, 7, 1280
 	square_note 15, 14, 7, 1288
 	square_note 8, 11, 4, 1152
@@ -8,7 +8,7 @@ SFX_Cry17_1_Ch5:
 
 
 SFX_Cry17_1_Ch6:
-	duty_cycle_pattern 68
+	duty_cycle_pattern 1, 0, 1, 0
 	square_note 14, 13, 7, 1153
 	square_note 14, 12, 7, 1161
 	square_note 10, 11, 4, 1025
diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm
index 2f143097..f2b1f366 100644
--- a/audio/sfx/cry17_2.asm
+++ b/audio/sfx/cry17_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry17_2_Ch5:
-	duty_cycle_pattern 15
+	duty_cycle_pattern 0, 0, 3, 3
 	square_note 15, 15, 7, 1280
 	square_note 15, 14, 7, 1288
 	square_note 8, 11, 4, 1152
@@ -8,7 +8,7 @@ SFX_Cry17_2_Ch5:
 
 
 SFX_Cry17_2_Ch6:
-	duty_cycle_pattern 68
+	duty_cycle_pattern 1, 0, 1, 0
 	square_note 14, 13, 7, 1153
 	square_note 14, 12, 7, 1161
 	square_note 10, 11, 4, 1025
diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm
index 32bee883..dabb4dbc 100644
--- a/audio/sfx/cry17_3.asm
+++ b/audio/sfx/cry17_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry17_3_Ch5:
-	duty_cycle_pattern 15
+	duty_cycle_pattern 0, 0, 3, 3
 	square_note 15, 15, 7, 1280
 	square_note 15, 14, 7, 1288
 	square_note 8, 11, 4, 1152
@@ -8,7 +8,7 @@ SFX_Cry17_3_Ch5:
 
 
 SFX_Cry17_3_Ch6:
-	duty_cycle_pattern 68
+	duty_cycle_pattern 1, 0, 1, 0
 	square_note 14, 13, 7, 1153
 	square_note 14, 12, 7, 1161
 	square_note 10, 11, 4, 1025
diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm
index d326c2c3..c67f03d1 100644
--- a/audio/sfx/cry18_1.asm
+++ b/audio/sfx/cry18_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry18_1_Ch5:
-	duty_cycle_pattern 80
+	duty_cycle_pattern 1, 1, 0, 0
 	square_note 10, 15, 5, 1664
 	square_note 3, 14, 2, 1696
 	square_note 3, 15, 2, 1728
@@ -12,7 +12,7 @@ SFX_Cry18_1_Ch5:
 
 
 SFX_Cry18_1_Ch6:
-	duty_cycle_pattern 15
+	duty_cycle_pattern 0, 0, 3, 3
 	square_note 9, 13, 5, 1585
 	square_note 3, 13, 2, 1618
 	square_note 3, 14, 2, 1649
diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm
index 1a81e1d3..55be1c3f 100644
--- a/audio/sfx/cry18_2.asm
+++ b/audio/sfx/cry18_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry18_2_Ch5:
-	duty_cycle_pattern 80
+	duty_cycle_pattern 1, 1, 0, 0
 	square_note 10, 15, 5, 1664
 	square_note 3, 14, 2, 1696
 	square_note 3, 15, 2, 1728
@@ -12,7 +12,7 @@ SFX_Cry18_2_Ch5:
 
 
 SFX_Cry18_2_Ch6:
-	duty_cycle_pattern 15
+	duty_cycle_pattern 0, 0, 3, 3
 	square_note 9, 13, 5, 1585
 	square_note 3, 13, 2, 1618
 	square_note 3, 14, 2, 1649
diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm
index 7ca9f2c6..cc0db3ec 100644
--- a/audio/sfx/cry18_3.asm
+++ b/audio/sfx/cry18_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry18_3_Ch5:
-	duty_cycle_pattern 80
+	duty_cycle_pattern 1, 1, 0, 0
 	square_note 10, 15, 5, 1664
 	square_note 3, 14, 2, 1696
 	square_note 3, 15, 2, 1728
@@ -12,7 +12,7 @@ SFX_Cry18_3_Ch5:
 
 
 SFX_Cry18_3_Ch6:
-	duty_cycle_pattern 15
+	duty_cycle_pattern 0, 0, 3, 3
 	square_note 9, 13, 5, 1585
 	square_note 3, 13, 2, 1618
 	square_note 3, 14, 2, 1649
diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm
index 6309f902..eca89a1c 100644
--- a/audio/sfx/cry19_1.asm
+++ b/audio/sfx/cry19_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry19_1_Ch5:
-	duty_cycle_pattern 27
+	duty_cycle_pattern 0, 1, 2, 3
 	square_note 7, 13, 2, 1856
 	square_note 15, 14, 5, 1888
 	square_note 15, 12, 1, 1840
@@ -7,7 +7,7 @@ SFX_Cry19_1_Ch5:
 
 
 SFX_Cry19_1_Ch6:
-	duty_cycle_pattern 129
+	duty_cycle_pattern 2, 0, 0, 1
 	square_note 2, 12, 2, 1793
 	square_note 4, 12, 2, 1800
 	square_note 15, 13, 7, 1857
diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm
index e838612b..3a7d51fd 100644
--- a/audio/sfx/cry19_2.asm
+++ b/audio/sfx/cry19_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry19_2_Ch5:
-	duty_cycle_pattern 27
+	duty_cycle_pattern 0, 1, 2, 3
 	square_note 7, 13, 2, 1856
 	square_note 15, 14, 5, 1888
 	square_note 15, 12, 1, 1840
@@ -7,7 +7,7 @@ SFX_Cry19_2_Ch5:
 
 
 SFX_Cry19_2_Ch6:
-	duty_cycle_pattern 129
+	duty_cycle_pattern 2, 0, 0, 1
 	square_note 2, 12, 2, 1793
 	square_note 4, 12, 2, 1800
 	square_note 15, 13, 7, 1857
diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm
index 51c113b6..965e6cf0 100644
--- a/audio/sfx/cry19_3.asm
+++ b/audio/sfx/cry19_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry19_3_Ch5:
-	duty_cycle_pattern 27
+	duty_cycle_pattern 0, 1, 2, 3
 	square_note 7, 13, 2, 1856
 	square_note 15, 14, 5, 1888
 	square_note 15, 12, 1, 1840
@@ -7,7 +7,7 @@ SFX_Cry19_3_Ch5:
 
 
 SFX_Cry19_3_Ch6:
-	duty_cycle_pattern 129
+	duty_cycle_pattern 2, 0, 0, 1
 	square_note 2, 12, 2, 1793
 	square_note 4, 12, 2, 1800
 	square_note 15, 13, 7, 1857
diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm
index 3209263a..f319878a 100644
--- a/audio/sfx/cry1a_1.asm
+++ b/audio/sfx/cry1a_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry1A_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 6, 15, 7, 1856
 	square_note 12, 14, 6, 1860
 	square_note 6, 13, 5, 1872
@@ -10,7 +10,7 @@ SFX_Cry1A_1_Ch5:
 
 
 SFX_Cry1A_1_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 6, 12, 7, 1793
 	square_note 11, 11, 6, 1794
 	square_note 6, 10, 5, 1809
diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm
index a8dca4fc..64fd0674 100644
--- a/audio/sfx/cry1a_2.asm
+++ b/audio/sfx/cry1a_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry1A_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 6, 15, 7, 1856
 	square_note 12, 14, 6, 1860
 	square_note 6, 13, 5, 1872
@@ -10,7 +10,7 @@ SFX_Cry1A_2_Ch5:
 
 
 SFX_Cry1A_2_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 6, 12, 7, 1793
 	square_note 11, 11, 6, 1794
 	square_note 6, 10, 5, 1809
diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm
index 0fc9574d..a55f0dcf 100644
--- a/audio/sfx/cry1a_3.asm
+++ b/audio/sfx/cry1a_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry1A_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 6, 15, 7, 1856
 	square_note 12, 14, 6, 1860
 	square_note 6, 13, 5, 1872
@@ -10,7 +10,7 @@ SFX_Cry1A_3_Ch5:
 
 
 SFX_Cry1A_3_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 6, 12, 7, 1793
 	square_note 11, 11, 6, 1794
 	square_note 6, 10, 5, 1809
diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm
index 8a228ec3..0070a0f1 100644
--- a/audio/sfx/cry1b_1.asm
+++ b/audio/sfx/cry1b_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry1B_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 6, 15, 7, 1728
 	square_note 15, 14, 7, 1792
 	square_note 4, 15, 4, 1776
@@ -9,7 +9,7 @@ SFX_Cry1B_1_Ch5:
 
 
 SFX_Cry1B_1_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 7, 14, 6, 1665
 	square_note 14, 13, 5, 1729
 	square_note 4, 12, 4, 1713
diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm
index 97f85337..9453ce9b 100644
--- a/audio/sfx/cry1b_2.asm
+++ b/audio/sfx/cry1b_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry1B_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 6, 15, 7, 1728
 	square_note 15, 14, 7, 1792
 	square_note 4, 15, 4, 1776
@@ -9,7 +9,7 @@ SFX_Cry1B_2_Ch5:
 
 
 SFX_Cry1B_2_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 7, 14, 6, 1665
 	square_note 14, 13, 5, 1729
 	square_note 4, 12, 4, 1713
diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm
index 27b7f633..f6a1d76a 100644
--- a/audio/sfx/cry1b_3.asm
+++ b/audio/sfx/cry1b_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry1B_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 6, 15, 7, 1728
 	square_note 15, 14, 7, 1792
 	square_note 4, 15, 4, 1776
@@ -9,7 +9,7 @@ SFX_Cry1B_3_Ch5:
 
 
 SFX_Cry1B_3_Ch6:
-	duty_cycle_pattern 10
+	duty_cycle_pattern 0, 0, 2, 2
 	square_note 7, 14, 6, 1665
 	square_note 14, 13, 5, 1729
 	square_note 4, 12, 4, 1713
diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm
index 50e29a0e..929835a5 100644
--- a/audio/sfx/cry1c_1.asm
+++ b/audio/sfx/cry1c_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry1C_1_Ch5:
-	duty_cycle_pattern 245
+	duty_cycle_pattern 3, 3, 1, 1
 	square_note 7, 13, 6, 2017
 	square_note 6, 12, 6, 2018
 	square_note 9, 13, 6, 2017
@@ -12,7 +12,7 @@ SFX_Cry1C_1_Ch5:
 
 
 SFX_Cry1C_1_Ch6:
-	duty_cycle_pattern 68
+	duty_cycle_pattern 1, 0, 1, 0
 	square_note 6, 12, 3, 1993
 	square_note 6, 11, 3, 1991
 	square_note 10, 12, 4, 1987
diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm
index e73f557c..c9f23916 100644
--- a/audio/sfx/cry1c_2.asm
+++ b/audio/sfx/cry1c_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry1C_2_Ch5:
-	duty_cycle_pattern 245
+	duty_cycle_pattern 3, 3, 1, 1
 	square_note 7, 13, 6, 2017
 	square_note 6, 12, 6, 2018
 	square_note 9, 13, 6, 2017
@@ -12,7 +12,7 @@ SFX_Cry1C_2_Ch5:
 
 
 SFX_Cry1C_2_Ch6:
-	duty_cycle_pattern 68
+	duty_cycle_pattern 1, 0, 1, 0
 	square_note 6, 12, 3, 1993
 	square_note 6, 11, 3, 1991
 	square_note 10, 12, 4, 1987
diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm
index 282804b2..7b18f038 100644
--- a/audio/sfx/cry1c_3.asm
+++ b/audio/sfx/cry1c_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry1C_3_Ch5:
-	duty_cycle_pattern 245
+	duty_cycle_pattern 3, 3, 1, 1
 	square_note 7, 13, 6, 2017
 	square_note 6, 12, 6, 2018
 	square_note 9, 13, 6, 2017
@@ -12,7 +12,7 @@ SFX_Cry1C_3_Ch5:
 
 
 SFX_Cry1C_3_Ch6:
-	duty_cycle_pattern 68
+	duty_cycle_pattern 1, 0, 1, 0
 	square_note 6, 12, 3, 1993
 	square_note 6, 11, 3, 1991
 	square_note 10, 12, 4, 1987
diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm
index 97fd2d31..a532ec5c 100644
--- a/audio/sfx/cry1d_1.asm
+++ b/audio/sfx/cry1d_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry1D_1_Ch5:
-	duty_cycle_pattern 244
+	duty_cycle_pattern 3, 3, 1, 0
 	square_note 15, 15, 0, 1797
 	square_note 10, 14, 0, 1792
 	square_note 6, 11, 4, 1808
@@ -10,7 +10,7 @@ SFX_Cry1D_1_Ch5:
 
 
 SFX_Cry1D_1_Ch6:
-	duty_cycle_pattern 34
+	duty_cycle_pattern 0, 2, 0, 2
 	square_note 15, 11, 0, 1731
 	square_note 10, 10, 0, 1729
 	square_note 6, 8, 4, 1746
diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm
index 5fc0a453..c919ba1e 100644
--- a/audio/sfx/cry1d_2.asm
+++ b/audio/sfx/cry1d_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry1D_2_Ch5:
-	duty_cycle_pattern 244
+	duty_cycle_pattern 3, 3, 1, 0
 	square_note 15, 15, 0, 1797
 	square_note 10, 14, 0, 1792
 	square_note 6, 11, 4, 1808
@@ -10,7 +10,7 @@ SFX_Cry1D_2_Ch5:
 
 
 SFX_Cry1D_2_Ch6:
-	duty_cycle_pattern 34
+	duty_cycle_pattern 0, 2, 0, 2
 	square_note 15, 11, 0, 1731
 	square_note 10, 10, 0, 1729
 	square_note 6, 8, 4, 1746
diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm
index f86dd102..47e38997 100644
--- a/audio/sfx/cry1d_3.asm
+++ b/audio/sfx/cry1d_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry1D_3_Ch5:
-	duty_cycle_pattern 244
+	duty_cycle_pattern 3, 3, 1, 0
 	square_note 15, 15, 0, 1797
 	square_note 10, 14, 0, 1792
 	square_note 6, 11, 4, 1808
@@ -10,7 +10,7 @@ SFX_Cry1D_3_Ch5:
 
 
 SFX_Cry1D_3_Ch6:
-	duty_cycle_pattern 34
+	duty_cycle_pattern 0, 2, 0, 2
 	square_note 15, 11, 0, 1731
 	square_note 10, 10, 0, 1729
 	square_note 6, 8, 4, 1746
diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm
index c3106e7b..19634a5e 100644
--- a/audio/sfx/cry1e_1.asm
+++ b/audio/sfx/cry1e_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry1E_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 6, 15, 2, 1536
 	square_note 6, 14, 2, 1600
 	square_note 6, 13, 2, 1664
@@ -12,7 +12,7 @@ SFX_Cry1E_1_Ch5:
 
 
 SFX_Cry1E_1_Ch6:
-	duty_cycle_pattern 17
+	duty_cycle_pattern 0, 1, 0, 1
 	square_note 3, 0, 8, 1
 	square_note 6, 12, 2, 1473
 	square_note 6, 11, 2, 1538
diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm
index 1c904ce4..74004489 100644
--- a/audio/sfx/cry1e_2.asm
+++ b/audio/sfx/cry1e_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry1E_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 6, 15, 2, 1536
 	square_note 6, 14, 2, 1600
 	square_note 6, 13, 2, 1664
@@ -12,7 +12,7 @@ SFX_Cry1E_2_Ch5:
 
 
 SFX_Cry1E_2_Ch6:
-	duty_cycle_pattern 17
+	duty_cycle_pattern 0, 1, 0, 1
 	square_note 3, 0, 8, 1
 	square_note 6, 12, 2, 1473
 	square_note 6, 11, 2, 1538
diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm
index 6fae812c..357c2f71 100644
--- a/audio/sfx/cry1e_3.asm
+++ b/audio/sfx/cry1e_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry1E_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 6, 15, 2, 1536
 	square_note 6, 14, 2, 1600
 	square_note 6, 13, 2, 1664
@@ -12,7 +12,7 @@ SFX_Cry1E_3_Ch5:
 
 
 SFX_Cry1E_3_Ch6:
-	duty_cycle_pattern 17
+	duty_cycle_pattern 0, 1, 0, 1
 	square_note 3, 0, 8, 1
 	square_note 6, 12, 2, 1473
 	square_note 6, 11, 2, 1538
diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm
index 63148b92..1f5b3a8d 100644
--- a/audio/sfx/cry1f_1.asm
+++ b/audio/sfx/cry1f_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry1F_1_Ch5:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 3, 15, 4, 1601
 	square_note 13, 13, 6, 1825
 	square_note 8, 15, 4, 1817
@@ -8,7 +8,7 @@ SFX_Cry1F_1_Ch5:
 
 
 SFX_Cry1F_1_Ch6:
-	duty_cycle_pattern 204
+	duty_cycle_pattern 3, 0, 3, 0
 	square_note 4, 15, 4, 1408
 	square_note 14, 14, 6, 1760
 	square_note 8, 13, 5, 1752
diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm
index 868975f8..99f3a056 100644
--- a/audio/sfx/cry1f_2.asm
+++ b/audio/sfx/cry1f_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry1F_2_Ch5:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 3, 15, 4, 1601
 	square_note 13, 13, 6, 1825
 	square_note 8, 15, 4, 1817
@@ -8,7 +8,7 @@ SFX_Cry1F_2_Ch5:
 
 
 SFX_Cry1F_2_Ch6:
-	duty_cycle_pattern 204
+	duty_cycle_pattern 3, 0, 3, 0
 	square_note 4, 15, 4, 1408
 	square_note 14, 14, 6, 1760
 	square_note 8, 13, 5, 1752
diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm
index cc5a6192..c9cf5441 100644
--- a/audio/sfx/cry1f_3.asm
+++ b/audio/sfx/cry1f_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry1F_3_Ch5:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 3, 15, 4, 1601
 	square_note 13, 13, 6, 1825
 	square_note 8, 15, 4, 1817
@@ -8,7 +8,7 @@ SFX_Cry1F_3_Ch5:
 
 
 SFX_Cry1F_3_Ch6:
-	duty_cycle_pattern 204
+	duty_cycle_pattern 3, 0, 3, 0
 	square_note 4, 15, 4, 1408
 	square_note 14, 14, 6, 1760
 	square_note 8, 13, 5, 1752
diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm
index 888aeb61..15a160ae 100644
--- a/audio/sfx/cry20_1.asm
+++ b/audio/sfx/cry20_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry20_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 13, 15, 1, 1297
 	square_note 13, 14, 1, 1301
 	square_note 13, 14, 1, 1297
@@ -8,7 +8,7 @@ SFX_Cry20_1_Ch5:
 
 
 SFX_Cry20_1_Ch6:
-	duty_cycle_pattern 21
+	duty_cycle_pattern 0, 1, 1, 1
 	square_note 12, 14, 1, 1292
 	square_note 12, 13, 1, 1296
 	square_note 14, 12, 1, 1292
diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm
index ed22a3f0..281e478c 100644
--- a/audio/sfx/cry20_2.asm
+++ b/audio/sfx/cry20_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry20_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 13, 15, 1, 1297
 	square_note 13, 14, 1, 1301
 	square_note 13, 14, 1, 1297
@@ -8,7 +8,7 @@ SFX_Cry20_2_Ch5:
 
 
 SFX_Cry20_2_Ch6:
-	duty_cycle_pattern 21
+	duty_cycle_pattern 0, 1, 1, 1
 	square_note 12, 14, 1, 1292
 	square_note 12, 13, 1, 1296
 	square_note 14, 12, 1, 1292
diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm
index 6295e936..8191ca6e 100644
--- a/audio/sfx/cry20_3.asm
+++ b/audio/sfx/cry20_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry20_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 13, 15, 1, 1297
 	square_note 13, 14, 1, 1301
 	square_note 13, 14, 1, 1297
@@ -8,7 +8,7 @@ SFX_Cry20_3_Ch5:
 
 
 SFX_Cry20_3_Ch6:
-	duty_cycle_pattern 21
+	duty_cycle_pattern 0, 1, 1, 1
 	square_note 12, 14, 1, 1292
 	square_note 12, 13, 1, 1296
 	square_note 14, 12, 1, 1292
diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm
index d9df1eca..2cf517a8 100644
--- a/audio/sfx/cry21_1.asm
+++ b/audio/sfx/cry21_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry21_1_Ch5:
-	duty_cycle_pattern 27
+	duty_cycle_pattern 0, 1, 2, 3
 	square_note 3, 15, 3, 1380
 	square_note 2, 14, 2, 1348
 	square_note 5, 13, 1, 1314
@@ -12,7 +12,7 @@ SFX_Cry21_1_Ch5:
 
 
 SFX_Cry21_1_Ch6:
-	duty_cycle_pattern 204
+	duty_cycle_pattern 3, 0, 3, 0
 	square_note 3, 13, 3, 1376
 	square_note 2, 12, 2, 1344
 	square_note 5, 12, 1, 1312
diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm
index f506e124..8136de63 100644
--- a/audio/sfx/cry21_2.asm
+++ b/audio/sfx/cry21_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry21_2_Ch5:
-	duty_cycle_pattern 27
+	duty_cycle_pattern 0, 1, 2, 3
 	square_note 3, 15, 3, 1380
 	square_note 2, 14, 2, 1348
 	square_note 5, 13, 1, 1314
@@ -12,7 +12,7 @@ SFX_Cry21_2_Ch5:
 
 
 SFX_Cry21_2_Ch6:
-	duty_cycle_pattern 204
+	duty_cycle_pattern 3, 0, 3, 0
 	square_note 3, 13, 3, 1376
 	square_note 2, 12, 2, 1344
 	square_note 5, 12, 1, 1312
diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm
index c93a4784..d829f9f2 100644
--- a/audio/sfx/cry21_3.asm
+++ b/audio/sfx/cry21_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry21_3_Ch5:
-	duty_cycle_pattern 27
+	duty_cycle_pattern 0, 1, 2, 3
 	square_note 3, 15, 3, 1380
 	square_note 2, 14, 2, 1348
 	square_note 5, 13, 1, 1314
@@ -12,7 +12,7 @@ SFX_Cry21_3_Ch5:
 
 
 SFX_Cry21_3_Ch6:
-	duty_cycle_pattern 204
+	duty_cycle_pattern 3, 0, 3, 0
 	square_note 3, 13, 3, 1376
 	square_note 2, 12, 2, 1344
 	square_note 5, 12, 1, 1312
diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm
index 72ea2db3..dd910103 100644
--- a/audio/sfx/cry22_1.asm
+++ b/audio/sfx/cry22_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry22_1_Ch5:
-	duty_cycle_pattern 17
+	duty_cycle_pattern 0, 1, 0, 1
 	square_note 2, 3, -5, 897
 	square_note 7, 15, 5, 1537
 	square_note 1, 12, 2, 1153
@@ -8,7 +8,7 @@ SFX_Cry22_1_Ch5:
 
 
 SFX_Cry22_1_Ch6:
-	duty_cycle_pattern 238
+	duty_cycle_pattern 3, 2, 3, 2
 	square_note 2, 3, -6, 1456
 	square_note 7, 13, 5, 1885
 	square_note 1, 11, 2, 1712
diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm
index 9492f818..43e09d67 100644
--- a/audio/sfx/cry22_2.asm
+++ b/audio/sfx/cry22_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry22_2_Ch5:
-	duty_cycle_pattern 17
+	duty_cycle_pattern 0, 1, 0, 1
 	square_note 2, 3, -5, 897
 	square_note 7, 15, 5, 1537
 	square_note 1, 12, 2, 1153
@@ -8,7 +8,7 @@ SFX_Cry22_2_Ch5:
 
 
 SFX_Cry22_2_Ch6:
-	duty_cycle_pattern 238
+	duty_cycle_pattern 3, 2, 3, 2
 	square_note 2, 3, -6, 1456
 	square_note 7, 13, 5, 1885
 	square_note 1, 11, 2, 1712
diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm
index 55cce857..397edba1 100644
--- a/audio/sfx/cry22_3.asm
+++ b/audio/sfx/cry22_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry22_3_Ch5:
-	duty_cycle_pattern 17
+	duty_cycle_pattern 0, 1, 0, 1
 	square_note 2, 3, -5, 897
 	square_note 7, 15, 5, 1537
 	square_note 1, 12, 2, 1153
@@ -8,7 +8,7 @@ SFX_Cry22_3_Ch5:
 
 
 SFX_Cry22_3_Ch6:
-	duty_cycle_pattern 238
+	duty_cycle_pattern 3, 2, 3, 2
 	square_note 2, 3, -6, 1456
 	square_note 7, 13, 5, 1885
 	square_note 1, 11, 2, 1712
diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm
index bd93eb67..5aeafe0f 100644
--- a/audio/sfx/cry23_1.asm
+++ b/audio/sfx/cry23_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry23_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 15, 7, 1984
 	square_note 6, 14, 4, 1985
 	square_note 10, 15, 6, 1984
@@ -9,7 +9,7 @@ SFX_Cry23_1_Ch5:
 
 
 SFX_Cry23_1_Ch6:
-	duty_cycle_pattern 95
+	duty_cycle_pattern 1, 1, 3, 3
 	square_note 15, 9, 7, 1921
 	square_note 6, 8, 4, 1920
 	square_note 10, 9, 6, 1921
diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm
index 78932fd9..04e4136b 100644
--- a/audio/sfx/cry23_2.asm
+++ b/audio/sfx/cry23_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry23_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 15, 7, 1984
 	square_note 6, 14, 4, 1985
 	square_note 10, 15, 6, 1984
@@ -9,7 +9,7 @@ SFX_Cry23_2_Ch5:
 
 
 SFX_Cry23_2_Ch6:
-	duty_cycle_pattern 95
+	duty_cycle_pattern 1, 1, 3, 3
 	square_note 15, 9, 7, 1921
 	square_note 6, 8, 4, 1920
 	square_note 10, 9, 6, 1921
diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm
index 14b52850..418e69bb 100644
--- a/audio/sfx/cry23_3.asm
+++ b/audio/sfx/cry23_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry23_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 15, 7, 1984
 	square_note 6, 14, 4, 1985
 	square_note 10, 15, 6, 1984
@@ -9,7 +9,7 @@ SFX_Cry23_3_Ch5:
 
 
 SFX_Cry23_3_Ch6:
-	duty_cycle_pattern 95
+	duty_cycle_pattern 1, 1, 3, 3
 	square_note 15, 9, 7, 1921
 	square_note 6, 8, 4, 1920
 	square_note 10, 9, 6, 1921
diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm
index 36654731..7e992707 100644
--- a/audio/sfx/cry24_1.asm
+++ b/audio/sfx/cry24_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry24_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 15, 7, 1664
 	square_note 10, 14, 6, 1668
 	square_note 15, 13, 7, 1680
@@ -12,7 +12,7 @@ SFX_Cry24_1_Ch5:
 
 
 SFX_Cry24_1_Ch6:
-	duty_cycle_pattern 5
+	duty_cycle_pattern 0, 0, 1, 1
 	square_note 15, 11, 7, 1601
 	square_note 10, 9, 6, 1602
 	square_note 15, 10, 7, 1617
diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm
index b23a020e..d845f6ed 100644
--- a/audio/sfx/cry24_2.asm
+++ b/audio/sfx/cry24_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry24_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 15, 7, 1664
 	square_note 10, 14, 6, 1668
 	square_note 15, 13, 7, 1680
@@ -12,7 +12,7 @@ SFX_Cry24_2_Ch5:
 
 
 SFX_Cry24_2_Ch6:
-	duty_cycle_pattern 5
+	duty_cycle_pattern 0, 0, 1, 1
 	square_note 15, 11, 7, 1601
 	square_note 10, 9, 6, 1602
 	square_note 15, 10, 7, 1617
diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm
index 6a9d5bf6..e8c1f24e 100644
--- a/audio/sfx/cry24_3.asm
+++ b/audio/sfx/cry24_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry24_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 15, 7, 1664
 	square_note 10, 14, 6, 1668
 	square_note 15, 13, 7, 1680
@@ -12,7 +12,7 @@ SFX_Cry24_3_Ch5:
 
 
 SFX_Cry24_3_Ch6:
-	duty_cycle_pattern 5
+	duty_cycle_pattern 0, 0, 1, 1
 	square_note 15, 11, 7, 1601
 	square_note 10, 9, 6, 1602
 	square_note 15, 10, 7, 1617
diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm
index 670cbaae..64d59389 100644
--- a/audio/sfx/cry25_1.asm
+++ b/audio/sfx/cry25_1.asm
@@ -1,5 +1,5 @@
 SFX_Cry25_1_Ch5:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 6, 15, 4, 1856
 	square_note 15, 14, 3, 1840
 	square_note 4, 15, 4, 1856
@@ -9,7 +9,7 @@ SFX_Cry25_1_Ch5:
 
 
 SFX_Cry25_1_Ch6:
-	duty_cycle_pattern 119
+	duty_cycle_pattern 1, 3, 1, 3
 	square_note 6, 12, 3, 1810
 	square_note 15, 11, 3, 1796
 	square_note 3, 12, 3, 1810
diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm
index 6b52d9bf..8ed47006 100644
--- a/audio/sfx/cry25_2.asm
+++ b/audio/sfx/cry25_2.asm
@@ -1,5 +1,5 @@
 SFX_Cry25_2_Ch5:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 6, 15, 4, 1856
 	square_note 15, 14, 3, 1840
 	square_note 4, 15, 4, 1856
@@ -9,7 +9,7 @@ SFX_Cry25_2_Ch5:
 
 
 SFX_Cry25_2_Ch6:
-	duty_cycle_pattern 119
+	duty_cycle_pattern 1, 3, 1, 3
 	square_note 6, 12, 3, 1810
 	square_note 15, 11, 3, 1796
 	square_note 3, 12, 3, 1810
diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm
index 22ce220d..f9800dc8 100644
--- a/audio/sfx/cry25_3.asm
+++ b/audio/sfx/cry25_3.asm
@@ -1,5 +1,5 @@
 SFX_Cry25_3_Ch5:
-	duty_cycle_pattern 165
+	duty_cycle_pattern 2, 2, 1, 1
 	square_note 6, 15, 4, 1856
 	square_note 15, 14, 3, 1840
 	square_note 4, 15, 4, 1856
@@ -9,7 +9,7 @@ SFX_Cry25_3_Ch5:
 
 
 SFX_Cry25_3_Ch6:
-	duty_cycle_pattern 119
+	duty_cycle_pattern 1, 3, 1, 3
 	square_note 6, 12, 3, 1810
 	square_note 15, 11, 3, 1796
 	square_note 3, 12, 3, 1810
diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm
index 3142fca5..2b94cf6d 100644
--- a/audio/sfx/psybeam.asm
+++ b/audio/sfx/psybeam.asm
@@ -1,5 +1,5 @@
 SFX_Psybeam_Ch5:
-	duty_cycle_pattern 161
+	duty_cycle_pattern 2, 2, 0, 1
 	square_note 10, 15, 1, 1600
 	square_note 10, 15, 3, 1664
 	square_note 10, 15, 2, 1568
@@ -9,7 +9,7 @@ SFX_Psybeam_Ch5:
 
 
 SFX_Psybeam_Ch6:
-	duty_cycle_pattern 179
+	duty_cycle_pattern 2, 3, 0, 3
 	square_note 10, 15, 3, 1393
 	square_note 7, 14, 3, 1329
 	square_note 10, 15, 1, 1361
diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm
index 796400a4..2a125987 100644
--- a/audio/sfx/shooting_star.asm
+++ b/audio/sfx/shooting_star.asm
@@ -1,5 +1,5 @@
 SFX_Shooting_Star_Ch5:
-	duty_cycle_pattern 228
+	duty_cycle_pattern 3, 2, 1, 0
 	pitch_sweep 2, -7
 	square_note 4, 4, 0, 2016
 	square_note 4, 6, 0, 2016
diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm
index 6b237950..b7a8b4a0 100644
--- a/audio/sfx/unused_1.asm
+++ b/audio/sfx/unused_1.asm
@@ -1,5 +1,5 @@
 SFX_Unused_1_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 14, 0, 1920
 	square_note 15, 15, 0, 1924
 	square_note 15, 12, 3, 1504
@@ -10,7 +10,7 @@ SFX_Unused_1_Ch5:
 
 
 SFX_Unused_1_Ch6:
-	duty_cycle_pattern 5
+	duty_cycle_pattern 0, 0, 1, 1
 	square_note 15, 10, 0, 1857
 	square_note 15, 11, 0, 1859
 	square_note 15, 9, 3, 1457
diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm
index 0a8fa9d9..7a050ea4 100644
--- a/audio/sfx/unused_2.asm
+++ b/audio/sfx/unused_2.asm
@@ -1,5 +1,5 @@
 SFX_Unused_2_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 14, 0, 1920
 	square_note 15, 15, 0, 1924
 	square_note 15, 12, 3, 1504
@@ -10,7 +10,7 @@ SFX_Unused_2_Ch5:
 
 
 SFX_Unused_2_Ch6:
-	duty_cycle_pattern 5
+	duty_cycle_pattern 0, 0, 1, 1
 	square_note 15, 10, 0, 1857
 	square_note 15, 11, 0, 1859
 	square_note 15, 9, 3, 1457
diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm
index 3710e797..a204fc10 100644
--- a/audio/sfx/unused_3.asm
+++ b/audio/sfx/unused_3.asm
@@ -1,5 +1,5 @@
 SFX_Unused_3_Ch5:
-	duty_cycle_pattern 240
+	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 14, 0, 1920
 	square_note 15, 15, 0, 1924
 	square_note 15, 12, 3, 1504
@@ -10,7 +10,7 @@ SFX_Unused_3_Ch5:
 
 
 SFX_Unused_3_Ch6:
-	duty_cycle_pattern 5
+	duty_cycle_pattern 0, 0, 1, 1
 	square_note 15, 10, 0, 1857
 	square_note 15, 11, 0, 1859
 	square_note 15, 9, 3, 1457
diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm
index a2282445..620b61ad 100755
--- a/macros/audio_macros.asm
+++ b/macros/audio_macros.asm
@@ -30,17 +30,22 @@ audio_header: MACRO
 	ENDC
 ENDM
 
-;format: length [0, 7], pitch change [-7, 7]
+; arguments: length [0, 7], pitch change [-7, 7]
+; length: length of time between pitch shifts
+; pitch change: positive value means increase in pitch, negative value means decrease in pitch
+;               small magnitude means quick change, large magnitude means slow change
 pitch_sweep: MACRO
 	db $10
-	IF \2 > 0
-		db (\1 << 4) | \2
-	ELSE
+	IF \2 <= 0
 		db (\1 << 4) | (%1000 | (\2 * -1))
+	ELSE
+		db (\1 << 4) | \2
 	ENDC
 ENDM
 
-;format: length [0, 15], volume [0, 15], volume change [-7, 7], frequency
+; arguments: length [0, 15], volume [0, 15], fade [-7, 7], frequency
+; fade: positive value means decrease in volume, negative value means increase in volume
+;       small magnitude means quick change, large magnitude means slow change
 square_note: MACRO
 	db $20 | \1
 	IF \3 < 0
@@ -51,7 +56,9 @@ square_note: MACRO
 	dw \4
 ENDM
 
-;format: length [0, 15], volume [0, 15], volume change [-7, 7], frequency
+; arguments: length [0, 15], volume [0, 15], fade [-7, 7], frequency
+; fade: positive value means decrease in volume, negative value means increase in volume
+;       small magnitude means quick change, large magnitude means slow change
 noise_note: MACRO
 	db $20 | \1
 	IF \3 < 0
@@ -75,18 +82,18 @@ A_ EQU $9
 A# EQU $A
 B_ EQU $B
 
-;format: pitch, length (in 16ths)
+; arguments: pitch, length [1, 16]
 note: MACRO
 	db (\1 << 4) | (\2 - 1)
 ENDM
 
-;format: instrument, length (in 16ths)
+; arguments: instrument [1, 19], length [1, 16]
 dnote: MACRO
 	db $B0 | (\2 - 1)
 	db \1
 ENDM
 
-;format: instrument [1, 3-10], length (in 16ths)
+; arguments: instrument, length [1, 16]
 ; like dnote but one 1 byte instead of 2
 ; can only be used with instruments 1-10, excluding 2
 ; unused
@@ -94,79 +101,103 @@ dnote_short: MACRO
 	db (\1 << 4) | (\2 - 1)
 ENDM
 
-;format: length (in 16ths)
+; arguments: length [1, 16]
 rest: MACRO
 	db $C0 | (\1 - 1)
 ENDM
 
-;format: speed, volume, fade
+; arguments: speed [0, 15], volume [0, 15], fade [-7, 7]
+; fade: positive value means decrease in volume, negative value means increase in volume
+;       small magnitude means quick change, large magnitude means slow change
 note_type: MACRO
 	db $D0 | \1
-	db (\2 << 4) | \3
+	IF \3 < 0
+		db (\2 << 4) | (%1000 | (\3 * -1))
+	ELSE
+		db (\2 << 4) | \3
+	ENDC
 ENDM
 
+; arguments: speed [0, 15]
 dspeed: MACRO
 	db $D0 | \1
 ENDM
 
+; arguments: octave [1, 8]
 octave: MACRO
 	db $E8 - \1
 ENDM
 
+; when enabled, effective frequency used is incremented by 1
 toggle_perfect_pitch: MACRO
 	db $E8
 ENDM
 
-;format: vibrato delay, rate, depth
+; arguments: delay [0, 255], depth [0, 15], rate [0, 15]
+; delay: time delay until vibrato effect begins
+; depth: amplitude of vibrato wave
+; rate: frequency of vibrato wave
 vibrato: MACRO
 	db $EA
 	db \1
 	db (\2 << 4) | \3
 ENDM
 
+; arguments: length [1, 256], octave [1, 8], pitch
 pitch_slide: MACRO
 	db $EB
-	db \1
-	db \2
+	db \1 - 1
+	db ((8 - \2) << 4) | \3
 ENDM
 
+; arguments: duty cycle [0, 3] (12.5%, 25%, 50%, 75%)
 duty_cycle: MACRO
 	db $EC
 	db \1
 ENDM
 
+; arguments: tempo [0, $ffff]
+; used to calculate note delay counters
+; so a smaller value means music plays faster
+; ideally should be set to $100 or less to guarantee no overflow
+; if larger than $100, large note speed or note length values might cause overflow
+; stored in big endian
 tempo: MACRO
 	db $ED
 	db \1 / $100
 	db \1 % $100
 ENDM
 
+; arguments: left output enable mask, right output enable mask
 stereo_panning: MACRO
 	db $EE
-	db \1
+	db (\1 << 4) | \2
 ENDM
 
+; arguments: left master volume [0, 7], right master volume [0, 7]
 volume: MACRO
 	db $F0
 	db (\1 << 4) | \2
 ENDM
 
+; when enabled, the sfx data is interpreted as music data
 execute_music: MACRO
 	db $F8
 ENDM
 
+; arguments: duty cycle 1, duty cycle 2, duty cycle 3, duty cycle 4
 duty_cycle_pattern: MACRO
 	db $FC
-	db \1
+	db \1 << 6 | \2 << 4 | \3 << 2 | \4
 ENDM
 
-;format: address
+; arguments: address
 sound_call: MACRO
 	db $FD
 	dw \1
 ENDM
 
-;format: count, address
+; arguments: count, address
 sound_loop: MACRO
 	db $FE
 	db \1
-- 
cgit v1.3.1-sl0p


From 44b9a240d4b2dd28737fa7aff37fb7d0582b25d6 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Sun, 25 Aug 2019 09:57:50 -0500
Subject: Make pitch_sweep pitch change argument consistent with the other
 signed magnitude arguments

---
 audio/sfx/arrow_tiles_1.asm      | 2 +-
 audio/sfx/arrow_tiles_3.asm      | 2 +-
 audio/sfx/ball_poof.asm          | 2 +-
 audio/sfx/battle_09.asm          | 2 +-
 audio/sfx/battle_1e.asm          | 2 +-
 audio/sfx/battle_24.asm          | 2 +-
 audio/sfx/battle_32.asm          | 2 +-
 audio/sfx/collision_1.asm        | 2 +-
 audio/sfx/collision_3.asm        | 2 +-
 audio/sfx/denied_1.asm           | 2 +-
 audio/sfx/denied_3.asm           | 2 +-
 audio/sfx/dex_page_added.asm     | 2 +-
 audio/sfx/faint_fall.asm         | 2 +-
 audio/sfx/faint_thud.asm         | 2 +-
 audio/sfx/heal_ailment_1.asm     | 2 +-
 audio/sfx/heal_ailment_2.asm     | 2 +-
 audio/sfx/heal_ailment_3.asm     | 2 +-
 audio/sfx/heal_hp_1.asm          | 2 +-
 audio/sfx/heal_hp_2.asm          | 2 +-
 audio/sfx/heal_hp_3.asm          | 2 +-
 audio/sfx/healing_machine_1.asm  | 2 +-
 audio/sfx/healing_machine_3.asm  | 2 +-
 audio/sfx/intro_hip.asm          | 2 +-
 audio/sfx/intro_hop.asm          | 2 +-
 audio/sfx/ledge_1.asm            | 2 +-
 audio/sfx/ledge_3.asm            | 2 +-
 audio/sfx/poisoned_1.asm         | 2 +-
 audio/sfx/poisoned_3.asm         | 2 +-
 audio/sfx/psychic_m.asm          | 2 +-
 audio/sfx/shooting_star.asm      | 2 +-
 audio/sfx/shrink_1.asm           | 2 +-
 audio/sfx/shrink_3.asm           | 2 +-
 audio/sfx/teleport_enter1_1.asm  | 2 +-
 audio/sfx/teleport_enter1_3.asm  | 2 +-
 audio/sfx/teleport_exit1_1.asm   | 2 +-
 audio/sfx/teleport_exit1_3.asm   | 2 +-
 audio/sfx/teleport_exit2_1.asm   | 2 +-
 audio/sfx/teleport_exit2_3.asm   | 2 +-
 audio/sfx/tink_1.asm             | 2 +-
 audio/sfx/tink_2.asm             | 2 +-
 audio/sfx/tink_3.asm             | 2 +-
 audio/sfx/trade_machine_1.asm    | 2 +-
 audio/sfx/trade_machine_3.asm    | 2 +-
 audio/sfx/withdraw_deposit_1.asm | 2 +-
 audio/sfx/withdraw_deposit_3.asm | 2 +-
 macros/audio_macros.asm          | 7 ++++++-
 46 files changed, 51 insertions(+), 46 deletions(-)

(limited to 'macros')

diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm
index 0ab4cbe2..30d12c8b 100644
--- a/audio/sfx/arrow_tiles_1.asm
+++ b/audio/sfx/arrow_tiles_1.asm
@@ -2,5 +2,5 @@ SFX_Arrow_Tiles_1_Ch5:
 	duty_cycle 0
 	pitch_sweep 1, 7
 	square_note 15, 13, 2, 1792
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm
index 787e431d..81c1774a 100644
--- a/audio/sfx/arrow_tiles_3.asm
+++ b/audio/sfx/arrow_tiles_3.asm
@@ -2,5 +2,5 @@ SFX_Arrow_Tiles_3_Ch5:
 	duty_cycle 0
 	pitch_sweep 1, 7
 	square_note 15, 13, 2, 1792
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm
index 9503c570..396adf44 100644
--- a/audio/sfx/ball_poof.asm
+++ b/audio/sfx/ball_poof.asm
@@ -2,7 +2,7 @@ SFX_Ball_Poof_Ch5:
 	duty_cycle 2
 	pitch_sweep 1, 6
 	square_note 15, 15, 2, 1024
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
 
 
diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm
index ef3cf017..7a61373b 100644
--- a/audio/sfx/battle_09.asm
+++ b/audio/sfx/battle_09.asm
@@ -2,5 +2,5 @@ SFX_Battle_09_Ch5:
 	duty_cycle 1
 	pitch_sweep 9, 7
 	square_note 15, 15, 2, 1280
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm
index ff4b0cbc..26820e8d 100644
--- a/audio/sfx/battle_1e.asm
+++ b/audio/sfx/battle_1e.asm
@@ -4,7 +4,7 @@ SFX_Battle_1E_Ch5:
 	square_note 4, 15, 2, 512
 	pitch_sweep 2, 2
 	square_note 8, 14, 2, 512
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
 
 
diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm
index 5b6c8e56..f99cf59a 100644
--- a/audio/sfx/battle_24.asm
+++ b/audio/sfx/battle_24.asm
@@ -2,7 +2,7 @@ SFX_Battle_24_Ch5:
 	duty_cycle 1
 	pitch_sweep 9, 7
 	square_note 15, 15, 2, 1792
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
 
 
diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm
index 53dfac32..c906dcac 100644
--- a/audio/sfx/battle_32.asm
+++ b/audio/sfx/battle_32.asm
@@ -2,7 +2,7 @@ SFX_Battle_32_Ch5:
 	duty_cycle 2
 	pitch_sweep 10, -7
 	square_note 8, 15, 1, 1792
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
 
 
diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm
index a6303265..70eb33ae 100644
--- a/audio/sfx/collision_1.asm
+++ b/audio/sfx/collision_1.asm
@@ -2,5 +2,5 @@ SFX_Collision_1_Ch5:
 	duty_cycle 2
 	pitch_sweep 5, -2
 	square_note 15, 15, 1, 768
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm
index ae68314a..8b557bcc 100644
--- a/audio/sfx/collision_3.asm
+++ b/audio/sfx/collision_3.asm
@@ -2,5 +2,5 @@ SFX_Collision_3_Ch5:
 	duty_cycle 2
 	pitch_sweep 5, -2
 	square_note 15, 15, 1, 768
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm
index fe822270..2c132003 100644
--- a/audio/sfx/denied_1.asm
+++ b/audio/sfx/denied_1.asm
@@ -2,7 +2,7 @@ SFX_Denied_1_Ch5:
 	duty_cycle 3
 	pitch_sweep 5, -2
 	square_note 4, 15, 0, 1280
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	square_note 4, 0, 0, 0
 	square_note 15, 15, 0, 1280
 	square_note 1, 0, 0, 0
diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm
index 51b98de4..56a0753f 100644
--- a/audio/sfx/denied_3.asm
+++ b/audio/sfx/denied_3.asm
@@ -2,7 +2,7 @@ SFX_Denied_3_Ch5:
 	duty_cycle 3
 	pitch_sweep 5, -2
 	square_note 4, 15, 0, 1280
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	square_note 4, 0, 0, 0
 	square_note 15, 15, 0, 1280
 	square_note 1, 0, 0, 0
diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm
index 147c3eb7..555b3beb 100644
--- a/audio/sfx/dex_page_added.asm
+++ b/audio/sfx/dex_page_added.asm
@@ -4,7 +4,7 @@ SFX_Dex_Page_Added_Ch5:
 	square_note 15, 15, 0, 1264
 	pitch_sweep 1, 7
 	square_note 15, 15, 2, 1616
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
 
 
diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm
index 6ce363e0..47f45037 100644
--- a/audio/sfx/faint_fall.asm
+++ b/audio/sfx/faint_fall.asm
@@ -2,5 +2,5 @@ SFX_Faint_Fall_Ch5:
 	duty_cycle 1
 	pitch_sweep 10, -7
 	square_note 15, 15, 2, 1920
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm
index d7449c84..527e027f 100644
--- a/audio/sfx/faint_thud.asm
+++ b/audio/sfx/faint_thud.asm
@@ -1,6 +1,6 @@
 SFX_Faint_Thud_Ch5:
 	square_note 15, 13, 1, 512
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
 
 
diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm
index a14afe1a..88a92881 100644
--- a/audio/sfx/heal_ailment_1.asm
+++ b/audio/sfx/heal_ailment_1.asm
@@ -5,5 +5,5 @@ SFX_Heal_Ailment_1_Ch5:
 	square_note 4, 15, 2, 1536
 	pitch_sweep 1, 7
 	square_note 15, 15, 2, 1536
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm
index 81171c12..6e3e68d9 100644
--- a/audio/sfx/heal_ailment_2.asm
+++ b/audio/sfx/heal_ailment_2.asm
@@ -5,5 +5,5 @@ SFX_Heal_Ailment_2_Ch5:
 	square_note 4, 15, 2, 1536
 	pitch_sweep 1, 7
 	square_note 15, 15, 2, 1536
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm
index b1a0a570..660d9abe 100644
--- a/audio/sfx/heal_ailment_3.asm
+++ b/audio/sfx/heal_ailment_3.asm
@@ -5,5 +5,5 @@ SFX_Heal_Ailment_3_Ch5:
 	square_note 4, 15, 2, 1536
 	pitch_sweep 1, 7
 	square_note 15, 15, 2, 1536
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm
index f6413962..8dafb807 100644
--- a/audio/sfx/heal_hp_1.asm
+++ b/audio/sfx/heal_hp_1.asm
@@ -3,5 +3,5 @@ SFX_Heal_HP_1_Ch5:
 	pitch_sweep 1, 7
 	square_note 15, 15, 0, 1264
 	square_note 15, 15, 2, 1616
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm
index c784c174..9eef9472 100644
--- a/audio/sfx/heal_hp_2.asm
+++ b/audio/sfx/heal_hp_2.asm
@@ -3,5 +3,5 @@ SFX_Heal_HP_2_Ch5:
 	pitch_sweep 1, 7
 	square_note 15, 15, 0, 1264
 	square_note 15, 15, 2, 1616
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm
index 7ca9d73b..22651532 100644
--- a/audio/sfx/heal_hp_3.asm
+++ b/audio/sfx/heal_hp_3.asm
@@ -3,5 +3,5 @@ SFX_Heal_HP_3_Ch5:
 	pitch_sweep 1, 7
 	square_note 15, 15, 0, 1264
 	square_note 15, 15, 2, 1616
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm
index 59d3f21a..9350ffd3 100644
--- a/audio/sfx/healing_machine_1.asm
+++ b/audio/sfx/healing_machine_1.asm
@@ -4,6 +4,6 @@ SFX_Healing_Machine_1_Ch5:
 	square_note 4, 15, 2, 1280
 	pitch_sweep 2, 2
 	square_note 2, 15, 1, 1280
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	square_note 1, 0, 0, 0
 	sound_ret
diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm
index 3078dba5..5df3856b 100644
--- a/audio/sfx/healing_machine_3.asm
+++ b/audio/sfx/healing_machine_3.asm
@@ -4,6 +4,6 @@ SFX_Healing_Machine_3_Ch5:
 	square_note 4, 15, 2, 1280
 	pitch_sweep 2, 2
 	square_note 2, 15, 1, 1280
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	square_note 1, 0, 0, 0
 	sound_ret
diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm
index 47e37c21..3d0f6642 100644
--- a/audio/sfx/intro_hip.asm
+++ b/audio/sfx/intro_hip.asm
@@ -2,5 +2,5 @@ SFX_Intro_Hip_Ch5:
 	duty_cycle 2
 	pitch_sweep 2, 6
 	square_note 12, 12, 2, 1856
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm
index 1bee7a5c..9c7c1ad6 100644
--- a/audio/sfx/intro_hop.asm
+++ b/audio/sfx/intro_hop.asm
@@ -2,5 +2,5 @@ SFX_Intro_Hop_Ch5:
 	duty_cycle 2
 	pitch_sweep 2, 6
 	square_note 12, 12, 2, 1664
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm
index 6cfb4d26..dd798f40 100644
--- a/audio/sfx/ledge_1.asm
+++ b/audio/sfx/ledge_1.asm
@@ -2,5 +2,5 @@ SFX_Ledge_1_Ch5:
 	duty_cycle 2
 	pitch_sweep 9, 5
 	square_note 15, 15, 2, 1024
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm
index 97627116..c218ee1b 100644
--- a/audio/sfx/ledge_3.asm
+++ b/audio/sfx/ledge_3.asm
@@ -2,5 +2,5 @@ SFX_Ledge_3_Ch5:
 	duty_cycle 2
 	pitch_sweep 9, 5
 	square_note 15, 15, 2, 1024
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm
index 2c922df7..6827147c 100644
--- a/audio/sfx/poisoned_1.asm
+++ b/audio/sfx/poisoned_1.asm
@@ -4,5 +4,5 @@ SFX_Poisoned_1_Ch5:
 	square_note 4, 15, 2, 1536
 	sound_loop 4, SFX_Poisoned_1_Ch5
 	square_note 15, 15, 3, 1536
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm
index 2c0b58cc..fa1808c3 100644
--- a/audio/sfx/poisoned_3.asm
+++ b/audio/sfx/poisoned_3.asm
@@ -4,5 +4,5 @@ SFX_Poisoned_3_Ch5:
 	square_note 4, 15, 2, 1536
 	sound_loop 4, SFX_Poisoned_3_Ch5
 	square_note 15, 15, 3, 1536
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm
index c6e11d42..ff0ab384 100644
--- a/audio/sfx/psychic_m.asm
+++ b/audio/sfx/psychic_m.asm
@@ -7,7 +7,7 @@ SFX_Psychic_M_Ch5:
 	square_note 8, 12, 4, 1984
 	square_note 15, 12, 4, 1985
 	square_note 15, 15, 2, 1984
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
 
 
diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm
index 2a125987..cbef7398 100644
--- a/audio/sfx/shooting_star.asm
+++ b/audio/sfx/shooting_star.asm
@@ -10,5 +10,5 @@ SFX_Shooting_Star_Ch5:
 	square_note 8, 6, 0, 2016
 	square_note 8, 3, 0, 2016
 	square_note 15, 1, 2, 2016
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm
index ae869564..912dd3f9 100644
--- a/audio/sfx/shrink_1.asm
+++ b/audio/sfx/shrink_1.asm
@@ -6,5 +6,5 @@ SFX_Shrink_1_Ch5:
 	square_note 15, 8, 7, 1280
 	square_note 15, 4, 7, 1152
 	square_note 15, 1, 7, 1024
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm
index b944680f..88da25c2 100644
--- a/audio/sfx/shrink_3.asm
+++ b/audio/sfx/shrink_3.asm
@@ -6,5 +6,5 @@ SFX_Shrink_3_Ch5:
 	square_note 15, 8, 7, 1280
 	square_note 15, 4, 7, 1152
 	square_note 15, 1, 7, 1024
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm
index 4f99dae1..eddaffa6 100644
--- a/audio/sfx/teleport_enter1_1.asm
+++ b/audio/sfx/teleport_enter1_1.asm
@@ -6,5 +6,5 @@ SFX_Teleport_Enter1_1_Ch5:
 	square_note 15, 8, 7, 1536
 	square_note 15, 4, 7, 1408
 	square_note 15, 1, 7, 1280
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm
index c6502a29..fc185621 100644
--- a/audio/sfx/teleport_enter1_3.asm
+++ b/audio/sfx/teleport_enter1_3.asm
@@ -6,5 +6,5 @@ SFX_Teleport_Enter1_3_Ch5:
 	square_note 15, 8, 7, 1536
 	square_note 15, 4, 7, 1408
 	square_note 15, 1, 7, 1280
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm
index b2511b1f..5e27525e 100644
--- a/audio/sfx/teleport_exit1_1.asm
+++ b/audio/sfx/teleport_exit1_1.asm
@@ -6,5 +6,5 @@ SFX_Teleport_Exit1_1_Ch5:
 	square_note 15, 8, 7, 1536
 	square_note 15, 4, 7, 1664
 	square_note 15, 1, 7, 1792
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm
index 6a3b2d96..350da576 100644
--- a/audio/sfx/teleport_exit1_3.asm
+++ b/audio/sfx/teleport_exit1_3.asm
@@ -6,5 +6,5 @@ SFX_Teleport_Exit1_3_Ch5:
 	square_note 15, 8, 7, 1536
 	square_note 15, 4, 7, 1664
 	square_note 15, 1, 7, 1792
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm
index 23a6ea85..a2a36942 100644
--- a/audio/sfx/teleport_exit2_1.asm
+++ b/audio/sfx/teleport_exit2_1.asm
@@ -2,5 +2,5 @@ SFX_Teleport_Exit2_1_Ch5:
 	duty_cycle 1
 	pitch_sweep 1, 6
 	square_note 15, 13, 2, 1280
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm
index 178a4d78..70d809c3 100644
--- a/audio/sfx/teleport_exit2_3.asm
+++ b/audio/sfx/teleport_exit2_3.asm
@@ -2,5 +2,5 @@ SFX_Teleport_Exit2_3_Ch5:
 	duty_cycle 1
 	pitch_sweep 1, 6
 	square_note 15, 13, 2, 1280
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm
index 4e471fab..7d56a081 100644
--- a/audio/sfx/tink_1.asm
+++ b/audio/sfx/tink_1.asm
@@ -4,5 +4,5 @@ SFX_Tink_1_Ch5:
 	square_note 4, 15, 2, 512
 	pitch_sweep 2, 2
 	square_note 8, 14, 2, 512
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm
index 077d93be..94aa8929 100644
--- a/audio/sfx/tink_2.asm
+++ b/audio/sfx/tink_2.asm
@@ -4,5 +4,5 @@ SFX_Tink_2_Ch5:
 	square_note 4, 15, 2, 512
 	pitch_sweep 2, 2
 	square_note 8, 14, 2, 512
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm
index e06ed62e..1134fdc4 100644
--- a/audio/sfx/tink_3.asm
+++ b/audio/sfx/tink_3.asm
@@ -4,5 +4,5 @@ SFX_Tink_3_Ch5:
 	square_note 4, 15, 2, 512
 	pitch_sweep 2, 2
 	square_note 8, 14, 2, 512
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm
index 050182b7..f09982eb 100644
--- a/audio/sfx/trade_machine_1.asm
+++ b/audio/sfx/trade_machine_1.asm
@@ -3,5 +3,5 @@ SFX_Trade_Machine_1_Ch5:
 	pitch_sweep 1, 5
 	square_note 15, 15, 0, 1264
 	square_note 15, 15, 2, 1616
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm
index d14fc4c1..a85b717e 100644
--- a/audio/sfx/trade_machine_3.asm
+++ b/audio/sfx/trade_machine_3.asm
@@ -3,5 +3,5 @@ SFX_Trade_Machine_3_Ch5:
 	pitch_sweep 1, 5
 	square_note 15, 15, 0, 1264
 	square_note 15, 15, 2, 1616
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm
index 9c4f2868..c7ab2447 100644
--- a/audio/sfx/withdraw_deposit_1.asm
+++ b/audio/sfx/withdraw_deposit_1.asm
@@ -8,5 +8,5 @@ SFX_Withdraw_Deposit_1_Ch5:
 	square_note 4, 15, 2, 1792
 	pitch_sweep 2, 2
 	square_note 15, 14, 2, 1792
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm
index cd881753..568f3230 100644
--- a/audio/sfx/withdraw_deposit_3.asm
+++ b/audio/sfx/withdraw_deposit_3.asm
@@ -8,5 +8,5 @@ SFX_Withdraw_Deposit_3_Ch5:
 	square_note 4, 15, 2, 1792
 	pitch_sweep 2, 2
 	square_note 15, 14, 2, 1792
-	pitch_sweep 0, 0
+	pitch_sweep 0, 8
 	sound_ret
diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm
index 620b61ad..643114da 100755
--- a/macros/audio_macros.asm
+++ b/macros/audio_macros.asm
@@ -32,11 +32,13 @@ ENDM
 
 ; arguments: length [0, 7], pitch change [-7, 7]
 ; length: length of time between pitch shifts
+;         sometimes used with a value >7 in which case the MSB is ignored
 ; pitch change: positive value means increase in pitch, negative value means decrease in pitch
 ;               small magnitude means quick change, large magnitude means slow change
+;               in signed magnitude representation, so a value of 8 is the same as (negative) 0
 pitch_sweep: MACRO
 	db $10
-	IF \2 <= 0
+	IF \2 < 0
 		db (\1 << 4) | (%1000 | (\2 * -1))
 	ELSE
 		db (\1 << 4) | \2
@@ -46,6 +48,7 @@ ENDM
 ; arguments: length [0, 15], volume [0, 15], fade [-7, 7], frequency
 ; fade: positive value means decrease in volume, negative value means increase in volume
 ;       small magnitude means quick change, large magnitude means slow change
+;       in signed magnitude representation, so a value of 8 is the same as (negative) 0
 square_note: MACRO
 	db $20 | \1
 	IF \3 < 0
@@ -59,6 +62,7 @@ ENDM
 ; arguments: length [0, 15], volume [0, 15], fade [-7, 7], frequency
 ; fade: positive value means decrease in volume, negative value means increase in volume
 ;       small magnitude means quick change, large magnitude means slow change
+;       in signed magnitude representation, so a value of 8 is the same as (negative) 0
 noise_note: MACRO
 	db $20 | \1
 	IF \3 < 0
@@ -109,6 +113,7 @@ ENDM
 ; arguments: speed [0, 15], volume [0, 15], fade [-7, 7]
 ; fade: positive value means decrease in volume, negative value means increase in volume
 ;       small magnitude means quick change, large magnitude means slow change
+;       in signed magnitude representation, so a value of 8 is the same as (negative) 0
 note_type: MACRO
 	db $D0 | \1
 	IF \3 < 0
-- 
cgit v1.3.1-sl0p


From 362bba7642431d87371cb86c9442e7636fcd287b Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Tue, 3 Sep 2019 22:36:02 -0500
Subject: 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                 | 160 +++++++--------
 audio/music/routes3.asm                 | 310 ++++++++++++++---------------
 audio/music/routes4.asm                 | 334 ++++++++++++++++----------------
 audio/music/titlescreen.asm             | 284 +++++++++++++--------------
 audio/music/vermilion.asm               |  52 ++---
 audio/music/yellow/yellowunusedsong.asm | 236 +++++++++++-----------
 macros/audio_macros.asm                 |   8 +-
 21 files changed, 1108 insertions(+), 1108 deletions(-)

(limited to 'macros')

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
-	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_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	rest 2
+	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
-	rest 2
-	dnote 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_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 2
+	rest 2
+	drum_note 3, 2
+	rest 2
+	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
-	rest 2
-	dspeed 8
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 3
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	rest 2
+	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
-	rest 2
-	dspeed 8
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 3
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	rest 2
+	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
-	rest 2
-	dspeed 8
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 2
-	dnote 3, 3
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	rest 2
+	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
-	rest 3
-	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
+	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
-	rest 3
-	dnote 2, 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
+	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
 
-- 
cgit v1.3.1-sl0p