Static symbols in easy_chat

asm/link_rfu.s

@@ -8497,7 +8497,7 @@ _0810134A:
 	lsrs r0, 24
 	cmp r0, 0x16
 	beq _0810138A
-	bl sub_80BDFB0
+	bl GetEasyChatWordGroupName
 	adds r2, r0, 0
 	movs r0, 0x54
 	adds r3, r4, 0

asm/mon_markings.s

@@ -981,4 +981,10 @@ sub_80BEBD0: @ 80BEBD0
 _080BEBE8: .4byte gUnknown_83EE028
 	thumb_func_end sub_80BEBD0
 
+	.section ewram_data
+	.align 2, 0
+gUnknown_20399C0:
+	.4byte 0
+
+	.text
 	.align 2, 0 @ Don't pad with nop.

data/strings.s

@@ -4368,7 +4368,7 @@ gEasyChatGroupName_Pokemon2:: @ 841DFDE
 	.string "POKéMON2$"
 
 	@ trade-related
-gUnknown_841E093:: @ 841E093
+gText_ThreeQuestionMarks:: @ 841E093
 	.string "???$"
 
 	.string "$"

include/constants/easy_chat.h

@@ -23,6 +23,7 @@
 #define EC_GROUP_MOVE_2         0x13
 #define EC_GROUP_TRENDY_SAYING  0x14
 #define EC_GROUP_POKEMON        0x15
+#define EC_NUM_GROUPS           0x16
 
 // TRAINER
 #define EC_WORD_I_CHOOSE_YOU  (EC_GROUP_TRAINER << 9) | 0x0
@@ -1073,5 +1074,6 @@
 
 #define EC_GROUP(word) ((word) >> 9)
 #define EC_INDEX(word) ((word) & 0x1FF)
+#define EC_WORD(groupId, index) ((((groupId) & 0x7F) << 9) | ((index) & 0x1FF))
 
 #endif  // GUARD_CONSTANTS_EASY_CHAT_H

include/easy_chat.h

@@ -2,6 +2,7 @@
 #define GUARD_EASYCHAT_H
 
 #include "global.h"
+#include "constants/easy_chat.h"
 
 struct EasyChatWordInfo
 {
@@ -31,13 +32,21 @@ struct EasyChatWordsByLetter
 
 void InitEasyChatPhrases(void);
 void easy_chat_input_maybe(void);
-void CopyEasyChatWord(u8 *dest, u16 word);
+u8 *CopyEasyChatWord(u8 *dest, u16 word);
 bool32 sub_811F8D8(u16 word);
 void InitializeEasyChatWordArray(u16 *words, u16 length);
-void ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2);
+u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2);
 bool8 ECWord_CheckIfOutsideOfValidRange(u16 word);
 void sub_80BDE28(void);
 void InitEasyChatPhrases(void);
 void EnableRareWord(u8);
+bool8 sub_80BDE44(void);
+void sub_80BDE70(void);
+u8 sub_80BDF44(u8);
+void sub_80BE16C(int, u16);
+u16 sub_80BE1D4(void);
+u16 sub_80BE19C(u16);
+const u8 *GetEasyChatWordGroupName(u8);
+u8 *CopyEasyChatWordPadded(u8 *, u16, u16);
 
 #endif // GUARD_EASYCHAT_H

include/global.h

@@ -754,10 +754,10 @@ struct SaveBlock1
     /*0x1000*/ u16 vars[VARS_COUNT];
     /*0x1200*/ u32 gameStats[NUM_GAME_STATS];
     /*0x1300*/ struct QuestLog questLog[4];
-    /*0x2CA0*/ u16 unk2CA0[6];
-    /*0x2CAC*/ u16 unk2CAC[6];
-    /*0x2CB8*/ u16 unk2CB8[6];
-    /*0x2CC4*/ u16 unk2CC4[6];
+    /*0x2CA0*/ u16 easyChatProfile[6];
+    /*0x2CAC*/ u16 easyChatBattleStart[6];
+    /*0x2CB8*/ u16 easyChatBattleWon[6];
+    /*0x2CC4*/ u16 easyChatBattleLost[6];
     /*0x2CD0*/ struct MailStruct mail[MAIL_COUNT];
     /*0x2F10*/ u8 additionalPhrases[EASY_CHAT_EXTRA_PHRASES_SIZE];
     /*0x2F18*/ OldMan oldMan; // unused

include/mevent.h

@@ -69,5 +69,6 @@ u32 MENews_GetInput(u16 input);
 void sub_8143D24(void);
 u16 sub_81445C0(u32 command);
 void sub_8144714(u32 a0, u32 a1);
+u16 *sub_8143DA8(void);
 
 #endif //GUARD_MEVENT_H

include/strings.h

