diff options
author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-19 13:23:17 +0100 |
---|---|---|
committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-19 13:23:17 +0100 |
commit | d4cd912eb85411a4be1ea97441f929a16f455f34 (patch) | |
tree | 31f54c8322ac4a7be5f2509b0903248cf993e24b /src/easy_chat_2.c | |
parent | 05ab3f96218b58001aa2d90cef951f7e4087c4ae (diff) | |
parent | 1d8798203e86b61e889ea1c0fba851cbdbdd03d7 (diff) |
Merge remote-tracking branch 'upstream/master' into various_data
Diffstat (limited to 'src/easy_chat_2.c')
-rw-r--r-- | src/easy_chat_2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index dc8bddd5a..c56fe7576 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -70,6 +70,8 @@ static u16 sub_80EB960(void); u8 sub_80EB9C8(void); static u16 sub_80EB9D8(void); +EWRAM_DATA u8 gUnknown_020388AC = 0; + static u8 gUnknown_03000740; const u16 InterviewPalette_0[] = INCBIN_U16("graphics/misc/interview_pal0.gbapal"); |