Merge remote-tracking branch 'upstream/master' into use_pokeblock

# Conflicts:
#	src/use_pokeblock.c

1 files changed, 434 insertions, 134 deletions

diff --git a/include/strings.h b/include/strings.h
index 2c3d966b7..d6054c5fd 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -864,15 +864,22 @@ extern const u8 gText_Winona[];
 extern const u8 gText_Phoebe[];
 extern const u8 gText_Glacia[];
 
-extern const u8 gText_PkmnLearnedMove4[];
-extern const u8 gText_PkmnTryingToLearnMove[];
-extern const u8 gText_WhichMoveToForget2[];
-extern const u8 gText_StopTryingToTeachMove[];
-extern const u8 gText_12AndPoof[];
-extern const u8 gText_PkmnForgotMoveAndLearnedNew[];
+extern const u8 gText_MoveRelearnerPkmnLearnedMove[];
+extern const u8 gText_MoveRelearnerPkmnTryingToLearnMove[];
+extern const u8 gText_MoveRelearnerWhichMoveToForget[];
+extern const u8 gText_MoveRelearnerStopTryingToTeachMove[];
+extern const u8 gText_MoveRelearnerAndPoof[];
+extern const u8 gText_MoveRelearnerPkmnForgotMoveAndLearnedNew[];
 extern const u8 gText_TeachWhichMoveToPkmn[];
-extern const u8 gText_GiveUpTeachingNewMove[];
-extern const u8 gText_TeachX[];
+extern const u8 gText_MoveRelearnerGiveUp[];
+extern const u8 gText_MoveRelearnerTeachMoveConfirm[];
+extern const u8 gText_MoveRelearnerBattleMoves[];
+extern const u8 gText_MoveRelearnerPP[];
+extern const u8 gText_MoveRelearnerPower[];
+extern const u8 gText_MoveRelearnerAccuracy[];
+extern const u8 gText_MoveRelearnerContestMovesTitle[];
+extern const u8 gText_MoveRelearnerAppeal[];
+extern const u8 gText_MoveRelearnerJam[];
 
 extern const u8 gText_Kira[];
 extern const u8 gText_Amy[];
@@ -991,6 +998,19 @@ extern const u8 gText_SomeonesPC[];
 extern const u8 gText_PlayersPC[];
 extern const u8 gText_WhichPCShouldBeAccessed[];
 
+extern const u8 gText_Navgear_ClearButtonList[];
+extern const u8 gText_NavgearMap_ZoomedOutButtons[];
+extern const u8 gText_NavgearMap_ZoomedInButtons[];
+extern const u8 gText_NavgearCondition_MonListButtons[];
+extern const u8 gText_NavgearCondition_MonStatusButtons[];
+extern const u8 gText_NavgearCondition_MarkingButtons[];
+extern const u8 gText_NavgearMatchCall_TrainerListButtons[];
+extern const u8 gText_NavgearMatchCall_CallMenuButtons[];
+extern const u8 gText_NavgearMatchCall_CheckTrainerButtons[];
+extern const u8 gText_NavgearRibbons_MonListButtons[];
+extern const u8 gText_NavgearRibbons_RibbonListButtons[];
+extern const u8 gText_NavgearRibbons_RibbonCheckButtons[];
+
 extern const u8 gUnknown_085EAD37[];
 extern const u8 gUnknown_085EAD41[];
 extern const u8 gUnknown_085EAD67[];
@@ -1692,133 +1712,251 @@ extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B[];
 extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF[];
 extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[];
 
