Consistent Music/SFX label names and more Home disasm

4 files changed, 19 insertions, 19 deletions

diff --git a/src/audio/music1.asm b/src/audio/music1.asm
index 16f6a9a..2db31c7 100755
--- a/src/audio/music1.asm
+++ b/src/audio/music1.asm
@@ -1,14 +1,14 @@
-SetupSound_Ext:: ; f4000 (3d:4000)
+_SetupSound:: ; f4000 (3d:4000)
 	jp Music1_Init
 
-SoundTimerHandler_Ext:: ; f4003 (3d:4003)
+SoundTimerHandler:: ; f4003 (3d:4003)
 	jp Music1_Update
 
-Func_f4006:: ; f4006 (3d:4006)
+_PlaySong:: ; f4006 (3d:4006)
 	jp Music1_PlaySong
 
-Func_f4009:: ; f4009 (3d:4009)
-	jp Func_f402d
+_PlaySFX:: ; f4009 (3d:4009)
+	jp Music1_PlaySFX
 
 Func_f400c:: ; f400c (3d:400c)
 	jp Func_f404e
@@ -41,7 +41,7 @@ Music1_PlaySong: ; f4021 (3d:4021)
 	pop hl
 	ret
 
-Func_f402d: ; f402d (3d:402d)
+Music1_PlaySFX: ; f402d (3d:402d)
 	push bc
 	push hl
 	ld b, $0
@@ -165,7 +165,7 @@ Music1_Init: ; f407d (3d:407d)
 Music1_Update: ; f40e9 (3d:40e9)
 	call Music1_EmptyFunc
 	call Music1_CheckForNewSound
-	ld hl, Func_fc003
+	ld hl, SFX_UpdateSFX
 	call Bankswitch3dTo3f
 	ld a, [wCurSongBank]
 	ldh [hBankROM], a
@@ -200,7 +200,7 @@ Music1_CheckForNewSound: ; f411c (3d:411c)
 	rla
 	jr c, .noNewSound
 	ld a, [wCurSfxID]
-	ld hl, Func_fc000
+	ld hl, SFX_PlaySFX
 	call Bankswitch3dTo3f
 	ld a, [wCurSfxID]
 	or $80
diff --git a/src/audio/music1_headers.asm b/src/audio/music1_headers.asm
index 3344365..f5008fe 100755
--- a/src/audio/music1_headers.asm
+++ b/src/audio/music1_headers.asm
@@ -1,4 +1,4 @@
-NumberOfSongs1: ; 4fee5 (3d:4ee5)
+NumberOfSongs1: ; f4ee5 (3d:4ee5)
 	db $1f
 
 SongBanks1: ; f4ee6 (3d:4ee6)
diff --git a/src/audio/music2.asm b/src/audio/music2.asm
index 3af0181..ddae2bb 100755
--- a/src/audio/music2.asm
+++ b/src/audio/music2.asm
@@ -8,7 +8,7 @@ Func_f8006: ; f8006 (3e:4006)
 	jp Music2_PlaySong
 
 Func_f8009: ; f8009 (3e:4009)
-	jp Func_f802d
+	jp Music2_PlaySFX
 
 Func_f800c: ; f800c (3e:400c)
 	jp Func_f804e
@@ -41,7 +41,7 @@ Music2_PlaySong: ; f8021 (3e:4021)
 	pop hl
 	ret
 
-Func_f802d: ; f802d (3e:402d)
+Music2_PlaySFX: ; f802d (3e:402d)
 	push bc
 	push hl
 	ld b, $0
@@ -165,7 +165,7 @@ Music2_Init: ; f807d (3e:407d)
 Music2_Update: ; f80e9 (3e:40e9)
 	call Music2_EmptyFunc
 	call Music2_CheckForNewSound
-	ld hl, Func_fc003
+	ld hl, SFX_UpdateSFX
 	call Bankswitch3dTo3f
 	ld a, [wCurSongBank]
 	ldh [hBankROM], a
@@ -200,7 +200,7 @@ Music2_CheckForNewSound: ; f811c (3e:411c)
 	rla
 	jr c, .noNewSound
 	ld a, [wCurSfxID]
-	ld hl, Func_fc000
+	ld hl, SFX_PlaySFX
 	call Bankswitch3dTo3f
 	ld a, [wCurSfxID]
 	or $80
diff --git a/src/audio/sfx.asm b/src/audio/sfx.asm
index cfd34eb..6b3e2bc 100755
--- a/src/audio/sfx.asm
+++ b/src/audio/sfx.asm
@@ -1,10 +1,10 @@
-Func_fc000: ; fc000 (3f:4000)
-	jp SFX_PlaySfx
+SFX_PlaySFX: ; fc000 (3f:4000)
+	jp SFX_Play
 
-Func_fc003: ; fc003 (3f:4003)
-	jp Func_fc059
+SFX_UpdateSFX: ; fc003 (3f:4003)
+	jp SFX_Update
 
-SFX_PlaySfx: ; fc006 (3f:4006)
+SFX_Play: ; fc006 (3f:4006)
 	ld hl, NumberOfSFX
 	cp [hl]
 	jr nc, .invalidID
@@ -59,7 +59,7 @@ SFX_PlaySfx: ; fc006 (3f:4006)
 .invalidID
 	ret
 
-Func_fc059: ; fc059 (3f:4059)
+SFX_Update: ; fc059 (3f:4059)
 	ld a, [wdd8c]
 	or a
 	jr nz, .asm_fc063