Merge pull request #199 from LOuroboros/item_expansion

Added missing item data.

src/data/items.h

@@ -336,6 +336,62 @@ const struct Item gItems[] =
         .secondaryId = 22,
     },
 
+    [ITEM_SPORT_BALL] =
+    {
+        .name = _("Sport Ball"),
+        .itemId = ITEM_SPORT_BALL,
+        .price = 10,
+        .description = sSportBallDesc,
+        .pocket = POCKET_POKE_BALLS,
+        .type = 11,
+        .fieldUseFunc = NULL,
+        .battleUsage = 2,
+        .battleUseFunc = ItemUseInBattle_PokeBall,
+        .secondaryId = 23, // To Do
+    },
+
+    [ITEM_PARK_BALL] =
+    {
+        .name = _("Park Ball"),
+        .itemId = ITEM_PARK_BALL,
+        .price = 10,
+        .description = sParkBallDesc,
+        .pocket = POCKET_POKE_BALLS,
+        .type = 11,
+        .fieldUseFunc = NULL,
+        .battleUsage = 2,
+        .battleUseFunc = ItemUseInBattle_PokeBall,
+        .secondaryId = 24, // To Do
+    },
+
+    [ITEM_DREAM_BALL] =
+    {
+        .name = _("Dream Ball"),
+        .itemId = ITEM_DREAM_BALL,
+        .price = 10,
+        .description = sDreamBallDesc,
+        .pocket = POCKET_POKE_BALLS,
+        .type = 11,
+        .fieldUseFunc = NULL,
+        .battleUsage = 2,
+        .battleUseFunc = ItemUseInBattle_PokeBall,
+        .secondaryId = 25, // To Do
+    },
+
+    [ITEM_BEAST_BALL] =
+    {
+        .name = _("Beast Ball"),
+        .itemId = ITEM_BEAST_BALL,
+        .price = 10,
+        .description = sBeastBallDesc,
+        .pocket = POCKET_POKE_BALLS,
+        .type = 11,
+        .fieldUseFunc = NULL,
+        .battleUsage = 2,
+        .battleUseFunc = ItemUseInBattle_PokeBall,
+        .secondaryId = 26, // To Do
+    },
+
 // Medicine
 
     [ITEM_POTION] =
@@ -2322,6 +2378,20 @@ const struct Item gItems[] =
         .secondaryId = 0,
     },
 
+    [ITEM_MICLE_BERRY] =
+    {
+        .name = _("Micle Berry"),
+        .itemId = ITEM_MICLE_BERRY,
+        .price = 20,
+        .holdEffect = HOLD_EFFECT_NONE, // Placeholder
+        .holdEffectParam = 4,
+        .description = sMicleBerryDesc,
+        .pocket = POCKET_BERRIES,
+        .type = 4,
+        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
+        .secondaryId = 0,
+    },
+
     [ITEM_ENIGMA_BERRY] =
     {
         .name = _("Enigma Berry"),

src/data/text/item_descriptions.h

@@ -117,6 +117,24 @@ static const u8 sCherishBallDesc[] = _(
     "in commemoration\n"
     "of some event.");
 
+static const u8 sSportBallDesc[] = _(
+    "A special Ball used\n"
+    "in the Bug-Catching\n"
+    "Contest.");
+
+static const u8 sParkBallDesc[] = _(
+    "A special Ball for\n"
+    "the Pal Park.");
+
+static const u8 sDreamBallDesc[] = _(
+    "A Poké Ball used in\n"
+    "the Entree Forest.\n"
+    "It doesn't fail.");
+
+static const u8 sBeastBallDesc[] = _(
+    "A Ball designed to\n"
+    "catch Ultra Beasts.");
+
 // Medicine
 static const u8 sPotionDesc[] = _(
     "Restores the HP of\n"
@@ -867,6 +885,11 @@ static const u8 sStarfBerryDesc[] = _(
     "sharply boosts a\n"
     "stat in a pinch.");
 
+static const u8 sMicleBerryDesc[] = _(
+    "When held, it ups\n"
+    "the Accuracy of a\n"
+    "move in a pinch.");
+
 static const u8 sEnigmaBerryDesc[] = _(
     "{POKEBLOCK} ingredient.\n"
     "Plant in loamy soil\n"