summaryrefslogtreecommitdiff
path: root/data/strings.s
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-21 23:20:13 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-21 23:20:13 -0500
commitd4e8c20f840996049f269ffcd22d7e3feb489696 (patch)
tree48b8deab17118064ae33bf8924569c834416cb96 /data/strings.s
parentd35cf06854be09a6bcf5ceb63cdb54cefd6d48a2 (diff)
parentf57340b729d741acae17213c9c748738fcc1dcb3 (diff)
Merge branch 'master' into link
Diffstat (limited to 'data/strings.s')
-rw-r--r--data/strings.s14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/strings.s b/data/strings.s
index 360f26711..75b430dd1 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -4379,25 +4379,25 @@ gText_ABtnTitleScreen:: @ 85EE572
gText_Option:: @ 85EE589
.string "OPTION$"
-gUnknown_085EE590:: @ 85EE590
+gText_TextSpeed:: @ 85EE590
.string "TEXT SPEED$"
-gUnknown_085EE59B:: @ 85EE59B
+gText_BattleScene:: @ 85EE59B
.string "BATTLE SCENE$"
-gUnknown_085EE5A8:: @ 85EE5A8
+gText_BattleStyle:: @ 85EE5A8
.string "BATTLE STYLE$"
-gUnknown_085EE5B5:: @ 85EE5B5
+gText_Sound:: @ 85EE5B5
.string "SOUND$"
-gUnknown_085EE5BB:: @ 85EE5BB
+gText_Frame:: @ 85EE5BB
.string "FRAME$"
-gUnknown_085EE5C1:: @ 85EE5C1
+gText_OptionMenuCancel:: @ 85EE5C1
.string "CANCEL$"
-gUnknown_085EE5C8:: @ 85EE5C8
+gText_ButtonMode:: @ 85EE5C8
.string "BUTTON MODE$"
gText_TextSpeedSlow:: @ 85EE5D4