diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-17 22:58:57 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-17 22:58:57 -0400 |
| commit | 380858293e4597dd40390129a9a7bac713bdf080 (patch) | |
| tree | 70aae164289d375eb72358935158253d282fd4a0 /data/strings.s | |
| parent | 052c9f0234a6034b9db8fce30f779b95b8869df5 (diff) | |
| parent | 19d2d73c7064375e6cef64ced734052170d4361b (diff) | |
Merge branch 'master' into sub_81700F8
Diffstat (limited to 'data/strings.s')
| -rw-r--r-- | data/strings.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/strings.s b/data/strings.s index 94cf82c59..4adbf17bd 100644 --- a/data/strings.s +++ b/data/strings.s @@ -45,7 +45,7 @@ gExpandedPlaceholder_Brendan:: @ 85E8258 gExpandedPlaceholder_May:: @ 85E8260 .string "MAY$" -gUnknown_085E8264:: @ 85E8264 +gEggNickname:: @ 85E8264 .string "EGG$" |