summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-03-07 18:05:54 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2020-03-07 18:05:54 -0500
commitab1d075682a34164ed82810108f909e1f9b46390 (patch)
treebbf4391d137a1ea2249aa3720a735a9b4c2f28fa /data
parent6ce70985ebcb78267290e35e65aadb6a433c1cba (diff)
through sub_8101558
Diffstat (limited to 'data')
-rw-r--r--data/data_8479668.s6
-rw-r--r--data/easy_chat_2.s7
2 files changed, 5 insertions, 8 deletions
diff --git a/data/data_8479668.s b/data/data_8479668.s
index 0ddecfe58..50ce06127 100644
--- a/data/data_8479668.s
+++ b/data/data_8479668.s
@@ -13,7 +13,7 @@
.section .rodata
- // berry_fix_program
+ // easy_chat_2
gUnknown_847A8D8::
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
@@ -27,6 +27,8 @@ gUnknown_847A913::
gUnknown_847A934::
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
+ // naming_screen
+
gUnknown_847A955::
.string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 26}.$"
@@ -63,6 +65,8 @@ gUnknown_847AA8F::
gUnknown_847AAA8::
.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $"
+ // union_room_chat
+
gText_UnionRoomChatKeyboard_ABCDE::
.string "ABCDE$"
diff --git a/data/easy_chat_2.s b/data/easy_chat_2.s
index 04270adac..2eca1d8b0 100644
--- a/data/easy_chat_2.s
+++ b/data/easy_chat_2.s
@@ -7,13 +7,6 @@
.section .rodata
.align 2
- .align 2
-gUnknown_843F8E0:: @ 843F8E0
- .4byte gUnknown_847A8D8
- .4byte gUnknown_847A8FA
- .4byte gUnknown_847A913
- .4byte gUnknown_847A934
-
gUnknown_843F8F0:: @ 843F8F0 sprite_sheet
obj_tiles gUnknown_843F3F8, 0x0020, 0
obj_tiles gUnknown_843F418, 0x0100, 2