diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-20 09:18:15 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-20 09:18:15 -0400 |
| commit | 1386f29730b42a640fde1d568255dc10be4ac759 (patch) | |
| tree | f5c98aba08075dd7c64ed0eb58af209a3d1872b3 /arm9/modules/58 | |
| parent | b138e415a2c6b4e42a08e776cd482d91d50bbc2a (diff) | |
Name methods in msgdata.c and unk_02021934.s aka string16.s
Diffstat (limited to 'arm9/modules/58')
| -rw-r--r-- | arm9/modules/58/asm/module_58.s | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 4c10cb07..540bb752 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -454,7 +454,7 @@ MOD58_021D9E04: ; 0x021D9E04 _021D9E14: mov r0, #8 mov r1, #0x27 - bl FUN_020219F4 + bl String_ctor str r0, [r4, #0x18] ldrb r1, [r5] ldr r0, [sp] @@ -470,15 +470,15 @@ _021D9E14: blt _021D9E14 mov r0, #0x14 mov r1, #0x27 - bl FUN_020219F4 + bl String_ctor str r0, [r7, #0x2c] mov r0, #0x28 mov r1, #0x27 - bl FUN_020219F4 + bl String_ctor str r0, [r7, #0x30] mov r0, #0x50 mov r1, #0x27 - bl FUN_020219F4 + bl String_ctor str r0, [r7, #0x34] ldr r0, _021D9E98 ; =0x0000431A mov r1, #0 @@ -490,11 +490,11 @@ _021D9E14: ldr r0, [r7, #0x14] ldr r2, [r7, #0x2c] mov r1, #0xc - bl FUN_0200A8E0 + bl ReadMsgDataIntoString ldr r0, [r7, #0x14] ldr r2, [r7, #0x30] mov r1, #9 - bl FUN_0200A8E0 + bl ReadMsgDataIntoString mov r0, #0x27 bl FUN_02014590 ldr r1, _021D9E9C ; =0x00005C9C @@ -523,17 +523,17 @@ MOD58_021D9EA0: ; 0x021D9EA0 add r5, r6, #0 _021D9EB0: ldr r0, [r5, #0x18] - bl FUN_02021A20 + bl String_dtor add r4, r4, #1 add r5, r5, #4 cmp r4, #5 blt _021D9EB0 ldr r0, [r6, #0x34] - bl FUN_02021A20 + bl String_dtor ldr r0, [r6, #0x30] - bl FUN_02021A20 + bl String_dtor ldr r0, [r6, #0x2c] - bl FUN_02021A20 + bl String_dtor pop {r4, r5, r6, pc} nop _021D9ED4: .word 0x00005C9C @@ -2201,18 +2201,18 @@ MOD58_021DAB94: ; 0x021DAB94 add r6, r1, #0 mov r0, #0x50 mov r1, #0x27 - bl FUN_020219F4 + bl String_ctor add r4, r0, #0 ldr r0, [r5, #0x14] add r1, r6, #0 add r2, r4, #0 - bl FUN_0200A8E0 + bl ReadMsgDataIntoString ldr r0, [r5, #0x10] ldr r1, [r5, #0x34] add r2, r4, #0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0 - bl FUN_02021A20 + bl String_dtor mov r0, #0xb5 lsl r0, r0, #2 add r0, r5, r0 |