3 files changed, 15 insertions, 15 deletions
diff --git a/audio/engine_1.asm b/audio/engine_1.asm
index 9a83e563..0eb4d5d7 100644
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -525,7 +525,7 @@ Audio1_unknownmusic0xef: ; 0x9407
 	call Audio1_GetNextMusicByte
 	push bc
 	ld b, a
-	call Func_22ec
+	call DetermineAudioFunction
 	pop bc
 	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
@@ -681,7 +681,7 @@ asm_94fd
 	and a
 	jr nz, .asm_9508
 	ld b, d
-	call Func_22ec
+	call DetermineAudioFunction
 .asm_9508
 	pop bc
 	pop de
@@ -1293,7 +1293,7 @@ Audio1_ApplyDutyCycle: ; 0x980d
 	ret
 
 Audio1_GetNextMusicByte: ; 0x9825
-	call Func_2288
+	call GetNextMusicByte
 	ret
 
 Audio1_GetRegisterPointer: ; 0x9838
@@ -1366,7 +1366,7 @@ Audio1_PlaySound:: ; 984e (2:584e)
 	jp nc, .playSfx
 
 .playMusic
-	call Func_22aa
+	call InitMusicVariables
 	jp .playSoundCommon
 
 .playSfx
@@ -1428,7 +1428,7 @@ Audio1_PlaySound:: ; 984e (2:584e)
 	jr c, .asm_99a3
 	ret
 .asm_99a3
-	call Func_22c0
+	call InitSFXVariables
 .asm_9a2b
 	ld a, c
 	and a
@@ -1437,7 +1437,7 @@ Audio1_PlaySound:: ; 984e (2:584e)
 	jp .sfxChannelLoop
 
 .stopAllAudio
-	call Func_22d6
+	call StopAllAudio
 	ret
 
 .playSoundCommon
diff --git a/audio/engine_2.asm b/audio/engine_2.asm
index e2f12bdc..a5cec3ee 100644
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -10,7 +10,7 @@ Audio2_PlaySound:: ; 218bb (8:58bb)
 	jr z, .asm_218d5
 	jp nc, Audio2_218db
 .asm_218d5
-	call Func_22aa
+	call InitMusicVariables
 	jp Audio2_21940
 
 Audio2_218db: ; 218db (8:58db)
@@ -72,7 +72,7 @@ Audio2_218db: ; 218db (8:58db)
 	jr c, .asm_21930
 	ret
 .asm_21930
-	call Func_22c0
+	call InitSFXVariables
 	ld a, c
 	and a
 	jp z, Audio2_21940
@@ -80,7 +80,7 @@ Audio2_218db: ; 218db (8:58db)
 	jp .asm_218f4
 
 Audio2_2193c: ; 2193c (8:593c)
-	call Func_22d6
+	call StopAllAudio
 	ret
 
 Audio2_21940: ; 21940 (8:5940)
@@ -208,7 +208,7 @@ Audio2_OverwriteChannelPointer: ; 219e6 (8:59e6)
 
 INCLUDE "audio/sfx/pokeflute_ch1_ch2.asm"
 	
-Audio2_219f8:: ; 219f8 (8:59f8)
+Audio2_InitMusicVariables:: ; 219f8 (8:59f8)
 	xor a
 	ld [wUnusedC000], a
 	ld [wDisableChannelOutputWhenSfxEnds], a
@@ -281,7 +281,7 @@ Audio2_219f8:: ; 219f8 (8:59f8)
 	ld [rNR50], a
 	ret
 
-Audio2_21ab7:: ; 21ab7 (8:5ab7)
+Audio2_InitSFXVariables:: ; 21ab7 (8:5ab7)
 	xor a
 	push de
 	ld h, d
@@ -369,7 +369,7 @@ Audio2_21ab7:: ; 21ab7 (8:5ab7)
 	ld [rNR10], a
 	ret
 
-Audio2_21b3f:: ; 21b3f (8:5b3f)
+Audio2_StopAllAudio:: ; 21b3f (8:5b3f)
 	ld a, $80
 	ld [rNR52], a
 	ld [rNR30], a
diff --git a/audio/engine_3.asm b/audio/engine_3.asm
index 7aa446cd..71416dbc 100644
--- a/audio/engine_3.asm
+++ b/audio/engine_3.asm
@@ -12,7 +12,7 @@ Audio3_PlaySound:: ; 7d10d (1f:510d)
 	jr z, .asm_7d127
 	jp nc, Audio3_7d12d
 .asm_7d127
-	call Func_22aa
+	call InitMusicVariables
 	jp Audio3_7d192
 
 Audio3_7d12d: ; 7d12d (1f:512d)
@@ -74,7 +74,7 @@ Audio3_7d12d: ; 7d12d (1f:512d)
 	jr c, .asm_7d182
 	ret
 .asm_7d182
-	call Func_22c0
+	call InitSFXVariables
 	ld a, c
 	and a
 	jp z, Audio3_7d192
@@ -82,7 +82,7 @@ Audio3_7d12d: ; 7d12d (1f:512d)
 	jp .asm_7d146
 
 Audio3_7d18e: ; 7d18e (1f:518e)
-	call Func_22d6
+	call StopAllAudio
 	ret
 
 Audio3_7d192: ; 7d192 (1f:5192)