diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
| commit | 65391a1eb2979dc050dd4a98afea02bb0ef310ea (patch) | |
| tree | e31a90d0966cec7e8713ead9ca8083d439c8d9b5 /data/text/easy_chat/easy_chat_group_name_pointers.inc | |
| parent | eb48cc2f7eefc1e56c2dcec21c38381b4534b897 (diff) | |
| parent | abe56579c107af58e6f3a43968ba2257ff358189 (diff) | |
Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
# src/use_pokeblock.c
Diffstat (limited to 'data/text/easy_chat/easy_chat_group_name_pointers.inc')
| -rw-r--r-- | data/text/easy_chat/easy_chat_group_name_pointers.inc | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/data/text/easy_chat/easy_chat_group_name_pointers.inc b/data/text/easy_chat/easy_chat_group_name_pointers.inc deleted file mode 100644 index 375614b86..000000000 --- a/data/text/easy_chat/easy_chat_group_name_pointers.inc +++ /dev/null @@ -1,24 +0,0 @@ - .align 2 -gEasyChatGroupNamePointers:: @ 859E5D4 - .4byte gEasyChatGroupName_Pokemon - .4byte gEasyChatGroupName_Trainer - .4byte gEasyChatGroupName_Status - .4byte gEasyChatGroupName_Battle - .4byte gEasyChatGroupName_Greetings - .4byte gEasyChatGroupName_People - .4byte gEasyChatGroupName_Voices - .4byte gEasyChatGroupName_Speech - .4byte gEasyChatGroupName_Endings - .4byte gEasyChatGroupName_Feelings - .4byte gEasyChatGroupName_Conditions - .4byte gEasyChatGroupName_Actions - .4byte gEasyChatGroupName_Lifestyle - .4byte gEasyChatGroupName_Hobbies - .4byte gEasyChatGroupName_Time - .4byte gEasyChatGroupName_Misc - .4byte gEasyChatGroupName_Adjectives - .4byte gEasyChatGroupName_Events - .4byte gEasyChatGroupName_Move1 - .4byte gEasyChatGroupName_Move2 - .4byte gEasyChatGroupName_TrendySaying - .4byte gEasyChatGroupName_Pokemon2 |