From ecf7cf9835ca2f50b4c483c9ee4156d2057e5406 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 6 Mar 2020 17:07:36 -0500 Subject: through sub_80FFF80 --- include/constants/easy_chat.h | 4 ++++ include/easy_chat.h | 1 + include/overworld.h | 1 + include/strings.h | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+) (limited to 'include') 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 -- cgit v1.2.3 From 6ce70985ebcb78267290e35e65aadb6a433c1cba Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Mar 2020 12:37:18 -0500 Subject: through sub_8100B70 --- include/easy_chat.h | 23 +++++++++++++++++++++++ include/graphics.h | 4 ++++ 2 files changed, 27 insertions(+) (limited to 'include') diff --git a/include/easy_chat.h b/include/easy_chat.h index 67d14290c..12c096136 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -47,5 +47,28 @@ const u8 *GetEasyChatWordGroupName(u8); u8 *CopyEasyChatWordPadded(u8 *, u16, u16); void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback); u8 GetNumDisplayableGroups(void); +bool8 sub_80FFF80(void); +bool8 sub_80FFF98(void); +void sub_810011C(void); +void sub_8100134(u16 v0); +bool8 sub_810014C(void); +u8 GetEasyChatScreenFrameId(void); +const u8 *GetTitleText(void); +u16 *GetEasyChatWordBuffer(void); +u8 GetNumRows(void); +u8 GetNumColumns(void); +u8 GetMainCursorColumn(void); +u8 GetMainCursorRow(void); +void GetEasyChatInstructionsText(const u8 **str1, const u8 **str2); +void GetEasyChatConfirmText(const u8 **str1, const u8 **str2); +void sub_80FFDC8(const u8 **str1, const u8 **str2); +void GetEasyChatConfirmDeletionText(const u8 **str1, const u8 **str2); +void sub_80FFE08(u8 *arg0, u8 *arg1); +u8 sub_80FFE1C(void); +u8 sub_80FFE28(void); +void sub_80FFE34(u8 *arg0, u8 *arg1); +u8 sub_80FFE48(void); +u8 sub_80FFE54(void); +u8 unref_sub_80FFE60(void); #endif // GUARD_EASY_CHAT_H diff --git a/include/graphics.h b/include/graphics.h index 2c3aa7c4b..5bac692a4 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4886,4 +4886,8 @@ extern const u16 gUnknown_8EAFEA0[]; extern const u32 gUnknown_8EAFFC0[]; extern const u32 gUnknown_8EB0ADC[]; +// easy_chat_3 +extern const u32 gEasyChatWindow_Gfx[]; +extern const u32 gEasyChatWindow_Tilemap[]; + #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From ab1d075682a34164ed82810108f909e1f9b46390 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Mar 2020 18:05:54 -0500 Subject: through sub_8101558 --- include/data_8479668.h | 5 +++++ include/graphics.h | 1 + 2 files changed, 6 insertions(+) (limited to 'include') diff --git a/include/data_8479668.h b/include/data_8479668.h index 1a1f44267..aba3721c8 100644 --- a/include/data_8479668.h +++ b/include/data_8479668.h @@ -32,4 +32,9 @@ extern const u8 gText_UnionRoomChatKeyboard_Emoji8[]; extern const u8 gText_UnionRoomChatKeyboard_Emoji9[]; extern const u8 gText_UnionRoomChatKeyboard_Emoji10[]; +extern const u8 gUnknown_847A8D8[]; +extern const u8 gUnknown_847A8FA[]; +extern const u8 gUnknown_847A913[]; +extern const u8 gUnknown_847A934[]; + #endif //GUARD_DATA_8479668_H diff --git a/include/graphics.h b/include/graphics.h index 5bac692a4..2b449ea94 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4889,5 +4889,6 @@ extern const u32 gUnknown_8EB0ADC[]; // easy_chat_3 extern const u32 gEasyChatWindow_Gfx[]; extern const u32 gEasyChatWindow_Tilemap[]; +extern const u32 gEasyChatMode_Pal[]; #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From 40e4ef8f77caf47932d3b2c75481be9680eeea17 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Mar 2020 20:46:29 -0500 Subject: through sub_8101BA8 --- include/graphics.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 2b449ea94..19f2ad4a8 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4890,5 +4890,9 @@ extern const u32 gUnknown_8EB0ADC[]; extern const u32 gEasyChatWindow_Gfx[]; extern const u32 gEasyChatWindow_Tilemap[]; extern const u32 gEasyChatMode_Pal[]; +extern const u16 gUnknown_8E99F24[]; +extern const u32 gUnknown_8E9BD28[]; +extern const u32 gUnknown_8E99F44[]; +extern const u32 gUnknown_8E9A168[]; #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From c81edda7956500731d66b55b5b3c98cada723347 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Mar 2020 21:29:31 -0500 Subject: through sub_8101F80 --- include/easy_chat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/easy_chat.h b/include/easy_chat.h index 12c096136..5e918c887 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -66,7 +66,7 @@ void GetEasyChatConfirmDeletionText(const u8 **str1, const u8 **str2); void sub_80FFE08(u8 *arg0, u8 *arg1); u8 sub_80FFE1C(void); u8 sub_80FFE28(void); -void sub_80FFE34(u8 *arg0, u8 *arg1); +void sub_80FFE34(s8 *arg0, s8 *arg1); u8 sub_80FFE48(void); u8 sub_80FFE54(void); u8 unref_sub_80FFE60(void); -- cgit v1.2.3 From e1537a1d728a8e2d217d5224e3d813da6f5fa222 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Mar 2020 09:49:07 -0400 Subject: easy_chat_3 finish decomp --- include/easy_chat.h | 2 ++ include/strings.h | 1 + 2 files changed, 3 insertions(+) (limited to 'include') diff --git a/include/easy_chat.h b/include/easy_chat.h index 5e918c887..4830a134e 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -70,5 +70,7 @@ void sub_80FFE34(s8 *arg0, s8 *arg1); u8 sub_80FFE48(void); u8 sub_80FFE54(void); u8 unref_sub_80FFE60(void); +bool32 sub_80FFE64(void); +bool32 sub_80FFE98(void); #endif // GUARD_EASY_CHAT_H diff --git a/include/strings.h b/include/strings.h index 2c1ed13b0..443d84de2 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1348,5 +1348,6 @@ extern const u8 gUnknown_8418A77[]; extern const u8 gUnknown_8418A87[]; extern const u8 gUnknown_8418AA1[]; extern const u8 gUnknown_8418AB2[]; +extern const u8 gUnknown_841EE2B[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From a9b72fbd7f00a1337c2f91f57d83110dbaeb1fa5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Mar 2020 12:32:34 -0400 Subject: Document Easy Chat 2/3 --- include/easy_chat.h | 28 ++++++++++++++-------------- include/graphics.h | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'include') diff --git a/include/easy_chat.h b/include/easy_chat.h index 4830a134e..e04db7b35 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -47,11 +47,11 @@ const u8 *GetEasyChatWordGroupName(u8); u8 *CopyEasyChatWordPadded(u8 *, u16, u16); void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback); u8 GetNumDisplayableGroups(void); -bool8 sub_80FFF80(void); -bool8 sub_80FFF98(void); -void sub_810011C(void); -void sub_8100134(u16 v0); -bool8 sub_810014C(void); +bool8 InitEasyChatGraphicsWork(void); +bool8 LoadEasyChatGraphics(void); +void DestroyEasyChatGraphicsResources(void); +void EasyChatInterfaceCommand_Setup(u16 id); +bool8 EasyChatInterfaceCommand_Run(void); u8 GetEasyChatScreenFrameId(void); const u8 *GetTitleText(void); u16 *GetEasyChatWordBuffer(void); @@ -61,16 +61,16 @@ u8 GetMainCursorColumn(void); u8 GetMainCursorRow(void); void GetEasyChatInstructionsText(const u8 **str1, const u8 **str2); void GetEasyChatConfirmText(const u8 **str1, const u8 **str2); -void sub_80FFDC8(const u8 **str1, const u8 **str2); +void GetEasyChatConfirmCancelText(const u8 **str1, const u8 **str2); void GetEasyChatConfirmDeletionText(const u8 **str1, const u8 **str2); -void sub_80FFE08(u8 *arg0, u8 *arg1); -u8 sub_80FFE1C(void); -u8 sub_80FFE28(void); -void sub_80FFE34(s8 *arg0, s8 *arg1); -u8 sub_80FFE48(void); -u8 sub_80FFE54(void); +void GetECSelectGroupCursorCoords(u8 *Xp, u8 *Yp); +bool8 IsEasyChatAlphaMode(void); +u8 GetECSelectGroupRowsAbove(void); +void GetECSelectWordCursorCoords(s8 *arg0, s8 *arg1); +u8 GetECSelectWordRowsAbove(void); +u8 GetECSelectWordNumRows(void); u8 unref_sub_80FFE60(void); -bool32 sub_80FFE64(void); -bool32 sub_80FFE98(void); +bool32 ShouldDrawECUpArrow(void); +bool32 ShouldDrawECDownArrow(void); #endif // GUARD_EASY_CHAT_H diff --git a/include/graphics.h b/include/graphics.h index 19f2ad4a8..a61d5f62f 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4891,8 +4891,8 @@ extern const u32 gEasyChatWindow_Gfx[]; extern const u32 gEasyChatWindow_Tilemap[]; extern const u32 gEasyChatMode_Pal[]; extern const u16 gUnknown_8E99F24[]; -extern const u32 gUnknown_8E9BD28[]; -extern const u32 gUnknown_8E99F44[]; -extern const u32 gUnknown_8E9A168[]; +extern const u32 gEasyChatRedRectangularCursor_Tiles[]; +extern const u32 gEasyChatSelectGroupHelp_Tiles[]; +extern const u32 gEasyChatModeIcons_Tiles[]; #endif //GUARD_GRAPHICS_H -- cgit v1.2.3 From 5d7c0e9bb041ec4c7d8fd3c88c02ac1f25e200a7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 8 Mar 2020 12:55:16 -0400 Subject: Remove duplicate decl; use EASY_CHAT_TYPE define in mystery_event_club.inc --- include/easy_chat.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/easy_chat.h b/include/easy_chat.h index e04db7b35..11711cbbc 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -30,7 +30,6 @@ struct EasyChatWordsByLetter int numWords; }; -void InitEasyChatPhrases(void); u8 *CopyEasyChatWord(u8 *dest, u16 word); u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2); bool8 EC_DoesEasyChatStringFitOnLine(const u16 *easyChatWords, u8 columns, u8 rows, u16 maxLength); -- cgit v1.2.3