diff options
Diffstat (limited to 'arm9/modules')
-rw-r--r-- | arm9/modules/12/asm/module_12.s | 2 | ||||
-rw-r--r-- | arm9/modules/16/asm/module_16.s | 26 | ||||
-rw-r--r-- | arm9/modules/18/asm/module_18.s | 4 | ||||
-rw-r--r-- | arm9/modules/56/asm/module_56.s | 2 | ||||
-rw-r--r-- | arm9/modules/57/asm/module_57.s | 10 | ||||
-rw-r--r-- | arm9/modules/60/asm/module_60.s | 4 |
6 files changed, 24 insertions, 24 deletions
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 53833b86..0df8207d 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -5564,7 +5564,7 @@ MOD12_022303C0: ; 0x022303C0 str r2, [r4, r0] mov r0, #7 str r1, [r3, #4] - bl FUN_02004F64 + bl GF_SndPlayerGetTick ldr r1, _02230498 ; =0x00000AF8 ldr r1, [r4, r1] mul r0, r1 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 73e8460b..16b3c00d 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -71,7 +71,7 @@ _021D7546: str r0, [r4] mov r0, #1 mov r1, #0x2a - bl FUN_020051EC + bl GF_SndPlayerSetPlayerVolume mov r0, #1 add sp, #0x20 pop {r3, r4, r5, pc} @@ -171,7 +171,7 @@ _021D7630: bl DestroyHeap mov r0, #1 mov r1, #0x7f - bl FUN_020051EC + bl GF_SndPlayerSetPlayerVolume mov r0, #1 pop {r4, pc} thumb_func_end MOD16_021D7614 @@ -44271,7 +44271,7 @@ _021EBCD4: cmp r0, #1 bne _021EBCE6 mov r0, #0 - bl FUN_02004CA4 + bl GF_SndCaptureStopReverb _021EBCE6: ldr r0, [r4, #0x50] cmp r0, #2 @@ -44291,13 +44291,13 @@ _021EBD02: ldr r0, [r4, #0x50] cmp r0, #2 bne _021EBD0C - bl FUN_02004CFC + bl GF_SndCaptureStopEffect _021EBD0C: ldr r0, [r4, #0x50] cmp r0, #1 beq _021EBD1C mov r0, #0 - bl FUN_02004C80 + bl GF_SndCaptureStartReverb mov r0, #1 str r0, [r4, #0x50] _021EBD1C: @@ -44316,7 +44316,7 @@ _021EBD26: sub r0, r0, #1 _021EBD34: mov r1, #0 - bl FUN_02004CAC + bl GF_SndCaptureSetReverbVolume pop {r4, pc} thumb_func_end MOD16_021EBCC4 @@ -44710,12 +44710,12 @@ MOD16_021EC010: ; 0x021EC010 cmp r0, #1 bne _021EC020 mov r0, #0 - bl FUN_02004CA4 + bl GF_SndCaptureStopReverb _021EC020: ldr r0, [r4, #0x50] cmp r0, #2 bne _021EC02A - bl FUN_02004CFC + bl GF_SndCaptureStopEffect _021EC02A: mov r0, #0 str r0, [r4, #0x50] @@ -44855,7 +44855,7 @@ MOD16_021EC0E8: ; 0x021EC0E8 ldr r1, _021EC10C ; =0x0000FFFF ldr r2, [r4, #0x40] mov r0, #1 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan ldr r0, [r4, #0x44] bl MOD16_021EC110 _021EC108: @@ -44866,13 +44866,13 @@ _021EC10C: .word 0x0000FFFF thumb_func_start MOD16_021EC110 MOD16_021EC110: ; 0x021EC110 - ldr r3, _021EC11C ; =FUN_02004828 + ldr r3, _021EC11C ; =GF_SndPlayerMoveVolume add r1, r0, #0 mov r0, #8 mov r2, #0 bx r3 nop -_021EC11C: .word FUN_02004828 +_021EC11C: .word GF_SndPlayerMoveVolume thumb_func_end MOD16_021EC110 thumb_func_start MOD16_021EC120 @@ -44988,12 +44988,12 @@ MOD16_021EC1DC: ; 0x021EC1DC ldr r1, _021EC1F8 ; =0x0000FFFF mov r0, #1 add r2, r4, #0 - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch add r4, #0x14 ldr r1, _021EC1F8 ; =0x0000FFFF mov r0, #8 add r2, r4, #0 - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch pop {r4, pc} .align 2, 0 _021EC1F8: .word 0x0000FFFF diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 85c8a425..d1d70504 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -17263,7 +17263,7 @@ MOD18_02241AD0: ; 0x02241AD0 ldr r2, _02241D24 ; =MOD18_02241AB4 mov r3, #0 mov r0, #2 - bl FUN_02004928 + bl GF_MIC_DoSamplingAsync ldr r0, _02241D28 ; =0x022513A0 ldr r2, [r0, #4] ldr r0, _02241D2C ; =0x00000B3B @@ -20447,7 +20447,7 @@ _02243402: ldr r2, _02243530 ; =MOD18_02241AB4 mov r0, #2 mov r3, #0 - bl FUN_02004928 + bl GF_MIC_DoSamplingAsync ldr r0, [r5, #0x14] add r0, r0, #1 str r0, [r5, #0x14] diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 7e036d8c..61f44b88 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -8528,7 +8528,7 @@ _022161A8: mov r0, #7 mov r1, #0x12 mov r2, #0 - bl FUN_02004828 + bl GF_SndPlayerMoveVolume mov r0, #0x7f mov r1, #0x1e mov r2, #1 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 52ef15ff..bbf164b2 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -225,7 +225,7 @@ _021D76A8: bl FUN_02033F20 mov r0, #1 mov r1, #0x2a - bl FUN_020051EC + bl GF_SndPlayerSetPlayerVolume mov r0, #6 str r0, [sp] mov r0, #1 @@ -564,7 +564,7 @@ MOD57_021D7944: ; 0x021D7944 bl DestroyHeap mov r0, #1 mov r1, #0x7f - bl FUN_020051EC + bl GF_SndPlayerSetPlayerVolume mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -4129,7 +4129,7 @@ _021D95FE: beq _021D9612 ldrb r0, [r5] add r0, r0, #3 - bl FUN_020048BC + bl GF_SndPlayerCountPlayingSeqByPlayerNo cmp r0, #0 bne _021D9612 strb r6, [r5, #1] @@ -4279,7 +4279,7 @@ MOD57_021D96F4: ; 0x021D96F4 add r4, r1, #0 ldr r2, _021D9720 ; =0x00000694 add r1, r0, #0 - bl FUN_020048A0 + bl GF_SndArcPlayerStartSeqEx ldr r2, _021D9724 ; =0x021D9A00 lsl r3, r4, #1 ldrh r2, [r2, r3] @@ -4290,7 +4290,7 @@ MOD57_021D96F4: ; 0x021D96F4 ldr r1, _021D9728 ; =0x0000FFFF add r0, r5, #3 sub r2, r2, r3 - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch pop {r4, r5, r6, pc} .align 2, 0 _021D9720: .word 0x00000694 diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index bce93cc6..6d3eade4 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -205,7 +205,7 @@ _021D7680: ldrh r0, [r4, #0x18] lsl r0, r0, #0x1a lsr r0, r0, #0x1e - bl FUN_02004D60 + bl GF_SndSetMonoFlag ldrh r1, [r4, #0x18] mov r0, #0 lsl r1, r1, #0x16 @@ -1257,7 +1257,7 @@ _021D7F26: add r0, r0, r1 add r0, #0x5e ldrh r0, [r0] - bl FUN_02004D60 + bl GF_SndSetMonoFlag b _021D7F54 _021D7F3C: cmp r0, #4 |