Merge branch 'master' into modern_gcc

1 files changed, 85 insertions, 0 deletions

diff --git a/src/data/text/ribbon_descriptions_en.h b/src/data/text/ribbon_descriptions_en.h
new file mode 100644
index 000000000..5a314d2a6
--- /dev/null
+++ b/src/data/text/ribbon_descriptions_en.h
@@ -0,0 +1,85 @@
+const u8 gRibbonDescriptionPart1_Champion[] = _(
+    "CHAMPION-beating, HALL");
+
+const u8 gRibbonDescriptionPart2_Champion[] = _(
+    "OF FAME Member RIBBON");
+
+const u8 gRibbonDescriptionPart1_CoolContest[] = _(
+    "COOL CONTEST");
+
+const u8 gRibbonDescriptionPart1_BeautyContest[] = _(
+    "BEAUTY CONTEST");
+
+const u8 gRibbonDescriptionPart1_CuteContest[] = _(
+    "CUTE CONTEST");
+
+const u8 gRibbonDescriptionPart1_SmartContest[] = _(
+    "SMART CONTEST");
+
+const u8 gRibbonDescriptionPart1_ToughContest[] = _(
+    "TOUGH CONTEST");
+
+const u8 gRibbonDescriptionPart2_NormalRank[] = _(
+    "Normal Rank winner!");
+
+const u8 gRibbonDescriptionPart2_SuperRank[] = _(
+    "Super Rank winner!");
+
+const u8 gRibbonDescriptionPart2_HyperRank[] = _(
+    "Hyper Rank winner!");
+
+const u8 gRibbonDescriptionPart2_MasterRank[] = _(
+    "Master Rank winner!");
+
+const u8 gRibbonDescriptionPart1_Winning[] = _(
+    "RIBBON for clearing LV50");
+
+const u8 gRibbonDescriptionPart2_Winning[] = _(
+    "at the BATTLE TOWER.");
+
+const u8 gRibbonDescriptionPart1_Victory[] = _(
+    "Won for clearing LV100");
+
+const u8 gRibbonDescriptionPart2_Victory[] = _(
+    "at the BATTLE TOWER.");
+
+const u8 gRibbonDescriptionPart1_Artist[] = _(
+    "RIBBON for being chosen");
+
+const u8 gRibbonDescriptionPart2_Artist[] = _(
+    "as a super sketch model.");
+
+const u8 gRibbonDescriptionPart1_Effort[] = _(
+    "RIBBON awarded for");
+
+const u8 gRibbonDescriptionPart2_Effort[] = _(
+    "being a hard worker.");
+
+const u8 *const gRibbonDescriptions[][2] = 
+{
+    {gRibbonDescriptionPart1_Champion,      gRibbonDescriptionPart2_Champion},
+    {gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_NormalRank},
+    {gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_SuperRank},
+    {gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_HyperRank},
+    {gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_MasterRank},
+    {gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_NormalRank},
+    {gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_SuperRank},
+    {gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_HyperRank},
+    {gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_MasterRank},
+    {gRibbonDescriptionPart1_CuteContest,   gRibbonDescriptionPart2_NormalRank},
+    {gRibbonDescriptionPart1_CuteContest,   gRibbonDescriptionPart2_SuperRank},
+    {gRibbonDescriptionPart1_CuteContest,   gRibbonDescriptionPart2_HyperRank},
+    {gRibbonDescriptionPart1_CuteContest,   gRibbonDescriptionPart2_MasterRank},
+    {gRibbonDescriptionPart1_SmartContest,  gRibbonDescriptionPart2_NormalRank},
+    {gRibbonDescriptionPart1_SmartContest,  gRibbonDescriptionPart2_SuperRank},
+    {gRibbonDescriptionPart1_SmartContest,  gRibbonDescriptionPart2_HyperRank},
+    {gRibbonDescriptionPart1_SmartContest,  gRibbonDescriptionPart2_MasterRank},
+    {gRibbonDescriptionPart1_ToughContest,  gRibbonDescriptionPart2_NormalRank},
+    {gRibbonDescriptionPart1_ToughContest,  gRibbonDescriptionPart2_SuperRank},
+    {gRibbonDescriptionPart1_ToughContest,  gRibbonDescriptionPart2_HyperRank},
+    {gRibbonDescriptionPart1_ToughContest,  gRibbonDescriptionPart2_MasterRank},
+    {gRibbonDescriptionPart1_Winning,       gRibbonDescriptionPart2_Winning},
+    {gRibbonDescriptionPart1_Victory,       gRibbonDescriptionPart2_Victory},
+    {gRibbonDescriptionPart1_Artist,        gRibbonDescriptionPart2_Artist},
+    {gRibbonDescriptionPart1_Effort,        gRibbonDescriptionPart2_Effort},
+};