diff options
| author | red031000 <rubenru09@aol.com> | 2020-08-07 18:15:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-07 18:15:57 +0200 |
| commit | 8c3282cded0a1f6a54160e7166bfea23ec31da7e (patch) | |
| tree | 4773d2f08e7c7207a884ac2bd6c0e79cb3cd5835 /arm9/src/msgdata.c | |
| parent | 14655718ad3fa1ea0ce481b599943b3480ad9e3e (diff) | |
| parent | 20573e3d384f73f63836864a0c6c9b0069ee9e9d (diff) | |
Merge pull request #259 from PikalaxALT/pikalax_work
Refactor message command syntax; decomp string16 funcs
Diffstat (limited to 'arm9/src/msgdata.c')
| -rw-r--r-- | arm9/src/msgdata.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arm9/src/msgdata.c b/arm9/src/msgdata.c index ae33e0f5..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); } } @@ -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); } |