Merge branch 'master' into doc-cinnabar

1 files changed, 30 insertions, 29 deletions

diff --git a/src/script_menu.c b/src/script_menu.c
index 42be3b539..72ff1dc9e 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -565,36 +565,37 @@ const struct MultichoiceListStruct gScriptMultiChoiceMenus[] = {
     { sScriptMultiChoiceMenu_TrainerTowerMode, NELEMS(sScriptMultiChoiceMenu_TrainerTowerMode) }
 };
 
+// From Cool to Berries goes unused
 const u8 *const gStdStringPtrs[] = {
-    gText_Cool,
-    gText_Beauty,
-    gText_Cute,
-    gText_Smart,
-    gText_Tough,
-    gText_Cool_2,
-    gText_Beauty_2,
-    gText_Cute_2,
-    gText_Smart_2,
-    gText_Tough_2,
-    gText_Items,
-    gText_KeyItems,
-    gText_PokeBalls,
-    gText_TMsAndHMs,
-    gText_Berries,
-    gText_Boulderbadge,
-    gText_Cascadebadge,
-    gText_Thunderbadge,
-    gText_Rainbowbadge,
-    gText_Soulbadge,
-    gText_Marshbadge,
-    gText_Volcanobadge,
-    gText_Earthbadge,
-    gText_Coins_2,
-    gText_ItemsPocket,
-    gText_KeyItemsPocket,
-    gText_PokeBallsPocket,
-    gText_TmCase,
-    gText_BerryPouch_2
+    [STDSTRING_COOL]             = gText_Cool,
+    [STDSTRING_BEAUTY]           = gText_Beauty,
+    [STDSTRING_CUTE]             = gText_Cute,
+    [STDSTRING_SMART]            = gText_Smart,
+    [STDSTRING_TOUGH]            = gText_Tough,
+    [STDSTRING_COOL2]            = gText_Cool_2,
+    [STDSTRING_BEAUTY2]          = gText_Beauty_2,
+    [STDSTRING_CUTE2]            = gText_Cute_2,
+    [STDSTRING_SMART2]           = gText_Smart_2,
+    [STDSTRING_TOUGH2]           = gText_Tough_2,
+    [STDSTRING_ITEMS]            = gText_Items,
+    [STDSTRING_KEY_ITEMS]        = gText_KeyItems,
+    [STDSTRING_POKEBALLS]        = gText_PokeBalls,
+    [STDSTRING_TMHMS]            = gText_TMsAndHMs,
+    [STDSTRING_BERRIES]          = gText_Berries,
+    [STDSTRING_BOULDER_BADGE]    = gText_Boulderbadge,
+    [STDSTRING_CASCADE_BADGE]    = gText_Cascadebadge,
+    [STDSTRING_THUNDER_BADGE]    = gText_Thunderbadge,
+    [STDSTRING_RAINBOW_BADGE]    = gText_Rainbowbadge,
+    [STDSTRING_SOUL_BADGE]       = gText_Soulbadge,
+    [STDSTRING_MARSH_BADGE]      = gText_Marshbadge,
+    [STDSTRING_VOLCANO_BADGE]    = gText_Volcanobadge,
+    [STDSTRING_EARTH_BADGE]      = gText_Earthbadge,
+    [STDSTRING_COINS]            = gText_Coins_2,
+    [STDSTRING_ITEMS_POCKET]     = gText_ItemsPocket,
+    [STDSTRING_KEY_ITEMS_POCKET] = gText_KeyItemsPocket,
+    [STDSTRING_POKEBALLS_POCKET] = gText_PokeBallsPocket,
+    [STDSTRING_TM_CASE]          = gText_TmCase,
+    [STDSTRING_BERRY_POUCH]      = gText_BerryPouch_2
 };
 
 static const u8 *const sDescriptionPtrs_CableClub_TradeBattleCancel[] = {