restructure easy chat group words

26 files changed, 77 insertions, 77 deletions

diff --git a/asm/rom.s b/asm/rom.s
index b01c17958..64b5e86e3 100644
--- a/asm/rom.s
+++ b/asm/rom.s
@@ -483124,7 +483124,7 @@ _080EB094:
 	pop {r0}
 	bx r0
 	.align 2
-_080EB0A4: .4byte gEasyChatGroups
+_080EB0A4: .4byte gEasyChatGroupWords
 _080EB0A8: .4byte gUnknown_083DB694
 _080EB0AC: .4byte 0x000041a4
 	thumb_func_end sub_80EB040
@@ -483551,7 +483551,7 @@ _080EB3C2:
 	bcc _080EB3C2
 	b _080EB3F4
 	.align 2
-_080EB3D8: .4byte gEasyChatGroups
+_080EB3D8: .4byte gEasyChatGroupWords
 _080EB3DC: .4byte gEasyChatGroupSizes
 _080EB3E0:
 	ldr r0, _080EB3F0
@@ -483669,7 +483669,7 @@ _080EB4A6:
 	pop {r1}
 	bx r1
 	.align 2
-_080EB4AC: .4byte gEasyChatGroups
+_080EB4AC: .4byte gEasyChatGroupWords
 _080EB4B0: .4byte 0x0000ffff
 	thumb_func_end sub_80EB3FC
 
@@ -483914,7 +483914,7 @@ _080EB660:
 	movs r2, 0
 	b _080EB674
 	.align 2
-_080EB664: .4byte gEasyChatGroups
+_080EB664: .4byte gEasyChatGroupWords
 _080EB668: .4byte 0x0000ffff
 _080EB66C:
 	adds r1, 0x1
@@ -484077,7 +484077,7 @@ _080EB766:
 	bx r1
 	.align 2
 _080EB778: .4byte gEasyChatGroupSizes
-_080EB77C: .4byte gEasyChatGroups
+_080EB77C: .4byte gEasyChatGroupWords
 _080EB780: .4byte 0x000001ff
 	thumb_func_end sub_80EB72C
 
@@ -484474,7 +484474,7 @@ _080EBA48:
 	pop {r1}
 	bx r1
 	.align 2
-_080EBA50: .4byte gEasyChatGroups
+_080EBA50: .4byte gEasyChatGroupWords
 _080EBA54: .4byte gEasyChatGroupSizes
 _080EBA58: .4byte 0x0000ffff
 	thumb_func_end sub_80EB9D8
diff --git a/data/data2.s b/data/data2.s
index 2397c6c55..e17ff16a0 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -3954,7 +3954,7 @@ gUnknown_083DBEAC: ; 83DBEAC
 	.incbin "baserom.gba", 0x003dbeac, 0x80
 
 ; 83DBF2C
-	.include "data/text/easy_chat/groups.s"
+	.include "data/text/easy_chat/group_words.s"
 
 gUnknown_083DE138: ; 83DE138
 	.incbin "baserom.gba", 0x003de138, 0xe8a
