Merge pull request #1336 from GriffinRichards/giftribbons

Document some ribbon usage

2 files changed, 26 insertions, 26 deletions

diff --git a/src/data/text/gift_ribbon_descriptions.h b/src/data/text/gift_ribbon_descriptions.h
index ea108be18..a95f9729d 100644
--- a/src/data/text/gift_ribbon_descriptions.h
+++ b/src/data/text/gift_ribbon_descriptions.h
@@ -46,7 +46,7 @@ const u8 gGiftRibbonDescriptionPart2_LovedPokemon[] = _("for a loved POKéMON.")
 const u8 gGiftRibbonDescriptionPart1_LoveForPokemon[] = _("RIBBON that shows");
 const u8 gGiftRibbonDescriptionPart2_LoveForPokemon[] = _("love for POKéMON.");
 
-const u8 *const gGiftRibbonDescriptionPointers[][2] = 
+const u8 *const gGiftRibbonDescriptionPointers[MAX_GIFT_RIBBON][2] = 
 {
     {gGiftRibbonDescriptionPart1_2003RegionalTourney,   gGiftRibbonDescriptionPart2_Champion},
     {gGiftRibbonDescriptionPart1_2003NationalTourney,   gGiftRibbonDescriptionPart2_Champion},
diff --git a/src/data/text/ribbon_descriptions.h b/src/data/text/ribbon_descriptions.h
index f455a7771..5db52dced 100644
--- a/src/data/text/ribbon_descriptions.h
+++ b/src/data/text/ribbon_descriptions.h
@@ -20,29 +20,29 @@ const u8 gRibbonDescriptionPart2_Effort[] = _("being a hard worker.");
 
 const u8 *const gRibbonDescriptionPointers[][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},
+    [CHAMPION_RIBBON]      = {gRibbonDescriptionPart1_Champion,      gRibbonDescriptionPart2_Champion},
+    [COOL_RIBBON_NORMAL]   = {gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_NormalRank},
+    [COOL_RIBBON_SUPER]    = {gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_SuperRank},
+    [COOL_RIBBON_HYPER]    = {gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_HyperRank},
+    [COOL_RIBBON_MASTER]   = {gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_MasterRank},
+    [BEAUTY_RIBBON_NORMAL] = {gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_NormalRank},
+    [BEAUTY_RIBBON_SUPER]  = {gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_SuperRank},
+    [BEAUTY_RIBBON_HYPER]  = {gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_HyperRank},
+    [BEAUTY_RIBBON_MASTER] = {gRibbonDescriptionPart1_BeautyContest, gRibbonDescriptionPart2_MasterRank},
+    [CUTE_RIBBON_NORMAL]   = {gRibbonDescriptionPart1_CuteContest,   gRibbonDescriptionPart2_NormalRank},
+    [CUTE_RIBBON_SUPER]    = {gRibbonDescriptionPart1_CuteContest,   gRibbonDescriptionPart2_SuperRank},
+    [CUTE_RIBBON_HYPER]    = {gRibbonDescriptionPart1_CuteContest,   gRibbonDescriptionPart2_HyperRank},
+    [CUTE_RIBBON_MASTER]   = {gRibbonDescriptionPart1_CuteContest,   gRibbonDescriptionPart2_MasterRank},
+    [SMART_RIBBON_NORMAL]  = {gRibbonDescriptionPart1_SmartContest,  gRibbonDescriptionPart2_NormalRank},
+    [SMART_RIBBON_SUPER]   = {gRibbonDescriptionPart1_SmartContest,  gRibbonDescriptionPart2_SuperRank},
+    [SMART_RIBBON_HYPER]   = {gRibbonDescriptionPart1_SmartContest,  gRibbonDescriptionPart2_HyperRank},
+    [SMART_RIBBON_MASTER]  = {gRibbonDescriptionPart1_SmartContest,  gRibbonDescriptionPart2_MasterRank},
+    [TOUGH_RIBBON_NORMAL]  = {gRibbonDescriptionPart1_ToughContest,  gRibbonDescriptionPart2_NormalRank},
+    [TOUGH_RIBBON_SUPER]   = {gRibbonDescriptionPart1_ToughContest,  gRibbonDescriptionPart2_SuperRank},
+    [TOUGH_RIBBON_HYPER]   = {gRibbonDescriptionPart1_ToughContest,  gRibbonDescriptionPart2_HyperRank},
+    [TOUGH_RIBBON_MASTER]  = {gRibbonDescriptionPart1_ToughContest,  gRibbonDescriptionPart2_MasterRank},
+    [WINNING_RIBBON]       = {gRibbonDescriptionPart1_Winning,       gRibbonDescriptionPart2_Winning},
+    [VICTORY_RIBBON]       = {gRibbonDescriptionPart1_Victory,       gRibbonDescriptionPart2_Victory},
+    [ARTIST_RIBBON]        = {gRibbonDescriptionPart1_Artist,        gRibbonDescriptionPart2_Artist},
+    [EFFORT_RIBBON]        = {gRibbonDescriptionPart1_Effort,        gRibbonDescriptionPart2_Effort},
 };