summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/rom3.s156
-rw-r--r--asm/rom4.s66
-rw-r--r--asm/rom5.s1482
-rw-r--r--asm/rom_803D1FC.s10
-rw-r--r--asm/rom_8040EB4.s196
-rw-r--r--asm/rom_8065394.s106
-rw-r--r--asm/rom_8074BAC.s38
-rw-r--r--data/data2.s16
-rw-r--r--include/gba/m4a_internal.h24
-rw-r--r--include/sound.h46
-rw-r--r--sound/music_player_table.s8
-rw-r--r--src/link.c13
-rw-r--r--src/m4a_2.c14
-rw-r--r--src/m4a_4.c24
-rw-r--r--src/main.c7
-rw-r--r--src/main_menu.c43
-rw-r--r--src/menu.c23
-rw-r--r--src/scrcmd.c36
-rw-r--r--src/sound.c494
-rw-r--r--src/text.c15
-rw-r--r--sym_bss.txt15
-rw-r--r--sym_common.txt10
-rw-r--r--sym_ewram.txt4
23 files changed, 1432 insertions, 1414 deletions
diff --git a/asm/rom3.s b/asm/rom3.s
index 600d780f7..8eae899e1 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -5281,7 +5281,7 @@ _0800E148:
bl sub_800DC24
_0800E154:
movs r0, 0x78
- bl audio_play
+ bl PlaySE
mov r0, r9
bl DestroyTask
ldr r4, _0800E224
@@ -8825,7 +8825,7 @@ sub_800FE20: @ 800FE20
ldr r0, _0800FE3C
str r0, [r4, 0x1C]
movs r0, 0x68
- bl audio_play
+ bl PlaySE
pop {r4}
pop {r0}
bx r0
@@ -9358,7 +9358,7 @@ sub_8010278: @ 8010278
str r0, [r2, 0x1C]
ldrh r0, [r2, 0x32]
movs r1, 0x19
- bl cry_related
+ bl PlayCry1
_080102A0:
pop {r0}
bx r0
@@ -16312,24 +16312,24 @@ _08013A50:
.4byte _08013B24
_08013B18:
ldr r0, _08013B20
- bl sub_8075474
+ bl PlayBGM
b _08013B48
.align 2, 0
_08013B20: .4byte 0x00000163
_08013B24:
movs r0, 0xD4
lsls r0, 1
- bl sub_8075474
+ bl PlayBGM
b _08013B48
_08013B2E:
movs r0, 0xB1
lsls r0, 1
- bl sub_8075474
+ bl PlayBGM
b _08013B48
_08013B38:
movs r0, 0xCE
lsls r0, 1
- bl sub_8075474
+ bl PlayBGM
b _08013B48
_08013B42:
ldr r1, _08013B54
@@ -16581,7 +16581,7 @@ _08013D4C:
movs r0, 0x3
bl BeginFastPaletteFade
movs r0, 0x5
- bl sub_8074D28
+ bl FadeOutMapMusic
ldr r1, _08013D6C
ldr r0, _08013D70
str r0, [r1]
@@ -18767,7 +18767,7 @@ bs8_exit_by_flight: @ 8014F80
ldrb r0, [r0]
strb r0, [r2]
movs r0, 0x11
- bl audio_play
+ bl PlaySE
ldr r0, _08014FB4
ldrb r0, [r0]
strb r0, [r4]
@@ -40618,7 +40618,7 @@ _080202E8:
bne _08020316
bl sub_80325B8
ldr r0, _08020358
- bl sub_8075474
+ bl PlayBGM
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
@@ -47663,7 +47663,7 @@ _08023B74:
cmp r0, 0
beq _08023B9A
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl nullsub_6
movs r0, 0
strb r0, [r4, 0x1]
@@ -47680,7 +47680,7 @@ _08023B9A:
cmp r0, 0
bne _08023BC0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl nullsub_6
movs r0, 0x1
strb r0, [r4, 0x1]
@@ -47693,7 +47693,7 @@ _08023BC0:
cmp r0, 0
beq _08023C0C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _08023C00
ldrb r4, [r0, 0x1]
cmp r4, 0
@@ -47725,7 +47725,7 @@ _08023C0C:
b _08023E5C
_08023C16:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_08023C1C:
ldr r0, _08023C28
ldr r1, _08023C2C
@@ -48037,7 +48037,7 @@ _08023EA8:
cmp r0, 0
beq _08023ECE
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl nullsub_6
movs r0, 0
strb r0, [r4, 0x1]
@@ -48054,7 +48054,7 @@ _08023ECE:
cmp r0, 0
bne _08023EF4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl nullsub_6
movs r0, 0x1
strb r0, [r4, 0x1]
@@ -48067,7 +48067,7 @@ _08023EF4:
cmp r0, 0
beq _08023F4C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _08023F30
ldrb r0, [r0, 0x1]
cmp r0, 0
@@ -48106,7 +48106,7 @@ _08023F4C:
cmp r0, 0
beq _08023F78
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r3, _08023F80
ldr r2, [r3]
ldrb r1, [r2, 0x1]
@@ -48969,7 +48969,7 @@ _08024616:
cmp r0, 0
beq _0802463A
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl nullsub_6
movs r0, 0
strb r0, [r5, 0x1]
@@ -48986,7 +48986,7 @@ _0802463A:
cmp r0, 0
bne _08024660
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl nullsub_6
movs r0, 0x1
strb r0, [r4, 0x1]
@@ -49012,7 +49012,7 @@ _0802467C:
beq _08024696
_08024684:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_8023AD8
ldr r1, _0802469C
ldr r0, [r1]
@@ -49570,7 +49570,7 @@ _08024AF4:
b _08024C38
_08024AFE:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _08024B98
ldr r1, _08024B9C
bl StringCopy
@@ -49693,7 +49693,7 @@ _08024C04:
cmp r0, 0
beq _08024C38
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
str r0, [sp]
movs r0, 0xB
@@ -63922,7 +63922,7 @@ _0802BCEC:
cmp r0, 0
beq _0802BD10
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl nullsub_6
movs r0, 0
strb r0, [r4, 0x1]
@@ -63939,7 +63939,7 @@ _0802BD10:
cmp r0, 0
bne _0802BD36
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl nullsub_6
movs r0, 0x1
strb r0, [r4, 0x1]
@@ -63952,7 +63952,7 @@ _0802BD36:
cmp r0, 0
beq _0802BD68
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _0802BD64
ldrb r0, [r1, 0x1]
cmp r0, 0
@@ -63974,7 +63974,7 @@ _0802BD68:
b _0802BEDA
_0802BD72:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _0802BD80
_0802BD7A:
movs r0, 0x4
@@ -64406,7 +64406,7 @@ sub_802C098: @ 802C098
cmp r0, 0
beq _0802C13E
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_814A7FC
ldr r1, _0802C108
ldrb r0, [r4]
@@ -64469,7 +64469,7 @@ _0802C13E:
b _0802C2AC
_0802C158:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@@ -64497,7 +64497,7 @@ _0802C178:
b _0802C2AC
_0802C192:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@@ -64541,7 +64541,7 @@ _0802C1D0:
bne _0802C2AC
_0802C1E8:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@@ -64609,7 +64609,7 @@ _0802C218:
bl sub_80A9424
_0802C278:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
movs r1, 0xC
movs r2, 0
@@ -64703,7 +64703,7 @@ _0802C32E:
beq _0802C3A8
bl sub_814A7FC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r2, _0802C394
ldr r1, _0802C398
ldr r4, _0802C388
@@ -64749,7 +64749,7 @@ _0802C3A8:
cmp r0, 0
beq _0802C41C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r2, _0802C400
ldr r1, _0802C404
ldr r5, _0802C408
@@ -64800,7 +64800,7 @@ _0802C41C:
b _0802C540
_0802C426:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r2, _0802C458
ldr r1, _0802C45C
ldr r3, _0802C460
@@ -64941,7 +64941,7 @@ _0802C540:
b _0802C658
_0802C54A:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r2, _0802C57C
ldr r1, _0802C580
ldr r3, _0802C584
@@ -65119,7 +65119,7 @@ sub_802C68C: @ 802C68C
b _0802C864
_0802C6B2:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _0802C6F0
ldrb r0, [r7]
adds r0, r1
@@ -65331,7 +65331,7 @@ _0802C864:
beq _0802C8A4
bl sub_814A7FC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _0802C898
strh r4, [r0]
ldr r1, _0802C89C
@@ -65459,7 +65459,7 @@ _0802C944:
_0802C976:
strb r0, [r1]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrb r0, [r7]
adds r0, r4
ldrb r0, [r0]
@@ -65578,7 +65578,7 @@ sub_802CA60: @ 802CA60
b _0802CE78
_0802CA7A:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _0802CDF0
mov r10, r0
ldr r1, _0802CDF4
@@ -66084,7 +66084,7 @@ _0802CE78:
cmp r0, 0
beq _0802CEF0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _0802CF34
ldrb r0, [r0]
bl nullsub_7
@@ -66172,7 +66172,7 @@ _0802CF4E:
eors r0, r1
strb r0, [r4]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _0802CF7C
ldr r0, _0802CF80
ldrb r0, [r0]
@@ -66239,7 +66239,7 @@ _0802CFE2:
eors r0, r1
strb r0, [r4]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _0802D010
ldr r0, _0802D014
ldrb r0, [r0]
@@ -66299,7 +66299,7 @@ _0802D066:
eors r0, r1
strb r0, [r4]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _0802D094
ldr r0, _0802D098
ldrb r0, [r0]
@@ -66366,7 +66366,7 @@ _0802D0FA:
eors r0, r1
strb r0, [r4]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _0802D128
ldr r0, _0802D12C
ldrb r0, [r0]
@@ -66699,7 +66699,7 @@ _0802D374:
_0802D3A8:
movs r6, 0x1
_0802D3AA:
- bl sub_80753C4
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
beq _0802D3B6
@@ -66794,7 +66794,7 @@ _0802D468: .4byte SpriteCallbackDummy
_0802D46C: .4byte 0x02017810
_0802D470: .4byte 0x000027f9
_0802D474: .4byte gUnknown_020239F8
-_0802D478: .4byte gUnknown_03007380
+_0802D478: .4byte gMPlay_BGM
_0802D47C:
ldr r0, _0802D4E0
ldr r1, _0802D4E4
@@ -66846,7 +66846,7 @@ _0802D4DA:
pop {r0}
bx r0
.align 2, 0
-_0802D4E0: .4byte gUnknown_03007380
+_0802D4E0: .4byte gMPlay_BGM
_0802D4E4: .4byte 0x0000ffff
_0802D4E8: .4byte gUnknown_02024A6A
_0802D4EC: .4byte gUnknown_02024A60
@@ -67132,7 +67132,7 @@ sub_802D730: @ 802D730
ands r0, r1
cmp r0, 0
bne _0802D77A
- bl sub_80753C4
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
bne _0802D77A
@@ -67159,7 +67159,7 @@ _0802D77A:
.align 2, 0
_0802D780: .4byte gUnknown_02024A60
_0802D784: .4byte 0x02017810
-_0802D788: .4byte gUnknown_03007380
+_0802D788: .4byte gMPlay_BGM
_0802D78C: .4byte 0x0000ffff
_0802D790: .4byte gUnknown_02024A6A
_0802D794: .4byte gPlayerParty
@@ -67266,7 +67266,7 @@ c3_0802FDF4: @ 802D86C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_80753C4
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
bne _0802D88E
@@ -67282,7 +67282,7 @@ _0802D88E:
pop {r0}
bx r0
.align 2, 0
-_0802D894: .4byte gUnknown_03007380
+_0802D894: .4byte gMPlay_BGM
_0802D898: .4byte 0x0000ffff
thumb_func_end c3_0802FDF4
@@ -67612,7 +67612,7 @@ sub_802DA9C: @ 802DA9C
mov r0, r10
bl sub_8043D84
movs r0, 0x21
- bl audio_play
+ bl PlaySE
ldr r0, _0802DB68
mov r1, r8
str r0, [r1]
@@ -71910,7 +71910,7 @@ _0802FEC8:
movs r1, 0x40
negs r1, r1
movs r0, 0x10
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldr r2, _0802FF4C
ldr r3, _0802FF50
ldrb r0, [r5]
@@ -73292,7 +73292,7 @@ sub_8030A3C: @ 8030A3C
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
- bl sub_8075474
+ bl PlayBGM
bl dp01_tbl1_exec_completed
pop {r0}
bx r0
@@ -73524,7 +73524,7 @@ _08030BEC:
orrs r0, r1
lsls r1, r3, 24
asrs r1, 24
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
bl dp01_tbl1_exec_completed
pop {r4}
pop {r0}
@@ -73549,7 +73549,7 @@ sub_8030C1C: @ 8030C1C
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
- bl fanfare_play
+ bl PlayFanfare
bl dp01_tbl1_exec_completed
pop {r0}
bx r0
@@ -73578,7 +73578,7 @@ sub_8030C4C: @ 8030C4C
movs r1, 0x19
negs r1, r1
movs r2, 0x5
- bl sub_80750B4
+ bl PlayCry3
bl dp01_tbl1_exec_completed
pop {r0}
bx r0
@@ -74351,7 +74351,7 @@ sub_80312A0: @ 80312A0
ldrb r0, [r0]
strb r0, [r2]
movs r0, 0x5
- bl sub_8074D28
+ bl FadeOutMapMusic
movs r0, 0x3
bl BeginFastPaletteFade
bl dp01_tbl1_exec_completed
@@ -74935,7 +74935,7 @@ mplay_80342A4: @ 8031724
lsls r0, 24
lsrs r4, r0, 24
movs r5, 0
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _08031764
@@ -74969,8 +74969,8 @@ _08031768:
.align 2, 0
_0803176C: .4byte 0x02017810
_08031770: .4byte gUnknown_02024A60
-_08031774: .4byte gUnknown_030073C0
-_08031778: .4byte gUnknown_03007400
+_08031774: .4byte gMPlay_SE1
+_08031778: .4byte gMPlay_SE2
_0803177C:
lsls r0, r4, 1
adds r0, r4
@@ -76673,7 +76673,7 @@ sub_80324F8: @ 80324F8
cmp r0, 0
bne _0803255A
movs r0, 0x5A
- bl audio_play
+ bl PlaySE
_0803255A:
ldrb r0, [r4]
orrs r0, r5
@@ -77678,7 +77678,7 @@ _08032CE0:
_08032D14:
movs r6, 0x1
_08032D16:
- bl sub_80753C4
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
beq _08032D22
@@ -77769,7 +77769,7 @@ _08032DD0: .4byte SpriteCallbackDummy
_08032DD4: .4byte 0x02017810
_08032DD8: .4byte 0x000027f9
_08032DDC: .4byte gUnknown_020239F8
-_08032DE0: .4byte gUnknown_03007380
+_08032DE0: .4byte gMPlay_BGM
_08032DE4:
ldr r0, _08032E14
ldr r1, _08032E18
@@ -77797,7 +77797,7 @@ _08032E0E:
pop {r0}
bx r0
.align 2, 0
-_08032E14: .4byte gUnknown_03007380
+_08032E14: .4byte gMPlay_BGM
_08032E18: .4byte 0x0000ffff
_08032E1C: .4byte gUnknown_02024A60
_08032E20: .4byte 0x02017810
@@ -81924,7 +81924,7 @@ _0803507C:
strb r0, [r3, 0x4]
movs r0, 0x10
movs r1, 0x3F
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldr r2, _080350C0
ldr r1, _080350C4
ldrb r0, [r5]
@@ -83165,7 +83165,7 @@ _08035A34:
orrs r0, r1
lsls r1, r3, 24
asrs r1, 24
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
bl sub_80334EC
pop {r4}
pop {r0}
@@ -83190,7 +83190,7 @@ sub_8035A64: @ 8035A64
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
- bl fanfare_play
+ bl PlayFanfare
bl sub_80334EC
pop {r0}
bx r0
@@ -83218,7 +83218,7 @@ sub_8035A94: @ 8035A94
lsrs r0, 16
movs r1, 0x19
movs r2, 0x5
- bl sub_80750B4
+ bl PlayCry3
bl sub_80334EC
pop {r0}
bx r0
@@ -86793,7 +86793,7 @@ _080376D8:
_0803770C:
movs r6, 0x1
_0803770E:
- bl sub_80753C4
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
beq _0803771A
@@ -86898,7 +86898,7 @@ _080377E4: .4byte SpriteCallbackDummy
_080377E8: .4byte 0x02017810
_080377EC: .4byte 0x000027f9
_080377F0: .4byte gUnknown_020239F8
-_080377F4: .4byte gUnknown_03007380
+_080377F4: .4byte gMPlay_BGM
_080377F8:
ldr r0, _08037828
ldr r1, _0803782C
@@ -86926,7 +86926,7 @@ _08037822:
pop {r0}
bx r0
.align 2, 0
-_08037828: .4byte gUnknown_03007380
+_08037828: .4byte gMPlay_BGM
_0803782C: .4byte 0x0000ffff
_08037830: .4byte gUnknown_02024A60
_08037834: .4byte 0x02017810
@@ -90941,7 +90941,7 @@ _080399A8:
strb r0, [r3, 0x4]
movs r0, 0x10
movs r1, 0x3F
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldr r2, _080399EC
ldr r1, _080399F0
ldrb r0, [r5]
@@ -91889,7 +91889,7 @@ _0803A0E8:
orrs r0, r1
lsls r1, r3, 24
asrs r1, 24
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
bl dp01_tbl4_exec_completed
pop {r4}
pop {r0}
@@ -91914,7 +91914,7 @@ sub_803A118: @ 803A118
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
- bl fanfare_play
+ bl PlayFanfare
bl dp01_tbl4_exec_completed
pop {r0}
bx r0
@@ -91942,7 +91942,7 @@ sub_803A148: @ 803A148
lsrs r0, 16
movs r1, 0x19
movs r2, 0x5
- bl sub_80750B4
+ bl PlayCry3
bl dp01_tbl4_exec_completed
pop {r0}
bx r0
@@ -92583,7 +92583,7 @@ _0803A680:
strb r1, [r0]
_0803A688:
movs r0, 0x5
- bl sub_8074D28
+ bl FadeOutMapMusic
movs r0, 0x3
bl BeginFastPaletteFade
bl dp01_tbl4_exec_completed
diff --git a/asm/rom4.s b/asm/rom4.s
index e186e3e52..b571f1a26 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -2044,7 +2044,7 @@ _08053E80:
thumb_func_start call_map_music_set_to_zero
call_map_music_set_to_zero: @ 8053E84
push {lr}
- bl map_music_set_to_zero
+ bl ResetMapMusic
pop {r0}
bx r0
thumb_func_end call_map_music_set_to_zero
@@ -2092,13 +2092,13 @@ _08053EC8:
beq _08053ED6
ldr r4, _08053EF0
_08053ED6:
- bl current_map_music_get
+ bl GetCurrentMapMusic
lsls r0, 16
lsrs r0, 16
cmp r4, r0
beq _08053EE8
adds r0, r4, 0
- bl current_map_music_set
+ bl PlayNewMapMusic
_08053EE8:
pop {r4}
pop {r0}
@@ -2138,7 +2138,7 @@ sub_8053F0C: @ 8053F0C
bl warp1_target_get_music
lsls r0, 16
lsrs r5, r0, 16
- bl current_map_music_get
+ bl GetCurrentMapMusic
lsls r0, 16
lsrs r4, r0, 16
.ifdef SAPPHIRE
@@ -2176,7 +2176,7 @@ _08053F4E:
adds r0, r5, 0
movs r1, 0x4
movs r2, 0x4
- bl sub_8074D94
+ bl FadeOutAndFadeInNewMapMusic
b _08053F7C
.align 2, 0
_08053F6C: .4byte 0x00004001
@@ -2187,7 +2187,7 @@ _08053F70: .4byte 0x0000016d
_08053F74:
adds r0, r5, 0
movs r1, 0x8
- bl sub_8074D60
+ bl FadeOutAndPlayNewMapMusic
_08053F7C:
pop {r4-r6}
pop {r0}
@@ -2197,7 +2197,7 @@ _08053F7C:
thumb_func_start sub_8053F84
sub_8053F84: @ 8053F84
push {r4,lr}
- bl current_map_music_get
+ bl GetCurrentMapMusic
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -2210,7 +2210,7 @@ sub_8053F84: @ 8053F84
lsls r0, 16
lsrs r0, 16
movs r1, 0x8
- bl sub_8074D60
+ bl FadeOutAndPlayNewMapMusic
_08053FAA:
pop {r4}
pop {r0}
@@ -2222,7 +2222,7 @@ sub_8053FB0: @ 8053FB0
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
- bl current_map_music_get
+ bl GetCurrentMapMusic
lsls r0, 16
lsrs r1, r0, 16
cmp r1, r4
@@ -2237,7 +2237,7 @@ sub_8053FB0: @ 8053FB0
beq _08053FD2
adds r0, r4, 0
movs r1, 0x8
- bl sub_8074D60
+ bl FadeOutAndPlayNewMapMusic
_08053FD2:
pop {r4}
pop {r0}
@@ -2279,7 +2279,7 @@ sub_8053FF8: @ 8053FF8
lsrs r0, 24
cmp r0, 0x1
beq _08054028
- bl current_map_music_get
+ bl GetCurrentMapMusic
lsls r0, 16
lsrs r0, 16
cmp r4, r0
@@ -2287,7 +2287,7 @@ sub_8053FF8: @ 8053FF8
bl is_warp1_light_level_8_or_9
lsls r0, 24
lsrs r0, 24
- bl sub_8074D28
+ bl FadeOutMapMusic
_08054028:
pop {r4}
pop {r0}
@@ -2299,7 +2299,7 @@ _08054030: .4byte 0x00004001
thumb_func_start sub_8054034
sub_8054034: @ 8054034
push {lr}
- bl sub_8074E14
+ bl IsNotWaitingForBGMStop
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -2310,7 +2310,7 @@ sub_8054034: @ 8054034
sub_8054044: @ 8054044
push {lr}
movs r0, 0x4
- bl sub_8074D28
+ bl FadeOutMapMusic
pop {r0}
bx r0
thumb_func_end sub_8054044
@@ -2365,7 +2365,7 @@ _08054084:
asrs r2, 24
adds r1, r4, 0
movs r3, 0x1
- bl sub_8075090
+ bl PlayCry2
_080540C0:
add sp, 0x4
pop {r4}
@@ -2853,7 +2853,7 @@ _0805440C: .4byte gUnknown_0300485C
CB2_NewGame: @ 8054410
push {lr}
bl FieldClearVBlankHBlankCallbacks
- bl sub_8074D08
+ bl StopMapMusic
bl ResetSafariZoneFlag_
bl NewGameInitData
bl player_avatar_init_params_reset
@@ -2895,7 +2895,7 @@ c2_whiteout: @ 8054468
cmp r0, 0x77
bls _080544BE
bl FieldClearVBlankHBlankCallbacks
- bl sub_8074D08
+ bl StopMapMusic
bl ResetSafariZoneFlag_
bl sub_8052F5C
bl player_avatar_init_params_reset
@@ -3107,7 +3107,7 @@ _08054658: .4byte c2_overworld
sub_805465C: @ 805465C
push {lr}
bl FieldClearVBlankHBlankCallbacks
- bl sub_8074D08
+ bl StopMapMusic
bl sub_8054F70
ldr r0, _0805468C
bl set_callback1
@@ -3213,7 +3213,7 @@ _08054730: .4byte gMapHeader
CB2_ContinueSavedGame: @ 8054734
push {lr}
bl FieldClearVBlankHBlankCallbacks
- bl sub_8074D08
+ bl StopMapMusic
bl ResetSafariZoneFlag_
bl sub_805338C
bl sub_8053198
@@ -5349,7 +5349,7 @@ sub_80557E8: @ 80557E8
sub_80557F4: @ 80557F4
push {lr}
movs r0, 0x6
- bl audio_play
+ bl PlaySE
bl sub_8071310
bl ScriptContext2_Enable
pop {r0}
@@ -5361,7 +5361,7 @@ sub_8055808: @ 8055808
push {r4,lr}
adds r4, r0, 0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl ScriptContext1_SetupScript
bl ScriptContext2_Enable
@@ -5374,7 +5374,7 @@ sub_8055808: @ 8055808
sub_8055824: @ 8055824
push {lr}
movs r0, 0x6
- bl audio_play
+ bl PlaySE
ldr r0, _0805583C
bl ScriptContext1_SetupScript
bl ScriptContext2_Enable
@@ -5389,7 +5389,7 @@ sub_8055840: @ 8055840
push {r4,lr}
adds r4, r0, 0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl ScriptContext1_SetupScript
bl ScriptContext2_Enable
@@ -14425,7 +14425,7 @@ PlayerJumpLedge: @ 805949C
lsls r4, 24
lsrs r4, 24
movs r0, 0xA
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl GetJumpLedgeAnimId
lsls r0, 24
@@ -14522,7 +14522,7 @@ sub_805954C: @ 805954C
lsls r4, 24
lsrs r4, 24
movs r0, 0x22
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_8060A5C
lsls r0, 24
@@ -14541,7 +14541,7 @@ sub_8059570: @ 8059570
lsls r4, 24
lsrs r4, 24
movs r0, 0x22
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_8060A88
lsls r0, 24
@@ -14560,7 +14560,7 @@ sub_8059594: @ 8059594
lsls r4, 24
lsrs r4, 24
movs r0, 0x22
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_8060AB4
lsls r0, 24
@@ -14579,7 +14579,7 @@ sub_80595B8: @ 80595B8
lsls r4, 24
lsrs r4, 24
movs r0, 0x22
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_8060878
lsls r0, 24
@@ -14598,7 +14598,7 @@ sub_80595DC: @ 80595DC
lsls r4, 24
lsrs r4, 24
movs r0, 0x7
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_8060AE0
lsls r0, 24
@@ -14700,7 +14700,7 @@ PlayCollisionSoundIfNotFacingWarp: @ 8059648
bne _080596B0
_080596AA:
movs r0, 0x7
- bl audio_play
+ bl PlaySE
_080596B0:
add sp, 0x4
pop {r4}
@@ -15846,7 +15846,7 @@ sub_8059EA4: @ 8059EA4
movs r0, 0xA
bl FieldEffectStart
movs r0, 0xD6
- bl audio_play
+ bl PlaySE
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
@@ -15968,7 +15968,7 @@ sub_805A000: @ 805A000
cmp r0, 0
beq _0805A05C
movs r0, 0xA
- bl audio_play
+ bl PlaySE
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@@ -16076,7 +16076,7 @@ sub_805A0D8: @ 805A0D8
strb r0, [r1, 0x6]
bl ScriptContext2_Enable
movs r0, 0x2D
- bl audio_play
+ bl PlaySE
movs r0, 0x1
pop {r1}
bx r1
diff --git a/asm/rom5.s b/asm/rom5.s
index ee4180b66..0665ec922 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -3090,7 +3090,7 @@ sub_807C644: @ 807C644
beq _0807C6B4
_0807C67A:
movs r0, 0x4
- bl play_sound_effect
+ bl FadeOutBGM
movs r0, 0x1
negs r0, r0
ldr r1, _0807C6AC
@@ -3127,7 +3127,7 @@ _0807C6C4:
cmp r0, 0x1
bne _0807C6FC
movs r0, 0x4
- bl play_sound_effect
+ bl FadeOutBGM
movs r0, 0x1
negs r0, r0
str r5, [sp]
@@ -3191,7 +3191,7 @@ _0807C758: .4byte REG_BG2Y_L
_0807C75C: .4byte gTasks
_0807C760: .4byte gUnknown_030041B4
_0807C764: .4byte gUnknown_030042C0
-_0807C768: .4byte gUnknown_03007380
+_0807C768: .4byte gMPlay_BGM
_0807C76C: .4byte 0x0000ffff
_0807C770: .4byte sub_807C790
thumb_func_end sub_807C644
@@ -6126,7 +6126,7 @@ _0807DDA0:
_0807DDA6:
strb r0, [r1]
adds r0, r2, 0
- bl audio_play
+ bl PlaySE
_0807DDAE:
pop {r0}
bx r0
@@ -6137,7 +6137,7 @@ _0807DDB4: .4byte 0x000006dd
thumb_func_start play_some_sound
play_some_sound: @ 807DDB8
push {lr}
- bl sub_80755FC
+ bl IsSpecialSEPlaying
lsls r0, 24
cmp r0, 0
beq _0807DDF6
@@ -6152,18 +6152,18 @@ play_some_sound: @ 807DDB8
cmp r0, 0
bne _0807DDF0
movs r0, 0x56
- bl audio_play
+ bl PlaySE
b _0807DDF6
.align 2, 0
_0807DDE0: .4byte gUnknown_0202F7E8
_0807DDE4: .4byte 0x000006dd
_0807DDE8:
movs r0, 0x54
- bl audio_play
+ bl PlaySE
b _0807DDF6
_0807DDF0:
movs r0, 0x52
- bl audio_play
+ bl PlaySE
_0807DDF6:
pop {r0}
bx r0
@@ -9069,7 +9069,7 @@ sub_807F434: @ 807F434
ldrh r0, [r1]
cmp r0, 0
bne _0807F490
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _0807F494
@@ -9078,14 +9078,14 @@ sub_807F434: @ 807F434
cmp r4, 0
beq _0807F474
movs r0, 0x57
- bl audio_play
+ bl PlaySE
b _0807F47A
.align 2, 0
_0807F46C: .4byte gUnknown_08396FC4
_0807F470: .4byte 0x000006ed
_0807F474:
movs r0, 0x58
- bl audio_play
+ bl PlaySE
_0807F47A:
ldr r0, _0807F488
ldr r0, [r0]
@@ -12123,7 +12123,7 @@ sub_8080B78: @ 8080B78
bl sub_8053E90
bl pal_fill_for_maplights
movs r0, 0x2E
- bl audio_play
+ bl PlaySE
ldr r0, _08080B98
movs r1, 0xA
bl CreateTask
@@ -12513,7 +12513,7 @@ sub_8080E88: @ 8080E88
bl sub_8080918
bl play_some_sound
movs r0, 0x9
- bl audio_play
+ bl PlaySE
ldr r0, _08080EB4
ldr r1, _08080EB8
str r1, [r0]
@@ -12623,7 +12623,7 @@ sub_8080F68: @ 8080F68
bl sub_8053FF8
bl sub_8080918
movs r0, 0x2D
- bl audio_play
+ bl PlaySE
ldr r0, _08080F90
movs r1, 0xA
bl CreateTask
@@ -12719,7 +12719,7 @@ sub_808102C: @ 808102C
bl sub_8053FF8
bl sub_8080918
movs r0, 0x9
- bl audio_play
+ bl PlaySE
ldr r0, _0808104C
movs r1, 0xA
bl CreateTask
@@ -12761,7 +12761,7 @@ _0808107E:
bl fade_screen
bl sub_8053FF8
movs r0, 0x9
- bl audio_play
+ bl PlaySE
b _080810AC
_08081096:
bl sub_8080E64
@@ -12913,7 +12913,7 @@ _080811A8:
bl sub_8058790
lsls r0, 16
lsrs r0, 16
- bl audio_play
+ bl PlaySE
movs r1, 0
ldrsh r0, [r4, r1]
movs r2, 0
@@ -13100,7 +13100,7 @@ sub_8081334: @ 8081334
bl sub_8080918
bl play_some_sound
movs r0, 0x9
- bl audio_play
+ bl PlaySE
ldr r0, _08081360
ldr r1, _08081364
str r1, [r0]
@@ -15759,7 +15759,7 @@ _080827F8: .4byte 0x0000018d
_080827FC:
ldr r0, _08082808
_080827FE:
- bl current_map_music_set
+ bl PlayNewMapMusic
_08082802:
pop {r0}
bx r0
@@ -16859,7 +16859,7 @@ sub_8082F68: @ 8082F68
cmp r0, 0x1
bne _08082FCC
movs r0, 0x15
- bl audio_play
+ bl PlaySE
ldr r0, _08082FC4
bl ShowFieldAutoScrollMessage
ldr r0, _08082FC8
@@ -16870,7 +16870,7 @@ _08082FC4: .4byte gUnknown_081A4932
_08082FC8: .4byte sub_8082FEC
_08082FCC:
movs r0, 0x16
- bl audio_play
+ bl PlaySE
ldr r0, _08082FE4
bl ShowFieldAutoScrollMessage
ldr r0, _08082FE8
@@ -17056,7 +17056,7 @@ _08083158:
cmp r0, 0
beq _08083178
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_8007F4C
ldr r0, _08083180
lsls r1, r6, 2
@@ -23383,7 +23383,7 @@ _080860D4:
subs r0, 0x1
strh r0, [r4, 0x3A]
movs r0, 0x17
- bl audio_play
+ bl PlaySE
_08086130:
movs r1, 0x3A
ldrsh r0, [r4, r1]
@@ -23428,7 +23428,7 @@ sub_8086154: @ 8086154
beq _08086184
movs r0, 0xB8
lsls r0, 1
- bl fanfare_play
+ bl PlayFanfare
_08086184:
pop {r0}
bx r0
@@ -23731,7 +23731,7 @@ sub_80863E0: @ 80863E0
ldrsh r0, [r4, r1]
cmp r0, 0
beq _080863F6
- bl task_is_not_running_overworld_fanfare
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _080863FC
@@ -24357,7 +24357,7 @@ sub_8086870: @ 8086870
ands r0, r2
strb r0, [r1, 0x1]
movs r0, 0x2B
- bl audio_play
+ bl PlaySE
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -24445,7 +24445,7 @@ _08086964:
cmp r0, 0
blt _08086988
movs r0, 0xD6
- bl audio_play
+ bl PlaySE
ldrb r0, [r6]
movs r1, 0x8
orrs r0, r1
@@ -24667,7 +24667,7 @@ _08086AEA:
strh r0, [r5, 0x8]
_08086B18:
movs r0, 0x50
- bl audio_play
+ bl PlaySE
_08086B1E:
movs r0, 0
pop {r4,r5}
@@ -25687,7 +25687,7 @@ sub_8087298: @ 8087298
movs r0, 0x32
bl FieldEffectStart
movs r0, 0xB2
- bl audio_play
+ bl PlaySE
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -26039,7 +26039,7 @@ sub_8087548: @ 8087548
strb r0, [r4, 0x1]
bl CameraObjectReset1
movs r0, 0xAF
- bl audio_play
+ bl PlaySE
movs r0, 0x4
bl sub_80608A4
adds r1, r0, 0
@@ -26289,7 +26289,7 @@ _0808774C:
adds r0, r4, 0
bl FieldObjectSetSpecialAnim
movs r0, 0x27
- bl audio_play
+ bl PlaySE
_0808776C:
movs r0, 0
pop {r4-r6}
@@ -26942,7 +26942,7 @@ _08087C60:
movs r0, 0x1
strh r0, [r4, 0xE]
movs r0, 0x2D
- bl audio_play
+ bl PlaySE
_08087C8E:
add sp, 0x8
pop {r4,r5}
@@ -27213,7 +27213,7 @@ sub_8087E4C: @ 8087E4C
lsrs r0, 24
strh r0, [r6, 0x26]
movs r0, 0x2D
- bl audio_play
+ bl PlaySE
_08087EC2:
pop {r4-r6}
pop {r0}
@@ -28505,14 +28505,14 @@ sub_8088890: @ 8088890
movs r1, 0
movs r2, 0x7D
movs r3, 0xA
- bl sub_8075090
+ bl PlayCry2
b _080888D0
.align 2, 0
_080888C4: .4byte sub_80888D4
_080888C8:
ldrh r0, [r1, 0x2E]
movs r1, 0
- bl cry_related
+ bl PlayCry1
_080888D0:
pop {r0}
bx r0
@@ -28875,7 +28875,7 @@ sub_8088B68: @ 8088B68
ldr r0, [r0]
strh r0, [r2, 0x30]
movs r0, 0x9E
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
pop {r4}
pop {r1}
@@ -29188,7 +29188,7 @@ _08088DFE:
adds r0, 0x1
strh r0, [r4, 0x8]
movs r0, 0x9E
- bl audio_play
+ bl PlaySE
ldrb r0, [r4, 0xA]
bl sub_8088FC0
_08088E1C:
@@ -31112,7 +31112,7 @@ sub_8089CD4: @ 8089CD4
_08089D00: .4byte gPaletteFade
_08089D04:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_806CA38
ldr r1, _08089D48
@@ -31148,7 +31148,7 @@ _08089D58: .4byte gTasks
_08089D5C: .4byte sub_8089D94
_08089D60:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
str r5, [sp]
@@ -31192,7 +31192,7 @@ sub_8089D94: @ 8089D94
cmp r1, 0x40
bne _08089DD4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
@@ -31207,7 +31207,7 @@ _08089DD4:
cmp r1, 0x80
bne _08089DF0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
ldr r1, _08089DEC
@@ -31222,7 +31222,7 @@ _08089DF0:
cmp r0, 0
beq _08089E30
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _08089E24
ldr r2, _08089E28
ldr r0, _08089E2C
@@ -31534,7 +31534,7 @@ sub_808A060: @ 808A060
bl MoveMenuCursor
strb r0, [r4]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_0808A086:
ldr r0, _0808A0D0
ldrh r0, [r0, 0x2E]
@@ -31548,7 +31548,7 @@ _0808A086:
bl MoveMenuCursor
strb r0, [r4]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_0808A0A4:
ldr r0, _0808A0D0
ldrh r1, [r0, 0x2E]
@@ -31557,7 +31557,7 @@ _0808A0A4:
cmp r0, 0
beq _0808A0E0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _0808A0D8
ldr r2, _0808A0DC
ldr r0, _0808A0D4
@@ -32364,7 +32364,7 @@ sub_808A73C: @ 808A73C
cmp r0, 0x40
bne _0808A77A
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r4, _0808A768
ldrb r0, [r4]
cmp r0, 0
@@ -32391,7 +32391,7 @@ _0808A77A:
cmp r0, 0x80
bne _0808A7B4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r4, _0808A7A4
ldrb r0, [r4]
ldr r1, _0808A7A8
@@ -32421,7 +32421,7 @@ _0808A7B4:
cmp r0, 0
beq _0808A7F0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _0808A7E4
ldr r2, _0808A7E8
ldr r0, _0808A7EC
@@ -32593,7 +32593,7 @@ sub_808A918: @ 808A918
lsrs r4, 24
bl sub_8072DEC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_808A8D4
pop {r4}
@@ -32609,7 +32609,7 @@ sub_808A938: @ 808A938
lsrs r4, 24
bl sub_8072DEC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x13
movs r1, 0
movs r2, 0x1D
@@ -33587,7 +33587,7 @@ _0808B0F0:
cmp r0, 0
beq _0808B120
movs r0, 0x20
- bl audio_play
+ bl PlaySE
b _0808B1CE
.align 2, 0
_0808B118: .4byte gUnknown_03005CE0
@@ -33610,7 +33610,7 @@ _0808B13C:
cmp r0, 0x1
bne _0808B154
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _0808B174
ldrh r1, [r0]
ldr r2, _0808B17C
@@ -33621,7 +33621,7 @@ _0808B154:
cmp r0, 0x3
bne _0808B1CE
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _0808B180
adds r0, r4, 0
bl sub_806EC44
@@ -33639,7 +33639,7 @@ _0808B184:
ldr r1, _0808B1D8
strb r0, [r1]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
str r5, [sp]
@@ -35219,7 +35219,7 @@ sub_808BE0C: @ 808BE0C
movs r0, 0x1
eors r4, r0
adds r0, r4, 0
- bl sub_81DF5D8
+ bl SetPokemonCryStereo
_0808BE28:
adds r0, r4, 0
pop {r4}
@@ -36095,7 +36095,7 @@ _0808C528: .4byte sub_808C5F0
_0808C52C: .4byte gUnknown_0202FFB4
_0808C530: .4byte 0x00000612
_0808C534: .4byte 0x00000616
-_0808C538: .4byte gUnknown_03007380
+_0808C538: .4byte gMPlay_BGM
_0808C53C: .4byte 0x0000ffff
thumb_func_end sub_808C27C
@@ -36308,7 +36308,7 @@ _0808C68C:
ldr r1, _0808C720
str r1, [r0]
movs r0, 0x15
- bl audio_play
+ bl PlaySE
b _0808C878
.align 2, 0
_0808C708: .4byte gMain
@@ -36348,7 +36348,7 @@ _0808C724:
ldr r1, _0808C770
str r1, [r0]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
b _0808C878
.align 2, 0
_0808C764: .4byte 0x00000654
@@ -36363,7 +36363,7 @@ _0808C774:
cmp r1, 0
beq _0808C814
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
str r4, [sp]
@@ -36414,7 +36414,7 @@ _0808C774:
ldr r0, _0808C810
str r0, [r3]
movs r0, 0x2
- bl audio_play
+ bl PlaySE
b _0808C878
.align 2, 0
_0808C7F4: .4byte gTasks
@@ -36445,7 +36445,7 @@ _0808C814:
ldr r1, _0808C848
str r1, [r0]
movs r0, 0x3
- bl audio_play
+ bl PlaySE
b _0808C878
.align 2, 0
_0808C844: .4byte gTasks
@@ -36633,7 +36633,7 @@ _0808C9A0:
ldr r1, _0808C9F4
str r1, [r0]
movs r0, 0x3
- bl audio_play
+ bl PlaySE
_0808C9C4:
ldr r2, _0808C9F8
ldrh r1, [r2, 0x2E]
@@ -36679,7 +36679,7 @@ _0808CA04:
strh r0, [r1]
_0808CA20:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
b _0808CA52
.align 2, 0
_0808CA28: .4byte gUnknown_0202FFB4
@@ -36700,7 +36700,7 @@ _0808CA30:
adds r0, 0x1
strh r0, [r1]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_0808CA52:
add sp, 0x4
pop {r4-r7}
@@ -36993,7 +36993,7 @@ _0808CCAC: .4byte gUnknown_0202FFB4
_0808CCB0: .4byte 0x00000612
_0808CCB4: .4byte 0x00000616
_0808CCB8: .4byte sub_805469C
-_0808CCBC: .4byte gUnknown_03007380
+_0808CCBC: .4byte gMPlay_BGM
_0808CCC0: .4byte 0x0000ffff
thumb_func_end sub_808CC50
@@ -37112,7 +37112,7 @@ _0808CD44:
ldr r1, _0808CDCC
str r1, [r0]
movs r0, 0x15
- bl audio_play
+ bl PlaySE
b _0808CEDC
.align 2, 0
_0808CDB4: .4byte gMain
@@ -37152,7 +37152,7 @@ _0808CDD0:
ldr r1, _0808CE1C
str r1, [r0]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
b _0808CEDC
.align 2, 0
_0808CE10: .4byte 0x00000654
@@ -37191,7 +37191,7 @@ _0808CE20:
ldr r0, _0808CE74
str r0, [r1]
movs r0, 0x2
- bl audio_play
+ bl PlaySE
b _0808CEDC
.align 2, 0
_0808CE68: .4byte gTasks
@@ -37218,7 +37218,7 @@ _0808CE78:
ldr r1, _0808CEAC
str r1, [r0]
movs r0, 0x3
- bl audio_play
+ bl PlaySE
b _0808CEDC
.align 2, 0
_0808CEA8: .4byte gTasks
@@ -37417,7 +37417,7 @@ _0808D024:
ldr r1, _0808D050
str r1, [r0]
movs r0, 0x34
- bl audio_play
+ bl PlaySE
b _0808D078
.align 2, 0
_0808D04C: .4byte gTasks
@@ -37438,7 +37438,7 @@ _0808D054:
ldr r1, _0808D0A8
str r1, [r0]
movs r0, 0x3
- bl audio_play
+ bl PlaySE
_0808D078:
ldr r2, _0808D0AC
ldrh r1, [r2, 0x2E]
@@ -37484,7 +37484,7 @@ _0808D0B8:
strh r0, [r1]
_0808D0D4:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
b _0808D106
.align 2, 0
_0808D0DC: .4byte gUnknown_0202FFB4
@@ -37505,7 +37505,7 @@ _0808D0E4:
adds r0, 0x1
strh r0, [r1]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_0808D106:
add sp, 0x4
pop {r4-r6}
@@ -40000,7 +40000,7 @@ _0808E4E0:
movs r1, 0xE
bl sub_808E0CC
movs r0, 0x6D
- bl audio_play
+ bl PlaySE
b _0808E5A2
.align 2, 0
_0808E52C: .4byte gMain
@@ -40055,7 +40055,7 @@ _0808E55A:
movs r1, 0xE
bl sub_808E0CC
movs r0, 0x6D
- bl audio_play
+ bl PlaySE
_0808E5A2:
mov r0, r10
cmp r0, 0
@@ -40112,7 +40112,7 @@ _0808E60E:
adds r2, r4, 0
bl sub_808DBE8
movs r0, 0x6C
- bl audio_play
+ bl PlaySE
b _0808E5A2
.align 2, 0
_0808E620: .4byte gUnknown_0202FFB4
@@ -42130,7 +42130,7 @@ _0808F614:
ldrsh r0, [r0, r1]
cmp r0, 0
bne _0808F66C
- bl sub_8075398
+ bl StopCryAndClearCrySongs
ldr r0, _0808F668
ldr r0, [r0]
ldrh r0, [r0]
@@ -42140,7 +42140,7 @@ _0808F614:
movs r1, 0
movs r2, 0x7D
movs r3, 0xA
- bl sub_8075090
+ bl PlayCry2
b _0808F6B6
.align 2, 0
_0808F65C: .4byte gPaletteFade
@@ -42152,7 +42152,7 @@ _0808F66C:
strb r0, [r2]
b _0808F6B6
_0808F672:
- bl sub_80753C4
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
bne _0808F6B6
@@ -42222,7 +42222,7 @@ sub_808F6CC: @ 808F6CC
ldr r0, _0808F708
str r0, [r5]
movs r0, 0x6C
- bl audio_play
+ bl PlaySE
b _0808F874
.align 2, 0
_0808F704: .4byte gTasks
@@ -42247,7 +42247,7 @@ _0808F70C:
ldr r0, _0808F740
str r0, [r5]
movs r0, 0x3
- bl audio_play
+ bl PlaySE
b _0808F874
.align 2, 0
_0808F73C: .4byte gMain
@@ -42314,7 +42314,7 @@ _0808F7AC:
cmp r0, 0
bne _0808F7C8
movs r0, 0x20
- bl audio_play
+ bl PlaySE
b _0808F874
.align 2, 0
_0808F7C4: .4byte gUnknown_0202FFBC
@@ -42330,7 +42330,7 @@ _0808F7C8:
_0808F7DA:
str r0, [r5]
movs r0, 0x15
- bl audio_play
+ bl PlaySE
b _0808F874
.align 2, 0
_0808F7E4: .4byte sub_8090070
@@ -42364,7 +42364,7 @@ _0808F802:
movs r1, 0xD
bl sub_8090584
movs r0, 0x6D
- bl audio_play
+ bl PlaySE
b _0808F874
.align 2, 0
_0808F828: .4byte gSaveBlock2
@@ -42401,7 +42401,7 @@ _0808F850:
movs r1, 0xD
bl sub_8090584
movs r0, 0x6D
- bl audio_play
+ bl PlaySE
_0808F874:
add sp, 0x4
pop {r4-r6}
@@ -42722,7 +42722,7 @@ _0808FACA:
b _0808FDDC
.align 2, 0
_0808FB08: .4byte gPaletteFade
-_0808FB0C: .4byte gUnknown_03007380
+_0808FB0C: .4byte gMPlay_BGM
_0808FB10: .4byte gUnknown_0202FFB4
_0808FB14: .4byte 0x0000064a
_0808FB18: .4byte gUnknown_03005CEC
@@ -43048,7 +43048,7 @@ sub_808FDF8: @ 808FDF8
lsrs r4, r0, 24
movs r0, 0
bl sub_8119F88
- bl sub_80753E8
+ bl IsCryPlaying
lsls r0, 24
cmp r0, 0
beq _0808FE18
@@ -43119,11 +43119,11 @@ _0808FE62:
ldr r1, _0808FEBC
str r1, [r0]
movs r0, 0x3
- bl audio_play
+ bl PlaySE
b _0808FF9E
.align 2, 0
_0808FEA8: .4byte gPaletteFade
-_0808FEAC: .4byte gUnknown_03007380
+_0808FEAC: .4byte gMPlay_BGM
_0808FEB0: .4byte gUnknown_0202FFB4
_0808FEB4: .4byte 0x0000064f
_0808FEB8: .4byte gTasks
@@ -43166,11 +43166,11 @@ _0808FEDA:
ldr r1, _0808FF28
str r1, [r0]
movs r0, 0x6D
- bl audio_play
+ bl PlaySE
b _0808FF9E
.align 2, 0
_0808FF14: .4byte gSaveBlock2
-_0808FF18: .4byte gUnknown_03007380
+_0808FF18: .4byte gMPlay_BGM
_0808FF1C: .4byte gUnknown_0202FFB4
_0808FF20: .4byte 0x0000064f
_0808FF24: .4byte gTasks
@@ -43199,7 +43199,7 @@ _0808FF48:
cmp r0, 0
bne _0808FF68
movs r0, 0x20
- bl audio_play
+ bl PlaySE
b _0808FF9E
.align 2, 0
_0808FF60: .4byte gSaveBlock2
@@ -43228,14 +43228,14 @@ _0808FF68:
ldr r1, _0808FFB8
str r1, [r0]
movs r0, 0x6D
- bl audio_play
+ bl PlaySE
_0808FF9E:
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
-_0808FFA8: .4byte gUnknown_03007380
+_0808FFA8: .4byte gMPlay_BGM
_0808FFAC: .4byte gUnknown_0202FFB4
_0808FFB0: .4byte 0x0000064f
_0808FFB4: .4byte gTasks
@@ -43747,7 +43747,7 @@ sub_80903D0: @ 80903D0
ldr r1, _0809042C
str r1, [r0]
movs r0, 0x3
- bl audio_play
+ bl PlaySE
b _0809047A
.align 2, 0
_0809041C: .4byte gMain
@@ -43791,7 +43791,7 @@ _0809044A:
ldr r1, _08090494
str r1, [r0]
movs r0, 0x6D
- bl audio_play
+ bl PlaySE
_0809047A:
add sp, 0x4
pop {r4,r5}
@@ -44477,7 +44477,7 @@ _080909F4:
lsls r0, 16
lsrs r0, 16
movs r1, 0
- bl cry_related
+ bl PlayCry1
ldr r1, _08090A34
lsls r0, r7, 2
adds r0, r7
@@ -44587,7 +44587,7 @@ _08090AA4:
mov r0, r8
strh r0, [r5, 0x10]
movs r0, 0x15
- bl audio_play
+ bl PlaySE
b _08090B44
.align 2, 0
_08090B00: .4byte gTasks
@@ -44814,7 +44814,7 @@ sub_8090C68: @ 8090C68
adds r0, 0x1
strh r0, [r1]
movs r0, 0x15
- bl audio_play
+ bl PlaySE
b _08090D2A
.align 2, 0
_08090CD0: .4byte gUnknown_0202FFBC
@@ -44854,7 +44854,7 @@ _08090CE4:
subs r0, 0x1
strh r0, [r1]
movs r0, 0x15
- bl audio_play
+ bl PlaySE
_08090D2A:
pop {r4,r5}
pop {r0}
@@ -47381,7 +47381,7 @@ sub_809207C: @ 809207C
cmp r0, 0
beq _080920B0
movs r0, 0x3
- bl audio_play
+ bl PlaySE
ldr r0, _080920A8
lsls r1, r5, 2
adds r1, r5
@@ -47421,12 +47421,12 @@ _080920D8:
b _0809216C
_080920DE:
movs r0, 0x15
- bl audio_play
+ bl PlaySE
strh r4, [r5, 0xA]
b _080920F2
_080920E8:
movs r0, 0x15
- bl audio_play
+ bl PlaySE
movs r0, 0x4
strh r0, [r5, 0xA]
_080920F2:
@@ -47437,7 +47437,7 @@ _080920F2:
_080920F8: .4byte sub_809217C
_080920FC:
movs r0, 0x3
- bl audio_play
+ bl PlaySE
ldr r0, _08092108
str r0, [r5]
b _0809216C
@@ -47458,7 +47458,7 @@ _0809210C:
cmp r0, 0
ble _0809213A
movs r0, 0x6D
- bl audio_play
+ bl PlaySE
ldrh r0, [r4, 0x8]
subs r0, 0x1
strh r0, [r4, 0x8]
@@ -47482,7 +47482,7 @@ _0809213A:
cmp r0, 0x1
bgt _0809216C
movs r0, 0x6D
- bl audio_play
+ bl PlaySE
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -47564,7 +47564,7 @@ _080921F0:
cmp r3, 0
beq _08092230
movs r0, 0x17
- bl audio_play
+ bl PlaySE
adds r0, r5, 0
bl sub_8092EB0
ldr r0, _08092228
@@ -47641,7 +47641,7 @@ _08092288:
adds r0, r2
strh r1, [r0]
movs r0, 0x3
- bl audio_play
+ bl PlaySE
ldr r0, _080922D0
str r0, [r6]
b _080923EC
@@ -47660,14 +47660,14 @@ _080922D4:
ldr r0, _080922EC
str r0, [r6]
movs r0, 0x70
- bl audio_play
+ bl PlaySE
b _080923EC
.align 2, 0
_080922E8: .4byte gDexText_Searching
_080922EC: .4byte sub_80923FC
_080922F0:
movs r0, 0x15
- bl audio_play
+ bl PlaySE
ldr r0, _080922FC
str r0, [r6]
b _080923EC
@@ -47691,7 +47691,7 @@ _08092300:
cmp r0, 0xFF
beq _08092338
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r2, 0xA
ldrsh r0, [r4, r2]
lsls r0, 2
@@ -47720,7 +47720,7 @@ _08092338:
cmp r0, 0xFF
beq _08092374
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r2, 0xA
ldrsh r0, [r4, r2]
lsls r0, 2
@@ -47749,7 +47749,7 @@ _08092374:
cmp r0, 0xFF
beq _080923B0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r2, 0xA
ldrsh r0, [r4, r2]
lsls r0, 2
@@ -47778,7 +47778,7 @@ _080923B0:
cmp r0, 0xFF
beq _080923EC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r2, 0xA
ldrsh r0, [r4, r2]
lsls r0, 2
@@ -47880,7 +47880,7 @@ sub_80924A4: @ 80924A4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _080924F6
@@ -47892,7 +47892,7 @@ sub_80924A4: @ 80924A4
cmp r0, 0
beq _080924DC
movs r0, 0x1F
- bl audio_play
+ bl PlaySE
ldr r0, _080924D8
bl sub_8091E20
b _080924E8
@@ -47902,7 +47902,7 @@ _080924D4: .4byte 0x0000060c
_080924D8: .4byte gDexText_SearchComplete
_080924DC:
movs r0, 0x20
- bl audio_play
+ bl PlaySE
ldr r0, _080924FC
bl sub_8091E20
_080924E8:
@@ -47972,7 +47972,7 @@ sub_8092508: @ 8092508
ldr r1, _0809258C
str r1, [r0]
movs r0, 0x3
- bl audio_play
+ bl PlaySE
b _080925A4
.align 2, 0
_08092570: .4byte gMain
@@ -47992,7 +47992,7 @@ _08092590:
ldr r0, _080925B0
str r0, [r1]
movs r0, 0x17
- bl audio_play
+ bl PlaySE
_080925A4:
pop {r4,r5}
pop {r0}
@@ -48112,7 +48112,7 @@ sub_8092644: @ 8092644
beq _080926B4
bl sub_814ADC8
movs r0, 0x15
- bl audio_play
+ bl PlaySE
movs r0, 0x12
movs r1, 0x1
movs r2, 0x1C
@@ -48132,7 +48132,7 @@ _080926B4:
beq _080926EC
bl sub_814ADC8
movs r0, 0x17
- bl audio_play
+ bl PlaySE
movs r0, 0x12
movs r1, 0x1
movs r2, 0x1C
@@ -48187,7 +48187,7 @@ _08092730:
beq _080927AE
_08092734:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrh r0, [r4]
ldrh r1, [r5]
adds r0, r1
@@ -48235,7 +48235,7 @@ _08092794:
beq _080927AE
_08092798:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrh r0, [r4]
ldrh r1, [r5]
adds r0, r1
@@ -50516,7 +50516,7 @@ sub_8093918: @ 8093918
push {lr}
bl sub_8093A28
movs r0, 0x36
- bl audio_play
+ bl PlaySE
ldr r1, _08093934
ldrb r0, [r1]
adds r0, 0x1
@@ -53783,7 +53783,7 @@ _080951C0: .4byte word_203855E
_080951C4: .4byte sub_80952E4
_080951C8:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_806CA38
lsls r0, 24
@@ -53818,13 +53818,13 @@ _08095214:
bne _08095228
_0809521C:
movs r0, 0x20
- bl audio_play
+ bl PlaySE
b _08095268
.align 2, 0
_08095224: .4byte gUnknown_02038473
_08095228:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrb r0, [r5]
cmp r0, 0x3
bne _08095254
@@ -54079,7 +54079,7 @@ sub_8095408: @ 8095408
cmp r0, 0
beq _08095444
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
@@ -54093,7 +54093,7 @@ _08095444:
cmp r0, 0
beq _0809545A
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
b _080954B8
@@ -54104,7 +54104,7 @@ _0809545A:
cmp r0, 0
beq _080954A4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _08095498
lsls r0, r7, 2
adds r0, r7
@@ -54135,7 +54135,7 @@ _080954A4:
cmp r0, 0
beq _080954B8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_80958C4
_080954B8:
@@ -56007,7 +56007,7 @@ sub_8096368: @ 8096368
cmp r0, 0
beq _08096384
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0xC9
b _080963CC
.align 2, 0
@@ -56018,7 +56018,7 @@ _08096384:
cmp r0, 0
beq _080963A4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080963A0
ldr r0, [r0]
movs r1, 0x8F
@@ -56034,7 +56034,7 @@ _080963A4:
cmp r0, 0
beq _080963B8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_809662C
b _080963CA
_080963B8:
@@ -56043,7 +56043,7 @@ _080963B8:
cmp r0, 0
beq _080963CA
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_80965F8
_080963CA:
movs r0, 0xC8
@@ -57074,7 +57074,7 @@ _08096C0E:
b _08096C38
_08096C16:
movs r0, 0x2
- bl audio_play
+ bl PlaySE
movs r1, 0
movs r0, 0xE
strh r0, [r4, 0xC]
@@ -57190,7 +57190,7 @@ _08096CE0:
.4byte _08096DA0
_08096D20:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _08096D30
movs r0, 0x1
strb r0, [r1, 0x4]
@@ -57256,7 +57256,7 @@ _08096DA0:
_08096DA8: .4byte sub_8097CC0
_08096DAC:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _08096DBC
bl sub_8096BE0
b _08096FBA
@@ -57264,7 +57264,7 @@ _08096DAC:
_08096DBC: .4byte sub_809789C
_08096DC0:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _08096DD0
bl sub_8096BE0
b _08096FBA
@@ -57272,7 +57272,7 @@ _08096DC0:
_08096DD0: .4byte sub_8097078
_08096DD4:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r4, _08096DF0
ldr r0, _08096DF4
ldrb r0, [r0]
@@ -57290,7 +57290,7 @@ _08096DF4: .4byte gPokemonStorage
_08096DF8: .4byte 0x000008b2
_08096DFC:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r4, _08096E24
ldr r0, _08096E28
ldrb r0, [r0]
@@ -57335,7 +57335,7 @@ _08096E54: .4byte 0x02000000
_08096E58: .4byte 0x000011f2
_08096E5C:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _08096E6C
bl sub_8096BE0
b _08096FBA
@@ -57347,7 +57347,7 @@ _08096E70:
cmp r0, 0
bne _08096E96
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _08096E88
bl sub_8096BE0
b _08096FBA
@@ -57367,7 +57367,7 @@ _08096E96:
_08096EA0: .4byte 0x02000000
_08096EA4:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _08096EB4
bl sub_8096BE0
b _08096FBA
@@ -57375,7 +57375,7 @@ _08096EA4:
_08096EB4: .4byte c3_0808DC50
_08096EB8:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _08096EC8
bl sub_8096BE0
b _08096FBA
@@ -57383,7 +57383,7 @@ _08096EB8:
_08096EC8: .4byte sub_8097390
_08096ECC:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _08096EDC
bl sub_8096BE0
b _08096FBA
@@ -57462,12 +57462,12 @@ _08096F78: .4byte gMain
_08096F7C: .4byte 0x02000000
_08096F80:
movs r0, 0x20
- bl audio_play
+ bl PlaySE
movs r0, 0xD
b _08096F92
_08096F8A:
movs r0, 0x20
- bl audio_play
+ bl PlaySE
movs r0, 0x16
_08096F92:
bl sub_8098898
@@ -57549,7 +57549,7 @@ _0809701C:
b _0809706A
_08097022:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl add_to_c3_somehow
b _08097044
_0809702E:
@@ -57665,7 +57665,7 @@ _08097120:
cmp r0, 0
bne _080971D6
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_8098A5C
ldr r0, _0809713C
bl sub_8096BE0
@@ -57674,7 +57674,7 @@ _08097120:
_0809713C: .4byte sub_80972A8
_08097140:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_8098A5C
ldr r0, _08097154
bl sub_8096BE0
@@ -57687,7 +57687,7 @@ _08097158:
cmp r0, 0
beq _080971D6
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_8098A5C
ldr r0, _08097174
bl sub_8096BE0
@@ -57696,7 +57696,7 @@ _08097158:
_08097174: .4byte c3_0808DC50
_08097178:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_8098A5C
ldr r0, _0809718C
bl sub_8096BE0
@@ -57717,7 +57717,7 @@ _08097190:
cmp r0, 0
bne _08097210
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_8098A5C
ldr r0, _080971C8
bl sub_8096BE0
@@ -57767,7 +57767,7 @@ _08097210:
_08097218: .4byte 0x000011f2
_0809721C:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _0809722C
bl sub_8096BE0
b _0809729A
@@ -57775,7 +57775,7 @@ _0809721C:
_0809722C: .4byte sub_8097594
_08097230:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _08097240
bl sub_8096BE0
b _0809729A
@@ -57783,7 +57783,7 @@ _08097230:
_08097240: .4byte sub_8097788
_08097244:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _08097254
bl sub_8096BE0
b _0809729A
@@ -57791,17 +57791,17 @@ _08097244:
_08097254: .4byte sub_80977E4
_08097258:
movs r0, 0x20
- bl audio_play
+ bl PlaySE
movs r0, 0xD
b _08097274
_08097262:
movs r0, 0x20
- bl audio_play
+ bl PlaySE
movs r0, 0x11
b _08097274
_0809726C:
movs r0, 0x20
- bl audio_play
+ bl PlaySE
movs r0, 0x16
_08097274:
bl sub_8098898
@@ -58615,7 +58615,7 @@ _08097914:
_08097928: .4byte sub_8096C84
_0809792C:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _0809793C
bl sub_8096BE0
b _08097968
@@ -58623,7 +58623,7 @@ _0809792C:
_0809793C: .4byte sub_8097B44
_08097940:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_8098A5C
ldr r0, _08097954
bl sub_8096BE0
@@ -58632,7 +58632,7 @@ _08097940:
_08097954: .4byte sub_8097974
_08097958:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_8098A5C
ldr r0, _08097970
bl sub_8096BE0
@@ -58697,7 +58697,7 @@ _080979D4:
cmp r0, 0xC
blt _08097A5A
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrh r0, [r4]
subs r0, 0xC
strh r0, [r4]
@@ -58728,7 +58728,7 @@ _080979FC:
b _08097A5A
_08097A24:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_8098A5C
ldrh r0, [r4]
subs r0, 0x10
@@ -58939,7 +58939,7 @@ _08097BD4:
cmp r0, 0
beq _08097BF8
movs r0, 0x20
- bl audio_play
+ bl PlaySE
movs r0, 0xF
bl sub_8098898
ldr r1, _08097BF4
@@ -58950,7 +58950,7 @@ _08097BD4:
_08097BF4: .4byte 0x02000000
_08097BF8:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0
bl sub_8098898
movs r0, 0
@@ -58996,7 +58996,7 @@ _08097C4A:
_08097C58: .4byte sub_8096C84
_08097C5C:
movs r0, 0x3
- bl audio_play
+ bl PlaySE
bl sub_8098A5C
ldr r1, _08097C70
ldrb r0, [r1, 0x4]
@@ -59073,7 +59073,7 @@ _08097CF4:
cmp r0, 0
beq _08097D18
movs r0, 0x20
- bl audio_play
+ bl PlaySE
movs r0, 0xF
bl sub_8098898
ldr r1, _08097D14
@@ -59084,7 +59084,7 @@ _08097CF4:
_08097D14: .4byte 0x02000000
_08097D18:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x12
bl sub_8098898
movs r0, 0
@@ -59131,7 +59131,7 @@ _08097D6C:
_08097D78: .4byte sub_8096C84
_08097D7C:
movs r0, 0x3
- bl audio_play
+ bl PlaySE
bl sub_8098A5C
ldr r1, _08097D90
ldrb r0, [r1, 0x4]
@@ -60435,7 +60435,7 @@ sub_809880C: @ 809880C
movs r1, 0
strb r1, [r0]
movs r0, 0x6
- bl audio_play
+ bl PlaySE
bl sub_80984E8
pop {r0}
bx r0
@@ -69595,7 +69595,7 @@ sub_809CF30: @ 809CF30
cmp r0, 0
beq _0809CF52
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r5, 0x1
_0809CF52:
ldrh r1, [r4, 0x2E]
@@ -69604,7 +69604,7 @@ _0809CF52:
cmp r0, 0
beq _0809CF70
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
@@ -69617,7 +69617,7 @@ _0809CF70:
cmp r0, 0
beq _0809CF8E
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
b _0809CF8E
@@ -71840,7 +71840,7 @@ sub_809E0FC: @ 809E0FC
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -71884,7 +71884,7 @@ sub_809E13C: @ 809E13C
strb r0, [r1]
bl ResetSpriteData
bl FreeAllSpritePalettes
- bl sub_8075398
+ bl StopCryAndClearCrySongs
ldr r0, _0809E194
ldr r1, _0809E198
movs r2, 0x80
@@ -71902,7 +71902,7 @@ _0809E182:
_0809E188: .4byte gPaletteFade
_0809E18C: .4byte gUnknown_020384F0
_0809E190: .4byte 0x02018000
-_0809E194: .4byte gUnknown_03007380
+_0809E194: .4byte gMPlay_BGM
_0809E198: .4byte 0x0000ffff
thumb_func_end sub_809E13C
@@ -72183,7 +72183,7 @@ _0809E3BC: .4byte 0x02018000
_0809E3C0: .4byte gUnknown_0202E8CE
_0809E3C4:
movs r0, 0x20
- bl audio_play
+ bl PlaySE
ldrb r1, [r5]
adds r0, r4, 0
bl sub_809F9D0
@@ -72289,13 +72289,13 @@ _0809E474:
cmp r0, 0
bne _0809E4AC
movs r0, 0x20
- bl audio_play
+ bl PlaySE
b _0809E502
.align 2, 0
_0809E4A8: .4byte 0x02018000
_0809E4AC:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrb r1, [r6]
adds r0, r4, 0
adds r0, 0x7A
@@ -72317,7 +72317,7 @@ _0809E4D8: .4byte gTasks
_0809E4DC: .4byte sub_809E534
_0809E4E0:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r7, 0
bl sub_809EAC8
b _0809E502
@@ -72327,7 +72327,7 @@ _0809E4EE:
cmp r0, 0
beq _0809E502
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r7, 0
bl sub_809EAC8
_0809E502:
@@ -72743,7 +72743,7 @@ sub_809E83C: @ 809E83C
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x13
bl sub_80A1B1C
movs r0, 0
@@ -72838,7 +72838,7 @@ sub_809E8F0: @ 809E8F0
movs r0, 0x1
str r0, [sp]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
mov r1, r9
ldrb r6, [r1]
ldr r1, _0809E944
@@ -73003,7 +73003,7 @@ sub_809EA50: @ 809EA50
lsls r0, 24
lsrs r5, r0, 24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r4, _0809EABC
adds r1, r4, 0
adds r1, 0x79
@@ -73919,7 +73919,7 @@ _0809F17C:
cmp r0, 0xFF
bne _0809F1A6
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r6, 0
adds r1, r5, 0
bl sub_809F0D0
@@ -74001,7 +74001,7 @@ _0809F22C:
cmp r0, r1
beq _0809F270
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r5, _0809F278
adds r0, r5, 0
bl sub_80A1CD8
@@ -74318,7 +74318,7 @@ _0809F468:
.4byte _0809F584
.4byte _0809F5A0
_0809F48C:
- bl sub_8075398
+ bl StopCryAndClearCrySongs
b _0809F5B2
_0809F492:
ldr r0, _0809F4AC
@@ -78815,7 +78815,7 @@ sub_80A1888: @ 80A1888
bne _080A18B0
ldrh r0, [r4, 0x2E]
movs r1, 0
- bl cry_related
+ bl PlayCry1
_080A18B0:
pop {r4}
pop {r0}
@@ -80715,7 +80715,7 @@ sub_80A2698: @ 80A2698
push {r7}
movs r7, 0
movs r0, 0x80
- bl audio_play
+ bl PlaySE
ldr r4, _080A2790
adds r1, r4, 0x2
adds r0, r4, 0
@@ -81284,7 +81284,7 @@ _080A2AFC: .4byte gSprites
sub_80A2B00: @ 80A2B00
push {lr}
movs r0, 0x80
- bl audio_play
+ bl PlaySE
movs r0, 0x2
bl FieldEffectActiveListRemove
bl EnableBothScriptContexts
@@ -83799,7 +83799,7 @@ sub_80A3E90: @ 80A3E90
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl nullsub_16
ldr r0, _080A3EE8
lsls r5, r4, 2
@@ -83843,7 +83843,7 @@ sub_80A3EF4: @ 80A3EF4
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl nullsub_16
ldr r0, _080A3F44
lsls r1, r4, 2
@@ -85408,7 +85408,7 @@ sub_80A4ADC: @ 80A4ADC
bl sub_80A7528
_080A4AFA:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080A4B10
movs r0, 0x1
strb r0, [r1]
@@ -85860,7 +85860,7 @@ sub_80A4E8C: @ 80A4E8C
lsls r6, 24
lsrs r6, 24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0
movs r1, 0x1
bl sub_80F979C
@@ -86189,7 +86189,7 @@ _080A50F6:
b _080A526A
_080A5138:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_80A3F50
b _080A526A
@@ -86213,7 +86213,7 @@ _080A5160:
cmp r1, r0
beq _080A5188
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_80A3E90
b _080A526A
@@ -86273,7 +86273,7 @@ _080A51F0:
cmp r0, 0
bne _080A5264
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r2, _080A5250
movs r1, 0
ldrsb r1, [r6, r1]
@@ -86579,7 +86579,7 @@ _080A5440:
b _080A5552
_080A5452:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
b _080A54EE
@@ -86604,7 +86604,7 @@ _080A546C:
cmp r0, 0x8
beq _080A5552
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
b _080A54EE
.align 2, 0
@@ -86626,7 +86626,7 @@ _080A549C:
cmp r0, 0x8
beq _080A5552
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x2
negs r0, r0
b _080A54EE
@@ -86648,7 +86648,7 @@ _080A54CC:
cmp r0, 0x8
beq _080A5552
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x2
_080A54EE:
bl MoveMenuCursor3
@@ -86803,7 +86803,7 @@ _080A561E:
b _080A5736
_080A5630:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
b _080A56D2
@@ -86830,7 +86830,7 @@ _080A5648:
cmp r0, 0x8
beq _080A5736
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
b _080A56D2
.align 2, 0
@@ -86853,7 +86853,7 @@ _080A5680:
cmp r0, 0x8
beq _080A5736
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x3
negs r0, r0
b _080A56D2
@@ -86875,7 +86875,7 @@ _080A56B0:
cmp r0, 0x8
beq _080A5736
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x3
_080A56D2:
bl MoveMenuCursor3
@@ -87098,7 +87098,7 @@ sub_80A5888: @ 80A5888
cmp r0, 0
beq _080A5988
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
b _080A58E2
@@ -87120,7 +87120,7 @@ _080A58C0:
cmp r1, r0
beq _080A5988
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
_080A58E2:
bl MoveMenuCursor
@@ -87369,7 +87369,7 @@ sub_80A5AE4: @ 80A5AE4
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_80A5AAC
pop {r4}
@@ -87451,7 +87451,7 @@ sub_80A5B78: @ 80A5B78
cmp r0, 0
beq _080A5BF2
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl CalculatePlayerPartyCount
lsls r0, 24
cmp r0, 0
@@ -87864,7 +87864,7 @@ sub_80A5EA0: @ 80A5EA0
cmp r0, 0
beq _080A5EF8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080A5EEC
ldrh r0, [r0]
ldr r2, _080A5EF0
@@ -87889,7 +87889,7 @@ _080A5EF8:
cmp r0, 0
beq _080A5F0C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r5, 0
bl sub_80A5D38
_080A5F0C:
@@ -87905,7 +87905,7 @@ sub_80A5F14: @ 80A5F14
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080A5F58
lsls r0, r4, 2
adds r0, r4
@@ -87958,7 +87958,7 @@ sub_80A5F80: @ 80A5F80
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0
bl sub_80A7528
adds r0, r4, 0
@@ -87977,7 +87977,7 @@ sub_80A5FAC: @ 80A5FAC
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080A5FD0
ldr r1, _080A5FD4
adds r4, r0, r1
@@ -88111,7 +88111,7 @@ ItemMenu_Give: @ 80A60C8
lsrs r4, r0, 24
adds r6, r4, 0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r5, _080A60FC
ldrh r0, [r5]
bl sub_80F931C
@@ -88638,7 +88638,7 @@ sub_80A6520: @ 80A6520
cmp r0, 0
beq _080A653E
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl BuyMenuPrintItemQuantityAndPrice
_080A653E:
@@ -88679,7 +88679,7 @@ sub_80A6574: @ 80A6574
lsls r5, 24
lsrs r5, 24
movs r0, 0x5F
- bl audio_play
+ bl PlaySE
ldr r0, _080A65A0
ldrh r0, [r0]
ldr r1, _080A65A4
@@ -88832,7 +88832,7 @@ _080A66B4:
cmp r0, 0
beq _080A6744
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0
movs r1, 0xA
movs r2, 0xD
@@ -88888,7 +88888,7 @@ _080A6744:
cmp r0, 0
beq _080A6758
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl BuyMenuPrintItemQuantityAndPrice
_080A6758:
@@ -89403,7 +89403,7 @@ _080A6B1A:
adds r1, r2, 0
bl sub_80A48E8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_80A5D38
_080A6B4C:
@@ -89498,7 +89498,7 @@ sub_80A6BE0: @ 80A6BE0
cmp r2, 0
beq _080A6C20
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080A6C1C
bl sub_80A4DA4
adds r0, r4, 0
@@ -89530,7 +89530,7 @@ _080A6C20:
adds r1, r2, 0
bl sub_80A48E8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r5, 0
bl sub_80A5D38
_080A6C58:
@@ -89575,7 +89575,7 @@ sub_80A6C6C: @ 80A6C6C
bl sub_80A48E8
bl sub_80A73FC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_80A7590
movs r0, 0
ldrsb r0, [r6, r0]
@@ -89840,7 +89840,7 @@ sub_80A6EB8: @ 80A6EB8
cmp r0, 0x1
bne _080A6FC0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
b _080A6F02
@@ -89858,7 +89858,7 @@ _080A6EE8:
cmp r0, r1
bge _080A6FC0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
_080A6F02:
bl MoveMenuCursor
@@ -90083,7 +90083,7 @@ sub_80A70D8: @ 80A70D8
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_80A7094
pop {r4}
@@ -90102,7 +90102,7 @@ ItemMenu_UseInBattle: @ 80A70F4
cmp r0, 0
beq _080A711A
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrh r0, [r4]
bl itemid_get_battle_function
adds r1, r0, 0
@@ -90123,7 +90123,7 @@ sub_80A7124: @ 80A7124
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0
bl sub_80A7528
adds r0, r4, 0
@@ -90274,14 +90274,14 @@ _080A7260:
b _080A7358
_080A726A:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
movs r1, 0x2
bl sub_80A4E8C
b _080A7358
_080A727A:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x2
bl sub_80F98A4
movs r0, 0x3
@@ -90330,7 +90330,7 @@ _080A72EC: .4byte gUnknown_02038559
_080A72F0: .4byte gBG1TilemapBuffer
_080A72F4:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080A7344
bl sub_80A4DA4
ldr r4, _080A7348
@@ -99697,7 +99697,7 @@ _080AB9E0:
strh r0, [r4, 0xA]
movs r0, 0x61
movs r1, 0
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -99997,7 +99997,7 @@ sub_80ABC70: @ 80ABC70
bne _080ABCCE
_080ABC88:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080ABCB4
ldrb r0, [r0]
bl sub_80AF59C
@@ -100276,7 +100276,7 @@ _080ABEC6:
beq _080ABF08
bl sub_814A7FC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080ABF00
lsls r1, r7, 2
adds r1, r7
@@ -100313,7 +100313,7 @@ _080ABF24:
_080ABF26:
bl sub_814A904
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0
bl sub_80AFFE0
ldr r0, _080ABF64
@@ -100424,7 +100424,7 @@ _080AC006:
cmp r6, 0x1
bls _080AC098
movs r0, 0x5
- bl audio_play
+ bl PlaySE
b _080AC098
.align 2, 0
_080AC03C: .4byte 0x02019204
@@ -100466,7 +100466,7 @@ _080AC068:
cmp r6, 0x1
bls _080AC098
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_080AC098:
add sp, 0x8
pop {r4-r7}
@@ -101643,7 +101643,7 @@ _080ACAAE:
cmp r0, 0
beq _080ACAC0
movs r0, 0x63
- bl audio_play
+ bl PlaySE
_080ACAC0:
ldr r0, _080ACAD4
mov r3, r8
@@ -101988,13 +101988,13 @@ _080ACD5E:
cmp r0, 0
beq _080ACD7C
movs r0, 0x63
- bl audio_play
+ bl PlaySE
b _080ACD82
.align 2, 0
_080ACD78: .4byte gUnknown_02038696
_080ACD7C:
movs r0, 0x64
- bl audio_play
+ bl PlaySE
_080ACD82:
lsls r0, r6, 3
subs r0, r6
@@ -102675,7 +102675,7 @@ _080AD33E:
movs r1, 0x1
bl sub_80B1EA8
ldr r0, _080AD350
- bl fanfare_play
+ bl PlayFanfare
b _080AD3A8
.align 2, 0
_080AD350: .4byte 0x00000187
@@ -102796,7 +102796,7 @@ _080AD420:
_080AD42C:
bl sub_80B1DDC
movs r0, 0xDF
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl sub_80B1CBC
b _080AD4CC
@@ -104093,7 +104093,7 @@ sub_80ADE54: @ 80ADE54
strh r0, [r1]
movs r0, 0x62
movs r1, 0
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldr r1, _080ADEA4
lsls r0, r4, 2
adds r0, r4
@@ -106236,7 +106236,7 @@ _080AEF0A:
beq _080AEF3A
movs r0, 0x26
_080AEF2C:
- bl audio_play
+ bl PlaySE
ldrb r1, [r5, 0x10]
movs r0, 0x31
negs r0, r0
@@ -107679,7 +107679,7 @@ _080AF990:
adds r0, r3, 0x1
strh r0, [r2, 0xA]
movs r0, 0x16
- bl audio_play
+ bl PlaySE
b _080AF9D0
_080AF9BC:
ldrh r0, [r2, 0x8]
@@ -107690,7 +107690,7 @@ _080AF9BC:
subs r0, r3, 0x1
strh r0, [r2, 0xA]
movs r0, 0x15
- bl audio_play
+ bl PlaySE
_080AF9D0:
ldr r3, _080AFA00
lsls r0, r4, 2
@@ -108214,7 +108214,7 @@ _080AFDA2:
cmp r2, 0
ble _080AFDFC
movs r0, 0x60
- bl audio_play
+ bl PlaySE
ldr r4, _080AFDF4
adds r0, r4, 0
bl m4aMPlayImmInit
@@ -108229,11 +108229,11 @@ _080AFDA2:
_080AFDE8: .4byte gUnknown_02038696
_080AFDEC: .4byte 0x0600c000
_080AFDF0: .4byte 0x01000001
-_080AFDF4: .4byte gUnknown_030073C0
+_080AFDF4: .4byte gMPlay_SE1
_080AFDF8: .4byte 0x0000ffff
_080AFDFC:
movs r0, 0x16
- bl audio_play
+ bl PlaySE
_080AFE02:
cmp r5, 0
bne _080AFE1C
@@ -108896,7 +108896,7 @@ sub_80B02A8: @ 80B02A8
ldr r0, _080B02F0
str r0, [r4, 0x1C]
movs r0, 0x18
- bl audio_play
+ bl PlaySE
pop {r4}
pop {r0}
bx r0
@@ -110128,7 +110128,7 @@ sub_80B0BC4: @ 80B0BC4
cmp r1, 0
bne _080B0C48
movs r0, 0x65
- bl audio_play
+ bl PlaySE
b _080B0C4E
.align 2, 0
_080B0C38: .4byte gSprites
@@ -110137,7 +110137,7 @@ _080B0C40: .4byte sub_80B0C5C
_080B0C44: .4byte SpriteCallbackDummy
_080B0C48:
movs r0, 0x2
- bl audio_play
+ bl PlaySE
_080B0C4E:
pop {r3,r4}
mov r8, r3
@@ -111624,7 +111624,7 @@ _080B1758:
orrs r0, r2
strh r0, [r1, 0x4]
movs r0, 0x20
- bl audio_play
+ bl PlaySE
b _080B18E4
.align 2, 0
_080B177C: .4byte gSprites
@@ -111647,7 +111647,7 @@ _080B1788:
orrs r0, r2
strh r0, [r1, 0x4]
movs r0, 0x1F
- bl audio_play
+ bl PlaySE
b _080B18E4
.align 2, 0
_080B17B0: .4byte gSprites
@@ -111670,7 +111670,7 @@ _080B17BC:
orrs r0, r2
strh r0, [r1, 0x4]
movs r0, 0x1F
- bl audio_play
+ bl PlaySE
b _080B18E4
.align 2, 0
_080B17E4: .4byte gSprites
@@ -111693,7 +111693,7 @@ _080B17F0:
orrs r0, r2
strh r0, [r1, 0x4]
movs r0, 0x2D
- bl audio_play
+ bl PlaySE
b _080B18E4
.align 2, 0
_080B1818: .4byte gSprites
@@ -111716,7 +111716,7 @@ _080B1824:
orrs r0, r2
strh r0, [r1, 0x4]
movs r0, 0x2D
- bl audio_play
+ bl PlaySE
b _080B18E4
.align 2, 0
_080B184C: .4byte gSprites
@@ -111739,7 +111739,7 @@ _080B1858:
orrs r0, r2
strh r0, [r1, 0x4]
movs r0, 0x2D
- bl audio_play
+ bl PlaySE
b _080B18E4
.align 2, 0
_080B1880: .4byte gSprites
@@ -111762,7 +111762,7 @@ _080B188C:
orrs r0, r2
strh r0, [r1, 0x4]
movs r0, 0xC3
- bl audio_play
+ bl PlaySE
b _080B18E4
.align 2, 0
_080B18B4: .4byte gSprites
@@ -111785,7 +111785,7 @@ _080B18C0:
orrs r0, r2
strh r0, [r1, 0x4]
movs r0, 0x2D
- bl audio_play
+ bl PlaySE
_080B18E4:
adds r2, r4, 0
ldr r4, _080B1914
@@ -112872,7 +112872,7 @@ _080B20CA:
adds r0, 0x11
strh r0, [r4]
movs r0, 0x63
- bl audio_play
+ bl PlaySE
_080B2126:
adds r6, 0x1
cmp r6, 0x3
@@ -113178,7 +113178,7 @@ sub_80B237C: @ 80B237C
strh r0, [r1]
movs r0, 0x62
movs r1, 0
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldr r1, _080B23B4
lsls r0, r4, 2
adds r0, r4
@@ -113471,7 +113471,7 @@ _080B25C8:
strh r0, [r4, 0xC]
movs r0, 0x61
movs r1, 0
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldr r0, _080B25E0
str r0, [r4]
_080B25D8:
@@ -114559,7 +114559,7 @@ sub_80B2E38: @ 80B2E38
cmp r0, 0
beq _080B2EF4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
b _080B2E82
@@ -114577,7 +114577,7 @@ _080B2E68:
cmp r0, r1
beq _080B2EF4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
_080B2E82:
bl MoveMenuCursor
@@ -114592,7 +114592,7 @@ _080B2E90:
cmp r0, 0
beq _080B2EE0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r3, _080B2EB0
ldrb r0, [r3, 0xC]
cmp r0, 0
@@ -114627,7 +114627,7 @@ _080B2EE0:
cmp r0, 0
beq _080B2EF4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl HandleShopMenuQuit
_080B2EF4:
@@ -116185,7 +116185,7 @@ _080B3B06:
movs r2, 0
bl sub_80B39D0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrb r0, [r4, 0xB]
ldrb r1, [r4, 0x9]
adds r0, r1
@@ -116247,7 +116247,7 @@ sub_80B3B80: @ 80B3B80
adds r0, r5, 0
bl sub_80B79E0
movs r0, 0x5F
- bl audio_play
+ bl PlaySE
ldr r0, [r5]
movs r1, 0
movs r2, 0
@@ -116916,7 +116916,7 @@ _080B4102:
b _080B436C
_080B411E:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrb r0, [r4, 0xB]
subs r0, 0x1
strb r0, [r4, 0xB]
@@ -116930,7 +116930,7 @@ _080B4138: .4byte gMain
_080B413C: .4byte gUnknown_03000708
_080B4140:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
b _080B41A0
@@ -116950,7 +116950,7 @@ _080B414C:
b _080B436C
_080B4166:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrb r0, [r4, 0xB]
adds r0, 0x1
strb r0, [r4, 0xB]
@@ -116972,7 +116972,7 @@ _080B4190:
b _080B436C
_080B4198:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
_080B41A0:
bl MoveMenuCursor
@@ -116988,7 +116988,7 @@ _080B41AC:
b _080B4358
_080B41B8:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r6, _080B426C
ldrb r0, [r6, 0xB]
ldrb r1, [r6, 0x9]
@@ -117167,7 +117167,7 @@ _080B4358:
cmp r0, 0
beq _080B436C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
mov r0, r8
bl sub_80B43F0
_080B436C:
@@ -119283,7 +119283,7 @@ _080B52EC:
cmp r0, 0
bne _080B534E
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080B5324
movs r0, 0x7F
strh r0, [r1]
@@ -119561,7 +119561,7 @@ _080B5524:
bne _080B5542
_080B552C:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080B5538
movs r0, 0
b _080B5540
@@ -119760,7 +119760,7 @@ sub_80B5684: @ 80B5684
cmp r0, 0
bne _080B56F4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080B56C8
movs r0, 0x7F
strh r0, [r1]
@@ -120853,7 +120853,7 @@ sub_80B5F38: @ 80B5F38
movs r2, 0x1
bl sub_80B6460
movs r0, 0x6
- bl audio_play
+ bl PlaySE
ldr r1, _080B5F6C
movs r0, 0x5
strb r0, [r1]
@@ -121168,7 +121168,7 @@ sub_80B6194: @ 80B6194
b _080B61BC
_080B61AE:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080B61C4
movs r0, 0x6
strb r0, [r1]
@@ -123113,7 +123113,7 @@ _080B6FEA:
bl sub_80B6460
_080B6FF4:
movs r0, 0x17
- bl audio_play
+ bl PlaySE
pop {r4}
pop {r0}
bx r0
@@ -123166,7 +123166,7 @@ _080B7054:
_080B705A:
bl sub_80B7960
movs r0, 0x5
- bl audio_play
+ bl PlaySE
cmp r4, 0
beq _080B7084
bl sub_80B6F84
@@ -123241,7 +123241,7 @@ _080B70EC:
_080B70F4:
bl sub_80B7960
movs r0, 0x5
- bl audio_play
+ bl PlaySE
pop {r4-r7}
pop {r0}
bx r0
@@ -128075,7 +128075,7 @@ sub_80B9450: @ 80B9450
cmp r0, 0x32
bne _080B9478
movs r0, 0xE2
- bl audio_play
+ bl PlaySE
movs r0, 0
strh r0, [r4, 0x8]
_080B9478:
@@ -128183,7 +128183,7 @@ _080B9550:
movs r0, 0x3
strh r0, [r4]
movs r0, 0xE0
- bl audio_play
+ bl PlaySE
b _080B95E6
.align 2, 0
_080B956C: .4byte sub_80BA00C
@@ -128352,7 +128352,7 @@ _080B9690:
b _080B97D6
_080B96B2:
movs r0, 0x15
- bl audio_play
+ bl PlaySE
movs r1, 0
movs r0, 0xC9
strh r0, [r5, 0x8]
@@ -128360,7 +128360,7 @@ _080B96B2:
b _080B97D6
_080B96C2:
movs r0, 0x16
- bl audio_play
+ bl PlaySE
ldr r0, _080B96CC
b _080B97D4
.align 2, 0
@@ -130905,7 +130905,7 @@ _080BAB14:
strb r0, [r4]
bl sub_80BAD5C
ldrb r0, [r4]
- bl sub_81DF5D8
+ bl SetPokemonCryStereo
b _080BACC6
.align 2, 0
_080BAB34: .4byte gUnknown_020387D9
@@ -130953,26 +130953,26 @@ _080BAB78:
_080BAB82:
ldr r4, _080BABE4
ldrb r0, [r4, 0x4]
- bl sub_81DF50C
+ bl SetPokemonCryVolume
movs r0, 0x8
ldrsb r0, [r4, r0]
- bl sub_81DF520
+ bl SetPokemonCryPanpot
movs r1, 0xC
ldrsh r0, [r4, r1]
- bl sub_81DF538
+ bl SetPokemonCryPitch
ldrh r0, [r4, 0x10]
- bl sub_81DF570
+ bl SetPokemonCryLength
ldr r0, [r4, 0x18]
- bl sub_81DF588
+ bl SetPokemonCryProgress
ldrb r0, [r4, 0x14]
- bl sub_81DF57C
+ bl SetPokemonCryRelease
movs r0, 0x1C
ldrsb r0, [r4, r0]
- bl sub_81DF5AC
+ bl SetPokemonCryChorus
ldr r0, [r4, 0x20]
lsls r0, 24
lsrs r0, 24
- bl sub_81DF618
+ bl SetPokemonCryPriority
ldr r4, [r4]
adds r0, r4, 0
cmp r4, 0
@@ -131084,7 +131084,7 @@ _080BAC90:
ldr r1, _080BACCC
_080BAC98:
adds r0, r1
- bl sub_81DF43C
+ bl SetPokemonCryTone
ldr r1, _080BACD0
str r0, [r1]
_080BACA2:
@@ -131093,7 +131093,7 @@ _080BACA2:
cmp r0, 0
beq _080BACC6
ldr r5, _080BACD4
- bl sub_81DF594
+ bl IsPokemonCryPlaying
strb r0, [r5]
ldr r4, _080BACD8
lsls r0, 24
@@ -131572,7 +131572,7 @@ _080BB05C:
bgt _080BB0A2
lsls r0, 24
asrs r0, 24
- bl sub_8075560
+ bl SE12PanpotControl
b _080BB0A2
.align 2, 0
_080BB088: .4byte gUnknown_083D03F8
@@ -131586,7 +131586,7 @@ _080BB08C:
ble _080BB0A2
lsls r0, r1, 24
asrs r0, 24
- bl sub_8075560
+ bl SE12PanpotControl
_080BB0A2:
ldr r1, _080BB0EC
ldrh r3, [r1, 0x2E]
@@ -131653,7 +131653,7 @@ _080BB104:
movs r4, 0x40
negs r4, r4
adds r1, r4, 0
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
str r4, [r5, 0x1C]
b _080BB14C
.align 2, 0
@@ -131662,7 +131662,7 @@ _080BB13C: .4byte gUnknown_020387B4
_080BB140:
ldrh r0, [r5]
movs r1, 0x3F
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
movs r0, 0x3F
str r0, [r5, 0x1C]
_080BB14C:
@@ -131672,7 +131672,7 @@ _080BB14C:
b _080BB1C8
_080BB154:
ldrh r0, [r5]
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
str r4, [r5, 0x18]
b _080BB1C8
_080BB15E:
@@ -131792,7 +131792,7 @@ _080BB234:
movs r3, 0x3
bl sub_80BAE78
_080BB240:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
lsrs r0, 24
movs r1, 0xC
@@ -131927,7 +131927,7 @@ _080BB306:
strh r0, [r1]
ldr r0, _080BB3A8
movs r1, 0x2
- bl sub_81DE0D0
+ bl m4aMPlayFadeOutTemporarily
ldr r1, _080BB3AC
adds r0, r5, r6
lsls r0, 3
@@ -131952,7 +131952,7 @@ _080BB398: .4byte REG_BG2HOFS
_080BB39C: .4byte REG_BG2CNT
_080BB3A0: .4byte 0x00000f01
_080BB3A4: .4byte 0x00001d03
-_080BB3A8: .4byte gUnknown_03007380
+_080BB3A8: .4byte gMPlay_BGM
_080BB3AC: .4byte gTasks
_080BB3B0: .4byte sub_80BB3B4
thumb_func_end sub_80BB25C
@@ -131980,7 +131980,7 @@ _080BB3D4:
ands r0, r1
cmp r0, 0
beq _080BB3E4
- bl sub_8075398
+ bl StopCryAndClearCrySongs
_080BB3E4:
ldrh r1, [r4, 0x30]
movs r0, 0x40
@@ -134645,7 +134645,7 @@ sub_80BC824: @ 80BC824
cmp r0, 0
beq _080BC860
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
b _080BC8B6
@@ -134658,7 +134658,7 @@ _080BC860:
cmp r0, 0
beq _080BC940
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrh r0, [r4, 0x4]
subs r0, 0x1
b _080BC8A4
@@ -134683,7 +134683,7 @@ _080BC874:
cmp r0, r1
beq _080BC940
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrh r0, [r4, 0x4]
adds r0, 0x1
_080BC8A4:
@@ -134693,7 +134693,7 @@ _080BC8A4:
b _080BC940
_080BC8AE:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
_080BC8B6:
bl MoveMenuCursor
@@ -134708,7 +134708,7 @@ _080BC8C2:
cmp r0, 0
beq _080BC91C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r1, 0x2
ldrsh r0, [r4, r1]
movs r2, 0x4
@@ -134747,7 +134747,7 @@ _080BC91C:
cmp r0, 0
beq _080BC940
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_8072DEC
movs r0, 0
movs r1, 0
@@ -134861,7 +134861,7 @@ sub_80BC9E4: @ 80BC9E4
cmp r0, 0
beq _080BCA7C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
@@ -134879,7 +134879,7 @@ _080BCA18:
cmp r0, 0x1
beq _080BCA7C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
b _080BCA7C
@@ -134890,7 +134890,7 @@ _080BCA3A:
cmp r0, 0
beq _080BCA68
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r4, _080BCA64
bl GetMenuCursorPos
lsls r0, 24
@@ -134909,7 +134909,7 @@ _080BCA68:
cmp r0, 0
beq _080BCA7C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_80BCBF8
_080BCA7C:
@@ -146070,7 +146070,7 @@ sub_80C2358: @ 80C2358
bl sub_80C3F00
movs r0, 0xDF
lsls r0, 1
- bl sub_8075474
+ bl PlayBGM
ldr r0, _080C242C
bl SetVBlankCallback
add sp, 0x4
@@ -148982,7 +148982,7 @@ _080C3A94:
adds r0, r4, 0
bl DestroyTask
movs r0, 0x18
- bl audio_play
+ bl PlaySE
_080C3B12:
pop {r4}
pop {r0}
@@ -149157,7 +149157,7 @@ sub_80C3C44: @ 80C3C44
bne _080C3CA8
ldrh r0, [r4, 0x30]
movs r1, 0
- bl cry_related
+ bl PlayCry1
movs r0, 0
strh r0, [r4, 0x30]
b _080C3CA8
@@ -149962,13 +149962,13 @@ _080C4292:
cmp r0, 0
beq _080C429E
movs r0, 0x16
- bl audio_play
+ bl PlaySE
_080C429E:
mov r1, r10
cmp r1, 0
beq _080C42AA
movs r0, 0x15
- bl audio_play
+ bl PlaySE
_080C42AA:
add sp, 0x8
pop {r3-r5}
@@ -154374,7 +154374,7 @@ sub_80C644C: @ 80C644C
push {r4,lr}
adds r4, r0, 0
movs r0, 0x83
- bl audio_play
+ bl PlaySE
movs r0, 0
strh r0, [r4, 0x2E]
ldr r0, _080C6464
@@ -154551,7 +154551,7 @@ sub_80C6598: @ 80C6598
push {r4,lr}
adds r4, r0, 0
movs r0, 0x9B
- bl audio_play
+ bl PlaySE
ldr r0, _080C65BC
ldr r1, [r0, 0x1C]
adds r2, r4, 0
@@ -154706,7 +154706,7 @@ sub_80C66BC: @ 80C66BC
push {r4,lr}
adds r4, r0, 0
movs r0, 0xA9
- bl audio_play
+ bl PlaySE
movs r0, 0
strh r0, [r4, 0x2E]
ldr r0, _080C66D4
@@ -154898,7 +154898,7 @@ sub_80C683C: @ 80C683C
adds r1, r4, 0
bl GetXYCoordsOneStepInFrontOfPlayer
movs r0, 0x3
- bl audio_play
+ bl PlaySE
ldr r0, _080C6874
bl VarGet
lsls r0, 16
@@ -155069,19 +155069,19 @@ _080C6988:
b _080C69B6
_080C6998:
movs r0, 0x4A
- bl audio_play
+ bl PlaySE
b _080C69B6
_080C69A0:
movs r0, 0x4B
- bl audio_play
+ bl PlaySE
b _080C69B6
_080C69A8:
movs r0, 0x4C
- bl audio_play
+ bl PlaySE
b _080C69B6
_080C69B0:
movs r0, 0x4E
- bl audio_play
+ bl PlaySE
_080C69B6:
pop {r0}
bx r0
@@ -155109,7 +155109,7 @@ sub_80C69C4: @ 80C69C4
lsls r4, 16
lsrs r4, 16
movs r0, 0x4D
- bl audio_play
+ bl PlaySE
lsls r5, 16
asrs r5, 16
lsls r4, 16
@@ -155317,35 +155317,35 @@ _080C6AF0:
.4byte _080C6C18
_080C6BE0:
movs r0, 0x3E
- bl audio_play
+ bl PlaySE
b _080C6C1E
_080C6BE8:
movs r0, 0x3F
- bl audio_play
+ bl PlaySE
b _080C6C1E
_080C6BF0:
movs r0, 0x40
- bl audio_play
+ bl PlaySE
b _080C6C1E
_080C6BF8:
movs r0, 0x41
- bl audio_play
+ bl PlaySE
b _080C6C1E
_080C6C00:
movs r0, 0x42
- bl audio_play
+ bl PlaySE
b _080C6C1E
_080C6C08:
movs r0, 0x43
- bl audio_play
+ bl PlaySE
b _080C6C1E
_080C6C10:
movs r0, 0x44
- bl audio_play
+ bl PlaySE
b _080C6C1E
_080C6C18:
movs r0, 0x45
- bl audio_play
+ bl PlaySE
_080C6C1E:
adds r0, r4, 0
bl DestroyTask
@@ -155398,7 +155398,7 @@ sub_80C6C64: @ 80C6C64
cmp r0, 0x8
bne _080C6C7C
movs r0, 0xC3
- bl audio_play
+ bl PlaySE
_080C6C7C:
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -155642,7 +155642,7 @@ door_restore_tilemap: @ 80C6E64
push {r4,r5,lr}
adds r5, r0, 0
movs r0, 0x83
- bl audio_play
+ bl PlaySE
ldr r4, _080C6E90
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
@@ -155903,7 +155903,7 @@ _080C7070: .4byte REG_MOSAIC
overworld_posion_effect: @ 80C7074
push {lr}
movs r0, 0x4F
- bl audio_play
+ bl PlaySE
ldr r0, _080C7088
movs r1, 0x50
bl CreateTask
@@ -156560,7 +156560,7 @@ _080C7580:
movs r0, 0x1
strh r0, [r4]
movs r0, 0x31
- bl audio_play
+ bl PlaySE
b _080C7698
.align 2, 0
_080C75A4: .4byte sub_80C72C4
@@ -156607,7 +156607,7 @@ _080C75C4:
movs r0, 0x3
strh r0, [r4]
movs r0, 0x32
- bl audio_play
+ bl PlaySE
b _080C7698
.align 2, 0
_080C7608: .4byte gPaletteFade
@@ -156639,7 +156639,7 @@ _080C7634:
cmp r0, 0x5A
bne _080C7698
movs r0, 0x33
- bl audio_play
+ bl PlaySE
movs r0, 0
strh r0, [r4, 0x2]
movs r0, 0x5
@@ -156670,7 +156670,7 @@ _080C7652:
bl MapGridSetMetatileIdAt
bl DrawWholeMapView
movs r0, 0x34
- bl audio_play
+ bl PlaySE
adds r0, r5, 0
bl DestroyTask
bl ScriptContext2_Disable
@@ -157482,7 +157482,7 @@ sub_80C7C94: @ 80C7C94
lsrs r4, r0, 24
_080C7CCA:
movs r0, 0x30
- bl audio_play
+ bl PlaySE
adds r0, r6, 0
adds r1, r4, 0
bl StartSpriteAffineAnim
@@ -157505,7 +157505,7 @@ _080C7CDA:
lsrs r4, r0, 24
_080C7CFA:
movs r0, 0x30
- bl audio_play
+ bl PlaySE
adds r0, r6, 0
adds r1, r4, 0
bl StartSpriteAffineAnim
@@ -160647,7 +160647,7 @@ _080C94F8: .4byte gTasks
_080C94FC: .4byte sub_80C9A38
_080C9500:
movs r0, 0x48
- bl audio_play
+ bl PlaySE
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -161978,7 +161978,7 @@ sub_80C9EE4: @ 80C9EE4
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
- bl audio_play
+ bl PlaySE
ldr r1, _080C9F08
lsls r0, r4, 2
adds r0, r4
@@ -162196,7 +162196,7 @@ sub_80CA098: @ 80CA098
cmp r0, 0x7
ble _080CA0C8
movs r0, 0x75
- bl audio_play
+ bl PlaySE
ldr r1, _080CA0D4
ldr r2, _080CA0D8
adds r0, r4, 0
@@ -162470,7 +162470,7 @@ sub_80CA2BC: @ 80CA2BC
cmp r0, 0x7
ble _080CA2FC
movs r0, 0x1
- bl audio_play
+ bl PlaySE
ldr r4, _080CA308
ldrh r0, [r4]
movs r1, 0x1
@@ -165645,7 +165645,7 @@ _080CBB8A:
lsls r1, 24
asrs r1, 24
movs r0, 0x7D
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
_080CBBBE:
adds r0, r4, 0
bl sub_80CB814
@@ -165663,7 +165663,7 @@ _080CBBBE:
lsls r1, 24
asrs r1, 24
movs r0, 0x7D
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
_080CBBE6:
pop {r4,r5}
pop {r0}
@@ -168889,7 +168889,7 @@ _080CD438:
lsls r1, 24
asrs r1, 24
movs r0, 0xD2
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
_080CD49E:
ldrh r0, [r5, 0x38]
movs r1, 0x1
@@ -169100,7 +169100,7 @@ _080CD5D8:
lsls r1, 24
asrs r1, 24
movs r0, 0xC0
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
b _080CD648
.align 2, 0
_080CD634: .4byte 0x00007fff
@@ -170460,7 +170460,7 @@ sub_80CE000: @ 80CE000
lsls r1, 24
asrs r1, 24
movs r0, 0xC2
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
_080CE052:
movs r1, 0
strh r1, [r4, 0x2E]
@@ -173955,7 +173955,7 @@ _080CFAA4:
lsls r1, 24
asrs r1, 24
movs r0, 0x9A
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
movs r3, 0xA
ldrsh r0, [r4, r3]
cmp r0, 0x2
@@ -174626,7 +174626,7 @@ sub_80D0030: @ 80D0030
lsls r1, 24
asrs r1, 24
movs r0, 0xA6
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldrh r0, [r4, 0x24]
ldrh r1, [r4, 0x20]
adds r0, r1
@@ -176560,7 +176560,7 @@ _080D0EF0:
lsls r1, 24
asrs r1, 24
movs r0, 0xCD
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
_080D0F36:
ldrh r0, [r4, 0x34]
ldrh r2, [r4, 0x36]
@@ -186605,7 +186605,7 @@ _080D5C92:
movs r1, 0
ldrsb r1, [r0, r1]
movs r0, 0x90
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
b _080D5CBA
.align 2, 0
_080D5CB0: .4byte gUnknown_0202F7D2
@@ -189781,7 +189781,7 @@ _080D74DC:
lsls r1, 24
asrs r1, 24
movs r0, 0x76
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
_080D74FE:
movs r0, 0x12
ldrsh r3, [r4, r0]
@@ -200475,7 +200475,7 @@ _080DC778:
lsls r1, 24
asrs r1, 24
movs r0, 0xCB
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
adds r0, r5, 0
movs r1, 0x1
bl ChangeSpriteAffineAnim
@@ -202361,7 +202361,7 @@ _080DD694:
lsls r1, 24
asrs r1, 24
movs r0, 0xA2
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
b _080DD76C
.align 2, 0
_080DD6A4: .4byte gSprites
@@ -202447,7 +202447,7 @@ _080DD70C:
lsls r1, 24
asrs r1, 24
movs r0, 0xAF
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
_080DD74A:
ldrh r0, [r4, 0x18]
subs r0, 0x1
@@ -203097,7 +203097,7 @@ _080DDC30:
movs r1, 0
ldrsb r1, [r0, r1]
movs r0, 0xC4
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
_080DDC42:
pop {r4}
pop {r0}
@@ -203145,7 +203145,7 @@ _080DDC92:
cmp r0, 0
ble _080DDC9E
movs r0, 0xC4
- bl audio_play
+ bl PlaySE
_080DDC9E:
movs r1, 0x3A
ldrsh r0, [r4, r1]
@@ -214710,7 +214710,7 @@ _080E3692:
lsls r1, 24
asrs r1, 24
movs r0, 0xEF
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
b _080E36F4
.align 2, 0
_080E36D8: .4byte gUnknown_02024BE0
@@ -214723,7 +214723,7 @@ _080E36E0:
lsls r1, 24
asrs r1, 24
movs r0, 0xF5
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
_080E36F4:
add sp, 0x24
pop {r3-r5}
@@ -219201,7 +219201,7 @@ _080E5954:
ldr r0, _080E598C
adds r4, r0
movs r0, 0x22
- bl audio_play
+ bl PlaySE
ldrb r0, [r4, 0x1]
movs r1, 0x2
orrs r0, r1
@@ -221512,7 +221512,7 @@ sub_80E6AE4: @ 80E6AE4
cmp r0, 0
beq _080E6AFE
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_080E6AFE:
ldr r2, _080E6B48
ldrh r1, [r2, 0x2E]
@@ -221522,7 +221522,7 @@ _080E6AFE:
cmp r0, 0
beq _080E6BA4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r1, r4, 0
adds r1, 0x86
adds r0, r4, 0
@@ -222139,7 +222139,7 @@ sub_80E6FC8: @ 80E6FC8
cmp r0, 0
beq _080E700C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r1, 0xE2
lsls r1, 1
adds r0, r4, r1
@@ -222157,7 +222157,7 @@ _080E700C:
cmp r0, 0
beq _080E7018
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_080E7018:
ldr r0, _080E7054
ldrh r1, [r0, 0x2E]
@@ -222173,7 +222173,7 @@ _080E7018:
cmp r0, 0
beq _080E7090
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r1, 0xD4
lsls r1, 1
adds r0, r4, r1
@@ -222246,7 +222246,7 @@ _080E7090:
beq _080E710A
_080E70CA:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_80E7AD4
ldr r0, _080E70E4
bl sub_80E682C
@@ -222484,7 +222484,7 @@ sub_80E7294: @ 80E7294
cmp r0, 0
beq _080E72DC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r1, 0xE2
lsls r1, 1
adds r0, r4, r1
@@ -222503,7 +222503,7 @@ _080E72DC:
cmp r0, 0
beq _080E72E8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_080E72E8:
ldr r0, _080E7304
ldrh r1, [r0, 0x2E]
@@ -222512,7 +222512,7 @@ _080E72E8:
cmp r0, 0
beq _080E730C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080E7308
bl sub_80E682C
b _080E731A
@@ -224524,7 +224524,7 @@ _080E81F8: .4byte 0x00009c7e
sub_80E81FC: @ 80E81FC
push {lr}
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_80E95A4
movs r0, 0
movs r1, 0
@@ -232012,7 +232012,7 @@ _080EBBA0:
movs r1, 0x1
strb r1, [r0]
movs r0, 0x6E
- bl audio_play
+ bl PlaySE
ldr r0, _080EBBD8
bl SetMainCallback2
ldr r0, _080EBBDC
@@ -232879,7 +232879,7 @@ _080EC2AE:
cmp r0, 0
beq _080EC2D4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080EC2D0
adds r0, r4, r1
ldrb r1, [r0]
@@ -232933,7 +232933,7 @@ _080EC31C:
.4byte _080EC358
_080EC330:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080EC340
bl sub_80EBDBC
b _080EC492
@@ -232941,7 +232941,7 @@ _080EC330:
_080EC340: .4byte sub_80EC4A0
_080EC344:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080EC354
bl sub_80EBDBC
b _080EC492
@@ -233025,7 +233025,7 @@ _080EC3DC:
cmp r0, 0
beq _080EC408
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080EC404
bl sub_80EBDBC
b _080EC492
@@ -233034,7 +233034,7 @@ _080EC400: .4byte 0x00008fe8
_080EC404: .4byte sub_80EDB88
_080EC408:
movs r0, 0x20
- bl audio_play
+ bl PlaySE
movs r0, 0
movs r1, 0x5
b _080EC442
@@ -233046,7 +233046,7 @@ _080EC414:
cmp r0, 0
beq _080EC438
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080EC434
bl sub_80EBDBC
b _080EC492
@@ -233055,7 +233055,7 @@ _080EC430: .4byte 0x0000d158
_080EC434: .4byte sub_80EE3D8
_080EC438:
movs r0, 0x20
- bl audio_play
+ bl PlaySE
movs r0, 0
movs r1, 0x6
_080EC442:
@@ -233070,7 +233070,7 @@ _080EC44C:
cmp r5, 0
beq _080EC478
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080EC474
adds r0, r4, r1
ldrb r1, [r0]
@@ -233382,7 +233382,7 @@ _080EC6E2:
b _080EC800
_080EC6E8:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080EC6FC
movs r1, 0xC1
lsls r1, 2
@@ -233394,7 +233394,7 @@ _080EC6E8:
_080EC6FC: .4byte 0x02000000
_080EC700:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080EC714
movs r2, 0xC1
lsls r2, 2
@@ -233590,7 +233590,7 @@ _080EC888:
cmp r0, 0
beq _080EC8B0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080EC8AC
adds r0, r4, r1
ldrb r1, [r0]
@@ -233608,7 +233608,7 @@ _080EC8B0:
cmp r0, 0
beq _080EC918
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r2, _080EC8E8
adds r0, r4, r2
ldrb r1, [r0]
@@ -233657,7 +233657,7 @@ _080EC918:
cmp r0, 0
beq _080EC954
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080EC93C
adds r0, r4, r1
strb r6, [r0]
@@ -234032,7 +234032,7 @@ _080ECC24:
cmp r0, 0
beq _080ECC4C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080ECC48
adds r0, r4, r1
ldrb r1, [r0]
@@ -234052,7 +234052,7 @@ _080ECC4C:
b _080ECD40
_080ECC5A:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r2, _080ECC7C
adds r0, r4, r2
ldrb r0, [r0]
@@ -234160,7 +234160,7 @@ _080ECD40:
cmp r0, 0
beq _080ECD74
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r2, _080ECD60
adds r1, r4, r2
movs r0, 0x5
@@ -234896,7 +234896,7 @@ _080ED342:
cmp r0, 0
beq _080ED38C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080ED370
bl sub_80EBDBC
b _080ED3CA
@@ -234905,12 +234905,12 @@ _080ED36C: .4byte gMain
_080ED370: .4byte sub_80ED4D8
_080ED374:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl ShowMapNamePopUpWindow
b _080ED3CA
_080ED380:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrh r0, [r4]
adds r0, 0x1
b _080ED3C8
@@ -234920,7 +234920,7 @@ _080ED38C:
cmp r0, 0
beq _080ED3CA
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080ED3A4
bl sub_80EBDBC
b _080ED3CA
@@ -235599,7 +235599,7 @@ _080ED91A:
beq _080ED970
_080ED948:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl sub_80F5060
bl move_anim_execute
@@ -235640,7 +235640,7 @@ _080ED970:
bge _080ED9CC
_080ED9A2:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0
bl sub_80F5060
bl move_anim_execute
@@ -235662,7 +235662,7 @@ _080ED9CC:
cmp r0, 0
beq _080ED9F8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_80F4FDC
bl move_anim_execute
ldr r0, _080ED9F4
@@ -235701,7 +235701,7 @@ _080EDA02:
b _080EDB7A
_080EDA26:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0xC1
lsls r0, 2
adds r1, r4, r0
@@ -235721,7 +235721,7 @@ _080EDA44:
b _080EDB7A
_080EDA50:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r2, 0xC1
lsls r2, 2
adds r1, r5, r2
@@ -236157,7 +236157,7 @@ _080EDDE2:
cmp r0, 0
beq _080EDE2C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080EDE10
bl sub_80EBDBC
b _080EDE6A
@@ -236166,12 +236166,12 @@ _080EDE0C: .4byte gMain
_080EDE10: .4byte sub_80EDEE4
_080EDE14:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl ShowMapNamePopUpWindow
b _080EDE6A
_080EDE20:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrh r0, [r4]
adds r0, 0x1
b _080EDE68
@@ -236181,7 +236181,7 @@ _080EDE2C:
cmp r0, 0
beq _080EDE6A
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080EDE44
bl sub_80EBDBC
b _080EDE6A
@@ -236513,7 +236513,7 @@ _080EE0CC:
cmp r0, 0
beq _080EE104
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl sub_80F6A4C
@@ -236541,7 +236541,7 @@ _080EE104:
cmp r2, r0
bge _080EE140
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl sub_80F6A4C
movs r0, 0xC1
@@ -236558,7 +236558,7 @@ _080EE140:
cmp r0, 0
beq _080EE164
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0xB
bl sub_80EEFBC
ldr r0, _080EE160
@@ -236576,7 +236576,7 @@ _080EE164:
b _080EE288
_080EE16E:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080EE17C
bl sub_80EBDBC
b _080EE288
@@ -236648,7 +236648,7 @@ _080EE1F8:
cmp r0, 0x1
bne _080EE224
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_80F3B94
ldr r0, _080EE220
movs r5, 0xC1
@@ -236667,7 +236667,7 @@ _080EE224:
cmp r0, 0
beq _080EE288
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_80F3B94
ldr r0, _080EE24C
movs r1, 0xC1
@@ -237101,7 +237101,7 @@ _080EE5B2:
cmp r0, 0
beq _080EE608
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080EE5E0
bl sub_80EBDBC
b _080EE652
@@ -237110,7 +237110,7 @@ _080EE5DC: .4byte gMain
_080EE5E0: .4byte sub_80EE658
_080EE5E4:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080EE5F8
adds r0, r5, r1
ldrb r0, [r0]
@@ -237120,7 +237120,7 @@ _080EE5E4:
_080EE5F8: .4byte 0x0000876e
_080EE5FC:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrh r0, [r4]
adds r0, 0x1
b _080EE650
@@ -237130,7 +237130,7 @@ _080EE608:
cmp r0, 0
beq _080EE652
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080EE620
bl sub_80EBDBC
b _080EE652
@@ -237306,7 +237306,7 @@ _080EE780:
cmp r0, 0
beq _080EE7B8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl sub_80F708C
@@ -237334,7 +237334,7 @@ _080EE7B8:
cmp r2, r0
bge _080EE7F8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl sub_80F708C
movs r0, 0xC1
@@ -237354,7 +237354,7 @@ _080EE7F8:
cmp r0, 0
beq _080EE8E8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_80F4394
bl sub_80F0EC0
ldr r1, _080EE81C
@@ -237542,7 +237542,7 @@ sub_80EE96C: @ 80EE96C
cmp r4, 0
bne _080EE9A0
movs r0, 0x6F
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
str r4, [sp]
@@ -244155,7 +244155,7 @@ _080F1E22:
blt _080F1E0E
_080F1E38:
movs r0, 0x6
- bl audio_play
+ bl PlaySE
pop {r4-r6}
pop {r0}
bx r0
@@ -255393,7 +255393,7 @@ _080F7558:
cmp r0, 0
beq _080F758C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, [r4]
ldrb r0, [r1, 0x5]
subs r0, 0x1
@@ -255415,7 +255415,7 @@ _080F758C:
cmp r0, 0
beq _080F75B0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, [r4]
ldrb r0, [r1, 0x5]
adds r0, 0x1
@@ -255433,7 +255433,7 @@ _080F75B0:
cmp r0, 0
beq _080F7602
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, [r4]
movs r1, 0x5
ldrsb r1, [r0, r1]
@@ -255478,7 +255478,7 @@ _080F7602:
cmp r0, 0
beq _080F75FE
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_080F7610:
movs r0, 0
_080F7612:
@@ -256953,7 +256953,7 @@ _080F8114:
strb r0, [r6, 0x2]
b _080F817A
.align 2, 0
-_080F811C: .4byte gUnknown_03007400
+_080F811C: .4byte gMPlay_SE2
_080F8120: .4byte 0x0000ffff
_080F8124:
adds r0, r1, 0x1
@@ -256988,7 +256988,7 @@ _080F8124:
bl m4aMPlayPitchControl
b _080F817A
.align 2, 0
-_080F8168: .4byte gUnknown_03007400
+_080F8168: .4byte gMPlay_SE2
_080F816C: .4byte 0x0000ffff
_080F8170:
ldr r0, _080F8180
@@ -257001,7 +257001,7 @@ _080F817A:
pop {r0}
bx r0
.align 2, 0
-_080F8180: .4byte gUnknown_03007400
+_080F8180: .4byte gMPlay_SE2
thumb_func_end sub_80F7FB0
thumb_func_start sub_80F8184
@@ -257060,7 +257060,7 @@ _080F81D8:
strh r0, [r5, 0xE]
strh r0, [r5, 0x10]
movs r0, 0x4
- bl sub_8074FB8
+ bl FadeOutBGMTemporarily
movs r0, 0x1
b _080F83C6
.align 2, 0
@@ -257068,7 +257068,7 @@ _080F820C: .4byte gMenuWindowPtr
_080F8210: .4byte gWindowConfig_81E6CE4
_080F8214: .4byte gStringVar4
_080F8218:
- bl sub_8074FD0
+ bl IsBGMPausedOrStopped
lsls r0, 24
cmp r0, 0
bne _080F8224
@@ -257181,17 +257181,17 @@ _080F82D8:
movs r0, 0xC8
lsls r0, 1
movs r1, 0x6
- bl sub_8074F6C
+ bl FadeInNewBGM
ldr r0, _080F8308
movs r1, 0x2
- bl sub_81DE0D0
+ bl m4aMPlayFadeOutTemporarily
bl EnableBothScriptContexts
adds r0, r6, 0
bl DestroyTask
b _080F83C8
.align 2, 0
_080F8304: .4byte gStringVar4
-_080F8308: .4byte gUnknown_03007400
+_080F8308: .4byte gMPlay_SE2
_080F830C:
cmp r4, 0
bne _080F832C
@@ -259031,7 +259031,7 @@ _080F9114:
b _080F9140
_080F911A:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080F912C
ldr r1, [r0]
adds r0, r4, 0
@@ -259041,7 +259041,7 @@ _080F911A:
_080F912C: .4byte gUnknown_020388C4
_080F9130:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080F9148
ldr r1, [r0, 0x4]
adds r0, r4, 0
@@ -260589,7 +260589,7 @@ sub_80F9C6C: @ 80F9C6C
_080F9C94: .4byte gPaletteFade
_080F9C98:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_806CA38
ldr r1, _080F9CB8
@@ -260605,7 +260605,7 @@ _080F9CB8: .4byte gUnknown_02038694
_080F9CBC: .4byte gUnknown_0202E8CC
_080F9CC0:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080F9CE0
movs r0, 0xFF
strb r0, [r1]
@@ -260841,7 +260841,7 @@ sub_80F9E64: @ 80F9E64
_080F9E8C: .4byte gPaletteFade
_080F9E90:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r4, _080F9EC4
adds r0, r6, 0
bl sub_806CA38
@@ -260867,7 +260867,7 @@ _080F9EC8: .4byte gUnknown_0202E8CE
_080F9ECC: .4byte gPlayerParty
_080F9ED0:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080F9EE8
movs r0, 0xFF
strh r0, [r1]
@@ -269805,7 +269805,7 @@ sub_80FE2EC: @ 80FE2EC
cmp r0, 0
beq _080FE324
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
@@ -269819,7 +269819,7 @@ _080FE324:
cmp r0, 0
beq _080FE342
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
ldr r1, _080FE370
@@ -269832,7 +269832,7 @@ _080FE342:
cmp r0, 0
beq _080FE378
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080FE374
ldr r0, _080FE370
ldrb r0, [r0]
@@ -269854,7 +269854,7 @@ _080FE378:
cmp r0, 0
beq _080FE38C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r7, 0
bl gpu_pal_decompress_alloc_tag_and_upload
_080FE38C:
@@ -270191,7 +270191,7 @@ _080FE61C:
cmp r0, 0
beq _080FE640
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
@@ -270205,7 +270205,7 @@ _080FE640:
cmp r0, 0
beq _080FE656
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
b _080FE720
@@ -270216,7 +270216,7 @@ _080FE656:
cmp r0, 0
beq _080FE70C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl GetMenuCursorPos
ldr r4, _080FE6C0
strb r0, [r4]
@@ -270289,7 +270289,7 @@ _080FE70C:
cmp r0, 0
beq _080FE720
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_80FE728
_080FE720:
@@ -270509,7 +270509,7 @@ sub_80FE894: @ 80FE894
mov r10, r1
_080FE8C8:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
lsls r0, r5, 24
asrs r0, 24
cmp r0, 0
@@ -270657,7 +270657,7 @@ _080FE9EE:
beq _080FEA7C
bl sub_8072DEC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r2, _080FEA44
ldr r1, _080FEA48
ldr r0, _080FEA38
@@ -270717,7 +270717,7 @@ _080FEA7C:
beq _080FEAAC
bl sub_8072DEC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080FEAB4
ldr r2, _080FEAB8
lsls r0, r4, 2
@@ -273536,7 +273536,7 @@ _08100078: .4byte gSecretBaseText_PlaceItHere
_0810007C: .4byte sub_81000A0
_08100080:
movs r0, 0x20
- bl audio_play
+ bl PlaySE
ldr r1, _08100098
ldr r2, _0810009C
adds r0, r4, 0
@@ -277145,7 +277145,7 @@ sub_8101BA4: @ 8101BA4
strh r1, [r0]
adds r0, 0x2
strh r1, [r0]
- bl current_map_music_get
+ bl GetCurrentMapMusic
adds r1, r5, 0
adds r1, 0x60
strh r0, [r1]
@@ -277508,7 +277508,7 @@ _08101E9C:
movs r0, 0x9
strb r0, [r1]
movs r0, 0x5F
- bl audio_play
+ bl PlaySE
b _08101F1A
.align 2, 0
_08101EB8: .4byte 0x02000000
@@ -277527,7 +277527,7 @@ _08101EC2:
cmp r0, 0
beq _08101EEC
movs r0, 0x5F
- bl audio_play
+ bl PlaySE
ldrb r0, [r4, 0x12]
bl sub_8103D50
ldrh r0, [r4, 0xC]
@@ -277746,7 +277746,7 @@ sub_8102058: @ 8102058
cmp r0, 0
beq _0810207E
movs r0, 0x18
- bl audio_play
+ bl PlaySE
ldr r4, _0810208C
ldrb r0, [r4, 0x18]
bl sub_8102E1C
@@ -277839,7 +277839,7 @@ _0810210C:
cmp r0, 0
beq _08102130
ldr r0, _0810212C
- bl fanfare_play
+ bl PlayFanfare
movs r0, 0x6
bl sub_8104CAC
b _0810215A
@@ -277852,7 +277852,7 @@ _08102130:
cmp r0, 0
beq _0810214C
ldr r0, _08102148
- bl fanfare_play
+ bl PlayFanfare
movs r0, 0x5
bl sub_8104CAC
b _0810215A
@@ -277861,7 +277861,7 @@ _08102148: .4byte 0x00000185
_0810214C:
movs r0, 0xC3
lsls r0, 1
- bl fanfare_play
+ bl PlayFanfare
movs r0, 0x2
bl sub_8104CAC
_0810215A:
@@ -279169,12 +279169,12 @@ sub_8102AD0: @ 8102AD0
negs r1, r1
cmp r0, r1
bne _08102B22
- bl task_is_not_running_overworld_fanfare
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _08102AF6
movs r0, 0x15
- bl audio_play
+ bl PlaySE
_08102AF6:
ldr r2, _08102B70
ldrh r0, [r2, 0xE]
@@ -279200,7 +279200,7 @@ _08102B0E:
movs r0, 0x4
strh r0, [r4, 0xA]
_08102B22:
- bl task_is_not_running_overworld_fanfare
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _08102B58
@@ -279211,7 +279211,7 @@ _08102B22:
cmp r0, 0
beq _08102B58
movs r0, 0x15
- bl audio_play
+ bl PlaySE
ldr r1, _08102B70
ldrh r0, [r1, 0xE]
ldrh r2, [r1, 0xC]
@@ -282611,10 +282611,10 @@ sub_810437C: @ 810437C
bl sub_81053A0
bl sub_810545C
bl sub_8102680
- bl sub_8074D08
+ bl StopMapMusic
movs r0, 0xC4
lsls r0, 1
- bl current_map_music_set
+ bl PlayNewMapMusic
pop {r0}
bx r0
.align 2, 0
@@ -283004,7 +283004,7 @@ sub_81046C0: @ 81046C0
asrs r0, 16
cmp r0, 0x3B
ble _08104758
- bl sub_8074D08
+ bl StopMapMusic
bl sub_81056C0
bl sub_8105804
ldrh r0, [r4, 0x8]
@@ -283027,7 +283027,7 @@ sub_81046C0: @ 81046C0
movs r1, 0x5
bl StartSpriteAnimIfDifferent
ldr r0, _08104718
- bl fanfare_play
+ bl PlayFanfare
b _08104758
.align 2, 0
_08104710: .4byte 0x02000000
@@ -283061,7 +283061,7 @@ _0810471C:
_08104750:
movs r0, 0xC3
lsls r0, 1
- bl fanfare_play
+ bl PlayFanfare
_08104758:
pop {r4-r7}
pop {r0}
@@ -283165,7 +283165,7 @@ sub_81047EC: @ 81047EC
adds r0, r4, 0
adds r0, 0x60
ldrh r0, [r0]
- bl current_map_music_set
+ bl PlayNewMapMusic
ldrb r0, [r4, 0xA]
cmp r0, 0
bne _08104844
@@ -283293,11 +283293,11 @@ sub_81048CC: @ 81048CC
movs r0, 0x4
strh r0, [r4, 0x10]
strh r1, [r4, 0x12]
- bl sub_8074D08
+ bl StopMapMusic
ldr r0, _0810493C
- bl fanfare_play
+ bl PlayFanfare
movs r0, 0xB2
- bl audio_play
+ bl PlaySE
pop {r4,r5}
pop {r0}
bx r0
@@ -283411,7 +283411,7 @@ sub_81049F8: @ 81049F8
ldr r0, _08104A38
adds r0, 0x60
ldrh r0, [r0]
- bl current_map_music_set
+ bl PlayNewMapMusic
bl sub_810514C
bl sub_8105554
bl sub_8105524
@@ -294275,7 +294275,7 @@ sub_8109B7C: @ 8109B7C
cmp r0, 0
beq _08109BAC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
@@ -294289,7 +294289,7 @@ _08109BAC:
cmp r0, 0
beq _08109BC2
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
b _08109C3E
@@ -294299,7 +294299,7 @@ _08109BC2:
cmp r0, 0
beq _08109C28
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r5, _08109BFC
bl GetMenuCursorPos
lsls r0, 24
@@ -294344,7 +294344,7 @@ _08109C28:
cmp r0, 0
beq _08109C3E
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r5, 0
movs r1, 0
bl sub_8109B34
@@ -295146,7 +295146,7 @@ sub_810A2D8: @ 810A2D8
lsls r0, 16
lsrs r0, 16
movs r1, 0
- bl cry_related
+ bl PlayCry1
movs r0, 0x2
movs r1, 0xE
movs r2, 0x1B
@@ -295211,7 +295211,7 @@ _0810A374: .4byte gTasks
_0810A378: .4byte gMain
_0810A37C:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x15
movs r1, 0x7
movs r2, 0x1B
@@ -296386,7 +296386,7 @@ _0810ACF4:
b _0810AD48
_0810ACFA:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _0810AD10
lsls r1, r4, 2
adds r1, r4
@@ -296400,7 +296400,7 @@ _0810AD14: .4byte sub_810AD58
_0810AD18:
bl sub_8072DEC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x17
movs r1, 0x8
movs r2, 0x1D
@@ -297545,7 +297545,7 @@ _0810B588: .4byte sub_810B58C
sub_810B58C: @ 810B58C
push {lr}
movs r0, 0x83
- bl audio_play
+ bl PlaySE
movs r0, 0x25
bl FieldEffectActiveListRemove
bl EnableBothScriptContexts
@@ -298734,7 +298734,7 @@ sub_810BF38: @ 810BF38
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r2, _0810BF6C
ldr r0, _0810BF70
ldr r1, _0810BF74
@@ -298850,7 +298850,7 @@ _0810C012:
cmp r0, r1
beq _0810C0B8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl sub_810BDAC
ldr r1, _0810C054
@@ -298875,7 +298875,7 @@ _0810C05C:
cmp r0, 0
beq _0810C09C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _0810C088
ldrb r1, [r0, 0x1]
ldrb r2, [r0]
@@ -298904,7 +298904,7 @@ _0810C09C:
cmp r0, 0
beq _0810C0B8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _0810C0C0
ldr r2, _0810C0C4
adds r0, r2, 0
@@ -299009,7 +299009,7 @@ _0810C168:
beq _0810C190
_0810C17A:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r5, 0
movs r1, 0
bl sub_810C1C8
@@ -299022,7 +299022,7 @@ _0810C190:
cmp r0, 0
beq _0810C1BA
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r5, 0
movs r1, 0
bl sub_810C1C8
@@ -299347,7 +299347,7 @@ sub_810C40C: @ 810C40C
cmp r0, 0
beq _0810C4BC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
@@ -299368,7 +299368,7 @@ _0810C440:
cmp r0, r1
beq _0810C4BC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
b _0810C4BC
@@ -299381,7 +299381,7 @@ _0810C46C:
cmp r0, 0
beq _0810C4A8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r4, _0810C4A0
bl GetMenuCursorPos
lsls r0, 24
@@ -299406,7 +299406,7 @@ _0810C4A8:
cmp r0, 0
beq _0810C4BC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_810C748
_0810C4BC:
@@ -300393,7 +300393,7 @@ _0810CC30: .4byte sub_810CC34
sub_810CC34: @ 810CC34
push {lr}
movs r0, 0xCF
- bl audio_play
+ bl PlaySE
ldr r0, _0810CC4C
bl FlagSet
ldr r0, _0810CC50
@@ -302980,7 +302980,7 @@ sub_810E070: @ 810E070
ldr r0, _0810E094
strb r1, [r0]
movs r0, 0x2C
- bl audio_play
+ bl PlaySE
ldr r0, _0810E098
movs r1, 0x8
bl CreateTask
@@ -304278,7 +304278,7 @@ _0810E9E8:
movs r0, 0
strh r0, [r1]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0
movs r1, 0
movs r2, 0x1D
@@ -304324,7 +304324,7 @@ _0810EA94:
ldr r0, _0810EAC4
strh r1, [r0]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_810EEDC
movs r0, 0
movs r1, 0
@@ -304521,7 +304521,7 @@ sub_810EBEC: @ 810EBEC
bl SetCameraPanningCallback
bl sub_810ECFC
movs r0, 0x59
- bl audio_play
+ bl PlaySE
pop {r0}
bx r0
.align 2, 0
@@ -304569,7 +304569,7 @@ sub_810EC34: @ 810EC34
cmp r0, 0x17
bne _0810EC92
movs r0, 0x49
- bl audio_play
+ bl PlaySE
adds r0, r5, 0
bl sub_810EC9C
bl InstallCameraPanAheadCallback
@@ -305211,7 +305211,7 @@ _0810F17A:
ldrb r1, [r1]
strh r1, [r0]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_810EEDC
movs r0, 0
movs r1, 0
@@ -305231,7 +305231,7 @@ _0810F1AE:
movs r0, 0x7F
strh r0, [r1]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_810EEDC
movs r0, 0
movs r1, 0
@@ -306015,7 +306015,7 @@ sub_810F758: @ 810F758
movs r0, 0
bl SetCameraPanningCallback
movs r0, 0xD6
- bl audio_play
+ bl PlaySE
pop {r0}
bx r0
.align 2, 0
@@ -309952,7 +309952,7 @@ _081115B4:
beq _081115D0
strh r1, [r5, 0xA]
movs r0, 0x3
- bl audio_play
+ bl PlaySE
b _0811163C
.align 2, 0
_081115CC: .4byte gMain
@@ -309973,7 +309973,7 @@ _081115D0:
_081115EA:
strh r3, [r5, 0xA]
movs r0, 0x6D
- bl audio_play
+ bl PlaySE
b _0811163C
.align 2, 0
_081115F4: .4byte gSaveBlock2
@@ -311752,7 +311752,7 @@ _08112588:
.align 2, 0
_08112590: .4byte gUnknown_03004210
_08112594:
- bl sub_8075374
+ bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _081125A2
@@ -311760,7 +311760,7 @@ _08112594:
_081125A2:
movs r0, 0xBC
lsls r0, 1
- bl audio_play
+ bl PlaySE
ldr r0, _081125B8
mov r2, r8
adds r1, r2, r7
@@ -311770,7 +311770,7 @@ _081125A2:
.align 2, 0
_081125B8: .4byte gTasks
_081125BC:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -311778,7 +311778,7 @@ _081125BC:
bl _08112FD0
_081125CC:
ldr r0, _081125F4
- bl current_map_music_set
+ bl PlayNewMapMusic
ldr r0, _081125F8
mov r3, r8
adds r1, r3, r7
@@ -311952,7 +311952,7 @@ _08112728:
bl _08112FD0
_0811273E:
movs r0, 0x21
- bl audio_play
+ bl PlaySE
mov r2, r8
adds r1, r2, r7
lsls r1, 3
@@ -311961,7 +311961,7 @@ _0811273E:
.align 2, 0
_08112750: .4byte gUnknown_02024D1E
_08112754:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _08112762
@@ -311975,7 +311975,7 @@ _08112762:
adds r4, r0
ldrh r0, [r4, 0x10]
movs r1, 0
- bl cry_related
+ bl PlayCry1
ldr r0, _08112798
ldr r1, _0811279C
movs r2, 0x60
@@ -311993,7 +311993,7 @@ _08112794: .4byte gTasks
_08112798: .4byte gPlttBufferUnfaded + 0x40
_0811279C: .4byte 0x02009000
_081127A0:
- bl sub_8075374
+ bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _081127AE
@@ -312019,7 +312019,7 @@ _081127BE:
movs r3, 0x2
bl sub_8002EB0
ldr r0, _08112844
- bl sub_8075474
+ bl PlayBGM
ldr r2, _08112848
mov r0, r8
adds r1, r0, r7
@@ -312217,7 +312217,7 @@ _08112982:
adds r4, r6
ldrh r0, [r4, 0xE]
movs r1, 0
- bl cry_related
+ bl PlayCry1
_08112992:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -312226,7 +312226,7 @@ _08112992:
.align 2, 0
_0811299C: .4byte gPaletteFade
_081129A0:
- bl sub_8075374
+ bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _081129AC
@@ -312263,7 +312263,7 @@ _081129E8:
beq _081129F2
b _08112FD0
_081129F2:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _081129FE
@@ -312271,7 +312271,7 @@ _081129F2:
_081129FE:
bl sub_8024CEC
ldr r0, _08112A3C
- bl fanfare_play
+ bl PlayFanfare
ldr r0, _08112A40
ldr r0, [r0, 0xC]
bl get_battle_strings_
@@ -312307,7 +312307,7 @@ _08112A4C:
beq _08112A56
b _08112FD0
_08112A56:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _08112A62
@@ -312371,7 +312371,7 @@ _08112AD8:
beq _08112AE2
b _08112FD0
_08112AE2:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _08112AEE
@@ -312408,7 +312408,7 @@ _08112B2C:
beq _08112B36
b _08112FD0
_08112B36:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _08112B42
@@ -312444,7 +312444,7 @@ _08112B7C:
beq _08112B86
b _08112FD0
_08112B86:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _08112BC0
@@ -312477,7 +312477,7 @@ _08112BC0:
beq _08112BCA
b _08112FD0
_08112BCA:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _08112BD6
@@ -312515,7 +312515,7 @@ _08112C0C:
cmp r0, 0
beq _08112C32
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl nullsub_6
movs r0, 0
strb r0, [r4, 0x1]
@@ -312532,7 +312532,7 @@ _08112C32:
cmp r0, 0
bne _08112C58
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl nullsub_6
movs r0, 0x1
strb r0, [r4, 0x1]
@@ -312559,7 +312559,7 @@ _08112C58:
movs r3, 0x2
bl sub_8002EB0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _08112CA8
ldrb r2, [r0, 0x1]
cmp r2, 0
@@ -312622,7 +312622,7 @@ _08112CF0:
movs r3, 0x2
bl sub_8002EB0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _08112D28
mov r2, r8
adds r0, r2, r7
@@ -312798,7 +312798,7 @@ _08112E98:
beq _08112EA2
b _08112FD0
_08112EA2:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _08112EAE
@@ -312832,7 +312832,7 @@ _08112EE8:
ldrh r0, [r4, 0x16]
cmp r0, 0
bne _08112FD0
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _08112FD0
@@ -312920,7 +312920,7 @@ _08112FB0:
ldrh r0, [r0, 0x16]
cmp r0, 0
bne _08112FD0
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _08112FD0
@@ -313043,12 +313043,12 @@ _081130C6:
adds r4, r6
ldrh r0, [r4, 0xE]
movs r1, 0
- bl cry_related
+ bl PlayCry1
b _081132E2
.align 2, 0
_081130D8: .4byte gUnknown_03004828
_081130DC:
- bl sub_8075374
+ bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _081130EA
@@ -313058,7 +313058,7 @@ _081130EA:
bl m4aSongNumStop
movs r0, 0xBC
lsls r0, 1
- bl audio_play
+ bl PlaySE
ldr r1, _08113108
lsls r0, r7, 2
adds r0, r7
@@ -313069,7 +313069,7 @@ _081130EA:
_08113104: .4byte 0x00000179
_08113108: .4byte gTasks
_0811310C:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
@@ -313077,7 +313077,7 @@ _0811310C:
bl _08113B3A
_0811311C:
ldr r0, _08113144
- bl sub_8075474
+ bl PlayBGM
ldr r1, _08113148
lsls r0, r7, 2
adds r0, r7
@@ -313249,7 +313249,7 @@ _08113274:
bl _08113B3A
_0811328A:
movs r0, 0x21
- bl audio_play
+ bl PlaySE
_08113290:
lsls r0, r7, 2
adds r0, r7
@@ -313263,7 +313263,7 @@ _08113298:
.align 2, 0
_081132A4: .4byte gUnknown_02024D1E
_081132A8:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _081132B6
@@ -313276,7 +313276,7 @@ _081132B6:
adds r4, r0
ldrh r0, [r4, 0x10]
movs r1, 0
- bl cry_related
+ bl PlayCry1
ldr r0, _081132F0
ldr r1, _081132F4
movs r2, 0x60
@@ -313298,7 +313298,7 @@ _081132EC: .4byte gTasks
_081132F0: .4byte gPlttBufferUnfaded + 0x40
_081132F4: .4byte 0x02009000
_081132F8:
- bl sub_8075374
+ bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _08113306
@@ -313327,7 +313327,7 @@ _08113316:
movs r3, 0x2
bl sub_8002EB0
ldr r0, _081133A0
- bl fanfare_play
+ bl PlayFanfare
ldr r2, _081133A4
lsls r1, r7, 2
adds r1, r7
@@ -313377,7 +313377,7 @@ _081133A8:
beq _081133B4
b _08113B3A
_081133B4:
- bl task_is_not_running_overworld_fanfare
+ bl IsFanfareTaskInactive
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -313438,7 +313438,7 @@ _08113428:
_08113430: .4byte 0x0000fffe
_08113434:
ldr r0, _0811345C
- bl sub_8075474
+ bl PlayBGM
ldr r0, _08113460
ldr r2, [r0]
adds r0, r2, 0x4
@@ -313485,7 +313485,7 @@ _08113490:
beq _0811349C
b _08113B3A
_0811349C:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _081134A8
@@ -313493,7 +313493,7 @@ _0811349C:
_081134A8:
bl sub_8024CEC
ldr r0, _081134E8
- bl fanfare_play
+ bl PlayFanfare
ldr r0, _081134EC
ldr r0, [r0, 0xC]
bl get_battle_strings_
@@ -313532,7 +313532,7 @@ _081134F8:
beq _08113504
b _08113B3A
_08113504:
- bl task_is_not_running_overworld_fanfare
+ bl IsFanfareTaskInactive
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -313599,7 +313599,7 @@ _0811358C:
beq _08113598
b _08113B3A
_08113598:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _081135A4
@@ -313639,7 +313639,7 @@ _081135E4:
beq _081135F0
b _08113B3A
_081135F0:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _081135FC
@@ -313678,7 +313678,7 @@ _08113638:
beq _08113644
b _08113B3A
_08113644:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _08113682
@@ -313714,7 +313714,7 @@ _08113682:
beq _0811368E
b _08113B3A
_0811368E:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
@@ -313784,7 +313784,7 @@ _0811371C:
cmp r0, 0
beq _08113742
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl nullsub_24
movs r0, 0
strb r0, [r4, 0x1]
@@ -313801,7 +313801,7 @@ _08113742:
cmp r0, 0
bne _08113768
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl nullsub_24
movs r0, 0x1
strb r0, [r4, 0x1]
@@ -313839,7 +313839,7 @@ _08113768:
movs r3, 0x2
bl sub_8002EB0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _081137D0
ldrb r2, [r0, 0x1]
cmp r2, 0
@@ -313913,7 +313913,7 @@ _08113818:
movs r3, 0x2
bl sub_8002EB0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _08113868
mov r2, r9
adds r0, r2, r7
@@ -314098,7 +314098,7 @@ _081139E8:
beq _081139F4
b _08113B3A
_081139F4:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _08113A00
@@ -314135,7 +314135,7 @@ _08113A3C:
ldrh r0, [r0, 0x1A]
cmp r0, 0
bne _08113B3A
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _08113B3A
@@ -314230,7 +314230,7 @@ _08113B18:
ldrh r0, [r0, 0x1A]
cmp r0, 0
bne _08113B3A
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _08113B3A
@@ -318345,7 +318345,7 @@ _08115C0C:
mov r1, r8
strh r1, [r4, 0xA]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r5, _08115D3C
ldr r1, _08115D40
adds r0, r5, 0
@@ -318663,7 +318663,7 @@ _08115E6E:
cmp r1, 0
beq _08115EB8
movs r0, 0x16
- bl audio_play
+ bl PlaySE
b _08115EC2
.align 2, 0
_08115EA8: .4byte gTasks
@@ -319563,7 +319563,7 @@ sub_811659C: @ 811659C
blt _08116600
cmp r0, 0x2
bgt _08116600
- bl task_is_not_running_overworld_fanfare
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _08116624
@@ -319592,7 +319592,7 @@ _081165F4: .4byte gTasks
_081165F8: .4byte sub_811677C
_081165FC: .4byte 0x0000ffff
_08116600:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
@@ -319641,7 +319641,7 @@ sub_8116638: @ 8116638
cmp r0, 0xC
bne _08116684
ldr r0, _0811667C
- bl fanfare_play
+ bl PlayFanfare
movs r0, 0
movs r1, 0xE
movs r2, 0x1D
@@ -319656,7 +319656,7 @@ _08116680: .4byte gUnknown_081C41A5
_08116684:
movs r0, 0xC3
lsls r0, 1
- bl fanfare_play
+ bl PlayFanfare
movs r0, 0
movs r1, 0xE
movs r2, 0x1D
@@ -320315,7 +320315,7 @@ _08116BE4:
cmp r0, 0
beq _08116C06
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_08116C06:
movs r0, 0
str r0, [r5]
@@ -323889,7 +323889,7 @@ _08118790:
muls r0, r1
asrs r0, 12
strh r0, [r6, 0x26]
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _08118818
@@ -323914,9 +323914,9 @@ _08118818:
bx r0
.align 2, 0
_08118824: .4byte 0x00000000
-_08118828: .4byte gUnknown_030073C0
+_08118828: .4byte gMPlay_SE1
_0811882C: .4byte 0x0000ffff
-_08118830: .4byte gUnknown_03007400
+_08118830: .4byte gMPlay_SE2
thumb_func_end sub_8118724
thumb_func_start sub_8118834
@@ -325618,7 +325618,7 @@ _081195EA:
lsls r0, 1
movs r1, 0x3F
negs r1, r1
- bl cry_related
+ bl PlayCry1
b _08119670
.align 2, 0
_08119610: .4byte 0x02019000
@@ -325658,14 +325658,14 @@ _08119658:
movs r0, 0x98
lsls r0, 1
movs r1, 0x3F
- bl cry_related
+ bl PlayCry1
b _08119670
_08119664:
movs r0, 0x99
lsls r0, 1
movs r1, 0x3F
negs r1, r1
- bl cry_related
+ bl PlayCry1
_08119670:
movs r5, 0x2
ldr r4, _081196A0
@@ -326395,7 +326395,7 @@ sub_8119BCC: @ 8119BCC
ldrh r2, [r4, 0x20]
adds r0, r2
strh r0, [r4, 0x20]
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _08119CF6
@@ -326423,9 +326423,9 @@ sub_8119BCC: @ 8119BCC
_08119C44: .4byte gUnknown_083FA64A
_08119C48: .4byte gUnknown_083FA64C
_08119C4C: .4byte 0x02019000
-_08119C50: .4byte gUnknown_030073C0
+_08119C50: .4byte gMPlay_SE1
_08119C54: .4byte 0x0000ffff
-_08119C58: .4byte gUnknown_03007400
+_08119C58: .4byte gMPlay_SE2
_08119C5C:
lsls r0, r1, 16
cmp r0, 0
@@ -326478,7 +326478,7 @@ _08119CAC:
movs r0, 0x98
lsls r0, 1
movs r1, 0x3F
- bl cry_related
+ bl PlayCry1
b _08119CDC
.align 2, 0
_08119CCC: .4byte 0x02019000
@@ -326487,7 +326487,7 @@ _08119CD0:
lsls r0, 1
movs r1, 0x3F
negs r1, r1
- bl cry_related
+ bl PlayCry1
_08119CDC:
ldr r0, _08119D00
ldr r0, [r0, 0x38]
@@ -326887,7 +326887,7 @@ _08119FDC:
_08119FE6:
cmp r0, 0x8
bls _0811A006
- bl sub_80753E8
+ bl IsCryPlaying
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -326956,18 +326956,18 @@ sub_811A050: @ 811A050
bne _0811A09A
movs r0, 0x4
strb r0, [r4, 0x1B]
- bl sub_80753E8
+ bl IsCryPlaying
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0811A094
- bl sub_80753B0
+ bl StopCry
strh r5, [r4, 0x18]
movs r0, 0x2
strb r0, [r4, 0x1A]
b _0811A09A
.align 2, 0
-_0811A08C: .4byte gUnknown_03007380
+_0811A08C: .4byte gMPlay_BGM
_0811A090: .4byte 0x0201c000
_0811A094:
adds r0, r6, 0
@@ -326986,7 +326986,7 @@ sub_811A0A0: @ 811A0A0
movs r1, 0
movs r2, 0x7D
movs r3, 0xA
- bl sub_8075090
+ bl PlayCry2
ldr r1, _0811A0BC
movs r0, 0x1
strb r0, [r1, 0x10]
@@ -331595,7 +331595,7 @@ _0811C39E:
ldrsh r0, [r4, r1]
bl sub_811CA28
movs r0, 0x68
- bl audio_play
+ bl PlaySE
ldrb r0, [r5]
adds r0, 0x1
ldrb r1, [r5]
@@ -334821,7 +334821,7 @@ _0811DC18:
_0811DC4E:
movs r6, 0x1
_0811DC50:
- bl sub_80753C4
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
beq _0811DC5C
@@ -338768,7 +338768,7 @@ _0811FD34:
movs r1, 0x40
negs r1, r1
movs r0, 0x10
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldr r2, _0811FDB8
ldr r3, _0811FDBC
ldrb r0, [r5]
@@ -339735,7 +339735,7 @@ _081204B4:
orrs r0, r1
lsls r1, r3, 24
asrs r1, 24
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
bl dp01_tbl3_exec_completed
pop {r4}
pop {r0}
@@ -339760,7 +339760,7 @@ sub_81204E4: @ 81204E4
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
- bl fanfare_play
+ bl PlayFanfare
bl dp01_tbl3_exec_completed
pop {r0}
bx r0
@@ -339789,7 +339789,7 @@ sub_8120514: @ 8120514
movs r1, 0x19
negs r1, r1
movs r2, 0x5
- bl sub_80750B4
+ bl PlayCry3
bl dp01_tbl3_exec_completed
pop {r0}
bx r0
@@ -340432,7 +340432,7 @@ sub_8120A58: @ 8120A58
ldrb r0, [r0]
strb r0, [r2]
movs r0, 0x5
- bl sub_8074D28
+ bl FadeOutMapMusic
movs r0, 0x3
bl BeginFastPaletteFade
bl dp01_tbl3_exec_completed
@@ -343476,7 +343476,7 @@ sub_81222B0: @ 81222B0
_081222DC: .4byte gPaletteFade
_081222E0:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_806CA38
ldr r1, _08122320
@@ -343525,7 +343525,7 @@ _0812234C: .4byte gTasks
_08122350: .4byte sub_81224A8
_08122354:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_8121E58
movs r0, 0x1
negs r0, r0
@@ -343575,7 +343575,7 @@ sub_812238C: @ 812238C
cmp r0, 0
beq _0812244A
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
@@ -343594,7 +343594,7 @@ _081223D0:
cmp r0, 0x3
beq _0812244A
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
b _0812244A
@@ -343605,7 +343605,7 @@ _081223F2:
cmp r0, 0
beq _0812243C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _08122430
lsls r0, r7, 2
adds r0, r7
@@ -343739,7 +343739,7 @@ _081224FC: .4byte gTasks
_08122500: .4byte sub_8122450
_08122504:
movs r0, 0x20
- bl audio_play
+ bl PlaySE
movs r0, 0xE
movs r1, 0
bl sub_806D538
@@ -343971,7 +343971,7 @@ _081226DC:
cmp r4, 0x2
bls _081226A0
movs r0, 0x20
- bl audio_play
+ bl PlaySE
movs r0, 0x14
movs r1, 0xA
movs r2, 0x1D
@@ -344148,7 +344148,7 @@ sub_8122838: @ 8122838
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_81227FC
pop {r4}
@@ -344489,7 +344489,7 @@ sub_8122AB8: @ 8122AB8
movs r1, 0x2
strb r1, [r0]
movs r0, 0x78
- bl audio_play
+ bl PlaySE
_08122AF4:
pop {r4}
pop {r0}
@@ -344904,7 +344904,7 @@ sub_8122E0C: @ 8122E0C
_08122E34: .4byte gPaletteFade
_08122E38:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_806CA38
ldr r1, _08122E70
@@ -344934,7 +344934,7 @@ _08122E7C: .4byte gTasks
_08122E80: .4byte sub_8122EAC
_08122E84:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _08122EA4
movs r0, 0xFF
strb r0, [r1]
@@ -344976,7 +344976,7 @@ sub_8122EAC: @ 8122EAC
cmp r0, 0
beq _08122F6A
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
@@ -344995,7 +344995,7 @@ _08122EF0:
cmp r0, 0x3
beq _08122F6A
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
b _08122F6A
@@ -345006,7 +345006,7 @@ _08122F12:
cmp r0, 0
beq _08122F5C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _08122F50
lsls r0, r7, 2
adds r0, r7
@@ -345235,7 +345235,7 @@ sub_81230F4: @ 81230F4
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x14
movs r1, 0xA
movs r2, 0x1D
@@ -345566,8 +345566,8 @@ _081233A4:
lsrs r4, r0, 24
cmp r4, 0x13
bls _081233A4
- bl sound_sources_off
- bl map_music_set_to_zero
+ bl InitMapMusic
+ bl ResetMapMusic
ldr r2, _081233D8
ldr r1, _081233DC
movs r0, 0
@@ -345883,7 +345883,7 @@ _08123678:
bl BeginNormalPaletteFade
ldr r0, _081236A4
movs r1, 0x1
- bl sub_8074F6C
+ bl FadeInNewBGM
movs r0, 0x1
bl sub_8123FBC
ldr r1, _081236A8
@@ -345957,7 +345957,7 @@ mainloop: @ 8123724
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
- bl sound_something
+ bl MapMusicMain
pop {r0}
bx r0
thumb_func_end mainloop
@@ -346267,7 +346267,7 @@ _0812397E:
movs r3, 0x10
bl BeginNormalPaletteFade
movs r0, 0x4
- bl play_sound_effect
+ bl FadeOutBGM
b _081239D6
.align 2, 0
_081239A0: .4byte 0x023a0000
@@ -354243,7 +354243,7 @@ sub_8127610: @ 8127610
subs r0, 0x4
strh r0, [r3, 0x26]
movs r0, 0x46
- bl audio_play
+ bl PlaySE
_0812769A:
movs r0, 0
pop {r4-r6}
@@ -354601,7 +354601,7 @@ _08127920:
cmp r0, 0
bne _0812796A
movs r0, 0x46
- bl audio_play
+ bl PlaySE
_0812796A:
add sp, 0x4
pop {r4,r5}
@@ -362001,7 +362001,7 @@ unref_sub_812AECC: @ 812AECC
b _0812AF08
_0812AEEA:
movs r0, 0x16
- bl audio_play
+ bl PlaySE
movs r0, 0x1
b _0812AF0A
_0812AEF4:
@@ -362009,7 +362009,7 @@ _0812AEF4:
b _0812AF08
_0812AEFA:
movs r0, 0x16
- bl audio_play
+ bl PlaySE
bl sub_812AF10
movs r0, 0x1
b _0812AF0A
@@ -362129,7 +362129,7 @@ _0812AFD0:
ldrh r0, [r4, 0x8]
lsls r1, r5, 24
asrs r1, 24
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
_0812AFEA:
lsls r1, r6, 24
asrs r1, 24
@@ -362171,7 +362171,7 @@ sub_812B004: @ 812B004
ldrh r0, [r4, 0xA]
lsls r1, 24
asrs r1, 24
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldrh r0, [r4, 0x1E]
adds r0, 0x1
strh r0, [r4, 0x1E]
@@ -362298,7 +362298,7 @@ sub_812B108: @ 812B108
ldrh r0, [r4, 0x8]
movs r1, 0x1E
ldrsb r1, [r4, r1]
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldrh r0, [r4, 0x10]
subs r0, 0x1
strh r0, [r4, 0x10]
@@ -362469,7 +362469,7 @@ _0812B272:
lsls r1, r6, 24
asrs r1, 24
adds r0, r4, 0
- bl cry_related
+ bl PlayCry1
b _0812B2AA
.align 2, 0
_0812B290: .4byte gUnknown_02024A6A
@@ -362481,7 +362481,7 @@ _0812B29C:
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
- bl sub_80750B4
+ bl PlayCry3
_0812B2AA:
adds r0, r5, 0
bl move_anim_task_del
@@ -362522,7 +362522,7 @@ _0812B2E6:
lsls r1, r4, 24
asrs r1, 24
movs r2, 0x4
- bl sub_80750B4
+ bl PlayCry3
_0812B2F6:
adds r0, r5, 0
bl move_anim_task_del
@@ -362550,7 +362550,7 @@ sub_812B30C: @ 812B30C
lsls r1, 24
asrs r1, 24
adds r0, r5, 0
- bl sub_80754F8
+ bl PlaySE1WithPanning
adds r0, r4, 0
bl move_anim_task_del
pop {r4,r5}
@@ -362576,7 +362576,7 @@ sub_812B340: @ 812B340
lsls r1, 24
asrs r1, 24
adds r0, r5, 0
- bl sub_807552C
+ bl PlaySE2WithPanning
adds r0, r4, 0
bl move_anim_task_del
pop {r4,r5}
@@ -362778,7 +362778,7 @@ bx_battle_menu_t6_2: @ 812B4D4
cmp r0, 0
beq _0812B546
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_814A7FC
ldr r1, _0812B50C
ldr r0, _0812B510
@@ -362840,7 +362840,7 @@ _0812B546:
cmp r0, 0
beq _0812B64E
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@@ -362868,7 +362868,7 @@ _0812B584:
cmp r0, 0
bne _0812B64E
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@@ -362896,7 +362896,7 @@ _0812B5C0:
cmp r0, 0
beq _0812B64E
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@@ -362932,7 +362932,7 @@ _0812B60C:
cmp r0, 0
bne _0812B64E
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
@@ -363933,7 +363933,7 @@ _0812BD94:
orrs r0, r1
lsls r1, r3, 24
asrs r1, 24
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
bl dp01_tbl6_exec_completed
pop {r4}
pop {r0}
@@ -363958,7 +363958,7 @@ sub_812BDC4: @ 812BDC4
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
- bl fanfare_play
+ bl PlayFanfare
bl dp01_tbl6_exec_completed
pop {r0}
bx r0
@@ -363985,7 +363985,7 @@ sub_812BDF4: @ 812BDF4
lsls r0, 16
lsrs r0, 16
movs r1, 0x19
- bl cry_related
+ bl PlayCry1
bl dp01_tbl6_exec_completed
pop {r0}
bx r0
@@ -364164,7 +364164,7 @@ sub_812BF54: @ 812BF54
ldrb r0, [r0]
strb r0, [r2]
movs r0, 0x5
- bl sub_8074D28
+ bl FadeOutMapMusic
movs r0, 0x3
bl BeginFastPaletteFade
bl dp01_tbl6_exec_completed
@@ -364259,7 +364259,7 @@ sub_812C01C: @ 812C01C
push {lr}
sub sp, 0x4
movs r0, 0xEC
- bl audio_play
+ bl PlaySE
bl GetPlayerAvatarObjectId
ldr r2, _0812C078
lsls r0, 24
@@ -365812,7 +365812,7 @@ sub_812CBB4: @ 812CBB4
lsls r1, 24
asrs r1, 24
movs r0, 0xDE
- bl sub_80754F8
+ bl PlaySE1WithPanning
b _0812CC12
_0812CBF2:
ldrh r0, [r4, 0x24]
@@ -366481,7 +366481,7 @@ _0812D0D4:
lsls r1, 24
asrs r1, 24
movs r0, 0xBA
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
cmp r4, 0x40
beq _0812D138
ldr r5, _0812D16C
@@ -368132,7 +368132,7 @@ _0812DDD2:
lsls r1, 24
asrs r1, 24
movs r0, 0xE4
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
b _0812DE80
_0812DDEA:
mov r0, sp
@@ -375238,7 +375238,7 @@ _081314A6:
lsls r1, 24
asrs r1, 24
movs r0, 0x7D
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldr r1, _081314D4
adds r0, r1, 0
ldrh r2, [r4, 0x1C]
@@ -375311,7 +375311,7 @@ _08131538:
lsls r1, 24
asrs r1, 24
movs r0, 0x7D
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
adds r0, r6, 0
bl move_anim_task_del
_0813155A:
@@ -375408,7 +375408,7 @@ _081315F8:
lsls r1, 24
asrs r1, 24
movs r0, 0xCD
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
movs r0, 0
strh r0, [r4, 0x26]
b _081316B0
@@ -375437,7 +375437,7 @@ _0813161C:
lsls r1, 24
asrs r1, 24
movs r0, 0xCD
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
strh r5, [r4, 0x30]
strh r5, [r4, 0x26]
b _081316B0
@@ -375481,7 +375481,7 @@ _0813168C:
lsls r1, 24
asrs r1, 24
movs r0, 0xC0
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
movs r0, 0
strh r0, [r4, 0x30]
_081316B0:
@@ -376517,7 +376517,7 @@ _08131ECA:
lsls r1, 24
asrs r1, 24
movs r0, 0x7A
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldr r0, _08131F54
ldrb r0, [r0]
movs r1, 0x1
@@ -378526,7 +378526,7 @@ _08132F58:
movs r0, 0x1F
strb r0, [r1]
ldr r0, _08132F80
- bl fanfare_play
+ bl PlayFanfare
b _08132FD6
.align 2, 0
_08132F78: .4byte gOtherText_ForgotOrDidNotLearnMove
@@ -378538,7 +378538,7 @@ _08132F84:
cmp r0, 0
beq _08132FD6
ldr r0, _08132F9C
- bl fanfare_play
+ bl PlayFanfare
ldr r0, _08132FA0
ldr r1, [r0]
movs r0, 0x20
@@ -378547,7 +378547,7 @@ _08132F84:
_08132F9C: .4byte 0x0000016f
_08132FA0: .4byte gUnknown_030007B0
_08132FA4:
- bl task_is_not_running_overworld_fanfare
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _08132FD6
@@ -378565,7 +378565,7 @@ _08132FBC:
cmp r0, 0
beq _08132FD6
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_08132FCE:
ldr r0, _08132FE8
ldr r1, [r0]
@@ -378736,7 +378736,7 @@ _0813310C:
cmp r4, 0
beq _0813312A
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r2, _0813313C
ldr r1, [r2]
movs r0, 0x5
@@ -378914,7 +378914,7 @@ _0813326C:
cmp r4, 0
beq _0813328A
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r2, _0813329C
ldr r1, [r2]
movs r3, 0
@@ -379405,7 +379405,7 @@ sub_813362C: @ 813362C
b _08133796
_08133646:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, [r4]
ldrb r0, [r1, 0x1B]
subs r0, 0x1
@@ -379450,7 +379450,7 @@ _08133688:
b _08133796
_081336A0:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, [r4]
ldrb r0, [r1, 0x1B]
adds r0, 0x1
@@ -379491,7 +379491,7 @@ _081336E8:
cmp r0, 0
beq _0813376C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r5, _08133738
ldr r2, [r5]
ldrb r1, [r2, 0x1B]
@@ -379547,7 +379547,7 @@ _0813376C:
cmp r0, 0
beq _08133796
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _081337D4
ldr r1, [r0]
movs r0, 0xC
@@ -380359,7 +380359,7 @@ _08133DDA:
_08133DE4: .4byte gPlayerParty
_08133DE8:
movs r0, 0x1
- bl audio_play
+ bl PlaySE
mov r0, r10
ldrb r1, [r0, 0x1]
lsls r0, r1, 4
@@ -385587,7 +385587,7 @@ _0813667C:
cmp r0, 0
beq _081366AC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl sub_80F5060
bl move_anim_execute
@@ -385605,7 +385605,7 @@ _081366AC:
cmp r0, 0
beq _081366D4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0
bl sub_80F5060
bl move_anim_execute
@@ -385623,7 +385623,7 @@ _081366D4:
cmp r0, 0
beq _081366F4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _081366F0
ldr r0, [r0]
adds r0, 0x50
@@ -385639,7 +385639,7 @@ _081366F4:
b _081367FA
_081366FE:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _08136728
ldr r0, [r0]
ldr r2, _0813672C
@@ -387191,7 +387191,7 @@ _0813730E:
cmp r4, 0
bne _08137410
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
movs r1, 0
movs r2, 0
@@ -387214,7 +387214,7 @@ _08137344:
cmp r4, 0
bne _08137410
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
movs r1, 0
b _0813737E
@@ -387262,7 +387262,7 @@ _081373AC:
cmp r0, 0
bne _08137410
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0
bl nullsub_8
movs r0, 0x1
@@ -387289,7 +387289,7 @@ _081373E8:
cmp r0, 0
bne _08137410
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_814A7FC
movs r0, 0x1
movs r1, 0x1
@@ -391119,7 +391119,7 @@ _081393B2:
bne _081393DE
bl sub_814A7FC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r2, 0x80
lsls r2, 1
movs r0, 0x1
@@ -391503,7 +391503,7 @@ sub_8139680: @ 8139680
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
- bl audio_play
+ bl PlaySE
bl dp01_tbl5_exec_completed
pop {r0}
bx r0
@@ -391527,7 +391527,7 @@ sub_81396B0: @ 81396B0
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
- bl fanfare_play
+ bl PlayFanfare
bl dp01_tbl5_exec_completed
pop {r0}
bx r0
@@ -391554,7 +391554,7 @@ sub_81396E0: @ 81396E0
lsls r0, 16
lsrs r0, 16
movs r1, 0x19
- bl cry_related
+ bl PlayCry1
bl dp01_tbl5_exec_completed
pop {r0}
bx r0
@@ -392144,7 +392144,7 @@ sub_8139BB8: @ 8139BB8
ldrb r0, [r0]
strb r0, [r2]
movs r0, 0x5
- bl sub_8074D28
+ bl FadeOutMapMusic
movs r0, 0x3
bl BeginFastPaletteFade
bl dp01_tbl5_exec_completed
@@ -392350,7 +392350,7 @@ sub_8139D64: @ 8139D64
cmp r0, 0
beq _08139D8C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
@@ -392363,7 +392363,7 @@ _08139D8C:
cmp r0, 0
beq _08139DA2
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
b _08139E10
@@ -392375,7 +392375,7 @@ _08139DA2:
beq _08139DE0
bl sub_8072DEC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r4, _08139DD8
bl GetMenuCursorPos
lsls r0, 24
@@ -392401,7 +392401,7 @@ _08139DE0:
beq _08139E10
bl sub_8072DEC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r2, _08139E18
ldr r0, _08139E1C
ldrb r0, [r0]
@@ -392655,7 +392655,7 @@ sub_8139FD4: @ 8139FD4
cmp r0, 0
beq _08139FF8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
b _0813A008
@@ -392667,7 +392667,7 @@ _08139FF8:
cmp r0, 0
beq _0813A024
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
_0813A008:
bl MoveMenuCursor
@@ -392688,7 +392688,7 @@ _0813A024:
cmp r0, 0
beq _0813A050
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r4, _0813A04C
bl GetMenuCursorPos
lsls r0, 24
@@ -392708,7 +392708,7 @@ _0813A050:
beq _0813A06C
bl sub_8072DEC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _0813A074
ldr r1, [r0, 0x1C]
adds r0, r4, 0
@@ -393008,7 +393008,7 @@ sub_813A280: @ 813A280
cmp r0, 0
beq _0813A2E4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
@@ -393043,7 +393043,7 @@ _0813A2E4:
b _0813A460
_0813A2EE:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrh r0, [r4, 0x2]
subs r0, 0x1
strh r0, [r4, 0x2]
@@ -393065,7 +393065,7 @@ _0813A306:
cmp r1, r0
beq _0813A370
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
lsls r0, 24
@@ -393114,7 +393114,7 @@ _0813A370:
cmp r0, r1
beq _0813A460
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrh r0, [r4, 0x2]
adds r0, 0x1
strh r0, [r4, 0x2]
@@ -393148,7 +393148,7 @@ _0813A3A0:
cmp r0, r1
beq _0813A3DC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
strh r0, [r4, 0x12]
ldrh r0, [r4]
@@ -393165,7 +393165,7 @@ _0813A3DC:
_0813A3E4: .4byte 0x0000fff7
_0813A3E8:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
b _0813A420
_0813A3F0:
movs r0, 0x1
@@ -393173,7 +393173,7 @@ _0813A3F0:
cmp r0, 0
beq _0813A430
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r2, 0x12
ldrsh r0, [r4, r2]
cmp r0, 0
@@ -393203,7 +393203,7 @@ _0813A430:
cmp r0, 0
beq _0813A460
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r1, 0x12
ldrsh r0, [r4, r1]
cmp r0, 0
@@ -393479,7 +393479,7 @@ _0813A668:
cmp r0, 0
beq _0813A69C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x6
movs r1, 0x6
movs r2, 0xD
@@ -393502,7 +393502,7 @@ _0813A69C:
cmp r0, 0
beq _0813A6E8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x6
movs r1, 0x6
movs r2, 0xD
@@ -394895,7 +394895,7 @@ sub_813B174: @ 813B174
cmp r0, 0
beq _0813B1B8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
b _0813B1E6
@@ -394908,7 +394908,7 @@ _0813B1B8:
cmp r0, 0
beq _0813B274
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrb r0, [r4, 0x2]
subs r0, 0x1
b _0813B208
@@ -394924,7 +394924,7 @@ _0813B1CA:
cmp r1, r0
beq _0813B1F4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
_0813B1E6:
bl MoveMenuCursor
@@ -394939,7 +394939,7 @@ _0813B1F4:
cmp r0, r1
beq _0813B274
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrb r0, [r4, 0x2]
adds r0, 0x1
_0813B208:
@@ -394955,7 +394955,7 @@ _0813B212:
beq _0813B25C
bl sub_8072DEC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _0813B23C
ldrb r1, [r0, 0x2]
ldrb r2, [r0]
@@ -394988,7 +394988,7 @@ _0813B25C:
beq _0813B274
bl sub_8072DEC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_813B320
_0813B274:
@@ -395152,7 +395152,7 @@ sub_813B3A0: @ 813B3A0
cmp r0, 0
beq _0813B3C8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
@@ -395165,7 +395165,7 @@ _0813B3C8:
cmp r0, 0
beq _0813B3DE
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
b _0813B420
@@ -395176,7 +395176,7 @@ _0813B3DE:
cmp r0, 0
beq _0813B40C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r4, _0813B408
bl GetMenuCursorPos
lsls r0, 24
@@ -395195,7 +395195,7 @@ _0813B40C:
cmp r0, 0
beq _0813B420
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_813B734
_0813B420:
@@ -395984,7 +395984,7 @@ _0813BA6E:
ldrb r0, [r0, 0x15]
lsls r0, 31
lsrs r0, 31
- bl sub_81DF5D8
+ bl SetPokemonCryStereo
_0813BA7A:
pop {r0}
bx r0
@@ -397931,7 +397931,7 @@ _0813CA76:
cmp r1, r0
bne _0813CA88
movs r0, 0x67
- bl audio_play
+ bl PlaySE
_0813CA88:
mov r0, r8
ldr r1, [r0]
@@ -404427,7 +404427,7 @@ sub_813FCBC: @ 813FCBC
bne _0813FD16
movs r0, 0x3D
movs r1, 0
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldr r0, _0813FD24
lsls r4, r5, 2
adds r4, r5
@@ -404685,7 +404685,7 @@ sub_813FEC8: @ 813FEC8
cmp r0, 0xB
bne _0813FEFA
movs r0, 0x3C
- bl audio_play
+ bl PlaySE
_0813FEFA:
movs r1, 0x8
ldrsh r0, [r5, r1]
@@ -404918,19 +404918,19 @@ _081400BC:
b _081400DA
_081400C2:
movs r0, 0x38
- bl audio_play
+ bl PlaySE
b _0814010E
_081400CA:
movs r0, 0x39
- bl audio_play
+ bl PlaySE
b _0814010E
_081400D2:
movs r0, 0x3A
- bl audio_play
+ bl PlaySE
b _0814010E
_081400DA:
movs r0, 0x3B
- bl audio_play
+ bl PlaySE
b _0814010E
_081400E2:
movs r2, 0x38
@@ -405019,7 +405019,7 @@ sub_8140158: @ 8140158
ldr r0, _0814019C
str r0, [r4, 0x1C]
movs r0, 0x17
- bl audio_play
+ bl PlaySE
_08140190:
pop {r4,r5}
pop {r0}
@@ -405347,7 +405347,7 @@ _081403FC:
bl StartSpriteAffineAnim
_08140404:
movs r0, 0x17
- bl audio_play
+ bl PlaySE
_0814040A:
pop {r4,r5}
pop {r0}
@@ -405416,7 +405416,7 @@ sub_8140454: @ 8140454
bl sub_8043EB4
bl m4aMPlayAllStop
ldr r0, _0814048C
- bl audio_play
+ bl PlaySE
b _081404CC
.align 2, 0
_08140484: .4byte gUnknown_0202F7C9
@@ -405980,7 +405980,7 @@ _081408B6:
strh r7, [r0, 0x10]
strh r5, [r0, 0x26]
movs r0, 0xF
- bl audio_play
+ bl PlaySE
ldr r0, _08140924
ldr r1, _08140928
adds r0, r1
@@ -408206,7 +408206,7 @@ _08141A82:
lsls r1, 24
asrs r1, 24
movs r0, 0x66
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
_08141A8C:
ldr r1, _08141AC4
adds r0, r4, r5
@@ -408824,7 +408824,7 @@ _08141F58:
bl SetMainCallback2
movs r0, 0xDA
lsls r0, 1
- bl sub_8075474
+ bl PlayBGM
movs r0, 0
b _08141F86
.align 2, 0
@@ -409224,7 +409224,7 @@ sub_8142274: @ 8142274
movs r0, 0x3
bl sub_8125D44
movs r0, 0x37
- bl audio_play
+ bl PlaySE
ldr r1, _081422B0
lsls r0, r4, 2
adds r0, r4
@@ -409454,7 +409454,7 @@ sub_8142404: @ 8142404
lsls r0, r2, 23
lsrs r0, 23
movs r1, 0
- bl cry_related
+ bl PlayCry1
_08142458:
adds r0, r6, 0
movs r1, 0
@@ -409651,7 +409651,7 @@ _081425C0:
movs r1, 0xF
bl sub_8143068
movs r0, 0x69
- bl audio_play
+ bl PlaySE
ldr r1, _08142610
mov r2, r8
adds r0, r2, r4
@@ -409945,7 +409945,7 @@ sub_8142818: @ 8142818
cmp r0, 0
beq _0814283E
movs r0, 0x4
- bl play_sound_effect
+ bl FadeOutBGM
ldr r0, _08142848
lsls r1, r4, 2
adds r1, r4
@@ -410620,12 +410620,12 @@ _08142D36:
lsls r1, 1
cmp r0, r1
beq _08142DB2
- bl sub_8075398
+ bl StopCryAndClearCrySongs
ldrh r0, [r4, 0x8]
lsls r0, 23
lsrs r0, 23
movs r1, 0
- bl cry_related
+ bl PlayCry1
_08142DB2:
adds r0, r4, 0
movs r1, 0
@@ -410733,11 +410733,11 @@ _08142E8C: .4byte gTasks
_08142E90: .4byte gSprites
_08142E94: .4byte sub_8142B04
_08142E98:
- bl sub_80753C4
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
beq _08142EB2
- bl sub_8075398
+ bl StopCryAndClearCrySongs
ldr r0, _08142EB8
ldr r1, _08142EBC
movs r2, 0x80
@@ -410748,7 +410748,7 @@ _08142EB2:
str r0, [r4]
b _08142F64
.align 2, 0
-_08142EB8: .4byte gUnknown_03007380
+_08142EB8: .4byte gMPlay_BGM
_08142EBC: .4byte 0x0000ffff
_08142EC0: .4byte sub_8142F78
_08142EC4:
@@ -410756,11 +410756,11 @@ _08142EC4:
ands r0, r2
cmp r0, 0
beq _08142F08
- bl sub_80753C4
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
beq _08142EE6
- bl sub_8075398
+ bl StopCryAndClearCrySongs
ldr r0, _08142EF8
ldr r1, _08142EFC
movs r2, 0x80
@@ -410776,7 +410776,7 @@ _08142EE6:
str r0, [r1]
b _08142F64
.align 2, 0
-_08142EF8: .4byte gUnknown_03007380
+_08142EF8: .4byte gMPlay_BGM
_08142EFC: .4byte 0x0000ffff
_08142F00: .4byte gTasks
_08142F04: .4byte sub_8142F78
@@ -412974,7 +412974,7 @@ sub_8144080: @ 8144080
beq _081440E0
_081440AE:
movs r0, 0x4
- bl play_sound_effect
+ bl FadeOutBGM
movs r0, 0x1
negs r0, r0
ldr r1, _081440D8
@@ -412997,7 +412997,7 @@ _081440E0:
cmp r1, r0
bne _081440EC
movs r0, 0x8
- bl play_sound_effect
+ bl FadeOutBGM
_081440EC:
movs r0, 0x8
ldrsh r1, [r4, r0]
@@ -417439,7 +417439,7 @@ sub_8146440: @ 8146440
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -417801,7 +417801,7 @@ _08146718:
bgt _0814678C
_08146728:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
mov r2, r8
ldrb r3, [r2, 0x1]
ldrb r4, [r4, 0xC]
@@ -418095,7 +418095,7 @@ CB2_InitMysteryEventMenu: @ 8146930
ldr r0, _081469A4
movs r1, 0
bl CreateTask
- bl sub_8074D08
+ bl StopMapMusic
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
@@ -418261,7 +418261,7 @@ _08146AE2:
b _08146C38
_08146AEC:
movs r0, 0x15
- bl audio_play
+ bl PlaySE
ldr r0, _08146B0C
bl sub_8072044
ldr r1, _08146B10
@@ -418297,7 +418297,7 @@ _08146B26:
cmp r0, 0
beq _08146B70
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_8007F4C
movs r0, 0x6
movs r1, 0x5
@@ -418323,7 +418323,7 @@ _08146B70:
b _08146DA4
_08146B7A:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl CloseLink
ldr r0, _08146B8C
adds r1, r4, r0
@@ -418412,7 +418412,7 @@ _08146C38:
b _08146DA4
_08146C46:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl CloseLink
ldr r2, _08146C60
adds r1, r4, r2
@@ -418533,7 +418533,7 @@ _08146D50:
cmp r0, 0
beq _08146DA4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r2, _08146D68
adds r1, r4, r2
b _08146D82
@@ -419453,7 +419453,7 @@ sub_8147408: @ 8147408
bl MapGridSetMetatileIdAt
bl DrawWholeMapView
movs r0, 0x14
- bl audio_play
+ bl PlaySE
ldr r0, _08147474
bl FlagSet
bl ScriptContext2_Disable
@@ -419580,7 +419580,7 @@ sub_8147514: @ 8147514
bl MapGridSetMetatileIdAt
bl DrawWholeMapView
movs r0, 0x14
- bl audio_play
+ bl PlaySE
movs r0, 0x85
lsls r0, 4
bl FlagSet
@@ -419705,7 +419705,7 @@ sub_814761C: @ 814761C
bl MapGridSetMetatileIdAt
bl DrawWholeMapView
movs r0, 0x14
- bl audio_play
+ bl PlaySE
ldr r0, _08147688
bl FlagSet
bl ScriptContext2_Disable
@@ -419782,7 +419782,7 @@ _081476FE:
beq _08147716
bl MenuZeroFillScreen
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x2
strh r0, [r4]
b _0814776A
@@ -420773,7 +420773,7 @@ _08147F34:
bx r0
.align 2, 0
_08147F3C: .4byte gPaletteFade
-_08147F40: .4byte gUnknown_03007380
+_08147F40: .4byte gMPlay_BGM
_08147F44: .4byte 0x0000ffff
_08147F48: .4byte gMain
thumb_func_end sub_8147F08
@@ -420944,7 +420944,7 @@ sub_8148078: @ 8148078
bne _0814809E
ldrh r0, [r4, 0x32]
movs r1, 0
- bl cry_related
+ bl PlayCry1
_0814809E:
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -421920,7 +421920,7 @@ _081488DC:
b _0814891E
_081488E2:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _08148900
bl sub_8071F40
ldr r1, _08148904
@@ -421937,7 +421937,7 @@ _08148904: .4byte gTasks
_08148908: .4byte sub_8148930
_0814890C:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl DestroyTask
ldr r0, _0814892C
@@ -424025,7 +424025,7 @@ sub_81499A0: @ 81499A0
ldr r0, _081499EC
str r0, [r5]
movs r0, 0x8C
- bl audio_play
+ bl PlaySE
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -424157,7 +424157,7 @@ sub_8149AA8: @ 8149AA8
ldr r1, _08149AD8
str r1, [r0]
movs r0, 0xB7
- bl audio_play
+ bl PlaySE
pop {r4}
pop {r0}
bx r0
@@ -424256,7 +424256,7 @@ sub_8149B5C: @ 8149B5C
ldr r1, _08149B8C
str r1, [r0]
movs r0, 0x66
- bl audio_play
+ bl PlaySE
pop {r4}
pop {r0}
bx r0
@@ -424399,7 +424399,7 @@ sub_8149C50: @ 8149C50
ldr r0, _08149CAC
str r0, [r5]
movs r0, 0xCA
- bl audio_play
+ bl PlaySE
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -424560,7 +424560,7 @@ sub_8149D8C: @ 8149D8C
ldr r0, _08149DE8
str r0, [r5]
movs r0, 0xCA
- bl audio_play
+ bl PlaySE
add sp, 0x4
pop {r4,r5}
pop {r0}
diff --git a/asm/rom_803D1FC.s b/asm/rom_803D1FC.s
index 59db9abff..5ea380b1c 100644
--- a/asm/rom_803D1FC.s
+++ b/asm/rom_803D1FC.s
@@ -5137,12 +5137,12 @@ _080408B8: .4byte 0x000001c9
thumb_func_start sub_80408BC
sub_80408BC: @ 80408BC
push {lr}
- bl map_music_set_to_zero
+ bl ResetMapMusic
bl m4aMPlayAllStop
bl sub_8040728
lsls r0, 16
lsrs r0, 16
- bl sub_8075474
+ bl PlayBGM
pop {r0}
bx r0
thumb_func_end sub_80408BC
@@ -5152,18 +5152,18 @@ current_map_music_set__default_for_battle: @ 80408D8
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
- bl map_music_set_to_zero
+ bl ResetMapMusic
bl m4aMPlayAllStop
cmp r4, 0
beq _080408F2
adds r0, r4, 0
- bl current_map_music_set
+ bl PlayNewMapMusic
b _080408FE
_080408F2:
bl sub_8040728
lsls r0, 16
lsrs r0, 16
- bl current_map_music_set
+ bl PlayNewMapMusic
_080408FE:
pop {r4}
pop {r0}
diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s
index 826e43ea1..cb27ea812 100644
--- a/asm/rom_8040EB4.s
+++ b/asm/rom_8040EB4.s
@@ -3327,7 +3327,7 @@ _08042768:
_0804278A:
bl MoveMenuCursor
movs r0, 0x5
- bl audio_play
+ bl PlaySE
b _08042816
.align 2, 0
_08042798: .4byte gTasks
@@ -3338,7 +3338,7 @@ _0804279C:
beq _080427E8
bl sub_8072DEC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r3, _080427DC
ldr r2, _080427E0
ldr r1, _080427E4
@@ -4025,7 +4025,7 @@ _08042D34:
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
- bl current_map_music_get
+ bl GetCurrentMapMusic
ldr r1, _08042D8C
strh r0, [r1]
b _08042F6E
@@ -4290,7 +4290,7 @@ c3_080472E4: @ 8042FB8
ldrsh r0, [r4, r1]
cmp r0, 0
bne _08042FD4
- bl sub_8074D08
+ bl StopMapMusic
_08042FD4:
movs r1, 0x8
ldrsh r0, [r4, r1]
@@ -4298,14 +4298,14 @@ _08042FD4:
bne _08042FE4
movs r0, 0xBC
lsls r0, 1
- bl sub_8075474
+ bl PlayBGM
_08042FE4:
movs r1, 0x8
ldrsh r0, [r4, r1]
cmp r0, 0x3C
ble _08042FF8
ldr r0, _08043008
- bl sub_8075474
+ bl PlayBGM
adds r0, r5, 0
bl DestroyTask
_08042FF8:
@@ -4468,7 +4468,7 @@ _08043124:
adds r0, r4, 0
bl sub_80436FC
ldr r0, _08043160
- bl fanfare_play
+ bl PlayFanfare
ldr r1, [r5]
b _0804329C
.align 2, 0
@@ -4478,7 +4478,7 @@ _08043158: .4byte gStringVar4
_0804315C: .4byte gOtherText_HatchedFromEgg
_08043160: .4byte 0x00000173
_08043164:
- bl task_is_not_running_overworld_fanfare
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
bne _08043170
@@ -4486,7 +4486,7 @@ _08043164:
_08043170:
b _08043298
_08043172:
- bl task_is_not_running_overworld_fanfare
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
bne _0804317E
@@ -4687,7 +4687,7 @@ _08043304:
cmp r0, 0xF
bne _08043334
movs r0, 0x17
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
movs r1, 0x1
bl StartSpriteAnim
@@ -4740,7 +4740,7 @@ _0804336C:
cmp r0, 0xF
bne _08043398
movs r0, 0x17
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
movs r1, 0x2
bl StartSpriteAnim
@@ -4823,7 +4823,7 @@ _08043418:
cmp r0, 0xF
bne _0804344C
movs r0, 0x17
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
movs r1, 0x2
bl StartSpriteAnim
@@ -4835,7 +4835,7 @@ _0804344C:
cmp r0, 0x1E
bne _0804345A
movs r0, 0x17
- bl audio_play
+ bl PlaySE
_0804345A:
pop {r4-r6}
pop {r0}
@@ -4909,7 +4909,7 @@ _080434C0:
cmp r4, 0
bne _080434EE
movs r0, 0x71
- bl audio_play
+ bl PlaySE
adds r2, r5, 0
adds r2, 0x3E
ldrb r0, [r2]
@@ -7932,7 +7932,7 @@ _08044C62:
strh r6, [r0, 0x1C]
movs r0, 0x72
movs r1, 0
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
adds r0, r4, 0
add sp, 0x28
pop {r3-r5}
@@ -8525,13 +8525,13 @@ _080450E4:
lsls r1, 24
asrs r1, 24
movs r0, 0x74
- bl sub_807552C
+ bl PlaySE2WithPanning
b _08045102
_080450F8:
lsls r1, 24
asrs r1, 24
movs r0, 0x73
- bl sub_80754F8
+ bl PlaySE1WithPanning
_08045102:
ldr r0, _0804510C
str r0, [r4, 0x1C]
@@ -11188,7 +11188,7 @@ _080465CC:
ldr r1, _08046630
str r1, [r0]
movs r0, 0x3D
- bl audio_play
+ bl PlaySE
_08046616:
add sp, 0x4
pop {r3-r5}
@@ -11367,7 +11367,7 @@ sub_8046760: @ 8046760
cmp r0, 0xB
bne _08046778
movs r0, 0x3C
- bl audio_play
+ bl PlaySE
_08046778:
ldr r6, _080467C4
ldr r5, _080467C8
@@ -11536,19 +11536,19 @@ _080468B0:
b _080468CE
_080468B6:
movs r0, 0x38
- bl audio_play
+ bl PlaySE
b _08046902
_080468BE:
movs r0, 0x39
- bl audio_play
+ bl PlaySE
b _08046902
_080468C6:
movs r0, 0x3A
- bl audio_play
+ bl PlaySE
b _08046902
_080468CE:
movs r0, 0x3B
- bl audio_play
+ bl PlaySE
b _08046902
_080468D6:
movs r2, 0x38
@@ -11633,7 +11633,7 @@ sub_8046944: @ 8046944
ldr r0, _08046980
str r0, [r4, 0x1C]
movs r0, 0x17
- bl audio_play
+ bl PlaySE
_08046978:
pop {r4}
pop {r0}
@@ -11807,7 +11807,7 @@ _08046ABC:
bl StartSpriteAffineAnim
_08046AC4:
movs r0, 0x17
- bl audio_play
+ bl PlaySE
_08046ACA:
pop {r4}
pop {r0}
@@ -11896,10 +11896,10 @@ _08046BA6:
lsls r1, r3, 24
asrs r1, 24
adds r0, r5, 0
- bl cry_related
+ bl PlayCry1
b _08046BEE
_08046BB2:
- bl sub_8075398
+ bl StopCryAndClearCrySongs
ldr r1, _08046BCC
lsls r0, r4, 2
adds r0, r4
@@ -11926,7 +11926,7 @@ _08046BD0:
asrs r1, 24
adds r0, r5, 0
movs r2, 0x1
- bl sub_8075114
+ bl PlayCry4
_08046BEE:
adds r0, r4, 0
bl DestroyTask
@@ -11955,11 +11955,11 @@ _08046C08:
adds r0, 0x1
strh r0, [r1, 0x26]
_08046C20:
- bl sub_80753C4
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
bne _08046C72
- bl sub_8075398
+ bl StopCryAndClearCrySongs
ldr r0, _08046C44
lsls r1, r4, 2
adds r1, r4
@@ -11992,7 +11992,7 @@ _08046C60:
asrs r1, 24
adds r0, r5, 0
movs r2, 0
- bl sub_8075114
+ bl PlayCry4
adds r0, r4, 0
bl DestroyTask
_08046C72:
@@ -12122,7 +12122,7 @@ _08046D5A:
ands r0, r1
cmp r0, 0
beq _08046DA4
- bl sub_80755D4
+ bl IsBGMPlaying
lsls r0, 24
cmp r0, 0
beq _08046DAE
@@ -12134,7 +12134,7 @@ _08046D90: .4byte gUnknown_02024A6A
_08046D94: .4byte gPlayerParty
_08046D98: .4byte 0x02017840
_08046D9C: .4byte gUnknown_020239F8
-_08046DA0: .4byte gUnknown_03007380
+_08046DA0: .4byte gMPlay_BGM
_08046DA4:
ldr r0, _08046DC8
ldr r1, _08046DCC
@@ -12155,7 +12155,7 @@ _08046DC4:
movs r4, 0
b _08046DF6
.align 2, 0
-_08046DC8: .4byte gUnknown_03007380
+_08046DC8: .4byte gMPlay_BGM
_08046DCC: .4byte 0x0000ffff
_08046DD0: .4byte 0x02017840
_08046DD4:
@@ -12426,7 +12426,7 @@ sub_8046FBC: @ 8046FBC
strb r1, [r0]
bl m4aMPlayAllStop
ldr r0, _08046FF0
- bl audio_play
+ bl PlaySE
b _08047056
.align 2, 0
_08046FEC: .4byte gUnknown_02024E6D
@@ -13336,7 +13336,7 @@ sub_80476E0: @ 80476E0
cmp r0, 0xB
bne _080476F8
movs r0, 0x3C
- bl audio_play
+ bl PlaySE
_080476F8:
ldrh r1, [r5, 0x2E]
lsls r1, 24
@@ -14970,7 +14970,7 @@ _080483B8:
movs r1, 0
bl nullsub_5
ldr r0, _080483FC
- bl sub_8075474
+ bl PlayBGM
b _080484C6
.align 2, 0
_080483F0: .4byte gUnknown_03004824
@@ -17166,7 +17166,7 @@ _08049600:
cmp r0, r6
beq _0804960C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_0804960C:
strb r6, [r7]
pop {r4-r7}
@@ -17288,7 +17288,7 @@ _080496F4:
cmp r0, 0
beq _080497B6
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r4, _08049750
ldr r0, [r4]
adds r1, r0, 0
@@ -17462,7 +17462,7 @@ sub_8049860: @ 8049860
cmp r0, 0
beq _08049880
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
b _08049890
@@ -17474,7 +17474,7 @@ _08049880:
cmp r0, 0
beq _0804989C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
_08049890:
bl MoveMenuCursor
@@ -17490,7 +17490,7 @@ _0804989C:
cmp r0, 0
beq _08049938
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl GetMenuCursorPos
lsls r0, 24
lsrs r1, r0, 24
@@ -17560,7 +17560,7 @@ _08049938:
cmp r0, 0
beq _0804994A
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_8049804
_0804994A:
add sp, 0x4
@@ -17584,7 +17584,7 @@ sub_8049954: @ 8049954
beq _08049974
_0804996A:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_8049804
_08049974:
pop {r0}
@@ -17772,7 +17772,7 @@ sub_8049AC0: @ 8049AC0
cmp r0, 0
beq _08049AE0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
b _08049AF0
@@ -17784,7 +17784,7 @@ _08049AE0:
cmp r0, 0
beq _08049AFC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
_08049AF0:
bl MoveMenuCursor
@@ -17800,7 +17800,7 @@ _08049AFC:
cmp r0, 0
beq _08049B64
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl GetMenuCursorPos
lsls r0, 24
cmp r0, 0
@@ -17892,7 +17892,7 @@ sub_8049BC0: @ 8049BC0
cmp r0, 0
beq _08049BE0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
b _08049BF0
@@ -17904,7 +17904,7 @@ _08049BE0:
cmp r0, 0
beq _08049BFC
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
_08049BF0:
bl MoveMenuCursor
@@ -17920,7 +17920,7 @@ _08049BFC:
cmp r0, 0
beq _08049C72
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl GetMenuCursorPos
lsls r0, 24
lsrs r5, r0, 24
@@ -17971,7 +17971,7 @@ _08049C72:
cmp r0, 0
beq _08049C84
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl sub_8049804
_08049C84:
pop {r4,r5}
@@ -18086,7 +18086,7 @@ sub_8049D44: @ 8049D44
cmp r0, 0
beq _08049D8A
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0
bl sub_804A840
movs r0, 0x1
@@ -20533,7 +20533,7 @@ sub_804B058: @ 804B058
cmp r0, 0xA
bne _0804B074
movs r0, 0x17
- bl audio_play
+ bl PlaySE
movs r0, 0
strh r0, [r4, 0x2E]
_0804B074:
@@ -20632,7 +20632,7 @@ sub_804B104: @ 804B104
cmp r0, 0xF
bne _0804B120
movs r0, 0xCC
- bl audio_play
+ bl PlaySE
movs r0, 0
strh r0, [r4, 0x2E]
_0804B120:
@@ -22951,14 +22951,14 @@ _0804C5EC:
ldrh r0, [r1]
adds r0, 0x1
strh r0, [r1]
- bl current_map_music_get
+ bl GetCurrentMapMusic
ldr r1, [r6]
movs r7, 0x92
lsls r7, 1
adds r1, r7
strh r0, [r1]
ldr r0, _0804C668
- bl sub_8075474
+ bl PlayBGM
bl _0804D570
.align 2, 0
_0804C65C: .4byte gSprites
@@ -23562,7 +23562,7 @@ _0804CB70:
cmp r0, 0
bne _0804CB8E
movs r0, 0x2E
- bl audio_play
+ bl PlaySE
ldr r0, _0804CBC4
ldr r1, [r0]
adds r1, 0xC4
@@ -23845,7 +23845,7 @@ _0804CD94:
cmp r0, 0x2
bhi _0804CDDC
movs r0, 0x2D
- bl audio_play
+ bl PlaySE
_0804CDDC:
ldr r2, [r6]
adds r3, r2, 0
@@ -24265,7 +24265,7 @@ _0804D11A:
adds r0, 0x1
strh r0, [r1]
movs r0, 0x9F
- bl audio_play
+ bl PlaySE
b _0804D570
.align 2, 0
_0804D138: .4byte gSprites
@@ -24632,7 +24632,7 @@ _0804D41C:
cmp r0, 0x4
bne _0804D430
ldr r0, _0804D480
- bl fanfare_play
+ bl PlayFanfare
_0804D430:
ldr r2, [r6]
adds r0, r2, 0
@@ -24783,7 +24783,7 @@ _0804D54C:
lsls r7, 1
adds r0, r7
ldrh r0, [r0]
- bl sub_8075474
+ bl PlayBGM
ldr r0, _0804D584
bl SetMainCallback2
bl sub_804D8E4
@@ -25038,7 +25038,7 @@ sub_804D738: @ 804D738
cmp r0, 0x16
bne _0804D760
movs r0, 0x38
- bl audio_play
+ bl PlaySE
_0804D760:
ldrh r0, [r4, 0x2E]
adds r0, 0x1
@@ -25048,7 +25048,7 @@ _0804D760:
cmp r0, 0x2C
bne _0804D796
movs r0, 0x8C
- bl audio_play
+ bl PlaySE
ldr r0, _0804D7A4
str r0, [r4, 0x1C]
movs r0, 0
@@ -25150,7 +25150,7 @@ sub_804D80C: @ 804D80C
movs r0, 0x16
strh r0, [r4, 0x2E]
movs r0, 0x38
- bl audio_play
+ bl PlaySE
b _0804D88C
_0804D83C:
movs r1, 0x2E
@@ -25158,21 +25158,21 @@ _0804D83C:
cmp r0, 0x42
bne _0804D84A
movs r0, 0x39
- bl audio_play
+ bl PlaySE
_0804D84A:
movs r2, 0x2E
ldrsh r0, [r4, r2]
cmp r0, 0x5C
bne _0804D858
movs r0, 0x3A
- bl audio_play
+ bl PlaySE
_0804D858:
movs r3, 0x2E
ldrsh r0, [r4, r3]
cmp r0, 0x6B
bne _0804D866
movs r0, 0x3B
- bl audio_play
+ bl PlaySE
_0804D866:
ldr r1, _0804D894
movs r2, 0x2E
@@ -26084,7 +26084,7 @@ _0804E0BC:
cmp r0, 0
bne _0804E11A
movs r0, 0x3
- bl play_sound_effect
+ bl FadeOutBGM
ldr r1, _0804E0DC
ldr r0, _0804E0E0
adds r1, r0
@@ -26094,7 +26094,7 @@ _0804E0D8: .4byte gPaletteFade
_0804E0DC: .4byte gMain
_0804E0E0: .4byte 0x0000043c
_0804E0E4:
- bl sub_8075028
+ bl IsBGMStopped
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -26313,7 +26313,7 @@ sub_804E290: @ 804E290
pop {r0}
bx r0
.align 2, 0
-_0804E2B0: .4byte gUnknown_03007400
+_0804E2B0: .4byte gMPlay_SE2
_0804E2B4: .4byte 0x0000ffff
_0804E2B8: .4byte gUnknown_03004854
thumb_func_end sub_804E290
@@ -26874,7 +26874,7 @@ sub_804E738: @ 804E738
b _0804E786
_0804E780:
movs r0, 0x74
- bl audio_play
+ bl PlaySE
_0804E786:
ldrh r0, [r4, 0x30]
strh r0, [r4, 0x20]
@@ -27886,13 +27886,13 @@ _0804F03A:
str r1, [r0]
ldr r0, _0804F07C
bl SetMainCallback2
- bl current_map_music_get
+ bl GetCurrentMapMusic
lsls r0, 16
lsrs r0, 16
ldr r4, _0804F080
cmp r0, r4
beq _0804F074
- bl current_map_music_get
+ bl GetCurrentMapMusic
mov r3, r8
ldr r1, [r3]
movs r2, 0xBC
@@ -27901,7 +27901,7 @@ _0804F03A:
strh r0, [r1]
_0804F074:
adds r0, r4, 0
- bl sub_8075474
+ bl PlayBGM
b _0804F0CE
.align 2, 0
_0804F07C: .4byte sub_80501FC
@@ -28633,7 +28633,7 @@ _0804F636:
strb r1, [r0]
bl sub_804F238
movs r0, 0x2B
- bl audio_play
+ bl PlaySE
mov r2, r8
ldr r0, [r2]
b _0804F710
@@ -28701,7 +28701,7 @@ _0804F650:
movs r0, 0
str r0, [r1]
movs r0, 0x34
- bl audio_play
+ bl PlaySE
bl BuyMenuDrawFieldObjects
_0804F6D6:
mov r1, r8
@@ -28816,13 +28816,13 @@ _0804F792:
cmp r4, r0
blt _0804F792
_0804F7B8:
- bl current_map_music_get
+ bl GetCurrentMapMusic
lsls r0, 16
lsrs r0, 16
ldr r4, _0804F818
cmp r0, r4
beq _0804F7D6
- bl current_map_music_get
+ bl GetCurrentMapMusic
ldr r1, _0804F804
ldr r1, [r1]
movs r5, 0xBC
@@ -28831,9 +28831,9 @@ _0804F7B8:
strh r0, [r1]
_0804F7D6:
adds r0, r4, 0
- bl sub_8075474
+ bl PlayBGM
movs r0, 0x35
- bl audio_play
+ bl PlaySE
bl sub_804E290
_0804F7E6:
bl RunTasks
@@ -29442,7 +29442,7 @@ sub_804FC48: @ 804FC48
ldr r0, _0804FCD0
str r0, [r4]
movs r0, 0x28
- bl audio_play
+ bl PlaySE
b _0804FD18
.align 2, 0
_0804FCBC: .4byte gSpriteTemplate_821645C
@@ -29463,7 +29463,7 @@ _0804FCD4:
movs r1, 0
bl StartSpriteAnim
movs r0, 0x1F
- bl audio_play
+ bl PlaySE
b _0804FD18
.align 2, 0
_0804FCF4: .4byte 0x00005432
@@ -29480,7 +29480,7 @@ _0804FCFC:
movs r1, 0x1
bl StartSpriteAnim
movs r0, 0x20
- bl audio_play
+ bl PlaySE
_0804FD18:
bl sub_805156C
pop {r3}
@@ -29863,7 +29863,7 @@ _08050020: .4byte 0x00004523
_08050024: .4byte gUnknown_03004854
_08050028: .4byte 0x000005dc
_0805002C: .4byte 0xfffffd12
-_08050030: .4byte gUnknown_03007380
+_08050030: .4byte gMPlay_BGM
_08050034:
ldr r0, _08050098
movs r1, 0x80
@@ -29919,7 +29919,7 @@ _08050088:
pop {r0}
bx r0
.align 2, 0
-_08050098: .4byte gUnknown_03007380
+_08050098: .4byte gMPlay_BGM
_0805009C: .4byte gUnknown_03004854
_080500A0: .4byte gUnknown_0202E8CC
_080500A4: .4byte gRecvCmds
@@ -31139,7 +31139,7 @@ _080509B4:
movs r4, 0
b _080509E4
.align 2, 0
-_080509C8: .4byte gUnknown_03007380
+_080509C8: .4byte gMPlay_BGM
_080509CC:
ldr r0, _080509F0
ldr r0, [r0]
@@ -31202,7 +31202,7 @@ _08050A40:
bl sub_804E290
b _08050CB6
.align 2, 0
-_08050A48: .4byte gUnknown_03007400
+_08050A48: .4byte gMPlay_SE2
_08050A4C:
bl GetMultiplayerId
lsls r0, 24
@@ -31349,7 +31349,7 @@ _08050B58:
cmp r0, 0
beq _08050B76
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_08050B76:
movs r0, 0
bl sub_80508D4
@@ -31369,7 +31369,7 @@ _08050B88:
cmp r0, 0x1
beq _08050BD4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
b _08050BD4
.align 2, 0
_08050BA4: .4byte gUnknown_03004854
@@ -31379,7 +31379,7 @@ _08050BA8:
cmp r0, 0
beq _08050BB8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
b _08050C82
_08050BB8:
movs r0, 0x2
@@ -31389,7 +31389,7 @@ _08050BB8:
b _08050CB6
_08050BC2:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _08050BDC
ldr r1, [r0]
adds r1, 0x6F
@@ -31915,7 +31915,7 @@ _08051004:
cmp r0, 0
beq _080510C4
movs r0, 0x37
- bl audio_play
+ bl PlaySE
ldr r0, _0805101C
ldr r1, [r0]
b _080510AC
@@ -32970,7 +32970,7 @@ _08051838:
adds r0, 0x1
strh r0, [r4, 0x2E]
movs r0, 0x38
- bl audio_play
+ bl PlaySE
b _080518BE
_08051858:
ldrh r0, [r4, 0x32]
@@ -33063,7 +33063,7 @@ _080518E8:
adds r0, 0x1
strh r0, [r4, 0x2E]
movs r0, 0x15
- bl audio_play
+ bl PlaySE
b _0805193C
_08051908:
ldrh r0, [r4, 0x32]
@@ -34529,7 +34529,7 @@ _0805247E:
cmp r0, 0
beq _080524AE
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080524A0
ldr r1, [r0]
_08052494:
@@ -35425,12 +35425,12 @@ sub_8052BD0: @ 8052BD0
cmp r0, 0
bne _08052BF6
ldr r0, _08052C20
- bl fanfare_play
+ bl PlayFanfare
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_08052BF6:
- bl task_is_not_running_overworld_fanfare
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _08052C16
@@ -35440,7 +35440,7 @@ _08052BF6:
lsls r1, 1
adds r0, r1
ldrh r0, [r0]
- bl sub_8075474
+ bl PlayBGM
adds r0, r5, 0
bl DestroyTask
_08052C16:
diff --git a/asm/rom_8065394.s b/asm/rom_8065394.s
index c8cf00cef..1b27a4e97 100644
--- a/asm/rom_8065394.s
+++ b/asm/rom_8065394.s
@@ -318,7 +318,7 @@ _0806813C:
cmp r0, 0
beq _08068154
movs r0, 0x6
- bl audio_play
+ bl PlaySE
bl sub_8071310
_08068150:
movs r0, 0x1
@@ -437,7 +437,7 @@ _08068208:
cmp r4, r0
beq _0806822C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_0806822C:
adds r0, r4, 0
bl ScriptContext1_SetupScript
@@ -2121,7 +2121,7 @@ _08068EF8:
bl walkrun_find_lowest_active_bit_in_bitfield
bl sp13E_warp_to_last_warp
movs r0, 0xE9
- bl audio_play
+ bl PlaySE
movs r0, 0x1
b _08068F12
_08068F10:
@@ -3583,7 +3583,7 @@ _0806995E:
cmp r0, 0
beq _080699CE
movs r0, 0x46
- bl audio_play
+ bl PlaySE
b _080699CE
_0806998C:
ldrh r0, [r4, 0xC]
@@ -3866,7 +3866,7 @@ _08069BA4:
bne _08069BB8
_08069BB2:
movs r0, 0x47
- bl audio_play
+ bl PlaySE
_08069BB8:
cmp r7, 0
beq _08069BF4
@@ -4276,7 +4276,7 @@ _08069EB6:
ldrh r0, [r5, 0xA]
strh r0, [r4]
movs r0, 0x2A
- bl audio_play
+ bl PlaySE
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -4322,7 +4322,7 @@ _08069F20:
ldrh r0, [r5, 0xA]
strh r0, [r4]
movs r0, 0x29
- bl audio_play
+ bl PlaySE
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -5696,7 +5696,7 @@ _0806A9BA:
_0806A9CC:
strh r0, [r5, 0x4]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
b _0806AA58
_0806A9D6:
cmp r4, 0x5
@@ -5718,7 +5718,7 @@ _0806A9D6:
ldrh r0, [r5, 0xC]
strb r0, [r1, 0x4]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _0806AA1C
lsls r0, r6, 2
adds r0, r6
@@ -5748,7 +5748,7 @@ _0806AA24:
cmp r0, 0
beq _0806AA58
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldrh r2, [r5, 0x6]
ldrb r3, [r5, 0x8]
ldrb r0, [r5, 0xA]
@@ -6043,7 +6043,7 @@ _0806ACB0:
cmp r0, 0
beq _0806ACC4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r5, 0
bl DestroyTask
_0806ACC4:
@@ -6243,7 +6243,7 @@ _0806AE5C:
ldr r0, _0806AE78
bl sub_806ABDC
movs r0, 0x49
- bl audio_play
+ bl PlaySE
b _0806AE88
.align 2, 0
_0806AE78: .4byte gSystemText_SaveCompleted
@@ -6251,7 +6251,7 @@ _0806AE7C:
ldr r0, _0806AECC
bl sub_806ABDC
movs r0, 0x16
- bl audio_play
+ bl PlaySE
_0806AE88:
movs r0, 0x5
strh r0, [r5]
@@ -8730,7 +8730,7 @@ _0806C1A4:
cmp r5, r0
beq _0806C1C8
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_0806C1C8:
pop {r3,r4}
mov r8, r3
@@ -9615,7 +9615,7 @@ _0806C84A:
cmp r6, r0
beq _0806C878
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_0806C878:
pop {r3}
mov r8, r3
@@ -9690,7 +9690,7 @@ _0806C8E2:
movs r1, 0x2
strb r1, [r0]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_0806C914:
pop {r4-r6}
pop {r0}
@@ -10064,7 +10064,7 @@ _0806CBDA:
cmp r0, 0
beq _0806CC10
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _0806CC0C
lsls r0, r4, 2
adds r0, r4
@@ -10086,7 +10086,7 @@ _0806CC10:
cmp r0, 0x2
bne _0806CC24
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_806CD44
_0806CC24:
@@ -14137,7 +14137,7 @@ _0806EB80:
cmp r1, r0
bne _0806EB8E
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_0806EB8E:
movs r0, 0x17
movs r1, 0x8
@@ -14520,7 +14520,7 @@ _0806EEBC:
cmp r1, r0
bne _0806EECA
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_0806EECA:
movs r0, 0x17
movs r1, 0x8
@@ -14638,7 +14638,7 @@ _0806EFA8:
cmp r1, r0
bne _0806EFB6
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_0806EFB6:
movs r0, 0x17
movs r1, 0x8
@@ -14750,7 +14750,7 @@ sub_806F06C: @ 806F06C
lsls r5, 16
lsrs r5, 16
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _0806F0A8
lsls r0, r4, 2
adds r0, r4
@@ -14965,7 +14965,7 @@ sub_806F254: @ 806F254
cmp r0, 0
bne _0806F276
ldr r0, _0806F280
- bl fanfare_play
+ bl PlayFanfare
ldr r1, _0806F284
lsls r0, r4, 2
adds r0, r4
@@ -14990,7 +14990,7 @@ sub_806F28C: @ 806F28C
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
- bl task_is_not_running_overworld_fanfare
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _0806F2F2
@@ -15161,7 +15161,7 @@ _0806F3E0:
cmp r1, r0
bne _0806F3EE
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_0806F3EE:
adds r0, r5, 0
bl sub_806F614
@@ -15552,7 +15552,7 @@ _0806F73C:
cmp r1, r0
bne _0806F74A
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_0806F74A:
movs r0, 0x17
movs r1, 0x8
@@ -15914,7 +15914,7 @@ sub_806FA18: @ 806FA18
cmp r0, r1
bne _0806FAE4
movs r0, 0x1
- bl audio_play
+ bl PlaySE
movs r0, 0x80
lsls r0, 5
adds r4, r6, r0
@@ -16473,7 +16473,7 @@ _0806FEE6:
movs r0, 0
strb r0, [r1]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _0806FF0C
movs r1, 0x1
bl sub_806E834
@@ -16495,13 +16495,13 @@ _0806FF14:
cmp r0, 0
bne _0806FF34
movs r0, 0x1
- bl audio_play
+ bl PlaySE
b _0806FF3A
.align 2, 0
_0806FF30: .4byte gUnknown_0202E8F4
_0806FF34:
movs r0, 0x75
- bl audio_play
+ bl PlaySE
_0806FF3A:
ldr r4, _0806FF88
ldr r0, [r4]
@@ -16755,7 +16755,7 @@ _08070134:
movs r3, 0x13
bl MenuZeroFillWindowRect
movs r0, 0x1
- bl audio_play
+ bl PlaySE
ldr r0, [r4]
ldrb r1, [r4, 0x5]
bl sub_806FBB4
@@ -17027,7 +17027,7 @@ sub_8070374: @ 8070374
cmp r0, 0
beq _0807039C
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
@@ -17040,7 +17040,7 @@ _0807039C:
cmp r0, 0
beq _080703B2
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
b _080703E4
@@ -17062,7 +17062,7 @@ _080703CC:
cmp r0, 0
beq _080703E4
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080703EC
ldr r1, [r0, 0x4]
adds r0, r4, 0
@@ -17138,7 +17138,7 @@ _08070468: .4byte gTasks
_0807046C: .4byte TaskDummy
_08070470:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0xA
movs r1, 0x3
bl sub_806D538
@@ -17279,7 +17279,7 @@ ether_effect_related: @ 8070570
ldr r0, _080705B0
strb r5, [r0]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _080705B4
movs r1, 0x1
bl sub_806E834
@@ -17294,7 +17294,7 @@ _080705B8:
movs r0, 0x1
strb r0, [r1]
movs r0, 0x1
- bl audio_play
+ bl PlaySE
ldrh r0, [r6, 0x6]
movs r1, 0x1
bl sub_80A9538
@@ -17352,7 +17352,7 @@ dp05_pp_up: @ 8070624
str r4, [r3]
bl sub_806E8D0
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0xB
movs r1, 0x3
bl sub_806D538
@@ -17438,7 +17438,7 @@ _080706F6:
movs r0, 0
strb r0, [r1]
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r0, _0807071C
movs r1, 0x1
bl sub_806E834
@@ -17455,7 +17455,7 @@ _08070724:
movs r0, 0x1
strb r0, [r1]
movs r0, 0
- bl pause_music_for_sound_maybe
+ bl PlayFanfareByFanfareNum
ldr r4, _08070788
ldrb r0, [r4, 0x5]
ldr r1, [r4]
@@ -17506,7 +17506,7 @@ sub_80707A0: @ 80707A0
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0
- bl ducking_tick
+ bl WaitFanfare
lsls r0, 24
cmp r0, 0
beq _080707E8
@@ -17526,7 +17526,7 @@ sub_80707A0: @ 80707A0
beq _080707E8
_080707CE:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_8070848
ldr r0, _080707F8
@@ -17564,7 +17564,7 @@ sub_8070800: @ 8070800
beq _08070834
_0807081A:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
adds r0, r4, 0
bl sub_8070968
ldr r0, _08070840
@@ -17890,7 +17890,7 @@ sub_8070AC8: @ 8070AC8
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0
- bl ducking_tick
+ bl WaitFanfare
lsls r0, 24
cmp r0, 0
bne _08070ADC
@@ -18231,7 +18231,7 @@ sub_8070DBC: @ 8070DBC
lsls r1, 16
lsrs r6, r1, 16
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _08070E18
lsls r0, r4, 2
adds r0, r4
@@ -18951,7 +18951,7 @@ sub_8071338: @ 8071338
cmp r0, 0
beq _08071358
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
@@ -18964,7 +18964,7 @@ _08071358:
cmp r0, 0
beq _08071372
movs r0, 0x5
- bl audio_play
+ bl PlaySE
movs r0, 0x1
bl MoveMenuCursor
ldr r1, _080713E0
@@ -18976,7 +18976,7 @@ _08071372:
cmp r0, 0
beq _08071400
movs r0, 0x5
- bl audio_play
+ bl PlaySE
ldr r1, _080713E4
ldr r2, _080713E8
ldr r0, _080713E0
@@ -19503,7 +19503,7 @@ _08071750: .4byte gUnknown_030006AC
_08071754: .4byte gMain
_08071758:
movs r0, 0x5
- bl audio_play
+ bl PlaySE
_0807175E:
movs r0, 0x1
_08071760:
@@ -19788,7 +19788,7 @@ sub_8071960: @ 8071960
cmp r0, 0
beq _08071978
movs r0, 0x37
- bl audio_play
+ bl PlaySE
ldr r1, _08071980
ldr r0, _08071984
str r0, [r1]
@@ -19804,7 +19804,7 @@ _08071984: .4byte sub_8071988
thumb_func_start sub_8071988
sub_8071988: @ 8071988
push {lr}
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _080719A6
@@ -19830,7 +19830,7 @@ sub_80719AC: @ 80719AC
cmp r0, 0
beq _080719C4
movs r0, 0x16
- bl audio_play
+ bl PlaySE
ldr r1, _080719CC
ldr r0, _080719D0
str r0, [r1]
@@ -20137,7 +20137,7 @@ _08071C1C: .4byte gMain
sub_8071C20: @ 8071C20
push {lr}
movs r0, 0x5
- bl audio_play
+ bl PlaySE
bl MenuZeroFillScreen
bl sub_8064E2C
bl ScriptContext2_Disable
diff --git a/asm/rom_8074BAC.s b/asm/rom_8074BAC.s
index bfad6a2fc..2f43d9b68 100644
--- a/asm/rom_8074BAC.s
+++ b/asm/rom_8074BAC.s
@@ -327,7 +327,7 @@ _080758AE:
bx r0
.align 2, 0
_080758D0: .4byte 0x0000ffff
-_080758D4: .4byte gUnknown_03007380
+_080758D4: .4byte gMPlay_BGM
_080758D8: .4byte gUnknown_030042C4
_080758DC: .4byte gUnknown_03004240
_080758E0: .4byte gUnknown_03004200
@@ -879,7 +879,7 @@ _08075CE4: .4byte gUnknown_0202F7B3
_08075CE8: .4byte gUnknown_0202F7C2
_08075CEC: .4byte gUnknown_03004AF0
_08075CF0:
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _08075D28
@@ -960,13 +960,13 @@ _08075D8E:
pop {r0}
bx r0
.align 2, 0
-_08075D98: .4byte gUnknown_030073C0
-_08075D9C: .4byte gUnknown_03007400
+_08075D98: .4byte gMPlay_SE1
+_08075D9C: .4byte gMPlay_SE2
_08075DA0: .4byte gUnknown_03004AF0
_08075DA4: .4byte 0x0000ffff
_08075DA8: .4byte gBattleAnimPicTable
_08075DAC: .4byte gUnknown_03004B10
-_08075DB0: .4byte gUnknown_03007380
+_08075DB0: .4byte gMPlay_BGM
_08075DB4: .4byte gUnknown_0202F7B1
thumb_func_end sub_8075CB0
@@ -981,7 +981,7 @@ ma09_play_sound: @ 8075DB8
ldrb r1, [r1, 0x1]
lsls r1, 8
orrs r0, r1
- bl audio_play
+ bl PlaySE
ldr r0, [r4]
adds r0, 0x2
str r0, [r4]
@@ -3546,7 +3546,7 @@ ma19_08073BC8: @ 807716C
lsls r1, 24
asrs r1, 24
adds r0, r4, 0
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldr r0, [r5]
adds r0, 0x3
str r0, [r5]
@@ -3569,7 +3569,7 @@ ma1A_8073C00: @ 80771A4
bl sub_8076F98
lsls r0, 24
asrs r0, 24
- bl sub_8075560
+ bl SE12PanpotControl
ldr r0, [r4]
adds r0, 0x1
str r0, [r4]
@@ -3649,7 +3649,7 @@ ma1B_8073C2C: @ 80771D0
strh r5, [r1, 0x10]
mov r0, r9
adds r1, r5, 0
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldr r1, _0807728C
ldrb r0, [r1]
adds r0, 0x1
@@ -3741,7 +3741,7 @@ _080772FC:
_0807730C:
lsls r0, r4, 24
asrs r0, 24
- bl sub_8075560
+ bl SE12PanpotControl
_08077314:
pop {r4-r7}
pop {r0}
@@ -3799,7 +3799,7 @@ sub_8077320: @ 8077320
strh r4, [r1, 0x10]
mov r0, r8
adds r1, r4, 0
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldr r1, _080773B0
ldrb r0, [r1]
adds r0, 0x1
@@ -3891,7 +3891,7 @@ sub_80773B4: @ 80773B4
strh r6, [r1, 0x10]
mov r0, r9
adds r1, r6, 0
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
ldr r1, _08077470
ldrb r0, [r1]
adds r0, 0x1
@@ -4010,7 +4010,7 @@ sub_80774FC: @ 80774FC
lsrs r4, 24
lsls r1, 24
asrs r1, 24
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
cmp r4, 0
bne _0807754A
adds r0, r5, 0
@@ -4103,7 +4103,7 @@ sub_80775CC: @ 80775CC
ldrh r0, [r2, 0x8]
movs r1, 0xA
ldrsb r1, [r2, r1]
- bl audio_play_and_stuff
+ bl PlaySE12WithPanning
adds r0, r4, 0
bl DestroyTask
ldr r1, _0807760C
@@ -4186,7 +4186,7 @@ ma20_wait_for_something: @ 8077684
ldrb r5, [r0]
cmp r5, 0
bne _080776CC
- bl mplay_has_finished_maybe
+ bl IsSEPlaying
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -4208,8 +4208,8 @@ ma20_wait_for_something: @ 8077684
.align 2, 0
_080776BC: .4byte gUnknown_0202F7B3
_080776C0: .4byte gUnknown_03004AF0
-_080776C4: .4byte gUnknown_030073C0
-_080776C8: .4byte gUnknown_03007400
+_080776C4: .4byte gMPlay_SE1
+_080776C8: .4byte gMPlay_SE2
_080776CC:
ldr r1, _080776DC
movs r0, 0
@@ -4721,8 +4721,8 @@ ma2F_stop_music: @ 8077A94
pop {r0}
bx r0
.align 2, 0
-_08077AB0: .4byte gUnknown_030073C0
-_08077AB4: .4byte gUnknown_03007400
+_08077AB0: .4byte gMPlay_SE1
+_08077AB4: .4byte gMPlay_SE2
_08077AB8: .4byte gUnknown_0202F7A4
thumb_func_end ma2F_stop_music
diff --git a/data/data2.s b/data/data2.s
index e9b973db2..2cc0fecd5 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -8580,8 +8580,20 @@ gTilesetAnimTable_BikeShop:: @ 837DEDC
gDummyPaletteStructTemplate:: @ 837DEE4
.incbin "baserom.gba", 0x0037dee4, 0x10
-gUnknown_0837DEF4:: @ 837DEF4
- .incbin "baserom.gba", 0x0037def4, 0x30
+ .align 2
+gFanfares:: @ 837DEF4
+ .2byte BGM_FANFA1, 80
+ .2byte BGM_FANFA4, 160
+ .2byte BGM_FANFA5, 220
+ .2byte BGM_ME_WAZA, 220
+ .2byte BGM_ME_ASA, 160
+ .2byte BGM_ME_BACHI, 340
+ .2byte BGM_ME_WASURE, 180
+ .2byte BGM_ME_KINOMI, 120
+ .2byte BGM_ME_TAMA, 710
+ .2byte BGM_ME_B_BIG, 250
+ .2byte BGM_ME_B_SMALL, 150
+ .2byte BGM_ME_ZANNEN, 160
.align 2
gOamData_837DF24:: @ 837DF24
diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h
index 65cfd5756..b0d0b9d5c 100644
--- a/include/gba/m4a_internal.h
+++ b/include/gba/m4a_internal.h
@@ -283,7 +283,7 @@ struct MusicPlayerTrack
#define MAX_MUSICPLAYER_TRACKS 16
-#define STOP_AFTER_FADE 0x0001
+#define TEMPORARY_FADE 0x0001
#define FADE_IN 0x0002
#define FADE_VOL_MAX 64
#define FADE_VOL_SHIFT 2
@@ -409,17 +409,17 @@ void ClearModM(struct MusicPlayerTrack *track);
void m4aMPlayModDepthSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 modDepth);
void m4aMPlayLFOSpeedSet(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u8 lfoSpeed);
-struct MusicPlayerInfo *sub_81DF43C(u32 tone);
-void sub_81DF50C(u8 val);
-void sub_81DF520(s8 val);
-void sub_81DF538(s16 val);
-void sub_81DF570(u16 val);
-void sub_81DF57C(u8 val);
-void sub_81DF588(u32 val);
-int sub_81DF594(struct MusicPlayerInfo *mplayInfo);
-void sub_81DF5AC(s8 val);
-void sub_81DF5D8(u32 val);
-void sub_81DF618(u8 val);
+struct MusicPlayerInfo *SetPokemonCryTone(struct ToneData *tone);
+void SetPokemonCryVolume(u8 val);
+void SetPokemonCryPanpot(s8 val);
+void SetPokemonCryPitch(s16 val);
+void SetPokemonCryLength(u16 val);
+void SetPokemonCryRelease(u8 val);
+void SetPokemonCryProgress(u32 val);
+int IsPokemonCryPlaying(struct MusicPlayerInfo *mplayInfo);
+void SetPokemonCryChorus(s8 val);
+void SetPokemonCryStereo(u32 val);
+void SetPokemonCryPriority(u8 val);
// sound command handler functions
void ply_fine(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
diff --git a/include/sound.h b/include/sound.h
new file mode 100644
index 000000000..1a5161ca8
--- /dev/null
+++ b/include/sound.h
@@ -0,0 +1,46 @@
+#ifndef GUARD_SOUND_H
+#define GUARD_SOUND_H
+
+void InitMapMusic(void);
+void MapMusicMain(void);
+void ResetMapMusic(void);
+u16 GetCurrentMapMusic(void);
+void PlayNewMapMusic(u16 songNum);
+void StopMapMusic(void);
+void FadeOutMapMusic(u8 speed);
+void FadeOutAndPlayNewMapMusic(u16 songNum, u8 speed);
+void FadeOutAndFadeInNewMapMusic(u16 songNum, u8 fadeOutSpeed, u8 fadeInSpeed);
+void FadeInNewMapMusic(u16 songNum, u8 speed);
+bool8 IsNotWaitingForBGMStop(void);
+void PlayFanfareByFanfareNum(u8 fanfareNum);
+bool8 WaitFanfare(bool8 stop);
+void StopFanfareByFanfareNum(u8 fanfareNum);
+void PlayFanfare(u16 songNum);
+bool8 IsFanfareTaskInactive(void);
+void FadeInNewBGM(u16 songNum, u8 speed);
+void FadeOutBGMTemporarily(u8 speed);
+bool8 IsBGMPausedOrStopped(void);
+void FadeInBGM(u8 speed);
+void FadeOutBGM(u8 speed);
+bool8 IsBGMStopped(void);
+void PlayCry1(u16 species, s8 pan);
+void PlayCry2(u16 species, s8 pan, s8 volume, u8 priority);
+void PlayCry3(u16 species, s8 pan, u8 mode);
+void PlayCry4(u16 species, s8 pan, u8 mode);
+void PlayCry5(u16 species, u8 mode);
+bool8 IsCryFinished(void);
+void StopCryAndClearCrySongs(void);
+void StopCry(void);
+bool8 IsCryPlayingOrClearCrySongs(void);
+bool8 IsCryPlaying(void);
+void PlayBGM(u16 songNum);
+void PlaySE(u16 songNum);
+void PlaySE12WithPanning(u16 songNum, u8 pan);
+void PlaySE1WithPanning(u16 songNum, u8 pan);
+void PlaySE2WithPanning(u16 songNum, u8 pan);
+void SE12PanpotControl(u8 pan);
+bool8 IsSEPlaying(void);
+bool8 IsBGMPlaying(void);
+bool8 IsSpecialSEPlaying(void);
+
+#endif // GUARD_SOUND_H
diff --git a/sound/music_player_table.s b/sound/music_player_table.s
index 9357bf64a..eadcfc90a 100644
--- a/sound/music_player_table.s
+++ b/sound/music_player_table.s
@@ -1,6 +1,6 @@
.align 2
gMPlayTable:: @ 845545C
- music_player 0x3007380, 0x30007F8, 10, 0
- music_player 0x30073C0, 0x3000B18, 3, 1
- music_player 0x3007400, 0x3000C08, 9, 1
- music_player 0x3007450, 0x3000ED8, 1, 0
+ music_player gMPlay_BGM, 0x30007F8, 10, 0
+ music_player gMPlay_SE1, 0x3000B18, 3, 1
+ music_player gMPlay_SE2, 0x3000C08, 9, 1
+ music_player gMPlay_SE3, 0x3000ED8, 1, 0
diff --git a/src/link.c b/src/link.c
index f6b683b74..0b4852c8d 100644
--- a/src/link.c
+++ b/src/link.c
@@ -7,6 +7,8 @@
#include "link.h"
#include "palette.h"
#include "rng.h"
+#include "menu.h"
+#include "sound.h"
#define SIO_MULTI_CNT ((struct SioMultiCnt *)REG_ADDR_SIOCNT)
@@ -27,7 +29,6 @@ struct LinkTestBGInfo
u32 dummy_C;
};
-extern void InitMenuWindow(const struct WindowConfig *);
extern void sub_80516C4(u8, u16);
extern u8 unk_2000000[];
@@ -230,7 +231,7 @@ static void LinkTestScreen(void)
ResetTasks();
SetVBlankCallback(VBlankCB_LinkTest);
SetUpWindowConfig(&gWindowConfig_81E6CE4);
- InitMenuWindow(&gWindowConfig_81E6CE4);
+ InitMenuWindow((struct WindowConfig *)&gWindowConfig_81E6CE4);
ResetBlockSend();
gLinkType = 0x1111;
OpenLink();
@@ -1217,7 +1218,7 @@ void CB2_LinkError(void)
ResetTasks();
SetVBlankCallback(VBlankCB_LinkTest);
SetUpWindowConfig(&gWindowConfig_81E7198);
- InitMenuWindow(&gWindowConfig_81E7198);
+ InitMenuWindow((struct WindowConfig *)&gWindowConfig_81E7198);
MenuZeroFillScreen();
REG_BLDALPHA = 0;
REG_BG0VOFS = 0;
@@ -1225,7 +1226,7 @@ void CB2_LinkError(void)
REG_DISPCNT = 320;
gUnknown_3001BB4 = 0;
CreateTask(Task_DestroySelf, 0);
- sub_8074D08();
+ StopMapMusic();
RunTasks();
AnimateSprites();
BuildOamBuffer();
@@ -1244,10 +1245,10 @@ static void CB2_PrintErrorMessage(void)
break;
case 30:
case 60:
- audio_play(SE_BOO);
+ PlaySE(SE_BOO);
break;
case 90:
- audio_play(SE_BOO);
+ PlaySE(SE_BOO);
break;
}
diff --git a/src/m4a_2.c b/src/m4a_2.c
index cb4b39e0f..b046b3172 100644
--- a/src/m4a_2.c
+++ b/src/m4a_2.c
@@ -196,19 +196,19 @@ void m4aMPlayFadeOut(struct MusicPlayerInfo *mplayInfo, u16 speed)
MPlayFadeOut(mplayInfo, speed);
}
-void sub_81DE0D0(struct MusicPlayerInfo *mplayInfo, u16 speed)
+void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed)
{
if (mplayInfo->ident == ID_NUMBER)
{
mplayInfo->ident++;
mplayInfo->fadeOC = speed;
mplayInfo->fadeOI = speed;
- mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT) | STOP_AFTER_FADE;
+ mplayInfo->fadeOV = (64 << FADE_VOL_SHIFT) | TEMPORARY_FADE;
mplayInfo->ident = ID_NUMBER;
}
}
-void sub_81DE0F0(struct MusicPlayerInfo *mplayInfo, u16 speed)
+void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed)
{
if (mplayInfo->ident == ID_NUMBER)
{
@@ -701,22 +701,22 @@ void FadeOutBody(struct MusicPlayerInfo *mplayInfo)
while (i > 0)
{
register u32 fadeOV asm("r7");
- register u32 val asm("r0");
+ u32 val;
TrackStop(mplayInfo, track);
- val = STOP_AFTER_FADE;
+ val = TEMPORARY_FADE;
fadeOV = mplayInfo->fadeOV;
val &= fadeOV;
if (!val)
- track->flags = val;
+ track->flags = 0;
i--;
track++;
}
- if (mplayInfo->fadeOV & STOP_AFTER_FADE)
+ if (mplayInfo->fadeOV & TEMPORARY_FADE)
mplayInfo->status |= MUSICPLAYER_STATUS_PAUSE;
else
mplayInfo->status = MUSICPLAYER_STATUS_PAUSE;
diff --git a/src/m4a_4.c b/src/m4a_4.c
index 9c7655187..1a3ce4024 100644
--- a/src/m4a_4.c
+++ b/src/m4a_4.c
@@ -415,7 +415,7 @@ void DummyFunc(void)
{
}
-struct MusicPlayerInfo *sub_81DF43C(u32 tone)
+struct MusicPlayerInfo *SetPokemonCryTone(struct ToneData *tone)
{
u32 maxClock = 0;
s32 maxClockIndex = 0;
@@ -447,7 +447,7 @@ start_song:
memcpy((void *)CRY, &gPokemonCrySong, sizeof(struct PokemonCrySong));
- *(u32 *)(CRY + CRY_OFS(tone)) = tone;
+ *(u32 *)(CRY + CRY_OFS(tone)) = (u32)tone;
*(u32 *)(CRY + CRY_OFS(part)) = CRY + CRY_OFS(part0);
*(u32 *)(CRY + CRY_OFS(part) + 4) = CRY + CRY_OFS(part1);
*(u32 *)(CRY + CRY_OFS(gotoTarget)) = CRY + CRY_OFS(cont);
@@ -462,17 +462,17 @@ start_song:
return mplayInfo;
}
-void sub_81DF50C(u8 val)
+void SetPokemonCryVolume(u8 val)
{
gPokemonCrySong.volumeValue = val & 0x7F;
}
-void sub_81DF520(s8 val)
+void SetPokemonCryPanpot(s8 val)
{
gPokemonCrySong.panValue = (val + C_V) & 0x7F;
}
-void sub_81DF538(s16 val)
+void SetPokemonCryPitch(s16 val)
{
s16 b = val + 0x80;
u8 a = gPokemonCrySong.tuneValue2 - gPokemonCrySong.tuneValue;
@@ -481,22 +481,22 @@ void sub_81DF538(s16 val)
gPokemonCrySong.tuneValue2 = (a + ((b >> 1) & 0x7F)) & 0x7F;
}
-void sub_81DF570(u16 val)
+void SetPokemonCryLength(u16 val)
{
gPokemonCrySong.unkCmd0CParam = val;
}
-void sub_81DF57C(u8 val)
+void SetPokemonCryRelease(u8 val)
{
gPokemonCrySong.releaseValue = val;
}
-void sub_81DF588(u32 val)
+void SetPokemonCryProgress(u32 val)
{
gPokemonCrySong.unkCmd0DParam = val;
}
-int sub_81DF594(struct MusicPlayerInfo *mplayInfo)
+int IsPokemonCryPlaying(struct MusicPlayerInfo *mplayInfo)
{
struct MusicPlayerTrack *track = mplayInfo->tracks;
@@ -506,7 +506,7 @@ int sub_81DF594(struct MusicPlayerInfo *mplayInfo)
return 0;
}
-void sub_81DF5AC(s8 val)
+void SetPokemonCryChorus(s8 val)
{
if (val)
{
@@ -519,7 +519,7 @@ void sub_81DF5AC(s8 val)
}
}
-void sub_81DF5D8(u32 val)
+void SetPokemonCryStereo(u32 val)
{
struct SoundInfo *soundInfo = SOUND_INFO_PTR;
@@ -539,7 +539,7 @@ void sub_81DF5D8(u32 val)
}
}
-void sub_81DF618(u8 val)
+void SetPokemonCryPriority(u8 val)
{
gPokemonCrySong.priority = val;
}
diff --git a/src/main.c b/src/main.c
index 2a1cbc1b7..012f5536d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,6 +6,7 @@
#include "rtc.h"
#include "link.h"
#include "rng.h"
+#include "sound.h"
extern struct SoundInfo gSoundInfo;
extern u32 gUnknown_3004820;
@@ -68,9 +69,7 @@ extern void c2_copyright_1();
extern u32 sub_80558AC(void);
extern u32 sub_8055910(void);
extern u32 sub_8055940(void);
-extern void sound_something(void);
extern void CheckForFlashMemory(void);
-extern void sound_sources_off(void);
void UpdateLinkAndCallCallbacks(void);
void InitMainCallbacks(void);
@@ -99,7 +98,7 @@ void AgbMain()
RtcInit();
CheckForFlashMemory();
InitMainCallbacks();
- sound_sources_off();
+ InitMapMusic();
SeedRngWithRtc();
gUnknown_3001BB4 = 0;
@@ -142,7 +141,7 @@ void AgbMain()
}
PlayTimeCounter_Update();
- sound_something();
+ MapMusicMain();
WaitForVBlank();
}
}
diff --git a/src/main_menu.c b/src/main_menu.c
index 55e3baa00..099a3634a 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -10,6 +10,7 @@
#include "species.h"
#include "pokemon.h"
#include "menu.h"
+#include "sound.h"
#define BirchSpeechUpdateWindowText() ((u8)MenuUpdateWindowText_OverrideLineLength(24))
@@ -20,18 +21,9 @@ extern void CB2_InitTitleScreen(void);
extern void FormatPlayTime(u8 *str, u16 hours, u16 minutes, bool16 colon);
extern u16 GetPokedexSeenCount(void);
extern u8 GetBadgeCount(void);
-extern void Task_Birch1(u8);
-u8 sub_8075374(void);
-void cry_related(u16, u8);
-void audio_play(u8 a);
-u8 GetMenuCursorPos(void);
void DoNamingScreen(u8 r0, struct SaveBlock2 *r1, u16 r2, u16 r3, u8 s0, MainCallback s4);
-void DisplayYesNoMenu(u8 r0, u8 r1, u32 r2);
-s8 ProcessMenuInputNoWrap_(void);
void CB2_NewGame(void);
void LZ77UnCompVram(const void *src, void *dest);
-void CB2_MainMenu(void);
-void VBlankCB_MainMenu(void);
void DecompressPicFromTable_2(const struct SpriteSheet *, u8, u8, void *, void *, u32);
void LoadCompressedObjectPalette(const struct SpritePalette *);
u8 AddNewGameBirchObject(u8, u8, u8);
@@ -74,6 +66,7 @@ static void PrintPlayerName(void);
static void PrintPlayTime(void);
static void PrintPokedexCount(void);
static void PrintBadgeCount(void);
+void Task_Birch1(u8);
extern u16 gMainMenuPalette[];
@@ -349,13 +342,13 @@ bool8 MainMenuProcessKeyInput(u8 taskId)
{
if (gMain.newKeys & A_BUTTON)
{
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0x0000);
gTasks[taskId].func = MainMenuPressedA;
}
else if (gMain.newKeys & B_BUTTON)
{
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0xFFFF);
REG_WIN0H = WIN_RANGE(0, 240);
REG_WIN0V = WIN_RANGE(0, 160);
@@ -738,7 +731,7 @@ void Task_Birch1(u8 taskId)
gTasks[taskId].data[3] = 0xFF;
gTasks[taskId].data[7] = 216;
- sub_8075474(BGM_DOORO_X4);
+ PlayBGM(BGM_DOORO_X4);
}
void task_new_game_prof_birch_speech_2(u8 taskId)
@@ -750,7 +743,7 @@ void task_new_game_prof_birch_speech_2(u8 taskId)
else
{
u8 spriteId = gTasks[taskId].data[8];
-
+
gSprites[spriteId].pos1.x = 136;
gSprites[spriteId].pos1.y = 60;
gSprites[spriteId].invisible = 0;
@@ -798,7 +791,7 @@ void task_new_game_prof_birch_speech_5(u8 taskId)
void task_new_game_prof_birch_speech_6(u8 taskId)
{
u8 spriteId = gTasks[taskId].data[9];
-
+
gSprites[spriteId].pos1.x = 104;
gSprites[spriteId].pos1.y = 72;
gSprites[spriteId].invisible = 0;
@@ -810,7 +803,7 @@ void task_new_game_prof_birch_speech_6(u8 taskId)
void task_new_game_prof_birch_speech_7(u8 taskId)
{
- if (sub_8075374())
+ if (IsCryFinished())
{
if (gTasks[taskId].data[7] > 95)
{
@@ -818,13 +811,13 @@ void task_new_game_prof_birch_speech_7(u8 taskId)
gTasks[taskId].func = task_new_game_prof_birch_speech_8;
}
}
-
+
if (gTasks[taskId].data[7] < 16384)
{
gTasks[taskId].data[7]++;
if (gTasks[taskId].data[7] == 32)
{
- cry_related(SPECIES_AZURILL, 0);
+ PlayCry1(SPECIES_AZURILL, 0);
}
}
}
@@ -936,14 +929,14 @@ void task_new_game_prof_birch_speech_16(u8 taskId)
{
case MALE:
sub_8072DEC();
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
gSaveBlock2.playerGender = MALE;
MenuZeroFillWindowRect(2, 4, 8, 9);
gTasks[taskId].func = sub_800A974;
break;
case FEMALE:
sub_8072DEC();
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
gSaveBlock2.playerGender = FEMALE;
MenuZeroFillWindowRect(2, 4, 8, 9);
gTasks[taskId].func = sub_800A974;
@@ -1037,19 +1030,19 @@ void sub_800A9EC(u8 taskId)
case 3:
case 4:
sub_8072DEC();
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
MenuZeroFillWindowRect(2, 1, 22, 12);
set_default_player_name(n);
gTasks[taskId].func = task_new_game_prof_birch_speech_part2_1;
break;
case 0:
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
BeginNormalPaletteFade(-1, 0, 0, 16, 0);
gTasks[taskId].func = sub_800AAAC;
break;
case -1:
sub_8072DEC();
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
MenuZeroFillWindowRect(2, 1, 22, 12);
gTasks[taskId].func = task_new_game_prof_birch_speech_14;
break;
@@ -1087,7 +1080,7 @@ void task_new_game_prof_birch_speech_part2_4(u8 taskId)
switch (ProcessMenuInputNoWrap_())
{
case 0:
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
MenuZeroFillWindowRect(2, 1, 8, 7);
gSprites[gTasks[taskId].data[2]].oam.objMode = ST_OAM_OBJ_BLEND;
sub_800B458(taskId, 2);
@@ -1096,7 +1089,7 @@ void task_new_game_prof_birch_speech_part2_4(u8 taskId)
break;
case -1:
case 1:
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
MenuZeroFillWindowRect(2, 1, 8, 7);
gTasks[taskId].func = task_new_game_prof_birch_speech_14;
break;
@@ -1237,7 +1230,7 @@ void task_new_game_prof_birch_speech_part2_9(u8 taskId)
StartSpriteAffineAnim(&gSprites[spriteId], 0);
gSprites[spriteId].callback = sub_800B240;
BeginNormalPaletteFade(0x0000FFFF, 0, 0, 0x10, 0);
- play_sound_effect(4);
+ FadeOutBGM(4);
gTasks[taskId].func = task_new_game_prof_birch_speech_part2_10;
}
}
diff --git a/src/menu.c b/src/menu.c
index ab7aae955..ae9213785 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -4,6 +4,7 @@
#include "text.h"
#include "songs.h"
#include "text_window.h"
+#include "sound.h"
struct Menu
{
@@ -250,7 +251,7 @@ s8 ProcessMenuInput(void)
{
if (gMain.newKeys & A_BUTTON)
{
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
if (gMenu.menu_field_7)
sub_8072DEC();
return gMenu.cursorPos;
@@ -265,13 +266,13 @@ s8 ProcessMenuInput(void)
if (gMain.newKeys & DPAD_UP)
{
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
MoveMenuCursor(-1);
return -2;
}
else if (gMain.newKeys & DPAD_DOWN)
{
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
MoveMenuCursor(1);
return -2;
}
@@ -285,7 +286,7 @@ s8 ProcessMenuInputNoWrap(void)
if (gMain.newKeys & A_BUTTON)
{
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
if (gMenu.menu_field_7)
sub_8072DEC();
return gMenu.cursorPos;
@@ -301,13 +302,13 @@ s8 ProcessMenuInputNoWrap(void)
if (gMain.newKeys & DPAD_UP)
{
if (cursorPos != MoveMenuCursorNoWrap(-1))
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
return -2;
}
else if (gMain.newKeys & DPAD_DOWN)
{
if (cursorPos != MoveMenuCursorNoWrap(1))
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
return -2;
}
@@ -500,7 +501,7 @@ s8 sub_80727CC(void)
{
if (gMenu.menu_field_7)
sub_8072DEC();
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
return GetMenuCursorPos();
}
@@ -513,25 +514,25 @@ s8 sub_80727CC(void)
if (gMain.newKeys & DPAD_UP)
{
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
MoveMenuCursor4(-gMenu.width);
return -2;
}
else if (gMain.newKeys & DPAD_DOWN)
{
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
MoveMenuCursor4(gMenu.width);
return -2;
}
else if (gMain.newKeys & DPAD_LEFT)
{
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
MoveMenuCursor4(-1);
return -2;
}
else if (gMain.newKeys & DPAD_RIGHT)
{
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
MoveMenuCursor4(1);
return -2;
}
diff --git a/src/scrcmd.c b/src/scrcmd.c
index f9b64926c..53262d183 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -8,6 +8,7 @@
#include "main.h"
#include "decoration.h"
#include "field_message_box.h"
+#include "sound.h"
extern void ClearRamScript(void);
extern u16 *GetVarPointer(u16);
@@ -50,16 +51,9 @@ extern void saved_warp2_set_2(s8, s8, s8, s8, s8, s8);
extern void sub_8053690(s8, s8, s8, s8, s8);
extern void sub_80536E4(s8, s8, s8, s8, s8);
extern void sub_805363C(s8, s8, s8, s8, s8);
-extern void audio_play(u16);
-extern bool8 task_is_not_running_overworld_fanfare(void);
-extern bool8 mplay_has_finished_maybe(void);
-extern void fanfare_play(u16);
extern void sav1_set_battle_music_maybe(u16);
extern void sub_8053F84(void);
extern void sub_8053FB0(u16);
-extern void sub_8074FB8(u8);
-extern bool8 sub_8074FD0(void);
-extern void sub_8074FF8(u8);
extern u8 exec_movement(u8, u8, u8, void *);
extern bool8 sub_80A212C(u8, u8, u8);
extern void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8);
@@ -128,8 +122,6 @@ extern void sub_80C4980(u8);
extern u32 FieldEffectStart(u8);
extern bool8 FieldEffectActiveListContains(u8);
extern void sub_8053588(u8);
-extern void sub_8075178(u16, u8);
-extern bool8 sub_8075374(void);
extern void MapGridSetMetatileIdAt(u32, u32, u16);
extern u16 sub_8058790(u32, u32);
extern bool8 task_overworld_door_add_if_role_69_for_opening_door_at(u32, u32);
@@ -904,13 +896,13 @@ bool8 ScrCmd_countpokemon(struct ScriptContext *ctx)
bool8 ScrCmd_playsfx(struct ScriptContext *ctx)
{
- audio_play(ScriptReadHalfword(ctx));
+ PlaySE(ScriptReadHalfword(ctx));
return FALSE;
}
bool8 s30_music_check_asm()
{
- if (!mplay_has_finished_maybe())
+ if (!IsSEPlaying())
return TRUE;
else
return FALSE;
@@ -924,13 +916,13 @@ bool8 ScrCmd_checksound(struct ScriptContext *ctx)
bool8 ScrCmd_fanfare(struct ScriptContext *ctx)
{
- fanfare_play(ScriptReadHalfword(ctx));
+ PlayFanfare(ScriptReadHalfword(ctx));
return FALSE;
}
bool8 s32_fanfare_wait_asm()
{
- return task_is_not_running_overworld_fanfare();
+ return IsFanfareTaskInactive();
}
bool8 ScrCmd_waitfanfare(struct ScriptContext *ctx)
@@ -945,7 +937,7 @@ bool8 ScrCmd_playmusic(struct ScriptContext *ctx)
bool8 val = *(ctx->scriptPtr++);
if (val == TRUE)
sav1_set_battle_music_maybe(songId);
- current_map_music_set(songId);
+ PlayNewMapMusic(songId);
return FALSE;
}
@@ -971,10 +963,10 @@ bool8 ScrCmd_fadeout(struct ScriptContext *ctx)
{
u8 val = *(ctx->scriptPtr++);
if (val)
- sub_8074FB8(4 * val);
+ FadeOutBGMTemporarily(4 * val);
else
- sub_8074FB8(4);
- SetupNativeScript(ctx, sub_8074FD0);
+ FadeOutBGMTemporarily(4);
+ SetupNativeScript(ctx, IsBGMPausedOrStopped);
return TRUE;
}
@@ -982,9 +974,9 @@ bool8 ScrCmd_fadein(struct ScriptContext *ctx)
{
u8 val = *(ctx->scriptPtr++);
if (val)
- sub_8074FF8(4 * val);
+ FadeInBGM(4 * val);
else
- sub_8074FF8(4);
+ FadeInBGM(4);
return FALSE;
}
@@ -1855,13 +1847,13 @@ bool8 ScrCmd_pokecry(struct ScriptContext *ctx)
{
u16 v3 = VarGet(ScriptReadHalfword(ctx));
u16 v5 = VarGet(ScriptReadHalfword(ctx));
- sub_8075178(v3, v5);
+ PlayCry5(v3, v5);
return FALSE;
}
bool8 ScrCmd_waitpokecry(struct ScriptContext *ctx)
{
- SetupNativeScript(ctx, sub_8075374);
+ SetupNativeScript(ctx, IsCryFinished);
return TRUE;
}
@@ -1888,7 +1880,7 @@ bool8 ScrCmd_setdooropened(struct ScriptContext *ctx)
v3 += 7;
v4 += 7;
v7 = sub_8058790(v3, v4);
- audio_play(v7);
+ PlaySE(v7);
task_overworld_door_add_if_role_69_for_opening_door_at(v3, v4);
return FALSE;
}
diff --git a/src/sound.c b/src/sound.c
index 141902b1f..2a861839c 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1,6 +1,8 @@
#include "global.h"
#include "gba/m4a_internal.h"
#include "task.h"
+#include "sound.h"
+#include "songs.h"
struct Fanfare
{
@@ -10,27 +12,23 @@ struct Fanfare
extern u32 speciesid_conv(u32);
-void sound_sources_off(void);
-
-void map_music_set_to_zero(void);
-
extern u16 gUnknown_020239F8;
-extern struct MusicPlayerInfo *gUnknown_0202F79C;
-extern u8 gUnknown_0202F7A0;
+extern struct MusicPlayerInfo *gMPlay_PokemonCry;
+extern u8 gPokemonCryBGMDuckingCounter;
-extern u16 gUnknown_030006D4;
-extern u16 gUnknown_030006D6;
-extern u8 gUnknown_030006D8;
-extern u8 gUnknown_030006D9;
-extern u16 gUnknown_030006DA;
+static u16 sCurrentMapMusic;
+static u16 sNextMapMusic;
+static u8 sMapMusicState;
+static u8 sMapMusicFadeInSpeed;
+static u16 sFanfareCounter;
-extern u8 gUnknown_03004AEC;
-extern struct MusicPlayerInfo gUnknown_03007380;
-extern struct MusicPlayerInfo gUnknown_030073C0;
-extern struct MusicPlayerInfo gUnknown_03007400;
-extern struct MusicPlayerInfo gUnknown_03007450;
+extern bool8 gDisableMusic;
+extern struct MusicPlayerInfo gMPlay_BGM;
+extern struct MusicPlayerInfo gMPlay_SE1;
+extern struct MusicPlayerInfo gMPlay_SE2;
+extern struct MusicPlayerInfo gMPlay_SE3;
-extern struct Fanfare gUnknown_0837DEF4[];
+extern struct Fanfare gFanfares[];
extern struct ToneData voicegroup_8452590[];
extern struct ToneData voicegroup_8452B90[];
@@ -42,333 +40,325 @@ extern struct ToneData voicegroup_8453DC0[];
extern struct ToneData voicegroup_84543C0[];
extern struct ToneData voicegroup_84549C0[];
-u8 sub_8075028(void);
-u8 task_is_not_running_overworld_fanfare(void);
-u8 sub_8074E14(void);
-void sub_8074F6C(u16, u8);
-void task50_overworld_fanfare(u8);
-void task_add_50_overworld_fanfare_if_not_running(void);
-void play_sound_effect(u8);
-void sub_80751C0(u16 species, s8 a2, s8 a3, u8 a4, u8 a5);
-void sub_8075408(u8);
-void sub_8075450(void);
-void sub_8075474(u16);
+static void Task_Fanfare(u8 taskId);
+static void CreateFanfareTask(void);
+static void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode);
+static void Task_DuckBGMForPokemonCry(u8 taskId);
+static void RestoreBGMVolumeAfterPokemonCry(void);
-void sound_sources_off(void)
+void InitMapMusic(void)
{
- gUnknown_03004AEC = 0;
- map_music_set_to_zero();
+ gDisableMusic = FALSE;
+ ResetMapMusic();
}
-void sound_something(void)
+void MapMusicMain(void)
{
- switch (gUnknown_030006D8)
+ switch (sMapMusicState)
{
case 0:
break;
case 1:
- gUnknown_030006D8 = 2;
- sub_8075474(gUnknown_030006D4);
+ sMapMusicState = 2;
+ PlayBGM(sCurrentMapMusic);
break;
case 2:
case 3:
case 4:
break;
case 5:
- if (sub_8075028())
+ if (IsBGMStopped())
{
- gUnknown_030006D6 = 0;
- gUnknown_030006D8 = 0;
+ sNextMapMusic = 0;
+ sMapMusicState = 0;
}
break;
case 6:
- if (sub_8075028() && task_is_not_running_overworld_fanfare())
+ if (IsBGMStopped() && IsFanfareTaskInactive())
{
- gUnknown_030006D4 = gUnknown_030006D6;
- gUnknown_030006D6 = 0;
- gUnknown_030006D8 = 2;
- sub_8075474(gUnknown_030006D4);
+ sCurrentMapMusic = sNextMapMusic;
+ sNextMapMusic = 0;
+ sMapMusicState = 2;
+ PlayBGM(sCurrentMapMusic);
}
break;
case 7:
- if (sub_8075028() && task_is_not_running_overworld_fanfare())
+ if (IsBGMStopped() && IsFanfareTaskInactive())
{
- sub_8074F6C(gUnknown_030006D6, gUnknown_030006D9);
- gUnknown_030006D4 = gUnknown_030006D6;
- gUnknown_030006D6 = 0;
- gUnknown_030006D8 = 2;
- gUnknown_030006D9 = 0;
+ FadeInNewBGM(sNextMapMusic, sMapMusicFadeInSpeed);
+ sCurrentMapMusic = sNextMapMusic;
+ sNextMapMusic = 0;
+ sMapMusicState = 2;
+ sMapMusicFadeInSpeed = 0;
}
break;
}
}
-void map_music_set_to_zero(void)
+void ResetMapMusic(void)
{
- gUnknown_030006D4 = 0;
- gUnknown_030006D6 = 0;
- gUnknown_030006D8 = 0;
- gUnknown_030006D9 = 0;
+ sCurrentMapMusic = 0;
+ sNextMapMusic = 0;
+ sMapMusicState = 0;
+ sMapMusicFadeInSpeed = 0;
}
-u16 current_map_music_get(void)
+u16 GetCurrentMapMusic(void)
{
- return gUnknown_030006D4;
+ return sCurrentMapMusic;
}
-void current_map_music_set(u16 a1)
+void PlayNewMapMusic(u16 songNum)
{
- gUnknown_030006D4 = a1;
- gUnknown_030006D6 = 0;
- gUnknown_030006D8 = 1;
+ sCurrentMapMusic = songNum;
+ sNextMapMusic = 0;
+ sMapMusicState = 1;
}
-void sub_8074D08(void)
+void StopMapMusic(void)
{
- gUnknown_030006D4 = 0;
- gUnknown_030006D6 = 0;
- gUnknown_030006D8 = 1;
+ sCurrentMapMusic = 0;
+ sNextMapMusic = 0;
+ sMapMusicState = 1;
}
-void sub_8074D28(u8 a1)
+void FadeOutMapMusic(u8 speed)
{
- if (sub_8074E14())
- play_sound_effect(a1);
- gUnknown_030006D4 = 0;
- gUnknown_030006D6 = 0;
- gUnknown_030006D8 = 5;
+ if (IsNotWaitingForBGMStop())
+ FadeOutBGM(speed);
+ sCurrentMapMusic = 0;
+ sNextMapMusic = 0;
+ sMapMusicState = 5;
}
-void sub_8074D60(u16 a1, u8 a2)
+void FadeOutAndPlayNewMapMusic(u16 songNum, u8 speed)
{
- sub_8074D28(a2);
- gUnknown_030006D4 = 0;
- gUnknown_030006D6 = a1;
- gUnknown_030006D8 = 6;
+ FadeOutMapMusic(speed);
+ sCurrentMapMusic = 0;
+ sNextMapMusic = songNum;
+ sMapMusicState = 6;
}
-void sub_8074D94(u16 a1, u8 a2, u8 a3)
+void FadeOutAndFadeInNewMapMusic(u16 songNum, u8 fadeOutSpeed, u8 fadeInSpeed)
{
- sub_8074D28(a2);
- gUnknown_030006D4 = 0;
- gUnknown_030006D6 = a1;
- gUnknown_030006D8 = 7;
- gUnknown_030006D9 = a3;
+ FadeOutMapMusic(fadeOutSpeed);
+ sCurrentMapMusic = 0;
+ sNextMapMusic = songNum;
+ sMapMusicState = 7;
+ sMapMusicFadeInSpeed = fadeInSpeed;
}
-void unref_sub_8074DD8(u16 a1, u8 a2)
+void FadeInNewMapMusic(u16 songNum, u8 speed)
{
- sub_8074F6C(a1, a2);
- gUnknown_030006D4 = a1;
- gUnknown_030006D6 = 0;
- gUnknown_030006D8 = 2;
- gUnknown_030006D9 = 0;
+ FadeInNewBGM(songNum, speed);
+ sCurrentMapMusic = songNum;
+ sNextMapMusic = 0;
+ sMapMusicState = 2;
+ sMapMusicFadeInSpeed = 0;
}
-bool8 sub_8074E14(void)
+bool8 IsNotWaitingForBGMStop(void)
{
- if (gUnknown_030006D8 == 6)
+ if (sMapMusicState == 6)
return FALSE;
- if (gUnknown_030006D8 == 5)
+ if (sMapMusicState == 5)
return FALSE;
- if (gUnknown_030006D8 == 7)
+ if (sMapMusicState == 7)
return FALSE;
return TRUE;
}
-void pause_music_for_sound_maybe(u8 a1)
+void PlayFanfareByFanfareNum(u8 fanfareNum)
{
struct Fanfare *fanfares;
struct Fanfare *fanfare;
u16 songNum;
- m4aMPlayStop(&gUnknown_03007380);
- fanfares = gUnknown_0837DEF4;
- fanfare = &fanfares[a1];
+ m4aMPlayStop(&gMPlay_BGM);
+ fanfares = gFanfares;
+ fanfare = &fanfares[fanfareNum];
songNum = fanfare->songNum;
- gUnknown_030006DA = fanfare->duration;
+ sFanfareCounter = fanfare->duration;
m4aSongNumStart(songNum);
}
-bool8 ducking_tick(u8 a1)
+bool8 WaitFanfare(bool8 stop)
{
- if (gUnknown_030006DA)
+ if (sFanfareCounter)
{
- gUnknown_030006DA--;
+ sFanfareCounter--;
return FALSE;
}
else
{
- if (!a1)
- m4aMPlayContinue(&gUnknown_03007380);
+ if (!stop)
+ m4aMPlayContinue(&gMPlay_BGM);
else
- m4aSongNumStart(0);
-
+ m4aSongNumStart(SE_STOP);
+
return TRUE;
}
}
-void unref_sub_8074EA4(u8 a1)
+void StopFanfareByFanfareNum(u8 fanfareNum)
{
- m4aSongNumStop(gUnknown_0837DEF4[a1].songNum);
+ m4aSongNumStop(gFanfares[fanfareNum].songNum);
}
-void fanfare_play(u16 a1)
+void PlayFanfare(u16 songNum)
{
s32 i;
for (i = 0; (u32)i < 12; i++)
{
- struct Fanfare *fanfare = &gUnknown_0837DEF4[i];
- if (fanfare->songNum == a1)
+ struct Fanfare *fanfare = &gFanfares[i];
+ if (fanfare->songNum == songNum)
{
- pause_music_for_sound_maybe(i);
- task_add_50_overworld_fanfare_if_not_running();
+ PlayFanfareByFanfareNum(i);
+ CreateFanfareTask();
return;
}
}
- pause_music_for_sound_maybe(0);
- task_add_50_overworld_fanfare_if_not_running();
+ PlayFanfareByFanfareNum(0);
+ CreateFanfareTask();
}
-bool8 task_is_not_running_overworld_fanfare(void)
+bool8 IsFanfareTaskInactive(void)
{
- if (FuncIsActiveTask(task50_overworld_fanfare) == TRUE)
+ if (FuncIsActiveTask(Task_Fanfare) == TRUE)
return FALSE;
return TRUE;
}
-void task50_overworld_fanfare(u8 taskId)
+static void Task_Fanfare(u8 taskId)
{
- if (gUnknown_030006DA)
+ if (sFanfareCounter)
{
- gUnknown_030006DA--;
+ sFanfareCounter--;
}
else
{
- m4aMPlayContinue(&gUnknown_03007380);
+ m4aMPlayContinue(&gMPlay_BGM);
DestroyTask(taskId);
}
}
-void task_add_50_overworld_fanfare_if_not_running(void)
+static void CreateFanfareTask(void)
{
- if (FuncIsActiveTask(task50_overworld_fanfare) != TRUE)
- CreateTask(task50_overworld_fanfare, 80);
+ if (FuncIsActiveTask(Task_Fanfare) != TRUE)
+ CreateTask(Task_Fanfare, 80);
}
-void sub_8074F6C(u16 a1, u8 a2)
+void FadeInNewBGM(u16 songNum, u8 speed)
{
- if (gUnknown_03004AEC)
- a1 = 0;
- m4aSongNumStart(a1);
- m4aMPlayImmInit(&gUnknown_03007380);
- m4aMPlayVolumeControl(&gUnknown_03007380, 0xFFFF, 0);
- m4aSongNumStop(a1);
- sub_81DE0F0(&gUnknown_03007380, a2);
+ if (gDisableMusic)
+ songNum = 0;
+ m4aSongNumStart(songNum);
+ m4aMPlayImmInit(&gMPlay_BGM);
+ m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 0);
+ m4aSongNumStop(songNum);
+ m4aMPlayFadeIn(&gMPlay_BGM, speed);
}
-void sub_8074FB8(u8 a1)
+void FadeOutBGMTemporarily(u8 speed)
{
- sub_81DE0D0(&gUnknown_03007380, a1);
+ m4aMPlayFadeOutTemporarily(&gMPlay_BGM, speed);
}
-bool8 sub_8074FD0(void)
+bool8 IsBGMPausedOrStopped(void)
{
- if (gUnknown_03007380.status & MUSICPLAYER_STATUS_PAUSE)
+ if (gMPlay_BGM.status & MUSICPLAYER_STATUS_PAUSE)
return TRUE;
- if (!(gUnknown_03007380.status & MUSICPLAYER_STATUS_TRACK))
+ if (!(gMPlay_BGM.status & MUSICPLAYER_STATUS_TRACK))
return TRUE;
return FALSE;
}
-void sub_8074FF8(u8 a1)
+void FadeInBGM(u8 speed)
{
- sub_81DE0F0(&gUnknown_03007380, a1);
+ m4aMPlayFadeIn(&gMPlay_BGM, speed);
}
-void play_sound_effect(u8 a1)
+void FadeOutBGM(u8 speed)
{
- m4aMPlayFadeOut(&gUnknown_03007380, a1);
+ m4aMPlayFadeOut(&gMPlay_BGM, speed);
}
-bool8 sub_8075028(void)
+bool8 IsBGMStopped(void)
{
- if (!(gUnknown_03007380.status & MUSICPLAYER_STATUS_TRACK))
+ if (!(gMPlay_BGM.status & MUSICPLAYER_STATUS_TRACK))
return TRUE;
return FALSE;
}
-void cry_related(u16 a1, u8 a2)
+void PlayCry1(u16 species, s8 pan)
{
- m4aMPlayVolumeControl(&gUnknown_03007380, 0xFFFF, 85);
- sub_80751C0(a1, a2, 0x7D, 0xA, 0);
- gUnknown_0202F7A0 = 2;
- sub_8075450();
+ m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85);
+ PlayCryInternal(species, pan, 125, 10, 0);
+ gPokemonCryBGMDuckingCounter = 2;
+ RestoreBGMVolumeAfterPokemonCry();
}
-void sub_8075090(u16 a1, s8 a2, s8 a3, u8 a4)
+void PlayCry2(u16 species, s8 pan, s8 volume, u8 priority)
{
- sub_80751C0(a1, a2, a3, a4, 0);
+ PlayCryInternal(species, pan, volume, priority, 0);
}
-void sub_80750B4(u16 a1, s8 a2, u8 a3)
+void PlayCry3(u16 species, s8 pan, u8 mode)
{
- if (a3 == 1)
+ if (mode == 1)
{
- sub_80751C0(a1, a2, 0x7D, 0xA, 1);
+ PlayCryInternal(species, pan, 125, 10, 1);
}
else
{
- m4aMPlayVolumeControl(&gUnknown_03007380, 0xFFFF, 85);
- sub_80751C0(a1, a2, 0x7D, 0xA, a3);
- gUnknown_0202F7A0 = 2;
- sub_8075450();
+ m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85);
+ PlayCryInternal(species, pan, 125, 10, mode);
+ gPokemonCryBGMDuckingCounter = 2;
+ RestoreBGMVolumeAfterPokemonCry();
}
}
-void sub_8075114(u16 a1, s8 a2, u8 a3)
+void PlayCry4(u16 species, s8 pan, u8 mode)
{
- if (a3 == 1)
+ if (mode == 1)
{
- sub_80751C0(a1, a2, 0x7D, 0xA, 1);
+ PlayCryInternal(species, pan, 125, 10, 1);
}
else
{
if (!(gUnknown_020239F8 & 0x40))
- m4aMPlayVolumeControl(&gUnknown_03007380, 0xFFFF, 85);
- sub_80751C0(a1, a2, 0x7D, 0xA, a3);
+ m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85);
+ PlayCryInternal(species, pan, 125, 10, mode);
}
}
-void sub_8075178(u16 a1, u8 a2)
+void PlayCry5(u16 species, u8 mode)
{
- m4aMPlayVolumeControl(&gUnknown_03007380, 0xFFFF, 85);
- sub_80751C0(a1, 0, 0x7D, 0xA, a2);
- gUnknown_0202F7A0 = 2;
- sub_8075450();
+ m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 85);
+ PlayCryInternal(species, 0, 125, 10, mode);
+ gPokemonCryBGMDuckingCounter = 2;
+ RestoreBGMVolumeAfterPokemonCry();
}
#define GET_CRY_PTR(a, b)\
{\
- u32 ptr1;\
- struct MusicPlayerInfo *ptr2;\
+ struct ToneData *tone;\
if (v0)\
- ptr1 = (u32)&a[index];\
+ tone = &a[index];\
else\
- ptr1 = (u32)&b[index];\
- ptr2 = sub_81DF43C(ptr1);\
- gUnknown_0202F79C = ptr2;\
+ tone = &b[index];\
+ gMPlay_PokemonCry = SetPokemonCryTone(tone);\
break;\
}
-void sub_80751C0(u16 species, s8 a2, s8 a3, u8 a4, u8 a5)
+static void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode)
{
u32 cryId;
u32 v0;
- u32 v1;
- u32 v2;
- u32 v3;
- u32 v4;
+ u32 release;
+ u32 length;
+ u32 pitch;
+ u32 chorus;
u32 index;
u8 table;
@@ -377,50 +367,50 @@ void sub_80751C0(u16 species, s8 a2, s8 a3, u8 a4, u8 a5)
cryId = species;
v0 = 0;
- v1 = 0;
- v2 = 140;
- v3 = 15360;
- v4 = 0;
+ release = 0;
+ length = 140;
+ pitch = 15360;
+ chorus = 0;
- switch (a5)
+ switch (mode)
{
case 0:
break;
case 1:
- v2 = 20;
- v1 = 225;
+ length = 20;
+ release = 225;
break;
case 2:
- v2 = 30;
- v1 = 225;
- v3 = 15600;
- v4 = 20;
- a3 = 80;
+ length = 30;
+ release = 225;
+ pitch = 15600;
+ chorus = 20;
+ volume = 80;
break;
case 3:
- v2 = 50;
- v1 = 200;
- v3 = 14800;
+ length = 50;
+ release = 200;
+ pitch = 14800;
break;
case 4:
- v2 = 20;
- v1 = 220;
- v3 = 15800;
+ length = 20;
+ release = 220;
+ pitch = 15800;
break;
case 5:
- v1 = 200;
- v3 = 14500;
+ release = 200;
+ pitch = 14500;
break;
}
- sub_81DF50C(a3);
- sub_81DF520(a2);
- sub_81DF538(v3);
- sub_81DF570(v2);
- sub_81DF588(0);
- sub_81DF57C(v1);
- sub_81DF5AC(v4);
- sub_81DF618(a4);
+ SetPokemonCryVolume(volume);
+ SetPokemonCryPanpot(pan);
+ SetPokemonCryPitch(pitch);
+ SetPokemonCryLength(length);
+ SetPokemonCryProgress(0);
+ SetPokemonCryRelease(release);
+ SetPokemonCryChorus(chorus);
+ SetPokemonCryPriority(priority);
asm("");
asm("");
@@ -445,9 +435,9 @@ void sub_80751C0(u16 species, s8 a2, s8 a3, u8 a4, u8 a5)
}
}
-bool8 sub_8075374(void)
+bool8 IsCryFinished(void)
{
- if (FuncIsActiveTask(sub_8075408) == TRUE)
+ if (FuncIsActiveTask(Task_DuckBGMForPokemonCry) == TRUE)
{
return FALSE;
}
@@ -458,20 +448,20 @@ bool8 sub_8075374(void)
}
}
-void sub_8075398(void)
+void StopCryAndClearCrySongs(void)
{
- m4aMPlayStop(gUnknown_0202F79C);
+ m4aMPlayStop(gMPlay_PokemonCry);
ClearPokemonCrySongs();
}
-void sub_80753B0(void)
+void StopCry(void)
{
- m4aMPlayStop(gUnknown_0202F79C);
+ m4aMPlayStop(gMPlay_PokemonCry);
}
-bool8 sub_80753C4(void)
+bool8 IsCryPlayingOrClearCrySongs(void)
{
- if (sub_81DF594(gUnknown_0202F79C))
+ if (IsPokemonCryPlaying(gMPlay_PokemonCry))
{
return TRUE;
}
@@ -482,97 +472,97 @@ bool8 sub_80753C4(void)
}
}
-bool8 sub_80753E8(void)
+bool8 IsCryPlaying(void)
{
- if (sub_81DF594(gUnknown_0202F79C))
+ if (IsPokemonCryPlaying(gMPlay_PokemonCry))
return TRUE;
else
return FALSE;
}
-void sub_8075408(u8 taskId)
+static void Task_DuckBGMForPokemonCry(u8 taskId)
{
- if (gUnknown_0202F7A0)
+ if (gPokemonCryBGMDuckingCounter)
{
- gUnknown_0202F7A0--;
+ gPokemonCryBGMDuckingCounter--;
}
- else if (!sub_81DF594(gUnknown_0202F79C))
+ else if (!IsPokemonCryPlaying(gMPlay_PokemonCry))
{
- m4aMPlayVolumeControl(&gUnknown_03007380, 0xFFFF, 256);
+ m4aMPlayVolumeControl(&gMPlay_BGM, 0xFFFF, 256);
DestroyTask(taskId);
}
}
-void sub_8075450(void)
+static void RestoreBGMVolumeAfterPokemonCry(void)
{
- if (FuncIsActiveTask(sub_8075408) != TRUE)
- CreateTask(sub_8075408, 80);
+ if (FuncIsActiveTask(Task_DuckBGMForPokemonCry) != TRUE)
+ CreateTask(Task_DuckBGMForPokemonCry, 80);
}
-void sub_8075474(u16 a1)
+void PlayBGM(u16 songNum)
{
- if (gUnknown_03004AEC)
- a1 = 0;
- m4aSongNumStart(a1);
+ if (gDisableMusic)
+ songNum = 0;
+ m4aSongNumStart(songNum);
}
-void audio_play(u16 songNum)
+void PlaySE(u16 songNum)
{
m4aSongNumStart(songNum);
}
-void audio_play_and_stuff(u16 a1, u8 a2)
+void PlaySE12WithPanning(u16 songNum, u8 pan)
{
- m4aSongNumStart(a1);
- m4aMPlayImmInit(&gUnknown_030073C0);
- m4aMPlayImmInit(&gUnknown_03007400);
- m4aMPlayPanpotControl(&gUnknown_030073C0, 0xFFFF, a2);
- m4aMPlayPanpotControl(&gUnknown_03007400, 0xFFFF, a2);
+ m4aSongNumStart(songNum);
+ m4aMPlayImmInit(&gMPlay_SE1);
+ m4aMPlayImmInit(&gMPlay_SE2);
+ m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan);
+ m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan);
}
-void sub_80754F8(u16 a1, u8 a2)
+void PlaySE1WithPanning(u16 songNum, u8 pan)
{
- m4aSongNumStart(a1);
- m4aMPlayImmInit(&gUnknown_030073C0);
- m4aMPlayPanpotControl(&gUnknown_030073C0, 0xFFFF, a2);
+ m4aSongNumStart(songNum);
+ m4aMPlayImmInit(&gMPlay_SE1);
+ m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan);
}
-void sub_807552C(u16 a1, u8 a2)
+void PlaySE2WithPanning(u16 songNum, u8 pan)
{
- m4aSongNumStart(a1);
- m4aMPlayImmInit(&gUnknown_03007400);
- m4aMPlayPanpotControl(&gUnknown_03007400, 0xFFFF, a2);
+ m4aSongNumStart(songNum);
+ m4aMPlayImmInit(&gMPlay_SE2);
+ m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan);
}
-void sub_8075560(u8 a1)
+void SE12PanpotControl(u8 pan)
{
- m4aMPlayPanpotControl(&gUnknown_030073C0, 0xFFFF, a1);
- m4aMPlayPanpotControl(&gUnknown_03007400, 0xFFFF, a1);
+ m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, pan);
+ m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, pan);
}
-bool8 mplay_has_finished_maybe(void)
+bool8 IsSEPlaying(void)
{
- if ((gUnknown_030073C0.status & MUSICPLAYER_STATUS_PAUSE) && (gUnknown_03007400.status & MUSICPLAYER_STATUS_PAUSE))
+ if ((gMPlay_SE1.status & MUSICPLAYER_STATUS_PAUSE) && (gMPlay_SE2.status & MUSICPLAYER_STATUS_PAUSE))
return FALSE;
- if (!(gUnknown_030073C0.status & MUSICPLAYER_STATUS_TRACK) && !(gUnknown_03007400.status & MUSICPLAYER_STATUS_TRACK))
+ if (!(gMPlay_SE1.status & MUSICPLAYER_STATUS_TRACK) && !(gMPlay_SE2.status & MUSICPLAYER_STATUS_TRACK))
return FALSE;
return TRUE;
}
-bool8 sub_80755D4(void)
+bool8 IsBGMPlaying(void)
{
- if (gUnknown_03007380.status & MUSICPLAYER_STATUS_PAUSE)
+ if (gMPlay_BGM.status & MUSICPLAYER_STATUS_PAUSE)
return FALSE;
- if (!(gUnknown_03007380.status & MUSICPLAYER_STATUS_TRACK))
+ if (!(gMPlay_BGM.status & MUSICPLAYER_STATUS_TRACK))
return FALSE;
return TRUE;
}
-bool8 sub_80755FC(void)
+bool8 IsSpecialSEPlaying(void)
{
- if (gUnknown_03007450.status & MUSICPLAYER_STATUS_PAUSE)
+ if (gMPlay_SE3.status & MUSICPLAYER_STATUS_PAUSE)
return FALSE;
- if (!(gUnknown_03007450.status & MUSICPLAYER_STATUS_TRACK))
+ if (!(gMPlay_SE3.status & MUSICPLAYER_STATUS_TRACK))
return FALSE;
return TRUE;
}
diff --git a/src/text.c b/src/text.c
index 6ed91fc2e..fe284328f 100644
--- a/src/text.c
+++ b/src/text.c
@@ -4,6 +4,7 @@
#include "string_util.h"
#include "songs.h"
#include "palette.h"
+#include "sound.h"
enum
{
@@ -63,10 +64,6 @@ struct ShiftAmount
u32 right;
};
-extern void sub_8075474(u16);
-extern void audio_play(u16);
-extern u8 mplay_has_finished_maybe(void);
-
static u16 InitVariableWidthFontTileData(struct Window *, u16);
static u16 LoadFixedWidthFont(struct Window *, u16);
static u16 LoadFixedWidthFont_Font1Latin(struct Window *, u16);
@@ -2178,7 +2175,7 @@ static u8 ExtCtrlCode_PlayBGM(struct Window *win)
{
u16 loByte = win->text[win->textIndex++];
u16 hiByte = win->text[win->textIndex++] << 8;
- sub_8075474(loByte | hiByte);
+ PlayBGM(loByte | hiByte);
return 2;
}
@@ -2210,7 +2207,7 @@ static u8 ExtCtrlCode_PlaySE(struct Window *win)
{
u16 loByte = win->text[win->textIndex++];
u16 hiByte = win->text[win->textIndex++] << 8;
- audio_play(loByte | hiByte);
+ PlaySE(loByte | hiByte);
return 2;
}
@@ -2386,7 +2383,7 @@ static u8 UpdateWindowText(struct Window *win)
{
if (gMain.newKeys & (A_BUTTON | B_BUTTON))
{
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
}
else
{
@@ -2445,7 +2442,7 @@ static u8 UpdateWindowText(struct Window *win)
ClearWindowTextLines(win);
break;
case WIN_STATE_WAIT_SOUND:
- if (mplay_has_finished_maybe())
+ if (IsSEPlaying())
return 0;
win->state = WIN_STATE_NORMAL;
break;
@@ -3192,7 +3189,7 @@ static u8 WaitWithDownArrow(struct Window *win)
{
if (gMain.newKeys & (A_BUTTON | B_BUTTON))
{
- audio_play(SE_SELECT);
+ PlaySE(SE_SELECT);
TryEraseDownArrow(win);
}
else
diff --git a/sym_bss.txt b/sym_bss.txt
index 8cae646bb..7947be078 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -119,20 +119,7 @@ gUnknown_030006CC: @ 30006CC
gUnknown_030006D0: @ 30006D0
.space 0x4
-gUnknown_030006D4: @ 30006D4
- .space 0x2
-
-gUnknown_030006D6: @ 30006D6
- .space 0x2
-
-gUnknown_030006D8: @ 30006D8
- .space 0x1
-
-gUnknown_030006D9: @ 30006D9
- .space 0x1
-
-gUnknown_030006DA: @ 30006DA
- .space 0x2
+ .include "src/sound.o"
gUnknown_030006DC: @ 30006DC
.space 0x4
diff --git a/sym_common.txt b/sym_common.txt
index 880659b18..2345f833c 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -206,7 +206,7 @@ gUnknown_03004AE4: @ 3004AE4
gUnknown_03004AE8: @ 3004AE8
.space 0x4
-gUnknown_03004AEC: @ 3004AEC
+gDisableMusic: @ 3004AEC
.space 0x4
gUnknown_03004AF0: @ 3004AF0
@@ -419,19 +419,19 @@ gUnknown_03005FA0: @ 3005FA0
.include "m4a_2.o"
.align 4
-gUnknown_03007380: @ 3007380
+gMPlay_BGM: @ 3007380
.space 0x40
-gUnknown_030073C0: @ 30073C0
+gMPlay_SE1: @ 30073C0
.space 0x40
-gUnknown_03007400: @ 3007400
+gMPlay_SE2: @ 3007400
.space 0x40
gMPlayMemAccArea: @ 3007440
.space 0x10
-gUnknown_03007450: @ 3007450
+gMPlay_SE3: @ 3007450
.space 0x40
.include "agb_flash.o"
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 048e35173..f57774309 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -484,10 +484,10 @@ gUnknown_0202E9D8: @ 202E9D8
.include "src/palette.o"
.align 2
-gUnknown_0202F79C: @ 202F79C
+gMPlay_PokemonCry: @ 202F79C
.space 0x4
-gUnknown_0202F7A0: @ 202F7A0
+gPokemonCryBGMDuckingCounter: @ 202F7A0
.space 0x4
gUnknown_0202F7A4: @ 202F7A4
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 22:30:43 +0000