diff --git a/data/text/easy_chat/group_words.s b/data/text/easy_chat/group_words.s
new file mode 100644
index 000000000..47738d985
--- /dev/null
+++ b/data/text/easy_chat/group_words.s
@@ -0,0 +1,48 @@
+	.include "data/text/easy_chat/groups/pokemon/words.s"
+	.include "data/text/easy_chat/groups/trainer/words.s"
+	.include "data/text/easy_chat/groups/status/words.s"
+	.include "data/text/easy_chat/groups/battle/words.s"
+	.include "data/text/easy_chat/groups/greetings/words.s"
+	.include "data/text/easy_chat/groups/people/words.s"
+	.include "data/text/easy_chat/groups/voices/words.s"
+	.include "data/text/easy_chat/groups/speech/words.s"
+	.include "data/text/easy_chat/groups/endings/words.s"
+	.include "data/text/easy_chat/groups/feelings/words.s"
+	.include "data/text/easy_chat/groups/conditions/words.s"
+	.include "data/text/easy_chat/groups/actions/words.s"
+	.include "data/text/easy_chat/groups/lifestyle/words.s"
+	.include "data/text/easy_chat/groups/hobbies/words.s"
+	.include "data/text/easy_chat/groups/time/words.s"
+	.include "data/text/easy_chat/groups/misc/words.s"
+	.include "data/text/easy_chat/groups/adjectives/words.s"
+	.include "data/text/easy_chat/groups/event/words.s"
+	.include "data/text/easy_chat/groups/move_1/words.s"
+	.include "data/text/easy_chat/groups/move_2/words.s"
+	.include "data/text/easy_chat/groups/trendy_saying/words.s"
+	.include "data/text/easy_chat/groups/pokemon2/words.s"
+
+	.align 2
+
+gEasyChatGroupWords: ; 83DE0E0
+	.4byte gEasyChatGroupWords_Pokemon
+	.4byte gEasyChatGroupWords_Trainer
+	.4byte gEasyChatGroupWords_Status
+	.4byte gEasyChatGroupWords_Battle
+	.4byte gEasyChatGroupWords_Greetings
+	.4byte gEasyChatGroupWords_People
+	.4byte gEasyChatGroupWords_Voices
+	.4byte gEasyChatGroupWords_Speech
+	.4byte gEasyChatGroupWords_Endings
+	.4byte gEasyChatGroupWords_Feelings
+	.4byte gEasyChatGroupWords_Conditions
+	.4byte gEasyChatGroupWords_Actions
+	.4byte gEasyChatGroupWords_Lifestyle
+	.4byte gEasyChatGroupWords_Hobbies
+	.4byte gEasyChatGroupWords_Time
+	.4byte gEasyChatGroupWords_Misc
+	.4byte gEasyChatGroupWords_Adjectives
+	.4byte gEasyChatGroupWords_Event
+	.4byte gEasyChatGroupWords_Move1
+	.4byte gEasyChatGroupWords_Move2
+	.4byte gEasyChatGroupWords_TrendySaying
+	.4byte gEasyChatGroupWords_Pokemon2
diff --git a/data/text/easy_chat/groups.s b/data/text/easy_chat/groups.s
deleted file mode 100644
index e0673eae6..000000000
--- a/data/text/easy_chat/groups.s
+++ /dev/null
@@ -1,48 +0,0 @@
-	.include "data/text/easy_chat/groups/pokemon.s"
-	.include "data/text/easy_chat/groups/trainer.s"
-	.include "data/text/easy_chat/groups/status.s"
-	.include "data/text/easy_chat/groups/battle.s"
-	.include "data/text/easy_chat/groups/greetings.s"
-	.include "data/text/easy_chat/groups/people.s"
-	.include "data/text/easy_chat/groups/voices.s"
-	.include "data/text/easy_chat/groups/speech.s"
-	.include "data/text/easy_chat/groups/endings.s"
-	.include "data/text/easy_chat/groups/feelings.s"
-	.include "data/text/easy_chat/groups/conditions.s"
-	.include "data/text/easy_chat/groups/actions.s"
-	.include "data/text/easy_chat/groups/lifestyle.s"
-	.include "data/text/easy_chat/groups/hobbies.s"
-	.include "data/text/easy_chat/groups/time.s"
-	.include "data/text/easy_chat/groups/misc.s"
-	.include "data/text/easy_chat/groups/adjectives.s"
-	.include "data/text/easy_chat/groups/event.s"
-	.include "data/text/easy_chat/groups/move_1.s"
-	.include "data/text/easy_chat/groups/move_2.s"
-	.include "data/text/easy_chat/groups/trendy_saying.s"
-	.include "data/text/easy_chat/groups/pokemon2.s"
-
-	.align 2
-
-gEasyChatGroups: ; 83DE0E0
-	.4byte gEasyChatGroup_Pokemon
-	.4byte gEasyChatGroup_Trainer
-	.4byte gEasyChatGroup_Status
-	.4byte gEasyChatGroup_Battle
-	.4byte gEasyChatGroup_Greetings
-	.4byte gEasyChatGroup_People
-	.4byte gEasyChatGroup_Voices
-	.4byte gEasyChatGroup_Speech
-	.4byte gEasyChatGroup_Endings
-	.4byte gEasyChatGroup_Feelings
-	.4byte gEasyChatGroup_Conditions
-	.4byte gEasyChatGroup_Actions
-	.4byte gEasyChatGroup_Lifestyle
-	.4byte gEasyChatGroup_Hobbies
-	.4byte gEasyChatGroup_Time
-	.4byte gEasyChatGroup_Misc
-	.4byte gEasyChatGroup_Adjectives
-	.4byte gEasyChatGroup_Event
-	.4byte gEasyChatGroup_Move1
-	.4byte gEasyChatGroup_Move2
-	.4byte gEasyChatGroup_TrendySaying
-	.4byte gEasyChatGroup_Pokemon2
diff --git a/data/text/easy_chat/groups/actions.s b/data/text/easy_chat/groups/actions/words.s
index efd886845..3a02ecab6 100644
--- a/data/text/easy_chat/groups/actions.s
+++ b/data/text/easy_chat/groups/actions/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_Actions: ; 83DD26E
+gEasyChatGroupWords_Actions: ; 83DD26E
 	.charmapstr "MEETS$"
 	.charmapstr "CONCEDE$"
 	.charmapstr "GIVE$"
