summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-10-12 15:59:43 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-10-12 15:59:43 -0400
commit8d31a46c6fbc2dedd39ec9e9687f372ac102303d (patch)
tree361e868f823114ceccfb49f83fc1aacef8d636a7 /include
parent8914645231c9301579ed39bdd9200ad50e5296d0 (diff)
sub_8121478
Diffstat (limited to 'include')
-rw-r--r--include/easy_chat.h3
-rw-r--r--include/mail_data.h12
-rw-r--r--include/malloc.h2
3 files changed, 15 insertions, 2 deletions
diff --git a/include/easy_chat.h b/include/easy_chat.h
index fc44b6a8a..c9ba81c6d 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -30,7 +30,8 @@ enum
void InitEasyChatPhrases(void);
void easy_chat_input_maybe(void);
-void CopyEasyChatWord(u8 *, u16);
+void CopyEasyChatWord(u8 *dest, u16 word);
+void ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2);
bool32 sub_811F8D8(u16);
#endif // GUARD_EASYCHAT_H
diff --git a/include/mail_data.h b/include/mail_data.h
new file mode 100644
index 000000000..bf6540bad
--- /dev/null
+++ b/include/mail_data.h
@@ -0,0 +1,12 @@
+#ifndef GUARD_MAIL_DATA_H
+#define GUARD_MAIL_DATA_H
+
+// Exported type declarations
+
+// Exported RAM declarations
+
+// Exported ROM declarations
+
+u16 sub_80D45E8(u16, u16 *);
+
+#endif //GUARD_MAIL_DATA_H
diff --git a/include/malloc.h b/include/malloc.h
index 4568e244a..f3a731797 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -2,7 +2,7 @@
#define GUARD_MALLOC_H
#define malloc Alloc
-#define calloc AllocZeroed
+#define calloc(ct, sz) AllocZeroed((ct) * (sz))
#define free Free
extern u8 gHeap[];