diff options
| author | RoastVeg <RoastVeg@users.noreply.github.com> | 2020-06-20 17:57:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 17:57:41 +0100 |
| commit | 6298426d9ad4c59a875b0a90a0facfa1a3a513cc (patch) | |
| tree | 542386bd071b5b5b5b87ec9ad65668745eabc0c4 /arm9/modules/84 | |
| parent | 53ac396de4098e38a6916e0cc86cbd278a960c4c (diff) | |
| parent | 16b091058e6135f9b7875fcf074d812d610df380 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'arm9/modules/84')
| -rw-r--r-- | arm9/modules/84/asm/module_84.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arm9/modules/84/asm/module_84.s b/arm9/modules/84/asm/module_84.s index 8fd1ddbe..846d8d8a 100644 --- a/arm9/modules/84/asm/module_84.s +++ b/arm9/modules/84/asm/module_84.s @@ -1963,7 +1963,7 @@ MOD84_021D84F8: ; 0x021D84F8 mov r0, #1 lsl r0, r0, #8 mov r1, #0x4b - bl FUN_020219F4 + bl String_ctor str r0, [r4, #0x30] mov r0, #0x4b mov r1, #1 @@ -2032,7 +2032,7 @@ MOD84_021D85B8: ; 0x021D85B8 bl FUN_0200CAB4 _021D85C6: ldr r0, [r4, #0x30] - bl FUN_02021A20 + bl String_dtor ldr r0, [r4, #0x24] bl FUN_02019178 ldr r0, [r4, #0x28] @@ -2076,7 +2076,7 @@ _021D8600: ldr r0, [r5, #0x2c] ldrh r1, [r2, r1] ldr r2, [r5, #0x30] - bl FUN_0200A8E0 + bl ReadMsgDataIntoString ldr r1, [r5, #0xc] mov r0, #6 add r2, r1, #0 @@ -2297,7 +2297,7 @@ _021D87D0: ldr r0, [r5, #0x2c] ldr r2, [r5, #0x30] mov r1, #0xd7 - bl FUN_0200A8E0 + bl ReadMsgDataIntoString mov r0, #0 ldr r1, [r5, #0x30] add r2, r0, #0 |