update easy chat constants

1 files changed, 19 insertions, 35 deletions

diff --git a/constants/easy_chat_constants.s b/constants/easy_chat_constants.s
index 26089c294..dd42fc5fa 100644
--- a/constants/easy_chat_constants.s
+++ b/constants/easy_chat_constants.s
@@ -19,9 +19,8 @@
 	.set EC_GROUP_MOVE_1,        0x12
 	.set EC_GROUP_MOVE_2,        0x13
 	.set EC_GROUP_TRENDY_SAYING, 0x14
-	.set EC_GROUP_POKEMON2,      0x15
-
-; Trainer
+	.set EC_GROUP_POKEMON_2,     0x15
+; TRAINER
 	.set EC_WORD_I_CHOOSE_YOU, (EC_GROUP_TRAINER << 9) | 0x0
 	.set EC_WORD_GOTCHA,       (EC_GROUP_TRAINER << 9) | 0x1
 	.set EC_WORD_TRADE,        (EC_GROUP_TRAINER << 9) | 0x2
@@ -41,16 +40,8 @@
 	.set EC_WORD_POKEDEX,      (EC_GROUP_TRAINER << 9) | 0x10
 	.set EC_WORD_RUBY,         (EC_GROUP_TRAINER << 9) | 0x11
 	.set EC_WORD_LEVEL,        (EC_GROUP_TRAINER << 9) | 0x12
-	.set EC_WORD_RED,          (EC_GROUP_TRAINER << 9) | 0x13
-	.set EC_WORD_GREEN,        (EC_GROUP_TRAINER << 9) | 0x14
-	.set EC_WORD_BAG,          (EC_GROUP_TRAINER << 9) | 0x15
-	.set EC_WORD_FLAME,        (EC_GROUP_TRAINER << 9) | 0x16
-	.set EC_WORD_GOLD,         (EC_GROUP_TRAINER << 9) | 0x17
-	.set EC_WORD_LEAF,         (EC_GROUP_TRAINER << 9) | 0x18
-	.set EC_WORD_SILVER,       (EC_GROUP_TRAINER << 9) | 0x19
-	.set EC_WORD_EMERALD,      (EC_GROUP_TRAINER << 9) | 0x1a
 
-; Status
+; STATUS
 	.set EC_WORD_DARK,         (EC_GROUP_STATUS << 9) | 0x0
 	.set EC_WORD_STENCH,       (EC_GROUP_STATUS << 9) | 0x1
 	.set EC_WORD_THICK_FAT,    (EC_GROUP_STATUS << 9) | 0x2
@@ -161,7 +152,7 @@
 	.set EC_WORD_PURE_POWER,   (EC_GROUP_STATUS << 9) | 0x6b
 	.set EC_WORD_SHIELD_DUST,  (EC_GROUP_STATUS << 9) | 0x6c
 
-; Battle
+; BATTLE
 	.set EC_WORD_MATCH_UP,    (EC_GROUP_BATTLE << 9) | 0x0
 	.set EC_WORD_GO,          (EC_GROUP_BATTLE << 9) | 0x1
 	.set EC_WORD_NO_1,        (EC_GROUP_BATTLE << 9) | 0x2
@@ -226,7 +217,7 @@
 	.set EC_WORD_RULE,        (EC_GROUP_BATTLE << 9) | 0x3d
 	.set EC_WORD_MOVE,        (EC_GROUP_BATTLE << 9) | 0x3e
 
-; Greetings
+; GREETINGS
 	.set EC_WORD_THANKS,         (EC_GROUP_GREETINGS << 9) | 0x0
 	.set EC_WORD_YES,            (EC_GROUP_GREETINGS << 9) | 0x1
 	.set EC_WORD_HERE_GOES,      (EC_GROUP_GREETINGS << 9) | 0x2
@@ -270,7 +261,7 @@
 	.set EC_WORD_COME_OVER,      (EC_GROUP_GREETINGS << 9) | 0x28
 	.set EC_WORD_COUNT_ON,       (EC_GROUP_GREETINGS << 9) | 0x29
 
-; People
+; PEOPLE
 	.set EC_WORD_OPPONENT,    (EC_GROUP_PEOPLE << 9) | 0x0
 	.set EC_WORD_I,           (EC_GROUP_PEOPLE << 9) | 0x1
 	.set EC_WORD_YOU,         (EC_GROUP_PEOPLE << 9) | 0x2
