diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-01 19:54:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-01 19:54:04 -0400 |
| commit | 75fc4fd359ee2b0c9775d32ae8b86b880ad72585 (patch) | |
| tree | 1519033fd796e93ea79b9cc8fde29c53969e3c1a /include/constants | |
| parent | 193c12d401ac5b1016d77e60c36e8d9960af9d82 (diff) | |
| parent | e5eccf47524d9c40eaa925ed5dccdffce4b5268b (diff) | |
Merge pull request #139 from PikalaxALT/split_835b488
Split 835b488 part 2
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/easy_chat.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h index 2c437c88e..746f10679 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,8 @@ #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 +#define EC_NUM_GROUPS 0x16 // TRAINER #define EC_WORD_I_CHOOSE_YOU (EC_GROUP_TRAINER << 9) | 0x0 @@ -51,7 +52,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 +1031,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 @@ -1075,5 +1074,8 @@ #define EC_GROUP(word) ((word) >> 9) #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 |