diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 10:14:31 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 10:14:31 -0500 |
| commit | a5ee2c14fda450ca67985805b8bc71e66dfcf622 (patch) | |
| tree | 9f874dbe25d28bf81e9375da5731889b9b466b07 /data/scripts | |
| parent | 91fa5faf4acf617db0625992b2caf116e64f0888 (diff) | |
| parent | e8add87bf3ccc3563a3d4fa94e109251f4a06eea (diff) | |
Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
# include/menu_specialized.h
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/secret_base.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 6302a33a8..347513636 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -1052,7 +1052,7 @@ Text_276731: @ 8276731 .string "This data is already registered.\n" .string "Would you like to delete it?$" -Text_27676F: @ 827676F +Text_TooManyBasesDeleteSome: @ 827676F .string "Up to 10 locations can be registered.\p" .string "Delete a location if you want to\n" .string "register another location.$" @@ -1063,10 +1063,10 @@ Text_2767D1: @ 82767D1 Text_2767E9: @ 82767E9 .string "Data has been unregistered.$" -Text_276805: @ 8276805 +Text_SecretBaseBootUpPC: @ 8276805 .string "{PLAYER} booted up the PC.$" -Text_27681A: @ 827681A +Text_SecretBasePCStartMenu: @ 827681A .string "What would you like to do?$" Text_276835: @ 8276835 |