@@ -347,7 +338,7 @@
 	.set EC_WORD_SHE_IS,      (EC_GROUP_PEOPLE << 9) | 0x49
 	.set EC_WORD_SOME,        (EC_GROUP_PEOPLE << 9) | 0x4a
 
-; Voices
+; VOICES
 	.set EC_WORD_EXCL,                       (EC_GROUP_VOICES << 9) | 0x0
 	.set EC_WORD_EXCL_EXCL,                  (EC_GROUP_VOICES << 9) | 0x1
 	.set EC_WORD_QUES_EXCL,                  (EC_GROUP_VOICES << 9) | 0x2
@@ -412,7 +403,7 @@
 	.set EC_WORD_GWAH,                       (EC_GROUP_VOICES << 9) | 0x3d
 	.set EC_WORD_WAHAHAHA,                   (EC_GROUP_VOICES << 9) | 0x3e
 
-; Speech
+; SPEECH
 	.set EC_WORD_LISTEN,     (EC_GROUP_SPEECH << 9) | 0x0
 	.set EC_WORD_NOT_VERY,   (EC_GROUP_SPEECH << 9) | 0x1
 	.set EC_WORD_MEAN,       (EC_GROUP_SPEECH << 9) | 0x2
@@ -474,7 +465,7 @@
 	.set EC_WORD_INSTEAD,    (EC_GROUP_SPEECH << 9) | 0x3a
 	.set EC_WORD_FANTASTIC,  (EC_GROUP_SPEECH << 9) | 0x3b
 
-; Endings
+; ENDINGS
 	.set EC_WORD_WILL,          (EC_GROUP_ENDINGS << 9) | 0x0
 	.set EC_WORD_WILL_BE_HERE,  (EC_GROUP_ENDINGS << 9) | 0x1
 	.set EC_WORD_OR,            (EC_GROUP_ENDINGS << 9) | 0x2
@@ -545,7 +536,7 @@
 	.set EC_WORD_ONCE,          (EC_GROUP_ENDINGS << 9) | 0x43
 	.set EC_WORD_ANYWHERE,      (EC_GROUP_ENDINGS << 9) | 0x44
 
-; Feelings
+; FEELINGS
 	.set EC_WORD_MEET,         (EC_GROUP_FEELINGS << 9) | 0x0
 	.set EC_WORD_PLAY,         (EC_GROUP_FEELINGS << 9) | 0x1
 	.set EC_WORD_HURRIED,      (EC_GROUP_FEELINGS << 9) | 0x2
@@ -616,7 +607,7 @@
 	.set EC_WORD_UNDERSTAND,   (EC_GROUP_FEELINGS << 9) | 0x43
 	.set EC_WORD_UNDERSTANDS,  (EC_GROUP_FEELINGS << 9) | 0x44
 
-; Conditions
+; CONDITIONS
 	.set EC_WORD_HOT,          (EC_GROUP_CONDITIONS << 9) | 0x0
 	.set EC_WORD_EXISTS,       (EC_GROUP_CONDITIONS << 9) | 0x1
 	.set EC_WORD_EXCESS,       (EC_GROUP_CONDITIONS << 9) | 0x2
@@ -687,7 +678,7 @@
 	.set EC_WORD_SEEMS,        (EC_GROUP_CONDITIONS << 9) | 0x43
 	.set EC_WORD_BADLY,        (EC_GROUP_CONDITIONS << 9) | 0x44
 
-; Actions
+; ACTIONS
 	.set EC_WORD_MEETS,     (EC_GROUP_ACTIONS << 9) | 0x0
 	.set EC_WORD_CONCEDE,   (EC_GROUP_ACTIONS << 9) | 0x1
 	.set EC_WORD_GIVE,      (EC_GROUP_ACTIONS << 9) | 0x2
@@ -767,7 +758,7 @@
 	.set EC_WORD_FAINT,     (EC_GROUP_ACTIONS << 9) | 0x4c
 	.set EC_WORD_FAINTED,   (EC_GROUP_ACTIONS << 9) | 0x4d
 
-; Lifestyle
+; LIFESTYLE
 	.set EC_WORD_CHORES,       (EC_GROUP_LIFESTYLE << 9) | 0x0
 	.set EC_WORD_HOME,         (EC_GROUP_LIFESTYLE << 9) | 0x1
 	.set EC_WORD_MONEY,        (EC_GROUP_LIFESTYLE << 9) | 0x2
