diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/easy_chat.h | 4 | ||||
| -rw-r--r-- | include/easy_chat.h | 1 | ||||
| -rw-r--r-- | include/overworld.h | 1 | ||||
| -rw-r--r-- | include/strings.h | 36 |
4 files changed, 42 insertions, 0 deletions
diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h index 7261365c2..b43e93da2 100644 --- a/include/constants/easy_chat.h +++ b/include/constants/easy_chat.h @@ -6,6 +6,10 @@ #define EASY_CHAT_TYPE_BATTLE_WON 2 #define EASY_CHAT_TYPE_BATTLE_LOST 3 #define EASY_CHAT_TYPE_MAIL 4 +#define EASY_CHAT_TYPE_MAIL_NO_CONFIRM 5 +#define EASY_CHAT_TYPE_BARD_SONG 6 +#define EASY_CHAT_TYPE_INTERVIEW 7 +#define EASY_CHAT_TYPE_TRENDY_PHRASE 9 #define EASY_CHAT_TYPE_QUESTIONNAIRE 14 #define EC_GROUP_POKEMON_2 0x0 diff --git a/include/easy_chat.h b/include/easy_chat.h index e7ec52fd1..67d14290c 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -46,5 +46,6 @@ u16 GetNumDisplayedWords(void); const u8 *GetEasyChatWordGroupName(u8); u8 *CopyEasyChatWordPadded(u8 *, u16, u16); void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback); +u8 GetNumDisplayableGroups(void); #endif // GUARD_EASY_CHAT_H diff --git a/include/overworld.h b/include/overworld.h index a67c7cd88..daaa5e6e8 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -191,6 +191,7 @@ void sub_8057F70(void); void sub_8057F48(void); void SetMainCallback1(MainCallback cb); void CB1_Overworld(void); +void sub_80568C4(void); extern u16 gHeldKeyCodeToSend; diff --git a/include/strings.h b/include/strings.h index d5c6f4b58..2c1ed13b0 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1313,4 +1313,40 @@ extern const u8 gText_QuestLog_CeruleanCave[]; extern const u8 gUnknown_841B69E[]; extern const u8 gUnknown_841B6B9[]; +// easy_chat_2 +extern const u8 gUnknown_84186D1[]; +extern const u8 gUnknown_84186EF[]; +extern const u8 gUnknown_8418706[]; +extern const u8 gUnknown_8418725[]; +extern const u8 gUnknown_8418745[]; +extern const u8 gUnknown_8418763[]; +extern const u8 gUnknown_8418780[]; +extern const u8 gUnknown_841879E[]; +extern const u8 gUnknown_84187B2[]; +extern const u8 gUnknown_84187D1[]; +extern const u8 gUnknown_84187EE[]; +extern const u8 gUnknown_841880E[]; +extern const u8 gUnknown_841881B[]; +extern const u8 gUnknown_841883E[]; +extern const u8 gUnknown_841885F[]; +extern const u8 gUnknown_8418881[]; +extern const u8 gUnknown_841888C[]; +extern const u8 gUnknown_84188AC[]; +extern const u8 gUnknown_84188B9[]; +extern const u8 gUnknown_84188D6[]; +extern const u8 gUnknown_84188F0[]; +extern const u8 gUnknown_8418902[]; +extern const u8 gUnknown_8418937[]; +extern const u8 gUnknown_8418956[]; +extern const u8 gUnknown_84189E0[]; +extern const u8 gUnknown_84189EE[]; +extern const u8 gUnknown_8418A2B[]; +extern const u8 gUnknown_8418A33[]; +extern const u8 gUnknown_8418A4A[]; +extern const u8 gUnknown_8418A61[]; +extern const u8 gUnknown_8418A77[]; +extern const u8 gUnknown_8418A87[]; +extern const u8 gUnknown_8418AA1[]; +extern const u8 gUnknown_8418AB2[]; + #endif //GUARD_STRINGS_H |