diff options
Diffstat (limited to 'arm9/asm/unk_0207FD00.s')
| -rw-r--r-- | arm9/asm/unk_0207FD00.s | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/arm9/asm/unk_0207FD00.s b/arm9/asm/unk_0207FD00.s index 1f17ee0a..9e7642aa 100644 --- a/arm9/asm/unk_0207FD00.s +++ b/arm9/asm/unk_0207FD00.s @@ -478,13 +478,13 @@ FUN_020800E0: ; 0x020800E0 bgt _02080106 ldr r1, [r5, #0x0] mov r0, #0x48 - bl FUN_020219F4 + bl String_ctor str r0, [r5, #0x18] add r4, #0x18 ldr r0, [r5, #0x4] ldr r2, [r5, #0x18] add r1, r4, #0x0 - bl FUN_0200A8E0 + bl ReadMsgDataIntoString _02080106: pop {r3-r5, pc} @@ -497,17 +497,17 @@ FUN_02080108: ; 0x02080108 mov r0, #0x9 ldr r1, [r5, #0x0] lsl r0, r0, #0x6 - bl FUN_020219F4 + bl String_ctor add r4, r0, #0x0 mov r0, #0x9 ldr r1, [r5, #0x0] lsl r0, r0, #0x6 - bl FUN_020219F4 + bl String_ctor str r0, [r5, #0x20] ldr r0, [r5, #0x4] add r1, r6, #0x0 add r2, r4, #0x0 - bl FUN_0200A8E0 + bl ReadMsgDataIntoString ldr r0, [r5, #0xc] mov r1, #0x94 mov r2, #0x0 @@ -606,9 +606,9 @@ FUN_02080108: ; 0x02080108 ldr r0, [r5, #0x8] ldr r1, [r5, #0x20] add r2, r4, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 - bl FUN_02021A20 + bl String_dtor add sp, #0x8 pop {r4-r6, pc} @@ -621,17 +621,17 @@ FUN_02080228: ; 0x02080228 mov r0, #0x12 ldr r1, [r4, #0x0] lsl r0, r0, #0x4 - bl FUN_020219F4 + bl String_ctor add r5, r0, #0x0 mov r0, #0x12 ldr r1, [r4, #0x0] lsl r0, r0, #0x4 - bl FUN_020219F4 + bl String_ctor str r0, [r4, #0x20] ldr r0, [r4, #0x4] add r1, r6, #0x0 add r2, r5, #0x0 - bl FUN_0200A8E0 + bl ReadMsgDataIntoString ldr r0, [r4, #0xc] mov r1, #0x94 mov r2, #0x0 @@ -764,9 +764,9 @@ _0208036E: ldr r0, [r4, #0x8] ldr r1, [r4, #0x20] add r2, r5, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r5, #0x0 - bl FUN_02021A20 + bl String_dtor add sp, #0x8 pop {r4-r6, pc} .balign 4 @@ -781,17 +781,17 @@ FUN_02080384: ; 0x02080384 ldr r1, [r5, #0x0] lsl r0, r0, #0x2 add r6, r2, #0x0 - bl FUN_020219F4 + bl String_ctor add r4, r0, #0x0 mov r0, #0x5a ldr r1, [r5, #0x0] lsl r0, r0, #0x2 - bl FUN_020219F4 + bl String_ctor str r0, [r5, #0x20] ldr r0, [r5, #0x4] add r1, r7, #0x0 add r2, r4, #0x0 - bl FUN_0200A8E0 + bl ReadMsgDataIntoString cmp r6, #0x0 ldr r0, [r5, #0xc] bne _02080418 @@ -881,9 +881,9 @@ _02080478: ldr r0, [r5, #0x8] ldr r1, [r5, #0x20] add r2, r4, #0x0 - bl FUN_0200B7B8 + bl StringExpandPlaceholders add r0, r4, #0x0 - bl FUN_02021A20 + bl String_dtor add sp, #0x8 pop {r3-r7, pc} @@ -894,7 +894,7 @@ FUN_0208048C: ; 0x0208048C add r4, r0, #0x0 ldr r1, [r4, #0x0] mov r0, #0x48 - bl FUN_020219F4 + bl String_ctor str r0, [r4, #0x28] ldr r0, [r4, #0xc] mov r1, #0x46 @@ -1152,7 +1152,7 @@ _02080654: ldrh r1, [r2, r1] ldr r0, [r4, #0x4] ldr r2, [r4, #0x28] - bl FUN_0200A8E0 + bl ReadMsgDataIntoString add sp, #0x10 pop {r3-r7, pc} .balign 4 @@ -1164,7 +1164,7 @@ FUN_02080678: ; 0x02080678 add r5, r0, #0x0 ldr r1, [r5, #0x0] mov r0, #0x48 - bl FUN_020219F4 + bl String_ctor mov r6, #0x0 str r0, [r5, #0x30] add r4, r6, #0x0 @@ -1184,7 +1184,7 @@ _02080698: ldrh r1, [r1, r2] ldr r0, [r5, #0x4] ldr r2, [r5, #0x30] - bl FUN_0200A8E0 + bl ReadMsgDataIntoString pop {r4-r6, pc} nop _020806B0: .word UNK_020FBB48 @@ -1201,7 +1201,7 @@ FUN_020806B4: ; 0x020806B4 mov r0, #0x12 ldr r1, [r5, #0x0] lsl r0, r0, #0x4 - bl FUN_020219F4 + bl String_ctor str r0, [r5, #0x38] cmp r4, #0x5 bgt _020806D8 @@ -1222,7 +1222,7 @@ _020806E8: _020806EA: ldr r0, [r5, #0x4] ldr r2, [r5, #0x38] - bl FUN_0200A8E0 + bl ReadMsgDataIntoString pop {r3-r5, pc} thumb_func_start FUN_020806F4 @@ -1733,7 +1733,7 @@ FUN_02080AE4: ; 0x02080AE4 add r2, r4, #0x0 bl SetBoxMonData add r0, r4, #0x0 - bl FUN_02021A20 + bl String_dtor add sp, #0x8 pop {r4-r6, pc} |