diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-06-20 19:14:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 19:14:29 +0300 |
| commit | b1aec20540cd679d0c828a732de918234adf249e (patch) | |
| tree | 22da10db05fa06fb03f297e2d77c6c826898acb2 /include/proto.h | |
| parent | e979db22a66e401b11d7aa0f1c1dcde4f0fef285 (diff) | |
| parent | 16b091058e6135f9b7875fcf074d812d610df380 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'include/proto.h')
| -rw-r--r-- | include/proto.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/proto.h b/include/proto.h index 2e7d19b3..4a0012d3 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_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 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 StringExpandPlaceholders(u32 *, struct String *, struct String *); #endif //POKEDIAMOND_PROTO_H |