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/proto.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'include/proto.h') diff --git a/include/proto.h b/include/proto.h index 2e7d19b3..70cb8aa6 100644 --- a/include/proto.h +++ b/include/proto.h @@ -4,12 +4,12 @@ // For homeless function declarations #include "pokemon.h" // for struct definitions +#include "string16.h" // for struct definitions -u16 * FUN_0200AA50(u16 species, u32 heap_id); -void FUN_02021A74(u16 * dest, u16 * src); +void FUN_02021A74(u16 * dest, struct String * src); void FUN_02021A20(void * ptr); void FUN_02021E28(u16 * dest, u16 * src); -void FUN_02021EF0(const u16 * src, u16 * dest, u32 count); +void FUN_02021EF0(const struct String * src, u16 * dest, u32 count); u32 FUN_0206E7B8(u16 item, u32 a1, u32 a2); int FUN_02014C3C(u8); void FUN_02014C54(int, int, struct UnkStruct_02069038 *, u8); @@ -20,5 +20,6 @@ void FUN_02005E90(int, int, int, int); void FUN_020056AC(int, int, int, int, int); void FUN_020808AC(struct BoxPokemon *, int, int, int, int); void * FUN_02022610(void *, int); +void FUN_0200B7B8(u32 *, struct String *, struct String *); #endif //POKEDIAMOND_PROTO_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/proto.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/proto.h') diff --git a/include/proto.h b/include/proto.h index 70cb8aa6..4a0012d3 100644 --- a/include/proto.h +++ b/include/proto.h @@ -6,8 +6,8 @@ #include "pokemon.h" // for struct definitions #include "string16.h" // for struct definitions -void FUN_02021A74(u16 * dest, struct String * src); -void FUN_02021A20(void * ptr); +void StringCopy(u16 * dest, struct String * src); +void String_dtor(void * ptr); void FUN_02021E28(u16 * dest, u16 * src); void FUN_02021EF0(const struct String * src, u16 * dest, u32 count); u32 FUN_0206E7B8(u16 item, u32 a1, u32 a2); @@ -20,6 +20,6 @@ void FUN_02005E90(int, int, int, int); void FUN_020056AC(int, int, int, int, int); void FUN_020808AC(struct BoxPokemon *, int, int, int, int); void * FUN_02022610(void *, int); -void FUN_0200B7B8(u32 *, struct String *, struct String *); +void StringExpandPlaceholders(u32 *, struct String *, struct String *); #endif //POKEDIAMOND_PROTO_H -- cgit v1.2.3