diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
| commit | 82ddae9db42f45abf876e68dc9b0b69a00b44070 (patch) | |
| tree | 26e39c75e92ca8cf128b9143c0e664b06bff23a9 /src/easy_chat.c | |
| parent | c56305607a1bad264b89d07b7539eff3fe010e0d (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
fix merge conflicts
Diffstat (limited to 'src/easy_chat.c')
| -rw-r--r-- | src/easy_chat.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/easy_chat.c b/src/easy_chat.c index e43ba751f..cc2cd7030 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -1,6 +1,5 @@ #include "global.h" #include "easy_chat.h" -#include "asm.h" #include "data2.h" #include "event_data.h" #include "field_message_box.h" @@ -11,17 +10,9 @@ #include "strings2.h" #include "text.h" -u8 sub_80EB37C(u16); -u8 sub_80EB8C0(void); -u8 sub_80EB868(u8); -u16 sub_80EAE88(u8); -void sub_80EB890(u8); -u16 sub_80EB784(u16 group); -u8 sub_80EAD7C(u8 group); static bool8 sub_80EB680(u16 *, u16, u16, u16); static u16 sub_80EB9D8(void); static u16 sub_80EB960(void); -u16 sub_80EB72C(u16); extern void *gEasyChatGroupWords[]; extern const u8 gEasyChatGroupSizes[]; |