diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-02-26 11:17:41 -0600 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-02-26 14:50:02 -0600 |
| commit | b60611c38e904dac5c83f76fc2fbb880baaf0d33 (patch) | |
| tree | c83f052c5f21d03a35967a5242d2039948cd3c1c /include | |
| parent | 7742e28dad96fd908d87a3412d0127be10f65ed0 (diff) | |
Finish decompiling easy_chat.c code
Diffstat (limited to 'include')
| -rw-r--r-- | include/easy_chat.h | 3 | ||||
| -rw-r--r-- | include/global.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/easy_chat.h b/include/easy_chat.h index c55fca81b..b3639af21 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -6,7 +6,7 @@ void InitEasyChatPhrases(void); void easy_chat_input_maybe(void); u8 * CopyEasyChatWord(u8 *dest, u16 word); -bool32 sub_811F8D8(u16 word); +bool32 sub_811F8D8(int word); void InitializeEasyChatWordArray(u16 *words, u16 length); u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows); bool8 ECWord_CheckIfOutsideOfValidRange(u16 word); @@ -15,5 +15,6 @@ u16 sub_811F01C(void); u16 EasyChat_GetNumWordsInGroup(u8); u16 sub_811EE90(u16); void sub_811A20C(u8 kind, u16 *words, MainCallback callback, u8 sizeParam); +void sub_811F8BC(void); #endif // GUARD_EASYCHAT_H diff --git a/include/global.h b/include/global.h index cc308c3c9..ee0ba6893 100644 --- a/include/global.h +++ b/include/global.h @@ -875,8 +875,7 @@ struct SaveBlock1 /*0x2BC8*/ u16 unk2BC8[6]; /*0x2BD4*/ u16 unk2BD4[6]; /*0x2BE0*/ struct MailStruct mail[MAIL_COUNT]; - /*0x2E20*/ u8 additionalPhrases[5]; // bitfield for 33 additional phrases in easy chat system - /*0x2E25*/ u8 unk2E25[3]; // possibly padding? + /*0x2E20*/ u8 additionalPhrases[8]; // bitfield for 33 additional phrases in easy chat system /*0x2E28*/ OldMan oldMan; /*0x2e64*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff /*0x2e90*/ struct ContestWinner contestWinners[13]; // 0 - 5 used in contest hall, 6 - 7 unused?, 8 - 12 museum |