@@ -708,5 +708,6 @@ extern const u8 gEasyChatGroupName_Move1[];
 extern const u8 gEasyChatGroupName_Move2[];
 extern const u8 gEasyChatGroupName_TrendySaying[];
 extern const u8 gEasyChatGroupName_Pokemon2[];
+extern const u8 gText_ThreeQuestionMarks[];
 
 #endif //GUARD_STRINGS_H

ld_script.txt

@@ -174,7 +174,7 @@ SECTIONS {
         src/battle_anim_utility_funcs.o(.text);
         src/battle_intro.o(.text);
         asm/bike.o(.text);
-        asm/easy_chat.o(.text);
+        src/easy_chat.o(.text);
         asm/mon_markings.o(.text);
         src/mail.o(.text);
         src/menu_helpers.o(.text);

src/mail.c

@@ -70,8 +70,8 @@ struct MailViewResources {
     u8 monIconSpriteId;
     u8 unused;
     u8 mailArrangementType;
-    void (*copyEasyChatWord)(u8 *dest, u16 word);
-    void (*convertEasyChatWordsToString)(u8 *dest, const u16 *src, u16 length1, u16 length2);
+    u8 *(*copyEasyChatWord)(u8 *dest, u16 word);
+    u8 *(*convertEasyChatWordsToString)(u8 *dest, const u16 *src, u16 length1, u16 length2);
     const struct MailAttrStruct * messageLayout;
     u16 bg1TilemapBuffer[BG_SCREEN_SIZE];
     u16 bg2TilemapBuffer[BG_SCREEN_SIZE];

src/mevent.c

@@ -772,7 +772,7 @@ void sub_81442CC(struct MEventStruct_Unk1442CC * data)
     CopyTrainerId(data->unk_4C, gSaveBlock2Ptr->playerTrainerId);
     StringCopy(data->unk_45, gSaveBlock2Ptr->playerName);
     for (i = 0; i < 6; i++)
-        data->unk_50[i] = gSaveBlock1Ptr->unk2CA0[i];
+        data->unk_50[i] = gSaveBlock1Ptr->easyChatProfile[i];
     memcpy(data->unk_5C, RomHeaderGameCode, 4);
     data->unk_60 = RomHeaderSoftwareVersion;
 }

src/trade_scene.c

@@ -22,6 +22,7 @@
 #include "script.h"
 #include "event_data.h"
 #include "string_util.h"
+#include "mail.h"
 #include "mail_data.h"
 #include "pokeball.h"
 #include "evolution_scene.h"
@@ -2484,7 +2485,7 @@ static void CreateInGameTradePokemonInternal(u8 playerSlot, u8 inGameTradeIdx)
 static void GetInGameTradeMail(struct MailStruct * mail, const struct InGameTrade * inGameTrade)
 {
     int i;
-    for (i = 0; i < 9; i++)
+    for (i = 0; i < MAIL_WORDS_COUNT; i++)
         mail->words[i] = sInGameTradeMailMessages[inGameTrade->mailNum][i];
     StringCopy(mail->playerName, inGameTrade->otName);
     mail->trainerId[0] = inGameTrade->otId >> 24;

sym_bss.txt

@@ -68,26 +68,8 @@ gUnknown_3000FC8: @ 3000FC8
 gUnknown_3000FE8: @ 3000FE8
 	.space 0x184
 
-gUnknown_300116C: @ 300116C
-	.space 0x4
-
-gUnknown_3001170: @ 3001170
-	.space 0x4
-
-gUnknown_3001174: @ 3001174
-	.space 0x4
-
-gUnknown_3001178: @ 3001178
-	.space 0x4
-
-gUnknown_300117C: @ 300117C
-	.space 0x4
-
-gUnknown_3001180: @ 3001180
-	.space 0x4
-
-gUnknown_3001184: @ 3001184
-	.space 0x4
+	.align 2
+	.include "src/easy_chat.o"
 
 gUnknown_3001188: @ 3001188
 	.space 0x8

sym_ewram.txt

@@ -362,17 +362,16 @@ gUnknown_203998C: @ 203998C
 gUnknown_203999C: @ 203999C
 	.space 0x8
 
-	.include "src/dragon.o"
-	.include "src/battle_anim_utility_funcs.o"
-	.include "src/battle_intro.o"
-
 	.align 2
-gUnknown_20399BC: @ 20399BC
-	.space 0x4
-
-gUnknown_20399C0: @ 20399C0
-	.space 0x4
-
+	.include "src/dragon.o"
+	.align 2
+	.include "src/battle_anim_utility_funcs.o"
+	.align 2
+	.include "src/battle_intro.o"
+	.align 2
+	.include "src/easy_chat.o"
+	.align 2
+	.include "asm/mon_markings.o" @ TODO: Move to src
 	.align 2
 	.include "src/mail.o"
 	.align 2