diff options
author | YamaArashi <shadow962@live.com> | 2016-01-25 05:59:46 -0800 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-01-25 05:59:46 -0800 |
commit | 75191c61ab86d2395bd04501257bfb9524509b0a (patch) | |
tree | 2477d5c6a24d3966646c1c460878add2e5531eb3 | |
parent | ddad400c60ed99c3b0b82456fa8e32ffacdf3cf8 (diff) |
easy chat group names
-rw-r--r-- | asm/rom.s | 2 | ||||
-rw-r--r-- | data/data2.s | 9 | ||||
-rw-r--r-- | data/text/easy_chat/group_name_strings.s | 65 | ||||
-rw-r--r-- | data/text/easy_chat/group_name_table.s | 25 |
4 files changed, 97 insertions, 4 deletions
@@ -482714,7 +482714,7 @@ sub_80EAD64: ; 80EAD64 pop {r1} bx r1 .align 2 -_080EAD78: .4byte gUnknown_083DFE6C +_080EAD78: .4byte gEasyChatGroupNames thumb_func_end sub_80EAD64 thumb_func_start sub_80EAD7C diff --git a/data/data2.s b/data/data2.s index bb30a1219..0442f4929 100644 --- a/data/data2.s +++ b/data/data2.s @@ -3968,8 +3968,8 @@ gUnknown_083DEFFA: ; 83DEFFA gUnknown_083DFE14: ; 83DFE14 .incbin "baserom.gba", 0x003dfe14, 0x58 -gUnknown_083DFE6C: ; 83DFE6C - .incbin "baserom.gba", 0x003dfe6c, 0x58 +; 83DFE6C + .include "data/text/easy_chat/group_name_table.s" gUnknown_083DFEC4: ; 83DFEC4 .incbin "baserom.gba", 0x003dfec4, 0x4 @@ -7404,7 +7404,10 @@ gUnknown_0842C7CB: ; 842C7CB .incbin "baserom.gba", 0x0042c7cb, 0xb gUnknown_0842C7D6: ; 842C7D6 - .incbin "baserom.gba", 0x0042c7d6, 0xba + .incbin "baserom.gba", 0x0042c7d6, 0x5 + +; 842C7DB + .include "data/text/easy_chat/group_name_strings.s" gUnknown_0842C890: ; 842C890 .incbin "baserom.gba", 0x0042c890, 0x4 diff --git a/data/text/easy_chat/group_name_strings.s b/data/text/easy_chat/group_name_strings.s new file mode 100644 index 000000000..4993d194f --- /dev/null +++ b/data/text/easy_chat/group_name_strings.s @@ -0,0 +1,65 @@ +gEasyChatGroupName_Pokemon: ; 842C7DB + .charmapstr "POKéMON$" + +gEasyChatGroupName_Trainer: ; 842C7E3 + .charmapstr "TRAINER$" + +gEasyChatGroupName_Status: ; 842C7EB + .charmapstr "STATUS$" + +gEasyChatGroupName_Battle: ; 842C7F2 + .charmapstr "BATTLE$" + +gEasyChatGroupName_Greetings: ; 842C7F9 + .charmapstr "GREETINGS$" + +gEasyChatGroupName_People: ; 842C803 + .charmapstr "PEOPLE$" + +gEasyChatGroupName_Voices: ; 842C80A + .charmapstr "VOICES$" + +gEasyChatGroupName_Speech: ; 842C811 + .charmapstr "SPEECH$" + +gEasyChatGroupName_Endings: ; 842C818 + .charmapstr "ENDINGS$" + +gEasyChatGroupName_Feelings: ; 842C820 + .charmapstr "FEELINGS$" + +gEasyChatGroupName_Conditions: ; 842C829 + .charmapstr "CONDITIONS$" + +gEasyChatGroupName_Actions: ; 842C834 + .charmapstr "ACTIONS$" + +gEasyChatGroupName_Lifestyle: ; 842C83C + .charmapstr "LIFESTYLE$" + +gEasyChatGroupName_Hobbies: ; 842C846 + .charmapstr "HOBBIES$" + +gEasyChatGroupName_Time: ; 842C84E + .charmapstr "TIME$" + +gEasyChatGroupName_Misc: ; 842C853 + .charmapstr "MISC.$" + +gEasyChatGroupName_Adjectives: ; 842C859 + .charmapstr "ADJECTIVES$" + +gEasyChatGroupName_Event: ; 842C864 + .charmapstr "EVENT.$" + +gEasyChatGroupName_Move1: ; 842C86B + .charmapstr "MOVE 1$" + +gEasyChatGroupName_Move2: ; 842C872 + .charmapstr "MOVE 2$" + +gEasyChatGroupName_TrendySaying: ; 842C879 + .charmapstr "TRENDY SAYING$" + +gEasyChatGroupName_Pokemon2: ; 842C887 + .charmapstr "POKéMON2$" diff --git a/data/text/easy_chat/group_name_table.s b/data/text/easy_chat/group_name_table.s new file mode 100644 index 000000000..109c4c270 --- /dev/null +++ b/data/text/easy_chat/group_name_table.s @@ -0,0 +1,25 @@ + .align 2 + +gEasyChatGroupNames: ; 83DFE6C + .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_Event + .4byte gEasyChatGroupName_Move1 + .4byte gEasyChatGroupName_Move2 + .4byte gEasyChatGroupName_TrendySaying + .4byte gEasyChatGroupName_Pokemon2 |