summaryrefslogtreecommitdiff
path: root/arm9/src
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/src')
-rw-r--r--arm9/src/msgdata.c220
-rw-r--r--arm9/src/nutdata.c6
-rw-r--r--arm9/src/pokemon.c26
-rw-r--r--arm9/src/string_util.c4
4 files changed, 127 insertions, 129 deletions
diff --git a/arm9/src/msgdata.c b/arm9/src/msgdata.c
index 76d44338..ae33e0f5 100644
--- a/arm9/src/msgdata.c
+++ b/arm9/src/msgdata.c
@@ -1,6 +1,6 @@
#include "global.h"
#include "filesystem.h"
-#include "msg_data.h"
+#include "msgdata.h"
#include "heap.h"
#include "MI_memory.h"
#include "string16.h"
@@ -8,36 +8,34 @@
#pragma thumb on
-void * LoadSingleElementFromNarc(NarcId narc_id, s32 file_id, u32 heap_id);
-void FreeMsgDataRawData(void * data);
-void CopyEncryptedMessage16(u16 * dest, const u16 * src, struct UnkStruct_200A394_4 * param);
-void DecryptMessageDirect(struct UnkStruct_200A394 * r3, u32 r5, u16 * r4);
-void DecryptMessageViaNewNarcHandle(NarcId narc_id, u32 group, u32 num, u32 heap_id, u16 * dest);
-void FUN_0200A4D4(struct UnkStruct_200A394 * r5, u32 r4, struct String * dest);
-struct String * FUN_0200A584(struct UnkStruct_200A394 * r5, u32 r4, u32 heap_id);
-void FUN_0200A648(NarcId narc_id, u32 group, u32 num, u32 heap_id, struct String * dest);
-void FUN_0200A670(NARC * narc, u32 group, u32 num, u32 heap_id, struct String * dest);
-struct String * FUN_0200A738(NarcId narc_id, u32 group, u32 num, u32 heap_id);
-struct String * FUN_0200A76C(NARC * narc, u32 group, u32 num, u32 heap_id);
-u16 FUN_0200A848(struct UnkStruct_200A394 * tbl);
-u16 FUN_0200A84C(NarcId narc_id, s32 file_id);
-
-void * LoadSingleElementFromNarc(NarcId narc_id, s32 file_id, u32 heap_id)
+static void * LoadSingleElementFromNarc(NarcId narc_id, s32 file_id, u32 heap_id);
+static void FreeMsgDataRawData(void * data);
+static void ReadMsgData_ExistingTable_ExistingArray(struct MsgDataTable * table, u32 num, u16 * dest);
+static void ReadMsgData_NewNarc_ExistingArray(NarcId narc_id, u32 group, u32 num, u32 heap_id, u16 * dest);
+static void CopyEncryptedMessage16(u16 * dest, const u16 * src, struct MsgDataAlloc * param);
+static void ReadMsgData_ExistingTable_ExistingString(struct MsgDataTable * table, u32 num, struct String * dest);
+static struct String * ReadMsgData_ExistingTable_NewString(struct MsgDataTable * table, u32 num, u32 heap_id);
+static void ReadMsgData_ExistingNarc_ExistingString(NARC * narc, u32 group, u32 num, u32 heap_id, struct String * dest);
+static struct String * ReadMsgData_ExistingNarc_NewString(NARC * narc, u32 group, u32 num, u32 heap_id);
+static u16 GetMsgCount_ExistingTable(struct MsgDataTable * tbl);
+static u16 GetMsgCount_TableFromNarc(NarcId narc_id, s32 file_id);
+
+static void * LoadSingleElementFromNarc(NarcId narc_id, s32 file_id, u32 heap_id)
{
return AllocAndReadWholeNarcMemberByIdPair(narc_id, file_id, heap_id);
}
-void FreeMsgDataRawData(void * data)
+static void FreeMsgDataRawData(void * data)
{
FreeToHeap(data);
}
-inline static void Decrypt1(struct UnkStruct_200A394_4 * arg0, u32 arg1, u32 seed)
+inline static void Decrypt1(struct MsgDataAlloc * arg0, u32 arg1, u32 seed)
{
seed = seed * 765 * (arg1 + 1) & 0xffff;
seed |= seed << 16;
- arg0->unk0 ^= seed;
- arg0->unk4 ^= seed;
+ arg0->offset ^= seed;
+ arg0->length ^= seed;
}
inline static void Decrypt2(u16 * arg0, u32 count, u32 arg2)
@@ -52,17 +50,17 @@ inline static void Decrypt2(u16 * arg0, u32 count, u32 arg2)
}
}
-void DecryptMessageDirect(struct UnkStruct_200A394 * table, u32 num, u16 * dest)
+static void ReadMsgData_ExistingTable_ExistingArray(struct MsgDataTable * table, u32 num, u16 * dest)
{
- struct UnkStruct_200A394_4 sp0;
+ struct MsgDataAlloc sp0;
- if (num < table->unk0)
+ if (num < table->count)
{
- sp0 = table->unk4[num];
- Decrypt1(&sp0, num, table->unk2);
+ sp0 = table->alloc[num];
+ Decrypt1(&sp0, num, table->key);
- CopyEncryptedMessage16(dest, (const u16 *)((u8 *)table + sp0.unk0), &sp0);
- Decrypt2(dest, sp0.unk4, num);
+ CopyEncryptedMessage16(dest, (const u16 *)((u8 *)table + sp0.offset), &sp0);
+ Decrypt2(dest, sp0.length, num);
}
else
{
@@ -70,68 +68,68 @@ void DecryptMessageDirect(struct UnkStruct_200A394 * table, u32 num, u16 * dest)
}
}
-void DecryptMessageViaNewNarcHandle(NarcId narc_id, u32 group, u32 num, u32 heap_id, u16 * dest)
+static void ReadMsgData_NewNarc_ExistingArray(NarcId narc_id, u32 group, u32 num, u32 heap_id, u16 * dest)
{
NARC * narc = NARC_ctor(narc_id, heap_id);
- u16 spC[2];
- struct UnkStruct_200A394_4 sp4;
+ u16 header[2];
+ struct MsgDataAlloc alloc;
if (narc != NULL)
{
- NARC_ReadFromMember(narc, group, 0, 4, spC);
- NARC_ReadFromMember(narc, group, 8 * num + 4, 8, &sp4);
- Decrypt1(&sp4, num, spC[1]);
- NARC_ReadFromMember(narc, group, sp4.unk0, 2 * sp4.unk4, dest);
- Decrypt2(dest, sp4.unk4, num);
+ NARC_ReadFromMember(narc, group, 0, 4, header);
+ NARC_ReadFromMember(narc, group, 8 * num + 4, 8, &alloc);
+ Decrypt1(&alloc, num, header[1]);
+ NARC_ReadFromMember(narc, group, alloc.offset, 2 * alloc.length, dest);
+ Decrypt2(dest, alloc.length, num);
NARC_dtor(narc);
}
}
-void CopyEncryptedMessage16(u16 * dest, const u16 * src, struct UnkStruct_200A394_4 * param)
+static void CopyEncryptedMessage16(u16 * dest, const u16 * src, struct MsgDataAlloc * param)
{
- MI_CpuCopy16(src, dest, 2 * param->unk4);
+ MI_CpuCopy16(src, dest, 2 * param->length);
}
-void FUN_0200A4D4(struct UnkStruct_200A394 * table, u32 num, struct String * dest)
+static void ReadMsgData_ExistingTable_ExistingString(struct MsgDataTable * table, u32 num, struct String * dest)
{
- struct UnkStruct_200A394_4 sp4;
+ struct MsgDataAlloc alloc;
u16 * buf;
- if (num < table->unk0)
+ if (num < table->count)
{
- sp4 = table->unk4[num];
- Decrypt1(&sp4, num, table->unk2);
- buf = AllocFromHeapAtEnd(0, 2 * sp4.unk4);
+ alloc = table->alloc[num];
+ Decrypt1(&alloc, num, table->key);
+ buf = AllocFromHeapAtEnd(0, 2 * alloc.length);
if (buf != NULL)
{
- MI_CpuCopy16((char *)table + sp4.unk0, buf, 2 * sp4.unk4);
- Decrypt2(buf, sp4.unk4, num);
- FUN_02021E8C(dest, buf, sp4.unk4);
+ MI_CpuCopy16((char *)table + alloc.offset, buf, 2 * alloc.length);
+ Decrypt2(buf, alloc.length, num);
+ FUN_02021E8C(dest, buf, alloc.length);
FreeToHeap(buf);
}
}
else
{
GF_ASSERT(0);
- FUN_02021A4C(dest);
+ StringSetEmpty(dest);
}
}
-struct String * FUN_0200A584(struct UnkStruct_200A394 * table, u32 num, u32 heap_id)
+static struct String * ReadMsgData_ExistingTable_NewString(struct MsgDataTable * table, u32 num, u32 heap_id)
{
- struct UnkStruct_200A394_4 sp4;
+ struct MsgDataAlloc alloc;
u16 * buf;
struct String * dest;
- if (num < table->unk0)
+ if (num < table->count)
{
- sp4 = table->unk4[num];
- Decrypt1(&sp4, num, table->unk2);
- buf = AllocFromHeapAtEnd(heap_id, 2 * sp4.unk4);
+ alloc = table->alloc[num];
+ Decrypt1(&alloc, num, table->key);
+ buf = AllocFromHeapAtEnd(heap_id, 2 * alloc.length);
if (buf != NULL)
{
- MI_CpuCopy16((char *)table + sp4.unk0, buf, 2 * sp4.unk4);
- Decrypt2(buf, sp4.unk4, num);
- dest = FUN_020219F4(sp4.unk4, heap_id);
+ MI_CpuCopy16((char *)table + alloc.offset, buf, 2 * alloc.length);
+ Decrypt2(buf, alloc.length, num);
+ dest = String_ctor(alloc.length, heap_id);
if (dest != NULL)
- FUN_02021E8C(dest, buf, sp4.unk4);
+ FUN_02021E8C(dest, buf, alloc.length);
FreeToHeap(buf);
return dest;
}
@@ -143,39 +141,39 @@ struct String * FUN_0200A584(struct UnkStruct_200A394 * table, u32 num, u32 heap
else
{
GF_ASSERT(0);
- return FUN_020219F4(4, heap_id);
+ return String_ctor(4, heap_id);
}
}
-void FUN_0200A648(NarcId narc_id, u32 group, u32 num, u32 heap_id, struct String * dest)
+void ReadMsgData_NewNarc_ExistingString(NarcId narc_id, u32 group, u32 num, u32 heap_id, struct String * dest)
{
NARC * narc = NARC_ctor(narc_id, heap_id);
if (narc != NULL)
{
- FUN_0200A670(narc, group, num, heap_id, dest);
+ ReadMsgData_ExistingNarc_ExistingString(narc, group, num, heap_id, dest);
NARC_dtor(narc);
}
}
-void FUN_0200A670(NARC * narc, u32 group, u32 num, u32 heap_id, struct String * dest)
+static void ReadMsgData_ExistingNarc_ExistingString(NARC * narc, u32 group, u32 num, u32 heap_id, struct String * dest)
{
u16 * buf;
u32 size;
u16 sp10[2];
- struct UnkStruct_200A394_4 sp8;
+ struct MsgDataAlloc alloc;
NARC_ReadFromMember(narc, group, 0, 4, sp10);
if (num < sp10[0])
{
- NARC_ReadFromMember(narc, group, 8 * num + 4, 8, &sp8);
- Decrypt1(&sp8, num, sp10[1]);
- size = sp8.unk4 * 2;
+ NARC_ReadFromMember(narc, group, 8 * num + 4, 8, &alloc);
+ Decrypt1(&alloc, num, sp10[1]);
+ size = alloc.length * 2;
buf = AllocFromHeapAtEnd(heap_id, size);
if (buf != NULL)
{
- NARC_ReadFromMember(narc, group, sp8.unk0, size, buf);
- Decrypt2(buf, sp8.unk4, num);
- FUN_02021E8C(dest, buf, sp8.unk4);
+ NARC_ReadFromMember(narc, group, alloc.offset, size, buf);
+ Decrypt2(buf, alloc.length, num);
+ FUN_02021E8C(dest, buf, alloc.length);
FreeToHeap(buf);
return;
}
@@ -183,49 +181,49 @@ void FUN_0200A670(NARC * narc, u32 group, u32 num, u32 heap_id, struct String *
else
{
GF_ASSERT(0);
- FUN_02021A4C(dest);
+ StringSetEmpty(dest);
}
}
-struct String * FUN_0200A738(NarcId narc_id, u32 group, u32 num, u32 heap_id)
+struct String * ReadMsgData_NewNarc_NewString(NarcId narc_id, u32 group, u32 num, u32 heap_id)
{
NARC * narc = NARC_ctor(narc_id, heap_id);
struct String * string;
if (narc != NULL)
{
- string = FUN_0200A76C(narc, group, num, heap_id);
+ string = ReadMsgData_ExistingNarc_NewString(narc, group, num, heap_id);
NARC_dtor(narc);
}
else
{
- string = FUN_020219F4(4, heap_id);
+ string = String_ctor(4, heap_id);
}
return string;
}
-struct String * FUN_0200A76C(NARC * narc, u32 group, u32 num, u32 heap_id)
+static struct String * ReadMsgData_ExistingNarc_NewString(NARC * narc, u32 group, u32 num, u32 heap_id)
{
struct String * dest;
u16 * buf;
u32 size;
u16 sp10[2];
- struct UnkStruct_200A394_4 sp8;
+ struct MsgDataAlloc alloc;
NARC_ReadFromMember(narc, group, 0, 4, sp10);
if (num < sp10[0])
{
- NARC_ReadFromMember(narc, group, 8 * num + 4, 8, &sp8);
- Decrypt1(&sp8, num, sp10[1]);
- dest = FUN_020219F4(sp8.unk4, heap_id);
+ NARC_ReadFromMember(narc, group, 8 * num + 4, 8, &alloc);
+ Decrypt1(&alloc, num, sp10[1]);
+ dest = String_ctor(alloc.length, heap_id);
if (dest != NULL)
{
- size = sp8.unk4 * 2;
+ size = alloc.length * 2;
buf = AllocFromHeapAtEnd(heap_id, size);
if (buf != NULL)
{
- NARC_ReadFromMember(narc, group, sp8.unk0, size, buf);
- Decrypt2(buf, sp8.unk4, num);
- FUN_02021E8C(dest, buf, sp8.unk4);
+ NARC_ReadFromMember(narc, group, alloc.offset, size, buf);
+ Decrypt2(buf, alloc.length, num);
+ FUN_02021E8C(dest, buf, alloc.length);
FreeToHeap(buf);
}
}
@@ -234,16 +232,16 @@ struct String * FUN_0200A76C(NARC * narc, u32 group, u32 num, u32 heap_id)
else
{
GF_ASSERT(0);
- return FUN_020219F4(4, heap_id);
+ return String_ctor(4, heap_id);
}
}
-u16 FUN_0200A848(struct UnkStruct_200A394 * tbl)
+static u16 GetMsgCount_ExistingTable(struct MsgDataTable * tbl)
{
- return tbl->unk0;
+ return tbl->count;
}
-u16 FUN_0200A84C(NarcId narc_id, s32 file_id)
+static u16 GetMsgCount_TableFromNarc(NarcId narc_id, s32 file_id)
{
u16 n[2];
ReadFromNarcMemberByIdPair(&n, narc_id, file_id, 0, 4);
@@ -293,94 +291,94 @@ void DestroyMsgData(struct MsgData * msgData)
}
}
-void FUN_0200A8E0(struct MsgData * msgData, u32 msg_no, struct String * dest)
+void ReadMsgDataIntoString(struct MsgData * msgData, u32 msg_no, struct String * dest)
{
switch (msgData->type)
{
case 0:
- FUN_0200A4D4(msgData->data.raw, msg_no, dest);
+ ReadMsgData_ExistingTable_ExistingString(msgData->data.raw, msg_no, dest);
break;
case 1:
- FUN_0200A670(msgData->data.narc, msgData->file_id, msg_no, msgData->heap_id, dest);
+ ReadMsgData_ExistingNarc_ExistingString(msgData->data.narc, msgData->file_id, msg_no, msgData->heap_id, dest);
break;
}
}
-struct String * FUN_0200A914(struct MsgData * msgData, u32 msg_no)
+struct String * NewString_ReadMsgData(struct MsgData * msgData, u32 msg_no)
{
switch (msgData->type)
{
case 0:
- return FUN_0200A584(msgData->data.raw, msg_no, msgData->heap_id);
+ return ReadMsgData_ExistingTable_NewString(msgData->data.raw, msg_no, msgData->heap_id);
case 1:
- return FUN_0200A76C(msgData->data.narc, msgData->file_id, msg_no, msgData->heap_id);
+ return ReadMsgData_ExistingNarc_NewString(msgData->data.narc, msgData->file_id, msg_no, msgData->heap_id);
default:
return NULL;
}
}
-u16 FUN_0200A940(struct MsgData * msgData)
+u16 MsgDataGetCount(struct MsgData * msgData)
{
switch (msgData->type)
{
case 0:
- return FUN_0200A848(msgData->data.raw);
+ return GetMsgCount_ExistingTable(msgData->data.raw);
case 1:
- return FUN_0200A84C((NarcId)msgData->narc_id, msgData->file_id);
+ return GetMsgCount_TableFromNarc((NarcId)msgData->narc_id, msgData->file_id);
default:
return 0;
}
}
-void DecryptCopyString(struct MsgData * msgData, u32 msg_no, u16 * dest)
+void ReadMsgDataIntoU16Array(struct MsgData * msgData, u32 msg_no, u16 * dest)
{
switch (msgData->type)
{
case 0:
- DecryptMessageDirect(msgData->data.raw, msg_no, dest);
+ ReadMsgData_ExistingTable_ExistingArray(msgData->data.raw, msg_no, dest);
break;
case 1:
- DecryptMessageViaNewNarcHandle((NarcId)msgData->narc_id, msgData->file_id, msg_no, msgData->heap_id, dest);
+ ReadMsgData_NewNarc_ExistingArray((NarcId)msgData->narc_id, msgData->file_id, msg_no, msgData->heap_id, dest);
break;
}
}
-void GetSpeciesName(u16 species, u32 heap_id, u16 * dest)
+void GetSpeciesNameIntoArray(u16 species, u32 heap_id, u16 * dest)
{
struct MsgData * msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 362, heap_id);
- DecryptCopyString(msgData, species, dest);
+ ReadMsgDataIntoU16Array(msgData, species, dest);
DestroyMsgData(msgData);
}
-struct String * FUN_0200A9C4(u32 * a0, struct MsgData * msgData, u32 msgno, struct String * a3)
+struct String * ReadMsgData_ExpandPlaceholders(u32 * a0, struct MsgData * msgData, u32 msgno, u32 a3)
{
struct String * ret = NULL;
- struct String * r4 = FUN_020219F4(1024, 0);
+ struct String * r4 = String_ctor(1024, 0);
struct String * r5;
if (r4 != NULL)
{
- r5 = FUN_0200A914(msgData, msgno);
+ r5 = NewString_ReadMsgData(msgData, msgno);
if (r5 != NULL)
{
- FUN_0200B7B8(a0, r4, r5);
- ret = FUN_02021ACC(r4, a3);
- FUN_02021A20(r5);
+ StringExpandPlaceholders(a0, r4, r5);
+ ret = StringDup(r4, a3);
+ String_dtor(r5);
}
- FUN_02021A20(r4);
+ String_dtor(r4);
}
return ret;
}
-struct String * FUN_0200AA14(u32 msg_no, u32 heapno)
+struct String * GetMoveName(u32 move, u32 heapno)
{
struct MsgData * msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 588, heapno);
struct String * ret;
if (msgData != NULL)
{
- ret = FUN_020219F4(16, heapno);
+ ret = String_ctor(16, heapno);
if (ret != NULL)
{
- FUN_0200A8E0(msgData, msg_no, ret);
+ ReadMsgDataIntoString(msgData, move, ret);
}
DestroyMsgData(msgData);
return ret;
@@ -388,13 +386,13 @@ struct String * FUN_0200AA14(u32 msg_no, u32 heapno)
return NULL;
}
-struct String * FUN_0200AA50(u16 species, u32 heap_id)
+struct String * GetSpeciesName(u16 species, u32 heap_id)
{
struct String * ret;
struct MsgData * msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 362, heap_id);
if (msgData != NULL)
{
- ret = FUN_0200A914(msgData, species);
+ ret = NewString_ReadMsgData(msgData, species);
DestroyMsgData(msgData);
return ret;
}
diff --git a/arm9/src/nutdata.c b/arm9/src/nutdata.c
index bce5c291..4baaa1ae 100644
--- a/arm9/src/nutdata.c
+++ b/arm9/src/nutdata.c
@@ -1,7 +1,7 @@
#include "global.h"
#include "filesystem.h"
#include "itemtool.h"
-#include "msg_data.h"
+#include "msgdata.h"
#pragma thumb on
@@ -64,7 +64,7 @@ u32 GetNutAttr(struct NutData * nut, u32 attr)
struct String * GetNutName(u32 berry_idx, u32 heap_id)
{
struct MsgData * msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 373, heap_id);
- struct String * ret = FUN_0200A914(msgData, berry_idx);
+ struct String * ret = NewString_ReadMsgData(msgData, berry_idx);
DestroyMsgData(msgData);
return ret;
}
@@ -72,7 +72,7 @@ struct String * GetNutName(u32 berry_idx, u32 heap_id)
struct String * GetNutDesc(u32 berry_idx, u32 heap_id)
{
struct MsgData * msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 372, heap_id);
- struct String * ret = FUN_0200A914(msgData, berry_idx);
+ struct String * ret = NewString_ReadMsgData(msgData, berry_idx);
DestroyMsgData(msgData);
return ret;
}
diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c
index f3f094bb..a15d20c1 100644
--- a/arm9/src/pokemon.c
+++ b/arm9/src/pokemon.c
@@ -10,7 +10,7 @@
#include "move_data.h"
#include "string_util.h"
#include "text.h"
-#include "msg_data.h"
+#include "msgdata.h"
#include "constants/abilities.h"
#include "constants/items.h"
#include "constants/moves.h"
@@ -844,7 +844,7 @@ u32 GetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * dest)
break;
case MON_DATA_NICKNAME:
if (boxmon->checksum_fail)
- GetSpeciesName(SPECIES_MANAPHY_EGG, 0, dest);
+ GetSpeciesNameIntoArray(SPECIES_MANAPHY_EGG, 0, dest);
else
{
u16 * dest16 = (u16 *)dest;
@@ -861,9 +861,9 @@ u32 GetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * dest)
case MON_DATA_NICKNAME_3:
if (boxmon->checksum_fail)
{
- struct String * buffer = FUN_0200AA50(SPECIES_MANAPHY_EGG, 0);
- FUN_02021A74(dest, buffer);
- FUN_02021A20(buffer);
+ struct String * buffer = GetSpeciesName(SPECIES_MANAPHY_EGG, 0);
+ StringCopy(dest, buffer);
+ String_dtor(buffer);
}
else
{
@@ -979,7 +979,7 @@ u32 GetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * dest)
}
break;
case MON_DATA_SPECIES_NAME:
- GetSpeciesName(blockA->species, 0, dest);
+ GetSpeciesNameIntoArray(blockA->species, 0, dest);
break;
}
return ret;
@@ -1310,7 +1310,7 @@ void SetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * value)
blockB->Unused = VALUE(u16);
break;
case MON_DATA_NICKNAME_2:
- GetSpeciesName(blockA->species, 0, namebuf);
+ GetSpeciesNameIntoArray(blockA->species, 0, namebuf);
blockB->isNicknamed = StringNotEqual(namebuf, value);
// fallthrough
case MON_DATA_NICKNAME:
@@ -1320,7 +1320,7 @@ void SetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * value)
}
break;
case MON_DATA_NICKNAME_4:
- GetSpeciesName(blockA->species, 0, namebuf2);
+ GetSpeciesNameIntoArray(blockA->species, 0, namebuf2);
FUN_02021EF0(value, namebuf3, POKEMON_NAME_LENGTH + 1);
blockB->isNicknamed = StringNotEqual(namebuf2, namebuf3);
// fallthrough
@@ -1421,9 +1421,9 @@ void SetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * value)
blockB->spdefIV = (VALUE(u32) >> 25) & 0x1F;
break;
case MON_DATA_SPECIES_NAME:
- speciesName = FUN_0200AA50(blockA->species, 0);
+ speciesName = GetSpeciesName(blockA->species, 0);
FUN_02021EF0(speciesName, blockC->nickname, POKEMON_NAME_LENGTH + 1);
- FUN_02021A20(speciesName);
+ String_dtor(speciesName);
break;
}
#undef VALUE
@@ -3683,13 +3683,13 @@ BOOL FUN_0206A9AC(struct BoxPokemon * boxmon, struct SaveBlock2 * sb2, u32 heap_
u32 myGender = FUN_020239CC(sb2);
u32 otGender = GetBoxMonData(boxmon, MON_DATA_MET_GENDER, NULL);
struct String * r7 = FUN_020239A0(sb2, heap_id);
- struct String * r6 = FUN_020219F4(OT_NAME_LENGTH + 1, heap_id);
+ struct String * r6 = String_ctor(OT_NAME_LENGTH + 1, heap_id);
BOOL ret = FALSE;
GetBoxMonData(boxmon, MON_DATA_OT_NAME_2, r6);
if (myId == otId && myGender == otGender && FUN_02021CE0(r7, r6) == 0)
ret = TRUE;
- FUN_02021A20(r6);
- FUN_02021A20(r7);
+ String_dtor(r6);
+ String_dtor(r7);
return ret;
}
diff --git a/arm9/src/string_util.c b/arm9/src/string_util.c
index 54ad61fc..19ed5fa3 100644
--- a/arm9/src/string_util.c
+++ b/arm9/src/string_util.c
@@ -32,7 +32,7 @@ const s32 gPowersOfTen[] = {
1000000000,
};
-THUMB_FUNC void StringCopy(u16 *dest, const u16 *src)
+THUMB_FUNC void CopyU16StringArray(u16 *dest, const u16 *src)
{
u16 c = *src;
while (c != EOS) {
@@ -44,7 +44,7 @@ THUMB_FUNC void StringCopy(u16 *dest, const u16 *src)
*dest = EOS;
}
-THUMB_FUNC u16 *StringCopyN(u16 *dest, const u16 *src, u32 num)
+THUMB_FUNC u16 *CopyU16StringArrayN(u16 *dest, const u16 *src, u32 num)
{
u32 copied = 0;
if (num > copied) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-17 21:41:52 +0000