diff --git a/data/text/easy_chat/groups/adjectives.s b/data/text/easy_chat/groups/adjectives/words.s
index b5359cb02..79f0e94bb 100644
--- a/data/text/easy_chat/groups/adjectives.s
+++ b/data/text/easy_chat/groups/adjectives/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_Adjectives: ; 83DD96C
+gEasyChatGroupWords_Adjectives: ; 83DD96C
 	.charmapstr "WANDERING$"
 	.charmapstr "RICKETY$"
 	.charmapstr "ROCK-SOLID$"
diff --git a/data/text/easy_chat/groups/battle.s b/data/text/easy_chat/groups/battle/words.s
index 142ba2d36..a9b23ac2d 100644
--- a/data/text/easy_chat/groups/battle.s
+++ b/data/text/easy_chat/groups/battle/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_Battle: ; 83DC53C
+gEasyChatGroupWords_Battle: ; 83DC53C
 	.charmapstr "MATCH UP$"
 	.charmapstr "GO$"
 	.charmapstr "NO. 1$"
diff --git a/data/text/easy_chat/groups/conditions.s b/data/text/easy_chat/groups/conditions/words.s
index 8cbc6a409..b64714589 100644
--- a/data/text/easy_chat/groups/conditions.s
+++ b/data/text/easy_chat/groups/conditions/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_Conditions: ; 83DD07D
+gEasyChatGroupWords_Conditions: ; 83DD07D
 	.charmapstr "HOT$"
 	.charmapstr "EXISTS$"
 	.charmapstr "EXCESS$"
diff --git a/data/text/easy_chat/groups/endings.s b/data/text/easy_chat/groups/endings/words.s
index d20e5a70c..5b387281c 100644
--- a/data/text/easy_chat/groups/endings.s
+++ b/data/text/easy_chat/groups/endings/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_Endings: ; 83DCD23
+gEasyChatGroupWords_Endings: ; 83DCD23
 	.charmapstr "WILL$"
 	.charmapstr "WILL BE HERE$"
 	.charmapstr "OR$"
diff --git a/data/text/easy_chat/groups/event.s b/data/text/easy_chat/groups/event/words.s
index 2fae1416d..56fca7f6c 100644
--- a/data/text/easy_chat/groups/event.s
+++ b/data/text/easy_chat/groups/event/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_Event: ; 83DDA8D
+gEasyChatGroupWords_Event: ; 83DDA8D
 	.charmapstr "APPEAL$"
 	.charmapstr "EVENTS$"
 	.charmapstr "STAY-AT-HOME$"
diff --git a/data/text/easy_chat/groups/feelings.s b/data/text/easy_chat/groups/feelings/words.s
index 56a826412..05008b701 100644
--- a/data/text/easy_chat/groups/feelings.s
+++ b/data/text/easy_chat/groups/feelings/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_Feelings: ; 83DCE9B
+gEasyChatGroupWords_Feelings: ; 83DCE9B
 	.charmapstr "MEET$"
 	.charmapstr "PLAY$"
 	.charmapstr "HURRIED$"
