From 1d5e9d12ea905a67c818febbb3e58a3e8a7ad3ca Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 4 Aug 2020 11:22:23 -0400 Subject: This function was misnamed --- arm9/src/msgdata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arm9/src/msgdata.c') diff --git a/arm9/src/msgdata.c b/arm9/src/msgdata.c index ae33e0f5..5805a7eb 100644 --- a/arm9/src/msgdata.c +++ b/arm9/src/msgdata.c @@ -360,7 +360,7 @@ struct String * ReadMsgData_ExpandPlaceholders(u32 * a0, struct MsgData * msgDat r5 = NewString_ReadMsgData(msgData, msgno); if (r5 != NULL) { - StringExpandPlaceholders(a0, r4, r5); + FUN_0200B7B8(a0, r4, r5); ret = StringDup(r4, a3); String_dtor(r5); } -- cgit v1.2.3 From 8e763ab33e7c7b2de1b055687c0ae6fb1e197ff7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 6 Aug 2020 14:29:31 -0400 Subject: Decompile unk_02021934 --- arm9/src/msgdata.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'arm9/src/msgdata.c') diff --git a/arm9/src/msgdata.c b/arm9/src/msgdata.c index 5805a7eb..e90c7122 100644 --- a/arm9/src/msgdata.c +++ b/arm9/src/msgdata.c @@ -102,7 +102,7 @@ static void ReadMsgData_ExistingTable_ExistingString(struct MsgDataTable * table { MI_CpuCopy16((char *)table + alloc.offset, buf, 2 * alloc.length); Decrypt2(buf, alloc.length, num); - FUN_02021E8C(dest, buf, alloc.length); + CopyU16ArrayToStringN(dest, buf, alloc.length); FreeToHeap(buf); } } @@ -129,7 +129,7 @@ static struct String * ReadMsgData_ExistingTable_NewString(struct MsgDataTable * Decrypt2(buf, alloc.length, num); dest = String_ctor(alloc.length, heap_id); if (dest != NULL) - FUN_02021E8C(dest, buf, alloc.length); + CopyU16ArrayToStringN(dest, buf, alloc.length); FreeToHeap(buf); return dest; } @@ -173,7 +173,7 @@ static void ReadMsgData_ExistingNarc_ExistingString(NARC * narc, u32 group, u32 { NARC_ReadFromMember(narc, group, alloc.offset, size, buf); Decrypt2(buf, alloc.length, num); - FUN_02021E8C(dest, buf, alloc.length); + CopyU16ArrayToStringN(dest, buf, alloc.length); FreeToHeap(buf); return; } @@ -223,7 +223,7 @@ static struct String * ReadMsgData_ExistingNarc_NewString(NARC * narc, u32 group { NARC_ReadFromMember(narc, group, alloc.offset, size, buf); Decrypt2(buf, alloc.length, num); - FUN_02021E8C(dest, buf, alloc.length); + CopyU16ArrayToStringN(dest, buf, alloc.length); FreeToHeap(buf); } } -- cgit v1.2.3