summaryrefslogtreecommitdiff
path: root/asm/rom5.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/rom5.s')
-rw-r--r--asm/rom5.s34
1 files changed, 17 insertions, 17 deletions
diff --git a/asm/rom5.s b/asm/rom5.s
index 104b380ec..faa088118 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -36061,7 +36061,7 @@ _0808C4C4:
ldr r0, _0808C538
ldr r1, _0808C53C
movs r2, 0x80
- bl MPlayVolumeControl
+ bl m4aMPlayVolumeControl
_0808C50C:
add sp, 0x8
pop {r3}
@@ -36964,7 +36964,7 @@ _0808CC7A:
ldr r1, _0808CCC0
movs r2, 0x80
lsls r2, 1
- bl MPlayVolumeControl
+ bl m4aMPlayVolumeControl
_0808CC9C:
pop {r4-r6}
pop {r0}
@@ -42677,7 +42677,7 @@ _0808FABC:
b _0808FDDC
_0808FACA:
ldr r0, _0808FB0C
- bl MPlayStop_rev01
+ bl m4aMPlayStop
ldr r5, _0808FB10
ldr r0, [r5]
ldr r3, _0808FB14
@@ -71872,7 +71872,7 @@ sub_809E13C: @ 809E13C
ldr r1, _0809E198
movs r2, 0x80
lsls r2, 1
- bl MPlayVolumeControl
+ bl m4aMPlayVolumeControl
ldr r0, [r4, 0x4]
bl SetMainCallback2
adds r0, r5, 0
@@ -108206,7 +108206,7 @@ _080AFDA2:
lsls r2, r3, 24
asrs r2, 16
adds r0, r4, 0
- bl MPlayPitchControl
+ bl m4aMPlayPitchControl
b _080AFE02
.align 2, 0
_080AFDE8: .4byte 0x02038696
@@ -256921,12 +256921,12 @@ _080F80F2:
ldrh r2, [r6, 0x6]
adds r0, r4, 0
adds r1, r5, 0
- bl MPlayVolumeControl
+ bl m4aMPlayVolumeControl
movs r0, 0x8
ldrsh r2, [r6, r0]
adds r0, r4, 0
adds r1, r5, 0
- bl MPlayPitchControl
+ bl m4aMPlayPitchControl
ldrh r0, [r6, 0xA]
adds r0, 0x1
strh r0, [r6, 0xA]
@@ -256957,7 +256957,7 @@ _080F8124:
ldrh r2, [r6, 0x6]
adds r0, r4, 0
adds r1, r5, 0
- bl MPlayVolumeControl
+ bl m4aMPlayVolumeControl
movs r2, 0x80
lsls r2, 2
adds r0, r2, 0
@@ -256968,14 +256968,14 @@ _080F8124:
ldrsh r2, [r6, r0]
adds r0, r4, 0
adds r1, r5, 0
- bl MPlayPitchControl
+ bl m4aMPlayPitchControl
b _080F817A
.align 2, 0
_080F8168: .4byte 0x03007400
_080F816C: .4byte 0x0000ffff
_080F8170:
ldr r0, _080F8180
- bl MPlayStop_rev01
+ bl m4aMPlayStop
movs r0, 0xFF
_080F8178:
strb r0, [r6, 0x3]
@@ -323874,13 +323874,13 @@ _08118790:
lsls r2, 24
asrs r2, 24
adds r1, r4, 0
- bl MPlayPanpotControl
+ bl m4aMPlayPanpotControl
ldr r0, _08118830
ldrh r2, [r6, 0x24]
lsls r2, 24
asrs r2, 24
adds r1, r4, 0
- bl MPlayPanpotControl
+ bl m4aMPlayPanpotControl
_08118818:
pop {r3}
mov r8, r3
@@ -326388,11 +326388,11 @@ sub_8119BCC: @ 8119BCC
asrs r4, 24
adds r1, r5, 0
adds r2, r4, 0
- bl MPlayPanpotControl
+ bl m4aMPlayPanpotControl
ldr r0, _08119C58
adds r1, r5, 0
adds r2, r4, 0
- bl MPlayPanpotControl
+ bl m4aMPlayPanpotControl
b _08119CF6
.align 2, 0
_08119C44: .4byte gUnknown_083FA64A
@@ -410682,7 +410682,7 @@ _08142E98:
ldr r1, _08142EBC
movs r2, 0x80
lsls r2, 1
- bl MPlayVolumeControl
+ bl m4aMPlayVolumeControl
_08142EB2:
ldr r0, _08142EC0
str r0, [r4]
@@ -410705,7 +410705,7 @@ _08142EC4:
ldr r1, _08142EFC
movs r2, 0x80
lsls r2, 1
- bl MPlayVolumeControl
+ bl m4aMPlayVolumeControl
_08142EE6:
ldr r0, _08142F00
lsls r1, r6, 2
@@ -420608,7 +420608,7 @@ sub_8147F08: @ 8147F08
ldr r1, _08147F44
movs r2, 0x80
lsls r2, 1
- bl MPlayVolumeControl
+ bl m4aMPlayVolumeControl
ldr r0, _08147F48
ldr r0, [r0, 0x8]
bl SetMainCallback2