diff --git a/asm/emerald.s b/asm/emerald.s index 7dc3a62fe..1f0b3e8e2 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -550708,7 +550708,7 @@ sub_811F3E0: ; 811F3E0 lsls r1, 24 lsls r2, 16 lsrs r5, r2, 16 - ldr r0, =gUnknown_0859E5D4 + ldr r0, =gEasyChatGroupNamePointers lsrs r1, 22 adds r1, r0 ldr r1, [r1] @@ -550743,7 +550743,7 @@ sub_811F3E0: ; 811F3E0 thumb_func_start sub_811F424 sub_811F424: ; 811F424 lsls r0, 24 - ldr r1, =gUnknown_0859E5D4 + ldr r1, =gEasyChatGroupNamePointers lsrs r0, 22 adds r0, r1 ldr r0, [r0] diff --git a/data/data2.s b/data/data2.s index 87a170eb6..40bef4eb3 100644 --- a/data/data2.s +++ b/data/data2.s @@ -121,7 +121,7 @@ gMenuCursorDimensions: ; 82EA608 .byte 8, 16 .byte 8, 15 .byte 8, 8 - .byte 0, 0 + .byte 0, 0 gFont9JapaneseGlyphs: ; 82EA61C .incbin "base_emerald.gba", 0x2ea61c, 0x2000 @@ -5058,8 +5058,8 @@ gUnknown_0859D004: ; 859D004 gUnknown_0859E46C: ; 859E46C .incbin "base_emerald.gba", 0x59e46c, 0x168 -gUnknown_0859E5D4: ; 859E5D4 - .incbin "base_emerald.gba", 0x59e5d4, 0x58 +; 859E5D4 + .include "data/text/easy_chat/easy_chat_group_name_pointers.s" gUnknown_0859E62C: ; 859E62C .incbin "base_emerald.gba", 0x59e62c, 0x8 @@ -9358,7 +9358,10 @@ gUnknown_085EE966: ; 85EE966 .incbin "base_emerald.gba", 0x5ee966, 0x11 gUnknown_085EE977: ; 85EE977 - .incbin "base_emerald.gba", 0x5ee977, 0xcb + .incbin "base_emerald.gba", 0x5ee977, 0x16 + +; 85EE98D + .include "data/text/easy_chat/easy_chat_group_names.s" gUnknown_085EEA42: ; 85EEA42 .incbin "base_emerald.gba", 0x5eea42, 0x31 @@ -12044,7 +12047,7 @@ gUnusedFullwidthJapaneseFont2GlyphWidths: ; 866C6E4 gFont2JapaneseGlyphs: ; 866C8E4 .incbin "base_emerald.gba", 0x66c8e4, 0x8000 - + gFont2JapaneseGlyphWidths: ; 86748E4 .incbin "base_emerald.gba", 0x6748e4, 0x200 diff --git a/data/text/easy_chat/easy_chat_group_name_pointers.s b/data/text/easy_chat/easy_chat_group_name_pointers.s new file mode 100644 index 000000000..74d1270ba --- /dev/null +++ b/data/text/easy_chat/easy_chat_group_name_pointers.s @@ -0,0 +1,25 @@ + .align 2, 0 + +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 diff --git a/data/text/easy_chat/easy_chat_group_names.s b/data/text/easy_chat/easy_chat_group_names.s new file mode 100644 index 000000000..6311a453e --- /dev/null +++ b/data/text/easy_chat/easy_chat_group_names.s @@ -0,0 +1,65 @@ +gEasyChatGroupName_Pokemon: ; 85EE98D + .charmapstr "POKéMON$" + +gEasyChatGroupName_Trainer: ; 85EE995 + .charmapstr "TRAINER$" + +gEasyChatGroupName_Status: ; 85EE99D + .charmapstr "STATUS$" + +gEasyChatGroupName_Battle: ; 85EE9A4 + .charmapstr "BATTLE$" + +gEasyChatGroupName_Greetings: ; 85EE9AB + .charmapstr "GREETINGS$" + +gEasyChatGroupName_People: ; 85EE9B5 + .charmapstr "PEOPLE$" + +gEasyChatGroupName_Voices: ; 85EE9BC + .charmapstr "VOICES$" + +gEasyChatGroupName_Speech: ; 85EE9C3 + .charmapstr "SPEECH$" + +gEasyChatGroupName_Endings: ; 85EE9CA + .charmapstr "ENDINGS$" + +gEasyChatGroupName_Feelings: ; 85EE9D2 + .charmapstr "FEELINGS$" + +gEasyChatGroupName_Conditions: ; 85EE9DB + .charmapstr "CONDITIONS$" + +gEasyChatGroupName_Actions: ; 85EE9E6 + .charmapstr "ACTIONS$" + +gEasyChatGroupName_Lifestyle: ; 85EE9EE + .charmapstr "LIFESTYLE$" + +gEasyChatGroupName_Hobbies: ; 85EE9F8 + .charmapstr "HOBBIES$" + +gEasyChatGroupName_Time: ; 85EEA00 + .charmapstr "TIME$" + +gEasyChatGroupName_Misc: ; 85EEA05 + .charmapstr "MISC.$" + +gEasyChatGroupName_Adjectives: ; 85EEA0B + .charmapstr "ADJECTIVES$" + +gEasyChatGroupName_Events: ; 85EEA16 + .charmapstr "EVENTS$" + +gEasyChatGroupName_Move1: ; 85EEA1D + .charmapstr "MOVE 1$" + +gEasyChatGroupName_Move2: ; 85EEA24 + .charmapstr "MOVE 2$" + +gEasyChatGroupName_TrendySaying: ; 85EEA2B + .charmapstr "TRENDY SAYING$" + +gEasyChatGroupName_Pokemon2: ; 85EEA39 + .charmapstr "POKéMON2$"