diff options
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/music1.asm | 12 | ||||
| -rw-r--r-- | src/audio/music2.asm | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/audio/music1.asm b/src/audio/music1.asm index 86d76f4..0407f6c 100644 --- a/src/audio/music1.asm +++ b/src/audio/music1.asm @@ -13,11 +13,11 @@ _PlaySFX:: ; f4009 (3d:4009) Func_f400c:: ; f400c (3d:400c) jp Func_f404e -Func_f400f:: ; f400f (3d:400f) - jp Func_f4052 +_AssertSongFinished:: ; f400f (3d:400f) + jp Music1_AssertSongFinished -Func_f4012:: ; f4012 (3d:4012) - jp Func_f405c +_AssertSFXFinished:: ; f4012 (3d:4012) + jp Music1_AssertSFXFinished Func_f4015:: ; f4015 (3d:4015) jp Func_f4066 @@ -70,7 +70,7 @@ Func_f404e: ; f404e (3d:404e) ld [wddf0], a ret -Func_f4052: ; f4052 (3d:4052) +Music1_AssertSongFinished: ; f4052 (3d:4052) ld a, [wCurSongID] cp $80 ld a, $1 @@ -78,7 +78,7 @@ Func_f4052: ; f4052 (3d:4052) xor a ret -Func_f405c: ; f405c (3d:405c) +Music1_AssertSFXFinished: ; f405c (3d:405c) ld a, [wCurSfxID] cp $80 ld a, $1 diff --git a/src/audio/music2.asm b/src/audio/music2.asm index 41d58f8..499aafc 100644 --- a/src/audio/music2.asm +++ b/src/audio/music2.asm @@ -14,10 +14,10 @@ Func_f800c: ; f800c (3e:400c) jp Func_f804e Func_f800f: ; f800f (3e:400f) - jp Func_f8052 + jp Music2_AssertSongFinished Func_f8012: ; f8012 (3e:4012) - jp Func_f805c + jp Music2_AssertSFXFinished Func_f8015: ; f8015 (3e:4015) jp Func_f8066 @@ -70,7 +70,7 @@ Func_f804e: ; f804e (3e:404e) ld [wddf0], a ret -Func_f8052: ; f8052 (3e:4052) +Music2_AssertSongFinished: ; f8052 (3e:4052) ld a, [wCurSongID] cp $80 ld a, $1 @@ -78,7 +78,7 @@ Func_f8052: ; f8052 (3e:4052) xor a ret -Func_f805c: ; f805c (3e:405c) +Music2_AssertSFXFinished: ; f805c (3e:405c) ld a, [wCurSfxID] cp $80 ld a, $1 |