summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-01-26 22:27:04 -0800
committerYamaArashi <shadow962@live.com>2016-01-26 22:31:17 -0800
commit6b7cddeda393dda2e5e980c67c8425480c24d0a8 (patch)
tree867a5aff4722277017ed8dfd7db0e92dd9c938e1
parentae4a8ad2fdebd73efd53b3c072d021ea9f5501c8 (diff)
make internal name for EVENT. group match Emerald's
-rw-r--r--data/text/easy_chat/group_name_strings.s2
-rw-r--r--data/text/easy_chat/group_name_table.s2
-rw-r--r--data/text/easy_chat/group_orders.s4
-rw-r--r--data/text/easy_chat/group_sizes.s44
-rw-r--r--data/text/easy_chat/group_words.s4
-rw-r--r--data/text/easy_chat/groups/events/order.s (renamed from data/text/easy_chat/groups/event/order.s)2
-rw-r--r--data/text/easy_chat/groups/events/words.s (renamed from data/text/easy_chat/groups/event/words.s)2
7 files changed, 30 insertions, 30 deletions
diff --git a/data/text/easy_chat/group_name_strings.s b/data/text/easy_chat/group_name_strings.s
index 4993d194f..301bfbda0 100644
--- a/data/text/easy_chat/group_name_strings.s
+++ b/data/text/easy_chat/group_name_strings.s
@@ -49,7 +49,7 @@ gEasyChatGroupName_Misc: ; 842C853
gEasyChatGroupName_Adjectives: ; 842C859
.charmapstr "ADJECTIVES$"
-gEasyChatGroupName_Event: ; 842C864
+gEasyChatGroupName_Events: ; 842C864
.charmapstr "EVENT.$"
gEasyChatGroupName_Move1: ; 842C86B
diff --git a/data/text/easy_chat/group_name_table.s b/data/text/easy_chat/group_name_table.s
index 109c4c270..216420853 100644
--- a/data/text/easy_chat/group_name_table.s
+++ b/data/text/easy_chat/group_name_table.s
@@ -18,7 +18,7 @@ gEasyChatGroupNames: ; 83DFE6C
.4byte gEasyChatGroupName_Time
.4byte gEasyChatGroupName_Misc
.4byte gEasyChatGroupName_Adjectives
- .4byte gEasyChatGroupName_Event
+ .4byte gEasyChatGroupName_Events
.4byte gEasyChatGroupName_Move1
.4byte gEasyChatGroupName_Move2
.4byte gEasyChatGroupName_TrendySaying
diff --git a/data/text/easy_chat/group_orders.s b/data/text/easy_chat/group_orders.s
index b5c7b801a..39083913c 100644
--- a/data/text/easy_chat/group_orders.s
+++ b/data/text/easy_chat/group_orders.s
@@ -15,7 +15,7 @@
.include "data/text/easy_chat/groups/time/order.s"
.include "data/text/easy_chat/groups/misc/order.s"
.include "data/text/easy_chat/groups/adjectives/order.s"
- .include "data/text/easy_chat/groups/event/order.s"
+ .include "data/text/easy_chat/groups/events/order.s"
.include "data/text/easy_chat/groups/move_1/order.s"
.include "data/text/easy_chat/groups/move_2/order.s"
.include "data/text/easy_chat/groups/trendy_saying/order.s"
@@ -45,7 +45,7 @@ gEasyChatGroupOrders: ; 83DFE14
.4byte gEasyChatGroupOrder_Time
.4byte gEasyChatGroupOrder_Misc
.4byte gEasyChatGroupOrder_Adjectives
- .4byte gEasyChatGroupOrder_Event
+ .4byte gEasyChatGroupOrder_Events
.4byte gEasyChatGroupOrder_Move1
.4byte gEasyChatGroupOrder_Move2
.4byte gEasyChatGroupOrder_TrendySaying
diff --git a/data/text/easy_chat/group_sizes.s b/data/text/easy_chat/group_sizes.s
index 971105808..51d09af8b 100644
--- a/data/text/easy_chat/group_sizes.s
+++ b/data/text/easy_chat/group_sizes.s
@@ -1,23 +1,23 @@
gEasyChatGroupSizes: ; 83DEFFA
- .byte 202 ; Pokémon
- .byte 19 ; Trainer
- .byte 109 ; Status
- .byte 63 ; Battle
- .byte 42 ; Greetings
- .byte 75 ; People
- .byte 63 ; Voices
- .byte 60 ; Speech
- .byte 69 ; Endings
- .byte 69 ; Feelings
- .byte 69 ; Conditions
- .byte 78 ; Actions
- .byte 45 ; Lifestyle
- .byte 54 ; Hobbies
- .byte 45 ; Time
- .byte 42 ; Misc.
- .byte 36 ; Adjectives
- .byte 22 ; Event.
- .byte 153 ; Move 1
- .byte 194 ; Move 2
- .byte 33 ; Trendy Saying
- .byte 251 ; Pokémon2
+ .byte 202 ; POKEMON
+ .byte 19 ; TRAINER
+ .byte 109 ; STATUS
+ .byte 63 ; BATTLE
+ .byte 42 ; GREETINGS
+ .byte 75 ; PEOPLE
+ .byte 63 ; VOICES
+ .byte 60 ; SPEECH
+ .byte 69 ; ENDINGS
+ .byte 69 ; FEELINGS
+ .byte 69 ; CONDITIONS
+ .byte 78 ; ACTIONS
+ .byte 45 ; LIFESTYLE
+ .byte 54 ; HOBBIES
+ .byte 45 ; TIME
+ .byte 42 ; MISC
+ .byte 36 ; ADJECTIVES
+ .byte 22 ; EVENTS
+ .byte 153 ; MOVE_1
+ .byte 194 ; MOVE_2
+ .byte 33 ; TRENDY_SAYING
+ .byte 251 ; POKEMON_2
diff --git a/data/text/easy_chat/group_words.s b/data/text/easy_chat/group_words.s
index d3fa7c314..8d7f95c51 100644
--- a/data/text/easy_chat/group_words.s
+++ b/data/text/easy_chat/group_words.s
@@ -15,7 +15,7 @@
.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/events/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"
@@ -41,7 +41,7 @@ gEasyChatGroupWords: ; 83DE0E0
.4byte gEasyChatGroupWords_Time
.4byte gEasyChatGroupWords_Misc
.4byte gEasyChatGroupWords_Adjectives
- .4byte gEasyChatGroupWords_Event
+ .4byte gEasyChatGroupWords_Events
.4byte gEasyChatGroupWords_Move1
.4byte gEasyChatGroupWords_Move2
.4byte gEasyChatGroupWords_TrendySaying
diff --git a/data/text/easy_chat/groups/event/order.s b/data/text/easy_chat/groups/events/order.s
index 1bd8c660b..cfad65638 100644
--- a/data/text/easy_chat/groups/event/order.s
+++ b/data/text/easy_chat/groups/events/order.s
@@ -1,6 +1,6 @@
.align 1
-gEasyChatGroupOrder_Event: ; 83DF8F8
+gEasyChatGroupOrder_Events: ; 83DF8F8
.2byte 0
.2byte 14
.2byte 12
diff --git a/data/text/easy_chat/groups/event/words.s b/data/text/easy_chat/groups/events/words.s
index 56fca7f6c..9ed418e55 100644
--- a/data/text/easy_chat/groups/event/words.s
+++ b/data/text/easy_chat/groups/events/words.s
@@ -1,4 +1,4 @@
-gEasyChatGroupWords_Event: ; 83DDA8D
+gEasyChatGroupWords_Events: ; 83DDA8D
.charmapstr "APPEAL$"
.charmapstr "EVENTS$"
.charmapstr "STAY-AT-HOME$"