summaryrefslogtreecommitdiff
path: root/include/proto.h
diff options
context:
space:
mode:
authorLouis Hampton <roastveg@hotmail.co.uk>2020-06-20 19:01:00 +0100
committerLouis Hampton <roastveg@hotmail.co.uk>2020-06-20 19:01:00 +0100
commit3cf5ef0a661c62a94766e2c08025bb7ecb785b2a (patch)
tree7fa9fc230a0517f65876613318f043f3c14b8f63 /include/proto.h
parent59f6bdfa9a7645d3e2e9d1ac0bde5af3ad77e8b2 (diff)
parent6298426d9ad4c59a875b0a90a0facfa1a3a513cc (diff)
Merge branch 'master' of https://github.com/roastveg/pokediamond
Diffstat (limited to 'include/proto.h')
-rw-r--r--include/proto.h9
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