summaryrefslogtreecommitdiff
path: root/include/strings.h
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2018-10-16 14:31:45 -0400
committergarak <garakmon@gmail.com>2018-10-16 14:31:45 -0400
commit0051947414df4656826a5ba0b252fdbb5fb0e065 (patch)
tree4ac69544094baaa620b1e8556ddf79715db4fde3 /include/strings.h
parent72f9afcbf4a81909019f21acad0484b72ed217f6 (diff)
parented1bb3030bae8b0d00a1fbb68ebd50f6376938ac (diff)
Merge remote-tracking branch 'upstream/master' into event-flags
Diffstat (limited to 'include/strings.h')
-rw-r--r--include/strings.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/include/strings.h b/include/strings.h
index e72360563..4ea33635b 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -151,8 +151,6 @@ extern const u8 gMenuText_Confirm[];
extern const u8 gMenuText_Show[];
extern const u8 gMenuText_Give2[];
-extern const u8 gText_Cancel2[];
-
extern const u8 gText_WithdrawPokemon[];
extern const u8 gText_WithdrawMonDescription[];
extern const u8 gText_DepositPokemon[];
@@ -843,4 +841,19 @@ extern const u8 gText_TwoDashes[];
extern const u8 *const gReturnToXStringsTable2[];
+extern const u8 gText_XPLink[];
+extern const u8 gText_ConfirmLinkWhenPlayersReady[];
+extern const u8 gText_ConfirmStartLinkWithXPlayers[];
+extern const u8 gText_AwaitingLinkup[];
+extern const u8 gText_PleaseWaitForLink[];
+extern const u8 gText_BronzeCard[];
+extern const u8 gText_CopperCard[];
+extern const u8 gText_SilverCard[];
+extern const u8 gText_GoldCard[];
+
+extern const u8 gText_CanIHelpWithAnythingElse[];
+extern const u8 gText_AnythingElseICanHelp[];
+extern const u8 gText_QuitShopping[];
+extern const u8 gText_PokedollarVar1[];
+
#endif //GUARD_STRINGS_H