Static symbols in easy_chat

This commit is contained in:
PikalaxALT
2019-11-01 15:59:24 -04:00
parent 486a3abf6b
commit 36bea47ea6
16 changed files with 198 additions and 6066 deletions
+2
View File
@@ -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
+11 -2
View File
@@ -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
+4 -4
View File
@@ -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
+1
View File
@@ -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
+1
View File
@@ -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