diff --git a/audio/engine_1.asm b/audio/engine_1.asm
index f762da29..bab1be55 100644
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -563,7 +563,7 @@ Audio1_executemusic:
 Audio1_octave:
 	and $f0
 	cp $e0 ; is this command an octave?
-	jr nz, Audio1_unknownsfx0x20 ; no
+	jr nz, Audio1_sfxnote ; no
 	ld hl, wChannelOctaves
 	ld b, 0
 	add hl, bc
@@ -572,17 +572,18 @@ Audio1_octave:
 	ld [hl], a ; store low nibble as octave
 	jp Audio1_endchannel
 
-Audio1_unknownsfx0x20:
-	cp $20 ; is this command an unknownsfx0x20?
-	jr nz, Audio1_unknownsfx0x10
+; sfxnote is either squarenote or noisenote depending on the channel
+Audio1_sfxnote:
+	cp $20 ; is this command a sfxnote?
+	jr nz, Audio1_pitchenvelope
 	ld a, c
 	cp Ch3 ; is this a noise or sfx channel?
-	jr c, Audio1_unknownsfx0x10 ; no
+	jr c, Audio1_pitchenvelope ; no
 	ld b, 0
 	ld hl, wChannelFlags2
 	add hl, bc
 	bit BIT_EXECUTE_MUSIC, [hl] ; is executemusic being used?
-	jr nz, Audio1_unknownsfx0x10 ; yes
+	jr nz, Audio1_pitchenvelope ; yes
 	call Audio1_notelength
 
 ; This code seems to do the same thing as what Audio1_ApplyDutyAndSoundLength
@@ -624,12 +625,12 @@ Audio1_unknownsfx0x20:
 	call Audio1_ApplyWavePatternAndFrequency
 	ret
 
-Audio1_unknownsfx0x10:
+Audio1_pitchenvelope:
 	ld a, c
 	cp Ch4
 	jr c, Audio1_note ; if not a sfx
 	ld a, d
-	cp $10 ; is this command a unknownsfx0x10?
+	cp $10 ; is this command a pitchenvelope?
 	jr nz, Audio1_note ; no
 	ld b, $0
 	ld hl, wChannelFlags2
diff --git a/audio/engine_2.asm b/audio/engine_2.asm
index 4eb9b96b..2ca5cbe8 100644
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -557,7 +557,7 @@ Audio2_executemusic:
 Audio2_octave:
 	and $f0
 	cp $e0 ; is this command an octave?
-	jr nz, Audio2_unknownsfx0x20 ; no
+	jr nz, Audio2_sfxnote ; no
 	ld hl, wChannelOctaves ; yes
 	ld b, $0
 	add hl, bc
@@ -566,17 +566,18 @@ Audio2_octave:
 	ld [hl], a ; store low nibble as octave
 	jp Audio2_endchannel
 
-Audio2_unknownsfx0x20:
-	cp $20 ; is this command an unknownsfx0x20?
-	jr nz, Audio2_unknownsfx0x10 ; no
+; sfxnote is either squarenote or noisenote depending on the channel
+Audio2_sfxnote:
+	cp $20 ; is this command an sfxnote?
+	jr nz, Audio2_pitchenvelope ; no
 	ld a, c
 	cp Ch3 ; is this a noise or sfx channel?
-	jr c, Audio2_unknownsfx0x10 ; no
+	jr c, Audio2_pitchenvelope ; no
 	ld b, $0
 	ld hl, wChannelFlags2
 	add hl, bc
 	bit 0, [hl]
-	jr nz, Audio2_unknownsfx0x10 ; no
+	jr nz, Audio2_pitchenvelope ; no
 	call Audio2_notelength
 	ld d, a
 	ld b, $0
@@ -611,12 +612,12 @@ Audio2_unknownsfx0x20:
 	call Audio2_21dcc
 	ret
 
-Audio2_unknownsfx0x10:
+Audio2_pitchenvelope:
 	ld a, c
 	cp Ch4
 	jr c, Audio2_note ; if not a sfx
 	ld a, d
-	cp $10 ; is this command a unknownsfx0x10?
+	cp $10 ; is this command a pitchenvelope?
 	jr nz, Audio2_note ; no
 	ld b, $0
 	ld hl, wChannelFlags2
diff --git a/audio/engine_3.asm b/audio/engine_3.asm
index bd784023..9a95f3e1 100644
--- a/audio/engine_3.asm
+++ b/audio/engine_3.asm
@@ -550,7 +550,7 @@ Audio3_executemusic:
 Audio3_octave:
 	and $f0
 	cp $e0 ; is this command an octave?
-	jr nz, Audio3_unknownsfx0x20 ; no
+	jr nz, Audio3_sfxnote ; no
 	ld hl, wChannelOctaves ; yes
 	ld b, $0
 	add hl, bc
@@ -559,17 +559,18 @@ Audio3_octave:
 	ld [hl], a ; store low nibble as octave
 	jp Audio3_endchannel
 
-Audio3_unknownsfx0x20:
-	cp $20 ; is this command an unknownsfx0x20?
-	jr nz, Audio3_unknownsfx0x10 ; no
+; sfxnote is either squarenote or noisenote depending on the channel
+Audio3_sfxnote:
+	cp $20 ; is this command an sfxnote?
+	jr nz, Audio3_pitchenvelope ; no
 	ld a, c
 	cp Ch3 ; is this a noise or sfx channel?
-	jr c, Audio3_unknownsfx0x10 ; no
+	jr c, Audio3_pitchenvelope ; no
 	ld b, $0
 	ld hl, wChannelFlags2
 	add hl, bc
 	bit 0, [hl]
-	jr nz, Audio3_unknownsfx0x10 ; no
+	jr nz, Audio3_pitchenvelope ; no
 	call Audio3_notelength ; yes
 	ld d, a
 	ld b, $0
@@ -604,12 +605,12 @@ Audio3_unknownsfx0x20:
 	call Audio3_7d6bf
 	ret
 
-Audio3_unknownsfx0x10:
+Audio3_pitchenvelope:
 	ld a, c
 	cp Ch4
 	jr c, Audio3_note ; if not a sfx
 	ld a, d
-	cp $10 ; is this command an unknownsfx0x10?
+	cp $10 ; is this command an pitchenvelope?
 	jr nz, Audio3_note ; no
 	ld b, $0
 	ld hl, wChannelFlags2
diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm
index a13fff48..ac115501 100644
--- a/audio/sfx/59_1.asm
+++ b/audio/sfx/59_1.asm
@@ -1,11 +1,11 @@
 SFX_59_1_Ch4:
 	dutycycle 2
-	unknownsfx0x20 4, 241, 128, 7
+	squarenote 4, 15, 1, 1920
 	endchannel
 
 
 SFX_59_1_Ch5:
 	dutycycle 2
-	unknownsfx0x20 1, 8, 0, 0
-	unknownsfx0x20 4, 161, 97, 7
+	squarenote 1, 0, 8, 0
+	squarenote 4, 10, 1, 1889
 	endchannel
diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm
index e04d095b..b42b4cf2 100644
--- a/audio/sfx/arrow_tiles_1.asm
+++ b/audio/sfx/arrow_tiles_1.asm
@@ -1,6 +1,6 @@
 SFX_Arrow_Tiles_1_Ch4:
 	dutycycle 0
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 210, 0, 7
-	unknownsfx0x10 8
+	pitchenvelope 1, 7
+	squarenote 15, 13, 2, 1792
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm
index 3db9ca6c..7201a546 100644
--- a/audio/sfx/ball_poof.asm
+++ b/audio/sfx/ball_poof.asm
@@ -1,11 +1,11 @@
 SFX_Ball_Poof_Ch4:
 	dutycycle 2
-	unknownsfx0x10 22
-	unknownsfx0x20 15, 242, 0, 4
-	unknownsfx0x10 8
+	pitchenvelope 1, 6
+	squarenote 15, 15, 2, 1024
+	pitchenvelope 0, 0
 	endchannel
 
 
 SFX_Ball_Poof_Ch7:
-	unknownnoise0x20 15, 162, 34
+	noisenote 15, 10, 2, 34
 	endchannel
diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm
index 4bf46a7f..e9f550a8 100644
--- a/audio/sfx/ball_toss.asm
+++ b/audio/sfx/ball_toss.asm
@@ -1,11 +1,11 @@
 SFX_Ball_Toss_Ch4:
 	dutycycle 2
-	unknownsfx0x10 47
-	unknownsfx0x20 15, 242, 128, 7
+	pitchenvelope 2, -7
+	squarenote 15, 15, 2, 1920
 	endchannel
 
 
 SFX_Ball_Toss_Ch5:
 	dutycycle 2
-	unknownsfx0x20 15, 194, 130, 7
+	squarenote 15, 12, 2, 1922
 	endchannel
diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm
index 16a2e912..c5ee1afa 100644
--- a/audio/sfx/battle_09.asm
+++ b/audio/sfx/battle_09.asm
@@ -1,6 +1,6 @@
 SFX_Battle_09_Ch4:
 	dutycycle 1
-	unknownsfx0x10 151
-	unknownsfx0x20 15, 242, 0, 5
-	unknownsfx0x10 8
+	pitchenvelope 9, 7
+	squarenote 15, 15, 2, 1280
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm
index d6feba8e..06e2fa14 100644
--- a/audio/sfx/battle_0b.asm
+++ b/audio/sfx/battle_0b.asm
@@ -1,3 +1,3 @@
 SFX_Battle_0B_Ch7:
-	unknownnoise0x20 8, 241, 84
+	noisenote 8, 15, 1, 84
 	endchannel
diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm
index f193fc20..67e910eb 100644
--- a/audio/sfx/battle_0c.asm
+++ b/audio/sfx/battle_0c.asm
@@ -1,5 +1,5 @@
 SFX_Battle_0C_Ch7:
-	unknownnoise0x20 15, 143, 17
-	unknownnoise0x20 4, 255, 18
-	unknownnoise0x20 10, 241, 85
+	noisenote 15, 8, -7, 17
+	noisenote 4, 15, -7, 18
+	noisenote 10, 15, 1, 85
 	endchannel
diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm
index f9d423ad..231d324f 100644
--- a/audio/sfx/battle_0d.asm
+++ b/audio/sfx/battle_0d.asm
@@ -1,5 +1,5 @@
 SFX_Battle_0D_Ch7:
-	unknownnoise0x20 15, 143, 52
-	unknownnoise0x20 8, 242, 53
-	unknownnoise0x20 10, 241, 85
+	noisenote 15, 8, -7, 52
+	noisenote 8, 15, 2, 53
+	noisenote 10, 15, 1, 85
 	endchannel
diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm
index 92a660b2..eb67a126 100644
--- a/audio/sfx/battle_0e.asm
+++ b/audio/sfx/battle_0e.asm
@@ -1,4 +1,4 @@
 SFX_Battle_0E_Ch7:
-	unknownnoise0x20 15, 159, 35
-	unknownnoise0x20 8, 241, 33
+	noisenote 15, 9, -7, 35
+	noisenote 8, 15, 1, 33
 	endchannel
diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm
index 846a9053..26386131 100644
--- a/audio/sfx/battle_0f.asm
+++ b/audio/sfx/battle_0f.asm
@@ -1,6 +1,6 @@
 SFX_Battle_0F_Ch7:
-	unknownnoise0x20 2, 225, 75
-	unknownnoise0x20 10, 241, 68
-	unknownnoise0x20 2, 225, 58
-	unknownnoise0x20 6, 241, 52
+	noisenote 2, 14, 1, 75
+	noisenote 10, 15, 1, 68
+	noisenote 2, 14, 1, 58
+	noisenote 6, 15, 1, 52
 	endchannel
diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm
index 77be75c0..86d5a815 100644
--- a/audio/sfx/battle_12.asm
+++ b/audio/sfx/battle_12.asm
@@ -1,6 +1,6 @@
 SFX_Battle_12_Ch7:
-	unknownnoise0x20 8, 79, 35
-	unknownnoise0x20 4, 196, 34
-	unknownnoise0x20 6, 242, 35
+	noisenote 8, 4, -7, 35
+	noisenote 4, 12, 4, 34
+	noisenote 6, 15, 2, 35
 	loopchannel 4, SFX_Battle_12_Ch7
 	endchannel
diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm
index 81e1a0ef..882be8c7 100644
--- a/audio/sfx/battle_13.asm
+++ b/audio/sfx/battle_13.asm
@@ -1,6 +1,6 @@
 SFX_Battle_13_Ch7:
-	unknownnoise0x20 8, 79, 51
-	unknownnoise0x20 4, 196, 34
-	unknownnoise0x20 6, 242, 35
-	unknownnoise0x20 15, 242, 34
+	noisenote 8, 4, -7, 51
+	noisenote 4, 12, 4, 34
+	noisenote 6, 15, 2, 35
+	noisenote 15, 15, 2, 34
 	endchannel
diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm
index 8cecfb37..97a88b95 100644
--- a/audio/sfx/battle_14.asm
+++ b/audio/sfx/battle_14.asm
@@ -1,6 +1,6 @@
 SFX_Battle_14_Ch7:
-	unknownnoise0x20 8, 255, 50
-	unknownnoise0x20 8, 244, 67
-	unknownnoise0x20 8, 242, 84
-	unknownnoise0x20 8, 241, 101
+	noisenote 8, 15, -7, 50
+	noisenote 8, 15, 4, 67
+	noisenote 8, 15, 2, 84
+	noisenote 8, 15, 1, 101
 	endchannel
diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm
index dcc7014d..daa614cd 100644
--- a/audio/sfx/battle_16.asm
+++ b/audio/sfx/battle_16.asm
@@ -1,5 +1,5 @@
 SFX_Battle_16_Ch7:
-	unknownnoise0x20 1, 148, 35
-	unknownnoise0x20 1, 180, 34
-	unknownnoise0x20 8, 241, 68
+	noisenote 1, 9, 4, 35
+	noisenote 1, 11, 4, 34
+	noisenote 8, 15, 1, 68
 	endchannel
diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm
index 82bb2117..b6cc787e 100644
--- a/audio/sfx/battle_17.asm
+++ b/audio/sfx/battle_17.asm
@@ -1,6 +1,6 @@
 SFX_Battle_17_Ch7:
-	unknownnoise0x20 2, 148, 51
-	unknownnoise0x20 4, 180, 34
-	unknownnoise0x20 4, 241, 68
-	unknownnoise0x20 8, 241, 85
+	noisenote 2, 9, 4, 51
+	noisenote 4, 11, 4, 34
+	noisenote 4, 15, 1, 68
+	noisenote 8, 15, 1, 85
 	endchannel
diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm
index 14aac5c1..ced87cd8 100644
--- a/audio/sfx/battle_18.asm
+++ b/audio/sfx/battle_18.asm
@@ -1,4 +1,4 @@
 SFX_Battle_18_Ch7:
-	unknownnoise0x20 4, 255, 85
-	unknownnoise0x20 8, 241, 101
+	noisenote 4, 15, -7, 85
+	noisenote 8, 15, 1, 101
 	endchannel
diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm
index 6bc1804d..53de4341 100644
--- a/audio/sfx/battle_19.asm
+++ b/audio/sfx/battle_19.asm
@@ -1,5 +1,5 @@
 SFX_Battle_19_Ch7:
-	unknownnoise0x20 2, 132, 67
-	unknownnoise0x20 2, 196, 34
-	unknownnoise0x20 8, 242, 52
+	noisenote 2, 8, 4, 67
+	noisenote 2, 12, 4, 34
+	noisenote 8, 15, 2, 52
 	endchannel
diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm
index a4d8992b..06c2b6f1 100644
--- a/audio/sfx/battle_1b.asm
+++ b/audio/sfx/battle_1b.asm
@@ -1,4 +1,4 @@
 SFX_Battle_1B_Ch7:
-	unknownnoise0x20 2, 241, 34
-	unknownnoise0x20 15, 242, 18
+	noisenote 2, 15, 1, 34
+	noisenote 15, 15, 2, 18
 	endchannel
diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm
index 05cdd091..7518acd9 100644
--- a/audio/sfx/battle_1c.asm
+++ b/audio/sfx/battle_1c.asm
@@ -1,5 +1,5 @@
 SFX_Battle_1C_Ch7:
-	unknownnoise0x20 2, 194, 1
-	unknownnoise0x20 15, 244, 1
-	unknownnoise0x20 15, 242, 1
+	noisenote 2, 12, 2, 1
+	noisenote 15, 15, 4, 1
+	noisenote 15, 15, 2, 1
 	endchannel
diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm
index a8e46ecb..28736865 100644
--- a/audio/sfx/battle_1e.asm
+++ b/audio/sfx/battle_1e.asm
@@ -1,16 +1,16 @@
 SFX_Battle_1E_Ch4:
 	dutycycle 0
-	unknownsfx0x10 58
-	unknownsfx0x20 4, 242, 0, 2
-	unknownsfx0x10 34
-	unknownsfx0x20 8, 226, 0, 2
-	unknownsfx0x10 8
+	pitchenvelope 3, -2
+	squarenote 4, 15, 2, 512
+	pitchenvelope 2, 2
+	squarenote 8, 14, 2, 512
+	pitchenvelope 0, 0
 	endchannel
 
 
 SFX_Battle_1E_Ch7:
-	unknownnoise0x20 0, 209, 66
-	unknownnoise0x20 4, 161, 50
-	unknownnoise0x20 0, 209, 34
-	unknownnoise0x20 6, 161, 50
+	noisenote 0, 13, 1, 66
+	noisenote 4, 10, 1, 50
+	noisenote 0, 13, 1, 34
+	noisenote 6, 10, 1, 50
 	endchannel
diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm
index f7413e63..4e5687d8 100644
--- a/audio/sfx/battle_20.asm
+++ b/audio/sfx/battle_20.asm
@@ -1,4 +1,4 @@
 SFX_Battle_20_Ch7:
-	unknownnoise0x20 12, 241, 84
-	unknownnoise0x20 8, 241, 100
+	noisenote 12, 15, 1, 84
+	noisenote 8, 15, 1, 100
 	endchannel
diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm
index a6b63a6c..616b0c42 100644
--- a/audio/sfx/battle_21.asm
+++ b/audio/sfx/battle_21.asm
@@ -1,7 +1,7 @@
 SFX_Battle_21_Ch7:
-	unknownnoise0x20 2, 241, 51
-	unknownnoise0x20 2, 193, 50
-	unknownnoise0x20 2, 161, 49
-	unknownnoise0x20 15, 130, 50
-	unknownnoise0x20 8, 241, 52
+	noisenote 2, 15, 1, 51
+	noisenote 2, 12, 1, 50
+	noisenote 2, 10, 1, 49
+	noisenote 15, 8, 2, 50
+	noisenote 8, 15, 1, 52
 	endchannel
diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm
index 6a20c3ae..e19417e0 100644
--- a/audio/sfx/battle_22.asm
+++ b/audio/sfx/battle_22.asm
@@ -1,4 +1,4 @@
 SFX_Battle_22_Ch7:
-	unknownnoise0x20 2, 210, 50
-	unknownnoise0x20 15, 242, 67
+	noisenote 2, 13, 2, 50
+	noisenote 15, 15, 2, 67
 	endchannel
diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm
index e532cf08..febce65a 100644
--- a/audio/sfx/battle_23.asm
+++ b/audio/sfx/battle_23.asm
@@ -1,7 +1,7 @@
 SFX_Battle_23_Ch7:
-	unknownnoise0x20 2, 242, 67
-	unknownnoise0x20 4, 181, 50
-	unknownnoise0x20 9, 134, 49
-	unknownnoise0x20 7, 100, 0
-	unknownnoise0x20 15, 242, 85
+	noisenote 2, 15, 2, 67
+	noisenote 4, 11, 5, 50
+	noisenote 9, 8, 6, 49
+	noisenote 7, 6, 4, 0
+	noisenote 15, 15, 2, 85
 	endchannel
diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm
index 596ab68a..581edac2 100644
--- a/audio/sfx/battle_24.asm
+++ b/audio/sfx/battle_24.asm
@@ -1,12 +1,12 @@
 SFX_Battle_24_Ch4:
 	dutycycle 1
-	unknownsfx0x10 151
-	unknownsfx0x20 15, 242, 0, 7
-	unknownsfx0x10 8
+	pitchenvelope 9, 7
+	squarenote 15, 15, 2, 1792
+	pitchenvelope 0, 0
 	endchannel
 
 
 SFX_Battle_24_Ch7:
-	unknownnoise0x20 15, 63, 34
-	unknownnoise0x20 15, 242, 33
+	noisenote 15, 3, -7, 34
+	noisenote 15, 15, 2, 33
 	endchannel
diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm
index 3a46e505..1d50b391 100644
--- a/audio/sfx/battle_25.asm
+++ b/audio/sfx/battle_25.asm
@@ -1,7 +1,7 @@
 SFX_Battle_25_Ch7:
-	unknownnoise0x20 15, 79, 65
-	unknownnoise0x20 8, 143, 65
-	unknownnoise0x20 8, 207, 65
-	unknownnoise0x20 8, 242, 66
-	unknownnoise0x20 15, 242, 65
+	noisenote 15, 4, -7, 65
+	noisenote 8, 8, -7, 65
+	noisenote 8, 12, -7, 65
+	noisenote 8, 15, 2, 66
+	noisenote 15, 15, 2, 65
 	endchannel
diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm
index ce1ac2f9..0c0e21ae 100644
--- a/audio/sfx/battle_26.asm
+++ b/audio/sfx/battle_26.asm
@@ -1,9 +1,9 @@
 SFX_Battle_26_Ch7:
-	unknownnoise0x20 10, 255, 80
-	unknownnoise0x20 15, 255, 81
-	unknownnoise0x20 8, 242, 81
-	unknownnoise0x20 6, 255, 82
-	unknownnoise0x20 6, 255, 83
-	unknownnoise0x20 8, 255, 84
-	unknownnoise0x20 15, 242, 84
+	noisenote 10, 15, -7, 80
+	noisenote 15, 15, -7, 81
+	noisenote 8, 15, 2, 81
+	noisenote 6, 15, -7, 82
+	noisenote 6, 15, -7, 83
+	noisenote 8, 15, -7, 84
+	noisenote 15, 15, 2, 84
 	endchannel
diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm
index 31f4605c..d720d86c 100644
--- a/audio/sfx/battle_27.asm
+++ b/audio/sfx/battle_27.asm
@@ -1,27 +1,27 @@
 SFX_Battle_27_Ch4:
 	dutycycle 2
-	unknownsfx0x20 15, 63, 192, 7
+	squarenote 15, 3, -7, 1984
 
 SFX_Battle_27_branch_2062a:
-	unknownsfx0x20 15, 223, 192, 7
+	squarenote 15, 13, -7, 1984
 	loopchannel 4, SFX_Battle_27_branch_2062a
-	unknownsfx0x20 15, 209, 192, 7
+	squarenote 15, 13, 1, 1984
 	endchannel
 
 
 SFX_Battle_27_Ch5:
 	dutycycle 179