@@ -814,7 +805,7 @@
 	.set EC_WORD_RENTAL,       (EC_GROUP_LIFESTYLE << 9) | 0x2b
 	.set EC_WORD_WORLD,        (EC_GROUP_LIFESTYLE << 9) | 0x2c
 
-; Hobbies
+; HOBBIES
 	.set EC_WORD_IDOL,         (EC_GROUP_HOBBIES << 9) | 0x0
 	.set EC_WORD_ANIME,        (EC_GROUP_HOBBIES << 9) | 0x1
 	.set EC_WORD_SONG,         (EC_GROUP_HOBBIES << 9) | 0x2
@@ -870,7 +861,7 @@
 	.set EC_WORD_VACATION,     (EC_GROUP_HOBBIES << 9) | 0x34
 	.set EC_WORD_LOOK,         (EC_GROUP_HOBBIES << 9) | 0x35
 
-; Time
+; TIME
 	.set EC_WORD_FALL,      (EC_GROUP_TIME << 9) | 0x0
 	.set EC_WORD_MORNING,   (EC_GROUP_TIME << 9) | 0x1
 	.set EC_WORD_TOMORROW,  (EC_GROUP_TIME << 9) | 0x2
@@ -917,7 +908,7 @@
 	.set EC_WORD_NIGHT,     (EC_GROUP_TIME << 9) | 0x2b
 	.set EC_WORD_WEEK,      (EC_GROUP_TIME << 9) | 0x2c
 
-; Misc.
+; MISC
 	.set EC_WORD_HIGHS,           (EC_GROUP_MISC << 9) | 0x0
 	.set EC_WORD_LOWS,            (EC_GROUP_MISC << 9) | 0x1
 	.set EC_WORD_UM,              (EC_GROUP_MISC << 9) | 0x2
@@ -961,7 +952,7 @@
 	.set EC_WORD_LEFT,            (EC_GROUP_MISC << 9) | 0x28
 	.set EC_WORD_RIGHT,           (EC_GROUP_MISC << 9) | 0x29
 
-; Adjectives
+; ADJECTIVES
 	.set EC_WORD_WANDERING,    (EC_GROUP_ADJECTIVES << 9) | 0x0
 	.set EC_WORD_RICKETY,      (EC_GROUP_ADJECTIVES << 9) | 0x1
 	.set EC_WORD_ROCK_SOLID,   (EC_GROUP_ADJECTIVES << 9) | 0x2
@@ -999,7 +990,7 @@
 	.set EC_WORD_HAPPILY,      (EC_GROUP_ADJECTIVES << 9) | 0x22
 	.set EC_WORD_ANTICIPATION, (EC_GROUP_ADJECTIVES << 9) | 0x23
 
-; Events
+; EVENTS
 	.set EC_WORD_APPEAL,       (EC_GROUP_EVENTS << 9) | 0x0
 	.set EC_WORD_EVENTS,       (EC_GROUP_EVENTS << 9) | 0x1
 	.set EC_WORD_STAY_AT_HOME, (EC_GROUP_EVENTS << 9) | 0x2
@@ -1022,15 +1013,8 @@
 	.set EC_WORD_MASTER,       (EC_GROUP_EVENTS << 9) | 0x13
 	.set EC_WORD_RANK,         (EC_GROUP_EVENTS << 9) | 0x14
 	.set EC_WORD_RIBBON,       (EC_GROUP_EVENTS << 9) | 0x15
-	.set EC_WORD_CRUSH,        (EC_GROUP_EVENTS << 9) | 0x16
-	.set EC_WORD_DIRECT,       (EC_GROUP_EVENTS << 9) | 0x17
-	.set EC_WORD_TOWER,        (EC_GROUP_EVENTS << 9) | 0x18
-	.set EC_WORD_UNION,        (EC_GROUP_EVENTS << 9) | 0x19
-	.set EC_WORD_ROOM,         (EC_GROUP_EVENTS << 9) | 0x1a
-	.set EC_WORD_WIRELESS,     (EC_GROUP_EVENTS << 9) | 0x1b
-	.set EC_WORD_FRONTIER,     (EC_GROUP_EVENTS << 9) | 0x1c
 
-; Trendy Saying
+; TRENDY_SAYING
 	.set EC_WORD_KTHX_BYE,      (EC_GROUP_TRENDY_SAYING << 9) | 0x0
 	.set EC_WORD_YES_SIR_EXCL,  (EC_GROUP_TRENDY_SAYING << 9) | 0x1
 	.set EC_WORD_AVANT_GARDE,   (EC_GROUP_TRENDY_SAYING << 9) | 0x2