diff --git a/data/text/easy_chat/groups/greetings.s b/data/text/easy_chat/groups/greetings/words.s
index 667b95a9d..2c22e3748 100644
--- a/data/text/easy_chat/groups/greetings.s
+++ b/data/text/easy_chat/groups/greetings/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_Greetings: ; 83DC70F
+gEasyChatGroupWords_Greetings: ; 83DC70F
 	.charmapstr "THANKS$"
 	.charmapstr "YES$"
 	.charmapstr "HERE GOES$"
diff --git a/data/text/easy_chat/groups/hobbies.s b/data/text/easy_chat/groups/hobbies/words.s
index 4d8ddc67d..fd70ae436 100644
--- a/data/text/easy_chat/groups/hobbies.s
+++ b/data/text/easy_chat/groups/hobbies/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_Hobbies: ; 83DD5B1
+gEasyChatGroupWords_Hobbies: ; 83DD5B1
 	.charmapstr "IDOL$"
 	.charmapstr "ANIME$"
 	.charmapstr "SONG$"
diff --git a/data/text/easy_chat/groups/lifestyle.s b/data/text/easy_chat/groups/lifestyle/words.s
index 6c98e758a..1cd07cb86 100644
--- a/data/text/easy_chat/groups/lifestyle.s
+++ b/data/text/easy_chat/groups/lifestyle/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_Lifestyle: ; 83DD468
+gEasyChatGroupWords_Lifestyle: ; 83DD468
 	.charmapstr "CHORES$"
 	.charmapstr "HOME$"
 	.charmapstr "MONEY$"
diff --git a/data/text/easy_chat/groups/misc.s b/data/text/easy_chat/groups/misc/words.s
index 8d0c6b478..60c099298 100644
--- a/data/text/easy_chat/groups/misc.s
+++ b/data/text/easy_chat/groups/misc/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_Misc: ; 83DD860
+gEasyChatGroupWords_Misc: ; 83DD860
 	.charmapstr "HIGHS$"
 	.charmapstr "LOWS$"
 	.charmapstr "UM$"
diff --git a/data/text/easy_chat/groups/move_1.s b/data/text/easy_chat/groups/move_1/words.s
index 14416c6b1..3e0dbac76 100644
--- a/data/text/easy_chat/groups/move_1.s
+++ b/data/text/easy_chat/groups/move_1/words.s
@@ -1,6 +1,6 @@
 	.align 1
 
-gEasyChatGroup_Move1: ; 83DDB3C
+gEasyChatGroupWords_Move1: ; 83DDB3C
 	.2byte MOVE_THUNDERBOLT
 	.2byte MOVE_IRON_TAIL
 	.2byte MOVE_ICE_BALL
diff --git a/data/text/easy_chat/groups/move_2.s b/data/text/easy_chat/groups/move_2/words.s
index 20d63f5b0..69a5540ed 100644
--- a/data/text/easy_chat/groups/move_2.s
+++ b/data/text/easy_chat/groups/move_2/words.s
@@ -1,6 +1,6 @@
 	.align 1
 
-gEasyChatGroup_Move2: ; 83DDC6E
+gEasyChatGroupWords_Move2: ; 83DDC6E
 	.2byte MOVE_TACKLE
 	.2byte MOVE_EXPLOSION
 	.2byte MOVE_DIVE
diff --git a/data/text/easy_chat/groups/people.s b/data/text/easy_chat/groups/people/words.s
index df9c8d8a9..7ee188807 100644
--- a/data/text/easy_chat/groups/people.s
+++ b/data/text/easy_chat/groups/people/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_People: ; 83DC85A
+gEasyChatGroupWords_People: ; 83DC85A
 	.charmapstr "OPPONENT$"
 	.charmapstr "I$"
 	.charmapstr "YOU$"
diff --git a/data/text/easy_chat/groups/pokemon.s b/data/text/easy_chat/groups/pokemon/words.s
index 60bbd11dc..4e595dacf 100644
--- a/data/text/easy_chat/groups/pokemon.s
+++ b/data/text/easy_chat/groups/pokemon/words.s
@@ -1,6 +1,6 @@
 	.align 1
 
