Merge branch 'master' into sub_81700F8

1 files changed, 110 insertions, 2 deletions

diff --git a/data/data_emerald2.s b/data/data_emerald2.s
index a20731acb..7efcbbecf 100644
--- a/data/data_emerald2.s
+++ b/data/data_emerald2.s
@@ -932,6 +932,114 @@ gUnknown_0862B7E8:: @ 862B7E8
 	.incbin "baserom.gba", 0x62b7e8, 0x14
 
 gUnknown_0862B7FC:: @ 862B7FC
-	.incbin "baserom.gba", 0x62b7fc, 0x2e8
+	.incbin "baserom.gba", 0x62b7fc, 0x14
 
-    
\ No newline at end of file
+	.align 2
+	.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
+    .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$"
+    .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
+    .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
+    .string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}.$"
+    .string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 30},$"
+    .string "{CLEAR 11}m{CLEAR 6}n{CLEAR 6}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $"
+    .string "{CLEAR 11}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $"
+    .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 30}.$"
+    .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 30},$"
+    .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
+    .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
+    .string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
+    .string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
+    .string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$"
+    .string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 19}’{CLEAR 18} $"
+
+gUnknown_0862B9F9:: @ 862B9F9
+    .string "ABCDE$"
+
+gUnknown_0862B9FF:: @ 862B9FF
+    .string "FGHIJ$"
+
+gUnknown_0862BA05:: @ 862BA05
+    .string "KLMNO$"
+
+gUnknown_0862BA0B:: @ 862BA0B
+    .string "PQRST$"
+
+gUnknown_0862BA11:: @ 862BA11
+    .string "UVWXY$"
+
+gUnknown_0862BA17:: @ 862BA17
+    .string "Z    $"
+
+gUnknown_0862BA1D:: @ 862BA1D
+    .string "01234$"
+
+gUnknown_0862BA23:: @ 862BA23
+    .string "56789$"
+
+gUnknown_0862BA29:: @ 862BA29
+    .string ".,!? $"
+
+gUnknown_0862BA2F:: @ 862BA2F
+    .string "-/&… $"
+
+gUnknown_0862BA35:: @ 862BA35
+    .string "abcde$"
+
+gUnknown_0862BA3B:: @ 862BA3B
+    .string "fghij$"
+
+gUnknown_0862BA41:: @ 862BA41
+    .string "klmno$"
+
+gUnknown_0862BA47:: @ 862BA47
+    .string "pqrst$"
+
+gUnknown_0862BA4D:: @ 862BA4D
+    .string "uvwxy$"
+
+gUnknown_0862BA53:: @ 862BA53
+    .string "z    $"
+
+gUnknown_0862BA59:: @ 862BA59
+    .string "01234$"
+
+gUnknown_0862BA5F:: @ 862BA5F
+    .string "56789$"
+
+gUnknown_0862BA65:: @ 862BA65
+    .string ".,!? $"
+
+gUnknown_0862BA6B:: @ 862BA6B
+    .string "-/&… $"
+
+    .string "$$$$$$$$"
+
+gUnknown_0862BA79:: @ 862BA79
+    .string "{UNK_CTRL_F9 245}{UNK_CTRL_F9 246}{UNK_CTRL_F9 247}{UNK_CTRL_F9 248}{UNK_CTRL_F9 254}$"
+
+gUnknown_0862BA84:: @ 862BA84
+    .string "{UNK_CTRL_F9 249}{UNK_CTRL_F9 250}{UNK_CTRL_F9 252}{UNK_CTRL_F9 251}{UNK_CTRL_F9 253}$"
+
+gUnknown_0862BA8F:: @ 862BA8F
+    .string "{UNK_CTRL_F9 236}{UNK_CTRL_F9 237}{UNK_CTRL_F9 238}{UNK_CTRL_F9 235}{UNK_CTRL_F9 234}$"
+
+gUnknown_0862BA9A:: @ 862BA9A
+    .string "♂♀{UNK_CTRL_F9 212}{UNK_CTRL_F9 213}{UNK_CTRL_F9 211}$"
+
+gUnknown_0862BAA3:: @ 862BAA3
+    .string "{UNK_CTRL_F9 216}{UNK_CTRL_F9 217}{UNK_CTRL_F9 242}{UNK_CTRL_F9 243}{UNK_CTRL_F9 244}$"
+
+gUnknown_0862BAAE:: @ 862BAAE
+    .string "{UNK_CTRL_F9 218}{UNK_CTRL_F9 241}{UNK_CTRL_F9 224}{UNK_CTRL_F9 226}{UNK_CTRL_F9 227}$"
+
+gUnknown_0862BAB9:: @ 862BAB9
+    .string "{UNK_CTRL_F9 240}{UNK_CTRL_F9 239}{UNK_CTRL_F9 225}{UNK_CTRL_F9 214}{UNK_CTRL_F9 215}$"
+
+gUnknown_0862BAC4:: @ 862BAC4
+    .string "{UNK_CTRL_F9 228}{UNK_CTRL_F9 229}{UNK_CTRL_F9 230}{UNK_CTRL_F9 231}{UNK_CTRL_F9 232}$"
+
+gUnknown_0862BACF:: @ 862BACF
+    .string "{UNK_CTRL_F9 233}{UNK_CTRL_F9 220}{UNK_CTRL_F9 221}{UNK_CTRL_F9 222}{UNK_CTRL_F9 209}$"
+
+gUnknown_0862BADA:: @ 862BADA
+    .string "{UNK_CTRL_F9 210}{UNK_CTRL_F9 208}ょ: $"