From 06a7bf4c8c36af699b9882623d2642baf0269bf3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 19 Jun 2020 16:57:44 -0400 Subject: msgdata.c through DecryptMessageDirect --- include/msg_data.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'include/msg_data.h') diff --git a/include/msg_data.h b/include/msg_data.h index debacc79..b03fcdb6 100644 --- a/include/msg_data.h +++ b/include/msg_data.h @@ -13,6 +13,19 @@ struct MsgData } data; }; +struct UnkStruct_200A394_4 +{ + u32 unk0; + u32 unk4; +}; + +struct UnkStruct_200A394 +{ + u16 unk0; + u16 unk2; + struct UnkStruct_200A394_4 unk4[1]; +}; + struct MsgData * NewMsgDataFromNarc(u32 type, u32 narcId, u32 msgId, u32 heapno); u16 * FUN_0200A914(struct MsgData *, u32); void DestroyMsgData(struct MsgData *); -- cgit v1.2.3 From b138e415a2c6b4e42a08e776cd482d91d50bbc2a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 19 Jun 2020 22:26:26 -0400 Subject: Finish msgdata.c --- include/msg_data.h | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) (limited to 'include/msg_data.h') diff --git a/include/msg_data.h b/include/msg_data.h index b03fcdb6..5d8dd387 100644 --- a/include/msg_data.h +++ b/include/msg_data.h @@ -1,17 +1,7 @@ #ifndef POKEDIAMOND_MSG_DATA_H #define POKEDIAMOND_MSG_DATA_H -struct MsgData -{ - u16 unk0; - u16 unk2; - u16 unk4; - u16 unk6; - union { - u16 * raw; - NARC * narc; - } data; -}; +#include "string16.h" struct UnkStruct_200A394_4 { @@ -26,8 +16,27 @@ struct UnkStruct_200A394 struct UnkStruct_200A394_4 unk4[1]; }; -struct MsgData * NewMsgDataFromNarc(u32 type, u32 narcId, u32 msgId, u32 heapno); -u16 * FUN_0200A914(struct MsgData *, u32); +struct MsgData +{ + u16 type; + u16 heap_id; + u16 narc_id; + u16 file_id; + union { + struct UnkStruct_200A394 * raw; + NARC * narc; + } data; +}; + +struct MsgData * NewMsgDataFromNarc(u32 type, NarcId narcId, s32 msgId, u32 heapno); void DestroyMsgData(struct MsgData *); +void FUN_0200A8E0(struct MsgData * msgData, u32 msg_no, struct String * dest); +struct String * FUN_0200A914(struct MsgData *, u32); +u16 FUN_0200A940(struct MsgData * msgData); +void DecryptCopyString(struct MsgData * msgData, u32 msg_no, u16 * dest); +void GetSpeciesName(u16 species, u32 heap_id, u16 * dest); +struct String * FUN_0200A9C4(u32 * a0, struct MsgData * msgData, u32 msgno, struct String * a3); +struct String * FUN_0200AA14(u32 msg_no, u32 heapno); +struct String * FUN_0200AA50(u16 species, u32 heap_id); #endif //POKEDIAMOND_MSG_DATA_H -- cgit v1.2.3 From 1386f29730b42a640fde1d568255dc10be4ac759 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 20 Jun 2020 09:18:15 -0400 Subject: Name methods in msgdata.c and unk_02021934.s aka string16.s --- include/msg_data.h | 42 ------------------------------------------ 1 file changed, 42 deletions(-) delete mode 100644 include/msg_data.h (limited to 'include/msg_data.h') diff --git a/include/msg_data.h b/include/msg_data.h deleted file mode 100644 index 5d8dd387..00000000 --- a/include/msg_data.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef POKEDIAMOND_MSG_DATA_H -#define POKEDIAMOND_MSG_DATA_H - -#include "string16.h" - -struct UnkStruct_200A394_4 -{ - u32 unk0; - u32 unk4; -}; - -struct UnkStruct_200A394 -{ - u16 unk0; - u16 unk2; - struct UnkStruct_200A394_4 unk4[1]; -}; - -struct MsgData -{ - u16 type; - u16 heap_id; - u16 narc_id; - u16 file_id; - union { - struct UnkStruct_200A394 * raw; - NARC * narc; - } data; -}; - -struct MsgData * NewMsgDataFromNarc(u32 type, NarcId narcId, s32 msgId, u32 heapno); -void DestroyMsgData(struct MsgData *); -void FUN_0200A8E0(struct MsgData * msgData, u32 msg_no, struct String * dest); -struct String * FUN_0200A914(struct MsgData *, u32); -u16 FUN_0200A940(struct MsgData * msgData); -void DecryptCopyString(struct MsgData * msgData, u32 msg_no, u16 * dest); -void GetSpeciesName(u16 species, u32 heap_id, u16 * dest); -struct String * FUN_0200A9C4(u32 * a0, struct MsgData * msgData, u32 msgno, struct String * a3); -struct String * FUN_0200AA14(u32 msg_no, u32 heapno); -struct String * FUN_0200AA50(u16 species, u32 heap_id); - -#endif //POKEDIAMOND_MSG_DATA_H -- cgit v1.2.3