diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-07-25 13:23:02 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-07-25 13:23:02 -0400 |
| commit | 5e0e326b75402a36c4d31502b8b5a05b862ac23c (patch) | |
| tree | 1b5807c1efb72dbdd9d01f329cefb41171913a64 /arm9/modules/18 | |
| parent | 1f9d4503c898f9138422215132b53224571a281a (diff) | |
| parent | 68d7aa47cc52ef822220e0e35890863d7cad479f (diff) | |
Merge remote-tracking branch 'origin/master' into pikalax_work
Diffstat (limited to 'arm9/modules/18')
| -rw-r--r-- | arm9/modules/18/asm/module_18.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index e75f620e..f30d7e23 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -405,7 +405,7 @@ MOD18_02239994: ; 0x02239994 ldr r0, [r0] ldr r0, [r0] ldr r0, [r0, #0x28] - bl FUN_020344FC + bl MapMatrix_GetWidth sub r0, r0, #2 lsl r0, r0, #0x15 lsr r6, r0, #0x10 @@ -413,7 +413,7 @@ MOD18_02239994: ; 0x02239994 ldr r0, [r0] ldr r0, [r0] ldr r0, [r0, #0x28] - bl FUN_0203450C + bl MapMatrix_GetHeight sub r0, r0, #2 lsl r0, r0, #0x15 lsr r4, r0, #0x10 @@ -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] |