diff options
| author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-05-07 14:42:45 +0200 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-05-07 10:15:38 -0700 |
| commit | 91208b74b8e7cf6c18526417d7a3c093c955c1fe (patch) | |
| tree | 36a364887e57f3220df0e45c72d40b3e38d037fa /include | |
| parent | 525461441400312659935f7c6ed752330d99de9a (diff) | |
Start decompiling easy_chat
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.inc.h | 3 | ||||
| -rw-r--r-- | include/easy_chat.h | 32 | ||||
| -rw-r--r-- | include/global.h | 9 |
3 files changed, 39 insertions, 5 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index 430664517..da5c02113 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -321,9 +321,8 @@ void sub_80C8F34(u8); // asm/easy_chat.o void sub_80E6764(void); -void sub_80EB3FC(u8 *, u16); +u8* sub_80EB3FC(u8 *, u16); u8 ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16); -u16 sub_80EB72C(u16); // asm/pokenav.o void sub_80EBA5C(void); diff --git a/include/easy_chat.h b/include/easy_chat.h new file mode 100644 index 000000000..ee5ac4138 --- /dev/null +++ b/include/easy_chat.h @@ -0,0 +1,32 @@ +#ifndef GUARD_EASYCHAT_H +#define GUARD_EASYCHAT_H + +enum { + EC_GROUP_POKEMON, + EC_GROUP_TRAINER, + EC_GROUP_STATUS, + EC_GROUP_BATTLE, + EC_GROUP_GREETINGS, + EC_GROUP_PEOPLE, + EC_GROUP_VOICES, + EC_GROUP_SPEECH, + EC_GROUP_ENDINGS, + EC_GROUP_FEELINGS, + EC_GROUP_CONDITIONS, + EC_GROUP_ACTIONS, + EC_GROUP_LIFESTYLE, + EC_GROUP_HOBBIES, + EC_GROUP_TIME, + EC_GROUP_MISC, + EC_GROUP_ADJECTIVES, + EC_GROUP_EVENTS, + EC_GROUP_MOVE_1, + EC_GROUP_MOVE_2, + EC_GROUP_TRENDY_SAYING, + EC_GROUP_POKEMON_2, +}; + + +u16 sub_80EB72C(u16 group); + +#endif // GUARD_EASYCHAT_H diff --git a/include/global.h b/include/global.h index 4d9c837fa..5de9f48d3 100644 --- a/include/global.h +++ b/include/global.h @@ -386,10 +386,13 @@ struct SaveBlock1 /* 0x02025734 */ /*0x2B0D*/ u8 outbreakPokemonProbability; /*0x2B0E*/ u16 outbreakUnk5; /*0x2B10*/ u8 filler_2B0E[0xC]; - /*0x2B1C*/ u16 unk2B1C[4]; - /*0x2B24*/ u8 filler_2B24[0x28]; + /*0x2B1C*/ u16 unk2B1C[6]; + /*0x2B28*/ u16 unk2B28[6]; + /*0x2B34*/ u16 unk2B34[6]; + /*0x2B40*/ u16 unk2B40[6]; /*0x2B4C*/ struct MailStruct mail[16]; - /*0x2D8C*/ u8 filler_2D8C[0x8]; + /*0x2D8C*/ u8 unk2D8C[4]; + /*0x2D90*/ u8 filler_2D90[0x4]; /*0x2D94*/ OldMan oldMan; /*0x2DC0*/ u8 unk_2DC0[0x14]; /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff |