summaryrefslogtreecommitdiff
path: root/src/audio/music1.asm
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2018-02-09 14:15:31 +0100
committerxCrystal <rgr.crystal@gmail.com>2018-02-09 14:15:31 +0100
commit91b7ddeb1aa01c115e5f5a6cbbea8c4b1b60612c (patch)
treecd0189e01cb63ba43e3c9447cd1dafede4ba463f /src/audio/music1.asm
parentaca8305c725c1d14ff574e3c2d6708f914b1d5a7 (diff)
Consistent Music/SFX label names and more Home disasm
Diffstat (limited to 'src/audio/music1.asm')
-rwxr-xr-xsrc/audio/music1.asm16
1 files changed, 8 insertions, 8 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