Merge master into doc-tower

1 files changed, 307 insertions, 126 deletions

diff --git a/include/strings.h b/include/strings.h
index f20be5c45..fe4e08eeb 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1,6 +1,22 @@
 #ifndef GUARD_STRINGS_H
 #define GUARD_STRINGS_H
 
+// Placeholders
+extern const u8 gText_ExpandedPlaceholder_Empty[];
+extern const u8 gText_ExpandedPlaceholder_Kun[];
+extern const u8 gText_ExpandedPlaceholder_Chan[];
+extern const u8 gText_ExpandedPlaceholder_Sapphire[];
+extern const u8 gText_ExpandedPlaceholder_Ruby[];
+extern const u8 gText_ExpandedPlaceholder_Emerald[];
+extern const u8 gText_ExpandedPlaceholder_Aqua[];
+extern const u8 gText_ExpandedPlaceholder_Magma[];
+extern const u8 gText_ExpandedPlaceholder_Archie[];
+extern const u8 gText_ExpandedPlaceholder_Maxie[];
+extern const u8 gText_ExpandedPlaceholder_Kyogre[];
+extern const u8 gText_ExpandedPlaceholder_Groudon[];
+extern const u8 gText_ExpandedPlaceholder_Brendan[];
+extern const u8 gText_ExpandedPlaceholder_May[];
+
 extern const u8 gText_FromSpace[];
 
 extern const u8 gText_Lv50[];
@@ -1805,132 +1821,132 @@ extern const u8 gBattleDomeWinText6[];
 extern const u8 gBattleDomeWinText7[];
 
 // Battle Pyramid.
