diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-13 12:55:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-13 12:55:06 -0500 |
| commit | 32fbf67d479c15351c718851412d84b4925acfdf (patch) | |
| tree | e15fd2a025a49d29d9ff770ccbb8639aa3ffcc2c /data/scripts | |
| parent | b24559d69b6fa0abf042a1b7cdbcab3d1ec91fd6 (diff) | |
| parent | 0c1d33da4f6db7b90913586a39ed60ea2b13f39e (diff) | |
Merge branch 'master' into shop
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/cable_club.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 96e36dcf9..08f5accca 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -430,7 +430,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60 call OldaleTown_PokemonCenter_2F_EventScript_27134F compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - message OldaleTown_PokemonCenter_2F_Text_278091 + message gText_PleaseWaitForLink waitmessage special sub_80B2DA4 waitstate @@ -532,7 +532,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2 call OldaleTown_PokemonCenter_2F_EventScript_27134F compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - message OldaleTown_PokemonCenter_2F_Text_278091 + message gText_PleaseWaitForLink waitmessage special sub_80B2E4C waitstate @@ -607,7 +607,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB call OldaleTown_PokemonCenter_2F_EventScript_27134F compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - message OldaleTown_PokemonCenter_2F_Text_278091 + message gText_PleaseWaitForLink waitmessage special sub_80B2E74 waitstate @@ -1675,21 +1675,21 @@ OldaleTown_PokemonCenter_2F_Text_278061: @ 8278061 .string "A POKéMON holding the {STR_VAR_1}\n" .string "BERRY can’t be traded.$" -OldaleTown_PokemonCenter_2F_Text_278091:: @ 8278091 +gText_PleaseWaitForLink:: @ 8278091 .string "Please wait.\n" .string "… … B Button: Cancel$" -OldaleTown_PokemonCenter_2F_Text_2780B3:: @ 82780B3 +gText_ConfirmLinkWhenPlayersReady:: @ 82780B3 .string "When all players are ready…\n" .string "A Button: Confirm\l" .string "B Button: Cancel$" -OldaleTown_PokemonCenter_2F_Text_2780F2:: @ 82780F2 +gText_ConfirmStartLinkWithXPlayers:: @ 82780F2 .string "Start link with {STR_VAR_1} players.\n" .string "A Button: Confirm\l" .string "B Button: Cancel$" -OldaleTown_PokemonCenter_2F_Text_278131:: @ 8278131 +gText_AwaitingLinkup:: @ 8278131 .string "Awaiting linkup…\n" .string "… … B Button: Cancel$" |