-gEasyChatGroup_Pokemon: ; 83DBF2C
+gEasyChatGroupWords_Pokemon: ; 83DBF2C
 	.2byte SPECIES_ARMALDO
 	.2byte SPECIES_BEAUTIFLY
 	.2byte SPECIES_MEDITITE
diff --git a/data/text/easy_chat/groups/pokemon2.s b/data/text/easy_chat/groups/pokemon2/words.s
index 2caa755a2..eb42c9319 100644
--- a/data/text/easy_chat/groups/pokemon2.s
+++ b/data/text/easy_chat/groups/pokemon2/words.s
@@ -1,6 +1,6 @@
 	.align 1
 
-gEasyChatGroup_Pokemon2: ; 83DDEE8
+gEasyChatGroupWords_Pokemon2: ; 83DDEE8
 	.2byte SPECIES_EKANS
 	.2byte SPECIES_ARBOK
 	.2byte SPECIES_SEAKING
diff --git a/data/text/easy_chat/groups/speech.s b/data/text/easy_chat/groups/speech/words.s
index ee60329dc..264698a76 100644
--- a/data/text/easy_chat/groups/speech.s
+++ b/data/text/easy_chat/groups/speech/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_Speech: ; 83DCB82
+gEasyChatGroupWords_Speech: ; 83DCB82
 	.charmapstr "LISTEN$"
 	.charmapstr "NOT VERY$"
 	.charmapstr "MEAN$"
diff --git a/data/text/easy_chat/groups/status.s b/data/text/easy_chat/groups/status/words.s
index 51069896d..41de029e5 100644
--- a/data/text/easy_chat/groups/status.s
+++ b/data/text/easy_chat/groups/status/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_Status: ; 83DC152
+gEasyChatGroupWords_Status: ; 83DC152
 	.charmapstr "DARK$"
 	.charmapstr "STENCH$"
 	.charmapstr "THICK FAT$"
diff --git a/data/text/easy_chat/groups/time.s b/data/text/easy_chat/groups/time/words.s
index 0678acc65..0f5b4bc14 100644
--- a/data/text/easy_chat/groups/time.s
+++ b/data/text/easy_chat/groups/time/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_Time: ; 83DD72D
+gEasyChatGroupWords_Time: ; 83DD72D
 	.charmapstr "FALL$"
 	.charmapstr "MORNING$"
 	.charmapstr "TOMORROW$"
diff --git a/data/text/easy_chat/groups/trainer.s b/data/text/easy_chat/groups/trainer/words.s
index c54980029..6ffd780cd 100644
--- a/data/text/easy_chat/groups/trainer.s
+++ b/data/text/easy_chat/groups/trainer/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_Trainer: ; 83DC0C0
+gEasyChatGroupWords_Trainer: ; 83DC0C0
 	.charmapstr "I CHOOSE YOU$"
 	.charmapstr "GOTCHA$"
 	.charmapstr "TRADE$"
diff --git a/data/text/easy_chat/groups/trendy_saying.s b/data/text/easy_chat/groups/trendy_saying/words.s
index fce55c53b..cf76d99ee 100644
--- a/data/text/easy_chat/groups/trendy_saying.s
+++ b/data/text/easy_chat/groups/trendy_saying/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_TrendySaying: ; 83DDDF2
+gEasyChatGroupWords_TrendySaying: ; 83DDDF2
 	.charmapstr "KTHX, BYE.$"
 	.charmapstr "YES, SIR!$"
 	.charmapstr "AVANT GARDE$"
diff --git a/data/text/easy_chat/groups/voices.s b/data/text/easy_chat/groups/voices/words.s
index 89fc8319b..fe797c55a 100644
--- a/data/text/easy_chat/groups/voices.s
+++ b/data/text/easy_chat/groups/voices/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroup_Voices: ; 83DCA20
+gEasyChatGroupWords_Voices: ; 83DCA20
 	.charmapstr "!$"
 	.charmapstr "!!$"
 	.charmapstr "?!$"