-	unknownsfx0x20 15, 47, 200, 7
+	squarenote 15, 2, -7, 1992
 
 SFX_Battle_27_branch_2063d:
-	unknownsfx0x20 15, 207, 199, 7
+	squarenote 15, 12, -7, 1991
 	loopchannel 4, SFX_Battle_27_branch_2063d
-	unknownsfx0x20 15, 193, 200, 7
+	squarenote 15, 12, 1, 1992
 	endchannel
 
 
 SFX_Battle_27_Ch7:
-	unknownnoise0x20 3, 151, 18
-	unknownnoise0x20 3, 161, 17
+	noisenote 3, 9, 7, 18
+	noisenote 3, 10, 1, 17
 	loopchannel 10, SFX_Battle_27_Ch7
 	endchannel
diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm
index 8bc54354..e2023a21 100644
--- a/audio/sfx/battle_28.asm
+++ b/audio/sfx/battle_28.asm
@@ -1,21 +1,21 @@
 SFX_Battle_28_Ch4:
 	dutycycle 0
-	unknownsfx0x20 0, 241, 192, 7
-	unknownsfx0x20 0, 241, 0, 7
+	squarenote 0, 15, 1, 1984
+	squarenote 0, 15, 1, 1792
 	loopchannel 12, SFX_Battle_28_Ch4
 	endchannel
 
 
 SFX_Battle_28_Ch5:
 	dutycycle 179
-	unknownsfx0x20 0, 225, 193, 7
-	unknownsfx0x20 0, 225, 1, 7
+	squarenote 0, 14, 1, 1985
+	squarenote 0, 14, 1, 1793
 	loopchannel 12, SFX_Battle_28_Ch5
 	endchannel
 
 
 SFX_Battle_28_Ch7:
-	unknownnoise0x20 1, 209, 73
-	unknownnoise0x20 1, 209, 41
+	noisenote 1, 13, 1, 73
+	noisenote 1, 13, 1, 41
 	loopchannel 6, SFX_Battle_28_Ch7
 	endchannel
diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm
index e36c18dc..534826fe 100644
--- a/audio/sfx/battle_29.asm
+++ b/audio/sfx/battle_29.asm
@@ -1,18 +1,18 @@
 SFX_Battle_29_Ch4:
 	dutycycle 201
-	unknownsfx0x20 11, 243, 32, 1
-	unknownsfx0x20 9, 211, 80, 1
+	squarenote 11, 15, 3, 288
+	squarenote 9, 13, 3, 336
 	loopchannel 5, SFX_Battle_29_Ch4
-	unknownsfx0x20 8, 227, 48, 1
-	unknownsfx0x20 15, 194, 16, 1
+	squarenote 8, 14, 3, 304
+	squarenote 15, 12, 2, 272
 	endchannel
 
 
 SFX_Battle_29_Ch7:
-	unknownnoise0x20 10, 243, 53
-	unknownnoise0x20 14, 246, 69
+	noisenote 10, 15, 3, 53
+	noisenote 14, 15, 6, 69
 	loopchannel 4, SFX_Battle_29_Ch7
-	unknownnoise0x20 12, 244, 188
-	unknownnoise0x20 12, 245, 156
-	unknownnoise0x20 15, 244, 172
+	noisenote 12, 15, 4, 188
+	noisenote 12, 15, 5, 156
+	noisenote 15, 15, 4, 172
 	endchannel
diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm
index 710a45f1..f4986805 100644
--- a/audio/sfx/battle_2a.asm
+++ b/audio/sfx/battle_2a.asm
@@ -1,28 +1,28 @@
 SFX_Battle_2A_Ch4:
 	dutycycle 57
-	unknownsfx0x20 4, 244, 0, 6
-	unknownsfx0x20 3, 196, 0, 5
-	unknownsfx0x20 5, 181, 0, 6
-	unknownsfx0x20 13, 226, 192, 6
+	squarenote 4, 15, 4, 1536
+	squarenote 3, 12, 4, 1280
+	squarenote 5, 11, 5, 1536
+	squarenote 13, 14, 2, 1728
 	loopchannel 3, SFX_Battle_2A_Ch4
-	unknownsfx0x20 8, 209, 0, 6
+	squarenote 8, 13, 1, 1536
 	endchannel
 
 
 SFX_Battle_2A_Ch5:
 	dutycycle 141
-	unknownsfx0x20 5, 228, 224, 5
-	unknownsfx0x20 4, 180, 224, 4
-	unknownsfx0x20 6, 165, 232, 5
-	unknownsfx0x20 14, 209, 160, 6
+	squarenote 5, 14, 4, 1504
+	squarenote 4, 11, 4, 1248
+	squarenote 6, 10, 5, 1512
+	squarenote 14, 13, 1, 1696
 	loopchannel 3, SFX_Battle_2A_Ch5
 	endchannel
 
 
 SFX_Battle_2A_Ch7:
-	unknownnoise0x20 5, 195, 51
-	unknownnoise0x20 3, 146, 67
-	unknownnoise0x20 10, 181, 51
-	unknownnoise0x20 15, 195, 50
+	noisenote 5, 12, 3, 51
+	noisenote 3, 9, 2, 67
+	noisenote 10, 11, 5, 51
+	noisenote 15, 12, 3, 50
 	loopchannel 2, SFX_Battle_2A_Ch7
 	endchannel
diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm
index da57c7a7..418ab5cb 100644
--- a/audio/sfx/battle_2b.asm
+++ b/audio/sfx/battle_2b.asm
@@ -1,21 +1,21 @@
 SFX_Battle_2B_Ch4:
 	dutycycle 210
-	unknownsfx0x20 3, 129, 0, 3
-	unknownsfx0x20 3, 193, 0, 4
-	unknownsfx0x20 3, 241, 0, 5
-	unknownsfx0x20 3, 177, 0, 4
-	unknownsfx0x20 3, 113, 0, 3
+	squarenote 3, 8, 1, 768
+	squarenote 3, 12, 1, 1024
+	squarenote 3, 15, 1, 1280
+	squarenote 3, 11, 1, 1024
+	squarenote 3, 7, 1, 768
 	loopchannel 5, SFX_Battle_2B_Ch4
-	unknownsfx0x20 8, 129, 0, 4
+	squarenote 8, 8, 1, 1024
 	endchannel
 
 
 SFX_Battle_2B_Ch7:
-	unknownnoise0x20 3, 98, 34
-	unknownnoise0x20 3, 162, 50
-	unknownnoise0x20 3, 210, 51
-	unknownnoise0x20 3, 146, 35
-	unknownnoise0x20 3, 82, 18
+	noisenote 3, 6, 2, 34
+	noisenote 3, 10, 2, 50
+	noisenote 3, 13, 2, 51
+	noisenote 3, 9, 2, 35
+	noisenote 3, 5, 2, 18
 	loopchannel 5, SFX_Battle_2B_Ch7
-	unknownnoise0x20 8, 129, 18
+	noisenote 8, 8, 1, 18
 	endchannel
diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm
index 2f8bdc49..aedb91bd 100644
--- a/audio/sfx/battle_2c.asm
+++ b/audio/sfx/battle_2c.asm
@@ -1,25 +1,25 @@
 SFX_Battle_2C_Ch4:
 	dutycycle 57
-	unknownsfx0x20 15, 244, 0, 5
-	unknownsfx0x20 15, 196, 0, 4
-	unknownsfx0x20 15, 226, 192, 5
+	squarenote 15, 15, 4, 1280
+	squarenote 15, 12, 4, 1024
+	squarenote 15, 14, 2, 1472
 	loopchannel 3, SFX_Battle_2C_Ch4
 	endchannel
 
 
 SFX_Battle_2C_Ch5:
 	dutycycle 141
-	unknownsfx0x20 7, 228, 48, 4
-	unknownsfx0x20 15, 180, 48, 3
-	unknownsfx0x20 15, 162, 56, 4
+	squarenote 7, 14, 4, 1072
+	squarenote 15, 11, 4, 816
+	squarenote 15, 10, 2, 1080
 	loopchannel 4, SFX_Battle_2C_Ch5
 	endchannel
 
 
 SFX_Battle_2C_Ch7:
-	unknownnoise0x20 9, 244, 68
-	unknownnoise0x20 9, 242, 67
-	unknownnoise0x20 15, 244, 66
-	unknownnoise0x20 15, 244, 65
+	noisenote 9, 15, 4, 68
+	noisenote 9, 15, 2, 67
+	noisenote 15, 15, 4, 66
+	noisenote 15, 15, 4, 65
 	loopchannel 3, SFX_Battle_2C_Ch7
 	endchannel
diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm
index 1883c5f6..e823aebb 100644
--- a/audio/sfx/battle_2e.asm
+++ b/audio/sfx/battle_2e.asm
@@ -1,27 +1,27 @@
 SFX_Battle_2E_Ch4:
 	dutycycle 0
-	unknownsfx0x20 2, 241, 0, 2
-	unknownsfx0x20 3, 241, 0, 7
-	unknownsfx0x20 4, 241, 0, 5
-	unknownsfx0x20 5, 241, 240, 7
+	squarenote 2, 15, 1, 512
+	squarenote 3, 15, 1, 1792
+	squarenote 4, 15, 1, 1280
+	squarenote 5, 15, 1, 2032
 	loopchannel 8, SFX_Battle_2E_Ch4
 	endchannel
 
 
 SFX_Battle_2E_Ch5:
 	dutycycle 179
-	unknownsfx0x20 2, 225, 2, 3
-	unknownsfx0x20 3, 225, 242, 7
-	unknownsfx0x20 4, 225, 2, 6
-	unknownsfx0x20 5, 225, 2, 7
+	squarenote 2, 14, 1, 770
+	squarenote 3, 14, 1, 2034
+	squarenote 4, 14, 1, 1538
+	squarenote 5, 14, 1, 1794
 	loopchannel 8, SFX_Battle_2E_Ch5
 	endchannel
 
 
 SFX_Battle_2E_Ch7:
-	unknownnoise0x20 2, 211, 16
-	unknownnoise0x20 3, 211, 17
-	unknownnoise0x20 2, 210, 16
-	unknownnoise0x20 5, 210, 18
+	noisenote 2, 13, 3, 16
+	noisenote 3, 13, 3, 17
+	noisenote 2, 13, 2, 16
+	noisenote 5, 13, 2, 18
 	loopchannel 9, SFX_Battle_2E_Ch7
 	endchannel
diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm
index fb4c7a14..d8c2bd91 100644
--- a/audio/sfx/battle_2f.asm
+++ b/audio/sfx/battle_2f.asm
@@ -1,21 +1,21 @@
 SFX_Battle_2F_Ch4:
 	dutycycle 43
-	unknownsfx0x20 3, 241, 240, 7
-	unknownsfx0x20 4, 242, 0, 2
+	squarenote 3, 15, 1, 2032
+	squarenote 4, 15, 2, 512
 	loopchannel 8, SFX_Battle_2F_Ch4
 	endchannel
 
 
 SFX_Battle_2F_Ch5:
 	dutycycle 179
-	unknownsfx0x20 4, 226, 2, 2
-	unknownsfx0x20 4, 225, 226, 7
+	squarenote 4, 14, 2, 514
+	squarenote 4, 14, 1, 2018
 	loopchannel 9, SFX_Battle_2F_Ch5
 	endchannel
 
 
 SFX_Battle_2F_Ch7:
-	unknownnoise0x20 4, 255, 67
-	unknownnoise0x20 4, 242, 68
+	noisenote 4, 15, -7, 67
+	noisenote 4, 15, 2, 68
 	loopchannel 9, SFX_Battle_2F_Ch7
 	endchannel
diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm
index dce1d38f..b5c35c90 100644
--- a/audio/sfx/battle_31.asm
+++ b/audio/sfx/battle_31.asm
@@ -1,18 +1,18 @@
 SFX_Battle_31_Ch4:
 	dutycycle 2
-	unknownsfx0x20 15, 255, 224, 7
-	unknownsfx0x20 15, 255, 224, 7
-	unknownsfx0x20 15, 255, 224, 7
-	unknownsfx0x20 15, 255, 224, 7
-	unknownsfx0x20 15, 242, 224, 7
+	squarenote 15, 15, -7, 2016
+	squarenote 15, 15, -7, 2016
+	squarenote 15, 15, -7, 2016
+	squarenote 15, 15, -7, 2016
+	squarenote 15, 15, 2, 2016
 	endchannel
 
 
 SFX_Battle_31_Ch5:
 	dutycycle 3
-	unknownsfx0x20 15, 255, 226, 7
-	unknownsfx0x20 15, 255, 225, 7
-	unknownsfx0x20 15, 255, 226, 7
-	unknownsfx0x20 15, 255, 225, 7
-	unknownsfx0x20 15, 242, 226, 7
+	squarenote 15, 15, -7, 2018
+	squarenote 15, 15, -7, 2017
+	squarenote 15, 15, -7, 2018
+	squarenote 15, 15, -7, 2017
+	squarenote 15, 15, 2, 2018
 	endchannel
diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm
index 75a98229..504ba297 100644
--- a/audio/sfx/battle_32.asm
+++ b/audio/sfx/battle_32.asm
@@ -1,12 +1,12 @@
 SFX_Battle_32_Ch4:
 	dutycycle 2
-	unknownsfx0x10 175
-	unknownsfx0x20 8, 241, 0, 7
-	unknownsfx0x10 8
+	pitchenvelope 10, -7
+	squarenote 8, 15, 1, 1792
+	pitchenvelope 0, 0
 	endchannel
 
 
 SFX_Battle_32_Ch5:
 	dutycycle 3
-	unknownsfx0x20 8, 241, 1, 7
+	squarenote 8, 15, 1, 1793
 	endchannel
diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm
index 5d76f5bd..c7e250b9 100644
--- a/audio/sfx/battle_33.asm
+++ b/audio/sfx/battle_33.asm
@@ -1,18 +1,18 @@
 SFX_Battle_33_Ch4:
 	dutycycle 2
-	unknownsfx0x20 6, 241, 0, 5
-	unknownsfx0x20 6, 241, 128, 5
-	unknownsfx0x20 6, 241, 0, 6
-	unknownsfx0x20 6, 241, 128, 6
-	unknownsfx0x20 8, 241, 0, 7
+	squarenote 6, 15, 1, 1280
+	squarenote 6, 15, 1, 1408
+	squarenote 6, 15, 1, 1536
+	squarenote 6, 15, 1, 1664
+	squarenote 8, 15, 1, 1792
 	endchannel
 
 
 SFX_Battle_33_Ch5:
 	dutycycle 3
-	unknownsfx0x20 6, 225, 16, 5
-	unknownsfx0x20 6, 225, 144, 5
-	unknownsfx0x20 6, 225, 16, 6
-	unknownsfx0x20 6, 225, 144, 6
-	unknownsfx0x20 8, 225, 16, 7
+	squarenote 6, 14, 1, 1296
+	squarenote 6, 14, 1, 1424
+	squarenote 6, 14, 1, 1552
+	squarenote 6, 14, 1, 1680
+	squarenote 8, 14, 1, 1808
 	endchannel
diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm
index 38576ecb..af9d5b65 100644
--- a/audio/sfx/battle_34.asm
+++ b/audio/sfx/battle_34.asm
@@ -1,22 +1,22 @@
 SFX_Battle_34_Ch4:
 	dutycycle 237
-	unknownsfx0x20 8, 255, 248, 3
-	unknownsfx0x20 15, 255, 0, 4
-	unknownsfx0x20 15, 243, 0, 4
+	squarenote 8, 15, -7, 1016
+	squarenote 15, 15, -7, 1024
+	squarenote 15, 15, 3, 1024
 	endchannel
 
 
 SFX_Battle_34_Ch5:
 	dutycycle 180
-	unknownsfx0x20 8, 239, 192, 3
-	unknownsfx0x20 15, 239, 192, 3
-	unknownsfx0x20 15, 227, 192, 3
+	squarenote 8, 14, -7, 960
+	squarenote 15, 14, -7, 960
+	squarenote 15, 14, 3, 960
 	endchannel
 
 
 SFX_Battle_34_Ch7:
-	unknownnoise0x20 4, 255, 81
-	unknownnoise0x20 8, 255, 84
-	unknownnoise0x20 15, 255, 85
-	unknownnoise0x20 15, 243, 86
+	noisenote 4, 15, -7, 81
+	noisenote 8, 15, -7, 84
+	noisenote 15, 15, -7, 85
+	noisenote 15, 15, 3, 86
 	endchannel
diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm
index 8665e496..21f71e59 100644
--- a/audio/sfx/battle_36.asm
+++ b/audio/sfx/battle_36.asm
@@ -1,47 +1,47 @@
 SFX_Battle_36_Ch4:
 	dutycycle 0
-	unknownsfx0x20 2, 241, 128, 7
-	unknownsfx0x20 2, 241, 0, 7
-	unknownsfx0x20 2, 241, 144, 7
-	unknownsfx0x20 2, 241, 0, 7
-	unknownsfx0x20 2, 241, 160, 7
-	unknownsfx0x20 2, 241, 0, 7
-	unknownsfx0x20 2, 241, 176, 7
-	unknownsfx0x20 2, 241, 0, 7
-	unknownsfx0x20 2, 241, 192, 7
-	unknownsfx0x20 2, 241, 0, 7
-	unknownsfx0x20 2, 241, 208, 7
+	squarenote 2, 15, 1, 1920
+	squarenote 2, 15, 1, 1792
+	squarenote 2, 15, 1, 1936
+	squarenote 2, 15, 1, 1792
+	squarenote 2, 15, 1, 1952
+	squarenote 2, 15, 1, 1792
+	squarenote 2, 15, 1, 1968
+	squarenote 2, 15, 1, 1792
+	squarenote 2, 15, 1, 1984
+	squarenote 2, 15, 1, 1792
+	squarenote 2, 15, 1, 2000
 
 SFX_Battle_36_branch_20930:
-	unknownsfx0x20 2, 241, 0, 7
-	unknownsfx0x20 2, 241, 224, 7
+	squarenote 2, 15, 1, 1792
+	squarenote 2, 15, 1, 2016
 	loopchannel 12, SFX_Battle_36_branch_20930
-	unknownsfx0x20 15, 241, 0, 7
+	squarenote 15, 15, 1, 1792
 	endchannel
 
 
 SFX_Battle_36_Ch5:
 	dutycycle 179
-	unknownsfx0x20 2, 241, 129, 7
-	unknownsfx0x20 2, 241, 1, 7
-	unknownsfx0x20 2, 241, 145, 7
-	unknownsfx0x20 2, 241, 1, 7
-	unknownsfx0x20 2, 241, 161, 7
-	unknownsfx0x20 2, 241, 1, 7
-	unknownsfx0x20 2, 241, 177, 7
-	unknownsfx0x20 2, 241, 1, 7
-	unknownsfx0x20 2, 241, 193, 7
-	unknownsfx0x20 2, 241, 1, 7
-	unknownsfx0x20 2, 241, 209, 7
-	unknownsfx0x20 2, 241, 1, 7
-	unknownsfx0x20 2, 241, 225, 7
+	squarenote 2, 15, 1, 1921
+	squarenote 2, 15, 1, 1793
+	squarenote 2, 15, 1, 1937
+	squarenote 2, 15, 1, 1793
+	squarenote 2, 15, 1, 1953
+	squarenote 2, 15, 1, 1793
+	squarenote 2, 15, 1, 1969
+	squarenote 2, 15, 1, 1793
+	squarenote 2, 15, 1, 1985
+	squarenote 2, 15, 1, 1793
+	squarenote 2, 15, 1, 2001
+	squarenote 2, 15, 1, 1793
+	squarenote 2, 15, 1, 2017
 	loopchannel 12, SFX_Battle_36_branch_20930
-	unknownsfx0x20 15, 241, 1, 7
+	squarenote 15, 15, 1, 1793
 	endchannel
 
 
 SFX_Battle_36_Ch7:
-	unknownnoise0x20 1, 209, 73
-	unknownnoise0x20 1, 209, 41
+	noisenote 1, 13, 1, 73
+	noisenote 1, 13, 1, 41
 	loopchannel 26, SFX_Battle_36_Ch7
 	endchannel
diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm
index 16a58050..5ab3ed30 100644
--- a/audio/sfx/collision_1.asm
+++ b/audio/sfx/collision_1.asm
@@ -1,6 +1,6 @@
 SFX_Collision_1_Ch4:
 	dutycycle 2
-	unknownsfx0x10 90
-	unknownsfx0x20 15, 241, 0, 3
-	unknownsfx0x10 8
+	pitchenvelope 5, -2
+	squarenote 15, 15, 1, 768
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm
index 73510fd7..b4466ca7 100644
--- a/audio/sfx/cut_1.asm
+++ b/audio/sfx/cut_1.asm
@@ -1,7 +1,7 @@
 SFX_Cut_1_Ch7:
-	unknownnoise0x20 2, 247, 36
-	unknownnoise0x20 2, 247, 52
-	unknownnoise0x20 4, 247, 68
-	unknownnoise0x20 8, 244, 85
-	unknownnoise0x20 8, 241, 68
+	noisenote 2, 15, 7, 36
+	noisenote 2, 15, 7, 52
+	noisenote 4, 15, 7, 68
+	noisenote 8, 15, 4, 85
+	noisenote 8, 15, 1, 68
 	endchannel
diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm
index 452fd5ed..c96300fe 100644
--- a/audio/sfx/damage.asm
+++ b/audio/sfx/damage.asm
@@ -1,5 +1,5 @@
 SFX_Damage_Ch7:
-	unknownnoise0x20 2, 244, 68
-	unknownnoise0x20 2, 244, 20
-	unknownnoise0x20 15, 241, 50
+	noisenote 2, 15, 4, 68
+	noisenote 2, 15, 4, 20
+	noisenote 15, 15, 1, 50
 	endchannel
diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm
index 41aca525..b70ba0c1 100644
--- a/audio/sfx/denied_1.asm
+++ b/audio/sfx/denied_1.asm
@@ -1,18 +1,18 @@
 SFX_Denied_1_Ch4:
 	dutycycle 3
-	unknownsfx0x10 90
-	unknownsfx0x20 4, 240, 0, 5
-	unknownsfx0x10 8
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 1, 0, 0, 0
+	pitchenvelope 5, -2
+	squarenote 4, 15, 0, 1280
+	pitchenvelope 0, 0
+	squarenote 4, 0, 0, 0
+	squarenote 15, 15, 0, 1280
+	squarenote 1, 0, 0, 0
 	endchannel
 
 
 SFX_Denied_1_Ch5:
 	dutycycle 3
-	unknownsfx0x20 4, 240, 1, 4
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 15, 240, 1, 4
-	unknownsfx0x20 1, 0, 0, 0
+	squarenote 4, 15, 0, 1025
+	squarenote 4, 0, 0, 0
+	squarenote 15, 15, 0, 1025
+	squarenote 1, 0, 0, 0
 	endchannel
diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm
index 5bfd0c75..ecb94a1c 100644
--- a/audio/sfx/dex_page_added.asm
+++ b/audio/sfx/dex_page_added.asm
@@ -1,15 +1,15 @@
 SFX_Dex_Page_Added_Ch4:
 	dutycycle 2
-	unknownsfx0x10 68
-	unknownsfx0x20 15, 240, 240, 4
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 242, 80, 6
-	unknownsfx0x10 8
+	pitchenvelope 4, 4
+	squarenote 15, 15, 0, 1264
+	pitchenvelope 1, 7
+	squarenote 15, 15, 2, 1616
+	pitchenvelope 0, 0
 	endchannel
 
 
 SFX_Dex_Page_Added_Ch5:
 	dutycycle 2
-	unknownsfx0x20 15, 146, 0, 6
-	unknownsfx0x20 15, 146, 130, 7
+	squarenote 15, 9, 2, 1536
+	squarenote 15, 9, 2, 1922
 	endchannel
diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm
index 4e71ac36..82262b2e 100644
--- a/audio/sfx/doubleslap.asm
+++ b/audio/sfx/doubleslap.asm
@@ -1,4 +1,4 @@
 SFX_Doubleslap_Ch7:
-	unknownnoise0x20 8, 241, 50
-	unknownnoise0x20 8, 241, 51
+	noisenote 8, 15, 1, 50
+	noisenote 8, 15, 1, 51
 	endchannel
diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm
index 7c480608..5d5c04db 100644
--- a/audio/sfx/enter_pc_1.asm
+++ b/audio/sfx/enter_pc_1.asm
@@ -1,7 +1,7 @@
 SFX_Enter_PC_1_Ch4:
 	dutycycle 2
-	unknownsfx0x20 6, 240, 0, 7
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 6, 240, 0, 7
-	unknownsfx0x20 1, 0, 0, 0
+	squarenote 6, 15, 0, 1792
+	squarenote 4, 0, 0, 0
+	squarenote 6, 15, 0, 1792
+	squarenote 1, 0, 0, 0
 	endchannel
diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm
index c0a156cf..e8893ce7 100644
--- a/audio/sfx/faint_fall.asm
+++ b/audio/sfx/faint_fall.asm
@@ -1,6 +1,6 @@
 SFX_Faint_Fall_Ch4:
 	dutycycle 1
-	unknownsfx0x10 175
-	unknownsfx0x20 15, 242, 128, 7
-	unknownsfx0x10 8
+	pitchenvelope 10, -7
+	squarenote 15, 15, 2, 1920
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm
index 479efab3..d866b588 100644
--- a/audio/sfx/faint_thud.asm
+++ b/audio/sfx/faint_thud.asm
@@ -1,11 +1,11 @@
 SFX_Faint_Thud_Ch4:
-	unknownsfx0x20 15, 209, 0, 2
-	unknownsfx0x10 8
+	squarenote 15, 13, 1, 512
+	pitchenvelope 0, 0
 	endchannel
 
 
 SFX_Faint_Thud_Ch7:
-	unknownnoise0x20 4, 245, 51
-	unknownnoise0x20 8, 244, 34
-	unknownnoise0x20 15, 242, 33
+	noisenote 4, 15, 5, 51
+	noisenote 8, 15, 4, 34
+	noisenote 15, 15, 2, 33
 	endchannel
diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm
index ededef48..567485a5 100644
--- a/audio/sfx/fly_1.asm
+++ b/audio/sfx/fly_1.asm
@@ -1,18 +1,18 @@
 SFX_Fly_1_Ch7:
-	unknownnoise0x20 2, 241, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 161, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 209, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 129, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 177, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 97, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 145, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 65, 18
-	unknownnoise0x20 2, 0, 0
+	noisenote 2, 15, 1, 18
+	noisenote 2, 0, 0, 0
+	noisenote 2, 10, 1, 18
+	noisenote 2, 0, 0, 0
+	noisenote 2, 13, 1, 18
+	noisenote 2, 0, 0, 0
+	noisenote 2, 8, 1, 18
+	noisenote 2, 0, 0, 0
+	noisenote 2, 11, 1, 18
+	noisenote 2, 0, 0, 0
+	noisenote 2, 6, 1, 18
+	noisenote 2, 0, 0, 0
+	noisenote 2, 9, 1, 18
+	noisenote 2, 0, 0, 0
+	noisenote 2, 4, 1, 18
+	noisenote 2, 0, 0, 0
 	endchannel
diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm
index aa523774..f45c8399 100644
--- a/audio/sfx/go_inside_1.asm
+++ b/audio/sfx/go_inside_1.asm
@@ -1,4 +1,4 @@
 SFX_Go_Inside_1_Ch7:
-	unknownnoise0x20 9, 241, 68
-	unknownnoise0x20 8, 209, 67
+	noisenote 9, 15, 1, 68
+	noisenote 8, 13, 1, 67
 	endchannel
diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm
index c60bb592..3156eba7 100644
--- a/audio/sfx/go_outside_1.asm
+++ b/audio/sfx/go_outside_1.asm
@@ -1,7 +1,7 @@
 SFX_Go_Outside_1_Ch7:
-	unknownnoise0x20 2, 241, 84
-	unknownnoise0x20 12, 113, 35
-	unknownnoise0x20 2, 177, 84
-	unknownnoise0x20 12, 97, 35
-	unknownnoise0x20 6, 65, 84
+	noisenote 2, 15, 1, 84
+	noisenote 12, 7, 1, 35
+	noisenote 2, 11, 1, 84
+	noisenote 12, 6, 1, 35
+	noisenote 6, 4, 1, 84
 	endchannel
diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm
index b0ebe9e7..47628254 100644
--- a/audio/sfx/heal_ailment_1.asm
+++ b/audio/sfx/heal_ailment_1.asm
@@ -1,9 +1,9 @@
 SFX_Heal_Ailment_1_Ch4:
 	dutycycle 2
-	unknownsfx0x10 20
-	unknownsfx0x20 4, 242, 0, 6
-	unknownsfx0x20 4, 242, 0, 6
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 242, 0, 6
-	unknownsfx0x10 8
+	pitchenvelope 1, 4
+	squarenote 4, 15, 2, 1536
+	squarenote 4, 15, 2, 1536
+	pitchenvelope 1, 7
+	squarenote 15, 15, 2, 1536
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm
index 38a56162..080409ff 100644
--- a/audio/sfx/heal_hp_1.asm
+++ b/audio/sfx/heal_hp_1.asm
@@ -1,7 +1,7 @@
 SFX_Heal_HP_1_Ch4:
 	dutycycle 2
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 240, 240, 4
-	unknownsfx0x20 15, 242, 80, 6
-	unknownsfx0x10 8
+	pitchenvelope 1, 7
+	squarenote 15, 15, 0, 1264
+	squarenote 15, 15, 2, 1616
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm
index 6f09a414..23b4e7a9 100644
--- a/audio/sfx/healing_machine_1.asm
+++ b/audio/sfx/healing_machine_1.asm
@@ -1,9 +1,9 @@
 SFX_Healing_Machine_1_Ch4:
 	dutycycle 2
-	unknownsfx0x10 44
-	unknownsfx0x20 4, 242, 0, 5
-	unknownsfx0x10 34
-	unknownsfx0x20 2, 241, 0, 5
-	unknownsfx0x10 8
-	unknownsfx0x20 1, 0, 0, 0
+	pitchenvelope 2, -4
+	squarenote 4, 15, 2, 1280
+	pitchenvelope 2, 2
+	squarenote 2, 15, 1, 1280
+	pitchenvelope 0, 0
+	squarenote 1, 0, 0, 0
 	endchannel
diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm
index 12ca5da6..6f126626 100644
--- a/audio/sfx/horn_drill.asm
+++ b/audio/sfx/horn_drill.asm
@@ -1,6 +1,6 @@
 SFX_Horn_Drill_Ch7:
-	unknownnoise0x20 3, 146, 49
-	unknownnoise0x20 3, 178, 50
-	unknownnoise0x20 3, 194, 51
-	unknownnoise0x20 8, 241, 84
+	noisenote 3, 9, 2, 49
+	noisenote 3, 11, 2, 50
+	noisenote 3, 12, 2, 51
+	noisenote 8, 15, 1, 84
 	endchannel
diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm
index 82c58356..41a4db84 100644
--- a/audio/sfx/intro_crash.asm
+++ b/audio/sfx/intro_crash.asm
@@ -1,4 +1,4 @@
 SFX_Intro_Crash_Ch7:
-	unknownnoise0x20 2, 210, 50
-	unknownnoise0x20 15, 242, 67
+	noisenote 2, 13, 2, 50
+	noisenote 15, 15, 2, 67
 	endchannel
diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm
index 8c824ea0..e6cdca5a 100644
--- a/audio/sfx/intro_hip.asm
+++ b/audio/sfx/intro_hip.asm
@@ -1,6 +1,6 @@
 SFX_Intro_Hip_Ch4:
 	dutycycle 2
-	unknownsfx0x10 38
-	unknownsfx0x20 12, 194, 64, 7
-	unknownsfx0x10 8
+	pitchenvelope 2, 6
+	squarenote 12, 12, 2, 1856
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm
index 51cb8a30..f00b203d 100644
--- a/audio/sfx/intro_hop.asm
+++ b/audio/sfx/intro_hop.asm
@@ -1,6 +1,6 @@
 SFX_Intro_Hop_Ch4:
 	dutycycle 2
-	unknownsfx0x10 38
-	unknownsfx0x20 12, 194, 128, 6
-	unknownsfx0x10 8
+	pitchenvelope 2, 6
+	squarenote 12, 12, 2, 1664
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm
index bb534a70..ecdd9428 100644
--- a/audio/sfx/intro_lunge.asm
+++ b/audio/sfx/intro_lunge.asm
@@ -1,10 +1,10 @@
 SFX_Intro_Lunge_Ch7:
-	unknownnoise0x20 6, 32, 16
-	unknownnoise0x20 6, 47, 64
-	unknownnoise0x20 6, 79, 65
-	unknownnoise0x20 6, 143, 65
-	unknownnoise0x20 6, 207, 66
-	unknownnoise0x20 8, 215, 66
-	unknownnoise0x20 15, 231, 67
-	unknownnoise0x20 15, 242, 67
+	noisenote 6, 2, 0, 16
+	noisenote 6, 2, -7, 64
+	noisenote 6, 4, -7, 65
+	noisenote 6, 8, -7, 65
+	noisenote 6, 12, -7, 66
+	noisenote 8, 13, 7, 66
+	noisenote 15, 14, 7, 67
+	noisenote 15, 15, 2, 67
 	endchannel
diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm
index 060ef09a..c972283d 100644
--- a/audio/sfx/intro_raise.asm
+++ b/audio/sfx/intro_raise.asm
@@ -1,5 +1,5 @@
 SFX_Intro_Raise_Ch7:
-	unknownnoise0x20 2, 111, 33
-	unknownnoise0x20 2, 175, 49
-	unknownnoise0x20 15, 242, 65
+	noisenote 2, 6, -7, 33
+	noisenote 2, 10, -7, 49
+	noisenote 15, 15, 2, 65
 	endchannel
diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm
index e874e773..647fcbd2 100644
--- a/audio/sfx/intro_whoosh.asm
+++ b/audio/sfx/intro_whoosh.asm
@@ -1,7 +1,7 @@
 SFX_Intro_Whoosh_Ch7:
-	unknownnoise0x20 4, 44, 32
-	unknownnoise0x20 3, 160, 32
-	unknownnoise0x20 3, 176, 33
-	unknownnoise0x20 3, 192, 34
-	unknownnoise0x20 15, 210, 36
+	noisenote 4, 2, -4, 32
+	noisenote 3, 10, 0, 32
+	noisenote 3, 11, 0, 33
+	noisenote 3, 12, 0, 34
+	noisenote 15, 13, 2, 36
 	endchannel
diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm
index f2d5b9ce..1b28cbc7 100644
--- a/audio/sfx/ledge_1.asm
+++ b/audio/sfx/ledge_1.asm
@@ -1,6 +1,6 @@
 SFX_Ledge_1_Ch4:
 	dutycycle 2
-	unknownsfx0x10 149
-	unknownsfx0x20 15, 242, 0, 4
-	unknownsfx0x10 8
+	pitchenvelope 9, 5
+	squarenote 15, 15, 2, 1024
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm
index 3f74c515..2220bf03 100644
--- a/audio/sfx/not_very_effective.asm
+++ b/audio/sfx/not_very_effective.asm
@@ -1,6 +1,6 @@
 SFX_Not_Very_Effective_Ch7:
-	unknownnoise0x20 4, 143, 85
-	unknownnoise0x20 2, 244, 68
-	unknownnoise0x20 8, 244, 34
-	unknownnoise0x20 15, 242, 33
+	noisenote 4, 8, -7, 85
+	noisenote 2, 15, 4, 68
+	noisenote 8, 15, 4, 34
+	noisenote 15, 15, 2, 33
 	endchannel
diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm
index cca7ecaa..c52ce4d0 100644
--- a/audio/sfx/peck.asm
+++ b/audio/sfx/peck.asm
@@ -1,3 +1,3 @@
 SFX_Peck_Ch7:
-	unknownnoise0x20 2, 161, 18
+	noisenote 2, 10, 1, 18
 	endchannel
diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm
index 2e7d1e65..f26a50bf 100644
--- a/audio/sfx/poisoned_1.asm
+++ b/audio/sfx/poisoned_1.asm
@@ -1,8 +1,8 @@
 SFX_Poisoned_1_Ch4:
 	dutycycle 0
-	unknownsfx0x10 20
-	unknownsfx0x20 4, 242, 0, 6
+	pitchenvelope 1, 4
+	squarenote 4, 15, 2, 1536
 	loopchannel 4, SFX_Poisoned_1_Ch4
-	unknownsfx0x20 15, 243, 0, 6
-	unknownsfx0x10 8
+	squarenote 15, 15, 3, 1536
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/pokeflute_ch4_ch5.asm b/audio/sfx/pokeflute_ch4_ch5.asm
old mode 100755
new mode 100644
diff --git a/audio/sfx/pokeflute_ch6.asm b/audio/sfx/pokeflute_ch6.asm
old mode 100755
new mode 100644
diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm
index fc6d292e..3aee5836 100644
--- a/audio/sfx/pound.asm
+++ b/audio/sfx/pound.asm
@@ -1,3 +1,3 @@
 SFX_Pound_Ch7:
-	unknownnoise0x20 2, 161, 34
+	noisenote 2, 10, 1, 34
 	endchannel
diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm
index 0ac4efb0..fc7208da 100644
--- a/audio/sfx/press_ab_1.asm
+++ b/audio/sfx/press_ab_1.asm
@@ -1,7 +1,7 @@
 SFX_Press_AB_1_Ch4:
 	dutycycle 2
-	unknownsfx0x20 0, 145, 192, 7
-	unknownsfx0x20 0, 129, 208, 7
-	unknownsfx0x20 0, 145, 192, 7
-	unknownsfx0x20 12, 161, 208, 7
+	squarenote 0, 9, 1, 1984
+	squarenote 0, 8, 1, 2000
+	squarenote 0, 9, 1, 1984
+	squarenote 12, 10, 1, 2000
 	endchannel
diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm
index 12a1b6fc..71c7119b 100644
--- a/audio/sfx/psybeam.asm
+++ b/audio/sfx/psybeam.asm
@@ -1,25 +1,25 @@
 SFX_Psybeam_Ch4:
 	dutycycle 161
-	unknownsfx0x20 10, 241, 64, 6
-	unknownsfx0x20 10, 243, 128, 6
-	unknownsfx0x20 10, 242, 32, 6
+	squarenote 10, 15, 1, 1600
+	squarenote 10, 15, 3, 1664
+	squarenote 10, 15, 2, 1568
 	loopchannel 4, SFX_Psybeam_Ch4
-	unknownsfx0x20 10, 241, 64, 6
+	squarenote 10, 15, 1, 1600
 	endchannel
 
 
 SFX_Psybeam_Ch5:
 	dutycycle 179
-	unknownsfx0x20 10, 243, 113, 5
-	unknownsfx0x20 7, 227, 49, 5
-	unknownsfx0x20 10, 241, 81, 5
+	squarenote 10, 15, 3, 1393
+	squarenote 7, 14, 3, 1329
+	squarenote 10, 15, 1, 1361
 	loopchannel 4, SFX_Psybeam_Ch5
-	unknownsfx0x20 10, 241, 113, 5
+	squarenote 10, 15, 1, 1393
 	endchannel
 
 
 SFX_Psybeam_Ch7:
-	unknownnoise0x20 2, 209, 74
-	unknownnoise0x20 2, 210, 42
+	noisenote 2, 13, 1, 74
+	noisenote 2, 13, 2, 42
 	loopchannel 21, SFX_Psybeam_Ch7
 	endchannel
diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm
index 18be83ad..8e489d86 100644
--- a/audio/sfx/psychic_m.asm
+++ b/audio/sfx/psychic_m.asm
@@ -1,32 +1,32 @@
 SFX_Psychic_M_Ch4:
 	dutycycle 2
-	unknownsfx0x10 247
-	unknownsfx0x20 8, 196, 189, 7
-	unknownsfx0x20 8, 196, 190, 7
-	unknownsfx0x20 8, 196, 191, 7
-	unknownsfx0x20 8, 196, 192, 7
-	unknownsfx0x20 15, 196, 193, 7
-	unknownsfx0x20 15, 242, 192, 7
-	unknownsfx0x10 8
+	pitchenvelope 15, 7
+	squarenote 8, 12, 4, 1981
+	squarenote 8, 12, 4, 1982
+	squarenote 8, 12, 4, 1983
+	squarenote 8, 12, 4, 1984
+	squarenote 15, 12, 4, 1985
+	squarenote 15, 15, 2, 1984
+	pitchenvelope 0, 0
 	endchannel
 
 
 SFX_Psychic_M_Ch5:
 	dutycycle 2
-	unknownsfx0x20 8, 196, 112, 7
-	unknownsfx0x20 8, 196, 97, 7
-	unknownsfx0x20 8, 196, 98, 7
-	unknownsfx0x20 8, 196, 99, 7
-	unknownsfx0x20 15, 196, 100, 7
-	unknownsfx0x20 15, 242, 100, 7
+	squarenote 8, 12, 4, 1904
+	squarenote 8, 12, 4, 1889
+	squarenote 8, 12, 4, 1890
+	squarenote 8, 12, 4, 1891
+	squarenote 15, 12, 4, 1892
+	squarenote 15, 15, 2, 1892
 	endchannel
 
 
 SFX_Psychic_M_Ch7:
-	unknownnoise0x20 15, 63, 20
-	unknownnoise0x20 15, 207, 19
-	unknownnoise0x20 15, 207, 18
-	unknownnoise0x20 15, 207, 17
-	unknownnoise0x20 15, 207, 16
-	unknownnoise0x20 15, 194, 16
+	noisenote 15, 3, -7, 20
+	noisenote 15, 12, -7, 19
+	noisenote 15, 12, -7, 18
+	noisenote 15, 12, -7, 17
+	noisenote 15, 12, -7, 16
+	noisenote 15, 12, 2, 16
 	endchannel
diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm
index 9f8269b5..63a37a38 100644
--- a/audio/sfx/purchase_1.asm
+++ b/audio/sfx/purchase_1.asm
@@ -1,13 +1,13 @@
 SFX_Purchase_1_Ch4:
 	dutycycle 2
-	unknownsfx0x20 4, 225, 0, 7
-	unknownsfx0x20 8, 242, 224, 7
+	squarenote 4, 14, 1, 1792
+	squarenote 8, 15, 2, 2016
 	endchannel
 
 
 SFX_Purchase_1_Ch5:
 	dutycycle 2
-	unknownsfx0x20 1, 8, 0, 0
-	unknownsfx0x20 4, 145, 193, 6
-	unknownsfx0x20 8, 162, 161, 7
+	squarenote 1, 0, 8, 0
+	squarenote 4, 9, 1, 1729
+	squarenote 8, 10, 2, 1953
 	endchannel
diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm
index 86035278..bf7bf116 100644
--- a/audio/sfx/push_boulder_1.asm
+++ b/audio/sfx/push_boulder_1.asm
@@ -1,10 +1,10 @@
 SFX_Push_Boulder_1_Ch7:
-	unknownnoise0x20 4, 162, 35
-	unknownnoise0x20 8, 241, 52
-	unknownnoise0x20 15, 0, 0
-	unknownnoise0x20 2, 247, 36
-	unknownnoise0x20 2, 247, 52
-	unknownnoise0x20 4, 247, 68
-	unknownnoise0x20 8, 244, 85
-	unknownnoise0x20 8, 241, 68
+	noisenote 4, 10, 2, 35
+	noisenote 8, 15, 1, 52
+	noisenote 15, 0, 0, 0
+	noisenote 2, 15, 7, 36
+	noisenote 2, 15, 7, 52
+	noisenote 4, 15, 7, 68
+	noisenote 8, 15, 4, 85
+	noisenote 8, 15, 1, 68
 	endchannel
diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm
index 81d01467..b59ceefa 100644
--- a/audio/sfx/run.asm
+++ b/audio/sfx/run.asm
@@ -1,13 +1,13 @@
 SFX_Run_Ch7:
-	unknownnoise0x20 2, 97, 35
-	unknownnoise0x20 2, 161, 51
-	unknownnoise0x20 2, 193, 51
-	unknownnoise0x20 2, 81, 17
-	unknownnoise0x20 2, 241, 51
-	unknownnoise0x20 2, 65, 17
-	unknownnoise0x20 2, 193, 51
-	unknownnoise0x20 2, 49, 17
-	unknownnoise0x20 2, 129, 51
-	unknownnoise0x20 2, 49, 17
-	unknownnoise0x20 8, 65, 51
+	noisenote 2, 6, 1, 35
+	noisenote 2, 10, 1, 51
+	noisenote 2, 12, 1, 51
+	noisenote 2, 5, 1, 17
+	noisenote 2, 15, 1, 51
+	noisenote 2, 4, 1, 17
+	noisenote 2, 12, 1, 51
+	noisenote 2, 3, 1, 17
+	noisenote 2, 8, 1, 51
+	noisenote 2, 3, 1, 17
+	noisenote 8, 4, 1, 51
 	endchannel
diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm
index f20effb3..b73a62c9 100644
--- a/audio/sfx/safari_zone_pa.asm
+++ b/audio/sfx/safari_zone_pa.asm
@@ -1,9 +1,9 @@
 SFX_Safari_Zone_PA_Ch4:
 	dutycycle 2
-	unknownsfx0x20 15, 243, 48, 7
-	unknownsfx0x20 8, 101, 48, 7
-	unknownsfx0x20 15, 244, 0, 7
-	unknownsfx0x20 15, 116, 0, 7
-	unknownsfx0x20 15, 68, 0, 7
-	unknownsfx0x20 15, 36, 0, 7
+	squarenote 15, 15, 3, 1840
+	squarenote 8, 6, 5, 1840
+	squarenote 15, 15, 4, 1792
+	squarenote 15, 7, 4, 1792
+	squarenote 15, 4, 4, 1792
+	squarenote 15, 2, 4, 1792
 	endchannel
diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm
index 9929fb93..9622145f 100644
--- a/audio/sfx/save_1.asm
+++ b/audio/sfx/save_1.asm
@@ -1,23 +1,23 @@
 SFX_Save_1_Ch4:
 	dutycycle 2
-	unknownsfx0x20 4, 244, 0, 7
-	unknownsfx0x20 2, 228, 0, 6
-	unknownsfx0x20 2, 228, 128, 6
-	unknownsfx0x20 2, 228, 192, 6
-	unknownsfx0x20 2, 228, 0, 7
-	unknownsfx0x20 2, 228, 160, 7
-	unknownsfx0x20 15, 242, 224, 7
+	squarenote 4, 15, 4, 1792
+	squarenote 2, 14, 4, 1536
+	squarenote 2, 14, 4, 1664
+	squarenote 2, 14, 4, 1728
+	squarenote 2, 14, 4, 1792
+	squarenote 2, 14, 4, 1952
+	squarenote 15, 15, 2, 2016
 	endchannel
 
 
 SFX_Save_1_Ch5:
 	dutycycle 2
-	unknownsfx0x20 4, 8, 0, 0
-	unknownsfx0x20 2, 212, 1, 7
-	unknownsfx0x20 2, 196, 1, 6
-	unknownsfx0x20 2, 196, 129, 6
-	unknownsfx0x20 2, 196, 193, 6
-	unknownsfx0x20 2, 196, 1, 7
-	unknownsfx0x20 2, 196, 161, 7
-	unknownsfx0x20 15, 210, 225, 7
+	squarenote 4, 0, 8, 0
+	squarenote 2, 13, 4, 1793
+	squarenote 2, 12, 4, 1537
+	squarenote 2, 12, 4, 1665
+	squarenote 2, 12, 4, 1729
+	squarenote 2, 12, 4, 1793
+	squarenote 2, 12, 4, 1953
+	squarenote 15, 13, 2, 2017
 	endchannel
diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm
index f9b03feb..fbd158fd 100644
--- a/audio/sfx/shooting_star.asm
+++ b/audio/sfx/shooting_star.asm
@@ -1,14 +1,14 @@
 SFX_Shooting_Star_Ch4:
 	dutycycle 228
-	unknownsfx0x10 47
-	unknownsfx0x20 4, 64, 224, 7
-	unknownsfx0x20 4, 96, 224, 7
-	unknownsfx0x20 4, 128, 224, 7
-	unknownsfx0x20 8, 160, 224, 7
-	unknownsfx0x20 8, 160, 224, 7
-	unknownsfx0x20 8, 128, 224, 7
-	unknownsfx0x20 8, 96, 224, 7
-	unknownsfx0x20 8, 48, 224, 7
-	unknownsfx0x20 15, 18, 224, 7
-	unknownsfx0x10 8
+	pitchenvelope 2, -7
+	squarenote 4, 4, 0, 2016
+	squarenote 4, 6, 0, 2016
+	squarenote 4, 8, 0, 2016
+	squarenote 8, 10, 0, 2016
+	squarenote 8, 10, 0, 2016
+	squarenote 8, 8, 0, 2016
+	squarenote 8, 6, 0, 2016
+	squarenote 8, 3, 0, 2016
+	squarenote 15, 1, 2, 2016
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm
index e7e5d87c..b6489092 100644
--- a/audio/sfx/shrink_1.asm
+++ b/audio/sfx/shrink_1.asm
@@ -1,10 +1,10 @@
 SFX_Shrink_1_Ch4:
 	dutycycle 1
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 215, 0, 6
-	unknownsfx0x20 15, 183, 128, 5
-	unknownsfx0x20 15, 135, 0, 5
-	unknownsfx0x20 15, 71, 128, 4
-	unknownsfx0x20 15, 23, 0, 4
-	unknownsfx0x10 8
+	pitchenvelope 1, 7
+	squarenote 15, 13, 7, 1536
+	squarenote 15, 11, 7, 1408
+	squarenote 15, 8, 7, 1280
+	squarenote 15, 4, 7, 1152
+	squarenote 15, 1, 7, 1024
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm
index adbccec6..57fdc1e9 100644
--- a/audio/sfx/silph_scope.asm
+++ b/audio/sfx/silph_scope.asm
@@ -1,9 +1,9 @@
 SFX_Silph_Scope_Ch4:
 	dutycycle 0
-	unknownsfx0x20 0, 210, 0, 7
-	unknownsfx0x20 0, 210, 64, 7
-	unknownsfx0x20 0, 210, 128, 7
-	unknownsfx0x20 0, 210, 192, 7
-	unknownsfx0x20 10, 225, 224, 7
-	unknownsfx0x20 1, 0, 0, 0
+	squarenote 0, 13, 2, 1792
+	squarenote 0, 13, 2, 1856
+	squarenote 0, 13, 2, 1920
+	squarenote 0, 13, 2, 1984
+	squarenote 10, 14, 1, 2016
+	squarenote 1, 0, 0, 0
 	endchannel
diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm
index 328ceb2a..c960f1d9 100644
--- a/audio/sfx/slots_new_spin.asm
+++ b/audio/sfx/slots_new_spin.asm
@@ -1,14 +1,14 @@
 SFX_Slots_New_Spin_Ch4:
 	dutycycle 3
-	unknownsfx0x20 5, 225, 0, 7
-	unknownsfx0x20 2, 225, 128, 7
-	unknownsfx0x20 15, 241, 192, 7
+	squarenote 5, 14, 1, 1792
+	squarenote 2, 14, 1, 1920
+	squarenote 15, 15, 1, 1984
 	endchannel
 
 
 SFX_Slots_New_Spin_Ch5:
 	dutycycle 2
-	unknownsfx0x20 4, 193, 193, 6
-	unknownsfx0x20 2, 193, 65, 7
-	unknownsfx0x20 15, 209, 129, 7
+	squarenote 4, 12, 1, 1729
+	squarenote 2, 12, 1, 1857
+	squarenote 15, 13, 1, 1921
 	endchannel
diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm
index aa3c790f..3813cb83 100644
--- a/audio/sfx/slots_reward.asm
+++ b/audio/sfx/slots_reward.asm
@@ -1,5 +1,5 @@
 SFX_Slots_Reward_Ch4:
 	dutycycle 2
-	unknownsfx0x20 2, 241, 0, 7
-	unknownsfx0x20 8, 129, 224, 7
+	squarenote 2, 15, 1, 1792
+	squarenote 8, 8, 1, 2016
 	endchannel
diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm
index cbdeba86..953e48e7 100644
--- a/audio/sfx/slots_stop_wheel.asm
+++ b/audio/sfx/slots_stop_wheel.asm
@@ -1,6 +1,6 @@
 SFX_Slots_Stop_Wheel_Ch4:
 	dutycycle 2
-	unknownsfx0x20 1, 242, 160, 6
-	unknownsfx0x20 1, 242, 224, 6
-	unknownsfx0x20 8, 241, 0, 7
+	squarenote 1, 15, 2, 1696
+	squarenote 1, 15, 2, 1760
+	squarenote 8, 15, 1, 1792
 	endchannel
diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm
index ea8d181d..ef3e3416 100644
--- a/audio/sfx/ss_anne_horn_1.asm
+++ b/audio/sfx/ss_anne_horn_1.asm
@@ -1,22 +1,22 @@
 SFX_SS_Anne_Horn_1_Ch4:
 	dutycycle 2
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 15, 242, 0, 5
+	squarenote 15, 15, 0, 1280
+	squarenote 4, 0, 0, 0
+	squarenote 15, 15, 0, 1280
+	squarenote 15, 15, 0, 1280
+	squarenote 15, 15, 0, 1280
+	squarenote 15, 15, 0, 1280
+	squarenote 15, 15, 2, 1280
 	endchannel
 
 
 SFX_SS_Anne_Horn_1_Ch5:
 	dutycycle 3
-	unknownsfx0x20 15, 240, 130, 4
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 15, 240, 130, 4
-	unknownsfx0x20 15, 240, 130, 4
-	unknownsfx0x20 15, 240, 130, 4
-	unknownsfx0x20 15, 240, 130, 4
-	unknownsfx0x20 15, 242, 130, 4
+	squarenote 15, 15, 0, 1154
+	squarenote 4, 0, 0, 0
+	squarenote 15, 15, 0, 1154
+	squarenote 15, 15, 0, 1154
+	squarenote 15, 15, 0, 1154
+	squarenote 15, 15, 0, 1154
+	squarenote 15, 15, 2, 1154
 	endchannel
diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm
index 3a979b44..84c28d8a 100644
--- a/audio/sfx/start_menu_1.asm
+++ b/audio/sfx/start_menu_1.asm
@@ -1,4 +1,4 @@
 SFX_Start_Menu_1_Ch7:
-	unknownnoise0x20 1, 226, 51
-	unknownnoise0x20 8, 225, 34
+	noisenote 1, 14, 2, 51
+	noisenote 8, 14, 1, 34
 	endchannel
diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm
index 63ba35e8..ebc1e0b7 100644
--- a/audio/sfx/super_effective.asm
+++ b/audio/sfx/super_effective.asm
@@ -1,4 +1,4 @@
 SFX_Super_Effective_Ch7:
-	unknownnoise0x20 4, 241, 52
-	unknownnoise0x20 15, 242, 100
+	noisenote 4, 15, 1, 52
+	noisenote 15, 15, 2, 100
 	endchannel
diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm
index 4c4712ee..3283db92 100644
--- a/audio/sfx/swap_1.asm
+++ b/audio/sfx/swap_1.asm
@@ -1,11 +1,11 @@
 SFX_Swap_1_Ch4:
 	dutycycle 2
-	unknownsfx0x20 8, 225, 64, 7
+	squarenote 8, 14, 1, 1856
 	endchannel
 
 
 SFX_Swap_1_Ch5:
 	dutycycle 2
-	unknownsfx0x20 2, 8, 0, 0
-	unknownsfx0x20 8, 177, 65, 7
+	squarenote 2, 0, 8, 0
+	squarenote 8, 11, 1, 1857
 	endchannel
diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm
index 6ab4c947..7a55b1e0 100644
--- a/audio/sfx/switch_1.asm
+++ b/audio/sfx/switch_1.asm
@@ -1,8 +1,8 @@
 SFX_Switch_1_Ch4:
 	dutycycle 2
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 2, 241, 128, 6
-	unknownsfx0x20 1, 0, 0, 0
-	unknownsfx0x20 4, 241, 128, 7
-	unknownsfx0x20 4, 0, 0, 0
+	squarenote 4, 0, 0, 0
+	squarenote 2, 15, 1, 1664
+	squarenote 1, 0, 0, 0
+	squarenote 4, 15, 1, 1920
+	squarenote 4, 0, 0, 0
 	endchannel
diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm
index ec278374..88dbed49 100644
--- a/audio/sfx/teleport_enter1_1.asm
+++ b/audio/sfx/teleport_enter1_1.asm
@@ -1,10 +1,10 @@
 SFX_Teleport_Enter1_1_Ch4:
 	dutycycle 1
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 215, 0, 7
-	unknownsfx0x20 15, 183, 128, 6
-	unknownsfx0x20 15, 135, 0, 6
-	unknownsfx0x20 15, 71, 128, 5
-	unknownsfx0x20 15, 23, 0, 5
-	unknownsfx0x10 8
+	pitchenvelope 1, 7
+	squarenote 15, 13, 7, 1792
+	squarenote 15, 11, 7, 1664
+	squarenote 15, 8, 7, 1536
+	squarenote 15, 4, 7, 1408
+	squarenote 15, 1, 7, 1280
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm
index 53eb3335..b0d61646 100644
--- a/audio/sfx/teleport_enter2_1.asm
+++ b/audio/sfx/teleport_enter2_1.asm
@@ -1,6 +1,6 @@
 SFX_Teleport_Enter2_1_Ch7:
-	unknownnoise0x20 2, 241, 50
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 241, 34
-	unknownnoise0x20 1, 0, 0
+	noisenote 2, 15, 1, 50
+	noisenote 2, 0, 0, 0
+	noisenote 2, 15, 1, 34
+	noisenote 1, 0, 0, 0
 	endchannel
diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm
index 1b5e7512..df564451 100644
--- a/audio/sfx/teleport_exit1_1.asm
+++ b/audio/sfx/teleport_exit1_1.asm
@@ -1,10 +1,10 @@
 SFX_Teleport_Exit1_1_Ch4:
 	dutycycle 1
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 215, 0, 5
-	unknownsfx0x20 15, 183, 128, 5
-	unknownsfx0x20 15, 135, 0, 6
-	unknownsfx0x20 15, 71, 128, 6
-	unknownsfx0x20 15, 23, 0, 7
-	unknownsfx0x10 8
+	pitchenvelope 1, 7
+	squarenote 15, 13, 7, 1280
+	squarenote 15, 11, 7, 1408
+	squarenote 15, 8, 7, 1536
+	squarenote 15, 4, 7, 1664
+	squarenote 15, 1, 7, 1792
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm
index 2370096c..094a359c 100644
--- a/audio/sfx/teleport_exit2_1.asm
+++ b/audio/sfx/teleport_exit2_1.asm
@@ -1,6 +1,6 @@
 SFX_Teleport_Exit2_1_Ch4:
 	dutycycle 1
-	unknownsfx0x10 22
-	unknownsfx0x20 15, 210, 0, 5
-	unknownsfx0x10 8
+	pitchenvelope 1, 6
+	squarenote 15, 13, 2, 1280
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm
index c5fe34fd..1c652507 100644
--- a/audio/sfx/tink_1.asm
+++ b/audio/sfx/tink_1.asm
@@ -1,8 +1,8 @@
 SFX_Tink_1_Ch4:
 	dutycycle 2
-	unknownsfx0x10 58
-	unknownsfx0x20 4, 242, 0, 2
-	unknownsfx0x10 34
-	unknownsfx0x20 8, 226, 0, 2
-	unknownsfx0x10 8
+	pitchenvelope 3, -2
+	squarenote 4, 15, 2, 512
+	pitchenvelope 2, 2
+	squarenote 8, 14, 2, 512
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm
index b4e8773f..76b66ae8 100644
--- a/audio/sfx/trade_machine_1.asm
+++ b/audio/sfx/trade_machine_1.asm
@@ -1,7 +1,7 @@
 SFX_Trade_Machine_1_Ch4:
 	dutycycle 2
-	unknownsfx0x10 21
-	unknownsfx0x20 15, 240, 240, 4
-	unknownsfx0x20 15, 242, 80, 6
-	unknownsfx0x10 8
+	pitchenvelope 1, 5
+	squarenote 15, 15, 0, 1264
+	squarenote 15, 15, 2, 1616
+	pitchenvelope 0, 0
 	endchannel
diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm
index a704d861..3439efd1 100644
--- a/audio/sfx/turn_off_pc_1.asm
+++ b/audio/sfx/turn_off_pc_1.asm
@@ -1,7 +1,7 @@
 SFX_Turn_Off_PC_1_Ch4:
 	dutycycle 2
-	unknownsfx0x20 4, 240, 0, 6
-	unknownsfx0x20 4, 240, 0, 4
-	unknownsfx0x20 4, 240, 0, 2
-	unknownsfx0x20 1, 0, 0, 0
+	squarenote 4, 15, 0, 1536
+	squarenote 4, 15, 0, 1024
+	squarenote 4, 15, 0, 512
+	squarenote 1, 0, 0, 0
 	endchannel
diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm
index b7ec7eed..59e5e08e 100644
--- a/audio/sfx/turn_on_pc_1.asm
+++ b/audio/sfx/turn_on_pc_1.asm
@@ -1,13 +1,13 @@
 SFX_Turn_On_PC_1_Ch4:
 	dutycycle 2
-	unknownsfx0x20 15, 242, 192, 7
-	unknownsfx0x20 15, 0, 0, 0
-	unknownsfx0x20 3, 161, 128, 7
-	unknownsfx0x20 3, 161, 0, 7
-	unknownsfx0x20 3, 161, 64, 7
-	unknownsfx0x20 3, 161, 0, 7
-	unknownsfx0x20 3, 161, 128, 7
-	unknownsfx0x20 3, 161, 0, 7
-	unknownsfx0x20 3, 161, 192, 7
-	unknownsfx0x20 8, 161, 0, 7
+	squarenote 15, 15, 2, 1984
+	squarenote 15, 0, 0, 0
+	squarenote 3, 10, 1, 1920
+	squarenote 3, 10, 1, 1792
+	squarenote 3, 10, 1, 1856
+	squarenote 3, 10, 1, 1792
+	squarenote 3, 10, 1, 1920
+	squarenote 3, 10, 1, 1792
+	squarenote 3, 10, 1, 1984
+	squarenote 8, 10, 1, 1792
 	endchannel
diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm
old mode 100755
new mode 100644
diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm
old mode 100755
new mode 100644
index 21d54fb1..e805a333
--- a/audio/sfx/unused_1.asm
+++ b/audio/sfx/unused_1.asm
@@ -1,31 +1,31 @@
-SFX_02_unused_Ch4:
+SFX_Unused_1_Ch4:
 	dutycycle 240
-	unknownsfx0x20 15, 224, 128, 7
-	unknownsfx0x20 15, 240, 132, 7
-	unknownsfx0x20 15, 195, 224, 5
-	unknownsfx0x20 15, 196, 0, 6
-	unknownsfx0x20 10, 108, 128, 7
-	unknownsfx0x20 8, 113, 132, 7
+	squarenote 15, 14, 0, 1920
+	squarenote 15, 15, 0, 1924
+	squarenote 15, 12, 3, 1504
+	squarenote 15, 12, 4, 1536
+	squarenote 10, 6, -4, 1920
+	squarenote 8, 7, 1, 1924
 	endchannel
 
 
-SFX_02_unused_Ch5:
+SFX_Unused_1_Ch5:
 	dutycycle 5
-	unknownsfx0x20 15, 160, 65, 7
-	unknownsfx0x20 15, 176, 67, 7
-	unknownsfx0x20 15, 147, 177, 5
-	unknownsfx0x20 15, 148, 193, 5
-	unknownsfx0x20 10, 76, 65, 7
-	unknownsfx0x20 8, 49, 70, 7
+	squarenote 15, 10, 0, 1857
+	squarenote 15, 11, 0, 1859
+	squarenote 15, 9, 3, 1457
+	squarenote 15, 9, 4, 1473
+	squarenote 10, 4, -4, 1857
+	squarenote 8, 3, 1, 1862
 	endchannel
 
 
-SFX_02_unused_Ch7:
-	unknownnoise0x20 2, 242, 76
-	unknownnoise0x20 6, 224, 58
-	unknownnoise0x20 15, 208, 58
-	unknownnoise0x20 8, 208, 44
-	unknownnoise0x20 6, 230, 76
-	unknownnoise0x20 12, 125, 76
-	unknownnoise0x20 15, 211, 76
+SFX_Unused_1_Ch7:
+	noisenote 2, 15, 2, 76
+	noisenote 6, 14, 0, 58
+	noisenote 15, 13, 0, 58
+	noisenote 8, 13, 0, 44
+	noisenote 6, 14, 6, 76
+	noisenote 12, 7, -5, 76
+	noisenote 15, 13, 3, 76
 	endchannel
diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm
index ad0bd40b..7699d841 100644
--- a/audio/sfx/vine_whip.asm
+++ b/audio/sfx/vine_whip.asm
@@ -1,10 +1,10 @@
 SFX_Vine_Whip_Ch7:
-	unknownnoise0x20 1, 194, 51
-	unknownnoise0x20 2, 242, 33
-	unknownnoise0x20 1, 226, 51
-	unknownnoise0x20 1, 194, 50
-	unknownnoise0x20 1, 146, 18
-	unknownnoise0x20 1, 178, 49
-	unknownnoise0x20 12, 145, 16
-	unknownnoise0x20 8, 242, 65
+	noisenote 1, 12, 2, 51
+	noisenote 2, 15, 2, 33
+	noisenote 1, 14, 2, 51
+	noisenote 1, 12, 2, 50
+	noisenote 1, 9, 2, 18
+	noisenote 1, 11, 2, 49
+	noisenote 12, 9, 1, 16
+	noisenote 8, 15, 2, 65
 	endchannel
diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm
index 0556ce6d..a1c3482a 100644
--- a/audio/sfx/withdraw_deposit_1.asm
+++ b/audio/sfx/withdraw_deposit_1.asm
@@ -1,12 +1,12 @@
 SFX_Withdraw_Deposit_1_Ch4:
 	dutycycle 1
-	unknownsfx0x10 58
-	unknownsfx0x20 4, 242, 0, 5
-	unknownsfx0x10 34
-	unknownsfx0x20 4, 226, 0, 5
-	unknownsfx0x10 58
-	unknownsfx0x20 4, 242, 0, 7
-	unknownsfx0x10 34
-	unknownsfx0x20 15, 226, 0, 7
-	unknownsfx0x10 8
+	pitchenvelope 3, -2
+	squarenote 4, 15, 2, 1280
+	pitchenvelope 2, 2
+	squarenote 4, 14, 2, 1280
+	pitchenvelope 3, -2
+	squarenote 4, 15, 2, 1792
+	pitchenvelope 2, 2
+	squarenote 15, 14, 2, 1792
+	pitchenvelope 0, 0
 	endchannel
diff --git a/extras b/extras
index 0e179893..be6d6c9c 160000
--- a/extras
+++ b/extras
@@ -1 +1 @@
-Subproject commit 0e1798937a4bf723813574281d0dc12c471c9199
+Subproject commit be6d6c9ce9a86231482eafacd4be867285809366
diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm
index d16607bc..fda60df1 100755
--- a/macros/audio_macros.asm
+++ b/macros/audio_macros.asm
@@ -30,24 +30,38 @@ audio: MACRO
 	ENDC
 ENDM
 
-unknownsfx0x10: MACRO
+;format: length [0, 7], pitch change [-7, 7]
+pitchenvelope: MACRO
 	db $dd ; soundinput
-	db \1
+	IF \2 > 0
+		db (\1 << 4) | \2
+	ELSE
+		db (\1 << 4) | (%1000 | (\2 * -1))
+	ENDC
 ENDM
 
-unknownsfx0x20: MACRO
+;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch
+squarenote: MACRO
 	; noise/sound
 	db \1
 	;db $20 | \1
-	db \2
-	db \3
-	db \4
+	IF \3 < 0
+		db (\2 << 4) | (%1000 | (\3 * -1))
+	ELSE
+		db (\2 << 4) | \3
+	ENDC
+	dw \4
 ENDM
 
-unknownnoise0x20: MACRO
+;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch
+noisenote: MACRO
 	db \1 ; | $20
-	db \2
-	db \3
+	IF \3 < 0
+		db (\2 << 4) | (%1000 | (\3 * -1))
+	ELSE
+		db (\2 << 4) | \3
+	ENDC
+	db \4
 ENDM