From a8c2fecbd5427ad504d5b9be543edf549e792508 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 1 Nov 2019 13:36:16 -0400 Subject: Redump easy chat to C --- include/constants/easy_chat.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include/constants') diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h index 2c437c88e..5d6536490 100644 --- a/include/constants/easy_chat.h +++ b/include/constants/easy_chat.h @@ -1,7 +1,7 @@ #ifndef GUARD_CONSTANTS_EASY_CHAT_H #define GUARD_CONSTANTS_EASY_CHAT_H -#define EC_GROUP_POKEMON 0x0 +#define EC_GROUP_POKEMON_2 0x0 #define EC_GROUP_TRAINER 0x1 #define EC_GROUP_STATUS 0x2 #define EC_GROUP_BATTLE 0x3 @@ -22,7 +22,7 @@ #define EC_GROUP_MOVE_1 0x12 #define EC_GROUP_MOVE_2 0x13 #define EC_GROUP_TRENDY_SAYING 0x14 -#define EC_GROUP_POKEMON_2 0x15 +#define EC_GROUP_POKEMON 0x15 // TRAINER #define EC_WORD_I_CHOOSE_YOU (EC_GROUP_TRAINER << 9) | 0x0 @@ -51,7 +51,6 @@ #define EC_WORD_GOLD (EC_GROUP_TRAINER << 9) | 0x17 #define EC_WORD_LEAF (EC_GROUP_TRAINER << 9) | 0x18 #define EC_WORD_SILVER (EC_GROUP_TRAINER << 9) | 0x19 -#define EC_WORD_EMERALD (EC_GROUP_TRAINER << 9) | 0x1a // STATUS #define EC_WORD_DARK (EC_GROUP_STATUS << 9) | 0x0 @@ -1031,7 +1030,6 @@ #define EC_WORD_UNION (EC_GROUP_EVENTS << 9) | 0x19 #define EC_WORD_ROOM (EC_GROUP_EVENTS << 9) | 0x1a #define EC_WORD_WIRELESS (EC_GROUP_EVENTS << 9) | 0x1b -#define EC_WORD_FRONTIER (EC_GROUP_EVENTS << 9) | 0x1c // TRENDY_SAYING #define EC_WORD_KTHX_BYE (EC_GROUP_TRENDY_SAYING << 9) | 0x0 -- cgit v1.2.3 From 36bea47ea6d2a76a0add9eaf7f5f817eea9c49e5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 1 Nov 2019 15:59:24 -0400 Subject: Static symbols in easy_chat --- include/constants/easy_chat.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/constants') diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h index 5d6536490..11a8a1ba7 100644 --- a/include/constants/easy_chat.h +++ b/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 -- cgit v1.2.3 From 2100eb9d8194683f8814237c16333b76bfb2c0c9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 1 Nov 2019 16:40:31 -0400 Subject: Document easy_chat --- include/constants/easy_chat.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/constants') diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h index 11a8a1ba7..746f10679 100644 --- a/include/constants/easy_chat.h +++ b/include/constants/easy_chat.h @@ -1076,4 +1076,6 @@ #define EC_INDEX(word) ((word) & 0x1FF) #define EC_WORD(groupId, index) ((((groupId) & 0x7F) << 9) | ((index) & 0x1FF)) +#define EC_WORD_UNDEFINED (0xFFFF) + #endif // GUARD_CONSTANTS_EASY_CHAT_H -- cgit v1.2.3