From 12d8da7135cede3499c435800a2a7f603e9fee7f Mon Sep 17 00:00:00 2001 From: cawtds <38510667+cawtds@users.noreply.github.com> Date: Tue, 18 Jun 2024 20:41:00 +0200 Subject: [PATCH] updated items --- .../icon_palettes/stellar_tera_shard.pal | 18 + graphics/items/icons/stellar_tera_shard.png | Bin 0 -> 259 bytes include/constants/items.h | 1 - include/graphics.h | 3 + src/data/graphics/items.h | 3 + src/data/items.h | 3099 ++++++++++++----- src/item.c | 2 + src/party_menu.c | 4 +- 8 files changed, 2300 insertions(+), 830 deletions(-) create mode 100644 graphics/items/icon_palettes/stellar_tera_shard.pal create mode 100644 graphics/items/icons/stellar_tera_shard.png diff --git a/graphics/items/icon_palettes/stellar_tera_shard.pal b/graphics/items/icon_palettes/stellar_tera_shard.pal new file mode 100644 index 000000000..8afcf6cab --- /dev/null +++ b/graphics/items/icon_palettes/stellar_tera_shard.pal @@ -0,0 +1,18 @@ +JASC-PAL +0100 +15 +0 255 92 +147 87 0 +0 161 79 +0 0 0 +209 155 7 +57 67 189 +167 25 135 +217 120 165 +189 109 220 +167 219 139 +255 239 132 +246 240 183 +171 225 199 +137 195 227 +233 240 241 diff --git a/graphics/items/icons/stellar_tera_shard.png b/graphics/items/icons/stellar_tera_shard.png new file mode 100644 index 0000000000000000000000000000000000000000..a4bdfa3f2c6c6fa4947c20aa3780cad73d3a782d GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAF%}28J29*~C-V}>(GBnkab@@) zGdY}rVWB@z;Nom{OXt1ICEIUSEZv)XXZh{!|LGjLk2H_i!PatP?uPe3_b_<6`njxg HN@xNA5VmU- literal 0 HcmV?d00001 diff --git a/include/constants/items.h b/include/constants/items.h index a0eee8a72..76a702883 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -1077,7 +1077,6 @@ #define EFFECT_ITEM_REVIVE 9 #define EFFECT_ITEM_RESTORE_PP 10 #define EFFECT_ITEM_INCREASE_ALL_STATS 11 -#define EFFECT_ITEM_OPEN_BERRY_POUCH 12 // Enigma Berry dummy constant #define EFFECT_ITEM_ENIGMA_BERRY_EREADER 1 diff --git a/include/graphics.h b/include/graphics.h index c5c3269f6..8d744a375 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4177,6 +4177,9 @@ extern const u32 gItemIconPalette_DragonTeraShard[]; extern const u32 gItemIconPalette_SteelTeraShard[]; extern const u32 gItemIconPalette_FairyTeraShard[]; +extern const u32 gItemIcon_StellarTeraShard[]; +extern const u32 gItemIconPalette_StellarTeraShard[]; + extern const u32 gItemIcon_AdamantCrystal[]; extern const u32 gItemIconPalette_AdamantCrystal[]; extern const u32 gItemIcon_GriseousCore[]; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 6506ba402..45e3ec0e2 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -2025,6 +2025,9 @@ const u32 gItemIconPalette_DragonTeraShard[] = INCBIN_U32("graphics/items/icon_p const u32 gItemIconPalette_SteelTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/steel_tera_shard.gbapal.lz"); const u32 gItemIconPalette_FairyTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/fairy_tera_shard.gbapal.lz"); +const u32 gItemIcon_StellarTeraShard[] = INCBIN_U32("graphics/items/icons/stellar_tera_shard.4bpp.lz"); +const u32 gItemIconPalette_StellarTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/stellar_tera_shard.gbapal.lz"); + // Mochi const u32 gItemIcon_Mochi[] = INCBIN_U32("graphics/items/icons/mochi.4bpp.lz"); diff --git a/src/data/items.h b/src/data/items.h index 09f158207..09886ded5 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1,4 +1,8 @@ -#include "constants/moves.h" +#if I_EXPANDED_ITEM_NAMES == TRUE +#define HANDLE_EXPANDED_ITEM_NAME(_name, ...) _(DEFAULT(_name, __VA_ARGS__)) +#else +#define HANDLE_EXPANDED_ITEM_NAME(_name, ...) _(_name) +#endif #if I_USE_EVO_HELD_ITEMS_FROM_BAG == TRUE #define EVO_HELD_ITEM_TYPE ITEM_USE_PARTY_MENU @@ -63,11 +67,11 @@ static const u8 sShardsDesc[] = _("A shard from an " "be sold cheaply."); static const u8 sRootFossilDesc[] = _("A fossil of an " - "ancient, seafloor-\n" - "dwelling Pokémon."); + "ancient, seafloor-" + "\ndwelling Pokémon."); static const u8 sFossilizedFishDesc[] = _("A fossil of an " - "ancient, sea" + "ancient, sea-" "\ndwelling Pokémon."); static const u8 sBeadMailDesc[] = _("Mail featuring a " @@ -95,7 +99,7 @@ static const u8 sSeaIncenseDesc[] = _("A hold item that " "\nWater-type moves."); static const u8 sOddIncenseDesc[] = _("A hold item that " - "boosts Psychic" + "boosts Psychic-" "\ntype moves."); static const u8 sRockIncenseDesc[] = _("A hold item that " @@ -150,6 +154,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_QuestionMark, + .iconPalette = gItemIconPalette_QuestionMark, }, // Poké Balls @@ -157,7 +163,7 @@ const struct Item gItemsInfo[] = [ITEM_POKE_BALL] = { .name = _("Poké Ball"), - .price = 2, + .price = 200, .description = COMPOUND_STRING( "A tool used for " "catching wild " @@ -166,6 +172,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_POKE_BALL - FIRST_BALL, + .iconPic = gItemIcon_PokeBall, + .iconPalette = gItemIconPalette_PokeBall, }, [ITEM_GREAT_BALL] = @@ -180,6 +188,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_GREAT_BALL - FIRST_BALL, + .iconPic = gItemIcon_GreatBall, + .iconPalette = gItemIconPalette_GreatBall, }, [ITEM_ULTRA_BALL] = @@ -194,12 +204,14 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_ULTRA_BALL - FIRST_BALL, + .iconPic = gItemIcon_UltraBall, + .iconPalette = gItemIconPalette_UltraBall, }, [ITEM_MASTER_BALL] = { .name = _("Master Ball"), - .price = 2, + .price = 0, .description = COMPOUND_STRING( "The best Ball that " "catches a\nPokémon " @@ -208,6 +220,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_MASTER_BALL - FIRST_BALL, + .iconPic = gItemIcon_MasterBall, + .iconPalette = gItemIconPalette_MasterBall, }, [ITEM_PREMIER_BALL] = @@ -222,6 +236,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_PREMIER_BALL - FIRST_BALL, + .iconPic = gItemIcon_PremierBall, + .iconPalette = gItemIconPalette_LuxuryBall, }, [ITEM_HEAL_BALL] = @@ -236,6 +252,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_HEAL_BALL - FIRST_BALL, + .iconPic = gItemIcon_HealBall, + .iconPalette = gItemIconPalette_HealBall, }, [ITEM_NET_BALL] = @@ -250,6 +268,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_NET_BALL - FIRST_BALL, + .iconPic = gItemIcon_NetBall, + .iconPalette = gItemIconPalette_NetBall, }, [ITEM_NEST_BALL] = @@ -264,6 +284,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_NEST_BALL - FIRST_BALL, + .iconPic = gItemIcon_NestBall, + .iconPalette = gItemIconPalette_NestBall, }, [ITEM_DIVE_BALL] = @@ -278,6 +300,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_DIVE_BALL - FIRST_BALL, + .iconPic = gItemIcon_DiveBall, + .iconPalette = gItemIconPalette_DiveBall, }, [ITEM_DUSK_BALL] = @@ -292,6 +316,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_DUSK_BALL - FIRST_BALL, + .iconPic = gItemIcon_DuskBall, + .iconPalette = gItemIconPalette_DuskBall, }, [ITEM_TIMER_BALL] = @@ -306,6 +332,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_TIMER_BALL - FIRST_BALL, + .iconPic = gItemIcon_TimerBall, + .iconPalette = gItemIconPalette_RepeatBall, }, [ITEM_QUICK_BALL] = @@ -320,6 +348,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_QUICK_BALL - FIRST_BALL, + .iconPic = gItemIcon_QuickBall, + .iconPalette = gItemIconPalette_QuickBall, }, [ITEM_REPEAT_BALL] = @@ -334,6 +364,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_REPEAT_BALL - FIRST_BALL, + .iconPic = gItemIcon_RepeatBall, + .iconPalette = gItemIconPalette_RepeatBall, }, [ITEM_LUXURY_BALL] = @@ -348,6 +380,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_LUXURY_BALL - FIRST_BALL, + .iconPic = gItemIcon_LuxuryBall, + .iconPalette = gItemIconPalette_LuxuryBall, }, [ITEM_LEVEL_BALL] = @@ -362,6 +396,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_LEVEL_BALL - FIRST_BALL, + .iconPic = gItemIcon_LevelBall, + .iconPalette = gItemIconPalette_LevelBall, }, [ITEM_LURE_BALL] = @@ -376,12 +412,14 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_LURE_BALL - FIRST_BALL, + .iconPic = gItemIcon_LureBall, + .iconPalette = gItemIconPalette_LureBall, }, [ITEM_MOON_BALL] = { .name = _("Moon Ball"), - .price = (I_PRICE >= GEN_7) ? 2 : 2, + .price = (I_PRICE >= GEN_7) ? 0 : 300, .description = COMPOUND_STRING( "A Ball that works " "well on Moon " @@ -390,6 +428,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_MOON_BALL - FIRST_BALL, + .iconPic = gItemIcon_MoonBall, + .iconPalette = gItemIconPalette_MoonBall, }, [ITEM_FRIEND_BALL] = @@ -404,6 +444,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_FRIEND_BALL - FIRST_BALL, + .iconPic = gItemIcon_FriendBall, + .iconPalette = gItemIconPalette_FriendBall, }, [ITEM_LOVE_BALL] = @@ -418,6 +460,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_LOVE_BALL - FIRST_BALL, + .iconPic = gItemIcon_LoveBall, + .iconPalette = gItemIconPalette_LoveBall, }, [ITEM_FAST_BALL] = @@ -432,6 +476,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_FAST_BALL - FIRST_BALL, + .iconPic = gItemIcon_FastBall, + .iconPalette = gItemIconPalette_FastBall, }, [ITEM_HEAVY_BALL] = @@ -446,6 +492,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_HEAVY_BALL - FIRST_BALL, + .iconPic = gItemIcon_HeavyBall, + .iconPalette = gItemIconPalette_HeavyBall, }, [ITEM_DREAM_BALL] = @@ -465,6 +513,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_DREAM_BALL - FIRST_BALL, + .iconPic = gItemIcon_DreamBall, + .iconPalette = gItemIconPalette_DreamBall, }, [ITEM_SAFARI_BALL] = @@ -479,6 +529,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_SAFARI_BALL - FIRST_BALL, + .iconPic = gItemIcon_SafariBall, + .iconPalette = gItemIconPalette_SafariBall, }, [ITEM_SPORT_BALL] = @@ -493,6 +545,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_SPORT_BALL - FIRST_BALL, + .iconPic = gItemIcon_SportBall, + .iconPalette = gItemIconPalette_SportBall, }, [ITEM_PARK_BALL] = @@ -506,6 +560,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_PARK_BALL - FIRST_BALL, + .iconPic = gItemIcon_ParkBall, + .iconPalette = gItemIconPalette_ParkBall, }, [ITEM_BEAST_BALL] = @@ -519,12 +575,14 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_BEAST_BALL - FIRST_BALL, + .iconPic = gItemIcon_BeastBall, + .iconPalette = gItemIconPalette_BeastBall, }, [ITEM_CHERISH_BALL] = { .name = _("Cherish Ball"), - .price = 2, + .price = 0, .description = COMPOUND_STRING( "A rare Ball made " "in commemoration\n" @@ -533,6 +591,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_CHERISH_BALL - FIRST_BALL, + .iconPic = gItemIcon_CherishBall, + .iconPalette = gItemIconPalette_CherishBall, }, // Medicine @@ -540,7 +600,7 @@ const struct Item gItemsInfo[] = [ITEM_POTION] = { .name = _("Potion"), - .price = (I_PRICE >= GEN_7) ? 2 : 2, + .price = (I_PRICE >= GEN_7) ? 200 : 300, .holdEffectParam = 20, .description = COMPOUND_STRING( "Restores the HP of " @@ -552,6 +612,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_Potion, .flingPower = 30, + .iconPic = gItemIcon_Potion, + .iconPalette = gItemIconPalette_Potion, }, [ITEM_SUPER_POTION] = @@ -573,12 +635,14 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_SuperPotion, .flingPower = 30, + .iconPic = gItemIcon_Potion, + .iconPalette = gItemIconPalette_SuperPotion, }, [ITEM_HYPER_POTION] = { .name = _("Hyper Potion"), - .price = (I_PRICE >= GEN_2 || I_PRICE <= GEN_6) ? 1200 : 1500, + .price = (I_PRICE >= GEN_2 && I_PRICE <= GEN_6) ? 1200 : 1500, .holdEffectParam = 120, .description = COMPOUND_STRING( "Restores the HP of " @@ -594,6 +658,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_HyperPotion, .flingPower = 30, + .iconPic = gItemIcon_Potion, + .iconPalette = gItemIconPalette_HyperPotion, }, [ITEM_MAX_POTION] = @@ -610,12 +676,14 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_MaxPotion, .flingPower = 30, + .iconPic = gItemIcon_LargePotion, + .iconPalette = gItemIconPalette_MaxPotion, }, [ITEM_FULL_RESTORE] = { .name = _("Full Restore"), - .price = 2, + .price = 3000, .holdEffectParam = 255, .description = COMPOUND_STRING( "Fully restores the " @@ -627,12 +695,14 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_HEAL_AND_CURE_STATUS, .effect = gItemEffect_FullRestore, .flingPower = 30, + .iconPic = gItemIcon_LargePotion, + .iconPalette = gItemIconPalette_FullRestore, }, [ITEM_REVIVE] = { .name = _("Revive"), - .price = (I_PRICE >= GEN_7) ? 2 : 2, + .price = (I_PRICE >= GEN_7) ? 2000 : 1500, .description = COMPOUND_STRING( "Revives a fainted " "Pokémon with\nhalf " @@ -643,6 +713,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_REVIVE, .effect = gItemEffect_Revive, .flingPower = 30, + .iconPic = gItemIcon_Revive, + .iconPalette = gItemIconPalette_Revive, }, [ITEM_MAX_REVIVE] = @@ -656,6 +728,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_REVIVE, .effect = gItemEffect_MaxRevive, .flingPower = 30, + .iconPic = gItemIcon_MaxRevive, + .iconPalette = gItemIconPalette_Revive, }, [ITEM_FRESH_WATER] = @@ -677,6 +751,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_FreshWater, .flingPower = 30, + .iconPic = gItemIcon_FreshWater, + .iconPalette = gItemIconPalette_FreshWater, }, [ITEM_SODA_POP] = @@ -698,6 +774,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_SodaPop, .flingPower = 30, + .iconPic = gItemIcon_SodaPop, + .iconPalette = gItemIconPalette_SodaPop, }, [ITEM_LEMONADE] = @@ -722,6 +800,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_Lemonade, .flingPower = 30, + .iconPic = gItemIcon_Lemonade, + .iconPalette = gItemIconPalette_Lemonade, }, [ITEM_MOOMOO_MILK] = @@ -740,6 +820,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_MoomooMilk, .flingPower = 30, + .iconPic = gItemIcon_MoomooMilk, + .iconPalette = gItemIconPalette_MoomooMilk, }, [ITEM_ENERGY_POWDER] = @@ -761,6 +843,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_EnergyPowder, .flingPower = 30, + .iconPic = gItemIcon_Powder, + .iconPalette = gItemIconPalette_EnergyPowder, }, [ITEM_ENERGY_ROOT] = @@ -781,6 +865,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_EnergyRoot, .flingPower = 30, + .iconPic = gItemIcon_EnergyRoot, + .iconPalette = gItemIconPalette_EnergyRoot, }, [ITEM_HEAL_POWDER] = @@ -798,6 +884,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_HealPowder, .flingPower = 30, + .iconPic = gItemIcon_Powder, + .iconPalette = gItemIconPalette_HealPowder, }, [ITEM_REVIVAL_HERB] = @@ -814,12 +902,14 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_REVIVE, .effect = gItemEffect_RevivalHerb, .flingPower = 30, + .iconPic = gItemIcon_RevivalHerb, + .iconPalette = gItemIconPalette_RevivalHerb, }, [ITEM_ANTIDOTE] = { .name = _("Antidote"), - .price = (I_PRICE >= GEN_7) ? 2 : 2, + .price = (I_PRICE >= GEN_7) ? 200 : 100, .description = COMPOUND_STRING( "Heals a poisoned " "Pokémon."), @@ -829,11 +919,13 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_Antidote, .flingPower = 30, + .iconPic = gItemIcon_Antidote, + .iconPalette = gItemIconPalette_Antidote, }, [ITEM_PARALYZE_HEAL] = { - .name = _("ParalyzeHeal"), + .name = _("Paralyze Heal"), .price = (I_PRICE == GEN_7) ? 300 : 200, .description = COMPOUND_STRING( "Heals a paralyzed " @@ -844,6 +936,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_ParalyzeHeal, .flingPower = 30, + .iconPic = gItemIcon_StatusHeal, + .iconPalette = gItemIconPalette_ParalyzeHeal, }, [ITEM_BURN_HEAL] = @@ -859,6 +953,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_BurnHeal, .flingPower = 30, + .iconPic = gItemIcon_StatusHeal, + .iconPalette = gItemIconPalette_BurnHeal, }, [ITEM_ICE_HEAL] = @@ -874,6 +970,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_IceHeal, .flingPower = 30, + .iconPic = gItemIcon_StatusHeal, + .iconPalette = gItemIconPalette_IceHeal, }, [ITEM_AWAKENING] = @@ -889,6 +987,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_Awakening, .flingPower = 30, + .iconPic = gItemIcon_StatusHeal, + .iconPalette = gItemIconPalette_Awakening, }, [ITEM_FULL_HEAL] = @@ -902,12 +1002,14 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconPic = gItemIcon_FullHeal, + .iconPalette = gItemIconPalette_FullHeal, }, [ITEM_ETHER] = { .name = _("Ether"), - .price = (I_PRICE >= GEN_2) ? 2 : 2, + .price = (I_PRICE >= GEN_2) ? 1200 : 1, .holdEffectParam = 10, .description = COMPOUND_STRING( "Restores the PP " @@ -919,6 +1021,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_PP, .effect = gItemEffect_Ether, .flingPower = 30, + .iconPic = gItemIcon_Ether, + .iconPalette = gItemIconPalette_Ether, }, [ITEM_MAX_ETHER] = @@ -936,12 +1040,14 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_PP, .effect = gItemEffect_MaxEther, .flingPower = 30, + .iconPic = gItemIcon_Ether, + .iconPalette = gItemIconPalette_MaxEther, }, [ITEM_ELIXIR] = { .name = _("Elixir"), - .price = (I_PRICE >= GEN_2) ? 2 : 1, + .price = (I_PRICE >= GEN_2) ? 3000 : 1, .holdEffectParam = 10, .description = COMPOUND_STRING( "Restores the PP " @@ -952,6 +1058,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_PP, .effect = gItemEffect_Elixir, .flingPower = 30, + .iconPic = gItemIcon_Ether, + .iconPalette = gItemIconPalette_Elixir, }, [ITEM_MAX_ELIXIR] = @@ -969,6 +1077,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_PP, .effect = gItemEffect_MaxElixir, .flingPower = 30, + .iconPic = gItemIcon_Ether, + .iconPalette = gItemIconPalette_MaxElixir, }, [ITEM_BERRY_JUICE] = @@ -988,6 +1098,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_Potion, .flingPower = 30, + .iconPic = gItemIcon_BerryJuice, + .iconPalette = gItemIconPalette_BerryJuice, }, [ITEM_SACRED_ASH] = @@ -1004,6 +1116,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_SacredAsh, .effect = gItemEffect_SacredAsh, .flingPower = 30, + .iconPic = gItemIcon_SacredAsh, + .iconPalette = gItemIconPalette_SacredAsh, }, [ITEM_SWEET_HEART] = @@ -1021,6 +1135,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_Potion, .flingPower = 30, + .iconPic = gItemIcon_SweetHeart, + .iconPalette = gItemIconPalette_SweetHeart, }, [ITEM_MAX_HONEY] = @@ -1035,14 +1151,16 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_REVIVE, .effect = gItemEffect_MaxRevive, .flingPower = 30, + .iconPic = gItemIcon_MaxHoney, + .iconPalette = gItemIconPalette_MaxHoney, }, // Regional Specialties [ITEM_PEWTER_CRUNCHIES] = { - .name = _("PewtrCrnches"), - .pluralName = _("PewtrCrnches"), + .name = HANDLE_EXPANDED_ITEM_NAME("PewtrCrnches", "Pewter Crunchies"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("PewtrCrnches", "Pewter Crunchies"), .price = 250, .description = sFullHealDesc, .pocket = POCKET_ITEMS, @@ -1051,11 +1169,13 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconPic = gItemIcon_PewterCrunchies, + .iconPalette = gItemIconPalette_PewterCrunchies, }, [ITEM_RAGE_CANDY_BAR] = { - .name = _("RageCandyBar"), + .name = HANDLE_EXPANDED_ITEM_NAME("RageCandyBar", "Rage Candy Bar"), .price = (I_PRICE >= GEN_7) ? 350 : 300, .description = sFullHealDesc, .pocket = POCKET_ITEMS, @@ -1064,6 +1184,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconPic = gItemIcon_RageCandyBar, + .iconPalette = gItemIconPalette_RageCandyBar, }, [ITEM_LAVA_COOKIE] = @@ -1080,6 +1202,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconPic = gItemIcon_LavaCookie, + .iconPalette = gItemIconPalette_LavaCookieAndLetter, }, [ITEM_OLD_GATEAU] = @@ -1094,6 +1218,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconPic = gItemIcon_OldGateau, + .iconPalette = gItemIconPalette_OldGateau, }, [ITEM_CASTELIACONE] = @@ -1107,11 +1233,13 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconPic = gItemIcon_Casteliacone, + .iconPalette = gItemIconPalette_Casteliacone, }, [ITEM_LUMIOSE_GALETTE] = { - .name = _("LumioseGlete"), + .name = HANDLE_EXPANDED_ITEM_NAME("LumioseGlete", "Lumiose Galette"), .price = (I_PRICE >= GEN_7) ? 350 : 200, .description = sFullHealDesc, .pocket = POCKET_ITEMS, @@ -1120,11 +1248,13 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconPic = gItemIcon_LumioseGalette, + .iconPalette = gItemIconPalette_LumioseGalette, }, [ITEM_SHALOUR_SABLE] = { - .name = _("ShalourSable"), + .name = HANDLE_EXPANDED_ITEM_NAME("ShalourSable", "Shalour Sable"), .price = (I_PRICE >= GEN_7) ? 350 : 200, .description = sFullHealDesc, .pocket = POCKET_ITEMS, @@ -1133,6 +1263,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconPic = gItemIcon_ShalourSable, + .iconPalette = gItemIconPalette_ShalourSable, }, [ITEM_BIG_MALASADA] = @@ -1146,6 +1278,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconPic = gItemIcon_BigMalasada, + .iconPalette = gItemIconPalette_BigMalasada, }, // Vitamins @@ -1162,6 +1296,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_HPUp, .flingPower = 30, + .iconPic = gItemIcon_HPUp, + .iconPalette = gItemIconPalette_HPUp, }, [ITEM_PROTEIN] = @@ -1177,6 +1313,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_Protein, .flingPower = 30, + .iconPic = gItemIcon_Vitamin, + .iconPalette = gItemIconPalette_Protein, }, [ITEM_IRON] = @@ -1192,6 +1330,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_Iron, .flingPower = 30, + .iconPic = gItemIcon_Vitamin, + .iconPalette = gItemIconPalette_Iron, }, [ITEM_CALCIUM] = @@ -1207,6 +1347,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_Calcium, .flingPower = 30, + .iconPic = gItemIcon_Vitamin, + .iconPalette = gItemIconPalette_Calcium, }, [ITEM_ZINC] = @@ -1222,6 +1364,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_Zinc, .flingPower = 30, + .iconPic = gItemIcon_Vitamin, + .iconPalette = gItemIconPalette_Zinc, }, [ITEM_CARBOS] = @@ -1238,6 +1382,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_Carbos, .flingPower = 30, + .iconPic = gItemIcon_Vitamin, + .iconPalette = gItemIconPalette_Carbos, }, [ITEM_PP_UP] = @@ -1253,6 +1399,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_PPUp, .effect = gItemEffect_PPUp, .flingPower = 30, + .iconPic = gItemIcon_PPUp, + .iconPalette = gItemIconPalette_PPUp, }, [ITEM_PP_MAX] = @@ -1269,13 +1417,15 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_PPUp, .effect = gItemEffect_PPMax, .flingPower = 30, + .iconPic = gItemIcon_PPMax, + .iconPalette = gItemIconPalette_PPMax, }, // EV Feathers [ITEM_HEALTH_FEATHER] = { - .name = _("HealthFeather"), + .name = HANDLE_EXPANDED_ITEM_NAME("HealthFeather", "Health Feather"), .price = (I_PRICE >= GEN_7) ? 300 : 3000, .description = sHealthFeatherDesc, .pocket = POCKET_ITEMS, @@ -1283,11 +1433,13 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_HpFeather, .flingPower = 20, + .iconPic = gItemIcon_HealthFeather, + .iconPalette = gItemIconPalette_HealthFeather, }, [ITEM_MUSCLE_FEATHER] = { - .name = _("MuscleFeather"), + .name = HANDLE_EXPANDED_ITEM_NAME("MuscleFeather", "Muscle Feather"), .price = (I_PRICE >= GEN_7) ? 300 : 3000, .description = sMuscleFeatherDesc, .pocket = POCKET_ITEMS, @@ -1295,11 +1447,13 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_AtkFeather, .flingPower = 20, + .iconPic = gItemIcon_MuscleFeather, + .iconPalette = gItemIconPalette_MuscleFeather, }, [ITEM_RESIST_FEATHER] = { - .name = _("ResistFeather"), + .name = HANDLE_EXPANDED_ITEM_NAME("ResistFeather", "Resist Feather"), .price = (I_PRICE >= GEN_7) ? 300 : 3000, .description = sResistFeatherDesc, .pocket = POCKET_ITEMS, @@ -1307,11 +1461,13 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_DefFeather, .flingPower = 20, + .iconPic = gItemIcon_ResistFeather, + .iconPalette = gItemIconPalette_ResistFeather, }, [ITEM_GENIUS_FEATHER] = { - .name = _("GeniusFeather"), + .name = HANDLE_EXPANDED_ITEM_NAME("GeniusFeather", "Genius Feather"), .price = (I_PRICE >= GEN_7) ? 300 : 3000, .description = sGeniusFeatherDesc, .pocket = POCKET_ITEMS, @@ -1319,11 +1475,13 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_SpatkFeather, .flingPower = 20, + .iconPic = gItemIcon_GeniusFeather, + .iconPalette = gItemIconPalette_GeniusFeather, }, [ITEM_CLEVER_FEATHER] = { - .name = _("CleverFeather"), + .name = HANDLE_EXPANDED_ITEM_NAME("CleverFeather", "Clever Feather"), .price = (I_PRICE >= GEN_7) ? 300 : 3000, .description = sCleverFeatherDesc, .pocket = POCKET_ITEMS, @@ -1331,11 +1489,13 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_SpdefFeather, .flingPower = 20, + .iconPic = gItemIcon_CleverFeather, + .iconPalette = gItemIconPalette_CleverFeather, }, [ITEM_SWIFT_FEATHER] = { - .name = _("SwiftFeather"), + .name = HANDLE_EXPANDED_ITEM_NAME("SwiftFeather", "Swift Feather"), .price = (I_PRICE >= GEN_7) ? 300 : 3000, .description = sSwiftFeatherDesc, .pocket = POCKET_ITEMS, @@ -1343,27 +1503,31 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_SpeedFeather, .flingPower = 20, + .iconPic = gItemIcon_SwiftFeather, + .iconPalette = gItemIconPalette_SwiftFeather, }, // Ability Modifiers [ITEM_ABILITY_CAPSULE] = { - .name = _("AbilityCapsle"), + .name = HANDLE_EXPANDED_ITEM_NAME("AbilityCapsle", "Ability Capsule"), .price = (I_PRICE < GEN_7) ? 1000 : ((I_PRICE < GEN_9) ? 10000 : 100000), .holdEffectParam = 0, .description = COMPOUND_STRING( - "Switches a Poké" + "Switches a Poké-" "mon's ability."), .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_AbilityCapsule, + .iconPic = gItemIcon_AbilityCapsule, + .iconPalette = gItemIconPalette_AbilityCapsule, }, [ITEM_ABILITY_PATCH] = { - .name = _("AbilityPatch"), - .pluralName = _("AbilityPatches"), + .name = HANDLE_EXPANDED_ITEM_NAME("AbilityPatch", "Ability Patch"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("AbilityPatches", "Ability Patches"), .price = (I_PRICE >= GEN_9) ? 250000 : 20, .holdEffectParam = 0, .description = COMPOUND_STRING( @@ -1373,6 +1537,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_AbilityPatch, + .iconPic = gItemIcon_AbilityPatch, + .iconPalette = gItemIconPalette_AbilityPatch, }, // Mints @@ -1390,6 +1556,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_LONELY, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_RedMint, }, [ITEM_ADAMANT_MINT] = @@ -1405,6 +1573,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_ADAMANT, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_RedMint, }, [ITEM_NAUGHTY_MINT] = @@ -1420,6 +1590,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_NAUGHTY, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_RedMint, }, [ITEM_BRAVE_MINT] = @@ -1435,6 +1607,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_BRAVE, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_RedMint, }, [ITEM_BOLD_MINT] = @@ -1450,6 +1624,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_BOLD, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_BlueMint, }, [ITEM_IMPISH_MINT] = @@ -1465,6 +1641,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_IMPISH, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_BlueMint, }, [ITEM_LAX_MINT] = @@ -1480,6 +1658,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_LAX, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_BlueMint, }, [ITEM_RELAXED_MINT] = @@ -1495,6 +1675,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_RELAXED, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_BlueMint, }, [ITEM_MODEST_MINT] = @@ -1510,6 +1692,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_MODEST, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_LightBlueMint, }, [ITEM_MILD_MINT] = @@ -1525,6 +1709,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_MILD, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_LightBlueMint, }, [ITEM_RASH_MINT] = @@ -1540,6 +1726,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_RASH, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_LightBlueMint, }, [ITEM_QUIET_MINT] = @@ -1555,6 +1743,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_QUIET, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_LightBlueMint, }, [ITEM_CALM_MINT] = @@ -1570,6 +1760,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_CALM, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_PinkMint, }, [ITEM_GENTLE_MINT] = @@ -1585,6 +1777,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_GENTLE, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_PinkMint, }, [ITEM_CAREFUL_MINT] = @@ -1600,6 +1794,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_CAREFUL, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_PinkMint, }, [ITEM_SASSY_MINT] = @@ -1615,6 +1811,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_SASSY, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_PinkMint, }, [ITEM_TIMID_MINT] = @@ -1630,6 +1828,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_TIMID, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_GreenMint, }, [ITEM_HASTY_MINT] = @@ -1645,6 +1845,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_HASTY, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_GreenMint, }, [ITEM_JOLLY_MINT] = @@ -1660,6 +1862,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_JOLLY, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_GreenMint, }, [ITEM_NAIVE_MINT] = @@ -1675,6 +1879,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_NAIVE, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_GreenMint, }, [ITEM_SERIOUS_MINT] = @@ -1690,6 +1896,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_SERIOUS, .flingPower = 10, + .iconPic = gItemIcon_Mint, + .iconPalette = gItemIconPalette_YellowMint, }, // Candy @@ -1698,7 +1906,7 @@ const struct Item gItemsInfo[] = { .name = _("Rare Candy"), .pluralName = _("Rare Candies"), - .price = (I_PRICE >= GEN_7) ? 2 : 2, + .price = (I_PRICE >= GEN_7) ? 10000 : 4800, .description = COMPOUND_STRING( "Raises the level " "of a Pokémon by\n" @@ -1708,13 +1916,15 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_RareCandy, .effect = gItemEffect_RareCandy, .flingPower = 30, + .iconPic = gItemIcon_RareCandy, + .iconPalette = gItemIconPalette_RareCandy, }, [ITEM_EXP_CANDY_XS] = { - .name = _("Exp.Candy XS"), - .pluralName = _("Exp.Candies XS"), - .price = 2, + .name = HANDLE_EXPANDED_ITEM_NAME("Exp.Candy XS", "Exp. Candy XS"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("Exp.Candies XS", "Exp. Candies XS"), + .price = 20, .holdEffectParam = EXP_100, .description = COMPOUND_STRING( "Gives a very small " @@ -1725,13 +1935,15 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_RareCandy, .effect = gItemEffect_RareCandy, .flingPower = 30, + .iconPic = gItemIcon_ExpCandyXS, + .iconPalette = gItemIconPalette_ExpCandies, }, [ITEM_EXP_CANDY_S] = { - .name = _("Exp.Candy S"), - .pluralName = _("Exp.Candies S"), - .price = 2, + .name = HANDLE_EXPANDED_ITEM_NAME("Exp.Candy S", "Exp. Candy S"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("Exp.Candies S", "Exp. Candies S"), + .price = 240, .holdEffectParam = EXP_800, .description = COMPOUND_STRING( "Gives a small " @@ -1742,13 +1954,15 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_RareCandy, .effect = gItemEffect_RareCandy, .flingPower = 30, + .iconPic = gItemIcon_ExpCandyS, + .iconPalette = gItemIconPalette_ExpCandies, }, [ITEM_EXP_CANDY_M] = { - .name = _("Exp.Candy M"), - .pluralName = _("Exp.Candies M"), - .price = 2, + .name = HANDLE_EXPANDED_ITEM_NAME("Exp.Candy M", "Exp. Candy M"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("Exp.Candies M", "Exp. Candies M"), + .price = 1000, .holdEffectParam = EXP_3000, .description = COMPOUND_STRING( "Gives a moderate " @@ -1759,13 +1973,15 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_RareCandy, .effect = gItemEffect_RareCandy, .flingPower = 30, + .iconPic = gItemIcon_ExpCandyM, + .iconPalette = gItemIconPalette_ExpCandies, }, [ITEM_EXP_CANDY_L] = { - .name = _("Exp.Candy L"), - .pluralName = _("Exp.Candies L"), - .price = 2, + .name = HANDLE_EXPANDED_ITEM_NAME("Exp.Candy L", "Exp. Candy L"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("Exp.Candies L", "Exp. Candies L"), + .price = 3000, .holdEffectParam = EXP_10000, .description = COMPOUND_STRING( "Gives a large " @@ -1776,13 +1992,15 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_RareCandy, .effect = gItemEffect_RareCandy, .flingPower = 30, + .iconPic = gItemIcon_ExpCandyL, + .iconPalette = gItemIconPalette_ExpCandies, }, [ITEM_EXP_CANDY_XL] = { - .name = _("Exp.Candy XL"), - .pluralName = _("Exp.Candies L"), - .price = 2, + .name = HANDLE_EXPANDED_ITEM_NAME("Exp.Candy XL", "Exp. Candy XL"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("Exp.Candies XL", "Exp. Candies XL"), + .price = 10000, .holdEffectParam = EXP_30000, .description = COMPOUND_STRING( "Gives a very large " @@ -1793,12 +2011,14 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_RareCandy, .effect = gItemEffect_RareCandy, .flingPower = 30, + .iconPic = gItemIcon_ExpCandyXL, + .iconPalette = gItemIconPalette_ExpCandies, }, [ITEM_DYNAMAX_CANDY] = { - .name = _("DynamaxCandy"), - .pluralName = _("DynamaxCandies"), + .name = HANDLE_EXPANDED_ITEM_NAME("DynamaxCandy", "Dynamax Candy"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("DynamaxCandies", "Dynamax Candies"), .price = 0, .description = COMPOUND_STRING( "Raises the Dynamax " @@ -1808,6 +2028,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_DynamaxCandy, .flingPower = 30, + .iconPic = gItemIcon_DynamaxCandy, + .iconPalette = gItemIconPalette_DynamaxCandy, }, // Medicinal Flutes @@ -1826,6 +2048,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_Awakening, .flingPower = 30, + .iconPic = gItemIcon_Flute, + .iconPalette = gItemIconPalette_BlueFlute, }, [ITEM_YELLOW_FLUTE] = @@ -1842,6 +2066,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_YellowFlute, .flingPower = 30, + .iconPic = gItemIcon_Flute, + .iconPalette = gItemIconPalette_YellowFlute, }, [ITEM_RED_FLUTE] = @@ -1858,6 +2084,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_RedFlute, .flingPower = 30, + .iconPic = gItemIcon_Flute, + .iconPalette = gItemIconPalette_RedFlute, }, // Encounter-modifying Flutes @@ -1875,6 +2103,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_BlackWhiteFlute, .flingPower = 30, + .iconPic = gItemIcon_Flute, + .iconPalette = gItemIconPalette_BlackFlute, }, [ITEM_WHITE_FLUTE] = @@ -1889,6 +2119,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_BlackWhiteFlute, .flingPower = 30, + .iconPic = gItemIcon_Flute, + .iconPalette = gItemIconPalette_WhiteFlute, }, // Encounter Modifiers @@ -1906,6 +2138,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_Repel, .flingPower = 30, + .iconPic = gItemIcon_Repel, + .iconPalette = gItemIconPalette_Repel, }, [ITEM_SUPER_REPEL] = @@ -1921,6 +2155,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_Repel, .flingPower = 30, + .iconPic = gItemIcon_Repel, + .iconPalette = gItemIconPalette_SuperRepel, }, [ITEM_MAX_REPEL] = @@ -1936,6 +2172,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_Repel, .flingPower = 30, + .iconPic = gItemIcon_Repel, + .iconPalette = gItemIconPalette_MaxRepel, }, [ITEM_LURE] = @@ -1952,6 +2190,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Lure, .secondaryId = 0, .flingPower = 30, + .iconPic = gItemIcon_Lure, + .iconPalette = gItemIconPalette_Lure, }, [ITEM_SUPER_LURE] = @@ -1968,6 +2208,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Lure, .secondaryId = 0, .flingPower = 30, + .iconPic = gItemIcon_Lure, + .iconPalette = gItemIconPalette_SuperLure, }, [ITEM_MAX_LURE] = @@ -1984,6 +2226,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Lure, .secondaryId = 0, .flingPower = 30, + .iconPic = gItemIcon_Lure, + .iconPalette = gItemIconPalette_MaxLure, }, [ITEM_ESCAPE_ROPE] = @@ -2004,6 +2248,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_EscapeRope, .flingPower = 30, + .iconPic = gItemIcon_EscapeRope, + .iconPalette = gItemIconPalette_EscapeRope, }, // X Items @@ -2011,7 +2257,7 @@ const struct Item gItemsInfo[] = [ITEM_X_ATTACK] = { .name = _("X Attack"), - .price = (I_PRICE >= GEN_7) ? 2 : 2, + .price = (I_PRICE >= GEN_7) ? 1000 : 500, .holdEffectParam = X_ITEM_STAGES, .description = COMPOUND_STRING( #if B_X_ITEMS_BUFF >= GEN_7 @@ -2029,6 +2275,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_INCREASE_STAT, .effect = gItemEffect_XAttack, .flingPower = 30, + .iconPic = gItemIcon_BattleStatItem, + .iconPalette = gItemIconPalette_XAttack, }, [ITEM_X_DEFENSE] = @@ -2052,6 +2300,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_INCREASE_STAT, .effect = gItemEffect_XDefense, .flingPower = 30, + .iconPic = gItemIcon_BattleStatItem, + .iconPalette = gItemIconPalette_XDefend, }, [ITEM_X_SP_ATK] = @@ -2075,6 +2325,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_INCREASE_STAT, .effect = gItemEffect_XSpecialAttack, .flingPower = 30, + .iconPic = gItemIcon_BattleStatItem, + .iconPalette = gItemIconPalette_XSpecial, }, [ITEM_X_SP_DEF] = @@ -2098,6 +2350,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_INCREASE_STAT, .effect = gItemEffect_XSpecialDefense, .flingPower = 30, + .iconPic = gItemIcon_XSpecialDefense, + .iconPalette = gItemIconPalette_XSpecialDefense, }, [ITEM_X_SPEED] = @@ -2121,6 +2375,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_INCREASE_STAT, .effect = gItemEffect_XSpeed, .flingPower = 30, + .iconPic = gItemIcon_BattleStatItem, + .iconPalette = gItemIconPalette_XSpeed, }, [ITEM_X_ACCURACY] = @@ -2145,12 +2401,14 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_INCREASE_STAT, .effect = gItemEffect_XAccuracy, .flingPower = 30, + .iconPic = gItemIcon_BattleStatItem, + .iconPalette = gItemIconPalette_XAccuracy, }, [ITEM_DIRE_HIT] = { .name = _("Dire Hit"), - .price = (I_PRICE >= GEN_7) ? 2 : 2, + .price = (I_PRICE >= GEN_7) ? 1000 : 650, .description = COMPOUND_STRING( "Raises the " "critical-hit ratio " @@ -2161,13 +2419,15 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_SET_FOCUS_ENERGY, .effect = gItemEffect_DireHit, .flingPower = 30, + .iconPic = gItemIcon_BattleStatItem, + .iconPalette = gItemIconPalette_DireHit, }, [ITEM_GUARD_SPEC] = { .name = _("Guard Spec."), .pluralName = _("Guard Specs."), - .price = (I_PRICE >= GEN_7) ? 2 : 2, + .price = (I_PRICE >= GEN_7) ? 1500 : 700, .description = COMPOUND_STRING( "Prevents stat " "reduction when " @@ -2178,18 +2438,22 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_SET_MIST, .effect = gItemEffect_GuardSpec, .flingPower = 30, + .iconPic = gItemIcon_BattleStatItem, + .iconPalette = gItemIconPalette_GuardSpec, }, [ITEM_POKE_DOLL] = { .name = _("Poké Doll"), - .price = (I_PRICE < GEN_7) ? 2 : ((I_PRICE == GEN_7) ? 2 : 2), + .price = (I_PRICE < GEN_7) ? 1000 : ((I_PRICE == GEN_7) ? 100 : 300), .description = sPokeDollDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = EFFECT_ITEM_ESCAPE, .flingPower = 30, + .iconPic = gItemIcon_PokeDoll, + .iconPalette = gItemIconPalette_PokeDoll, }, [ITEM_FLUFFY_TAIL] = @@ -2202,6 +2466,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = EFFECT_ITEM_ESCAPE, .flingPower = 30, + .iconPic = gItemIcon_FluffyTail, + .iconPalette = gItemIconPalette_FluffyTail, }, [ITEM_POKE_TOY] = @@ -2214,13 +2480,15 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = EFFECT_ITEM_ESCAPE, .flingPower = 30, + .iconPic = gItemIcon_PokeToy, + .iconPalette = gItemIconPalette_PokeToy, }, [ITEM_MAX_MUSHROOMS] = { - .name = _("MaxMushrooms"), - .pluralName = _("MaxMushrooms"), - .price = 2, + .name = HANDLE_EXPANDED_ITEM_NAME("MaxMushrooms", "Max Mushrooms"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("MaxMushrooms", "Max Mushrooms"), + .price = 8000, .description = COMPOUND_STRING( "Raises every stat " "during one\nbattle " @@ -2230,6 +2498,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = EFFECT_ITEM_INCREASE_ALL_STATS, .flingPower = 30, + .iconPic = gItemIcon_MaxMushrooms, + .iconPalette = gItemIconPalette_MaxMushrooms, }, // Treasures @@ -2246,11 +2516,13 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_BottleCap, + .iconPalette = gItemIconPalette_BottleCap, }, [ITEM_GOLD_BOTTLE_CAP] = { - .name = _("GoldBottlCap"), + .name = HANDLE_EXPANDED_ITEM_NAME("GoldBottlCap", "Gold Bottle Cap"), .price = (I_PRICE >= GEN_9) ? 60000 : 10000, .description = COMPOUND_STRING( "A beautiful bottle " @@ -2260,6 +2532,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_BottleCap, + .iconPalette = gItemIconPalette_GoldBottleCap, }, [ITEM_NUGGET] = @@ -2274,6 +2548,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_Nugget, + .iconPalette = gItemIconPalette_Nugget, }, [ITEM_BIG_NUGGET] = @@ -2288,6 +2564,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 130, + .iconPic = gItemIcon_BigNugget, + .iconPalette = gItemIconPalette_BigNugget, }, [ITEM_TINY_MUSHROOM] = @@ -2302,6 +2580,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_TinyMushroom, + .iconPalette = gItemIconPalette_Mushroom, }, [ITEM_BIG_MUSHROOM] = @@ -2313,6 +2593,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_BigMushroom, + .iconPalette = gItemIconPalette_Mushroom, }, [ITEM_BALM_MUSHROOM] = @@ -2324,6 +2606,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_BalmMushroom, + .iconPalette = gItemIconPalette_BalmMushroom, }, [ITEM_PEARL] = @@ -2338,6 +2622,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_Pearl, + .iconPalette = gItemIconPalette_Pearl, }, [ITEM_BIG_PEARL] = @@ -2352,6 +2638,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_BigPearl, + .iconPalette = gItemIconPalette_Pearl, }, [ITEM_PEARL_STRING] = @@ -2366,6 +2654,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_PearlString, + .iconPalette = gItemIconPalette_PearlString, }, [ITEM_STARDUST] = @@ -2381,6 +2671,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_Stardust, + .iconPalette = gItemIconPalette_Star, }, [ITEM_STAR_PIECE] = @@ -2395,6 +2687,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_StarPiece, + .iconPalette = gItemIconPalette_Star, }, [ITEM_COMET_SHARD] = @@ -2409,6 +2703,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_CometShard, + .iconPalette = gItemIconPalette_CometShard, }, [ITEM_SHOAL_SALT] = @@ -2424,6 +2720,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_Powder, + .iconPalette = gItemIconPalette_ShoalSalt, }, [ITEM_SHOAL_SHELL] = @@ -2438,6 +2736,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_ShoalShell, + .iconPalette = gItemIconPalette_Shell, }, [ITEM_RED_SHARD] = @@ -2449,6 +2749,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_Shard, + .iconPalette = gItemIconPalette_RedShard, }, [ITEM_BLUE_SHARD] = @@ -2460,6 +2762,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_Shard, + .iconPalette = gItemIconPalette_BlueShard, }, [ITEM_YELLOW_SHARD] = @@ -2471,6 +2775,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_Shard, + .iconPalette = gItemIconPalette_YellowShard, }, [ITEM_GREEN_SHARD] = @@ -2482,6 +2788,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_Shard, + .iconPalette = gItemIconPalette_GreenShard, }, [ITEM_HEART_SCALE] = @@ -2496,6 +2804,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_HeartScale, + .iconPalette = gItemIconPalette_HeartScale, }, [ITEM_HONEY] = @@ -2511,6 +2821,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Honey, .flingPower = 30, + .iconPic = gItemIcon_Honey, + .iconPalette = gItemIconPalette_Honey, }, [ITEM_RARE_BONE] = @@ -2525,6 +2837,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_RareBone, + .iconPalette = gItemIconPalette_RareBone, }, [ITEM_ODD_KEYSTONE] = @@ -2539,11 +2853,13 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_OddKeystone, + .iconPalette = gItemIconPalette_OddKeystone, }, [ITEM_PRETTY_FEATHER] = { - .name = _("PrettyFeather"), + .name = HANDLE_EXPANDED_ITEM_NAME("PrettyFeather", "Pretty Feather"), .price = (I_PRICE >= GEN_7) ? 1000 * TREASURE_FACTOR: 200, .description = COMPOUND_STRING( "A beautiful yet " @@ -2553,6 +2869,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 20, + .iconPic = gItemIcon_PrettyFeather, + .iconPalette = gItemIconPalette_PrettyFeather, }, [ITEM_RELIC_COPPER] = @@ -2567,6 +2885,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_RelicCoin, + .iconPalette = gItemIconPalette_RelicCopper, }, [ITEM_RELIC_SILVER] = @@ -2581,6 +2901,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_RelicCoin, + .iconPalette = gItemIconPalette_RelicSilver, }, [ITEM_RELIC_GOLD] = @@ -2595,6 +2917,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_RelicCoin, + .iconPalette = gItemIconPalette_RelicGold, }, [ITEM_RELIC_VASE] = @@ -2609,6 +2933,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_RelicVase, + .iconPalette = gItemIconPalette_Relics, }, [ITEM_RELIC_BAND] = @@ -2623,6 +2949,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_RelicBand, + .iconPalette = gItemIconPalette_Relics, }, [ITEM_RELIC_STATUE] = @@ -2637,6 +2965,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_RelicStatue, + .iconPalette = gItemIconPalette_Relics, }, [ITEM_RELIC_CROWN] = @@ -2651,11 +2981,13 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_RelicCrown, + .iconPalette = gItemIconPalette_Relics, }, [ITEM_STRANGE_SOUVENIR] = { - .name = _("StrngeSouvnr"), + .name = HANDLE_EXPANDED_ITEM_NAME("StrngeSouvnr", "Strange Souvenir"), .price = (I_PRICE >= GEN_7) ? 3000 : 10, .description = COMPOUND_STRING( "An ornament that " @@ -2665,6 +2997,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_StrangeSouvenir, + .iconPalette = gItemIconPalette_StrangeSouvenir, }, // Fossils @@ -2687,6 +3021,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_HelixFossil, + .iconPalette = gItemIconPalette_KantoFossil, }, [ITEM_DOME_FOSSIL] = @@ -2707,6 +3043,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_DomeFossil, + .iconPalette = gItemIconPalette_KantoFossil, }, [ITEM_OLD_AMBER] = @@ -2727,6 +3065,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_OldAmber, + .iconPalette = gItemIconPalette_OldAmber, }, [ITEM_ROOT_FOSSIL] = @@ -2744,6 +3084,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_RootFossil, + .iconPalette = gItemIconPalette_HoennFossil, }, [ITEM_CLAW_FOSSIL] = @@ -2761,6 +3103,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_ClawFossil, + .iconPalette = gItemIconPalette_HoennFossil, }, [ITEM_ARMOR_FOSSIL] = @@ -2769,12 +3113,14 @@ const struct Item gItemsInfo[] = .price = (I_PRICE >= GEN_7) ? 7000: 1000, .description = COMPOUND_STRING( "A piece of a " - "prehistoric Poké" + "prehistoric Poké-" "\nmon's head."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_ArmorFossil, + .iconPalette = gItemIconPalette_ArmorFossil, }, [ITEM_SKULL_FOSSIL] = @@ -2783,12 +3129,14 @@ const struct Item gItemsInfo[] = .price = (I_PRICE >= GEN_7) ? 7000: 1000, .description = COMPOUND_STRING( "A piece of a " - "prehistoric Poké" + "prehistoric Poké-" "\nmon's collar."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_SkullFossil, + .iconPalette = gItemIconPalette_SkullFossil, }, [ITEM_COVER_FOSSIL] = @@ -2797,12 +3145,14 @@ const struct Item gItemsInfo[] = .price = (I_PRICE >= GEN_7) ? 7000: 1000, .description = COMPOUND_STRING( "A piece of a " - "prehistoric Poké" + "prehistoric Poké-" "\nmon's back."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_CoverFossil, + .iconPalette = gItemIconPalette_CoverFossil, }, [ITEM_PLUME_FOSSIL] = @@ -2811,12 +3161,14 @@ const struct Item gItemsInfo[] = .price = (I_PRICE >= GEN_7) ? 7000: 1000, .description = COMPOUND_STRING( "A piece of a " - "prehistoric Poké" + "prehistoric Poké-" "\nmon's wing."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_PlumeFossil, + .iconPalette = gItemIconPalette_PlumeFossil, }, [ITEM_JAW_FOSSIL] = @@ -2824,13 +3176,15 @@ const struct Item gItemsInfo[] = .name = _("Jaw Fossil"), .price = (I_PRICE >= GEN_7) ? 7000: 1000, .description = COMPOUND_STRING( - "A piece of a prehis" + "A piece of a prehis-" "toric\nPokémon's " "large jaw."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_JawFossil, + .iconPalette = gItemIconPalette_JawFossil, }, [ITEM_SAIL_FOSSIL] = @@ -2838,64 +3192,74 @@ const struct Item gItemsInfo[] = .name = _("Sail Fossil"), .price = (I_PRICE >= GEN_7) ? 7000: 1000, .description = COMPOUND_STRING( - "A piece of a prehis" + "A piece of a prehis-" "toric\nPokémon's " "skin sail."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_SailFossil, + .iconPalette = gItemIconPalette_SailFossil, }, [ITEM_FOSSILIZED_BIRD] = { - .name = _("FosslzedBird"), + .name = HANDLE_EXPANDED_ITEM_NAME("FosslzedBird", "Fossilized Bird"), .price = 5000, .description = COMPOUND_STRING( "A fossil of an " - "ancient, sky" + "ancient, sky-" "\nsoaring Pokémon."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_FossilizedBird, + .iconPalette = gItemIconPalette_FossilizedBird, }, [ITEM_FOSSILIZED_FISH] = { - .name = _("FosslzedFish"), - .pluralName = _("FosslzedFishes"), + .name = HANDLE_EXPANDED_ITEM_NAME("FosslzedFish", "Fossilized Fish"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("FosslzedFishes", "Fossilized Fishes"), .price = 5000, .description = sFossilizedFishDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_FossilizedFish, + .iconPalette = gItemIconPalette_FossilizedFish, }, [ITEM_FOSSILIZED_DRAKE] = { - .name = _("FosslzedDrke"), + .name = HANDLE_EXPANDED_ITEM_NAME("FosslzedDrke", "Fossilized Drake"), .price = 5000, .description = COMPOUND_STRING( "A fossil of an " - "ancient, land" + "ancient, land-" "\nroaming Pokémon."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_FossilizedDrake, + .iconPalette = gItemIconPalette_FossilizedDrake, }, [ITEM_FOSSILIZED_DINO] = { - .name = _("FosslzedDino"), + .name = HANDLE_EXPANDED_ITEM_NAME("FosslzedDino", "Fossilized Dino"), .price = 5000, .description = sFossilizedFishDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_FossilizedDino, + .iconPalette = gItemIconPalette_FossilizedDino, }, // Mulch @@ -2918,6 +3282,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = ITEM_TO_MULCH(ITEM_GROWTH_MULCH), .flingPower = 30, + .iconPic = gItemIcon_Mulch, + .iconPalette = gItemIconPalette_GrowthMulch, }, [ITEM_DAMP_MULCH] = @@ -2938,6 +3304,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = ITEM_TO_MULCH(ITEM_DAMP_MULCH), .flingPower = 30, + .iconPic = gItemIcon_Mulch, + .iconPalette = gItemIconPalette_DampMulch, }, [ITEM_STABLE_MULCH] = @@ -2958,6 +3326,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = ITEM_TO_MULCH(ITEM_STABLE_MULCH), .flingPower = 30, + .iconPic = gItemIcon_StableMulch, + .iconPalette = gItemIconPalette_StableMulch, }, [ITEM_GOOEY_MULCH] = @@ -2978,6 +3348,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = ITEM_TO_MULCH(ITEM_GOOEY_MULCH), .flingPower = 30, + .iconPic = gItemIcon_Mulch, + .iconPalette = gItemIconPalette_GooeyMulch, }, [ITEM_RICH_MULCH] = @@ -2998,12 +3370,14 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = ITEM_TO_MULCH(ITEM_RICH_MULCH), .flingPower = 30, + .iconPic = gItemIcon_Mulch, + .iconPalette = gItemIconPalette_RichMulch, }, [ITEM_SURPRISE_MULCH] = { - .name = _("SurprseMulch"), - .pluralName = _("SurprseMulch"), + .name = HANDLE_EXPANDED_ITEM_NAME("SurprseMulch", "Surprise Mulch"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("SurprseMulch", "Surprise Mulch"), .price = 200, #if OW_BERRY_MULCH_USAGE == TRUE .description = COMPOUND_STRING( @@ -3018,6 +3392,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = ITEM_TO_MULCH(ITEM_SURPRISE_MULCH), .flingPower = 30, + .iconPic = gItemIcon_Mulch, + .iconPalette = gItemIconPalette_SurpriseMulch, }, [ITEM_BOOST_MULCH] = @@ -3038,6 +3414,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = ITEM_TO_MULCH(ITEM_BOOST_MULCH), .flingPower = 30, + .iconPic = gItemIcon_Mulch, + .iconPalette = gItemIconPalette_BoostMulch, }, [ITEM_AMAZE_MULCH] = @@ -3058,6 +3436,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = ITEM_TO_MULCH(ITEM_AMAZE_MULCH), .flingPower = 30, + .iconPic = gItemIcon_Mulch, + .iconPalette = gItemIconPalette_AmazeMulch, }, // Apricorns @@ -3073,6 +3453,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_RedApricorn, + .iconPalette = gItemIconPalette_RedApricorn, }, [ITEM_BLUE_APRICORN] = @@ -3086,24 +3468,28 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_BlueApricorn, + .iconPalette = gItemIconPalette_BlueApricorn, }, [ITEM_YELLOW_APRICORN] = { - .name = _("YellwApricorn"), + .name = HANDLE_EXPANDED_ITEM_NAME("YellwApricorn", "Yellow Apricorn"), .price = (I_PRICE == GEN_4) ? 0 : ((I_PRICE >= GEN_5 && I_PRICE <= GEN_7) ? 20 : 200), .description = COMPOUND_STRING( "A yellow apricorn. " - "It has an\ninvigor" + "It has an\ninvigor-" "ating scent."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_YellowApricorn, + .iconPalette = gItemIconPalette_YellowApricorn, }, [ITEM_GREEN_APRICORN] = { - .name = _("GreenApricorn"), + .name = HANDLE_EXPANDED_ITEM_NAME("GreenApricorn", "Green Apricorn"), .price = (I_PRICE == GEN_4) ? 0 : ((I_PRICE >= GEN_5 && I_PRICE <= GEN_7) ? 20 : 200), .description = COMPOUND_STRING( "A green apricorn. " @@ -3112,6 +3498,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_GreenApricorn, + .iconPalette = gItemIconPalette_GreenApricorn, }, [ITEM_PINK_APRICORN] = @@ -3125,11 +3513,13 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_PinkApricorn, + .iconPalette = gItemIconPalette_PinkApricorn, }, [ITEM_WHITE_APRICORN] = { - .name = _("WhiteApricorn"), + .name = HANDLE_EXPANDED_ITEM_NAME("WhiteApricorn", "White Apricorn"), .price = (I_PRICE == GEN_4) ? 0 : ((I_PRICE >= GEN_5 && I_PRICE <= GEN_7) ? 20 : 200), .description = COMPOUND_STRING( "A white apricorn. " @@ -3138,24 +3528,28 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_WhiteApricorn, + .iconPalette = gItemIconPalette_WhiteApricorn, }, [ITEM_BLACK_APRICORN] = { - .name = _("BlackApricorn"), + .name = HANDLE_EXPANDED_ITEM_NAME("BlackApricorn", "Black Apricorn"), .price = (I_PRICE == GEN_4) ? 0 : ((I_PRICE >= GEN_5 && I_PRICE <= GEN_7) ? 20 : 200), .description = COMPOUND_STRING( "A black apricorn. " - "It has an inde-\n" - "scribable scent."), + "It has an inde-" + "\nscribable scent."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_BlackApricorn, + .iconPalette = gItemIconPalette_BlackApricorn, }, [ITEM_WISHING_PIECE] = { - .name = _("WishingPiece"), + .name = HANDLE_EXPANDED_ITEM_NAME("WishingPiece", "Wishing Piece"), .price = 20, .description = COMPOUND_STRING( "Throw into a " @@ -3165,11 +3559,13 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo .flingPower = 50, + .iconPic = gItemIcon_WishingPiece, + .iconPalette = gItemIconPalette_WishingPiece, }, [ITEM_GALARICA_TWIG] = { - .name = _("GalaricaTwig"), + .name = HANDLE_EXPANDED_ITEM_NAME("GalaricaTwig", "Galarica Twig"), .price = 20 * TREASURE_FACTOR, .description = COMPOUND_STRING( "A twig from a tree " @@ -3179,6 +3575,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_GalaricaTwig, + .iconPalette = gItemIconPalette_GalaricaItem, }, [ITEM_ARMORITE_ORE] = @@ -3194,6 +3592,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_ArmoriteOre, + .iconPalette = gItemIconPalette_ArmoriteOre, }, [ITEM_DYNITE_ORE] = @@ -3209,6 +3609,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_DyniteOre, + .iconPalette = gItemIconPalette_DyniteOre, }, // Mail @@ -3226,6 +3628,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_ORANGE_MAIL), + .iconPic = gItemIcon_OrangeMail, + .iconPalette = gItemIconPalette_OrangeMail, }, [ITEM_HARBOR_MAIL] = @@ -3241,6 +3645,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_HARBOR_MAIL), + .iconPic = gItemIcon_HarborMail, + .iconPalette = gItemIconPalette_HarborMail, }, [ITEM_GLITTER_MAIL] = @@ -3256,6 +3662,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_GLITTER_MAIL), + .iconPic = gItemIcon_GlitterMail, + .iconPalette = gItemIconPalette_GlitterMail, }, [ITEM_MECH_MAIL] = @@ -3271,6 +3679,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_MECH_MAIL), + .iconPic = gItemIcon_MechMail, + .iconPalette = gItemIconPalette_MechMail, }, [ITEM_WOOD_MAIL] = @@ -3286,6 +3696,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_WOOD_MAIL), + .iconPic = gItemIcon_WoodMail, + .iconPalette = gItemIconPalette_WoodMail, }, [ITEM_WAVE_MAIL] = @@ -3301,6 +3713,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_WAVE_MAIL), + .iconPic = gItemIcon_WaveMail, + .iconPalette = gItemIconPalette_WaveMail, }, [ITEM_BEAD_MAIL] = @@ -3313,6 +3727,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_BEAD_MAIL), + .iconPic = gItemIcon_BeadMail, + .iconPalette = gItemIconPalette_BeadMail, }, [ITEM_SHADOW_MAIL] = @@ -3328,6 +3744,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_SHADOW_MAIL), + .iconPic = gItemIcon_ShadowMail, + .iconPalette = gItemIconPalette_ShadowMail, }, [ITEM_TROPIC_MAIL] = @@ -3343,6 +3761,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_TROPIC_MAIL), + .iconPic = gItemIcon_TropicMail, + .iconPalette = gItemIconPalette_TropicMail, }, [ITEM_DREAM_MAIL] = @@ -3355,6 +3775,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_DREAM_MAIL), + .iconPic = gItemIcon_DreamMail, + .iconPalette = gItemIconPalette_DreamMail, }, [ITEM_FAB_MAIL] = @@ -3370,6 +3792,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_FAB_MAIL), + .iconPic = gItemIcon_FabMail, + .iconPalette = gItemIconPalette_FabMail, }, [ITEM_RETRO_MAIL] = @@ -3385,6 +3809,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_RETRO_MAIL), + .iconPic = gItemIcon_RetroMail, + .iconPalette = gItemIconPalette_RetroMail, }, // Evolution Items @@ -3392,13 +3818,15 @@ const struct Item gItemsInfo[] = [ITEM_FIRE_STONE] = { .name = _("Fire Stone"), - .price = (I_PRICE >= GEN_7) ? 2 : 2, + .price = (I_PRICE >= GEN_7) ? 3000 : 2100, .description = sEvolutionStoneDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_FireStone, + .iconPalette = gItemIconPalette_FireStone, }, [ITEM_WATER_STONE] = @@ -3411,6 +3839,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_WaterStone, + .iconPalette = gItemIconPalette_WaterStone, }, [ITEM_THUNDER_STONE] = @@ -3423,6 +3853,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_ThunderStone, + .iconPalette = gItemIconPalette_ThunderStone, }, [ITEM_LEAF_STONE] = @@ -3435,18 +3867,22 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_LeafStone, + .iconPalette = gItemIconPalette_LeafStone, }, [ITEM_ICE_STONE] = { .name = _("Ice Stone"), - .price = (I_PRICE >= GEN_7) ? 2 : 2, + .price = (I_PRICE >= GEN_7) ? 3000 : 2100, .description = sEvolutionStoneDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_IceStone, + .iconPalette = gItemIconPalette_IceStone, }, [ITEM_SUN_STONE] = @@ -3459,6 +3895,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_SunStone, + .iconPalette = gItemIconPalette_SunStone, }, [ITEM_MOON_STONE] = @@ -3471,6 +3909,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_MoonStone, + .iconPalette = gItemIconPalette_MoonStone, }, [ITEM_SHINY_STONE] = @@ -3483,6 +3923,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_ShinyStone, + .iconPalette = gItemIconPalette_ShinyStone, }, [ITEM_DUSK_STONE] = @@ -3495,6 +3937,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconPic = gItemIcon_DuskStone, + .iconPalette = gItemIconPalette_DuskStone, }, [ITEM_DAWN_STONE] = @@ -3507,6 +3951,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconPic = gItemIcon_DawnStone, + .iconPalette = gItemIconPalette_DawnStone, }, [ITEM_SWEET_APPLE] = @@ -3522,6 +3968,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_SweetApple, + .iconPalette = gItemIconPalette_SweetApple, }, [ITEM_TART_APPLE] = @@ -3537,6 +3985,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_TartApple, + .iconPalette = gItemIconPalette_TartApple, }, [ITEM_CRACKED_POT] = @@ -3552,6 +4002,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconPic = gItemIcon_CrackedPot, + .iconPalette = gItemIconPalette_Pot, }, [ITEM_CHIPPED_POT] = @@ -3567,11 +4019,13 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconPic = gItemIcon_ChippedPot, + .iconPalette = gItemIconPalette_Pot, }, [ITEM_GALARICA_CUFF] = { - .name = _("GalaricaCuff"), + .name = HANDLE_EXPANDED_ITEM_NAME("GalaricaCuff", "Galarica Cuff"), .price = (I_PRICE >= GEN_9) ? 3000 : 6000, .description = COMPOUND_STRING( "A cuff from Galar " @@ -3582,12 +4036,14 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_GalaricaCuff, + .iconPalette = gItemIconPalette_GalaricaItem, }, [ITEM_GALARICA_WREATH] = { - .name = _("GalrcaWreath"), - .pluralName = _("GalrcaWreathes"), + .name = HANDLE_EXPANDED_ITEM_NAME("GalrcaWreath", "Galarica Wreath"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("GalrcaWreathes", "Galarica Wreathes"), .price = (I_PRICE >= GEN_9) ? 3000 : 6000, .description = COMPOUND_STRING( "A wreath made in " @@ -3598,6 +4054,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_GalaricaWreath, + .iconPalette = gItemIconPalette_GalaricaItem, }, [ITEM_DRAGON_SCALE] = @@ -3608,13 +4066,15 @@ const struct Item gItemsInfo[] = .holdEffectParam = 10, .description = COMPOUND_STRING( "A strange scale " - "held by Dragon" + "held by Dragon-" "\ntype Pokémon."), .pocket = POCKET_ITEMS, .type = EVO_HELD_ITEM_TYPE, .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_DragonScale, + .iconPalette = gItemIconPalette_DragonScale, }, [ITEM_UPGRADE] = @@ -3630,6 +4090,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_Upgrade, + .iconPalette = gItemIconPalette_Upgrade, }, [ITEM_PROTECTOR] = @@ -3645,6 +4107,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconPic = gItemIcon_Protector, + .iconPalette = gItemIconPalette_Protector, }, [ITEM_ELECTIRIZER] = @@ -3660,6 +4124,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconPic = gItemIcon_Electirizer, + .iconPalette = gItemIconPalette_Electirizer, }, [ITEM_MAGMARIZER] = @@ -3675,6 +4141,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconPic = gItemIcon_Magmarizer, + .iconPalette = gItemIconPalette_Magmarizer, }, [ITEM_DUBIOUS_DISC] = @@ -3682,14 +4150,16 @@ const struct Item gItemsInfo[] = .name = _("Dubious Disc"), .price = (I_PRICE >= GEN_7) ? 2000 * TREASURE_FACTOR : 2100, .description = COMPOUND_STRING( - "A transparent device " - "overflowing\nwith " - "dubious data."), + "A clear device " + "overflowing with " + "\ndubious data."), .pocket = POCKET_ITEMS, .type = EVO_HELD_ITEM_TYPE, .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 50, + .iconPic = gItemIcon_DubiousDisc, + .iconPalette = gItemIconPalette_DubiousDisc, }, [ITEM_REAPER_CLOTH] = @@ -3706,6 +4176,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 10, + .iconPic = gItemIcon_ReaperCloth, + .iconPalette = gItemIconPalette_ReaperCloth, }, [ITEM_PRISM_SCALE] = @@ -3721,6 +4193,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_PrismScale, + .iconPalette = gItemIconPalette_PrismScale, }, [ITEM_WHIPPED_DREAM] = @@ -3737,6 +4211,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconPic = gItemIcon_WhippedDream, + .iconPalette = gItemIconPalette_WhippedDream, }, [ITEM_SACHET] = @@ -3752,6 +4228,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconPic = gItemIcon_Sachet, + .iconPalette = gItemIconPalette_Sachet, }, [ITEM_OVAL_STONE] = @@ -3767,11 +4245,13 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconPic = gItemIcon_OvalStone, + .iconPalette = gItemIconPalette_OvalStone, }, [ITEM_STRAWBERRY_SWEET] = { - .name = _("StrwbrySweet"), + .name = HANDLE_EXPANDED_ITEM_NAME("StrwbrySweet", "Strawberry Sweet"), .price = 500 * TREASURE_FACTOR, .description = COMPOUND_STRING( "Strawberry-shaped " @@ -3781,6 +4261,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_StrawberrySweet, + .iconPalette = gItemIconPalette_StrawberrySweet, }, [ITEM_LOVE_SWEET] = @@ -3795,6 +4277,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_LoveSweet, + .iconPalette = gItemIconPalette_LoveSweet, }, [ITEM_BERRY_SWEET] = @@ -3809,6 +4293,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_BerrySweet, + .iconPalette = gItemIconPalette_BerrySweet, }, [ITEM_CLOVER_SWEET] = @@ -3823,6 +4309,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_CloverSweet, + .iconPalette = gItemIconPalette_CloverSweet, }, [ITEM_FLOWER_SWEET] = @@ -3837,6 +4325,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_FlowerSweet, + .iconPalette = gItemIconPalette_FlowerSweet, }, [ITEM_STAR_SWEET] = @@ -3851,6 +4341,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_StarSweet, + .iconPalette = gItemIconPalette_StarSweet, }, [ITEM_RIBBON_SWEET] = @@ -3865,6 +4357,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_RibbonSweet, + .iconPalette = gItemIconPalette_RibbonSweet, }, [ITEM_EVERSTONE] = @@ -3880,6 +4374,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_Everstone, + .iconPalette = gItemIconPalette_Everstone, }, // Nectars @@ -3894,6 +4390,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse, .flingPower = 10, + .iconPic = gItemIcon_RedNectar, + .iconPalette = gItemIconPalette_RedNectar, }, [ITEM_YELLOW_NECTAR] = @@ -3906,6 +4404,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse, .flingPower = 10, + .iconPic = gItemIcon_YellowNectar, + .iconPalette = gItemIconPalette_YellowNectar, }, [ITEM_PINK_NECTAR] = @@ -3918,6 +4418,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse, .flingPower = 10, + .iconPic = gItemIcon_PinkNectar, + .iconPalette = gItemIconPalette_PinkNectar, }, [ITEM_PURPLE_NECTAR] = @@ -3930,6 +4432,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse, .flingPower = 10, + .iconPic = gItemIcon_PurpleNectar, + .iconPalette = gItemIconPalette_PurpleNectar, }, // Plates @@ -3949,6 +4453,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, .flingPower = 90, + .iconPic = gItemIcon_FlamePlate, + .iconPalette = gItemIconPalette_FlamePlate, }, [ITEM_SPLASH_PLATE] = @@ -3966,6 +4472,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, .flingPower = 90, + .iconPic = gItemIcon_SplashPlate, + .iconPalette = gItemIconPalette_SplashPlate, }, [ITEM_ZAP_PLATE] = @@ -3976,13 +4484,15 @@ const struct Item gItemsInfo[] = .holdEffectParam = 20, .description = COMPOUND_STRING( "A tablet that ups " - "the power of\nElec" + "the power of\nElec-" "tric-type moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, .flingPower = 90, + .iconPic = gItemIcon_ZapPlate, + .iconPalette = gItemIconPalette_ZapPlate, }, [ITEM_MEADOW_PLATE] = @@ -4000,6 +4510,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GRASS, .flingPower = 90, + .iconPic = gItemIcon_MeadowPlate, + .iconPalette = gItemIconPalette_MeadowPlate, }, [ITEM_ICICLE_PLATE] = @@ -4017,6 +4529,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, .flingPower = 90, + .iconPic = gItemIcon_IciclePlate, + .iconPalette = gItemIconPalette_IciclePlate, }, [ITEM_FIST_PLATE] = @@ -4027,13 +4541,15 @@ const struct Item gItemsInfo[] = .holdEffectParam = 20, .description = COMPOUND_STRING( "A tablet that ups " - "the power of\nFight" + "the power of\nFight-" "ing-type moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIGHTING, .flingPower = 90, + .iconPic = gItemIcon_FistPlate, + .iconPalette = gItemIconPalette_FistPlate, }, [ITEM_TOXIC_PLATE] = @@ -4051,6 +4567,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_POISON, .flingPower = 90, + .iconPic = gItemIcon_ToxicPlate, + .iconPalette = gItemIconPalette_ToxicPlate, }, [ITEM_EARTH_PLATE] = @@ -4068,6 +4586,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GROUND, .flingPower = 90, + .iconPic = gItemIcon_EarthPlate, + .iconPalette = gItemIconPalette_EarthPlate, }, [ITEM_SKY_PLATE] = @@ -4085,6 +4605,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FLYING, .flingPower = 90, + .iconPic = gItemIcon_SkyPlate, + .iconPalette = gItemIconPalette_SkyPlate, }, [ITEM_MIND_PLATE] = @@ -4102,6 +4624,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_PSYCHIC, .flingPower = 90, + .iconPic = gItemIcon_MindPlate, + .iconPalette = gItemIconPalette_MindPlate, }, [ITEM_INSECT_PLATE] = @@ -4119,6 +4643,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_BUG, .flingPower = 90, + .iconPic = gItemIcon_InsectPlate, + .iconPalette = gItemIconPalette_InsectPlate, }, [ITEM_STONE_PLATE] = @@ -4136,6 +4662,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ROCK, .flingPower = 90, + .iconPic = gItemIcon_StonePlate, + .iconPalette = gItemIconPalette_StonePlate, }, [ITEM_SPOOKY_PLATE] = @@ -4153,6 +4681,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GHOST, .flingPower = 90, + .iconPic = gItemIcon_SpookyPlate, + .iconPalette = gItemIconPalette_SpookyPlate, }, [ITEM_DRACO_PLATE] = @@ -4170,6 +4700,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DRAGON, .flingPower = 90, + .iconPic = gItemIcon_DracoPlate, + .iconPalette = gItemIconPalette_DracoPlate, }, [ITEM_DREAD_PLATE] = @@ -4187,6 +4719,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DARK, .flingPower = 90, + .iconPic = gItemIcon_DreadPlate, + .iconPalette = gItemIconPalette_DreadPlate, }, [ITEM_IRON_PLATE] = @@ -4204,6 +4738,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_STEEL, .flingPower = 90, + .iconPic = gItemIcon_IronPlate, + .iconPalette = gItemIconPalette_IronPlate, }, [ITEM_PIXIE_PLATE] = @@ -4221,6 +4757,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FAIRY, .flingPower = 90, + .iconPic = gItemIcon_PixiePlate, + .iconPalette = gItemIconPalette_PixiePlate, }, // Drives @@ -4239,6 +4777,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, .flingPower = 70, + .iconPic = gItemIcon_DouseDrive, + .iconPalette = gItemIconPalette_DouseDrive, }, [ITEM_SHOCK_DRIVE] = @@ -4255,6 +4795,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, .flingPower = 70, + .iconPic = gItemIcon_ShockDrive, + .iconPalette = gItemIconPalette_ShockDrive, }, [ITEM_BURN_DRIVE] = @@ -4271,6 +4813,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, .flingPower = 70, + .iconPic = gItemIcon_BurnDrive, + .iconPalette = gItemIconPalette_BurnDrive, }, [ITEM_CHILL_DRIVE] = @@ -4287,6 +4831,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, .flingPower = 70, + .iconPic = gItemIcon_ChillDrive, + .iconPalette = gItemIconPalette_ChillDrive, }, // Memories @@ -4307,6 +4853,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, .flingPower = 50, + .iconPic = gItemIcon_FireMemory, + .iconPalette = gItemIconPalette_FireMemory, }, [ITEM_WATER_MEMORY] = @@ -4325,12 +4873,14 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, .flingPower = 50, + .iconPic = gItemIcon_WaterMemory, + .iconPalette = gItemIconPalette_WaterMemory, }, [ITEM_ELECTRIC_MEMORY] = { - .name = _("ElectrcMemory"), - .pluralName = _("ElectrcMemories"), + .name = HANDLE_EXPANDED_ITEM_NAME("ElectrcMemory", "Electric Memory"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("ElectrcMemories", "Electric Memories"), .price = 1000, .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, @@ -4343,6 +4893,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, .flingPower = 50, + .iconPic = gItemIcon_ElectricMemory, + .iconPalette = gItemIconPalette_ElectricMemory, }, [ITEM_GRASS_MEMORY] = @@ -4361,6 +4913,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GRASS, .flingPower = 50, + .iconPic = gItemIcon_GrassMemory, + .iconPalette = gItemIconPalette_GrassMemory, }, [ITEM_ICE_MEMORY] = @@ -4379,12 +4933,14 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, .flingPower = 50, + .iconPic = gItemIcon_IceMemory, + .iconPalette = gItemIconPalette_IceMemory, }, [ITEM_FIGHTING_MEMORY] = { - .name = _("FightngMemory"), - .pluralName = _("FightngMemories"), + .name = HANDLE_EXPANDED_ITEM_NAME("FightngMemory", "Fighting Memory"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("FightngMemories", "Fighting Memories"), .price = 1000, .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, @@ -4397,6 +4953,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIGHTING, .flingPower = 50, + .iconPic = gItemIcon_FightingMemory, + .iconPalette = gItemIconPalette_FightingMemory, }, [ITEM_POISON_MEMORY] = @@ -4415,6 +4973,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_POISON, .flingPower = 50, + .iconPic = gItemIcon_PoisonMemory, + .iconPalette = gItemIconPalette_PoisonMemory, }, [ITEM_GROUND_MEMORY] = @@ -4433,6 +4993,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GROUND, .flingPower = 50, + .iconPic = gItemIcon_GroundMemory, + .iconPalette = gItemIconPalette_GroundMemory, }, [ITEM_FLYING_MEMORY] = @@ -4451,12 +5013,14 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FLYING, .flingPower = 50, + .iconPic = gItemIcon_FlyingMemory, + .iconPalette = gItemIconPalette_FlyingMemory, }, [ITEM_PSYCHIC_MEMORY] = { - .name = _("PsychicMemory"), - .pluralName = _("PsychicMemories"), + .name = HANDLE_EXPANDED_ITEM_NAME("PsychicMemory", "Psychic Memory"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("PsychicMemories", "Psychic Memories"), .price = 1000, .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, @@ -4469,6 +5033,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_PSYCHIC, .flingPower = 50, + .iconPic = gItemIcon_PsychicMemory, + .iconPalette = gItemIconPalette_PsychicMemory, }, [ITEM_BUG_MEMORY] = @@ -4487,6 +5053,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_BUG, .flingPower = 50, + .iconPic = gItemIcon_BugMemory, + .iconPalette = gItemIconPalette_BugMemory, }, [ITEM_ROCK_MEMORY] = @@ -4505,6 +5073,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ROCK, .flingPower = 50, + .iconPic = gItemIcon_RockMemory, + .iconPalette = gItemIconPalette_RockMemory, }, [ITEM_GHOST_MEMORY] = @@ -4523,6 +5093,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GHOST, .flingPower = 50, + .iconPic = gItemIcon_GhostMemory, + .iconPalette = gItemIconPalette_GhostMemory, }, [ITEM_DRAGON_MEMORY] = @@ -4541,6 +5113,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DRAGON, .flingPower = 50, + .iconPic = gItemIcon_DragonMemory, + .iconPalette = gItemIconPalette_DragonMemory, }, [ITEM_DARK_MEMORY] = @@ -4559,6 +5133,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DARK, .flingPower = 50, + .iconPic = gItemIcon_DarkMemory, + .iconPalette = gItemIconPalette_DarkMemory, }, [ITEM_STEEL_MEMORY] = @@ -4577,6 +5153,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_STEEL, .flingPower = 50, + .iconPic = gItemIcon_SteelMemory, + .iconPalette = gItemIconPalette_SteelMemory, }, [ITEM_FAIRY_MEMORY] = @@ -4595,11 +5173,13 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FAIRY, .flingPower = 50, + .iconPic = gItemIcon_FairyMemory, + .iconPalette = gItemIconPalette_FairyMemory, }, [ITEM_RUSTED_SWORD] = { - .name = _("RustedSword"), + .name = HANDLE_EXPANDED_ITEM_NAME("RustedSword", "Rusted Sword"), .price = 0, .description = COMPOUND_STRING( "A rusty sword. A " @@ -4608,11 +5188,13 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_RustedSword, + .iconPalette = gItemIconPalette_RustedWeapons, }, [ITEM_RUSTED_SHIELD] = { - .name = _("RustedShield"), + .name = HANDLE_EXPANDED_ITEM_NAME("RustedShield", "Rusted Shield"), .price = 0, .description = COMPOUND_STRING( "A rusty shield. A " @@ -4621,6 +5203,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_RustedShield, + .iconPalette = gItemIconPalette_RustedWeapons, }, // Colored Orbs @@ -4637,6 +5221,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_RedOrb, + .iconPalette = gItemIconPalette_RedOrb, }, [ITEM_BLUE_ORB] = @@ -4651,6 +5237,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_BlueOrb, + .iconPalette = gItemIconPalette_BlueOrb, }, // Mega Stones @@ -4668,11 +5256,13 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Venusaurite, + .iconPalette = gItemIconPalette_Venusaurite, }, [ITEM_CHARIZARDITE_X] = { - .name = _("CharizarditeX"), + .name = HANDLE_EXPANDED_ITEM_NAME("CharizarditeX", "Charizardite X"), .pluralName = _("Charizardites X"), .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, @@ -4681,11 +5271,13 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_CharizarditeX, + .iconPalette = gItemIconPalette_CharizarditeX, }, [ITEM_CHARIZARDITE_Y] = { - .name = _("CharizarditeY"), + .name = HANDLE_EXPANDED_ITEM_NAME("CharizarditeY", "Charizardite Y"), .pluralName = _("Charizardites Y"), .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, @@ -4694,6 +5286,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_CharizarditeY, + .iconPalette = gItemIconPalette_CharizarditeY, }, [ITEM_BLASTOISINITE] = @@ -4709,6 +5303,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Blastoisinite, + .iconPalette = gItemIconPalette_Blastoisinite, }, [ITEM_BEEDRILLITE] = @@ -4724,6 +5320,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Beedrillite, + .iconPalette = gItemIconPalette_Beedrillite, }, [ITEM_PIDGEOTITE] = @@ -4739,6 +5337,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Pidgeotite, + .iconPalette = gItemIconPalette_Pidgeotite, }, [ITEM_ALAKAZITE] = @@ -4754,6 +5354,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Alakazite, + .iconPalette = gItemIconPalette_Alakazite, }, [ITEM_SLOWBRONITE] = @@ -4769,6 +5371,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Slowbronite, + .iconPalette = gItemIconPalette_Slowbronite, }, [ITEM_GENGARITE] = @@ -4784,6 +5388,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Gengarite, + .iconPalette = gItemIconPalette_Gengarite, }, [ITEM_KANGASKHANITE] = @@ -4799,6 +5405,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Kangaskhanite, + .iconPalette = gItemIconPalette_Kangaskhanite, }, [ITEM_PINSIRITE] = @@ -4814,6 +5422,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Pinsirite, + .iconPalette = gItemIconPalette_Pinsirite, }, [ITEM_GYARADOSITE] = @@ -4829,6 +5439,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Gyaradosite, + .iconPalette = gItemIconPalette_Gyaradosite, }, [ITEM_AERODACTYLITE] = @@ -4844,6 +5456,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Aerodactylite, + .iconPalette = gItemIconPalette_Aerodactylite, }, [ITEM_MEWTWONITE_X] = @@ -4857,6 +5471,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_MewtwoniteX, + .iconPalette = gItemIconPalette_MewtwoniteX, }, [ITEM_MEWTWONITE_Y] = @@ -4870,6 +5486,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_MewtwoniteY, + .iconPalette = gItemIconPalette_MewtwoniteY, }, [ITEM_AMPHAROSITE] = @@ -4885,6 +5503,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Ampharosite, + .iconPalette = gItemIconPalette_Ampharosite, }, [ITEM_STEELIXITE] = @@ -4900,6 +5520,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Steelixite, + .iconPalette = gItemIconPalette_Steelixite, }, [ITEM_SCIZORITE] = @@ -4915,6 +5537,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Scizorite, + .iconPalette = gItemIconPalette_Scizorite, }, [ITEM_HERACRONITE] = @@ -4930,6 +5554,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Heracronite, + .iconPalette = gItemIconPalette_Heracronite, }, [ITEM_HOUNDOOMINITE] = @@ -4945,6 +5571,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Houndoominite, + .iconPalette = gItemIconPalette_Houndoominite, }, [ITEM_TYRANITARITE] = @@ -4960,6 +5588,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Tyranitarite, + .iconPalette = gItemIconPalette_Tyranitarite, }, [ITEM_SCEPTILITE] = @@ -4975,6 +5605,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Sceptilite, + .iconPalette = gItemIconPalette_Sceptilite, }, [ITEM_BLAZIKENITE] = @@ -4990,6 +5622,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Blazikenite, + .iconPalette = gItemIconPalette_Blazikenite, }, [ITEM_SWAMPERTITE] = @@ -5005,6 +5639,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Swampertite, + .iconPalette = gItemIconPalette_Swampertite, }, [ITEM_GARDEVOIRITE] = @@ -5020,6 +5656,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Gardevoirite, + .iconPalette = gItemIconPalette_Gardevoirite, }, [ITEM_SABLENITE] = @@ -5035,6 +5673,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Sablenite, + .iconPalette = gItemIconPalette_Sablenite, }, [ITEM_MAWILITE] = @@ -5050,6 +5690,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Mawilite, + .iconPalette = gItemIconPalette_Mawilite, }, [ITEM_AGGRONITE] = @@ -5065,6 +5707,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Aggronite, + .iconPalette = gItemIconPalette_Aggronite, }, [ITEM_MEDICHAMITE] = @@ -5080,6 +5724,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Medichamite, + .iconPalette = gItemIconPalette_Medichamite, }, [ITEM_MANECTITE] = @@ -5095,6 +5741,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Manectite, + .iconPalette = gItemIconPalette_Manectite, }, [ITEM_SHARPEDONITE] = @@ -5110,6 +5758,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Sharpedonite, + .iconPalette = gItemIconPalette_Sharpedonite, }, [ITEM_CAMERUPTITE] = @@ -5125,6 +5775,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Cameruptite, + .iconPalette = gItemIconPalette_Cameruptite, }, [ITEM_ALTARIANITE] = @@ -5140,6 +5792,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Altarianite, + .iconPalette = gItemIconPalette_Altarianite, }, [ITEM_BANETTITE] = @@ -5155,6 +5809,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Banettite, + .iconPalette = gItemIconPalette_Banettite, }, [ITEM_ABSOLITE] = @@ -5170,6 +5826,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Absolite, + .iconPalette = gItemIconPalette_Absolite, }, [ITEM_GLALITITE] = @@ -5185,6 +5843,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Glalitite, + .iconPalette = gItemIconPalette_Glalitite, }, [ITEM_SALAMENCITE] = @@ -5200,6 +5860,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Salamencite, + .iconPalette = gItemIconPalette_Salamencite, }, [ITEM_METAGROSSITE] = @@ -5215,6 +5877,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Metagrossite, + .iconPalette = gItemIconPalette_Metagrossite, }, [ITEM_LATIASITE] = @@ -5230,6 +5894,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Latiasite, + .iconPalette = gItemIconPalette_Latiasite, }, [ITEM_LATIOSITE] = @@ -5245,6 +5911,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Latiosite, + .iconPalette = gItemIconPalette_Latiosite, }, [ITEM_LOPUNNITE] = @@ -5260,6 +5928,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Lopunnite, + .iconPalette = gItemIconPalette_Lopunnite, }, [ITEM_GARCHOMPITE] = @@ -5275,6 +5945,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Garchompite, + .iconPalette = gItemIconPalette_Garchompite, }, [ITEM_LUCARIONITE] = @@ -5290,6 +5962,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Lucarionite, + .iconPalette = gItemIconPalette_Lucarionite, }, [ITEM_ABOMASITE] = @@ -5305,6 +5979,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Abomasite, + .iconPalette = gItemIconPalette_Abomasite, }, [ITEM_GALLADITE] = @@ -5320,6 +5996,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Galladite, + .iconPalette = gItemIconPalette_Galladite, }, [ITEM_AUDINITE] = @@ -5335,6 +6013,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Audinite, + .iconPalette = gItemIconPalette_Audinite, }, [ITEM_DIANCITE] = @@ -5350,6 +6030,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_Diancite, + .iconPalette = gItemIconPalette_Diancite, }, // Gems @@ -5368,6 +6050,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_NORMAL, + .iconPic = gItemIcon_NormalGem, + .iconPalette = gItemIconPalette_NormalGem, }, [ITEM_FIRE_GEM] = @@ -5384,6 +6068,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, + .iconPic = gItemIcon_FireGem, + .iconPalette = gItemIconPalette_FireGem, }, [ITEM_WATER_GEM] = @@ -5400,6 +6086,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, + .iconPic = gItemIcon_WaterGem, + .iconPalette = gItemIconPalette_WaterGem, }, [ITEM_ELECTRIC_GEM] = @@ -5416,6 +6104,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, + .iconPic = gItemIcon_ElectricGem, + .iconPalette = gItemIconPalette_ElectricGem, }, [ITEM_GRASS_GEM] = @@ -5432,6 +6122,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GRASS, + .iconPic = gItemIcon_GrassGem, + .iconPalette = gItemIconPalette_GrassGem, }, [ITEM_ICE_GEM] = @@ -5448,6 +6140,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, + .iconPic = gItemIcon_IceGem, + .iconPalette = gItemIconPalette_IceGem, }, [ITEM_FIGHTING_GEM] = @@ -5464,6 +6158,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIGHTING, + .iconPic = gItemIcon_FightingGem, + .iconPalette = gItemIconPalette_FightingGem, }, [ITEM_POISON_GEM] = @@ -5480,6 +6176,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_POISON, + .iconPic = gItemIcon_PoisonGem, + .iconPalette = gItemIconPalette_PoisonGem, }, [ITEM_GROUND_GEM] = @@ -5496,6 +6194,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GROUND, + .iconPic = gItemIcon_GroundGem, + .iconPalette = gItemIconPalette_GroundGem, }, [ITEM_FLYING_GEM] = @@ -5512,6 +6212,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FLYING, + .iconPic = gItemIcon_FlyingGem, + .iconPalette = gItemIconPalette_FlyingGem, }, [ITEM_PSYCHIC_GEM] = @@ -5528,6 +6230,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_PSYCHIC, + .iconPic = gItemIcon_PsychicGem, + .iconPalette = gItemIconPalette_PsychicGem, }, [ITEM_BUG_GEM] = @@ -5544,6 +6248,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_BUG, + .iconPic = gItemIcon_BugGem, + .iconPalette = gItemIconPalette_BugGem, }, [ITEM_ROCK_GEM] = @@ -5560,6 +6266,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ROCK, + .iconPic = gItemIcon_RockGem, + .iconPalette = gItemIconPalette_RockGem, }, [ITEM_GHOST_GEM] = @@ -5576,6 +6284,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GHOST, + .iconPic = gItemIcon_GhostGem, + .iconPalette = gItemIconPalette_GhostGem, }, [ITEM_DRAGON_GEM] = @@ -5592,6 +6302,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DRAGON, + .iconPic = gItemIcon_DragonGem, + .iconPalette = gItemIconPalette_DragonGem, }, [ITEM_DARK_GEM] = @@ -5608,6 +6320,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DARK, + .iconPic = gItemIcon_DarkGem, + .iconPalette = gItemIconPalette_DarkGem, }, [ITEM_STEEL_GEM] = @@ -5624,6 +6338,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_STEEL, + .iconPic = gItemIcon_SteelGem, + .iconPalette = gItemIconPalette_SteelGem, }, [ITEM_FAIRY_GEM] = @@ -5640,6 +6356,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FAIRY, + .iconPic = gItemIcon_FairyGem, + .iconPalette = gItemIconPalette_FairyGem, }, // Z-Crystals @@ -5650,13 +6368,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Normal" + "Upgrade Normal-" "type moves into " "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_NORMAL + .secondaryId = TYPE_NORMAL, + .iconPic = gItemIcon_NormaliumZ, + .iconPalette = gItemIconPalette_NormaliumZ, }, [ITEM_FIRIUM_Z] = @@ -5665,13 +6385,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Fire" + "Upgrade Fire-" "type moves into " "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_FIRE + .secondaryId = TYPE_FIRE, + .iconPic = gItemIcon_FiriumZ, + .iconPalette = gItemIconPalette_FiriumZ, }, [ITEM_WATERIUM_Z] = @@ -5680,13 +6402,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Water" + "Upgrade Water-" "type moves into " "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_WATER + .secondaryId = TYPE_WATER, + .iconPic = gItemIcon_WateriumZ, + .iconPalette = gItemIconPalette_WateriumZ, }, [ITEM_ELECTRIUM_Z] = @@ -5695,13 +6419,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Electric" - "type moves into\n" - "Z-Moves."), + "Upgrade Electric-" + "type moves into " + "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_ELECTRIC + .secondaryId = TYPE_ELECTRIC, + .iconPic = gItemIcon_ElectriumZ, + .iconPalette = gItemIconPalette_ElectriumZ, }, [ITEM_GRASSIUM_Z] = @@ -5710,13 +6436,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Grass" + "Upgrade Grass-" "type moves into " "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_GRASS + .secondaryId = TYPE_GRASS, + .iconPic = gItemIcon_GrassiumZ, + .iconPalette = gItemIconPalette_GrassiumZ, }, [ITEM_ICIUM_Z] = @@ -5725,13 +6453,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Ice" + "Upgrade Ice-" "type moves into " "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_ICE + .secondaryId = TYPE_ICE, + .iconPic = gItemIcon_IciumZ, + .iconPalette = gItemIconPalette_IciumZ, }, [ITEM_FIGHTINIUM_Z] = @@ -5740,13 +6470,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Fighting" - "type moves into\n" - "Z-Moves."), + "Upgrade Fighting-" + "type moves into " + "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_FIGHTING + .secondaryId = TYPE_FIGHTING, + .iconPic = gItemIcon_FightiniumZ, + .iconPalette = gItemIconPalette_FightiniumZ, }, [ITEM_POISONIUM_Z] = @@ -5755,13 +6487,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Poison" + "Upgrade Poison-" "type moves into " "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_POISON + .secondaryId = TYPE_POISON, + .iconPic = gItemIcon_PoisoniumZ, + .iconPalette = gItemIconPalette_PoisoniumZ, }, [ITEM_GROUNDIUM_Z] = @@ -5770,13 +6504,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Ground" + "Upgrade Ground-" "type moves into " "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_GROUND + .secondaryId = TYPE_GROUND, + .iconPic = gItemIcon_GroundiumZ, + .iconPalette = gItemIconPalette_GroundiumZ, }, [ITEM_FLYINIUM_Z] = @@ -5785,13 +6521,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Flying" + "Upgrade Flying-" "type moves into " "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_FLYING + .secondaryId = TYPE_FLYING, + .iconPic = gItemIcon_FlyiniumZ, + .iconPalette = gItemIconPalette_FlyiniumZ, }, [ITEM_PSYCHIUM_Z] = @@ -5800,13 +6538,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Psychic" + "Upgrade Psychic-" "type moves into " "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_PSYCHIC + .secondaryId = TYPE_PSYCHIC, + .iconPic = gItemIcon_PsychiumZ, + .iconPalette = gItemIconPalette_PsychiumZ, }, [ITEM_BUGINIUM_Z] = @@ -5815,13 +6555,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Bug" + "Upgrade Bug-" "type moves into " "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_BUG + .secondaryId = TYPE_BUG, + .iconPic = gItemIcon_BuginiumZ, + .iconPalette = gItemIconPalette_BuginiumZ, }, [ITEM_ROCKIUM_Z] = @@ -5830,13 +6572,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Rock" + "Upgrade Rock-" "type moves into " "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_ROCK + .secondaryId = TYPE_ROCK, + .iconPic = gItemIcon_RockiumZ, + .iconPalette = gItemIconPalette_RockiumZ, }, [ITEM_GHOSTIUM_Z] = @@ -5845,13 +6589,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Ghost" + "Upgrade Ghost-" "type moves into " "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_GHOST + .secondaryId = TYPE_GHOST, + .iconPic = gItemIcon_GhostiumZ, + .iconPalette = gItemIconPalette_GhostiumZ, }, [ITEM_DRAGONIUM_Z] = @@ -5860,13 +6606,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Dragon" + "Upgrade Dragon-" "type moves into " "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_DRAGON + .secondaryId = TYPE_DRAGON, + .iconPic = gItemIcon_DragoniumZ, + .iconPalette = gItemIconPalette_DragoniumZ, }, [ITEM_DARKINIUM_Z] = @@ -5875,13 +6623,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Dark" + "Upgrade Dark-" "type moves into " "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_DARK + .secondaryId = TYPE_DARK, + .iconPic = gItemIcon_DarkiniumZ, + .iconPalette = gItemIconPalette_DarkiniumZ, }, [ITEM_STEELIUM_Z] = @@ -5890,13 +6640,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Steel" + "Upgrade Steel-" "type moves into " "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_STEEL + .secondaryId = TYPE_STEEL, + .iconPic = gItemIcon_SteeliumZ, + .iconPalette = gItemIconPalette_SteeliumZ, }, [ITEM_FAIRIUM_Z] = @@ -5905,13 +6657,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Fairy" + "Upgrade Fairy-" "type moves into " "\nZ-Moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_FAIRY + .secondaryId = TYPE_FAIRY, + .iconPic = gItemIcon_FairiumZ, + .iconPalette = gItemIconPalette_FairiumZ, }, [ITEM_PIKANIUM_Z] = @@ -5926,7 +6680,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 // signature z move + .secondaryId = 255, // signature z move + .iconPic = gItemIcon_PikaniumZ, + .iconPalette = gItemIconPalette_PikaniumZ, }, [ITEM_EEVIUM_Z] = @@ -5941,7 +6697,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 // signature z move + .secondaryId = 255, // signature z move + .iconPic = gItemIcon_EeviumZ, + .iconPalette = gItemIconPalette_EeviumZ, }, [ITEM_SNORLIUM_Z] = @@ -5956,7 +6714,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 // signature z move + .secondaryId = 255, // signature z move + .iconPic = gItemIcon_SnorliumZ, + .iconPalette = gItemIconPalette_SnorliumZ, }, [ITEM_MEWNIUM_Z] = @@ -5971,7 +6731,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 // signature z move + .secondaryId = 255, // signature z move + .iconPic = gItemIcon_MewniumZ, + .iconPalette = gItemIconPalette_MewniumZ, }, [ITEM_DECIDIUM_Z] = @@ -5980,13 +6742,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Decidu" - "eye's Spirit Sha-\n" - "ckle into a Z-Move."), + "Upgrade Decidu-" + "eye's Spirit Sha-" + "\nckle into a Z-Move."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 // signature z move + .secondaryId = 255, // signature z move + .iconPic = gItemIcon_DecidiumZ, + .iconPalette = gItemIconPalette_DecidiumZ, }, [ITEM_INCINIUM_Z] = @@ -5995,13 +6759,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Incine" - "roar's Darkest\nLa" - "riat into a Z-Move."), + "Upgrade Incine-" + "roar's Darkest La-" + "\nriat into a Z-Move."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 // signature z move + .secondaryId = 255, // signature z move + .iconPic = gItemIcon_InciniumZ, + .iconPalette = gItemIconPalette_InciniumZ, }, [ITEM_PRIMARIUM_Z] = @@ -6016,7 +6782,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 // signature z move + .secondaryId = 255, // signature z move + .iconPic = gItemIcon_PrimariumZ, + .iconPalette = gItemIconPalette_PrimariumZ, }, [ITEM_LYCANIUM_Z] = @@ -6031,7 +6799,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 // signature z move + .secondaryId = 255, // signature z move + .iconPic = gItemIcon_LycaniumZ, + .iconPalette = gItemIconPalette_LycaniumZ, }, [ITEM_MIMIKIUM_Z] = @@ -6046,7 +6816,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 // signature z move + .secondaryId = 255, // signature z move + .iconPic = gItemIcon_MimikiumZ, + .iconPalette = gItemIconPalette_MimikiumZ, }, [ITEM_KOMMONIUM_Z] = @@ -6061,7 +6833,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 // signature z move + .secondaryId = 255, // signature z move + .iconPic = gItemIcon_KommoniumZ, + .iconPalette = gItemIconPalette_KommoniumZ, }, [ITEM_TAPUNIUM_Z] = @@ -6076,7 +6850,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 //signature z move + .secondaryId = 255, //signature z move + .iconPic = gItemIcon_TapuniumZ, + .iconPalette = gItemIconPalette_TapuniumZ, }, [ITEM_SOLGANIUM_Z] = @@ -6091,7 +6867,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 // signature z move + .secondaryId = 255, // signature z move + .iconPic = gItemIcon_SolganiumZ, + .iconPalette = gItemIconPalette_SolganiumZ, }, [ITEM_LUNALIUM_Z] = @@ -6106,7 +6884,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 // signature z move + .secondaryId = 255, // signature z move + .iconPic = gItemIcon_LunaliumZ, + .iconPalette = gItemIconPalette_LunaliumZ, }, [ITEM_MARSHADIUM_Z] = @@ -6115,13 +6895,15 @@ const struct Item gItemsInfo[] = .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( - "Upgrade Marsha" - "dow's Spectral\nThi" + "Upgrade Marsha-" + "dow's Spectral\nThi-" "ef into a Z-Move."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 // signature z move + .secondaryId = 255, // signature z move + .iconPic = gItemIcon_MarshadiumZ, + .iconPalette = gItemIconPalette_MarshadiumZ, }, [ITEM_ALORAICHIUM_Z] = @@ -6131,12 +6913,14 @@ const struct Item gItemsInfo[] = .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( "Upgrade Alolan " - "Raichu's Thunder" + "Raichu's Thunder-" "\nbolt into a Z-Move."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 // signature z move + .secondaryId = 255, // signature z move + .iconPic = gItemIcon_AloraichiumZ, + .iconPalette = gItemIconPalette_AloraichiumZ, }, [ITEM_PIKASHUNIUM_Z] = @@ -6151,12 +6935,14 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 // signature z move + .secondaryId = 255, // signature z move + .iconPic = gItemIcon_PikashuniumZ, + .iconPalette = gItemIconPalette_PikashuniumZ, }, [ITEM_ULTRANECROZIUM_Z] = { - .name = _("U-Necrozium Z"), + .name = HANDLE_EXPANDED_ITEM_NAME("U-Necrozium Z", "Ultranecrozium Z"), .price = 0, .holdEffect = HOLD_EFFECT_Z_CRYSTAL, .description = COMPOUND_STRING( @@ -6166,7 +6952,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 255 //signature z move + .secondaryId = 255, //signature z move + .iconPic = gItemIcon_UltranecroziumZ, + .iconPalette = gItemIconPalette_UltranecroziumZ, }, // Species-specific Held Items @@ -6184,6 +6972,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_LightBall, + .iconPalette = gItemIconPalette_LightBall, }, [ITEM_LEEK] = @@ -6199,6 +6989,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconPic = gItemIcon_Leek, + .iconPalette = gItemIconPalette_Leek, }, [ITEM_THICK_CLUB] = @@ -6214,6 +7006,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 90, + .iconPic = gItemIcon_ThickClub, + .iconPalette = gItemIconPalette_ThickClub, }, [ITEM_LUCKY_PUNCH] = @@ -6230,6 +7024,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 40, + .iconPic = gItemIcon_LuckyPunch, + .iconPalette = gItemIconPalette_LuckyPunch, }, [ITEM_METAL_POWDER] = @@ -6246,6 +7042,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_MetalPowder, + .iconPalette = gItemIconPalette_MetalPowder, }, [ITEM_QUICK_POWDER] = @@ -6262,11 +7060,13 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_QuickPowder, + .iconPalette = gItemIconPalette_QuickPowder, }, [ITEM_DEEP_SEA_SCALE] = { - .name = _("DeepSeaScale"), + .name = HANDLE_EXPANDED_ITEM_NAME("DeepSeaScale", "Deep Sea Scale"), .price = (I_PRICE >= GEN_7) ? 2000 : 200, .holdEffect = HOLD_EFFECT_DEEP_SEA_SCALE, .description = COMPOUND_STRING( @@ -6278,12 +7078,14 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_DeepSeaScale, + .iconPalette = gItemIconPalette_DeepSeaScale, }, [ITEM_DEEP_SEA_TOOTH] = { - .name = _("DeepSeaTooth"), - .pluralName = _("DeepSeaTeeth"), + .name = HANDLE_EXPANDED_ITEM_NAME("DeepSeaTooth", "Deep Sea Tooth"), + .pluralName = _("Deep Sea Teeth"), .price = (I_PRICE >= GEN_7) ? 2000 : 200, .holdEffect = HOLD_EFFECT_DEEP_SEA_TOOTH, .description = COMPOUND_STRING( @@ -6295,6 +7097,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 90, + .iconPic = gItemIcon_DeepSeaTooth, + .iconPalette = gItemIconPalette_DeepSeaTooth, }, [ITEM_SOUL_DEW] = @@ -6317,6 +7121,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_SoulDew, + .iconPalette = gItemIconPalette_SoulDew, }, [ITEM_ADAMANT_ORB] = @@ -6333,6 +7139,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconPic = gItemIcon_AdamantOrb, + .iconPalette = gItemIconPalette_AdamantOrb, }, [ITEM_LUSTROUS_ORB] = @@ -6349,6 +7157,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconPic = gItemIcon_LustrousOrb, + .iconPalette = gItemIconPalette_LustrousOrb, }, [ITEM_GRISEOUS_ORB] = @@ -6359,12 +7169,14 @@ const struct Item gItemsInfo[] = .holdEffectParam = 20, .description = COMPOUND_STRING( "Powers up Giratina's " - "Dragon and\nGhost" + "Dragon and\nGhost-" "type moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconPic = gItemIcon_GriseousOrb, + .iconPalette = gItemIconPalette_GriseousOrb, }, // Incenses @@ -6380,6 +7192,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_SeaIncense, + .iconPalette = gItemIconPalette_SeaIncense, }, [ITEM_LAX_INCENSE] = @@ -6396,6 +7210,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_LaxIncense, + .iconPalette = gItemIconPalette_LaxIncense, }, [ITEM_ODD_INCENSE] = @@ -6409,6 +7225,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_OddIncense, + .iconPalette = gItemIconPalette_OddIncense, }, [ITEM_ROCK_INCENSE] = @@ -6422,6 +7240,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_RockIncense, + .iconPalette = gItemIconPalette_RockIncense, }, [ITEM_FULL_INCENSE] = @@ -6435,6 +7255,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_FullIncense, + .iconPalette = gItemIconPalette_FullIncense, }, [ITEM_WAVE_INCENSE] = @@ -6448,6 +7270,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_WaveIncense, + .iconPalette = gItemIconPalette_WaveIncense, }, [ITEM_ROSE_INCENSE] = @@ -6461,6 +7285,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_RoseIncense, + .iconPalette = gItemIconPalette_RoseIncense, }, [ITEM_LUCK_INCENSE] = @@ -6473,6 +7299,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_LuckIncense, + .iconPalette = gItemIconPalette_LuckIncense, }, [ITEM_PURE_INCENSE] = @@ -6485,6 +7313,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_PureIncense, + .iconPalette = gItemIconPalette_PureIncense, }, // Contest Scarves @@ -6502,6 +7332,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_Scarf, + .iconPalette = gItemIconPalette_RedScarf, }, [ITEM_BLUE_SCARF] = @@ -6517,6 +7349,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_Scarf, + .iconPalette = gItemIconPalette_BlueScarf, }, [ITEM_PINK_SCARF] = @@ -6532,6 +7366,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_Scarf, + .iconPalette = gItemIconPalette_PinkScarf, }, [ITEM_GREEN_SCARF] = @@ -6547,6 +7383,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_Scarf, + .iconPalette = gItemIconPalette_GreenScarf, }, [ITEM_YELLOW_SCARF] = @@ -6562,6 +7400,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_Scarf, + .iconPalette = gItemIconPalette_YellowScarf, }, // EV Gain Modifiers @@ -6579,6 +7419,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconPic = gItemIcon_MachoBrace, + .iconPalette = gItemIconPalette_MachoBrace, }, [ITEM_POWER_WEIGHT] = @@ -6596,6 +7438,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_HP, .flingPower = 70, + .iconPic = gItemIcon_PowerWeight, + .iconPalette = gItemIconPalette_PowerWeight, }, [ITEM_POWER_BRACER] = @@ -6613,6 +7457,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_ATK, .flingPower = 70, + .iconPic = gItemIcon_PowerBracer, + .iconPalette = gItemIconPalette_PowerBracer, }, [ITEM_POWER_BELT] = @@ -6630,6 +7476,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_DEF, .flingPower = 70, + .iconPic = gItemIcon_PowerBelt, + .iconPalette = gItemIconPalette_PowerBelt, }, [ITEM_POWER_LENS] = @@ -6640,7 +7488,7 @@ const struct Item gItemsInfo[] = .holdEffect = HOLD_EFFECT_POWER_ITEM, .holdEffectParam = POWER_ITEM_BOOST, .description = COMPOUND_STRING( - "Hold item that pro" + "Hold item that pro-" "motes Sp. Atk\ngain, " "but reduces Speed."), .pocket = POCKET_ITEMS, @@ -6648,6 +7496,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_SPATK, .flingPower = 70, + .iconPic = gItemIcon_PowerLens, + .iconPalette = gItemIconPalette_PowerLens, }, [ITEM_POWER_BAND] = @@ -6657,7 +7507,7 @@ const struct Item gItemsInfo[] = .holdEffect = HOLD_EFFECT_POWER_ITEM, .holdEffectParam = POWER_ITEM_BOOST, .description = COMPOUND_STRING( - "Hold item that pro" + "Hold item that pro-" "motes Sp. Def\ngain, " "but reduces Speed."), .pocket = POCKET_ITEMS, @@ -6665,6 +7515,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_SPDEF, .flingPower = 70, + .iconPic = gItemIcon_PowerBand, + .iconPalette = gItemIconPalette_PowerBand, }, [ITEM_POWER_ANKLET] = @@ -6682,6 +7534,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_SPEED, .flingPower = 70, + .iconPic = gItemIcon_PowerAnklet, + .iconPalette = gItemIconPalette_PowerAnklet, }, // Type-boosting Held Items @@ -6701,6 +7555,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_SilkScarf, + .iconPalette = gItemIconPalette_SilkScarf, }, [ITEM_CHARCOAL] = @@ -6717,6 +7573,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_Charcoal, + .iconPalette = gItemIconPalette_Charcoal, }, [ITEM_MYSTIC_WATER] = @@ -6734,6 +7592,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_MysticWater, + .iconPalette = gItemIconPalette_MysticWater, }, [ITEM_MAGNET] = @@ -6744,12 +7604,14 @@ const struct Item gItemsInfo[] = .holdEffectParam = TYPE_BOOST_PARAM, .description = COMPOUND_STRING( "A hold item that " - "boosts Electric-\n" - "type moves."), + "boosts Electric-" + "\ntype moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_Magnet, + .iconPalette = gItemIconPalette_Magnet, }, [ITEM_MIRACLE_SEED] = @@ -6763,12 +7625,14 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_MiracleSeed, + .iconPalette = gItemIconPalette_MiracleSeed, }, [ITEM_NEVER_MELT_ICE] = { - .name = _("Never-MeltIce"), - .pluralName = _("Never-MeltIce"), + .name = HANDLE_EXPANDED_ITEM_NAME("Never-MeltIce", "Never-Melt Ice"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("Never-MeltIce", "Never-Melt Ice"), .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100), .holdEffect = HOLD_EFFECT_ICE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, @@ -6780,6 +7644,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_NeverMeltIce, + .iconPalette = gItemIconPalette_NeverMeltIce, }, [ITEM_BLACK_BELT] = @@ -6790,12 +7656,14 @@ const struct Item gItemsInfo[] = .holdEffectParam = TYPE_BOOST_PARAM, .description = COMPOUND_STRING( "A hold item that " - "boosts Fighting-\n" - "type moves."), + "boosts Fighting-" + "\ntype moves."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_BlackBelt, + .iconPalette = gItemIconPalette_BlackTypeEnhancingItem, }, [ITEM_POISON_BARB] = @@ -6812,6 +7680,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 70, + .iconPic = gItemIcon_PoisonBarb, + .iconPalette = gItemIconPalette_PoisonBarb, }, [ITEM_SOFT_SAND] = @@ -6829,6 +7699,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_SoftSand, + .iconPalette = gItemIconPalette_SoftSand, }, [ITEM_SHARP_BEAK] = @@ -6845,6 +7717,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 50, + .iconPic = gItemIcon_SharpBeak, + .iconPalette = gItemIconPalette_SharpBeak, }, [ITEM_TWISTED_SPOON] = @@ -6858,6 +7732,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_TwistedSpoon, + .iconPalette = gItemIconPalette_TwistedSpoon, }, [ITEM_SILVER_POWDER] = @@ -6875,6 +7751,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_SilverPowder, + .iconPalette = gItemIconPalette_SilverPowder, }, [ITEM_HARD_STONE] = @@ -6888,6 +7766,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_HardStone, + .iconPalette = gItemIconPalette_HardStone, }, [ITEM_SPELL_TAG] = @@ -6904,6 +7784,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_SpellTag, + .iconPalette = gItemIconPalette_SpellTag, }, [ITEM_DRAGON_FANG] = @@ -6920,6 +7802,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 70, + .iconPic = gItemIcon_DragonFang, + .iconPalette = gItemIconPalette_DragonFang, }, [ITEM_BLACK_GLASSES] = @@ -6937,6 +7821,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_BlackGlasses, + .iconPalette = gItemIconPalette_BlackTypeEnhancingItem, }, [ITEM_METAL_COAT] = @@ -6954,6 +7840,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_MetalCoat, + .iconPalette = gItemIconPalette_MetalCoat, }, // Choice Items @@ -6971,6 +7859,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_ChoiceBand, + .iconPalette = gItemIconPalette_ChoiceBand, }, [ITEM_CHOICE_SPECS] = @@ -6987,6 +7877,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_ChoiceSpecs, + .iconPalette = gItemIconPalette_ChoiceSpecs, }, [ITEM_CHOICE_SCARF] = @@ -7003,6 +7895,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_ChoiceScarf, + .iconPalette = gItemIconPalette_ChoiceScarf, }, // Status Orbs @@ -7020,6 +7914,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_FlameOrb, + .iconPalette = gItemIconPalette_FlameOrb, }, [ITEM_TOXIC_ORB] = @@ -7035,6 +7931,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_ToxicOrb, + .iconPalette = gItemIconPalette_ToxicOrb, }, // Weather Rocks @@ -7052,6 +7950,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconPic = gItemIcon_DampRock, + .iconPalette = gItemIconPalette_DampRock, }, [ITEM_HEAT_ROCK] = @@ -7067,6 +7967,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconPic = gItemIcon_HeatRock, + .iconPalette = gItemIconPalette_HeatRock, }, [ITEM_SMOOTH_ROCK] = @@ -7082,6 +7984,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_SmoothRock, + .iconPalette = gItemIconPalette_SmoothRock, }, [ITEM_ICY_ROCK] = @@ -7097,6 +8001,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 40, + .iconPic = gItemIcon_IcyRock, + .iconPalette = gItemIconPalette_IcyRock, }, // Terrain Seeds @@ -7115,6 +8021,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_ElectricSeed, + .iconPalette = gItemIconPalette_ElectricSeed, }, [ITEM_PSYCHIC_SEED] = @@ -7131,6 +8039,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_PsychicSeed, + .iconPalette = gItemIconPalette_PsychicSeed, }, [ITEM_MISTY_SEED] = @@ -7147,6 +8057,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_MistySeed, + .iconPalette = gItemIconPalette_MistySeed, }, [ITEM_GRASSY_SEED] = @@ -7163,6 +8075,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_GrassySeed, + .iconPalette = gItemIconPalette_GrassySeed, }, // Type-activated Stat Modifiers @@ -7181,6 +8095,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_AbsorbBulb, + .iconPalette = gItemIconPalette_AbsorbBulb, }, [ITEM_CELL_BATTERY] = @@ -7198,6 +8114,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_CellBattery, + .iconPalette = gItemIconPalette_CellBattery, }, [ITEM_LUMINOUS_MOSS] = @@ -7215,6 +8133,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_LuminousMoss, + .iconPalette = gItemIconPalette_LuminousMoss, }, [ITEM_SNOWBALL] = @@ -7231,6 +8151,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_Snowball, + .iconPalette = gItemIconPalette_Snowball, }, // Misc. Held Items @@ -7250,6 +8172,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_BrightPowder, + .iconPalette = gItemIconPalette_BrightPowder, }, [ITEM_WHITE_HERB] = @@ -7265,6 +8189,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_InBattleHerb, + .iconPalette = gItemIconPalette_WhiteHerb, }, [ITEM_EXP_SHARE] = @@ -7288,6 +8214,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_ExpShare, .flingPower = 30, + .iconPic = gItemIcon_ExpShare, + .iconPalette = gItemIconPalette_ExpShare, }, [ITEM_QUICK_CLAW] = @@ -7304,6 +8232,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_QuickClaw, + .iconPalette = gItemIconPalette_QuickClaw, }, [ITEM_SOOTHE_BELL] = @@ -7319,6 +8249,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_SootheBell, + .iconPalette = gItemIconPalette_SootheBell, }, [ITEM_MENTAL_HERB] = @@ -7340,6 +8272,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_InBattleHerb, + .iconPalette = gItemIconPalette_MentalHerb, }, [ITEM_KINGS_ROCK] = @@ -7354,6 +8288,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_KingsRock, + .iconPalette = gItemIconPalette_KingsRock, }, [ITEM_AMULET_COIN] = @@ -7366,6 +8302,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_AmuletCoin, + .iconPalette = gItemIconPalette_AmuletCoin, }, [ITEM_CLEANSE_TAG] = @@ -7378,6 +8316,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_CleanseTag, + .iconPalette = gItemIconPalette_CleanseTag, }, [ITEM_SMOKE_BALL] = @@ -7393,6 +8333,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_SmokeBall, + .iconPalette = gItemIconPalette_SmokeBall, }, [ITEM_FOCUS_BAND] = @@ -7409,6 +8351,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_FocusBand, + .iconPalette = gItemIconPalette_FocusBand, }, [ITEM_LUCKY_EGG] = @@ -7424,6 +8368,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_LuckyEgg, + .iconPalette = gItemIconPalette_LuckyEgg, }, [ITEM_SCOPE_LENS] = @@ -7440,6 +8386,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_ScopeLens, + .iconPalette = gItemIconPalette_ScopeLens, }, [ITEM_LEFTOVERS] = @@ -7457,6 +8405,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_Leftovers, + .iconPalette = gItemIconPalette_Leftovers, }, [ITEM_SHELL_BELL] = @@ -7473,6 +8423,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_ShellBell, + .iconPalette = gItemIconPalette_Shell, }, [ITEM_WIDE_LENS] = @@ -7490,6 +8442,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_WideLens, + .iconPalette = gItemIconPalette_WideLens, }, [ITEM_MUSCLE_BAND] = @@ -7506,6 +8460,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_MuscleBand, + .iconPalette = gItemIconPalette_MuscleBand, }, [ITEM_WISE_GLASSES] = @@ -7523,6 +8479,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_WiseGlasses, + .iconPalette = gItemIconPalette_WiseGlasses, }, [ITEM_EXPERT_BELT] = @@ -7539,6 +8497,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_ExpertBelt, + .iconPalette = gItemIconPalette_ExpertBelt, }, [ITEM_LIGHT_CLAY] = @@ -7555,6 +8515,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_LightClay, + .iconPalette = gItemIconPalette_LightClay, }, [ITEM_LIFE_ORB] = @@ -7570,6 +8532,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_LifeOrb, + .iconPalette = gItemIconPalette_LifeOrb, }, [ITEM_POWER_HERB] = @@ -7585,6 +8549,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_PowerHerb, + .iconPalette = gItemIconPalette_PowerHerb, }, [ITEM_FOCUS_SASH] = @@ -7601,6 +8567,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_FocusSash, + .iconPalette = gItemIconPalette_FocusSash, }, [ITEM_ZOOM_LENS] = @@ -7618,6 +8586,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_ZoomLens, + .iconPalette = gItemIconPalette_ZoomLens, }, [ITEM_METRONOME] = @@ -7634,6 +8604,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_Metronome, + .iconPalette = gItemIconPalette_Metronome, }, [ITEM_IRON_BALL] = @@ -7649,6 +8621,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 130, + .iconPic = gItemIcon_IronBall, + .iconPalette = gItemIconPalette_IronBall, }, [ITEM_LAGGING_TAIL] = @@ -7661,6 +8635,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_LaggingTail, + .iconPalette = gItemIconPalette_LaggingTail, }, [ITEM_DESTINY_KNOT] = @@ -7676,6 +8652,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_DestinyKnot, + .iconPalette = gItemIconPalette_DestinyKnot, }, [ITEM_BLACK_SLUDGE] = @@ -7692,6 +8670,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_BlackSludge, + .iconPalette = gItemIconPalette_BlackSludge, }, [ITEM_GRIP_CLAW] = @@ -7707,6 +8687,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 90, + .iconPic = gItemIcon_GripClaw, + .iconPalette = gItemIconPalette_GripClaw, }, [ITEM_STICKY_BARB] = @@ -7722,6 +8704,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_StickyBarb, + .iconPalette = gItemIconPalette_StickyBarb, }, [ITEM_SHED_SHELL] = @@ -7737,6 +8721,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_ShedShell, + .iconPalette = gItemIconPalette_ShedShell, }, [ITEM_BIG_ROOT] = @@ -7753,6 +8739,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_BigRoot, + .iconPalette = gItemIconPalette_BigRoot, }, [ITEM_RAZOR_CLAW] = @@ -7769,6 +8757,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconPic = gItemIcon_RazorClaw, + .iconPalette = gItemIconPalette_RazorClaw, }, [ITEM_RAZOR_FANG] = @@ -7783,6 +8773,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_RazorFang, + .iconPalette = gItemIconPalette_RazorFang, }, [ITEM_EVIOLITE] = @@ -7799,6 +8791,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 40, + .iconPic = gItemIcon_Eviolite, + .iconPalette = gItemIconPalette_Eviolite, }, [ITEM_FLOAT_STONE] = @@ -7814,6 +8808,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_FloatStone, + .iconPalette = gItemIconPalette_FloatStone, }, [ITEM_ROCKY_HELMET] = @@ -7830,6 +8826,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconPic = gItemIcon_RockyHelmet, + .iconPalette = gItemIconPalette_RockyHelmet, }, [ITEM_AIR_BALLOON] = @@ -7846,6 +8844,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_AirBalloon, + .iconPalette = gItemIconPalette_AirBalloon, }, [ITEM_RED_CARD] = @@ -7862,6 +8862,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_RedCard, + .iconPalette = gItemIconPalette_RedCard, }, [ITEM_RING_TARGET] = @@ -7878,6 +8880,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_RingTarget, + .iconPalette = gItemIconPalette_RingTarget, }, [ITEM_BINDING_BAND] = @@ -7893,6 +8897,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_BindingBand, + .iconPalette = gItemIconPalette_BindingBand, }, [ITEM_EJECT_BUTTON] = @@ -7909,12 +8915,14 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_EjectButton, + .iconPalette = gItemIconPalette_EjectButton, }, [ITEM_WEAKNESS_POLICY] = { - .name = _("WeaknssPolicy"), - .pluralName = _("WeaknssPolicies"), + .name = HANDLE_EXPANDED_ITEM_NAME("WeaknssPolicy", "Weakness Policy"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("WeaknssPolicies", "Weakness Policies"), .price = (I_PRICE >= GEN_9) ? 50000 : 1000, .holdEffect = HOLD_EFFECT_WEAKNESS_POLICY, .holdEffectParam = 0, @@ -7926,6 +8934,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_WeaknessPolicy, + .iconPalette = gItemIconPalette_WeaknessPolicy, }, [ITEM_ASSAULT_VEST] = @@ -7942,12 +8952,14 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_AssaultVest, + .iconPalette = gItemIconPalette_AssaultVest, }, [ITEM_SAFETY_GOGGLES] = { - .name = _("SafetyGoggles"), - .pluralName = _("SafetyGoggles"), + .name = HANDLE_EXPANDED_ITEM_NAME("SafetyGoggles", "Safety Goggles"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("SafetyGoggles", "Safety Goggles"), .price = (I_PRICE >= GEN_9) ? 20000 : ((I_PRICE >= GEN_7) ? 4000 : 1000), .holdEffect = HOLD_EFFECT_SAFETY_GOGGLES, .description = COMPOUND_STRING( @@ -7958,11 +8970,13 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_SafetyGoggles, + .iconPalette = gItemIconPalette_SafetyGoggles, }, [ITEM_ADRENALINE_ORB] = { - .name = _("AdrenalineOrb"), + .name = HANDLE_EXPANDED_ITEM_NAME("AdrenalineOrb", "Adrenaline Orb"), .price = (I_PRICE >= GEN_9) ? 5000 : ((I_PRICE >= GEN_8) ? 4000 : 300), .holdEffect = HOLD_EFFECT_ADRENALINE_ORB, .description = COMPOUND_STRING( @@ -7973,11 +8987,13 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_AdrenalineOrb, + .iconPalette = gItemIconPalette_AdrenalineOrb, }, [ITEM_TERRAIN_EXTENDER] = { - .name = _("TerainExtendr"), + .name = HANDLE_EXPANDED_ITEM_NAME("TerainExtendr", "Terrain Extender"), .price = (I_PRICE >= GEN_9) ? 15000 : 4000, .holdEffect = HOLD_EFFECT_TERRAIN_EXTENDER, .description = COMPOUND_STRING( @@ -7988,12 +9004,14 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconPic = gItemIcon_TerrainExtender, + .iconPalette = gItemIconPalette_TerrainExtender, }, [ITEM_PROTECTIVE_PADS] = { - .name = _("ProtectvePads"), - .pluralName = _("ProtectvePads"), + .name = HANDLE_EXPANDED_ITEM_NAME("ProtectvePads", "Protective Pads"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("ProtectvePads", "Protective Pads"), .price = (I_PRICE >= GEN_9) ? 15000 : 4000, .holdEffect = HOLD_EFFECT_PROTECTIVE_PADS, .description = COMPOUND_STRING( @@ -8004,6 +9022,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_ProtectivePads, + .iconPalette = gItemIconPalette_ProtectivePads, }, [ITEM_THROAT_SPRAY] = @@ -8019,6 +9039,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_ThroatSpray, + .iconPalette = gItemIconPalette_ThroatSpray, }, [ITEM_EJECT_PACK] = @@ -8034,12 +9056,14 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 50, + .iconPic = gItemIcon_EjectPack, + .iconPalette = gItemIconPalette_EjectPack, }, [ITEM_HEAVY_DUTY_BOOTS] = { - .name = _("Heavy-DtyBts"), - .pluralName = _("Heavy-DtyBts"), + .name = HANDLE_EXPANDED_ITEM_NAME("Heavy-DtyBts", "Heavy-Duty Boots"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("Heavy-DtyBts", "Heavy-Duty Boots"), .price = (I_PRICE >= GEN_9) ? 20000 : 4000, .holdEffect = HOLD_EFFECT_HEAVY_DUTY_BOOTS, .description = COMPOUND_STRING( @@ -8050,12 +9074,14 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_HeavyDutyBoots, + .iconPalette = gItemIconPalette_HeavyDutyBoots, }, [ITEM_BLUNDER_POLICY] = { - .name = _("BlundrPolicy"), - .pluralName = _("BlundrPolicies"), + .name = HANDLE_EXPANDED_ITEM_NAME("BlundrPolicy", "Blunder Policy"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("BlundrPolicies", "Blunder Policies"), .price = (I_PRICE >= GEN_9) ? 30000 : 4000, .holdEffect = HOLD_EFFECT_BLUNDER_POLICY, .description = COMPOUND_STRING( @@ -8066,6 +9092,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconPic = gItemIcon_BlunderPolicy, + .iconPalette = gItemIconPalette_BlunderPolicy, }, [ITEM_ROOM_SERVICE] = @@ -8081,11 +9109,13 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconPic = gItemIcon_RoomService, + .iconPalette = gItemIconPalette_RoomService, }, [ITEM_UTILITY_UMBRELLA] = { - .name = _("UtltyUmbrlla"), + .name = HANDLE_EXPANDED_ITEM_NAME("UtltyUmbrlla", "Utility Umbrella"), .price = (I_PRICE >= GEN_9) ? 15000 : 4000, .holdEffect = HOLD_EFFECT_UTILITY_UMBRELLA, .description = COMPOUND_STRING( @@ -8096,6 +9126,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconPic = gItemIcon_UtilityUmbrella, + .iconPalette = gItemIconPalette_UtilityUmbrella, }, // Berries @@ -8116,6 +9148,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_ParalyzeHeal, .flingPower = 10, + .iconPic = gItemIcon_CheriBerry, + .iconPalette = gItemIconPalette_CheriBerry, }, [ITEM_CHESTO_BERRY] = @@ -8134,13 +9168,15 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_Awakening, .flingPower = 10, + .iconPic = gItemIcon_ChestoBerry, + .iconPalette = gItemIconPalette_ChestoBerry, }, [ITEM_PECHA_BERRY] = { .name = _("Pecha Berry"), .pluralName = _("Pecha Berries"), - .price = (I_BERRY_PRICE >= GEN_8) ? 2 : 2, + .price = (I_BERRY_PRICE >= GEN_8) ? 80 : 20, .holdEffect = HOLD_EFFECT_CURE_PSN, .description = COMPOUND_STRING( "A hold item that " @@ -8152,6 +9188,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_Antidote, .flingPower = 10, + .iconPic = gItemIcon_PechaBerry, + .iconPalette = gItemIconPalette_PechaBerry, }, [ITEM_RAWST_BERRY] = @@ -8170,6 +9208,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_BurnHeal, .flingPower = 10, + .iconPic = gItemIcon_RawstBerry, + .iconPalette = gItemIconPalette_RawstBerry, }, [ITEM_ASPEAR_BERRY] = @@ -8188,13 +9228,15 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_IceHeal, .flingPower = 10, + .iconPic = gItemIcon_AspearBerry, + .iconPalette = gItemIconPalette_AspearBerry, }, [ITEM_LEPPA_BERRY] = { .name = _("Leppa Berry"), .pluralName = _("Leppa Berries"), - .price = (I_BERRY_PRICE >= GEN_8) ? 2 : 2, + .price = (I_BERRY_PRICE >= GEN_8) ? 80 : 20, .holdEffect = HOLD_EFFECT_RESTORE_PP, .holdEffectParam = 10, .description = COMPOUND_STRING( @@ -8207,6 +9249,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_PP, .effect = gItemEffect_LeppaBerry, .flingPower = 10, + .iconPic = gItemIcon_LeppaBerry, + .iconPalette = gItemIconPalette_LeppaBerry, }, [ITEM_ORAN_BERRY] = @@ -8226,6 +9270,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_OranBerry, .flingPower = 10, + .iconPic = gItemIcon_OranBerry, + .iconPalette = gItemIconPalette_OranBerry, }, [ITEM_PERSIM_BERRY] = @@ -8244,6 +9290,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_PersimBerry, .flingPower = 10, + .iconPic = gItemIcon_PersimBerry, + .iconPalette = gItemIconPalette_PersimBerry, }, [ITEM_LUM_BERRY] = @@ -8262,6 +9310,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 10, + .iconPic = gItemIcon_LumBerry, + .iconPalette = gItemIconPalette_LumBerry, }, [ITEM_SITRUS_BERRY] = @@ -8290,6 +9340,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_SitrusBerry, .flingPower = 10, + .iconPic = gItemIcon_SitrusBerry, + .iconPalette = gItemIconPalette_SitrusBerry, }, [ITEM_FIGY_BERRY] = @@ -8304,6 +9356,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_FigyBerry, + .iconPalette = gItemIconPalette_FigyBerry, }, [ITEM_WIKI_BERRY] = @@ -8318,6 +9372,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_WikiBerry, + .iconPalette = gItemIconPalette_WikiBerry, }, [ITEM_MAGO_BERRY] = @@ -8332,6 +9388,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_MagoBerry, + .iconPalette = gItemIconPalette_MagoBerry, }, [ITEM_AGUAV_BERRY] = @@ -8346,6 +9404,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_AguavBerry, + .iconPalette = gItemIconPalette_AguavBerry, }, [ITEM_IAPAPA_BERRY] = @@ -8360,6 +9420,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_IapapaBerry, + .iconPalette = gItemIconPalette_IapapaBerry, }, [ITEM_RAZZ_BERRY] = @@ -8375,6 +9437,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_RazzBerry, + .iconPalette = gItemIconPalette_RazzBerry, }, [ITEM_BLUK_BERRY] = @@ -8390,6 +9454,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_BlukBerry, + .iconPalette = gItemIconPalette_BlukBerry, }, [ITEM_NANAB_BERRY] = @@ -8405,6 +9471,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_NanabBerry, + .iconPalette = gItemIconPalette_NanabBerry, }, [ITEM_WEPEAR_BERRY] = @@ -8420,6 +9488,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_WepearBerry, + .iconPalette = gItemIconPalette_WepearBerry, }, [ITEM_PINAP_BERRY] = @@ -8435,6 +9505,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_PinapBerry, + .iconPalette = gItemIconPalette_PinapBerry, }, [ITEM_POMEG_BERRY] = @@ -8451,6 +9523,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_PomegBerry, .flingPower = 10, + .iconPic = gItemIcon_PomegBerry, + .iconPalette = gItemIconPalette_PomegBerry, }, [ITEM_KELPSY_BERRY] = @@ -8467,6 +9541,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_KelpsyBerry, .flingPower = 10, + .iconPic = gItemIcon_KelpsyBerry, + .iconPalette = gItemIconPalette_KelpsyBerry, }, [ITEM_QUALOT_BERRY] = @@ -8483,6 +9559,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_QualotBerry, .flingPower = 10, + .iconPic = gItemIcon_QualotBerry, + .iconPalette = gItemIconPalette_QualotBerry, }, [ITEM_HONDEW_BERRY] = @@ -8499,6 +9577,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_HondewBerry, .flingPower = 10, + .iconPic = gItemIcon_HondewBerry, + .iconPalette = gItemIconPalette_HondewBerry, }, [ITEM_GREPA_BERRY] = @@ -8515,6 +9595,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_GrepaBerry, .flingPower = 10, + .iconPic = gItemIcon_GrepaBerry, + .iconPalette = gItemIconPalette_GrepaBerry, }, [ITEM_TAMATO_BERRY] = @@ -8531,6 +9613,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_TamatoBerry, .flingPower = 10, + .iconPic = gItemIcon_TamatoBerry, + .iconPalette = gItemIconPalette_TamatoBerry, }, [ITEM_CORNN_BERRY] = @@ -8546,6 +9630,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_CornnBerry, + .iconPalette = gItemIconPalette_CornnBerry, }, [ITEM_MAGOST_BERRY] = @@ -8561,6 +9647,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_MagostBerry, + .iconPalette = gItemIconPalette_MagostBerry, }, [ITEM_RABUTA_BERRY] = @@ -8576,6 +9664,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_RabutaBerry, + .iconPalette = gItemIconPalette_RabutaBerry, }, [ITEM_NOMEL_BERRY] = @@ -8591,6 +9681,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_NomelBerry, + .iconPalette = gItemIconPalette_NomelBerry, }, [ITEM_SPELON_BERRY] = @@ -8606,6 +9698,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_SpelonBerry, + .iconPalette = gItemIconPalette_SpelonBerry, }, [ITEM_PAMTRE_BERRY] = @@ -8621,6 +9715,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_PamtreBerry, + .iconPalette = gItemIconPalette_PamtreBerry, }, [ITEM_WATMEL_BERRY] = @@ -8636,6 +9732,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_WatmelBerry, + .iconPalette = gItemIconPalette_WatmelBerry, }, [ITEM_DURIN_BERRY] = @@ -8651,6 +9749,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_DurinBerry, + .iconPalette = gItemIconPalette_DurinBerry, }, [ITEM_BELUE_BERRY] = @@ -8666,6 +9766,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_BelueBerry, + .iconPalette = gItemIconPalette_BelueBerry, }, [ITEM_CHILAN_BERRY] = @@ -8683,6 +9785,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_ChilanBerry, + .iconPalette = gItemIconPalette_ChilanBerry, }, [ITEM_OCCA_BERRY] = @@ -8700,6 +9804,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_OccaBerry, + .iconPalette = gItemIconPalette_OccaBerry, }, [ITEM_PASSHO_BERRY] = @@ -8717,6 +9823,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_PasshoBerry, + .iconPalette = gItemIconPalette_PasshoBerry, }, [ITEM_WACAN_BERRY] = @@ -8734,6 +9842,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_WacanBerry, + .iconPalette = gItemIconPalette_WacanBerry, }, [ITEM_RINDO_BERRY] = @@ -8751,6 +9861,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_RindoBerry, + .iconPalette = gItemIconPalette_RindoBerry, }, [ITEM_YACHE_BERRY] = @@ -8768,6 +9880,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_YacheBerry, + .iconPalette = gItemIconPalette_YacheBerry, }, [ITEM_CHOPLE_BERRY] = @@ -8785,6 +9899,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_ChopleBerry, + .iconPalette = gItemIconPalette_ChopleBerry, }, [ITEM_KEBIA_BERRY] = @@ -8802,6 +9918,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_KebiaBerry, + .iconPalette = gItemIconPalette_KebiaBerry, }, [ITEM_SHUCA_BERRY] = @@ -8819,6 +9937,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_ShucaBerry, + .iconPalette = gItemIconPalette_ShucaBerry, }, [ITEM_COBA_BERRY] = @@ -8836,6 +9956,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_CobaBerry, + .iconPalette = gItemIconPalette_CobaBerry, }, [ITEM_PAYAPA_BERRY] = @@ -8853,6 +9975,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_PayapaBerry, + .iconPalette = gItemIconPalette_PayapaBerry, }, [ITEM_TANGA_BERRY] = @@ -8870,6 +9994,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_TangaBerry, + .iconPalette = gItemIconPalette_TangaBerry, }, [ITEM_CHARTI_BERRY] = @@ -8887,6 +10013,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_ChartiBerry, + .iconPalette = gItemIconPalette_ChartiBerry, }, [ITEM_KASIB_BERRY] = @@ -8904,6 +10032,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_KasibBerry, + .iconPalette = gItemIconPalette_KasibBerry, }, [ITEM_HABAN_BERRY] = @@ -8921,6 +10051,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_HabanBerry, + .iconPalette = gItemIconPalette_HabanBerry, }, [ITEM_COLBUR_BERRY] = @@ -8938,6 +10070,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_ColburBerry, + .iconPalette = gItemIconPalette_ColburBerry, }, [ITEM_BABIRI_BERRY] = @@ -8955,6 +10089,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_BabiriBerry, + .iconPalette = gItemIconPalette_BabiriBerry, }, [ITEM_ROSELI_BERRY] = @@ -8972,6 +10108,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_RoseliBerry, + .iconPalette = gItemIconPalette_RoseliBerry, }, [ITEM_LIECHI_BERRY] = @@ -8989,6 +10127,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_LiechiBerry, + .iconPalette = gItemIconPalette_LiechiBerry, }, [ITEM_GANLON_BERRY] = @@ -9006,6 +10146,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_GanlonBerry, + .iconPalette = gItemIconPalette_GanlonBerry, }, [ITEM_SALAC_BERRY] = @@ -9023,6 +10165,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_SalacBerry, + .iconPalette = gItemIconPalette_SalacBerry, }, [ITEM_PETAYA_BERRY] = @@ -9040,6 +10184,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_PetayaBerry, + .iconPalette = gItemIconPalette_PetayaBerry, }, [ITEM_APICOT_BERRY] = @@ -9057,6 +10203,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_ApicotBerry, + .iconPalette = gItemIconPalette_ApicotBerry, }, [ITEM_LANSAT_BERRY] = @@ -9068,12 +10216,14 @@ const struct Item gItemsInfo[] = .holdEffectParam = 4, .description = COMPOUND_STRING( "A hold item that " - "ups the\ncritical" + "ups the\ncritical-" "hit rate in a pinch."), .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_LansatBerry, + .iconPalette = gItemIconPalette_LansatBerry, }, [ITEM_STARF_BERRY] = @@ -9091,6 +10241,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_StarfBerry, + .iconPalette = gItemIconPalette_StarfBerry, }, [ITEM_ENIGMA_BERRY] = @@ -9107,6 +10259,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_EnigmaBerry, + .iconPalette = gItemIconPalette_EnigmaBerry, }, [ITEM_MICLE_BERRY] = @@ -9124,6 +10278,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_MicleBerry, + .iconPalette = gItemIconPalette_MicleBerry, }, [ITEM_CUSTAP_BERRY] = @@ -9141,6 +10297,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_CustapBerry, + .iconPalette = gItemIconPalette_CustapBerry, }, [ITEM_JABOCA_BERRY] = @@ -9157,6 +10315,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_JabocaBerry, + .iconPalette = gItemIconPalette_JabocaBerry, }, [ITEM_ROWAP_BERRY] = @@ -9173,6 +10333,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_RowapBerry, + .iconPalette = gItemIconPalette_RowapBerry, }, [ITEM_KEE_BERRY] = @@ -9189,6 +10351,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_KeeBerry, + .iconPalette = gItemIconPalette_KeeBerry, }, [ITEM_MARANGA_BERRY] = @@ -9205,6 +10369,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_MarangaBerry, + .iconPalette = gItemIconPalette_MarangaBerry, }, [ITEM_ENIGMA_BERRY_E_READER] = @@ -9221,6 +10387,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EnigmaBerry, .battleUsage = EFFECT_ITEM_ENIGMA_BERRY_EREADER, .flingPower = 10, + .iconPic = gItemIcon_EnigmaBerry, + .iconPalette = gItemIconPalette_EnigmaBerry, }, // TMs/HMs. They don't have a set flingPower, as that's handled by GetFlingPowerFromItemId. @@ -9243,7 +10411,7 @@ const struct Item gItemsInfo[] = [ITEM_TM02] = { .name = _("TM02"), - .price = 10000, + .price = 3000, .description = COMPOUND_STRING( "Hooks and slashes " "the foe with\nlong, " @@ -9363,7 +10531,7 @@ const struct Item gItemsInfo[] = [ITEM_TM10] = { .name = _("TM10"), - .price = 10000, + .price = 3000, .description = COMPOUND_STRING( "The attack power " "varies among " @@ -9408,12 +10576,12 @@ const struct Item gItemsInfo[] = [ITEM_TM13] = { .name = _("TM13"), - .price = 2, + .price = 3000, .description = COMPOUND_STRING( "Fires an icy cold " "beam that may " #if B_USE_FROSTBITE == TRUE - "\ngive the foe frostbite."), + "\ninflict frostbite."), #else "\nfreeze the foe."), #endif @@ -9429,11 +10597,13 @@ const struct Item gItemsInfo[] = .name = _("TM14"), .price = 5500, .description = COMPOUND_STRING( - "A brutal snow-and" - "wind attack\nthat " #if B_USE_FROSTBITE == TRUE - "may give the foe frostbite."), + "A snow-and-wind " + "attack that may " + "\ninflict frostbite."), #else + "A brutal snow-and-" + "wind attack\nthat " "may freeze the foe."), #endif .importance = I_REUSABLE_TMS, @@ -9928,7 +11098,7 @@ const struct Item gItemsInfo[] = .name = _("TM47"), .price = 3000, .description = COMPOUND_STRING( - "Spreads hard" + "Spreads hard-" "edged wings and " "\nslams into the foe."), .importance = I_REUSABLE_TMS, @@ -9983,605 +11153,605 @@ const struct Item gItemsInfo[] = .secondaryId = MOVE_OVERHEAT, }, - // [ITEM_TM51] = - // { - // .name = _("TM51"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM51] = + { + .name = _("TM51"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM52] = - // { - // .name = _("TM52"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM52] = + { + .name = _("TM52"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM53] = - // { - // .name = _("TM53"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM53] = + { + .name = _("TM53"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM54] = - // { - // .name = _("TM54"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM54] = + { + .name = _("TM54"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM55] = - // { - // .name = _("TM55"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM55] = + { + .name = _("TM55"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM56] = - // { - // .name = _("TM56"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM56] = + { + .name = _("TM56"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM57] = - // { - // .name = _("TM57"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM57] = + { + .name = _("TM57"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM58] = - // { - // .name = _("TM58"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM58] = + { + .name = _("TM58"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM59] = - // { - // .name = _("TM59"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM59] = + { + .name = _("TM59"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM60] = - // { - // .name = _("TM60"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM60] = + { + .name = _("TM60"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM61] = - // { - // .name = _("TM61"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM61] = + { + .name = _("TM61"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM62] = - // { - // .name = _("TM62"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM62] = + { + .name = _("TM62"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM63] = - // { - // .name = _("TM63"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM63] = + { + .name = _("TM63"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM64] = - // { - // .name = _("TM64"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM64] = + { + .name = _("TM64"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM65] = - // { - // .name = _("TM65"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM65] = + { + .name = _("TM65"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM66] = - // { - // .name = _("TM66"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM66] = + { + .name = _("TM66"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM67] = - // { - // .name = _("TM67"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM67] = + { + .name = _("TM67"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM68] = - // { - // .name = _("TM68"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM68] = + { + .name = _("TM68"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM69] = - // { - // .name = _("TM69"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM69] = + { + .name = _("TM69"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM70] = - // { - // .name = _("TM70"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM70] = + { + .name = _("TM70"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM71] = - // { - // .name = _("TM71"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM71] = + { + .name = _("TM71"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM72] = - // { - // .name = _("TM72"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM72] = + { + .name = _("TM72"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM73] = - // { - // .name = _("TM73"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM73] = + { + .name = _("TM73"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM74] = - // { - // .name = _("TM74"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM74] = + { + .name = _("TM74"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM75] = - // { - // .name = _("TM75"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM75] = + { + .name = _("TM75"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM76] = - // { - // .name = _("TM76"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM76] = + { + .name = _("TM76"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM77] = - // { - // .name = _("TM77"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM77] = + { + .name = _("TM77"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM78] = - // { - // .name = _("TM78"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM78] = + { + .name = _("TM78"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM79] = - // { - // .name = _("TM79"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM79] = + { + .name = _("TM79"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM80] = - // { - // .name = _("TM80"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM80] = + { + .name = _("TM80"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM81] = - // { - // .name = _("TM81"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM81] = + { + .name = _("TM81"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM82] = - // { - // .name = _("TM82"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM82] = + { + .name = _("TM82"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM83] = - // { - // .name = _("TM83"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM83] = + { + .name = _("TM83"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM84] = - // { - // .name = _("TM84"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM84] = + { + .name = _("TM84"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM85] = - // { - // .name = _("TM85"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM85] = + { + .name = _("TM85"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM86] = - // { - // .name = _("TM86"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM86] = + { + .name = _("TM86"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM87] = - // { - // .name = _("TM87"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM87] = + { + .name = _("TM87"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM88] = - // { - // .name = _("TM88"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM88] = + { + .name = _("TM88"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM89] = - // { - // .name = _("TM89"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM89] = + { + .name = _("TM89"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM90] = - // { - // .name = _("TM90"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM90] = + { + .name = _("TM90"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM91] = - // { - // .name = _("TM91"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM91] = + { + .name = _("TM91"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM92] = - // { - // .name = _("TM92"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM92] = + { + .name = _("TM92"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM93] = - // { - // .name = _("TM93"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM93] = + { + .name = _("TM93"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM94] = - // { - // .name = _("TM94"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM94] = + { + .name = _("TM94"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM95] = - // { - // .name = _("TM95"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM95] = + { + .name = _("TM95"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM96] = - // { - // .name = _("TM96"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM96] = + { + .name = _("TM96"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM97] = - // { - // .name = _("TM97"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM97] = + { + .name = _("TM97"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM98] = - // { - // .name = _("TM98"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM98] = + { + .name = _("TM98"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM99] = - // { - // .name = _("TM99"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM99] = + { + .name = _("TM99"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, - // [ITEM_TM100] = - // { - // .name = _("TM100"), - // .price = 3000, - // .description = sQuestionMarksDesc, // Todo - // .importance = I_REUSABLE_TMS, - // .pocket = POCKET_TM_HM, - // .type = ITEM_USE_PARTY_MENU, - // .fieldUseFunc = NULL, - // .secondaryId = MOVE_NONE, // Todo - // }, + [ITEM_TM100] = + { + .name = _("TM100"), + .price = 3000, + .description = sQuestionMarksDesc, // Todo + .importance = I_REUSABLE_TMS, + .pocket = POCKET_TM_HM, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = NULL, + .secondaryId = MOVE_NONE, // Todo + }, [ITEM_HM01] = { @@ -10718,6 +11888,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_OvalCharm, + .iconPalette = gItemIconPalette_OvalCharm, }, [ITEM_SHINY_CHARM] = @@ -10732,11 +11904,13 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_ShinyCharm, + .iconPalette = gItemIconPalette_ShinyCharm, }, [ITEM_CATCHING_CHARM] = { - .name = _("CatchngCharm"), + .name = HANDLE_EXPANDED_ITEM_NAME("CatchngCharm", "Catching Charm"), .price = 0, .importance = 1, .description = COMPOUND_STRING( @@ -10746,6 +11920,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_CatchingCharm, + .iconPalette = gItemIconPalette_CatchingCharm, }, [ITEM_EXP_CHARM] = @@ -10760,22 +11936,26 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_ExpCharm, + .iconPalette = gItemIconPalette_ExpCharm, }, // Form-changing Key Items [ITEM_ROTOM_CATALOG] = { - .name = _("RotomCatalog"), + .name = HANDLE_EXPANDED_ITEM_NAME("RotomCatalog", "Rotom Catalog"), .price = 0, .importance = 1, .description = COMPOUND_STRING( "A catalog full of " - "deviced liked\nby " + "devices liked\nby " "Rotom."), .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_RotomCatalog, + .iconPic = gItemIcon_RotomCatalog, + .iconPalette = gItemIconPalette_RotomCatalog, }, [ITEM_GRACIDEA] = @@ -10790,6 +11970,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .iconPic = gItemIcon_Gracidea, + .iconPalette = gItemIconPalette_Gracidea, }, [ITEM_REVEAL_GLASS] = @@ -10805,6 +11987,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .iconPic = gItemIcon_RevealGlass, + .iconPalette = gItemIconPalette_RevealGlass, }, [ITEM_DNA_SPLICERS] = @@ -10820,6 +12004,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Fusion, + .iconPic = gItemIcon_DNASplicers, + .iconPalette = gItemIconPalette_DNASplicers, }, [ITEM_ZYGARDE_CUBE] = @@ -10834,6 +12020,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ZygardeCube, + .iconPic = gItemIcon_ZygardeCube, + .iconPalette = gItemIconPalette_ZygardeCube, }, [ITEM_PRISON_BOTTLE] = @@ -10848,6 +12036,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .iconPic = gItemIcon_PrisonBottle, + .iconPalette = gItemIconPalette_PrisonBottle, }, [ITEM_N_SOLARIZER] = @@ -10862,6 +12052,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Fusion, + .iconPic = gItemIcon_NecrozmaFuser, + .iconPalette = gItemIconPalette_NSolarizer, }, [ITEM_N_LUNARIZER] = @@ -10876,12 +12068,14 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Fusion, + .iconPic = gItemIcon_NecrozmaFuser, + .iconPalette = gItemIconPalette_NLunarizer, }, [ITEM_REINS_OF_UNITY] = { - .name = _("ReinsOfUnity"), - .pluralName = _("ReinsOfUnity"), + .name = HANDLE_EXPANDED_ITEM_NAME("ReinsOfUnity", "Reins of Unity"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("ReinsOfUnity", "Reins of Unity"), .price = 0, .importance = 1, .description = COMPOUND_STRING( @@ -10891,6 +12085,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Fusion, + .iconPic = gItemIcon_ReinsOfUnity, + .iconPalette = gItemIconPalette_ReinsOfUnity, }, // Battle Mechanic Key Items @@ -10898,7 +12094,7 @@ const struct Item gItemsInfo[] = [ITEM_MEGA_RING] = { .name = _("Mega Ring"), - .price = 2, + .price = 0, .importance = 1, .description = COMPOUND_STRING( "Enables {PKMN} holding " @@ -10907,6 +12103,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_MegaRing, + .iconPalette = gItemIconPalette_MegaRing, }, [ITEM_Z_POWER_RING] = @@ -10921,6 +12119,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_ZPowerRing, + .iconPalette = gItemIconPalette_ZPowerRing, }, [ITEM_DYNAMAX_BAND] = @@ -10934,6 +12134,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_DynamaxBand, + .iconPalette = gItemIconPalette_DynamaxBand, }, // Misc. Key Items @@ -10949,7 +12151,9 @@ const struct Item gItemsInfo[] = .importance = 1, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_FIELD, - .fieldUseFunc = ItemUseOutOfBattle_Bike, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_Bicycle, + .iconPalette = gItemIconPalette_Bicycle, }, [ITEM_MACH_BIKE] = @@ -10965,6 +12169,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Bike, .secondaryId = MACH_BIKE, + .iconPic = gItemIcon_MachBike, + .iconPalette = gItemIconPalette_MachBike, }, [ITEM_ACRO_BIKE] = @@ -10980,6 +12186,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Bike, .secondaryId = ACRO_BIKE, + .iconPic = gItemIcon_AcroBike, + .iconPalette = gItemIconPalette_AcroBike, }, [ITEM_OLD_ROD] = @@ -10995,6 +12203,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Rod, .secondaryId = OLD_ROD, + .iconPic = gItemIcon_OldRod, + .iconPalette = gItemIconPalette_OldRod, }, [ITEM_GOOD_ROD] = @@ -11010,6 +12220,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Rod, .secondaryId = GOOD_ROD, + .iconPic = gItemIcon_GoodRod, + .iconPalette = gItemIconPalette_GoodRod, }, [ITEM_SUPER_ROD] = @@ -11025,6 +12237,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Rod, .secondaryId = SUPER_ROD, + .iconPic = gItemIcon_SuperRod, + .iconPalette = gItemIconPalette_SuperRod, }, [ITEM_DOWSING_MACHINE] = @@ -11039,6 +12253,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Itemfinder, + .iconPic = gItemIcon_DowsingMachine, + .iconPalette = gItemIconPalette_DowsingMachine, }, [ITEM_TOWN_MAP] = @@ -11052,7 +12268,9 @@ const struct Item gItemsInfo[] = .importance = 1, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_TownMap, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TownMap, + .iconPalette = gItemIconPalette_TownMap, }, [ITEM_VS_SEEKER] = @@ -11061,7 +12279,7 @@ const struct Item gItemsInfo[] = .price = 0, .description = COMPOUND_STRING( "A rechargeable unit " - "that flags\nbattle" + "that flags\nbattle-" "ready Trainers."), .importance = 1, .pocket = POCKET_KEY_ITEMS, @@ -11071,6 +12289,8 @@ const struct Item gItemsInfo[] = #else .fieldUseFunc = ItemUseOutOfBattle_CannotUse, #endif + .iconPic = gItemIcon_VsSeeker, + .iconPalette = gItemIconPalette_VsSeeker, }, [ITEM_TM_CASE] = @@ -11085,6 +12305,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_TmCase, + .iconPic = gItemIcon_TMCase, + .iconPalette = gItemIconPalette_TMCase, }, [ITEM_BERRY_POUCH] = @@ -11099,8 +12321,9 @@ const struct Item gItemsInfo[] = .importance = 1, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, - .battleUsage = EFFECT_ITEM_OPEN_BERRY_POUCH, .fieldUseFunc = ItemUseOutOfBattle_BerryPouch, + .iconPic = gItemIcon_BerryPouch, + .iconPalette = gItemIconPalette_BerryPouch, }, [ITEM_POKEMON_BOX_LINK] = @@ -11115,6 +12338,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_PokemonBoxLink, + .iconPic = gItemIcon_PokemonBoxLink, + .iconPalette = gItemIconPalette_PokemonBoxLink, }, [ITEM_COIN_CASE] = @@ -11128,6 +12353,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CoinCase, + .iconPic = gItemIcon_CoinCase, + .iconPalette = gItemIconPalette_CoinCase, }, [ITEM_POWDER_JAR] = @@ -11142,6 +12369,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_PowderJar, + .iconPic = gItemIcon_PowderJar, + .iconPalette = gItemIconPalette_PowderJar, }, [ITEM_WAILMER_PAIL] = @@ -11156,6 +12385,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_WailmerPail, + .iconPalette = gItemIconPalette_WailmerPail, }, [ITEM_POKE_RADAR] = @@ -11170,6 +12401,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .iconPic = gItemIcon_PokeRadar, + .iconPalette = gItemIconPalette_PokeRadar, }, [ITEM_POKEBLOCK_CASE] = @@ -11184,6 +12417,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_UNUSED, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_PokeblockCase, + .iconPalette = gItemIconPalette_PokeblockCase, }, [ITEM_SOOT_SACK] = @@ -11198,6 +12433,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_SootSack, + .iconPalette = gItemIconPalette_SootSack, }, [ITEM_POKE_FLUTE] = @@ -11211,7 +12448,9 @@ const struct Item gItemsInfo[] = .importance = 1, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_PokeFlute, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_PokeFlute, + .iconPalette = gItemIconPalette_PokeFlute, }, [ITEM_FAME_CHECKER] = @@ -11225,7 +12464,9 @@ const struct Item gItemsInfo[] = .importance = 1, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_FameChecker, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_FameChecker, + .iconPalette = gItemIconPalette_FameChecker, }, [ITEM_TEACHY_TV] = @@ -11239,7 +12480,9 @@ const struct Item gItemsInfo[] = .importance = 1, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_FIELD, - .fieldUseFunc = ItemUseOutOfBattle_TeachyTv, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeachyTV, + .iconPalette = gItemIconPalette_TeachyTV, }, // Story Key Items @@ -11256,6 +12499,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_SSTicket, + .iconPalette = gItemIconPalette_SSTicket, }, [ITEM_EON_TICKET] = @@ -11271,6 +12516,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = 1, + .iconPic = gItemIcon_EonTicket, + .iconPalette = gItemIconPalette_EonTicket, }, [ITEM_MYSTIC_TICKET] = @@ -11285,6 +12532,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_MysticTicket, + .iconPalette = gItemIconPalette_MysticTicket, }, [ITEM_AURORA_TICKET] = @@ -11299,6 +12548,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_AuroraTicket, + .iconPalette = gItemIconPalette_AuroraTicket, }, [ITEM_OLD_SEA_MAP] = @@ -11313,6 +12564,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_OldSeaMap, + .iconPalette = gItemIconPalette_OldSeaMap, }, [ITEM_LETTER] = @@ -11327,6 +12580,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_Letter, + .iconPalette = gItemIconPalette_LavaCookieAndLetter, }, [ITEM_DEVON_PARTS] = @@ -11342,6 +12597,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_DevonParts, + .iconPalette = gItemIconPalette_DevonParts, }, [ITEM_GO_GOGGLES] = @@ -11357,6 +12614,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_GoGoggles, + .iconPalette = gItemIconPalette_GoGoggles, }, [ITEM_DEVON_SCOPE] = @@ -11371,6 +12630,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_DevonScope, + .iconPalette = gItemIconPalette_DevonScope, }, [ITEM_BASEMENT_KEY] = @@ -11385,6 +12646,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_BasementKey, + .iconPalette = gItemIconPalette_OldKey, }, [ITEM_SCANNER] = @@ -11399,6 +12662,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_Scanner, + .iconPalette = gItemIconPalette_Scanner, }, [ITEM_STORAGE_KEY] = @@ -11413,6 +12678,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_StorageKey, + .iconPalette = gItemIconPalette_OldKey, }, [ITEM_KEY_TO_ROOM_1] = @@ -11425,6 +12692,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_KeyToRoom1, + .iconPalette = gItemIconPalette_Key, }, [ITEM_KEY_TO_ROOM_2] = @@ -11437,6 +12706,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_KeyToRoom2, + .iconPalette = gItemIconPalette_Key, }, [ITEM_KEY_TO_ROOM_4] = @@ -11449,6 +12720,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_KeyToRoom4, + .iconPalette = gItemIconPalette_Key, }, [ITEM_KEY_TO_ROOM_6] = @@ -11461,6 +12734,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_KeyToRoom6, + .iconPalette = gItemIconPalette_Key, }, [ITEM_METEORITE] = @@ -11474,6 +12749,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .iconPic = gItemIcon_Meteorite, + .iconPalette = gItemIconPalette_Meteorite, }, [ITEM_MAGMA_EMBLEM] = @@ -11488,6 +12765,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_MagmaEmblem, + .iconPalette = gItemIconPalette_MagmaEmblem, }, [ITEM_CONTEST_PASS] = @@ -11503,6 +12782,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_ContestPass, + .iconPalette = gItemIconPalette_ContestPass, }, [ITEM_PARCEL] = @@ -11517,6 +12798,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_Parcel, + .iconPalette = gItemIconPalette_Parcel, }, [ITEM_SECRET_KEY] = @@ -11531,6 +12814,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_SecretKey, + .iconPalette = gItemIconPalette_SecretKey, }, [ITEM_BIKE_VOUCHER] = @@ -11545,6 +12830,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_BikeVoucher, + .iconPalette = gItemIconPalette_BikeVoucher, }, [ITEM_GOLD_TEETH] = @@ -11560,6 +12847,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_GoldTeeth, + .iconPalette = gItemIconPalette_GoldTeeth, }, [ITEM_CARD_KEY] = @@ -11574,6 +12863,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_CardKey, + .iconPalette = gItemIconPalette_CardKey, }, [ITEM_LIFT_KEY] = @@ -11588,6 +12879,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_LiftKey, + .iconPalette = gItemIconPalette_Key, }, [ITEM_SILPH_SCOPE] = @@ -11602,6 +12895,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_SilphScope, + .iconPalette = gItemIconPalette_SilphScope, }, [ITEM_TRI_PASS] = @@ -11617,6 +12912,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TriPass, + .iconPalette = gItemIconPalette_TriPass, }, [ITEM_RAINBOW_PASS] = @@ -11632,6 +12929,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_RainbowPass, + .iconPalette = gItemIconPalette_RainbowPass, }, [ITEM_TEA] = @@ -11647,6 +12946,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_Tea, + .iconPalette = gItemIconPalette_Tea, }, [ITEM_RUBY] = @@ -11655,13 +12956,15 @@ const struct Item gItemsInfo[] = .pluralName = _("Rubies"), .price = 0, .description = COMPOUND_STRING( - "An exquisite, red" + "An exquisite, red-" "glowing gem\nthat " "symbolizes passion."), .importance = 1, .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_Gem, + .iconPalette = gItemIconPalette_Ruby, }, [ITEM_SAPPHIRE] = @@ -11676,11 +12979,13 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_Gem, + .iconPalette = gItemIconPalette_Sapphire, }, [ITEM_ABILITY_SHIELD] = { - .name = _("AbilityShield"), + .name = HANDLE_EXPANDED_ITEM_NAME("AbilityShield", "Ability Shield"), .price = 20000, .holdEffect = HOLD_EFFECT_ABILITY_SHIELD, .description = COMPOUND_STRING( @@ -11691,6 +12996,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_AbilityShield, + .iconPalette = gItemIconPalette_AbilityShield, }, // GEN 9 ITEMS @@ -11708,12 +13015,14 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_ClearAmulet, + .iconPalette = gItemIconPalette_ClearAmulet, }, [ITEM_PUNCHING_GLOVE] = { - .name = _("PnchingGlove"), - .price = 2, + .name = HANDLE_EXPANDED_ITEM_NAME("PunchingGlove", "Punching Glove"), + .price = 15000, .holdEffect = HOLD_EFFECT_PUNCHING_GLOVE, .description = COMPOUND_STRING( "Powers up punching " @@ -11723,6 +13032,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_PunchingGlove, + .iconPalette = gItemIconPalette_PunchingGlove, }, [ITEM_COVERT_CLOAK] = @@ -11738,6 +13049,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_CovertCloak, + .iconPalette = gItemIconPalette_CovertCloak, }, [ITEM_LOADED_DICE] = @@ -11754,11 +13067,13 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_LoadedDice, + .iconPalette = gItemIconPalette_LoadedDice, }, [ITEM_AUSPICIOUS_ARMOR] = { - .name = _("AuspciousArmr"), + .name = HANDLE_EXPANDED_ITEM_NAME("AuspciousArmr", "Auspicious Armor"), .price = 3000, .description = COMPOUND_STRING( "Armor inhabited by " @@ -11769,12 +13084,14 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_AuspiciousArmor, + .iconPalette = gItemIconPalette_AuspiciousArmor, }, [ITEM_BOOSTER_ENERGY] = { - .name = _("BoosterEnergy"), - .pluralName = _("BoosterEnergies"), + .name = HANDLE_EXPANDED_ITEM_NAME("BoosterEnergy", "Booster Energy"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("BoosterEnergies", "Booster Energies"), .price = 0, .holdEffect = HOLD_EFFECT_BOOSTER_ENERGY, .description = COMPOUND_STRING( @@ -11785,11 +13102,13 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_BoosterEnergy, + .iconPalette = gItemIconPalette_BoosterEnergy, }, [ITEM_BIG_BAMBOO_SHOOT] = { - .name = _("BigBmbooShoot"), + .name = HANDLE_EXPANDED_ITEM_NAME("BigBmbooShoot", "Big Bamboo Shoot"), .price = 3000, .description = COMPOUND_STRING( "A large and rare " @@ -11799,11 +13118,13 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_BigBambooShoot, + .iconPalette = gItemIconPalette_BigBambooShoot, }, [ITEM_GIMMIGHOUL_COIN] = { - .name = _("GimighoulCoin"), + .name = HANDLE_EXPANDED_ITEM_NAME("GimighoulCoin", "Gimmighoul Coin"), .price = 400, .description = COMPOUND_STRING( "Gimmighoul hoard " @@ -11812,11 +13133,13 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_GimmighoulCoin, + .iconPalette = gItemIconPalette_GimmighoulCoin, }, [ITEM_LEADERS_CREST] = { - .name = _("Leader'sCrest"), + .name = HANDLE_EXPANDED_ITEM_NAME("Leader'sCrest", "Leader's Crest"), .price = 3000, .description = COMPOUND_STRING( "A shard of an old " @@ -11825,11 +13148,13 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_LeadersCrest, + .iconPalette = gItemIconPalette_LeadersCrest, }, [ITEM_MALICIOUS_ARMOR] = { - .name = _("MaliciousArmr"), + .name = HANDLE_EXPANDED_ITEM_NAME("MaliciousArmr", "Malicious Armor"), .price = 3000, .description = COMPOUND_STRING( "Armor inhabited by " @@ -11840,6 +13165,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_MaliciousArmor, + .iconPalette = gItemIconPalette_MaliciousArmor, }, [ITEM_MIRROR_HERB] = @@ -11855,12 +13182,14 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_MirrorHerb, + .iconPalette = gItemIconPalette_MirrorHerb, }, [ITEM_SCROLL_OF_DARKNESS] = { - .name = _("ScrllOfDrknss"), - .pluralName = _("ScrllsOfDrknss"), + .name = HANDLE_EXPANDED_ITEM_NAME("ScrllOfDrknss", "Scroll of Darkness"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("ScrllsOfDrknss", "Scrolls of Darkness"), .price = 0, .description = COMPOUND_STRING( "A peculiar scroll " @@ -11871,12 +13200,14 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, + .iconPic = gItemIcon_ScrollOfDarkness, + .iconPalette = gItemIconPalette_ScrollOfDarkness, }, [ITEM_SCROLL_OF_WATERS] = { - .name = _("ScrollOfWatrs"), - .pluralName = _("ScrollsOfWatrs"), + .name = HANDLE_EXPANDED_ITEM_NAME("ScrollOfWatrs", "Scroll of Waters"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("ScrollsOfWatrs", "Scrolls of Waters"), .price = 0, .description = COMPOUND_STRING( "A peculiar scroll " @@ -11887,6 +13218,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, + .iconPic = gItemIcon_ScrollOfWaters, + .iconPalette = gItemIconPalette_ScrollOfWaters, }, [ITEM_TERA_ORB] = @@ -11901,11 +13234,13 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraOrb, + .iconPalette = gItemIconPalette_TeraOrb, }, [ITEM_TINY_BAMBOO_SHOOT] = { - .name = _("TinyBmbooShot"), + .name = HANDLE_EXPANDED_ITEM_NAME("TinyBmbooShot", "Tiny Bamboo Shoot"), .price = 750, .description = COMPOUND_STRING( "A small and rare " @@ -11915,191 +13250,229 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconPic = gItemIcon_TinyBambooShoot, + .iconPalette = gItemIconPalette_TinyBambooShoot, }, [ITEM_BUG_TERA_SHARD] = { - .name = _("Bug TeraShard"), + .name = HANDLE_EXPANDED_ITEM_NAME("Bug TeraShard", "Bug Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_BugTeraShard, }, [ITEM_DARK_TERA_SHARD] = { - .name = _("DarkTeraShard"), + .name = HANDLE_EXPANDED_ITEM_NAME("DarkTeraShard", "Dark Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_DarkTeraShard, }, [ITEM_DRAGON_TERA_SHARD] = { - .name = _("DragnTeraShrd"), + .name = HANDLE_EXPANDED_ITEM_NAME("DragnTeraShrd", "Dragon Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_DragonTeraShard, }, [ITEM_ELECTRIC_TERA_SHARD] = { - .name = _("EltrcTeraShrd"), + .name = HANDLE_EXPANDED_ITEM_NAME("EltrcTeraShrd", "Electric Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_ElectricTeraShard, }, [ITEM_FAIRY_TERA_SHARD] = { - .name = _("FairyTeraShrd"), + .name = HANDLE_EXPANDED_ITEM_NAME("FairyTeraShrd", "Fairy Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_FairyTeraShard, }, [ITEM_FIGHTING_TERA_SHARD] = { - .name = _("FghtngTerShrd"), + .name = HANDLE_EXPANDED_ITEM_NAME("FghtngTerShrd", "Fighting Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_FightingTeraShard, }, [ITEM_FIRE_TERA_SHARD] = { - .name = _("FireTeraShard"), + .name = HANDLE_EXPANDED_ITEM_NAME("FireTeraShard", "Fire Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_FireTeraShard, }, [ITEM_FLYING_TERA_SHARD] = { - .name = _("FlyngTeraShrd"), + .name = HANDLE_EXPANDED_ITEM_NAME("FlyngTeraShrd", "Flying Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_FlyingTeraShard, }, [ITEM_GHOST_TERA_SHARD] = { - .name = _("GhostTeraShrd"), + .name = HANDLE_EXPANDED_ITEM_NAME("GhostTeraShrd", "Ghost Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_GhostTeraShard, }, [ITEM_GRASS_TERA_SHARD] = { - .name = _("GrassTeraShrd"), + .name = HANDLE_EXPANDED_ITEM_NAME("GrassTeraShrd", "Grass Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_GrassTeraShard, }, [ITEM_GROUND_TERA_SHARD] = { - .name = _("GrondTeraShrd"), + .name = HANDLE_EXPANDED_ITEM_NAME("GrondTeraShrd", "Ground Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_GroundTeraShard, }, [ITEM_ICE_TERA_SHARD] = { - .name = _("Ice TeraShard"), + .name = HANDLE_EXPANDED_ITEM_NAME("Ice TeraShard", "Ice Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_IceTeraShard, }, [ITEM_NORMAL_TERA_SHARD] = { - .name = _("NormlTeraShrd"), + .name = HANDLE_EXPANDED_ITEM_NAME("NormlTeraShrd", "Normal Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_NormalTeraShard, }, [ITEM_POISON_TERA_SHARD] = { - .name = _("PoisnTeraShrd"), + .name = HANDLE_EXPANDED_ITEM_NAME("PoisnTeraShrd", "Poison Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_PoisonTeraShard, }, [ITEM_PSYCHIC_TERA_SHARD] = { - .name = _("PschcTeraShrd"), + .name = HANDLE_EXPANDED_ITEM_NAME("PschcTeraShrd", "Psychic Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_PsychicTeraShard, }, [ITEM_ROCK_TERA_SHARD] = { - .name = _("RockTeraShard"), + .name = HANDLE_EXPANDED_ITEM_NAME("RockTeraShard", "Rock Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_RockTeraShard, }, [ITEM_STEEL_TERA_SHARD] = { - .name = _("SteelTeraShrd"), + .name = HANDLE_EXPANDED_ITEM_NAME("SteelTeraShrd", "Steel Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_SteelTeraShard, }, [ITEM_WATER_TERA_SHARD] = { - .name = _("WaterTeraShrd"), + .name = HANDLE_EXPANDED_ITEM_NAME("WaterTeraShrd", "Water Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_WaterTeraShard, }, [ITEM_ADAMANT_CRYSTAL] = { - .name = _("AdamantCrystl"), + .name = HANDLE_EXPANDED_ITEM_NAME("AdamantCrystl", "Adamant Crystal"), .price = 0, .description = COMPOUND_STRING( "A large, glowing gem " @@ -12109,6 +13482,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconPic = gItemIcon_AdamantCrystal, + .iconPalette = gItemIconPalette_AdamantCrystal, }, [ITEM_GRISEOUS_CORE] = @@ -12123,11 +13498,13 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconPic = gItemIcon_GriseousCore, + .iconPalette = gItemIconPalette_GriseousCore, }, [ITEM_LUSTROUS_GLOBE] = { - .name = _("LustrousGlobe"), + .name = HANDLE_EXPANDED_ITEM_NAME("LustrousGlobe", "Lustrous Globe"), .price = 0, .description = COMPOUND_STRING( "A large, glowing gem " @@ -12137,11 +13514,13 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconPic = gItemIcon_LustrousGlobe, + .iconPalette = gItemIconPalette_LustrousGlobe, }, [ITEM_BLACK_AUGURITE] = { - .name = _("BlackAugurite"), + .name = HANDLE_EXPANDED_ITEM_NAME("BlackAugurite", "Black Augurite"), .price = 8000, .description = COMPOUND_STRING( "A black stone that " @@ -12152,6 +13531,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_BlackAugurite, + .iconPalette = gItemIconPalette_BlackAugurite, }, [ITEM_LINKING_CORD] = @@ -12167,6 +13548,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_LinkingCord, + .iconPalette = gItemIconPalette_LinkingCord, }, [ITEM_PEAT_BLOCK] = @@ -12182,6 +13565,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_PeatBlock, + .iconPalette = gItemIconPalette_PeatBlock, }, [ITEM_BERSERK_GENE] = @@ -12197,6 +13582,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_BerserkGene, + .iconPalette = gItemIconPalette_BerserkGene, }, [ITEM_FAIRY_FEATHER] = @@ -12213,6 +13600,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconPic = gItemIcon_FairyFeather, + .iconPalette = gItemIconPalette_FairyFeather, }, [ITEM_SYRUPY_APPLE] = @@ -12228,11 +13617,13 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconPic = gItemIcon_SyrupyApple, + .iconPalette = gItemIconPalette_SyrupyApple, }, [ITEM_UNREMARKABLE_TEACUP] = { - .name = _("UnrmkblTeacup"), + .name = HANDLE_EXPANDED_ITEM_NAME("UnrmkblTeacup", "Unremarkable Teacup"), .price = 1600, .description = COMPOUND_STRING( "A cracked teacup " @@ -12243,11 +13634,13 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconPic = gItemIcon_UnremarkableTeacup, + .iconPalette = gItemIconPalette_UnremarkableTeacup, }, [ITEM_MASTERPIECE_TEACUP] = { - .name = _("MstrpceTeacup"), + .name = HANDLE_EXPANDED_ITEM_NAME("MstrpceTeacup", "Masterpiece Teacup"), .price = 38000, .description = COMPOUND_STRING( "A chipped teacup " @@ -12258,45 +13651,53 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconPic = gItemIcon_MasterpieceTeacup, + .iconPalette = gItemIconPalette_MasterpieceTeacup, }, [ITEM_CORNERSTONE_MASK] = { - .name = _("CornrstneMask"), + .name = HANDLE_EXPANDED_ITEM_NAME("CornrstneMask", "Cornerstone Mask"), .price = 0, .description = COMPOUND_STRING( "Allows Ogerpon to " - "wield the Rock-\n" - "type in battle."), + "wield the Rock-" + "\ntype in battle."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_CornerstoneMask, + .iconPalette = gItemIconPalette_CornerstoneMask, }, [ITEM_WELLSPRING_MASK] = { - .name = _("WellsprngMask"), + .name = HANDLE_EXPANDED_ITEM_NAME("WellsprngMask", "Wellspring Mask"), .price = 0, .description = COMPOUND_STRING( "Allows Ogerpon to " - "wield the\nWater" + "wield the\nWater-" "type in battle."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_WellspringMask, + .iconPalette = gItemIconPalette_WellspringMask, }, [ITEM_HEARTHFLAME_MASK] = { - .name = _("HrthflameMask"), + .name = HANDLE_EXPANDED_ITEM_NAME("HrthflameMask", "Hearthflame Mask"), .price = 0, .description = COMPOUND_STRING( "Allows Ogerpon to " - "wield the Fire-\n" - "type in battle."), + "wield the Fire-" + "\ntype in battle."), .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_HearthflameMask, + .iconPalette = gItemIconPalette_HearthflameMask, }, [ITEM_HEALTH_MOCHI] = @@ -12310,6 +13711,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_HpMochi, .flingPower = 30, + .iconPic = gItemIcon_Mochi, + .iconPalette = gItemIconPalette_HealthMochi, }, [ITEM_MUSCLE_MOCHI] = @@ -12323,6 +13726,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_AtkMochi, .flingPower = 30, + .iconPic = gItemIcon_Mochi, + .iconPalette = gItemIconPalette_MuscleMochi, }, [ITEM_RESIST_MOCHI] = @@ -12336,6 +13741,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_DefMochi, .flingPower = 30, + .iconPic = gItemIcon_Mochi, + .iconPalette = gItemIconPalette_ResistMochi, }, [ITEM_GENIUS_MOCHI] = @@ -12349,6 +13756,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_SpatkMochi, .flingPower = 30, + .iconPic = gItemIcon_Mochi, + .iconPalette = gItemIconPalette_GeniusMochi, }, [ITEM_CLEVER_MOCHI] = @@ -12362,6 +13771,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_SpdefMochi, .flingPower = 30, + .iconPic = gItemIcon_Mochi, + .iconPalette = gItemIconPalette_CleverMochi, }, [ITEM_SWIFT_MOCHI] = @@ -12375,12 +13786,14 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_SpeedMochi, .flingPower = 30, + .iconPic = gItemIcon_Mochi, + .iconPalette = gItemIconPalette_SwiftMochi, }, [ITEM_FRESH_START_MOCHI] = { - .name = _("FrshStrtMochi"), - .pluralName = _("FrshStrtMochi"), + .name = HANDLE_EXPANDED_ITEM_NAME("FrshStrtMochi", "Fresh Start Mochi"), + .pluralName = HANDLE_EXPANDED_ITEM_NAME("FrshStrtMochi", "Fresh Start Mochi"), .price = 300, .description = COMPOUND_STRING( "An item that resets " @@ -12391,11 +13804,13 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_ResetEVs, .effect = gItemEffect_ResetMochi, .flingPower = 30, + .iconPic = gItemIcon_Mochi, + .iconPalette = gItemIconPalette_FreshStartMochi, }, [ITEM_GLIMMERING_CHARM] = { - .name = _("GlmmringCharm"), + .name = HANDLE_EXPANDED_ITEM_NAME("GlmmringCharm", "Glimmering Charm"), .price = 0, .importance = 1, .description = COMPOUND_STRING( @@ -12405,6 +13820,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_GlimmeringCharm, + .iconPalette = gItemIconPalette_GlimmeringCharm, }, [ITEM_METAL_ALLOY] = @@ -12419,21 +13836,25 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, + .iconPic = gItemIcon_MetalAlloy, + .iconPalette = gItemIconPalette_MetalAlloy, }, [ITEM_STELLAR_TERA_SHARD] = { - .name = _("StllrTeraShrd"), + .name = HANDLE_EXPANDED_ITEM_NAME("StllrTeraShrd", "Stellar Tera Shard"), .price = 0, .description = sTeraShardDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_StellarTeraShard, + .iconPalette = gItemIconPalette_StellarTeraShard, }, [ITEM_JUBILIFE_MUFFIN] = { - .name = _("JublifeMuffin"), + .name = HANDLE_EXPANDED_ITEM_NAME("JublifeMuffin", "Jubilife Muffin"), .price = 250, .description = sFullHealDesc, .pocket = POCKET_ITEMS, @@ -12441,6 +13862,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = EFFECT_ITEM_CURE_STATUS, .flingPower = 30, + .iconPic = gItemIcon_JubilifeMuffin, + .iconPalette = gItemIconPalette_JubilifeMuffin, }, [ITEM_REMEDY] = @@ -12457,6 +13880,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_Remedy, .flingPower = 30, + .iconPic = gItemIcon_Remedy, + .iconPalette = gItemIconPalette_Remedy, }, [ITEM_FINE_REMEDY] = @@ -12477,6 +13902,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_FineRemedy, .flingPower = 30, + .iconPic = gItemIcon_FineRemedy, + .iconPalette = gItemIconPalette_FineRemedy, }, [ITEM_SUPERB_REMEDY] = @@ -12497,6 +13924,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_SuperbRemedy, .flingPower = 30, + .iconPic = gItemIcon_SuperbRemedy, + .iconPalette = gItemIconPalette_SuperbRemedy, }, [ITEM_AUX_EVASION] = @@ -12517,6 +13946,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, //.effect = currently missing + .iconPic = gItemIcon_AuxBottle, + .iconPalette = gItemIconPalette_AuxEvasion, }, [ITEM_AUX_GUARD] = @@ -12537,6 +13968,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, //.effect = currently missing + .iconPic = gItemIcon_AuxBottle, + .iconPalette = gItemIconPalette_AuxGuard, }, [ITEM_AUX_POWER] = @@ -12557,11 +13990,13 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, //.effect = currently missing + .iconPic = gItemIcon_AuxBottle, + .iconPalette = gItemIconPalette_AuxPower, }, [ITEM_AUX_POWERGUARD] = { - .name = _("AuxPowerguard"), + .name = HANDLE_EXPANDED_ITEM_NAME("AuxPowerguard", "Aux Powerguard"), .price = 1200, .holdEffectParam = X_ITEM_STAGES, .description = COMPOUND_STRING( @@ -12578,17 +14013,21 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, //.effect = currently missing + .iconPic = gItemIcon_AuxPowerguard, + .iconPalette = gItemIconPalette_AuxPowerguard, }, [ITEM_CHOICE_DUMPLING] = { - .name = _("ChoiceDumplng"), + .name = HANDLE_EXPANDED_ITEM_NAME("ChoiceDumplng", "Choice Dumpling"), .price = 1200, .description = sQuestionMarksDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, //.effect = currently missing + .iconPic = gItemIcon_ChoiceDumpling, + .iconPalette = gItemIconPalette_ChoiceDumpling, }, [ITEM_SWAP_SNACK] = @@ -12600,17 +14039,21 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, //.effect = currently missing + .iconPic = gItemIcon_SwapSnack, + .iconPalette = gItemIconPalette_SwapSnack, }, [ITEM_TWICE_SPICED_RADISH] = { - .name = _("2xSpicedRadsh"), + .name = HANDLE_EXPANDED_ITEM_NAME("2xSpicedRadsh", "Twice-Spiced Radish"), .price = 1600, .description = sQuestionMarksDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, //.effect = currently missing + .iconPic = gItemIcon_TwiceSpicedRadish, + .iconPalette = gItemIconPalette_TwiceSpicedRadish, }, [ITEM_POKESHI_DOLL] = @@ -12624,5 +14067,7 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconPic = gItemIcon_PokeshiDoll, + .iconPalette = gItemIconPalette_PokeshiDoll, }, }; diff --git a/src/item.c b/src/item.c index 204dfa0f4..860cb5574 100644 --- a/src/item.c +++ b/src/item.c @@ -2,6 +2,7 @@ #include "gflib.h" #include "berry.h" #include "event_data.h" +#include "graphics.h" #include "item.h" #include "item_use.h" #include "item_menu.h" @@ -11,6 +12,7 @@ #include "strings.h" #include "constants/hold_effects.h" #include "constants/item_effects.h" +#include "constants/item.h" #include "constants/items.h" #include "constants/maps.h" diff --git a/src/party_menu.c b/src/party_menu.c index 5b199a6d7..737757dca 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -4428,7 +4428,7 @@ static void CB2_UseItem(void) { GiveMoveToMon(&gPlayerParty[gPartyMenu.slotId], ItemIdToBattleMoveId(gSpecialVar_ItemId)); AdjustFriendship(&gPlayerParty[gPartyMenu.slotId], FRIENDSHIP_EVENT_LEARN_TMHM); - if (gSpecialVar_ItemId < ITEM_HM01) + if (!ItemId_GetImportance(gSpecialVar_ItemId)) RemoveBagItem(gSpecialVar_ItemId, 1); SetMainCallback2(gPartyMenu.exitCallback); } @@ -4448,7 +4448,7 @@ static void CB2_UseTMHMAfterForgettingMove(void) SetMonMoveSlot(mon, ItemIdToBattleMoveId(gSpecialVar_ItemId), moveIdx); AdjustFriendship(mon, FRIENDSHIP_EVENT_LEARN_TMHM); ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, mon, gSpecialVar_ItemId, move); - if (gSpecialVar_ItemId < ITEM_HM01) + if (!ItemId_GetImportance(gSpecialVar_ItemId)) RemoveBagItem(gSpecialVar_ItemId, 1); SetMainCallback2(gPartyMenu.exitCallback); }