-extern const u8 BattlePyramid_ExitHintUp_Text1[];
-extern const u8 BattlePyramid_ExitHintLeft_Text1[];
-extern const u8 BattlePyramid_ExitHintRight_Text1[];
-extern const u8 BattlePyramid_ExitHintDown_Text1[];
-extern const u8 BattlePyramid_ZeroItemsRemaining_Text1[];
-extern const u8 BattlePyramid_OneItemRemaining_Text1[];
-extern const u8 BattlePyramid_TwoItemsRemaining_Text1[];
-extern const u8 BattlePyramid_ThreeItemsRemaining_Text1[];
-extern const u8 BattlePyramid_FourItemsRemaining_Text1[];
-extern const u8 BattlePyramid_FiveItemsRemaining_Text1[];
-extern const u8 BattlePyramid_SixItemsRemaining_Text1[];
-extern const u8 BattlePyramid_SevenItemsRemaining_Text1[];
-extern const u8 BattlePyramid_EightItemsRemaining_Text1[];
-extern const u8 BattlePyramid_ZeroTrainersRemaining_Text1[];
-extern const u8 BattlePyramid_OneTrainersRemaining_Text1[];
-extern const u8 BattlePyramid_TwoTrainersRemaining_Text1[];
-extern const u8 BattlePyramid_ThreeTrainersRemaining_Text1[];
-extern const u8 BattlePyramid_FourTrainersRemaining_Text1[];
-extern const u8 BattlePyramid_FiveTrainersRemaining_Text1[];
-extern const u8 BattlePyramid_SixTrainersRemaining_Text1[];
-extern const u8 BattlePyramid_SevenTrainersRemaining_Text1[];
-extern const u8 BattlePyramid_ExitHintUp_Text2[];
-extern const u8 BattlePyramid_ExitHintLeft_Text2[];
-extern const u8 BattlePyramid_ExitHintRight_Text2[];
-extern const u8 BattlePyramid_ExitHintDown_Text2[];
-extern const u8 BattlePyramid_ZeroItemsRemaining_Text2[];
-extern const u8 BattlePyramid_OneItemRemaining_Text2[];
-extern const u8 BattlePyramid_TwoItemsRemaining_Text2[];
-extern const u8 BattlePyramid_ThreeItemsRemaining_Text2[];
-extern const u8 BattlePyramid_FourItemsRemaining_Text2[];
-extern const u8 BattlePyramid_FiveItemsRemaining_Text2[];
-extern const u8 BattlePyramid_SixItemsRemaining_Text2[];
-extern const u8 BattlePyramid_SevenItemsRemaining_Text2[];
-extern const u8 BattlePyramid_EightItemsRemaining_Text2[];
-extern const u8 BattlePyramid_ZeroTrainersRemaining_Text2[];
-extern const u8 BattlePyramid_OneTrainersRemaining_Text2[];
-extern const u8 BattlePyramid_TwoTrainersRemaining_Text2[];
-extern const u8 BattlePyramid_ThreeTrainersRemaining_Text2[];
-extern const u8 BattlePyramid_FourTrainersRemaining_Text2[];
-extern const u8 BattlePyramid_FiveTrainersRemaining_Text2[];
-extern const u8 BattlePyramid_SixTrainersRemaining_Text2[];
-extern const u8 BattlePyramid_SevenTrainersRemaining_Text2[];
-extern const u8 BattlePyramid_ExitHintUp_Text3[];
-extern const u8 BattlePyramid_ExitHintLeft_Text3[];
-extern const u8 BattlePyramid_ExitHintRight_Text3[];
-extern const u8 BattlePyramid_ExitHintDown_Text3[];
-extern const u8 BattlePyramid_ZeroItemsRemaining_Text3[];
-extern const u8 BattlePyramid_OneItemRemaining_Text3[];
-extern const u8 BattlePyramid_TwoItemsRemaining_Text3[];
-extern const u8 BattlePyramid_ThreeItemsRemaining_Text3[];
-extern const u8 BattlePyramid_FourItemsRemaining_Text3[];
-extern const u8 BattlePyramid_FiveItemsRemaining_Text3[];
-extern const u8 BattlePyramid_SixItemsRemaining_Text3[];
-extern const u8 BattlePyramid_SevenItemsRemaining_Text3[];
-extern const u8 BattlePyramid_EightItemsRemaining_Text3[];
-extern const u8 BattlePyramid_ZeroTrainersRemaining_Text3[];
-extern const u8 BattlePyramid_OneTrainersRemaining_Text3[];
-extern const u8 BattlePyramid_TwoTrainersRemaining_Text3[];
-extern const u8 BattlePyramid_ThreeTrainersRemaining_Text3[];
-extern const u8 BattlePyramid_FourTrainersRemaining_Text3[];
-extern const u8 BattlePyramid_FiveTrainersRemaining_Text3[];
-extern const u8 BattlePyramid_SixTrainersRemaining_Text3[];
-extern const u8 BattlePyramid_SevenTrainersRemaining_Text3[];
-extern const u8 BattlePyramid_ExitHintUp_Text4[];
-extern const u8 BattlePyramid_ExitHintLeft_Text4[];
-extern const u8 BattlePyramid_ExitHintRight_Text4[];
-extern const u8 BattlePyramid_ExitHintDown_Text4[];
-extern const u8 BattlePyramid_ZeroItemsRemaining_Text4[];
-extern const u8 BattlePyramid_OneItemRemaining_Text4[];
-extern const u8 BattlePyramid_TwoItemsRemaining_Text4[];
-extern const u8 BattlePyramid_ThreeItemsRemaining_Text4[];
-extern const u8 BattlePyramid_FourItemsRemaining_Text4[];
-extern const u8 BattlePyramid_FiveItemsRemaining_Text4[];
-extern const u8 BattlePyramid_SixItemsRemaining_Text4[];
-extern const u8 BattlePyramid_SevenItemsRemaining_Text4[];
-extern const u8 BattlePyramid_EightItemsRemaining_Text4[];
-extern const u8 BattlePyramid_ZeroTrainersRemaining_Text4[];
-extern const u8 BattlePyramid_OneTrainersRemaining_Text4[];
-extern const u8 BattlePyramid_TwoTrainersRemaining_Text4[];
-extern const u8 BattlePyramid_ThreeTrainersRemaining_Text4[];
-extern const u8 BattlePyramid_FourTrainersRemaining_Text4[];
-extern const u8 BattlePyramid_FiveTrainersRemaining_Text4[];
-extern const u8 BattlePyramid_SixTrainersRemaining_Text4[];
-extern const u8 BattlePyramid_SevenTrainersRemaining_Text4[];
-extern const u8 BattlePyramid_ExitHintUp_Text5[];
-extern const u8 BattlePyramid_ExitHintLeft_Text5[];
-extern const u8 BattlePyramid_ExitHintRight_Text5[];
-extern const u8 BattlePyramid_ExitHintDown_Text5[];
-extern const u8 BattlePyramid_ZeroItemsRemaining_Text5[];
-extern const u8 BattlePyramid_OneItemRemaining_Text5[];
-extern const u8 BattlePyramid_TwoItemsRemaining_Text5[];
-extern const u8 BattlePyramid_ThreeItemsRemaining_Text5[];
-extern const u8 BattlePyramid_FourItemsRemaining_Text5[];
-extern const u8 BattlePyramid_FiveItemsRemaining_Text5[];
-extern const u8 BattlePyramid_SixItemsRemaining_Text5[];
-extern const u8 BattlePyramid_SevenItemsRemaining_Text5[];
-extern const u8 BattlePyramid_EightItemsRemaining_Text5[];
-extern const u8 BattlePyramid_ZeroTrainersRemaining_Text5[];
-extern const u8 BattlePyramid_OneTrainersRemaining_Text5[];
-extern const u8 BattlePyramid_TwoTrainersRemaining_Text5[];
-extern const u8 BattlePyramid_ThreeTrainersRemaining_Text5[];
-extern const u8 BattlePyramid_FourTrainersRemaining_Text5[];
-extern const u8 BattlePyramid_FiveTrainersRemaining_Text5[];
-extern const u8 BattlePyramid_SixTrainersRemaining_Text5[];
-extern const u8 BattlePyramid_SevenTrainersRemaining_Text5[];
-extern const u8 BattlePyramid_ExitHintUp_Text6[];
-extern const u8 BattlePyramid_ExitHintLeft_Text6[];
-extern const u8 BattlePyramid_ExitHintRight_Text6[];
-extern const u8 BattlePyramid_ExitHintDown_Text6[];
-extern const u8 BattlePyramid_ZeroItemsRemaining_Text6[];
-extern const u8 BattlePyramid_OneItemRemaining_Text6[];
-extern const u8 BattlePyramid_TwoItemsRemaining_Text6[];
-extern const u8 BattlePyramid_ThreeItemsRemaining_Text6[];
-extern const u8 BattlePyramid_FourItemsRemaining_Text6[];
-extern const u8 BattlePyramid_FiveItemsRemaining_Text6[];
-extern const u8 BattlePyramid_SixItemsRemaining_Text6[];
-extern const u8 BattlePyramid_SevenItemsRemaining_Text6[];
-extern const u8 BattlePyramid_EightItemsRemaining_Text6[];
-extern const u8 BattlePyramid_ZeroTrainersRemaining_Text6[];
-extern const u8 BattlePyramid_OneTrainersRemaining_Text6[];
-extern const u8 BattlePyramid_TwoTrainersRemaining_Text6[];
-extern const u8 BattlePyramid_ThreeTrainersRemaining_Text6[];
-extern const u8 BattlePyramid_FourTrainersRemaining_Text6[];
-extern const u8 BattlePyramid_FiveTrainersRemaining_Text6[];
-extern const u8 BattlePyramid_SixTrainersRemaining_Text6[];
-extern const u8 BattlePyramid_SevenTrainersRemaining_Text6[];
+extern const u8 BattlePyramid_Text_ExitHintUp1[];
+extern const u8 BattlePyramid_Text_ExitHintLeft1[];
+extern const u8 BattlePyramid_Text_ExitHintRight1[];
+extern const u8 BattlePyramid_Text_ExitHintDown1[];
+extern const u8 BattlePyramid_Text_ZeroItemsRemaining1[];
+extern const u8 BattlePyramid_Text_OneItemRemaining1[];
+extern const u8 BattlePyramid_Text_TwoItemsRemaining1[];
+extern const u8 BattlePyramid_Text_ThreeItemsRemaining1[];
+extern const u8 BattlePyramid_Text_FourItemsRemaining1[];
+extern const u8 BattlePyramid_Text_FiveItemsRemaining1[];
+extern const u8 BattlePyramid_Text_SixItemsRemaining1[];
+extern const u8 BattlePyramid_Text_SevenItemsRemaining1[];
+extern const u8 BattlePyramid_Text_EightItemsRemaining1[];
+extern const u8 BattlePyramid_Text_ZeroTrainersRemaining1[];
+extern const u8 BattlePyramid_Text_OneTrainersRemaining1[];
+extern const u8 BattlePyramid_Text_TwoTrainersRemaining1[];
+extern const u8 BattlePyramid_Text_ThreeTrainersRemaining1[];
+extern const u8 BattlePyramid_Text_FourTrainersRemaining1[];
+extern const u8 BattlePyramid_Text_FiveTrainersRemaining1[];
+extern const u8 BattlePyramid_Text_SixTrainersRemaining1[];
+extern const u8 BattlePyramid_Text_SevenTrainersRemaining1[];
+extern const u8 BattlePyramid_Text_ExitHintUp2[];
+extern const u8 BattlePyramid_Text_ExitHintLeft2[];
+extern const u8 BattlePyramid_Text_ExitHintRight2[];
+extern const u8 BattlePyramid_Text_ExitHintDown2[];
+extern const u8 BattlePyramid_Text_ZeroItemsRemaining2[];
+extern const u8 BattlePyramid_Text_OneItemRemaining2[];
+extern const u8 BattlePyramid_Text_TwoItemsRemaining2[];
+extern const u8 BattlePyramid_Text_ThreeItemsRemaining2[];
+extern const u8 BattlePyramid_Text_FourItemsRemaining2[];
+extern const u8 BattlePyramid_Text_FiveItemsRemaining2[];
+extern const u8 BattlePyramid_Text_SixItemsRemaining2[];
+extern const u8 BattlePyramid_Text_SevenItemsRemaining2[];
+extern const u8 BattlePyramid_Text_EightItemsRemaining2[];
+extern const u8 BattlePyramid_Text_ZeroTrainersRemaining2[];
+extern const u8 BattlePyramid_Text_OneTrainersRemaining2[];
+extern const u8 BattlePyramid_Text_TwoTrainersRemaining2[];
+extern const u8 BattlePyramid_Text_ThreeTrainersRemaining2[];
+extern const u8 BattlePyramid_Text_FourTrainersRemaining2[];
+extern const u8 BattlePyramid_Text_FiveTrainersRemaining2[];
+extern const u8 BattlePyramid_Text_SixTrainersRemaining2[];
+extern const u8 BattlePyramid_Text_SevenTrainersRemaining2[];
+extern const u8 BattlePyramid_Text_ExitHintUp3[];
+extern const u8 BattlePyramid_Text_ExitHintLeft3[];
+extern const u8 BattlePyramid_Text_ExitHintRight3[];
+extern const u8 BattlePyramid_Text_ExitHintDown3[];
+extern const u8 BattlePyramid_Text_ZeroItemsRemaining3[];
+extern const u8 BattlePyramid_Text_OneItemRemaining3[];
+extern const u8 BattlePyramid_Text_TwoItemsRemaining3[];
+extern const u8 BattlePyramid_Text_ThreeItemsRemaining3[];
+extern const u8 BattlePyramid_Text_FourItemsRemaining3[];
+extern const u8 BattlePyramid_Text_FiveItemsRemaining3[];
+extern const u8 BattlePyramid_Text_SixItemsRemaining3[];
+extern const u8 BattlePyramid_Text_SevenItemsRemaining3[];
+extern const u8 BattlePyramid_Text_EightItemsRemaining3[];
+extern const u8 BattlePyramid_Text_ZeroTrainersRemaining3[];
+extern const u8 BattlePyramid_Text_OneTrainersRemaining3[];
+extern const u8 BattlePyramid_Text_TwoTrainersRemaining3[];
+extern const u8 BattlePyramid_Text_ThreeTrainersRemaining3[];
+extern const u8 BattlePyramid_Text_FourTrainersRemaining3[];
+extern const u8 BattlePyramid_Text_FiveTrainersRemaining3[];
+extern const u8 BattlePyramid_Text_SixTrainersRemaining3[];
+extern const u8 BattlePyramid_Text_SevenTrainersRemaining3[];
+extern const u8 BattlePyramid_Text_ExitHintUp4[];
+extern const u8 BattlePyramid_Text_ExitHintLeft4[];
+extern const u8 BattlePyramid_Text_ExitHintRight4[];
+extern const u8 BattlePyramid_Text_ExitHintDown4[];
+extern const u8 BattlePyramid_Text_ZeroItemsRemaining4[];
+extern const u8 BattlePyramid_Text_OneItemRemaining4[];
+extern const u8 BattlePyramid_Text_TwoItemsRemaining4[];
+extern const u8 BattlePyramid_Text_ThreeItemsRemaining4[];
+extern const u8 BattlePyramid_Text_FourItemsRemaining4[];
+extern const u8 BattlePyramid_Text_FiveItemsRemaining4[];
+extern const u8 BattlePyramid_Text_SixItemsRemaining4[];
+extern const u8 BattlePyramid_Text_SevenItemsRemaining4[];
+extern const u8 BattlePyramid_Text_EightItemsRemaining4[];
+extern const u8 BattlePyramid_Text_ZeroTrainersRemaining4[];
+extern const u8 BattlePyramid_Text_OneTrainersRemaining4[];
+extern const u8 BattlePyramid_Text_TwoTrainersRemaining4[];
+extern const u8 BattlePyramid_Text_ThreeTrainersRemaining4[];
+extern const u8 BattlePyramid_Text_FourTrainersRemaining4[];
+extern const u8 BattlePyramid_Text_FiveTrainersRemaining4[];
+extern const u8 BattlePyramid_Text_SixTrainersRemaining4[];
+extern const u8 BattlePyramid_Text_SevenTrainersRemaining4[];
+extern const u8 BattlePyramid_Text_ExitHintUp5[];
+extern const u8 BattlePyramid_Text_ExitHintLeft5[];
+extern const u8 BattlePyramid_Text_ExitHintRight5[];
+extern const u8 BattlePyramid_Text_ExitHintDown5[];
+extern const u8 BattlePyramid_Text_ZeroItemsRemaining5[];
+extern const u8 BattlePyramid_Text_OneItemRemaining5[];
+extern const u8 BattlePyramid_Text_TwoItemsRemaining5[];
+extern const u8 BattlePyramid_Text_ThreeItemsRemaining5[];
+extern const u8 BattlePyramid_Text_FourItemsRemaining5[];
+extern const u8 BattlePyramid_Text_FiveItemsRemaining5[];
+extern const u8 BattlePyramid_Text_SixItemsRemaining5[];
+extern const u8 BattlePyramid_Text_SevenItemsRemaining5[];
+extern const u8 BattlePyramid_Text_EightItemsRemaining5[];
+extern const u8 BattlePyramid_Text_ZeroTrainersRemaining5[];
+extern const u8 BattlePyramid_Text_OneTrainersRemaining5[];
+extern const u8 BattlePyramid_Text_TwoTrainersRemaining5[];
+extern const u8 BattlePyramid_Text_ThreeTrainersRemaining5[];
+extern const u8 BattlePyramid_Text_FourTrainersRemaining5[];
+extern const u8 BattlePyramid_Text_FiveTrainersRemaining5[];
+extern const u8 BattlePyramid_Text_SixTrainersRemaining5[];
+extern const u8 BattlePyramid_Text_SevenTrainersRemaining5[];
+extern const u8 BattlePyramid_Text_ExitHintUp6[];
+extern const u8 BattlePyramid_Text_ExitHintLeft6[];
+extern const u8 BattlePyramid_Text_ExitHintRight6[];
+extern const u8 BattlePyramid_Text_ExitHintDown6[];
+extern const u8 BattlePyramid_Text_ZeroItemsRemaining6[];
+extern const u8 BattlePyramid_Text_OneItemRemaining6[];
+extern const u8 BattlePyramid_Text_TwoItemsRemaining6[];
+extern const u8 BattlePyramid_Text_ThreeItemsRemaining6[];
+extern const u8 BattlePyramid_Text_FourItemsRemaining6[];
+extern const u8 BattlePyramid_Text_FiveItemsRemaining6[];
+extern const u8 BattlePyramid_Text_SixItemsRemaining6[];
+extern const u8 BattlePyramid_Text_SevenItemsRemaining6[];
+extern const u8 BattlePyramid_Text_EightItemsRemaining6[];
+extern const u8 BattlePyramid_Text_ZeroTrainersRemaining6[];
+extern const u8 BattlePyramid_Text_OneTrainersRemaining6[];
+extern const u8 BattlePyramid_Text_TwoTrainersRemaining6[];
+extern const u8 BattlePyramid_Text_ThreeTrainersRemaining6[];
+extern const u8 BattlePyramid_Text_FourTrainersRemaining6[];
+extern const u8 BattlePyramid_Text_FiveTrainersRemaining6[];
+extern const u8 BattlePyramid_Text_SixTrainersRemaining6[];
+extern const u8 BattlePyramid_Text_SevenTrainersRemaining6[];
 
 
 
