From 6b7cddeda393dda2e5e980c67c8425480c24d0a8 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 26 Jan 2016 22:27:04 -0800 Subject: make internal name for EVENT. group match Emerald's --- data/text/easy_chat/group_name_strings.s | 2 +- data/text/easy_chat/group_name_table.s | 2 +- data/text/easy_chat/group_orders.s | 4 +-- data/text/easy_chat/group_sizes.s | 44 +++++++++++++++---------------- data/text/easy_chat/group_words.s | 4 +-- data/text/easy_chat/groups/event/order.s | 25 ------------------ data/text/easy_chat/groups/event/words.s | 24 ----------------- data/text/easy_chat/groups/events/order.s | 25 ++++++++++++++++++ data/text/easy_chat/groups/events/words.s | 24 +++++++++++++++++ 9 files changed, 77 insertions(+), 77 deletions(-) delete mode 100644 data/text/easy_chat/groups/event/order.s delete mode 100644 data/text/easy_chat/groups/event/words.s create mode 100644 data/text/easy_chat/groups/events/order.s create mode 100644 data/text/easy_chat/groups/events/words.s 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/event/order.s deleted file mode 100644 index 1bd8c660b..000000000 --- a/data/text/easy_chat/groups/event/order.s +++ /dev/null @@ -1,25 +0,0 @@ - .align 1 - -gEasyChatGroupOrder_Event: ; 83DF8F8 - .2byte 0 - .2byte 14 - .2byte 12 - .2byte 3 - .2byte 17 - .2byte 4 - .2byte 1 - .2byte 10 - .2byte 9 - .2byte 15 - .2byte 11 - .2byte 6 - .2byte 13 - .2byte 19 - .2byte 5 - .2byte 18 - .2byte 20 - .2byte 21 - .2byte 16 - .2byte 8 - .2byte 2 - .2byte 7 diff --git a/data/text/easy_chat/groups/event/words.s b/data/text/easy_chat/groups/event/words.s deleted file mode 100644 index 56fca7f6c..000000000 --- a/data/text/easy_chat/groups/event/words.s +++ /dev/null @@ -1,24 +0,0 @@ -gEasyChatGroupWords_Event: ; 83DDA8D - .charmapstr "APPEAL$" - .charmapstr "EVENTS$" - .charmapstr "STAY-AT-HOME$" - .charmapstr "BERRY$" - .charmapstr "CONTEST$" - .charmapstr "MC$" - .charmapstr "JUDGE$" - .charmapstr "SUPER$" - .charmapstr "STAGE$" - .charmapstr "HALL OF FAME$" - .charmapstr "EVOLUTION$" - .charmapstr "HYPER$" - .charmapstr "BATTLE TOWER$" - .charmapstr "LEADERS$" - .charmapstr "BATTLE ROOM$" - .charmapstr "HIDDEN$" - .charmapstr "SECRET BASE$" - .charmapstr "BLEND$" - .charmapstr "{POKEBLOCK}$" - .charmapstr "MASTER$" - .charmapstr "RANK$" - .charmapstr "RIBBON$" - .charmapstr "$" diff --git a/data/text/easy_chat/groups/events/order.s b/data/text/easy_chat/groups/events/order.s new file mode 100644 index 000000000..cfad65638 --- /dev/null +++ b/data/text/easy_chat/groups/events/order.s @@ -0,0 +1,25 @@ + .align 1 + +gEasyChatGroupOrder_Events: ; 83DF8F8 + .2byte 0 + .2byte 14 + .2byte 12 + .2byte 3 + .2byte 17 + .2byte 4 + .2byte 1 + .2byte 10 + .2byte 9 + .2byte 15 + .2byte 11 + .2byte 6 + .2byte 13 + .2byte 19 + .2byte 5 + .2byte 18 + .2byte 20 + .2byte 21 + .2byte 16 + .2byte 8 + .2byte 2 + .2byte 7 diff --git a/data/text/easy_chat/groups/events/words.s b/data/text/easy_chat/groups/events/words.s new file mode 100644 index 000000000..9ed418e55 --- /dev/null +++ b/data/text/easy_chat/groups/events/words.s @@ -0,0 +1,24 @@ +gEasyChatGroupWords_Events: ; 83DDA8D + .charmapstr "APPEAL$" + .charmapstr "EVENTS$" + .charmapstr "STAY-AT-HOME$" + .charmapstr "BERRY$" + .charmapstr "CONTEST$" + .charmapstr "MC$" + .charmapstr "JUDGE$" + .charmapstr "SUPER$" + .charmapstr "STAGE$" + .charmapstr "HALL OF FAME$" + .charmapstr "EVOLUTION$" + .charmapstr "HYPER$" + .charmapstr "BATTLE TOWER$" + .charmapstr "LEADERS$" + .charmapstr "BATTLE ROOM$" + .charmapstr "HIDDEN$" + .charmapstr "SECRET BASE$" + .charmapstr "BLEND$" + .charmapstr "{POKEBLOCK}$" + .charmapstr "MASTER$" + .charmapstr "RANK$" + .charmapstr "RIBBON$" + .charmapstr "$" -- cgit v1.2.3