summaryrefslogtreecommitdiff
path: root/data/strings.s
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2017-09-16 14:24:47 -0500
committerDiegoisawesome <diego@domoreaweso.me>2017-09-16 14:24:47 -0500
commit5a74c0e91354276a92ea01152b76a85462d30d4e (patch)
tree8bca428892e561dcca4c75be7a91fed1406d4890 /data/strings.s
parent3c63063831f7d26874dc49143e2d19f6acc1be18 (diff)
parent19d2d73c7064375e6cef64ced734052170d4361b (diff)
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'data/strings.s')
-rw-r--r--data/strings.s2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/strings.s b/data/strings.s
index 7ab4e7540..c8a1b7683 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -45,7 +45,7 @@ gExpandedPlaceholder_Brendan:: @ 85E8258
gExpandedPlaceholder_May:: @ 85E8260
.string "MAY$"
-gText_Egg:: @ 85E8264
+gText_EggNickname:: @ 85E8264
.string "EGG$"
gText_Pokemon:: @ 85E8268