@@ -2329,6 +2345,150 @@ extern const u8 MatchCall_BattlePyramidText11[];
 extern const u8 MatchCall_BattlePyramidText12[];
 extern const u8 MatchCall_BattlePyramidText13[];
 extern const u8 MatchCall_BattlePyramidText14[];
+extern const u8 MatchCall_Text_MrStone1[];
+extern const u8 MatchCall_Text_MrStone2[];
+extern const u8 MatchCall_Text_MrStone3[];
+extern const u8 MatchCall_Text_MrStone4[];
+extern const u8 MatchCall_Text_MrStone5[];
+extern const u8 MatchCall_Text_MrStone6[];
+extern const u8 MatchCall_Text_MrStone7[];
+extern const u8 MatchCall_Text_MrStone8[];
+extern const u8 MatchCall_Text_MrStone9[];
+extern const u8 MatchCall_Text_MrStone10[];
+extern const u8 MatchCall_Text_MrStone11[];
+extern const u8 MatchCall_Text_Norman1[];
+extern const u8 MatchCall_Text_Norman2[];
+extern const u8 MatchCall_Text_Norman3[];
+extern const u8 MatchCall_Text_Norman4[];
+extern const u8 MatchCall_Text_Norman5[];
+extern const u8 MatchCall_Text_Norman6[];
+extern const u8 MatchCall_Text_Norman7[];
+extern const u8 MatchCall_Text_Norman8[];
+extern const u8 MatchCall_Text_Norman9[];
+extern const u8 MatchCall_Text_Mom1[];
+extern const u8 MatchCall_Text_Mom2[];
+extern const u8 MatchCall_Text_Mom3[];
+extern const u8 MatchCall_Text_Steven1[];
+extern const u8 MatchCall_Text_Steven2[];
+extern const u8 MatchCall_Text_Steven3[];
+extern const u8 MatchCall_Text_Steven4[];
+extern const u8 MatchCall_Text_Steven5[];
+extern const u8 MatchCall_Text_Steven6[];
+extern const u8 MatchCall_Text_Steven7[];
+extern const u8 MatchCall_Text_May1[];
+extern const u8 MatchCall_Text_May2[];
+extern const u8 MatchCall_Text_May3[];
+extern const u8 MatchCall_Text_May4[];
+extern const u8 MatchCall_Text_May5[];
+extern const u8 MatchCall_Text_May6[];
+extern const u8 MatchCall_Text_May7[];
+extern const u8 MatchCall_Text_May8[];
+extern const u8 MatchCall_Text_May9[];
+extern const u8 MatchCall_Text_May10[];
+extern const u8 MatchCall_Text_May11[];
+extern const u8 MatchCall_Text_May12[];
+extern const u8 MatchCall_Text_May13[];
+extern const u8 MatchCall_Text_May14[];
+extern const u8 MatchCall_Text_May15[];
+extern const u8 MatchCall_Text_Brendan1[];
+extern const u8 MatchCall_Text_Brendan2[];
+extern const u8 MatchCall_Text_Brendan3[];
+extern const u8 MatchCall_Text_Brendan4[];
+extern const u8 MatchCall_Text_Brendan5[];
+extern const u8 MatchCall_Text_Brendan6[];
+extern const u8 MatchCall_Text_Brendan7[];
+extern const u8 MatchCall_Text_Brendan8[];
+extern const u8 MatchCall_Text_Brendan9[];
+extern const u8 MatchCall_Text_Brendan10[];
+extern const u8 MatchCall_Text_Brendan11[];
+extern const u8 MatchCall_Text_Brendan12[];
+extern const u8 MatchCall_Text_Brendan13[];
+extern const u8 MatchCall_Text_Brendan14[];
+extern const u8 MatchCall_Text_Brendan15[];
+extern const u8 MatchCall_Text_Wally1[];
+extern const u8 MatchCall_Text_Wally2[];
+extern const u8 MatchCall_Text_Wally3[];
+extern const u8 MatchCall_Text_Wally4[];
+extern const u8 MatchCall_Text_Wally5[];
+extern const u8 MatchCall_Text_Wally6[];
+extern const u8 MatchCall_Text_Wally7[];
+extern const u8 MatchCall_Text_Scott1[];
+extern const u8 MatchCall_Text_Scott2[];
+extern const u8 MatchCall_Text_Scott3[];
+extern const u8 MatchCall_Text_Scott4[];
+extern const u8 MatchCall_Text_Scott5[];
+extern const u8 MatchCall_Text_Scott6[];
+extern const u8 MatchCall_Text_Scott7[];
+extern const u8 MatchCall_Text_Roxanne1[];
+extern const u8 MatchCall_Text_Roxanne2[];
+extern const u8 MatchCall_Text_Roxanne3[];
+extern const u8 MatchCall_Text_Roxanne4[];
+extern const u8 MatchCall_Text_Brawly1[];
+extern const u8 MatchCall_Text_Brawly2[];
+extern const u8 MatchCall_Text_Brawly3[];
+extern const u8 MatchCall_Text_Brawly4[];
+extern const u8 MatchCall_Text_Wattson1[];
+extern const u8 MatchCall_Text_Wattson2[];
+extern const u8 MatchCall_Text_Wattson3[];
+extern const u8 MatchCall_Text_Wattson4[];
+extern const u8 MatchCall_Text_Flannery1[];
+extern const u8 MatchCall_Text_Flannery2[];
+extern const u8 MatchCall_Text_Flannery3[];
+extern const u8 MatchCall_Text_Flannery4[];
+extern const u8 MatchCall_Text_Winona1[];
+extern const u8 MatchCall_Text_Winona2[];
+extern const u8 MatchCall_Text_Winona3[];
+extern const u8 MatchCall_Text_Winona4[];
+extern const u8 MatchCall_Text_TateLiza1[];
+extern const u8 MatchCall_Text_TateLiza2[];
+extern const u8 MatchCall_Text_TateLiza3[];
+extern const u8 MatchCall_Text_TateLiza4[];
+extern const u8 MatchCall_Text_Juan1[];
+extern const u8 MatchCall_Text_Juan2[];
+extern const u8 MatchCall_Text_Juan3[];
+extern const u8 MatchCall_Text_Juan4[];
+extern const u8 MatchCall_Text_Sidney[];
+extern const u8 MatchCall_Text_Phoebe[];
+extern const u8 MatchCall_Text_Glacia[];
+extern const u8 MatchCall_Text_Drake[];
+extern const u8 MatchCall_Text_Wallace[];
+extern const u8 gText_MrStoneMatchCallDesc[];
+extern const u8 gText_MrStoneMatchCallName[];
+extern const u8 gText_StevenMatchCallDesc[];
+extern const u8 gText_StevenMatchCallName[];
+extern const u8 gText_MayBrendanMatchCallDesc[];
+extern const u8 gText_WallyMatchCallDesc[];
+extern const u8 gText_NormanMatchCallDesc[];
+extern const u8 gText_NormanMatchCallName[];
+extern const u8 gText_MomMatchCallDesc[];
+extern const u8 gText_MomMatchCallName[];
+extern const u8 gText_ScottMatchCallDesc[];
+extern const u8 gText_ScottMatchCallName[];
+extern const u8 gText_RoxanneMatchCallDesc[];
+extern const u8 gText_BrawlyMatchCallDesc[];
+extern const u8 gText_WattsonMatchCallDesc[];
+extern const u8 gText_FlanneryMatchCallDesc[];
+extern const u8 gText_WinonaMatchCallDesc[];
+extern const u8 gText_TateLizaMatchCallDesc[];
+extern const u8 gText_JuanMatchCallDesc[];
+extern const u8 gText_EliteFourMatchCallDesc[];
+extern const u8 gText_ChampionMatchCallDesc[];
+extern const u8 gText_ProfBirchMatchCallDesc[];
+extern const u8 gText_ProfBirchMatchCallName[];
+extern const u8 gText_MatchCallSteven_Strategy[];
+extern const u8 gText_MatchCallSteven_Pokemon[];
+extern const u8 gText_MatchCallSteven_Intro1_BeforeMeteorFallsBattle[];
+extern const u8 gText_MatchCallSteven_Intro2_BeforeMeteorFallsBattle[];
+extern const u8 gText_MatchCallSteven_Intro1_AfterMeteorFallsBattle[];
+extern const u8 gText_MatchCallSteven_Intro2_AfterMeteorFallsBattle[];
+extern const u8 gText_MatchCallBrendan_Strategy[];
+extern const u8 gText_MatchCallBrendan_Pokemon[];
+extern const u8 gText_MatchCallBrendan_Intro1[];
+extern const u8 gText_MatchCallBrendan_Intro2[];
+extern const u8 gText_MatchCallMay_Strategy[];
+extern const u8 gText_MatchCallMay_Pokemon[];
+extern const u8 gText_MatchCallMay_Intro1[];
+extern const u8 gText_MatchCallMay_Intro2[];
 
 // Contest Link
 extern const u8 gText_ColorDarkGrey[];
@@ -2704,6 +2864,27 @@ extern const u8 gText_JumpsInARow[];
 extern const u8 gText_BestScore2[];
 extern const u8 gText_ExcellentsInARow[];
 
+// Berry crush
+extern const u8 gText_Var1Berry[];
+extern const u8 gText_XDotY[];
+extern const u8 gText_1DotBlueF700[];
+extern const u8 gText_1DotF700[];
+extern const u8 gText_TimeColon[];
+extern const u8 gText_SpaceSec[];
+extern const u8 gText_XDotY2[];
+extern const u8 gText_SpaceMin[];
+extern const u8 gText_StrVar1[];
+extern const u8 gText_PressingSpeed[];
+extern const u8 gText_TimesPerSec[];
+extern const u8 gText_XDotY3[];
+extern const u8 gText_Silkiness[];
+extern const u8 gText_Var1Percent[];
+extern const u8 gText_PressesRankings[];
+extern const u8 gText_CrushingResults[];
+extern const u8 gText_BerryCrush2[];
+extern const u8 gText_PressingSpeedRankings[];
+extern const u8 gText_Var1Players[];
+
 // Lilycove Lady
 extern const u8 gText_ContestLady_Handsome[];
 extern const u8 gText_ContestLady_Vinny[];