From 22e1e53d666f1642219baf5733f6804128b9d8d6 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 16 Sep 2019 18:04:01 -0300 Subject: [PATCH 1/2] Added missing item data. --- src/data/items.h | 70 +++++++++++++++++++++++++++++++ src/data/text/item_descriptions.h | 23 ++++++++++ 2 files changed, 93 insertions(+) diff --git a/src/data/items.h b/src/data/items.h index b50451f67..1a9445ade 100644 --- a/src/data/items.h +++ b/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 = sCherishBallDesc, + .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"), diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 74ae60e2e..9c722e4dc 100644 --- a/src/data/text/item_descriptions.h +++ b/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" From c6504ebfd4b210be0318029a215e13406e7b7970 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 16 Sep 2019 18:43:51 -0300 Subject: [PATCH 2/2] Oops. I forgot to set the correct description in the Dream Ball's data. --- src/data/items.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index 1a9445ade..c359d1c96 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -369,7 +369,7 @@ const struct Item gItems[] = .name = _("Dream Ball"), .itemId = ITEM_DREAM_BALL, .price = 10, - .description = sCherishBallDesc, + .description = sDreamBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, .fieldUseFunc = NULL,