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/text | |
| parent | 91fa5faf4acf617db0625992b2caf116e64f0888 (diff) | |
| parent | e8add87bf3ccc3563a3d4fa94e109251f4a06eea (diff) | |
Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
# include/menu_specialized.h
Diffstat (limited to 'data/text')
| -rw-r--r-- | data/text/surf.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/text/surf.inc b/data/text/surf.inc index 2751dae7b..31c197222 100644 --- a/data/text/surf.inc +++ b/data/text/surf.inc @@ -1,5 +1,5 @@ -gUnknown_08272FD6:: @ 8272FD6 +gText_WantToUseSurf:: @ 8272FD6 .string "The water is dyed a deep blue…\nWould you like to SURF?$" -gUnknown_0827300D:: @ 827300D +gText_PlayerUsedSurf:: @ 827300D .string "{STR_VAR_1} used SURF!$" |