+// Battle Dome.
+extern const u8 gBattleDomeOpponentPotentialText1[];
+extern const u8 gBattleDomeOpponentPotentialText2[];
+extern const u8 gBattleDomeOpponentPotentialText3[];
+extern const u8 gBattleDomeOpponentPotentialText4[];
+extern const u8 gBattleDomeOpponentPotentialText5[];
+extern const u8 gBattleDomeOpponentPotentialText6[];
+extern const u8 gBattleDomeOpponentPotentialText7[];
+extern const u8 gBattleDomeOpponentPotentialText8[];
+extern const u8 gBattleDomeOpponentPotentialText9[];
+extern const u8 gBattleDomeOpponentPotentialText10[];
+extern const u8 gBattleDomeOpponentPotentialText11[];
+extern const u8 gBattleDomeOpponentPotentialText12[];
+extern const u8 gBattleDomeOpponentPotentialText13[];
+extern const u8 gBattleDomeOpponentPotentialText14[];
+extern const u8 gBattleDomeOpponentPotentialText15[];
+extern const u8 gBattleDomeOpponentPotentialText16[];
+extern const u8 gBattleDomeOpponentPotentialText17[];
+extern const u8 gBattleDomeOpponentStyleText1[];
+extern const u8 gBattleDomeOpponentStyleText2[];
+extern const u8 gBattleDomeOpponentStyleText3[];
+extern const u8 gBattleDomeOpponentStyleText4[];
+extern const u8 gBattleDomeOpponentStyleText5[];
+extern const u8 gBattleDomeOpponentStyleText6[];
+extern const u8 gBattleDomeOpponentStyleText7[];
+extern const u8 gBattleDomeOpponentStyleText8[];
+extern const u8 gBattleDomeOpponentStyleText9[];
+extern const u8 gBattleDomeOpponentStyleText10[];
+extern const u8 gBattleDomeOpponentStyleText11[];
+extern const u8 gBattleDomeOpponentStyleText12[];
+extern const u8 gBattleDomeOpponentStyleText13[];
+extern const u8 gBattleDomeOpponentStyleText14[];
+extern const u8 gBattleDomeOpponentStyleText15[];
+extern const u8 gBattleDomeOpponentStyleText16[];
+extern const u8 gBattleDomeOpponentStyleText17[];
+extern const u8 gBattleDomeOpponentStyleText18[];
+extern const u8 gBattleDomeOpponentStyleText19[];
+extern const u8 gBattleDomeOpponentStyleText20[];
+extern const u8 gBattleDomeOpponentStyleText21[];
+extern const u8 gBattleDomeOpponentStyleText22[];
+extern const u8 gBattleDomeOpponentStyleText23[];
+extern const u8 gBattleDomeOpponentStyleText24[];
+extern const u8 gBattleDomeOpponentStyleText25[];
+extern const u8 gBattleDomeOpponentStyleText26[];
+extern const u8 gBattleDomeOpponentStyleText27[];
+extern const u8 gBattleDomeOpponentStyleText28[];
+extern const u8 gBattleDomeOpponentStyleTextUnused1[];
+extern const u8 gBattleDomeOpponentStyleTextUnused2[];
+extern const u8 gBattleDomeOpponentStyleTextUnused3[];
+extern const u8 gBattleDomeOpponentStyleTextUnused4[];
+extern const u8 gBattleDomeOpponentStatsText1[];
+extern const u8 gBattleDomeOpponentStatsText2[];
+extern const u8 gBattleDomeOpponentStatsText3[];
+extern const u8 gBattleDomeOpponentStatsText4[];
+extern const u8 gBattleDomeOpponentStatsText5[];
+extern const u8 gBattleDomeOpponentStatsText6[];
+extern const u8 gBattleDomeOpponentStatsText7[];
+extern const u8 gBattleDomeOpponentStatsText8[];
+extern const u8 gBattleDomeOpponentStatsText9[];
+extern const u8 gBattleDomeOpponentStatsText10[];
+extern const u8 gBattleDomeOpponentStatsText11[];
+extern const u8 gBattleDomeOpponentStatsText12[];
+extern const u8 gBattleDomeOpponentStatsText13[];
+extern const u8 gBattleDomeOpponentStatsText14[];
+extern const u8 gBattleDomeOpponentStatsText15[];
+extern const u8 gBattleDomeOpponentStatsText16[];
+extern const u8 gBattleDomeOpponentStatsText17[];
+extern const u8 gBattleDomeOpponentStatsText18[];
+extern const u8 gBattleDomeOpponentStatsText19[];
+extern const u8 gBattleDomeOpponentStatsText20[];
+extern const u8 gBattleDomeOpponentStatsText21[];
+extern const u8 gBattleDomeOpponentStatsText22[];
+extern const u8 gBattleDomeOpponentStatsText23[];
+extern const u8 gBattleDomeOpponentStatsText24[];
+extern const u8 gBattleDomeOpponentStatsText25[];
+extern const u8 gBattleDomeOpponentStatsText26[];
+extern const u8 gBattleDomeOpponentStatsText27[];
+extern const u8 gBattleDomeOpponentStatsText28[];
+extern const u8 gBattleDomeOpponentStatsText29[];
+extern const u8 gBattleDomeOpponentStatsText30[];
+extern const u8 gBattleDomeOpponentStatsText31[];
+extern const u8 gBattleDomeOpponentStatsText32[];
+extern const u8 gBattleDomeOpponentStatsText33[];
+extern const u8 gBattleDomeOpponentStatsText34[];
+extern const u8 gBattleDomeOpponentStatsText35[];
+extern const u8 gBattleDomeOpponentStatsText36[];
+extern const u8 gBattleDomeOpponentStatsText37[];
+extern const u8 gBattleDomeOpponentStatsText38[];
+extern const u8 gBattleDomeOpponentStatsText39[];
+extern const u8 gBattleDomeOpponentStatsText40[];
+extern const u8 gBattleDomeOpponentStatsText41[];
+extern const u8 gBattleDomeOpponentStatsText42[];
+extern const u8 gBattleDomeOpponentStatsText43[];
+extern const u8 gBattleDomeMatchNumberText1[];
+extern const u8 gBattleDomeMatchNumberText2[];
+extern const u8 gBattleDomeMatchNumberText3[];
+extern const u8 gBattleDomeMatchNumberText4[];
+extern const u8 gBattleDomeMatchNumberText5[];
+extern const u8 gBattleDomeMatchNumberText6[];
+extern const u8 gBattleDomeMatchNumberText7[];
+extern const u8 gBattleDomeMatchNumberText8[];
+extern const u8 gBattleDomeMatchNumberText9[];
+extern const u8 gBattleDomeMatchNumberText10[];
+extern const u8 gBattleDomeMatchNumberText11[];
+extern const u8 gBattleDomeMatchNumberText12[];
+extern const u8 gBattleDomeMatchNumberText13[];
+extern const u8 gBattleDomeMatchNumberText14[];
+extern const u8 gBattleDomeMatchNumberText15[];
+extern const u8 gBattleDomeWinText1[];
+extern const u8 gBattleDomeWinText2[];
+extern const u8 gBattleDomeWinText3[];
+extern const u8 gBattleDomeWinText4[];
+extern const u8 gBattleDomeWinText5[];
+extern const u8 gBattleDomeWinText6[];
+extern const u8 gBattleDomeWinText7[];
+
 // Battle Pyramid.
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D2D[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D57[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252D81[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252DAB[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25330B[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2532CC[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25328B[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253248[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253206[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2531C4[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253183[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253140[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530FD[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2544A6[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25445A[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25440B[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2543BA[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25436A[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25431A[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2542CB[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25427A[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252DD5[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E03[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E31[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E5F[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25362E[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2535D4[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253578[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25351A[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2534BD[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253460[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253404[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2533A6[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25334D[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25471E[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2546CC[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25467C[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25462A[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2545D9[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254588[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254538[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2544E6[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252E8D[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EAA[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EC7[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252EE4[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2539EC[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253980[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253915[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2538A8[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25383C[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2537D0[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253765[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2536F8[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25368B[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A0B[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2549AE[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25494D[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2548EB[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25488A[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254829[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2547C9[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254767[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F01[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F3A[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252F73[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252FAC[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253D3E[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253CE0[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253C87[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253C2C[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253BD2[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253B78[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253B1F[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253AC4[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253A69[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254C3E[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254BF1[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254BAE[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254B69[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254B25[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254AE1[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A9E[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254A59[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_252FE5[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253000[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25301B[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253036[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253F6C[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253F34[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253EFA[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253EBE[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E83[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E48[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253E0E[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253DD2[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253D96[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254E6E[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254E27[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254DE0[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D97[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D4F[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254D07[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254CC0[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254C77[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253051[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25307C[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530A7[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2530D2[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25422B[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2541DD[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25418D[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25413B[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_2540EA[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254099[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254049[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253FF7[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_253FA5[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_255068[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_25502F[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254FF6[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254FBB[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F81[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F47[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254F0E[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_Text_254ED3[];
+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[];
+
+
 
 // PC strings
 extern const u8 gText_ExitFromBox[];
@@ -2287,5 +2425,167 @@ extern const u8 gUnknown_085EDC45[];
 extern const u8 gUnknown_085EDB00[];
 extern const u8 gUnknown_085EDC84[];
 
+// Easy Chat Entry
+extern const u8 gText_StopGivingPkmnMail[];
+extern const u8 gText_LikeToQuitQuiz[];
+extern const u8 gText_ChallengeQuestionMark[];
+extern const u8 gText_QuitEditing[];
+extern const u8 gText_AllTextBeingEditedWill[];
+extern const u8 gText_BeDeletedThatOkay[];
+extern const u8 gText_Lady[];
+extern const u8 gText_F700sQuiz[];
+extern const u8 gText_CreateAQuiz[];
+extern const u8 gText_SelectTheAnswer[];
+extern const u8 gText_OriginalSongWillBeUsed[];
+extern const u8 gText_LyricsCantBeDeleted[];
+extern const u8 gText_CombineTwoWordsOrPhrases3[];
+extern const u8 gText_OnlyOnePhrase[];
+extern const u8 gText_YouCannotQuitHere[];
+extern const u8 gText_SectionMustBeCompleted[];
+extern const u8 gText_ThreeQuestionMarks[];
+extern const u8 gText_Profile[];
+extern const u8 gText_CombineFourWordsOrPhrases[];
+extern const u8 gText_AndMakeYourProfile[];
+extern const u8 gText_YourProfile[];
+extern const u8 gText_IsAsShownOkay[];
+extern const u8 gText_AtTheBattlesStart[];
+extern const u8 gText_CombineSixWordsOrPhrases[];
+extern const u8 gText_AndMakeAMessage[];
+extern const u8 gText_YourFeelingAtTheBattlesStart[];
+extern const u8 gText_UponWinningABattle[];
+extern const u8 gText_WhatYouSayIfYouWin[];
+extern const u8 gText_UponLosingABattle[];
+extern const u8 gText_WhatYouSayIfYouLose[];
+extern const u8 gText_CombineNineWordsOrPhrases[];
+extern const u8 gText_AndMakeAMessage2[];
+extern const u8 gText_TheMailMessage[];
+extern const u8 gText_Interview[];
+extern const u8 gText_LetsReplyToTheInterview[];
+extern const u8 gText_TheAnswer[];
+extern const u8 gText_TheBardsSong[];
+extern const u8 gText_ChangeJustOneWordOrPhrase[];
+extern const u8 gText_AndImproveTheBardsSong[];
+extern const u8 gText_TheBardsSong2[];
+extern const u8 gText_FindWordsThatDescribeYour[];
+extern const u8 gText_FeelingsRightNow[];
+extern const u8 gText_WhatsHipAndHappening[];
+extern const u8 gText_CombineTwoWordsOrPhrases[];
+extern const u8 gText_AndMakeATrendySaying[];
+extern const u8 gText_TheTrendySaying[];
+extern const u8 gText_AfterYouHaveReadTheQuiz[];
+extern const u8 gText_QuestionPressTheAButton[];
+extern const u8 gText_TheQuizAnswerIs[];
+extern const u8 gText_OutOfTheListedChoices[];
+extern const u8 gText_SelectTheAnswerToTheQuiz[];
+extern const u8 gText_TheAnswerColon[];
+extern const u8 gText_AndCreateAQuiz[];
+extern const u8 gText_IsThisQuizOK[];
+extern const u8 gText_PickAWordOrPhraseAnd[];
+extern const u8 gText_SetTheQuizAnswer[];
+extern const u8 gText_ApprenticesPhrase[];
+extern const u8 gText_FindWordsWhichFit[];
+extern const u8 gText_TheTrainersImage[];
+extern const u8 gText_ApprenticePhrase[];
+extern const u8 gText_GoodSaying[];
+extern const u8 gText_CombineTwoWordsOrPhrases2[];
+extern const u8 gText_ToTeachHerAGoodSaying[];
+extern const u8 gText_FansQuestion[];
+extern const u8 gText_TheImage[];
+extern const u8 gText_Questionnaire[];
+extern const u8 gText_AndFillOutTheQuestionnaire[];
+extern const u8 gText_DelAll[];
+extern const u8 gText_Cancel5[];
+extern const u8 gText_Ok2[];
+extern const u8 gText_Quiz[];
+extern const u8 gText_Answer[];
+extern const u8 gEasyChatGroupName_Pokemon[];
+extern const u8 gEasyChatGroupName_Trainer[];
+extern const u8 gEasyChatGroupName_Status[];
+extern const u8 gEasyChatGroupName_Battle[];
+extern const u8 gEasyChatGroupName_Greetings[];
+extern const u8 gEasyChatGroupName_People[];
+extern const u8 gEasyChatGroupName_Voices[];
+extern const u8 gEasyChatGroupName_Speech[];
+extern const u8 gEasyChatGroupName_Endings[];
+extern const u8 gEasyChatGroupName_Feelings[];
+extern const u8 gEasyChatGroupName_Conditions[];
+extern const u8 gEasyChatGroupName_Actions[];
+extern const u8 gEasyChatGroupName_Lifestyle[];
+extern const u8 gEasyChatGroupName_Hobbies[];
+extern const u8 gEasyChatGroupName_Time[];
+extern const u8 gEasyChatGroupName_Misc[];
+extern const u8 gEasyChatGroupName_Adjectives[];
+extern const u8 gEasyChatGroupName_Events[];
+extern const u8 gEasyChatGroupName_Move1[];
+extern const u8 gEasyChatGroupName_Move2[];
+extern const u8 gEasyChatGroupName_TrendySaying[];
+extern const u8 gEasyChatGroupName_Pokemon2[];
+
+extern const u8 gUnknown_862B810[];
+extern const u8 gUnknown_862B832[];
+extern const u8 gUnknown_862B84B[];
+extern const u8 gUnknown_862B86C[];
+extern const u8 gUnknown_0862B88D[];
+extern const u8 gUnknown_0862B8AE[];
+extern const u8 gUnknown_0862B8CF[];
+extern const u8 gUnknown_0862B8F0[];
+extern const u8 gUnknown_0862B911[];
+extern const u8 gUnknown_0862B932[];
+extern const u8 gUnknown_0862B953[];
+extern const u8 gUnknown_0862B974[];
+extern const u8 gUnknown_0862B995[];
+extern const u8 gUnknown_0862B9AE[];
+extern const u8 gUnknown_0862B9C7[];
+extern const u8 gUnknown_0862B9E0[];
+extern const u8 gUnknown_0862B9F9[];
+extern const u8 gUnknown_0862B9FF[];
+extern const u8 gUnknown_0862BA05[];
+extern const u8 gUnknown_0862BA0B[];
+extern const u8 gUnknown_0862BA11[];
+extern const u8 gUnknown_0862BA17[];
+extern const u8 gUnknown_0862BA1D[];
+extern const u8 gUnknown_0862BA23[];
+extern const u8 gUnknown_0862BA29[];
+extern const u8 gUnknown_0862BA2F[];
+extern const u8 gUnknown_0862BA35[];
+extern const u8 gUnknown_0862BA3B[];
+extern const u8 gUnknown_0862BA41[];
+extern const u8 gUnknown_0862BA47[];
+extern const u8 gUnknown_0862BA4D[];
+extern const u8 gUnknown_0862BA53[];
+extern const u8 gUnknown_0862BA59[];
+extern const u8 gUnknown_0862BA5F[];
+extern const u8 gUnknown_0862BA65[];
+extern const u8 gUnknown_0862BA6B[];
+extern const u8 gUnknown_0862BA79[];
+extern const u8 gUnknown_0862BA84[];
+extern const u8 gUnknown_0862BA8F[];
+extern const u8 gUnknown_0862BA9A[];
+extern const u8 gUnknown_0862BAA3[];
+extern const u8 gUnknown_0862BAAE[];
+extern const u8 gUnknown_0862BAB9[];
+extern const u8 gUnknown_0862BAC4[];
+extern const u8 gUnknown_0862BACF[];
+extern const u8 gUnknown_0862BADA[];
+
+// E-Reader
+extern const u8 gUnknown_085EDFD6[];
+extern const u8 gUnknown_085EDFF5[];
+extern const u8 gUnknown_085EE014[];
+extern const u8 gUnknown_085EE035[];
+extern const u8 gUnknown_085EE05C[];
+extern const u8 gUnknown_085EE06B[];
+extern const u8 gUnknown_085EE080[];
+extern const u8 gUnknown_085EE097[];
+extern const u8 gUnknown_085EE0A3[];
+extern const u8 gUnknown_085EE0BF[];
+extern const u8 gUnknown_085EE0DC[];
+extern const u8 gUnknown_085EE0FA[];
+extern const u8 gUnknown_085EE107[];
+extern const u8 gUnknown_085EE120[];
+extern const u8 gUnknown_085EE12D[];
+extern const u8 gUnknown_085EE14B[];
+extern const u8 gUnknown_085EE14F[];
+extern const u8 gUnknown_085EE154[];
 
 #endif // GUARD_STRINGS_H