diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index eb6c6142b..20ecada73 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -749,9 +749,7 @@ const u32 *const gItemIconTable[][2] = // Battle Mechanic Key Items [ITEM_KEY_STONE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo [ITEM_MEGA_RING] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - //[ITEM_MEGA_BRACELET] = {gItemIcon_MegaBracelet, gItemIconPalette_MegaBracelet}, // Remove [ITEM_Z_POWER_RING] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - //[ITEM_Z_RING] = {gItemIcon_ZRing, gItemIconPalette_ZRing}, // Remove [ITEM_DYNAMAX_BAND] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo // Misc. Key Items [ITEM_BICYCLE] = {gItemIcon_Bicycle, gItemIconPalette_Bicycle}, diff --git a/src/data/items.h b/src/data/items.h index 8d458c078..bf704a90a 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -744,39 +744,45 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, }, - [ITEM_MAX_HONEY] = // Todo + [ITEM_MAX_HONEY] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Max Honey"), + .itemId = ITEM_MAX_HONEY, + .price = 8000, + .description = sMaxHoneyDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .battleUsage = ITEM_B_USE_MEDICINE, + .battleUseFunc = ItemUseInBattle_Medicine, }, // Regional Specialties - [ITEM_PEWTER_CRUNCHIES] = // Todo + [ITEM_PEWTER_CRUNCHIES] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("PewtrCrnches"), + .itemId = ITEM_PEWTER_CRUNCHIES, + .price = 250, + .description = sPewterCrunchiesDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .battleUsage = ITEM_B_USE_MEDICINE, + .battleUseFunc = ItemUseInBattle_Medicine, }, - [ITEM_RAGE_CANDY_BAR] = // Todo + [ITEM_RAGE_CANDY_BAR] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("RageCandyBar"), + .itemId = ITEM_RAGE_CANDY_BAR, + .price = 350, + .description = sRageCandyBarDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .battleUsage = ITEM_B_USE_MEDICINE, + .battleUseFunc = ItemUseInBattle_Medicine, }, [ITEM_LAVA_COOKIE] = @@ -805,37 +811,43 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Medicine, }, - [ITEM_CASTELIACONE] = // Todo + [ITEM_CASTELIACONE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("CasteliaCone"), + .itemId = ITEM_CASTELIACONE, + .price = 400, + .description = sCasteliaconeDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .battleUsage = ITEM_B_USE_MEDICINE, + .battleUseFunc = ItemUseInBattle_Medicine, }, - [ITEM_LUMIOSE_GALETTE] = // Todo + [ITEM_LUMIOSE_GALETTE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("LumioseGlete"), + .itemId = ITEM_LUMIOSE_GALETTE, + .price = 400, + .description = sLumioseGaletteDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .battleUsage = ITEM_B_USE_MEDICINE, + .battleUseFunc = ItemUseInBattle_Medicine, }, - [ITEM_SHALOUR_SABLE] = // Todo + [ITEM_SHALOUR_SABLE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("ShalourSable"), + .itemId = ITEM_SHALOUR_SABLE, + .price = 400, + .description = sShalourSableDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, + .battleUsage = ITEM_B_USE_MEDICINE, + .battleUseFunc = ItemUseInBattle_Medicine, }, [ITEM_BIG_MALASADA] = @@ -1023,248 +1035,249 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_AbilityCapsule, }, - [ITEM_ABILITY_PATCH] = // Todo + [ITEM_ABILITY_PATCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("AbilityPatch"), + .itemId = ITEM_ABILITY_PATCH, .price = 0, - .description = sDummyDesc, + .holdEffectParam = 0, + .description = sAbilityPatchDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, // Mints - [ITEM_LONELY_MINT] = // Todo + [ITEM_LONELY_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Lonely Mint"), + .itemId = ITEM_LONELY_MINT, + .price = 20, + .description = sLonelyMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_ADAMANT_MINT] = // Todo + [ITEM_ADAMANT_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Adamant Mint"), + .itemId = ITEM_ADAMANT_MINT, + .price = 20, + .description = sAdamantMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_NAUGHTY_MINT] = // Todo + [ITEM_NAUGHTY_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Naughty Mint"), + .itemId = ITEM_NAUGHTY_MINT, + .price = 20, + .description = sNaughtyMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_BRAVE_MINT] = // Todo + [ITEM_BRAVE_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Brave Mint"), + .itemId = ITEM_BRAVE_MINT, + .price = 20, + .description = sBraveMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_BOLD_MINT] = // Todo + [ITEM_BOLD_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Bold Mint"), + .itemId = ITEM_BOLD_MINT, + .price = 20, + .description = sBoldMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_IMPISH_MINT] = // Todo + [ITEM_IMPISH_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Impish Mint"), + .itemId = ITEM_IMPISH_MINT, + .price = 20, + .description = sImpishMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_LAX_MINT] = // Todo + [ITEM_LAX_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Lax Mint"), + .itemId = ITEM_LAX_MINT, + .price = 20, + .description = sLaxMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_RELAXED_MINT] = // Todo + [ITEM_RELAXED_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Relaxed Mint"), + .itemId = ITEM_RELAXED_MINT, + .price = 20, + .description = sRelaxedMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_MODEST_MINT] = // Todo + [ITEM_MODEST_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Modest Mint"), + .itemId = ITEM_MODEST_MINT, + .price = 20, + .description = sModestMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_MILD_MINT] = // Todo + [ITEM_MILD_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Mild Mint"), + .itemId = ITEM_MILD_MINT, + .price = 20, + .description = sMildMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_RASH_MINT] = // Todo + [ITEM_RASH_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Rash Mint"), + .itemId = ITEM_RASH_MINT, + .price = 20, + .description = sRashMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_QUIET_MINT] = // Todo + [ITEM_QUIET_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Quiet Mint"), + .itemId = ITEM_QUIET_MINT, + .price = 20, + .description = sQuietMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_CALM_MINT] = // Todo + [ITEM_CALM_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Calm Mint"), + .itemId = ITEM_CALM_MINT, + .price = 20, + .description = sCalmMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_GENTLE_MINT] = // Todo + [ITEM_GENTLE_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Gentle Mint"), + .itemId = ITEM_GENTLE_MINT, + .price = 20, + .description = sGentleMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_CAREFUL_MINT] = // Todo + [ITEM_CAREFUL_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Careful Mint"), + .itemId = ITEM_CAREFUL_MINT, + .price = 20, + .description = sCarefulMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_SASSY_MINT] = // Todo + [ITEM_SASSY_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Sassy Mint"), + .itemId = ITEM_SASSY_MINT, + .price = 20, + .description = sSassyMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_TIMID_MINT] = // Todo + [ITEM_TIMID_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Timid Mint"), + .itemId = ITEM_TIMID_MINT, + .price = 20, + .description = sTimidMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_HASTY_MINT] = // Todo + [ITEM_HASTY_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Hasty Mint"), + .itemId = ITEM_HASTY_MINT, + .price = 20, + .description = sHastyMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_JOLLY_MINT] = // Todo + [ITEM_JOLLY_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Jolly Mint"), + .itemId = ITEM_JOLLY_MINT, + .price = 20, + .description = sJollyMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_NAIVE_MINT] = // Todo + [ITEM_NAIVE_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Naive Mint"), + .itemId = ITEM_NAIVE_MINT, + .price = 20, + .description = sNaiveMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_SERIOUS_MINT] = // Todo + [ITEM_SERIOUS_MINT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Serious Mint"), + .itemId = ITEM_SERIOUS_MINT, + .price = 20, + .description = sSeriousMintDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, // Candy @@ -1280,70 +1293,70 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_RareCandy, }, - [ITEM_EXP_CANDY_XS] = // Todo + [ITEM_EXP_CANDY_XS] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Exp.Candy XS"), + .itemId = ITEM_EXP_CANDY_XS, + .price = 20, + .description = sExpCandyXSDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_EXP_CANDY_S] = // Todo + [ITEM_EXP_CANDY_S] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Exp.Candy S"), + .itemId = ITEM_EXP_CANDY_S, + .price = 20, + .description = sExpCandyXSDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_EXP_CANDY_M] = // Todo + [ITEM_EXP_CANDY_M] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Exp.Candy M"), + .itemId = ITEM_EXP_CANDY_M, + .price = 20, + .description = sExpCandyMDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_EXP_CANDY_L] = // Todo + [ITEM_EXP_CANDY_L] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Exp.Candy L"), + .itemId = ITEM_EXP_CANDY_L, + .price = 20, + .description = sExpCandyLDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_EXP_CANDY_XL] = // Todo + [ITEM_EXP_CANDY_XL] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Exp.Candy XL"), + .itemId = ITEM_EXP_CANDY_XL, + .price = 20, + .description = sExpCandyXLDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_DYNAMAX_CANDY] = // Todo + [ITEM_DYNAMAX_CANDY] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("DynamaxCandy"), + .itemId = ITEM_DYNAMAX_CANDY, .price = 0, - .description = sDummyDesc, + .description = sDynamaxCandyDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, // Medicinal Flutes @@ -1633,47 +1646,51 @@ const struct Item gItems[] = .battleUseFunc = ItemUseInBattle_Escape, }, - [ITEM_POKE_TOY] = // Todo + [ITEM_POKE_TOY] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Poké Toy"), + .itemId = ITEM_POKE_TOY, + .price = 100, + .description = sPokeToyDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = ITEM_B_USE_OTHER, + .battleUseFunc = ItemUseInBattle_Escape, }, - [ITEM_MAX_MUSHROOMS] = // Todo + [ITEM_MAX_MUSHROOMS] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("MaxMushrooms"), + .itemId = ITEM_MAX_MUSHROOMS, + .price = 8000, + .description = sMaxMushroomsDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = ITEM_B_USE_OTHER, + .battleUseFunc = ItemUseInBattle_StatIncrease, // Todo }, // Treasures - [ITEM_BOTTLE_CAP] = // Todo + [ITEM_BOTTLE_CAP] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Bottle Cap"), + .itemId = ITEM_BOTTLE_CAP, + .price = 5000, + .description = sBottleCapDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_GOLD_BOTTLE_CAP] = // Todo + [ITEM_GOLD_BOTTLE_CAP] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("GoldBottlCap"), + .itemId = ITEM_GOLD_BOTTLE_CAP, + .price = 10000, + .description = sGoldBottleCapDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1690,12 +1707,12 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_BIG_NUGGET] = // Todo + [ITEM_BIG_NUGGET] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Big Nugget"), + .itemId = ITEM_BIG_NUGGET, + .price = 40000, + .description = sBigNuggetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1723,12 +1740,12 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_BALM_MUSHROOM] = // Todo + [ITEM_BALM_MUSHROOM] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Balm Mushroom"), + .itemId = ITEM_BALM_MUSHROOM, + .price = 15000, + .description = sBalmMushroomDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1756,12 +1773,12 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_PEARL_STRING] = // Todo + [ITEM_PEARL_STRING] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Pearl String"), + .itemId = ITEM_PEARL_STRING, + .price = 20000, + .description = sPearlStringDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1789,12 +1806,12 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_COMET_SHARD] = // Todo + [ITEM_COMET_SHARD] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Comet Shard"), + .itemId = ITEM_COMET_SHARD, + .price = 25000, + .description = sCometShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1921,89 +1938,89 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_RELIC_COPPER] = // Todo + [ITEM_RELIC_COPPER] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Relic Copper"), + .itemId = ITEM_RELIC_COPPER, .price = 0, - .description = sDummyDesc, + .description = sRelicCopperDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_RELIC_SILVER] = // Todo + [ITEM_RELIC_SILVER] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Relic Silver"), + .itemId = ITEM_RELIC_SILVER, .price = 0, - .description = sDummyDesc, + .description = sRelicSilverDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_RELIC_GOLD] = // Todo + [ITEM_RELIC_GOLD] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Relic Gold"), + .itemId = ITEM_RELIC_GOLD, .price = 0, - .description = sDummyDesc, + .description = sRelicGoldDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_RELIC_VASE] = // Todo + [ITEM_RELIC_VASE] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Relic Vase"), + .itemId = ITEM_RELIC_VASE, .price = 0, - .description = sDummyDesc, + .description = sRelicVaseDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_RELIC_BAND] = // Todo + [ITEM_RELIC_BAND] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Relic Band"), + .itemId = ITEM_RELIC_BAND, .price = 0, - .description = sDummyDesc, + .description = sRelicBandDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_RELIC_STATUE] = // Todo + [ITEM_RELIC_STATUE] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Relic Statue"), + .itemId = ITEM_RELIC_STATUE, .price = 0, - .description = sDummyDesc, + .description = sRelicStatueDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_RELIC_CROWN] = // Todo + [ITEM_RELIC_CROWN] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Relic Crown"), + .itemId = ITEM_RELIC_CROWN, .price = 0, - .description = sDummyDesc, + .description = sRelicCrownDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_STRANGE_SOUVENIR] = // Todo + [ITEM_STRANGE_SOUVENIR] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("StrngeSouvnr"), + .itemId = ITEM_STRANGE_SOUVENIR, + .price = 30000, + .description = sStrangeSouvenirDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2162,45 +2179,45 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_FOSSILIZED_BIRD] = // Todo + [ITEM_FOSSILIZED_BIRD] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("FosslzedBird"), + .itemId = ITEM_FOSSILIZED_BIRD, + .price = 5000, + .description = sFossilizedBirdDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_FOSSILIZED_FISH] = // Todo + [ITEM_FOSSILIZED_FISH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("FosslzedFish"), + .itemId = ITEM_FOSSILIZED_FISH, + .price = 5000, + .description = sFossilizedFishDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_FOSSILIZED_DRAKE] = // Todo + [ITEM_FOSSILIZED_DRAKE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("FosslzedDrke"), + .itemId = ITEM_FOSSILIZED_DRAKE, + .price = 5000, + .description = sFossilizedDrakeDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_FOSSILIZED_DINO] = // Todo + [ITEM_FOSSILIZED_DINO] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("FosslzedDino"), + .itemId = ITEM_FOSSILIZED_DINO, + .price = 5000, + .description = sFossilizedDinoDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2208,92 +2225,92 @@ const struct Item gItems[] = // Mulch - [ITEM_GROWTH_MULCH] = // Todo + [ITEM_GROWTH_MULCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Growth Mulch"), + .itemId = ITEM_GROWTH_MULCH, + .price = 200, + .description = sGrowthMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_DAMP_MULCH] = // Todo + [ITEM_DAMP_MULCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Damp Mulch"), + .itemId = ITEM_DAMP_MULCH, + .price = 200, + .description = sDampMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_STABLE_MULCH] = // Todo + [ITEM_STABLE_MULCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Stable Mulch"), + .itemId = ITEM_STABLE_MULCH, + .price = 200, + .description = sStableMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_GOOEY_MULCH] = // Todo + [ITEM_GOOEY_MULCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Gooey Mulch"), + .itemId = ITEM_GOOEY_MULCH, + .price = 200, + .description = sGooeyMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_RICH_MULCH] = // Todo + [ITEM_RICH_MULCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Rich Mulch"), + .itemId = ITEM_RICH_MULCH, + .price = 200, + .description = sRichMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_SURPRISE_MULCH] = // Todo + [ITEM_SURPRISE_MULCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("SurprseMulch"), + .itemId = ITEM_SURPRISE_MULCH, + .price = 200, + .description = sSurpriseMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_BOOST_MULCH] = // Todo + [ITEM_BOOST_MULCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Boost Mulch"), + .itemId = ITEM_BOOST_MULCH, + .price = 200, + .description = sBoostMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_AMAZE_MULCH] = // Todo + [ITEM_AMAZE_MULCH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Amaze Mulch"), + .itemId = ITEM_AMAZE_MULCH, + .price = 200, + .description = sAmazeMulchDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, // Apricorns @@ -2375,45 +2392,45 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_WISHING_PIECE] = // Todo + [ITEM_WISHING_PIECE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("WishingPiece"), + .itemId = ITEM_WISHING_PIECE, + .price = 20, + .description = sWishingPieceDesc, + .pocket = POCKET_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + }, + + [ITEM_GALARICA_TWIG] = + { + .name = _("GalaricaTwig"), + .itemId = ITEM_GALARICA_TWIG, + .price = 40, + .description = sGalaricaTwigDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_GALARICA_TWIG] = // Todo + [ITEM_ARMORITE_ORE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Armorite Ore"), + .itemId = ITEM_ARMORITE_ORE, + .price = 40, + .description = sArmoriteOreDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_ARMORITE_ORE] = // Todo + [ITEM_DYNITE_ORE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - }, - - [ITEM_DYNITE_ORE] = // Todo - { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Dynite Ore"), + .itemId = ITEM_DYNITE_ORE, + .price = 20, + .description = sDyniteOreDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -2677,70 +2694,70 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, }, - [ITEM_SWEET_APPLE] = // Todo + [ITEM_SWEET_APPLE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Sweet Apple"), + .itemId = ITEM_SWEET_APPLE, + .price = 2200, + .description = sSweetAppleDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, }, - [ITEM_TART_APPLE] = // Todo + [ITEM_TART_APPLE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Tart Apple"), + .itemId = ITEM_TART_APPLE, + .price = 2200, + .description = sTartAppleDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, }, - [ITEM_CRACKED_POT] = // Todo + [ITEM_CRACKED_POT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Cracked Pot"), + .itemId = ITEM_CRACKED_POT, + .price = 1600, + .description = sCrackedPotDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, }, - [ITEM_CHIPPED_POT] = // Todo + [ITEM_CHIPPED_POT] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Chipped Pot"), + .itemId = ITEM_CHIPPED_POT, + .price = 38000, + .description = sChippedPotDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, }, - [ITEM_GALARICA_CUFF] = // Todo + [ITEM_GALARICA_CUFF] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("GalaricaCuff"), + .itemId = ITEM_GALARICA_CUFF, + .price = 6000, + .description = sGalaricaCuffDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, }, - [ITEM_GALARICA_WREATH] = // Todo + [ITEM_GALARICA_WREATH] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("GalrcaWreath"), + .itemId = ITEM_GALARICA_WREATH, + .price = 6000, + .description = sGalaricaWreathDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, }, [ITEM_DRAGON_SCALE] = @@ -2867,78 +2884,78 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_STRAWBERRY_SWEET] = // Todo + [ITEM_STRAWBERRY_SWEET] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("StrwbrySweet"), + .itemId = ITEM_STRAWBERRY_SWEET, + .price = 500, + .description = sStrawberrySweetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_LOVE_SWEET] = // Todo + [ITEM_LOVE_SWEET] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Love Sweet"), + .itemId = ITEM_LOVE_SWEET, + .price = 500, + .description = sLoveSweetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_BERRY_SWEET] = // Todo + [ITEM_BERRY_SWEET] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Berry Sweet"), + .itemId = ITEM_BERRY_SWEET, + .price = 500, + .description = sBerrySweetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_CLOVER_SWEET] = // Todo + [ITEM_CLOVER_SWEET] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Clover Sweet"), + .itemId = ITEM_CLOVER_SWEET, + .price = 500, + .description = sCloverSweetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_FLOWER_SWEET] = // Todo + [ITEM_FLOWER_SWEET] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Flower Sweet"), + .itemId = ITEM_FLOWER_SWEET, + .price = 500, + .description = sFlowerSweetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_STAR_SWEET] = // Todo + [ITEM_STAR_SWEET] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Star Sweet"), + .itemId = ITEM_STAR_SWEET, + .price = 500, + .description = sStarSweetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_RIBBON_SWEET] = // Todo + [ITEM_RIBBON_SWEET] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Ribbon Sweet"), + .itemId = ITEM_RIBBON_SWEET, + .price = 500, + .description = sRibbonSweetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -3564,23 +3581,23 @@ const struct Item gItems[] = .secondaryId = TYPE_FAIRY, }, - [ITEM_RUSTED_SWORD] = // Todo + [ITEM_RUSTED_SWORD] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("RustedSword"), + .itemId = ITEM_RUSTED_SWORD, .price = 0, - .description = sDummyDesc, + .description = sRustedSwordDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_RUSTED_SHIELD] = // Todo + [ITEM_RUSTED_SHIELD] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("RustedShield"), + .itemId = ITEM_RUSTED_SHIELD, .price = 0, - .description = sDummyDesc, + .description = sRustedShieldDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -3612,13 +3629,15 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_JADE_ORB] = // Todo + [ITEM_JADE_ORB] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Jade Orb"), + .itemId = ITEM_JADE_ORB, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .description = sJadeOrbDesc, + .importance = 1, + .unk19 = 1, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, @@ -6385,67 +6404,73 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_THROAT_SPRAY] = // Todo + [ITEM_THROAT_SPRAY] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Throat Spray"), + .itemId = ITEM_THROAT_SPRAY, + .price = 4000, + .holdEffect = HOLD_EFFECT_THROAT_SPRAY, + .description = sThroatSprayDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_EJECT_PACK] = // Todo + [ITEM_EJECT_PACK] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Eject Pack"), + .itemId = ITEM_EJECT_PACK, + .price = 4000, + .holdEffect = HOLD_EFFECT_EJECT_PACK, + .description = sEjectPackDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_HEAVY_DUTY_BOOTS] = // Todo + [ITEM_HEAVY_DUTY_BOOTS] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Heavy-DtyBts"), + .itemId = ITEM_HEAVY_DUTY_BOOTS, + .price = 4000, + .holdEffect = HOLD_EFFECT_HEAVY_DUTY_BOOTS, + .description = sHeavyDutyBootsDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_BLUNDER_POLICY] = // Todo + [ITEM_BLUNDER_POLICY] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("BlundrPolicy"), + .itemId = ITEM_BLUNDER_POLICY, + .price = 4000, + .holdEffect = HOLD_EFFECT_BLUNDER_POLICY, + .description = sBlunderPolicyDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_ROOM_SERVICE] = // Todo + [ITEM_ROOM_SERVICE] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("Room Service"), + .itemId = ITEM_ROOM_SERVICE, + .price = 4000, + .holdEffect = HOLD_EFFECT_ROOM_SERVICE, + .description = sRoomServiceDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_UTILITY_UMBRELLA] = // Todo + [ITEM_UTILITY_UMBRELLA] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, + .name = _("UtltyUmbrlla"), + .itemId = ITEM_UTILITY_UMBRELLA, + .price = 4000, + .holdEffect = HOLD_EFFECT_UTILITY_UMBRELLA, + .description = sUtilityUmbrellaDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -7211,13 +7236,15 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_ENIGMA_BERRY] = // Todo + [ITEM_ENIGMA_BERRY] = { - .name = _("????????"), - .itemId = ITEM_NONE, - .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .name = _("Enigma Berry"), + .itemId = ITEM_ENIGMA_BERRY, + .price = 20, + .holdEffect = HOLD_EFFECT_RESIST_BERRY, + .holdEffectParam = TYPE_NONE, + .description = sEnigmaBerryDesc, + .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, @@ -8534,39 +8561,42 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_CATCHING_CHARM] = // Todo + [ITEM_CATCHING_CHARM] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("CatchngCharm"), + .itemId = ITEM_CATCHING_CHARM, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .importance = 1, + .description = sCatchingCharmDesc, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_EXP_CHARM] = // Todo + [ITEM_EXP_CHARM] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Exp. Charm"), + .itemId = ITEM_EXP_CHARM, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .importance = 1, + .description = sExpCharmDesc, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, // Form-changing Key Items - [ITEM_ROTOM_CATALOG] = // Todo + [ITEM_ROTOM_CATALOG] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("RotomCatalog"), + .itemId = ITEM_ROTOM_CATALOG, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .importance = 1, + .description = sRotomCatalogDesc, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, [ITEM_GRACIDEA] = @@ -8587,99 +8617,136 @@ const struct Item gItems[] = #endif }, - [ITEM_REVEAL_GLASS] = // Todo + [ITEM_REVEAL_GLASS] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Reveal Glass"), + .itemId = ITEM_REVEAL_GLASS, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .description = sRevealGlassDesc, + .pocket = POCKET_KEY_ITEMS, + #ifdef POKEMON_EXPANSION + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .secondaryId = FORM_ITEM_USE, + #else + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + #endif }, - [ITEM_DNA_SPLICERS] = // Todo + [ITEM_DNA_SPLICERS] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("DNA Splicers"), + .itemId = ITEM_DNA_SPLICERS, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .description = sDNASplicersDesc, + .pocket = POCKET_KEY_ITEMS, + #ifdef POKEMON_EXPANSION + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .secondaryId = FORM_ITEM_USE, + #else + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + #endif }, - [ITEM_ZYGARDE_CUBE] = // Todo + [ITEM_ZYGARDE_CUBE] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Zygarde Cube"), + .itemId = ITEM_ZYGARDE_CUBE, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .importance = 1, + .description = sZygardeCubeDesc, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, - [ITEM_PRISON_BOTTLE] = // Todo + [ITEM_PRISON_BOTTLE] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Prison Bottle"), + .itemId = ITEM_PRISON_BOTTLE, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .description = sPrisonBottleDesc, + .pocket = POCKET_KEY_ITEMS, + #ifdef POKEMON_EXPANSION + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .secondaryId = FORM_ITEM_USE, + #else + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + #endif }, - [ITEM_N_SOLARIZER] = // Todo + [ITEM_N_SOLARIZER] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("N-Solarizer"), + .itemId = ITEM_N_SOLARIZER, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .description = sNSolarizerDesc, + .pocket = POCKET_KEY_ITEMS, + #ifdef POKEMON_EXPANSION + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .secondaryId = FORM_ITEM_USE, + #else + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + #endif }, - [ITEM_N_LUNARIZER] = // Todo + [ITEM_N_LUNARIZER] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("N-Lunarizer"), + .itemId = ITEM_N_LUNARIZER, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .description = sNLunarizerDesc, + .pocket = POCKET_KEY_ITEMS, + #ifdef POKEMON_EXPANSION + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .secondaryId = FORM_ITEM_USE, + #else + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + #endif }, - [ITEM_REINS_OF_UNITY] = // Todo + [ITEM_REINS_OF_UNITY] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("ReinsOfUnity"), + .itemId = ITEM_REINS_OF_UNITY, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .description = sReinsOfUnityDesc, + .pocket = POCKET_KEY_ITEMS, + #ifdef POKEMON_EXPANSION + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .secondaryId = FORM_ITEM_USE, + #else + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + #endif }, // Battle Mechanic Key Items - [ITEM_KEY_STONE] = // Todo + [ITEM_KEY_STONE] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Key Stone"), + .itemId = ITEM_KEY_STONE, .price = 0, - .description = sDummyDesc, + .description = sKeyStoneDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_MEGA_RING] = // Todo (Replaces ITEM_MEGA_BRACELET) + [ITEM_MEGA_RING] = { - .name = _("Mega Bracelet"), + .name = _("Mega Ring"), .itemId = ITEM_MEGA_RING, .price = 0, .importance = 1, @@ -8689,25 +8756,24 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_Z_POWER_RING] = // Todo (Replaces ITEM_Z_POWER_RING) + [ITEM_Z_POWER_RING] = { - .name = _("Z-Ring"), + .name = _("Z-Power Ring"), .itemId = ITEM_Z_POWER_RING, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .description = sZPowerRingDesc, .importance = 1, + .description = sZPowerRingDesc, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_DYNAMAX_BAND] = // Todo + [ITEM_DYNAMAX_BAND] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Dynamax Band"), + .itemId = ITEM_DYNAMAX_BAND, .price = 0, - .description = sDummyDesc, + .description = sDynamaxBandDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -8863,15 +8929,17 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, - [ITEM_POKEMON_BOX_LINK] = // Todo + [ITEM_POKEMON_BOX_LINK] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("{PKMN} BOX LINK"), + .itemId = ITEM_POKEMON_BOX_LINK, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .description = sPokemonBoxLinkDesc, + .importance = 1, + .unk19 = 1, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, [ITEM_COIN_CASE] = @@ -8911,15 +8979,17 @@ const struct Item gItems[] = .fieldUseFunc = ItemUseOutOfBattle_WailmerPail, }, - [ITEM_POKE_RADAR] = // Todo + [ITEM_POKE_RADAR] = { - .name = _("????????"), - .itemId = ITEM_NONE, + .name = _("Poké Radar"), + .itemId = ITEM_POKE_RADAR, .price = 0, - .description = sDummyDesc, - .pocket = POCKET_ITEMS, + .description = sPokeRadarDesc, + .importance = 1, + .unk19 = 1, + .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo }, [ITEM_POKEBLOCK_CASE] = diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 8247b4e9d..7d2301feb 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -302,14 +302,20 @@ static const u8 sSweetHeartDesc[] = _( "that restores HP\n" "by 20 points."); -static const u8 sMaxHoneyDesc[] = _( // Todo - "?????"); +static const u8 sMaxHoneyDesc[] = _( + "Revives a fainted\n" + "Pokémon with all\n" + "its HP."); -static const u8 sPewterCrunchiesDesc[] = _( // Todo - "?????"); +static const u8 sPewterCrunchiesDesc[] = _( + "Heals all the\n" + "status problems of\n" + "one Pokémon."); -static const u8 sRageCandyBarDesc[] = _( // Todo - "?????"); +static const u8 sRageCandyBarDesc[] = _( + "Heals all the\n" + "status problems of\n" + "one Pokémon."); static const u8 sLavaCookieDesc[] = _( "A local specialty\n" @@ -321,14 +327,20 @@ static const u8 sOldGateauDesc[] = _( "status problems of\n" "one Pokémon."); -static const u8 sCasteliaconeDesc[] = _( // Todo - "?????"); +static const u8 sCasteliaconeDesc[] = _( + "Heals all the\n" + "status problems of\n" + "one Pokémon."); -static const u8 sLumioseGaletteDesc[] = _( // Todo - "?????"); +static const u8 sLumioseGaletteDesc[] = _( + "Heals all the\n" + "status problems of\n" + "one Pokémon."); -static const u8 sShalourSableDesc[] = _( // Todo - "?????"); +static const u8 sShalourSableDesc[] = _( + "Heals all the\n" + "status problems of\n" + "one Pokémon."); static const u8 sBigMalasadaDesc[] = _( "Heals all the\n" @@ -411,72 +423,116 @@ static const u8 sAbilityCapsuleDesc[] = _( "Switches a Poké-\n" "mon's ability."); -static const u8 sAbilityPatchDesc[] = _( // Todo - "?????"); +static const u8 sAbilityPatchDesc[] = _( + "Turns the ability\n" + "of a Pokémon into\n" + "a rare ability."); // Mints -static const u8 sLonelyMintDesc[] = _( // Todo - "?????"); +static const u8 sLonelyMintDesc[] = _( + "Can be smelled. It" + "ups Attack, but" + "reduces Defense."); -static const u8 sAdamantMintDesc[] = _( // Todo - "?????"); +static const u8 sAdamantMintDesc[] = _( + "Can be smelled. It" + "ups Attack, but" + "reduces Sp. Atk."); -static const u8 sNaughtyMintDesc[] = _( // Todo - "?????"); +static const u8 sNaughtyMintDesc[] = _( + "Can be smelled. It" + "ups Attack, but" + "reduces Sp. Def."); -static const u8 sBraveMintDesc[] = _( // Todo - "?????"); +static const u8 sBraveMintDesc[] = _( + "Can be smelled. It" + "ups Attack, but" + "reduces Speed."); -static const u8 sBoldMintDesc[] = _( // Todo - "?????"); +static const u8 sBoldMintDesc[] = _( + "Can be smelled. It" + "ups Defense, but" + "reduces Attack."); -static const u8 sImpishMintDesc[] = _( // Todo - "?????"); +static const u8 sImpishMintDesc[] = _( + "Can be smelled. It" + "ups Defense, but" + "reduces Sp. Atk."); -static const u8 sLaxMintDesc[] = _( // Todo - "?????"); +static const u8 sLaxMintDesc[] = _( + "Can be smelled. It" + "ups Defense, but" + "reduces Sp. Def."); -static const u8 sRelaxedMintDesc[] = _( // Todo - "?????"); +static const u8 sRelaxedMintDesc[] = _( + "Can be smelled. It" + "ups Defense, but" + "reduces Speed."); -static const u8 sModestMintDesc[] = _( // Todo - "?????"); +static const u8 sModestMintDesc[] = _( + "Can be smelled. It" + "ups Sp. Atk, but" + "reduces Attack."); -static const u8 sMildMintDesc[] = _( // Todo - "?????"); +static const u8 sMildMintDesc[] = _( + "Can be smelled. It" + "ups Sp. Atk, but" + "reduces Defense."); -static const u8 sRashMintDesc[] = _( // Todo - "?????"); +static const u8 sRashMintDesc[] = _( + "Can be smelled. It" + "ups Sp. Atk, but" + "reduces Sp. Def."); -static const u8 sQuietMintDesc[] = _( // Todo - "?????"); +static const u8 sQuietMintDesc[] = _( + "Can be smelled. It" + "ups Sp. Atk, but" + "reduces Speed."); -static const u8 sCalmMintDesc[] = _( // Todo - "?????"); +static const u8 sCalmMintDesc[] = _( + "Can be smelled. It" + "ups Sp. Def, but" + "reduces Attack."); -static const u8 sGentleMintDesc[] = _( // Todo - "?????"); +static const u8 sGentleMintDesc[] = _( + "Can be smelled. It" + "ups Sp. Def, but" + "reduces Defense."); -static const u8 sCarefulMintDesc[] = _( // Todo - "?????"); +static const u8 sCarefulMintDesc[] = _( + "Can be smelled. It" + "ups Sp. Def, but" + "reduces Sp. Atk."); -static const u8 sSassyMintDesc[] = _( // Todo - "?????"); +static const u8 sSassyMintDesc[] = _( + "Can be smelled. It" + "ups Sp. Def, but" + "reduces Speed."); -static const u8 sTimidMintDesc[] = _( // Todo - "?????"); +static const u8 sTimidMintDesc[] = _( + "Can be smelled. It" + "ups Speed, but" + "reduces Attack."); -static const u8 sHastyMintDesc[] = _( // Todo - "?????"); +static const u8 sHastyMintDesc[] = _( + "Can be smelled. It" + "ups Speed, but" + "reduces Defense."); -static const u8 sJollyMintDesc[] = _( // Todo - "?????"); +static const u8 sJollyMintDesc[] = _( + "Can be smelled. It" + "ups Speed, but" + "reduces Sp. Atk."); -static const u8 sNaiveMintDesc[] = _( // Todo - "?????"); +static const u8 sNaiveMintDesc[] = _( + "Can be smelled. It" + "ups Speed, but" + "reduces Sp. Def."); -static const u8 sSeriousMintDesc[] = _( // Todo - "?????"); +static const u8 sSeriousMintDesc[] = _( + "Can be smelled. It" + "ups Speed, but" + "reduces Attack."); // Candy static const u8 sRareCandyDesc[] = _( @@ -484,23 +540,35 @@ static const u8 sRareCandyDesc[] = _( "of a Pokémon by\n" "one."); -static const u8 sExpCandyXSDesc[] = _( // Todo - "?????"); +static const u8 sExpCandyXSDesc[] = _( + "Gives a very small\n" + "amount of exp. to\n" + "a single Pokémon."); -static const u8 sExpCandySDesc[] = _( // Todo - "?????"); +static const u8 sExpCandySDesc[] = _( + "Gives a small\n" + "amount of exp. to\n" + "a single Pokémon."); -static const u8 sExpCandyMDesc[] = _( // Todo - "?????"); +static const u8 sExpCandyMDesc[] = _( + "Gives a moderate\n" + "amount of exp. to\n" + "a single Pokémon."); -static const u8 sExpCandyLDesc[] = _( // Todo - "?????"); +static const u8 sExpCandyLDesc[] = _( + "Gives a large\n" + "amount of exp. to\n" + "a single Pokémon."); -static const u8 sExpCandyXLDesc[] = _( // Todo - "?????"); +static const u8 sExpCandyXLDesc[] = _( + "Gives a very large\n" + "amount of exp. to\n" + "a single Pokémon."); -static const u8 sDynamaxCandyDesc[] = _( // Todo - "?????"); +static const u8 sDynamaxCandyDesc[] = _( + "Raises the Dynamax\n" + "Level of a single\n" + "Pokémon by one."); // Medicinal Flutes static const u8 sBlueFluteDesc[] = _( @@ -646,26 +714,36 @@ static const u8 sFluffyTailDesc[] = _( "any battle with\n" "a wild Pokémon."); -static const u8 sPokeToyDesc[] = _( // Todo - "?????"); +static const u8 sPokeToyDesc[] = _( + "Use to flee from\n" + "any battle with\n" + "a wild Pokémon."); -static const u8 sMaxMushroomsDesc[] = _( // Todo - "?????"); +static const u8 sMaxMushroomsDesc[] = _( + "Raises every stat\n" + "during one battle\n" + "by one stage."); // Treasures -static const u8 sBottleCapDesc[] = _( // Todo - "?????"); +static const u8 sBottleCapDesc[] = _( + "A beautiful bottle\n" + "cap that gives off\n" + "a silver gleam."); -static const u8 sGoldBottleCapDesc[] = _( // Todo - "?????"); +static const u8 sGoldBottleCapDesc[] = _( + "A beautiful bottle\n" + "cap that gives off\n" + "a golden gleam."); static const u8 sNuggetDesc[] = _( "A nugget of pure\n" "gold. Can be sold at\n" "a high price."); -static const u8 sBigNuggetDesc[] = _( // Todo - "?????"); +static const u8 sBigNuggetDesc[] = _( + "A big nugget made\n" + "of gold, sellable\n" + "at a high price."); static const u8 sTinyMushroomDesc[] = _( "A plain mushroom\n" @@ -677,8 +755,10 @@ static const u8 sBigMushroomDesc[] = _( "that would sell at a\n" "high price."); -static const u8 sBalmMushroomDesc[] = _( // Todo - "?????"); +static const u8 sBalmMushroomDesc[] = _( + "A rare mushroom\n" + "that would sell at a\n" + "high price."); static const u8 sPearlDesc[] = _( "A pretty pearl\n" @@ -690,8 +770,10 @@ static const u8 sBigPearlDesc[] = _( "that would sell at a\n" "high price."); -static const u8 sPearlStringDesc[] = _( // Todo - "?????"); +static const u8 sPearlStringDesc[] = _( + "Very large pearls\n" + "that would sell at a\n" + "high price."); static const u8 sStardustDesc[] = _( "Beautiful red sand.\n" @@ -703,8 +785,10 @@ static const u8 sStarPieceDesc[] = _( "It would sell for a\n" "very high price."); -static const u8 sCometShardDesc[] = _( // Todo - "?????"); +static const u8 sCometShardDesc[] = _( + "A comet's shard.\n" + "It would sell for a\n" + "high price."); static const u8 sShoalSaltDesc[] = _( "Salt obtained from\n" @@ -761,29 +845,45 @@ static const u8 sPrettyFeatherDesc[] = _( "plain feather that\n" "does nothing."); -static const u8 sRelicCopperDesc[] = _( // Todo - "?????"); +static const u8 sRelicCopperDesc[] = _( + "A copper coin used\n" + "long ago. It sells\n" + "at a high price."); -static const u8 sRelicSilverDesc[] = _( // Todo - "?????"); +static const u8 sRelicSilverDesc[] = _( + "A silver coin used\n" + "long ago. It sells\n" + "at a high price."); -static const u8 sRelicGoldDesc[] = _( // Todo - "?????"); +static const u8 sRelicGoldDesc[] = _( + "A gold coin used\n" + "long ago. It sells\n" + "at a high price."); -static const u8 sRelicVaseDesc[] = _( // Todo - "?????"); +static const u8 sRelicVaseDesc[] = _( + "A vase made long\n" + "ago. It sells at\n" + "a high price."); -static const u8 sRelicBandDesc[] = _( // Todo - "?????"); +static const u8 sRelicBandDesc[] = _( + "An old bracelet.\n" + "It sells at a\n" + "high price."); -static const u8 sRelicStatueDesc[] = _( // Todo - "?????"); +static const u8 sRelicStatueDesc[] = _( + "An old statue.\n" + "It sells at a\n" + "high price."); -static const u8 sRelicCrownDesc[] = _( // Todo - "?????"); +static const u8 sRelicCrownDesc[] = _( + "An old crown.\n" + "It sells at a\n" + "high price."); -static const u8 sStrangeSouvenirDesc[] = _( // Todo - "?????"); +static const u8 sStrangeSouvenirDesc[] = _( + "An ornament that\n" + "depicts a Pokémon\n" + "from Alola."); // Fossils static const u8 sHelixFossilDesc[] = _( @@ -841,42 +941,67 @@ static const u8 sSailFossilDesc[] = _( "toric Pokémon's\n" "skin sail."); -static const u8 sFossilizedBirdDesc[] = _( // Todo - "?????"); +static const u8 sFossilizedBirdDesc[] = _( + "A fossil of an\n" + "ancient, sky-\n" + "soaring Pokémon."); -static const u8 sFossilizedFishDesc[] = _( // Todo - "?????"); +static const u8 sFossilizedFishDesc[] = _( + "A fossil of an\n" + "ancient, sea-\n" + "dwelling Pokémon."); -static const u8 sFossilizedDrakeDesc[] = _( // Todo - "?????"); +static const u8 sFossilizedDrakeDesc[] = _( + "A fossil of an\n" + "ancient, land-\n" + "roaming Pokémon."); -static const u8 sFossilizedDinoDesc[] = _( // Todo - "?????"); +static const u8 sFossilizedDinoDesc[] = _( + "A fossil of an\n" + "ancient, sea-\n" + "dwelling Pokémon."); // Mulch -static const u8 sGrowthMulchDesc[] = _( // Todo - "?????"); +static const u8 sGrowthMulchDesc[] = _( + "A fertilizer that\n" + "accelerates the\n" + "growth of Berries."); -static const u8 sDampMulchDesc[] = _( // Todo - "?????"); +static const u8 sDampMulchDesc[] = _( + "A fertilizer that\n" + "decelerates the\n" + "growth of Berries."); -static const u8 sStableMulchDesc[] = _( // Todo - "?????"); +static const u8 sStableMulchDesc[] = _( + "A fertilizer that\n" + "ups the life time\n" + "of Berry trees."); -static const u8 sGooeyMulchDesc[] = _( // Todo - "?????"); +static const u8 sGooeyMulchDesc[] = _( + "A fertilizer that\n" + "makes more Berries\n" + "regrow after fall."); -static const u8 sRichMulchDesc[] = _( // Todo - "?????"); +static const u8 sRichMulchDesc[] = _( + "A fertilizer that\n" + "ups the number of\n" + "Berries harvested."); -static const u8 sSurpriseMulchDesc[] = _( // Todo - "?????"); +static const u8 sSurpriseMulchDesc[] = _( + "A fertilizer that\n" + "ups the chance of\n" + "Berry mutations."); -static const u8 sBoostMulchDesc[] = _( // Todo - "?????"); +static const u8 sBoostMulchDesc[] = _( + "A fertilizer that\n" + "ups the dry speed\n" + "of soft soil."); + +static const u8 sAmazeMulchDesc[] = _( + "A fertilizer Rich\n" + "Surprising and\n" + "Boosting as well."); -static const u8 sAmazeMulchDesc[] = _( // Todo - "?????"); // Apricorns static const u8 sRedApricornDesc[] = _( "A red apricorn.\n" @@ -913,17 +1038,25 @@ static const u8 sBlackApricornDesc[] = _( "It has an inde-\n" "scribable scent."); -static const u8 sWishingPieceDesc[] = _( // Todo - "?????"); +static const u8 sWishingPieceDesc[] = _( + "Throw into a Poké-\n" + "mon Den to attract\n" + "Dynamax Pokémon."); -static const u8 sGalaricaTwigDesc[] = _( // Todo - "?????"); +static const u8 sGalaricaTwigDesc[] = _( + "A twig from a tree\n" + "in Galar called\n" + "Galarica."); -static const u8 sArmoriteOreDesc[] = _( // Todo - "?????"); +static const u8 sArmoriteOreDesc[] = _( + "A rare ore. Can be\n" + "found in the Isle\n" + "of Armor at Galar."); -static const u8 sDyniteOreDesc[] = _( // Todo - "?????"); +static const u8 sDyniteOreDesc[] = _( + "A mysterious ore.\n" + "It can be found in\n" + "Galar's Max Lair."); // Mail static const u8 sOrangeMailDesc[] = _( @@ -1037,23 +1170,35 @@ static const u8 sDawnStoneDesc[] = _( "species of Pokémon\n" "evolve."); -static const u8 sSweetAppleDesc[] = _( // Todo - "?????"); +static const u8 sSweetAppleDesc[] = _( + "A very sweet apple\n" + "that makes certain\n" + "Pokémon evolve."); -static const u8 sTartAppleDesc[] = _( // Todo - "?????"); +static const u8 sTartAppleDesc[] = _( + "A very tart apple\n" + "that makes certain\n" + "Pokémon evolve."); -static const u8 sCrackedPotDesc[] = _( // Todo - "?????"); +static const u8 sCrackedPotDesc[] = _( + "A cracked teapot\n" + "that makes certain\n" + "Pokémon evolve."); -static const u8 sChippedPotDesc[] = _( // Todo - "?????"); +static const u8 sChippedPotDesc[] = _( + "A chipped teapot\n" + "that makes certain\n" + "Pokémon evolve."); -static const u8 sGalaricaCuffDesc[] = _( // Todo - "?????"); +static const u8 sGalaricaCuffDesc[] = _( + "A cuff from Galar\n" + "that makes certain\n" + "Pokémon evolve."); -static const u8 sGalaricaWreathDesc[] = _( // Todo - "?????"); +static const u8 sGalaricaWreathDesc[] = _( + "A wreath made in\n" + "Galar. Makes some\n" + "Pokémon evolve."); static const u8 sDragonScaleDesc[] = _( "A strange scale\n" @@ -1109,26 +1254,40 @@ static const u8 sOvalStoneDesc[] = _( "Pokémon evolve. It's\n" "shaped like an egg."); -static const u8 sStrawberrySweetDesc[] = _( // Todo - "?????"); +static const u8 sStrawberrySweetDesc[] = _( + "Strawberry-shaped\n" + "sweet loved by\n" + "Milcery."); -static const u8 sLoveSweetDesc[] = _( // Todo - "?????"); +static const u8 sLoveSweetDesc[] = _( + "A heart-shaped\n" + "sweet loved by\n" + "Milcery."); -static const u8 sBerrySweetDesc[] = _( // Todo - "?????"); +static const u8 sBerrySweetDesc[] = _( + "A berry-shaped\n" + "sweet loved by\n" + "Milcery."); -static const u8 sCloverSweetDesc[] = _( // Todo - "?????"); +static const u8 sCloverSweetDesc[] = _( + "A clover-shaped\n" + "sweet loved by\n" + "Milcery."); -static const u8 sFlowerSweetDesc[] = _( // Todo - "?????"); +static const u8 sFlowerSweetDesc[] = _( + "A flower-shaped\n" + "sweet loved by\n" + "Milcery."); -static const u8 sStarSweetDesc[] = _( // Todo - "?????"); +static const u8 sStarSweetDesc[] = _( + "A star-shaped\n" + "sweet loved by\n" + "Milcery."); -static const u8 sRibbonSweetDesc[] = _( // Todo - "?????"); +static const u8 sRibbonSweetDesc[] = _( + "A ribbon-shaped\n" + "sweet loved by\n" + "Milcery."); static const u8 sEverstoneDesc[] = _( "A wondrous hold\n" @@ -1349,11 +1508,15 @@ static const u8 sFairyMemoryDesc[] = _( "type data. It swaps\n" "Silvally's type."); -static const u8 sRustedSwordDesc[] = _( // Todo - "?????"); +static const u8 sRustedSwordDesc[] = _( + "A rusty sword. A\n" + "hero used it to\n" + "halt a disaster."); -static const u8 sRustedShieldDesc[] = _( // Todo - "?????"); +static const u8 sRustedShieldDesc[] = _( + "A rusty shield. A\n" + "hero used it to\n" + "halt a disaster."); // Colored Orbs static const u8 sRedOrbDesc[] = _( @@ -1366,8 +1529,10 @@ static const u8 sBlueOrbDesc[] = _( "said to contain an\n" "ancient power."); -static const u8 sJadeOrbDesc[] = _( // Todo - "?????"); +static const u8 sJadeOrbDesc[] = _( + "A green, shiny orb\n" + "said to have a leg-\n" + "end tied to it."); // Mega Stones static const u8 sVenusauriteDesc[] = _( @@ -2466,23 +2631,35 @@ static const u8 sProtectivePadsDesc[] = _( "from contact move\n" "effects."); -static const u8 sThroatSprayDesc[] = _( // Todo - "?????"); +static const u8 sThroatSprayDesc[] = _( + "Raises Sp. Atk. if\n" + "a Pokémon is hit by\n" + "a sound-based move."); -static const u8 sEjectPackDesc[] = _( // Todo - "?????"); +static const u8 sEjectPackDesc[] = _( + "Forces the user to\n" + "switch if its stats\n" + "are lowered."); -static const u8 sHeavyDutyBootsDesc[] = _( // Todo - "?????"); +static const u8 sHeavyDutyBootsDesc[] = _( + "Boots that prevent\n" + "effects of traps\n" + "set in the field."); -static const u8 sBlunderPolicyDesc[] = _( // Todo - "?????"); +static const u8 sBlunderPolicyDesc[] = _( + "Raises Speed if\n" + "the user misses\n" + "due to Accuracy."); -static const u8 sRoomServiceDesc[] = _( // Todo - "?????"); +static const u8 sRoomServiceDesc[] = _( + "Lowers Speed if\n" + "Trick Room is\n" + "active."); -static const u8 sUtilityUmbrellaDesc[] = _( // Todo - "?????"); +static const u8 sUtilityUmbrellaDesc[] = _( + "An umbrella that\n" + "protects from\n" + "weather effects."); // Berries static const u8 sCheriBerryDesc[] = _( @@ -2791,8 +2968,10 @@ static const u8 sStarfBerryDesc[] = _( "sharply boosts a\n" "stat in a pinch."); -static const u8 sEnigmaBerryDesc[] = _( // Todo - "?????"); +static const u8 sEnigmaBerryDesc[] = _( + "A hold item that\n" + "heals from super\n" + "effective moves."); static const u8 sMicleBerryDesc[] = _( "When held, it ups\n" @@ -3281,45 +3460,67 @@ static const u8 sShinyCharmDesc[] = _( "raise the chance\n" "of Shiny Pokémon."); -static const u8 sCatchingCharmDesc[] = _( // Todo - "?????"); +static const u8 sCatchingCharmDesc[] = _( + "This charm raises\n" + "the chance of Crit-\n" + "ical Captures."); -static const u8 sExpCharmDesc[] = _( // Todo - "?????"); +static const u8 sExpCharmDesc[] = _( + "This charm raises\n" + "the amount of expe-\n" + "rience obtained."); // Form-changing Key Items -static const u8 sRotomCatalogDesc[] = _( // Todo - "?????"); +static const u8 sRotomCatalogDesc[] = _( + "A catalog full of\n" + "deviced liked by\n" + "Rotom."); static const u8 sGracideaDesc[] = _( "Bouquets made with\n" "it are offered as a\n" "token of gratitude."); -static const u8 sRevealGlassDesc[] = _( // Todo - "?????"); +static const u8 sRevealGlassDesc[] = _( + "This glass returns\n" + "a Pokémon back to\n" + "its original form."); -static const u8 sDNASplicersDesc[] = _( // Todo - "?????"); +static const u8 sDNASplicersDesc[] = _( + "Splicer that fuses\n" + "Kyurem and a cer-\n" + "tain Pokémon."); -static const u8 sZygardeCubeDesc[] = _( // Todo - "?????"); +static const u8 sZygardeCubeDesc[] = _( + "An item to store\n" + "Zygarde Cores and\n" + "Cells."); -static const u8 sPrisonBottleDesc[] = _( // Todo - "?????"); +static const u8 sPrisonBottleDesc[] = _( + "A bottle used to\n" + "seal a certain\n" + "Pokémon long ago."); -static const u8 sNSolarizerDesc[] = _( // Todo - "?????"); +static const u8 sNSolarizerDesc[] = _( + "A device to fuse\n" + "and split Necrozma\n" + "using a Solgaleo."); -static const u8 sNLunarizerDesc[] = _( // Todo - "?????"); +static const u8 sNLunarizerDesc[] = _( + "A device to fuse\n" + "and split Necrozma\n" + "using a Lunala."); -static const u8 sReinsOfUnityDesc[] = _( // Todo - "?????"); +static const u8 sReinsOfUnityDesc[] = _( + "Reins that unite\n" + "Calyrex with its\n" + "beloved steed."); // Battle Mechanic Key Items -static const u8 sKeyStoneDesc[] = _( // Todo - "?????"); +static const u8 sKeyStoneDesc[] = _( + "A stone of untold\n" + "power that allows\n" + "Mega Evolution."); static const u8 sMegaRingDesc[] = _( "Enables {PKMN} holding\n" @@ -3331,8 +3532,10 @@ static const u8 sZPowerRingDesc[] = _( "that enables\n" "Z-Move usage."); -static const u8 sDynamaxBandDesc[] = _( // Todo - "?????"); +static const u8 sDynamaxBandDesc[] = _( + "A band carrying a\n" + "Wishing Star that\n" + "allows Dynamaxing."); // Misc. Key Items static const u8 sBicycleDesc[] = _( @@ -3390,8 +3593,10 @@ static const u8 sBerryPouchDesc[] = _( "container that\n" "holds Berries."); -static const u8 sPokemonBoxLinkDesc[] = _( // Todo - "?????"); +static const u8 sPokemonBoxLinkDesc[] = _( + "This device grants\n" + "access to the Poké-\n" + "mon Storage System."); static const u8 sCoinCaseDesc[] = _( "A case that holds\n" @@ -3407,8 +3612,10 @@ static const u8 sWailmerPailDesc[] = _( "watering Berries\n" "and plants."); -static const u8 sPokeRadarDesc[] = _( // Todo - "?????"); +static const u8 sPokeRadarDesc[] = _( + "A tool used to\n" + "search out Pokémon\n" + "hiding in grass."); static const u8 sPokeblockCaseDesc[] = _( "A case for holding\n"