diff --git a/include/item.h b/include/item.h index 88c9fe5e3fd6..051a4b1627aa 100644 --- a/include/item.h +++ b/include/item.h @@ -23,6 +23,8 @@ struct Item u8 type; u8 battleUsage; u8 flingPower; + const u32 *iconSprite; + const u32 *iconPalette; }; struct BagPocket diff --git a/include/item_icon.h b/include/item_icon.h index c93a519bb472..b6841bb00d56 100644 --- a/include/item_icon.h +++ b/include/item_icon.h @@ -11,6 +11,7 @@ void FreeItemIconTemporaryBuffers(void); void CopyItemIconPicTo4x4Buffer(const void *src, void *dest); u8 AddItemIconSprite(u16 tilesTag, u16 paletteTag, u16 itemId); u8 AddCustomItemIconSprite(const struct SpriteTemplate *customSpriteTemplate, u16 tilesTag, u16 paletteTag, u16 itemId); -const void *GetItemIconPicOrPalette(u16 itemId, u8 which); +const void *GetItemIconSprite(u16 itemId); +const void *GetItemIconPalette(u16 itemId); #endif //GUARD_ITEM_ICON_H diff --git a/migration_scripts/convert_item_icons.py b/migration_scripts/convert_item_icons.py new file mode 100644 index 000000000000..0d07b4722fe4 --- /dev/null +++ b/migration_scripts/convert_item_icons.py @@ -0,0 +1,45 @@ +import glob +import re +import os + +if not os.path.exists("Makefile"): + print("Please run this script from your root folder.") + quit() + +# Read item_icon_table.h and extract the icon and palette information +for file in glob.glob('./src/data/item_icon_table.h'): + with open(file, 'r') as f: + icon_table_content = f.read() + +# Extract item icon and palette data from item_icon_table.h +icon_table_pattern = re.compile(r'\[(ITEM_[A-Z_0-9]+)\]\s*=\s*\{([^,]+),\s*([^}]+)\}', re.MULTILINE) +icon_table_data = {} +for match in icon_table_pattern.findall(icon_table_content): + if len(match) == 3: + item_name, icon_sprite, icon_palette = match + icon_table_data[item_name] = (icon_sprite, icon_palette) + +# Read items.h content +for file in glob.glob('./src/data/items.h'): + with open(file, 'r') as f: + items_content = f.read() + +# Modify items.h content +def add_icon_data(match): + item_name = match.group(1) + item_content = match.group(2) + if item_name in icon_table_data: + icon_sprite, icon_palette = icon_table_data[item_name] + print(f"Updating {item_name}: adding iconSprite = {icon_sprite}, iconPalette = {icon_palette}") + return f'[{item_name}] =\n {{{item_content} .iconSprite = {icon_sprite},\n .iconPalette = {icon_palette},\n }},' + else: + return match.group(0) + +item_pattern = re.compile(r'\[(ITEM_[A-Z_0-9]+)\]\s*=\s*\{([\s\S]*?)\},', re.DOTALL) +modified_items_content = item_pattern.sub(add_icon_data, items_content) + +# Write the modified content back to items.h +for file in glob.glob('./src/data/items.h'): + with open(file, 'w') as f: + f.write(modified_items_content) + print("items.h has been updated") \ No newline at end of file diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index d4d4a19c58c2..8b137891791f 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -1,769 +1 @@ -const u32 *const gItemIconTable[ITEMS_COUNT + 1][2] = -{ - [ITEM_NONE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, - // Poké Balls - [ITEM_POKE_BALL] = {gItemIcon_PokeBall, gItemIconPalette_PokeBall}, - [ITEM_GREAT_BALL] = {gItemIcon_GreatBall, gItemIconPalette_GreatBall}, - [ITEM_ULTRA_BALL] = {gItemIcon_UltraBall, gItemIconPalette_UltraBall}, - [ITEM_MASTER_BALL] = {gItemIcon_MasterBall, gItemIconPalette_MasterBall}, - [ITEM_PREMIER_BALL] = {gItemIcon_PremierBall, gItemIconPalette_LuxuryBall}, - [ITEM_HEAL_BALL] = {gItemIcon_HealBall, gItemIconPalette_HealBall}, - [ITEM_NET_BALL] = {gItemIcon_NetBall, gItemIconPalette_NetBall}, - [ITEM_NEST_BALL] = {gItemIcon_NestBall, gItemIconPalette_NestBall}, - [ITEM_DIVE_BALL] = {gItemIcon_DiveBall, gItemIconPalette_DiveBall}, - [ITEM_DUSK_BALL] = {gItemIcon_DuskBall, gItemIconPalette_DuskBall}, - [ITEM_TIMER_BALL] = {gItemIcon_TimerBall, gItemIconPalette_RepeatBall}, - [ITEM_QUICK_BALL] = {gItemIcon_QuickBall, gItemIconPalette_QuickBall}, - [ITEM_REPEAT_BALL] = {gItemIcon_RepeatBall, gItemIconPalette_RepeatBall}, - [ITEM_LUXURY_BALL] = {gItemIcon_LuxuryBall, gItemIconPalette_LuxuryBall}, - [ITEM_LEVEL_BALL] = {gItemIcon_LevelBall, gItemIconPalette_LevelBall}, - [ITEM_LURE_BALL] = {gItemIcon_LureBall, gItemIconPalette_LureBall}, - [ITEM_MOON_BALL] = {gItemIcon_MoonBall, gItemIconPalette_MoonBall}, - [ITEM_FRIEND_BALL] = {gItemIcon_FriendBall, gItemIconPalette_FriendBall}, - [ITEM_LOVE_BALL] = {gItemIcon_LoveBall, gItemIconPalette_LoveBall}, - [ITEM_FAST_BALL] = {gItemIcon_FastBall, gItemIconPalette_FastBall}, - [ITEM_HEAVY_BALL] = {gItemIcon_HeavyBall, gItemIconPalette_HeavyBall}, - [ITEM_DREAM_BALL] = {gItemIcon_DreamBall, gItemIconPalette_DreamBall}, - [ITEM_SAFARI_BALL] = {gItemIcon_SafariBall, gItemIconPalette_SafariBall}, - [ITEM_SPORT_BALL] = {gItemIcon_SportBall, gItemIconPalette_SportBall}, - [ITEM_PARK_BALL] = {gItemIcon_ParkBall, gItemIconPalette_ParkBall}, - [ITEM_BEAST_BALL] = {gItemIcon_BeastBall, gItemIconPalette_BeastBall}, - [ITEM_CHERISH_BALL] = {gItemIcon_CherishBall, gItemIconPalette_CherishBall}, - // Medicine - [ITEM_POTION] = {gItemIcon_Potion, gItemIconPalette_Potion}, - [ITEM_SUPER_POTION] = {gItemIcon_Potion, gItemIconPalette_SuperPotion}, - [ITEM_HYPER_POTION] = {gItemIcon_Potion, gItemIconPalette_HyperPotion}, - [ITEM_MAX_POTION] = {gItemIcon_LargePotion, gItemIconPalette_MaxPotion}, - [ITEM_FULL_RESTORE] = {gItemIcon_LargePotion, gItemIconPalette_FullRestore}, - [ITEM_REVIVE] = {gItemIcon_Revive, gItemIconPalette_Revive}, - [ITEM_MAX_REVIVE] = {gItemIcon_MaxRevive, gItemIconPalette_Revive}, - [ITEM_FRESH_WATER] = {gItemIcon_FreshWater, gItemIconPalette_FreshWater}, - [ITEM_SODA_POP] = {gItemIcon_SodaPop, gItemIconPalette_SodaPop}, - [ITEM_LEMONADE] = {gItemIcon_Lemonade, gItemIconPalette_Lemonade}, - [ITEM_MOOMOO_MILK] = {gItemIcon_MoomooMilk, gItemIconPalette_MoomooMilk}, - [ITEM_ENERGY_POWDER] = {gItemIcon_Powder, gItemIconPalette_EnergyPowder}, - [ITEM_ENERGY_ROOT] = {gItemIcon_EnergyRoot, gItemIconPalette_EnergyRoot}, - [ITEM_HEAL_POWDER] = {gItemIcon_Powder, gItemIconPalette_HealPowder}, - [ITEM_REVIVAL_HERB] = {gItemIcon_RevivalHerb, gItemIconPalette_RevivalHerb}, - [ITEM_ANTIDOTE] = {gItemIcon_Antidote, gItemIconPalette_Antidote}, - [ITEM_PARALYZE_HEAL] = {gItemIcon_StatusHeal, gItemIconPalette_ParalyzeHeal}, - [ITEM_BURN_HEAL] = {gItemIcon_StatusHeal, gItemIconPalette_BurnHeal}, - [ITEM_ICE_HEAL] = {gItemIcon_StatusHeal, gItemIconPalette_IceHeal}, - [ITEM_AWAKENING] = {gItemIcon_StatusHeal, gItemIconPalette_Awakening}, - [ITEM_FULL_HEAL] = {gItemIcon_FullHeal, gItemIconPalette_FullHeal}, - [ITEM_ETHER] = {gItemIcon_Ether, gItemIconPalette_Ether}, - [ITEM_MAX_ETHER] = {gItemIcon_Ether, gItemIconPalette_MaxEther}, - [ITEM_ELIXIR] = {gItemIcon_Ether, gItemIconPalette_Elixir}, - [ITEM_MAX_ELIXIR] = {gItemIcon_Ether, gItemIconPalette_MaxElixir}, - [ITEM_BERRY_JUICE] = {gItemIcon_BerryJuice, gItemIconPalette_BerryJuice}, - [ITEM_SACRED_ASH] = {gItemIcon_SacredAsh, gItemIconPalette_SacredAsh}, - [ITEM_SWEET_HEART] = {gItemIcon_SweetHeart, gItemIconPalette_SweetHeart}, - [ITEM_MAX_HONEY] = {gItemIcon_MaxHoney, gItemIconPalette_MaxHoney}, - // Regional Specialties - [ITEM_PEWTER_CRUNCHIES] = {gItemIcon_PewterCrunchies, gItemIconPalette_PewterCrunchies}, - [ITEM_RAGE_CANDY_BAR] = {gItemIcon_RageCandyBar, gItemIconPalette_RageCandyBar}, - [ITEM_LAVA_COOKIE] = {gItemIcon_LavaCookie, gItemIconPalette_LavaCookieAndLetter}, - [ITEM_OLD_GATEAU] = {gItemIcon_OldGateau, gItemIconPalette_OldGateau}, - [ITEM_CASTELIACONE] = {gItemIcon_Casteliacone, gItemIconPalette_Casteliacone}, - [ITEM_LUMIOSE_GALETTE] = {gItemIcon_LumioseGalette, gItemIconPalette_LumioseGalette}, - [ITEM_SHALOUR_SABLE] = {gItemIcon_ShalourSable, gItemIconPalette_ShalourSable}, - [ITEM_BIG_MALASADA] = {gItemIcon_BigMalasada, gItemIconPalette_BigMalasada}, - // Vitamins - [ITEM_HP_UP] = {gItemIcon_HPUp, gItemIconPalette_HPUp}, - [ITEM_PROTEIN] = {gItemIcon_Vitamin, gItemIconPalette_Protein}, - [ITEM_IRON] = {gItemIcon_Vitamin, gItemIconPalette_Iron}, - [ITEM_CALCIUM] = {gItemIcon_Vitamin, gItemIconPalette_Calcium}, - [ITEM_ZINC] = {gItemIcon_Vitamin, gItemIconPalette_Zinc}, - [ITEM_CARBOS] = {gItemIcon_Vitamin, gItemIconPalette_Carbos}, - [ITEM_PP_UP] = {gItemIcon_PPUp, gItemIconPalette_PPUp}, - [ITEM_PP_MAX] = {gItemIcon_PPMax, gItemIconPalette_PPMax}, - // EV Feathers - [ITEM_HEALTH_FEATHER] = {gItemIcon_HealthFeather, gItemIconPalette_HealthFeather}, - [ITEM_MUSCLE_FEATHER] = {gItemIcon_MuscleFeather, gItemIconPalette_MuscleFeather}, - [ITEM_RESIST_FEATHER] = {gItemIcon_ResistFeather, gItemIconPalette_ResistFeather}, - [ITEM_GENIUS_FEATHER] = {gItemIcon_GeniusFeather, gItemIconPalette_GeniusFeather}, - [ITEM_CLEVER_FEATHER] = {gItemIcon_CleverFeather, gItemIconPalette_CleverFeather}, - [ITEM_SWIFT_FEATHER] = {gItemIcon_SwiftFeather, gItemIconPalette_SwiftFeather}, - // Ability Modifiers - [ITEM_ABILITY_CAPSULE] = {gItemIcon_AbilityCapsule, gItemIconPalette_AbilityCapsule}, - [ITEM_ABILITY_PATCH] = {gItemIcon_AbilityPatch, gItemIconPalette_AbilityPatch}, - // Mints - [ITEM_LONELY_MINT] = {gItemIcon_Mint, gItemIconPalette_RedMint}, - [ITEM_ADAMANT_MINT] = {gItemIcon_Mint, gItemIconPalette_RedMint}, - [ITEM_NAUGHTY_MINT] = {gItemIcon_Mint, gItemIconPalette_RedMint}, - [ITEM_BRAVE_MINT] = {gItemIcon_Mint, gItemIconPalette_RedMint}, - [ITEM_BOLD_MINT] = {gItemIcon_Mint, gItemIconPalette_BlueMint}, - [ITEM_IMPISH_MINT] = {gItemIcon_Mint, gItemIconPalette_BlueMint}, - [ITEM_LAX_MINT] = {gItemIcon_Mint, gItemIconPalette_BlueMint}, - [ITEM_RELAXED_MINT] = {gItemIcon_Mint, gItemIconPalette_BlueMint}, - [ITEM_MODEST_MINT] = {gItemIcon_Mint, gItemIconPalette_LightBlueMint}, - [ITEM_MILD_MINT] = {gItemIcon_Mint, gItemIconPalette_LightBlueMint}, - [ITEM_RASH_MINT] = {gItemIcon_Mint, gItemIconPalette_LightBlueMint}, - [ITEM_QUIET_MINT] = {gItemIcon_Mint, gItemIconPalette_LightBlueMint}, - [ITEM_CALM_MINT] = {gItemIcon_Mint, gItemIconPalette_PinkMint}, - [ITEM_GENTLE_MINT] = {gItemIcon_Mint, gItemIconPalette_PinkMint}, - [ITEM_CAREFUL_MINT] = {gItemIcon_Mint, gItemIconPalette_PinkMint}, - [ITEM_SASSY_MINT] = {gItemIcon_Mint, gItemIconPalette_PinkMint}, - [ITEM_TIMID_MINT] = {gItemIcon_Mint, gItemIconPalette_GreenMint}, - [ITEM_HASTY_MINT] = {gItemIcon_Mint, gItemIconPalette_GreenMint}, - [ITEM_JOLLY_MINT] = {gItemIcon_Mint, gItemIconPalette_GreenMint}, - [ITEM_NAIVE_MINT] = {gItemIcon_Mint, gItemIconPalette_GreenMint}, - [ITEM_SERIOUS_MINT] = {gItemIcon_Mint, gItemIconPalette_YellowMint}, - // Candy - [ITEM_RARE_CANDY] = {gItemIcon_RareCandy, gItemIconPalette_RareCandy}, - [ITEM_EXP_CANDY_XS] = {gItemIcon_ExpCandyXS, gItemIconPalette_ExpCandies}, - [ITEM_EXP_CANDY_S] = {gItemIcon_ExpCandyS, gItemIconPalette_ExpCandies}, - [ITEM_EXP_CANDY_M] = {gItemIcon_ExpCandyM, gItemIconPalette_ExpCandies}, - [ITEM_EXP_CANDY_L] = {gItemIcon_ExpCandyL, gItemIconPalette_ExpCandies}, - [ITEM_EXP_CANDY_XL] = {gItemIcon_ExpCandyXL, gItemIconPalette_ExpCandies}, - [ITEM_DYNAMAX_CANDY] = {gItemIcon_DynamaxCandy, gItemIconPalette_DynamaxCandy}, - // Medicinal Flutes - [ITEM_BLUE_FLUTE] = {gItemIcon_Flute, gItemIconPalette_BlueFlute}, - [ITEM_YELLOW_FLUTE] = {gItemIcon_Flute, gItemIconPalette_YellowFlute}, - [ITEM_RED_FLUTE] = {gItemIcon_Flute, gItemIconPalette_RedFlute}, - // Encounter-modifying Flutes - [ITEM_BLACK_FLUTE] = {gItemIcon_Flute, gItemIconPalette_BlackFlute}, - [ITEM_WHITE_FLUTE] = {gItemIcon_Flute, gItemIconPalette_WhiteFlute}, - // Encounter Modifiers - [ITEM_REPEL] = {gItemIcon_Repel, gItemIconPalette_Repel}, - [ITEM_SUPER_REPEL] = {gItemIcon_Repel, gItemIconPalette_SuperRepel}, - [ITEM_MAX_REPEL] = {gItemIcon_Repel, gItemIconPalette_MaxRepel}, - [ITEM_LURE] = {gItemIcon_Lure, gItemIconPalette_Lure}, - [ITEM_SUPER_LURE] = {gItemIcon_Lure, gItemIconPalette_SuperLure}, - [ITEM_MAX_LURE] = {gItemIcon_Lure, gItemIconPalette_MaxLure}, - [ITEM_ESCAPE_ROPE] = {gItemIcon_EscapeRope, gItemIconPalette_EscapeRope}, - // X Items - [ITEM_X_ATTACK] = {gItemIcon_BattleStatItem, gItemIconPalette_XAttack}, - [ITEM_X_DEFENSE] = {gItemIcon_BattleStatItem, gItemIconPalette_XDefend}, - [ITEM_X_SP_ATK] = {gItemIcon_BattleStatItem, gItemIconPalette_XSpecial}, - [ITEM_X_SP_DEF] = {gItemIcon_XSpecialDefense, gItemIconPalette_XSpecialDefense}, - [ITEM_X_SPEED] = {gItemIcon_BattleStatItem, gItemIconPalette_XSpeed}, - [ITEM_X_ACCURACY] = {gItemIcon_BattleStatItem, gItemIconPalette_XAccuracy}, - [ITEM_DIRE_HIT] = {gItemIcon_BattleStatItem, gItemIconPalette_DireHit}, - [ITEM_GUARD_SPEC] = {gItemIcon_BattleStatItem, gItemIconPalette_GuardSpec}, - // Escape Items - [ITEM_POKE_DOLL] = {gItemIcon_PokeDoll, gItemIconPalette_PokeDoll}, - [ITEM_FLUFFY_TAIL] = {gItemIcon_FluffyTail, gItemIconPalette_FluffyTail}, - [ITEM_POKE_TOY] = {gItemIcon_PokeToy, gItemIconPalette_PokeToy}, - [ITEM_MAX_MUSHROOMS] = {gItemIcon_MaxMushrooms, gItemIconPalette_MaxMushrooms}, - // Treasures - [ITEM_BOTTLE_CAP] = {gItemIcon_BottleCap, gItemIconPalette_BottleCap}, - [ITEM_GOLD_BOTTLE_CAP] = {gItemIcon_BottleCap, gItemIconPalette_GoldBottleCap}, - [ITEM_NUGGET] = {gItemIcon_Nugget, gItemIconPalette_Nugget}, - [ITEM_BIG_NUGGET] = {gItemIcon_BigNugget, gItemIconPalette_BigNugget}, - [ITEM_TINY_MUSHROOM] = {gItemIcon_TinyMushroom, gItemIconPalette_Mushroom}, - [ITEM_BIG_MUSHROOM] = {gItemIcon_BigMushroom, gItemIconPalette_Mushroom}, - [ITEM_BALM_MUSHROOM] = {gItemIcon_BalmMushroom, gItemIconPalette_BalmMushroom}, - [ITEM_PEARL] = {gItemIcon_Pearl, gItemIconPalette_Pearl}, - [ITEM_BIG_PEARL] = {gItemIcon_BigPearl, gItemIconPalette_Pearl}, - [ITEM_PEARL_STRING] = {gItemIcon_PearlString, gItemIconPalette_PearlString}, - [ITEM_STARDUST] = {gItemIcon_Stardust, gItemIconPalette_Star}, - [ITEM_STAR_PIECE] = {gItemIcon_StarPiece, gItemIconPalette_Star}, - [ITEM_COMET_SHARD] = {gItemIcon_CometShard, gItemIconPalette_CometShard}, - [ITEM_SHOAL_SALT] = {gItemIcon_Powder, gItemIconPalette_ShoalSalt}, - [ITEM_SHOAL_SHELL] = {gItemIcon_ShoalShell, gItemIconPalette_Shell}, - [ITEM_RED_SHARD] = {gItemIcon_Shard, gItemIconPalette_RedShard}, - [ITEM_BLUE_SHARD] = {gItemIcon_Shard, gItemIconPalette_BlueShard}, - [ITEM_YELLOW_SHARD] = {gItemIcon_Shard, gItemIconPalette_YellowShard}, - [ITEM_GREEN_SHARD] = {gItemIcon_Shard, gItemIconPalette_GreenShard}, - [ITEM_HEART_SCALE] = {gItemIcon_HeartScale, gItemIconPalette_HeartScale}, - [ITEM_HONEY] = {gItemIcon_Honey, gItemIconPalette_Honey}, - [ITEM_RARE_BONE] = {gItemIcon_RareBone, gItemIconPalette_RareBone}, - [ITEM_ODD_KEYSTONE] = {gItemIcon_OddKeystone, gItemIconPalette_OddKeystone}, - [ITEM_PRETTY_FEATHER] = {gItemIcon_PrettyFeather, gItemIconPalette_PrettyFeather}, - [ITEM_RELIC_COPPER] = {gItemIcon_RelicCoin, gItemIconPalette_RelicCopper}, - [ITEM_RELIC_SILVER] = {gItemIcon_RelicCoin, gItemIconPalette_RelicSilver}, - [ITEM_RELIC_GOLD] = {gItemIcon_RelicCoin, gItemIconPalette_RelicGold}, - [ITEM_RELIC_VASE] = {gItemIcon_RelicVase, gItemIconPalette_Relics}, - [ITEM_RELIC_BAND] = {gItemIcon_RelicBand, gItemIconPalette_Relics}, - [ITEM_RELIC_STATUE] = {gItemIcon_RelicStatue, gItemIconPalette_Relics}, - [ITEM_RELIC_CROWN] = {gItemIcon_RelicCrown, gItemIconPalette_Relics}, - [ITEM_STRANGE_SOUVENIR] = {gItemIcon_StrangeSouvenir, gItemIconPalette_StrangeSouvenir}, - // Fossils - [ITEM_HELIX_FOSSIL] = {gItemIcon_HelixFossil, gItemIconPalette_KantoFossil}, - [ITEM_DOME_FOSSIL] = {gItemIcon_DomeFossil, gItemIconPalette_KantoFossil}, - [ITEM_OLD_AMBER] = {gItemIcon_OldAmber, gItemIconPalette_OldAmber}, - [ITEM_ROOT_FOSSIL] = {gItemIcon_RootFossil, gItemIconPalette_HoennFossil}, - [ITEM_CLAW_FOSSIL] = {gItemIcon_ClawFossil, gItemIconPalette_HoennFossil}, - [ITEM_ARMOR_FOSSIL] = {gItemIcon_ArmorFossil, gItemIconPalette_ArmorFossil}, - [ITEM_SKULL_FOSSIL] = {gItemIcon_SkullFossil, gItemIconPalette_SkullFossil}, - [ITEM_COVER_FOSSIL] = {gItemIcon_CoverFossil, gItemIconPalette_CoverFossil}, - [ITEM_PLUME_FOSSIL] = {gItemIcon_PlumeFossil, gItemIconPalette_PlumeFossil}, - [ITEM_JAW_FOSSIL] = {gItemIcon_JawFossil, gItemIconPalette_JawFossil}, - [ITEM_SAIL_FOSSIL] = {gItemIcon_SailFossil, gItemIconPalette_SailFossil}, - [ITEM_FOSSILIZED_BIRD] = {gItemIcon_FossilizedBird, gItemIconPalette_FossilizedBird}, - [ITEM_FOSSILIZED_FISH] = {gItemIcon_FossilizedFish, gItemIconPalette_FossilizedFish}, - [ITEM_FOSSILIZED_DRAKE] = {gItemIcon_FossilizedDrake, gItemIconPalette_FossilizedDrake}, - [ITEM_FOSSILIZED_DINO] = {gItemIcon_FossilizedDino, gItemIconPalette_FossilizedDino}, - // Mulch - [ITEM_GROWTH_MULCH] = {gItemIcon_Mulch, gItemIconPalette_GrowthMulch}, - [ITEM_DAMP_MULCH] = {gItemIcon_Mulch, gItemIconPalette_DampMulch}, - [ITEM_STABLE_MULCH] = {gItemIcon_StableMulch, gItemIconPalette_StableMulch}, - [ITEM_GOOEY_MULCH] = {gItemIcon_Mulch, gItemIconPalette_GooeyMulch}, - [ITEM_RICH_MULCH] = {gItemIcon_Mulch, gItemIconPalette_RichMulch}, - [ITEM_SURPRISE_MULCH] = {gItemIcon_Mulch, gItemIconPalette_SurpriseMulch}, - [ITEM_BOOST_MULCH] = {gItemIcon_Mulch, gItemIconPalette_BoostMulch}, - [ITEM_AMAZE_MULCH] = {gItemIcon_Mulch, gItemIconPalette_AmazeMulch}, - // Apricorns - [ITEM_RED_APRICORN] = {gItemIcon_RedApricorn, gItemIconPalette_RedApricorn}, - [ITEM_BLUE_APRICORN] = {gItemIcon_BlueApricorn, gItemIconPalette_BlueApricorn}, - [ITEM_YELLOW_APRICORN] = {gItemIcon_YellowApricorn, gItemIconPalette_YellowApricorn}, - [ITEM_GREEN_APRICORN] = {gItemIcon_GreenApricorn, gItemIconPalette_GreenApricorn}, - [ITEM_PINK_APRICORN] = {gItemIcon_PinkApricorn, gItemIconPalette_PinkApricorn}, - [ITEM_WHITE_APRICORN] = {gItemIcon_WhiteApricorn, gItemIconPalette_WhiteApricorn}, - [ITEM_BLACK_APRICORN] = {gItemIcon_BlackApricorn, gItemIconPalette_BlackApricorn}, - [ITEM_WISHING_PIECE] = {gItemIcon_WishingPiece, gItemIconPalette_WishingPiece}, - [ITEM_GALARICA_TWIG] = {gItemIcon_GalaricaTwig, gItemIconPalette_GalaricaItem}, - [ITEM_ARMORITE_ORE] = {gItemIcon_ArmoriteOre, gItemIconPalette_ArmoriteOre}, - [ITEM_DYNITE_ORE] = {gItemIcon_DyniteOre, gItemIconPalette_DyniteOre}, - // Mail - [ITEM_ORANGE_MAIL] = {gItemIcon_OrangeMail, gItemIconPalette_OrangeMail}, - [ITEM_HARBOR_MAIL] = {gItemIcon_HarborMail, gItemIconPalette_HarborMail}, - [ITEM_GLITTER_MAIL] = {gItemIcon_GlitterMail, gItemIconPalette_GlitterMail}, - [ITEM_MECH_MAIL] = {gItemIcon_MechMail, gItemIconPalette_MechMail}, - [ITEM_WOOD_MAIL] = {gItemIcon_WoodMail, gItemIconPalette_WoodMail}, - [ITEM_WAVE_MAIL] = {gItemIcon_WaveMail, gItemIconPalette_WaveMail}, - [ITEM_BEAD_MAIL] = {gItemIcon_BeadMail, gItemIconPalette_BeadMail}, - [ITEM_SHADOW_MAIL] = {gItemIcon_ShadowMail, gItemIconPalette_ShadowMail}, - [ITEM_TROPIC_MAIL] = {gItemIcon_TropicMail, gItemIconPalette_TropicMail}, - [ITEM_DREAM_MAIL] = {gItemIcon_DreamMail, gItemIconPalette_DreamMail}, - [ITEM_FAB_MAIL] = {gItemIcon_FabMail, gItemIconPalette_FabMail}, - [ITEM_RETRO_MAIL] = {gItemIcon_RetroMail, gItemIconPalette_RetroMail}, - // Evolution Items - [ITEM_FIRE_STONE] = {gItemIcon_FireStone, gItemIconPalette_FireStone}, - [ITEM_WATER_STONE] = {gItemIcon_WaterStone, gItemIconPalette_WaterStone}, - [ITEM_THUNDER_STONE] = {gItemIcon_ThunderStone, gItemIconPalette_ThunderStone}, - [ITEM_LEAF_STONE] = {gItemIcon_LeafStone, gItemIconPalette_LeafStone}, - [ITEM_ICE_STONE] = {gItemIcon_IceStone, gItemIconPalette_IceStone}, - [ITEM_SUN_STONE] = {gItemIcon_SunStone, gItemIconPalette_SunStone}, - [ITEM_MOON_STONE] = {gItemIcon_MoonStone, gItemIconPalette_MoonStone}, - [ITEM_SHINY_STONE] = {gItemIcon_ShinyStone, gItemIconPalette_ShinyStone}, - [ITEM_DUSK_STONE] = {gItemIcon_DuskStone, gItemIconPalette_DuskStone}, - [ITEM_DAWN_STONE] = {gItemIcon_DawnStone, gItemIconPalette_DawnStone}, - [ITEM_SWEET_APPLE] = {gItemIcon_SweetApple, gItemIconPalette_SweetApple}, - [ITEM_TART_APPLE] = {gItemIcon_TartApple, gItemIconPalette_TartApple}, - [ITEM_CRACKED_POT] = {gItemIcon_CrackedPot, gItemIconPalette_Pot}, - [ITEM_CHIPPED_POT] = {gItemIcon_ChippedPot, gItemIconPalette_Pot}, - [ITEM_GALARICA_CUFF] = {gItemIcon_GalaricaCuff, gItemIconPalette_GalaricaItem}, - [ITEM_GALARICA_WREATH] = {gItemIcon_GalaricaWreath, gItemIconPalette_GalaricaItem}, - [ITEM_DRAGON_SCALE] = {gItemIcon_DragonScale, gItemIconPalette_DragonScale}, - [ITEM_UPGRADE] = {gItemIcon_Upgrade, gItemIconPalette_Upgrade}, - [ITEM_PROTECTOR] = {gItemIcon_Protector, gItemIconPalette_Protector}, - [ITEM_ELECTIRIZER] = {gItemIcon_Electirizer, gItemIconPalette_Electirizer}, - [ITEM_MAGMARIZER] = {gItemIcon_Magmarizer, gItemIconPalette_Magmarizer}, - [ITEM_DUBIOUS_DISC] = {gItemIcon_DubiousDisc, gItemIconPalette_DubiousDisc}, - [ITEM_REAPER_CLOTH] = {gItemIcon_ReaperCloth, gItemIconPalette_ReaperCloth}, - [ITEM_PRISM_SCALE] = {gItemIcon_PrismScale, gItemIconPalette_PrismScale}, - [ITEM_WHIPPED_DREAM] = {gItemIcon_WhippedDream, gItemIconPalette_WhippedDream}, - [ITEM_SACHET] = {gItemIcon_Sachet, gItemIconPalette_Sachet}, - [ITEM_OVAL_STONE] = {gItemIcon_OvalStone, gItemIconPalette_OvalStone}, - [ITEM_STRAWBERRY_SWEET] = {gItemIcon_StrawberrySweet, gItemIconPalette_StrawberrySweet}, - [ITEM_LOVE_SWEET] = {gItemIcon_LoveSweet, gItemIconPalette_LoveSweet}, - [ITEM_BERRY_SWEET] = {gItemIcon_BerrySweet, gItemIconPalette_BerrySweet}, - [ITEM_CLOVER_SWEET] = {gItemIcon_CloverSweet, gItemIconPalette_CloverSweet}, - [ITEM_FLOWER_SWEET] = {gItemIcon_FlowerSweet, gItemIconPalette_FlowerSweet}, - [ITEM_STAR_SWEET] = {gItemIcon_StarSweet, gItemIconPalette_StarSweet}, - [ITEM_RIBBON_SWEET] = {gItemIcon_RibbonSweet, gItemIconPalette_RibbonSweet}, - [ITEM_EVERSTONE] = {gItemIcon_Everstone, gItemIconPalette_Everstone}, - // Nectars - [ITEM_RED_NECTAR] = {gItemIcon_RedNectar, gItemIconPalette_RedNectar}, - [ITEM_YELLOW_NECTAR] = {gItemIcon_YellowNectar, gItemIconPalette_YellowNectar}, - [ITEM_PINK_NECTAR] = {gItemIcon_PinkNectar, gItemIconPalette_PinkNectar}, - [ITEM_PURPLE_NECTAR] = {gItemIcon_PurpleNectar, gItemIconPalette_PurpleNectar}, - // Plates - [ITEM_FLAME_PLATE] = {gItemIcon_FlamePlate, gItemIconPalette_FlamePlate}, - [ITEM_SPLASH_PLATE] = {gItemIcon_SplashPlate, gItemIconPalette_SplashPlate}, - [ITEM_ZAP_PLATE] = {gItemIcon_ZapPlate, gItemIconPalette_ZapPlate}, - [ITEM_MEADOW_PLATE] = {gItemIcon_MeadowPlate, gItemIconPalette_MeadowPlate}, - [ITEM_ICICLE_PLATE] = {gItemIcon_IciclePlate, gItemIconPalette_IciclePlate}, - [ITEM_FIST_PLATE] = {gItemIcon_FistPlate, gItemIconPalette_FistPlate}, - [ITEM_TOXIC_PLATE] = {gItemIcon_ToxicPlate, gItemIconPalette_ToxicPlate}, - [ITEM_EARTH_PLATE] = {gItemIcon_EarthPlate, gItemIconPalette_EarthPlate}, - [ITEM_SKY_PLATE] = {gItemIcon_SkyPlate, gItemIconPalette_SkyPlate}, - [ITEM_MIND_PLATE] = {gItemIcon_MindPlate, gItemIconPalette_MindPlate}, - [ITEM_INSECT_PLATE] = {gItemIcon_InsectPlate, gItemIconPalette_InsectPlate}, - [ITEM_STONE_PLATE] = {gItemIcon_StonePlate, gItemIconPalette_StonePlate}, - [ITEM_SPOOKY_PLATE] = {gItemIcon_SpookyPlate, gItemIconPalette_SpookyPlate}, - [ITEM_DRACO_PLATE] = {gItemIcon_DracoPlate, gItemIconPalette_DracoPlate}, - [ITEM_DREAD_PLATE] = {gItemIcon_DreadPlate, gItemIconPalette_DreadPlate}, - [ITEM_IRON_PLATE] = {gItemIcon_IronPlate, gItemIconPalette_IronPlate}, - [ITEM_PIXIE_PLATE] = {gItemIcon_PixiePlate, gItemIconPalette_PixiePlate}, - // Drives - [ITEM_DOUSE_DRIVE] = {gItemIcon_DouseDrive, gItemIconPalette_DouseDrive}, - [ITEM_SHOCK_DRIVE] = {gItemIcon_ShockDrive, gItemIconPalette_ShockDrive}, - [ITEM_BURN_DRIVE] = {gItemIcon_BurnDrive, gItemIconPalette_BurnDrive}, - [ITEM_CHILL_DRIVE] = {gItemIcon_ChillDrive, gItemIconPalette_ChillDrive}, - // Memories - [ITEM_FIRE_MEMORY] = {gItemIcon_FireMemory, gItemIconPalette_FireMemory}, - [ITEM_WATER_MEMORY] = {gItemIcon_WaterMemory, gItemIconPalette_WaterMemory}, - [ITEM_ELECTRIC_MEMORY] = {gItemIcon_ElectricMemory, gItemIconPalette_ElectricMemory}, - [ITEM_GRASS_MEMORY] = {gItemIcon_GrassMemory, gItemIconPalette_GrassMemory}, - [ITEM_ICE_MEMORY] = {gItemIcon_IceMemory, gItemIconPalette_IceMemory}, - [ITEM_FIGHTING_MEMORY] = {gItemIcon_FightingMemory, gItemIconPalette_FightingMemory}, - [ITEM_POISON_MEMORY] = {gItemIcon_PoisonMemory, gItemIconPalette_PoisonMemory}, - [ITEM_GROUND_MEMORY] = {gItemIcon_GroundMemory, gItemIconPalette_GroundMemory}, - [ITEM_FLYING_MEMORY] = {gItemIcon_FlyingMemory, gItemIconPalette_FlyingMemory}, - [ITEM_PSYCHIC_MEMORY] = {gItemIcon_PsychicMemory, gItemIconPalette_PsychicMemory}, - [ITEM_BUG_MEMORY] = {gItemIcon_BugMemory, gItemIconPalette_BugMemory}, - [ITEM_ROCK_MEMORY] = {gItemIcon_RockMemory, gItemIconPalette_RockMemory}, - [ITEM_GHOST_MEMORY] = {gItemIcon_GhostMemory, gItemIconPalette_GhostMemory}, - [ITEM_DRAGON_MEMORY] = {gItemIcon_DragonMemory, gItemIconPalette_DragonMemory}, - [ITEM_DARK_MEMORY] = {gItemIcon_DarkMemory, gItemIconPalette_DarkMemory}, - [ITEM_STEEL_MEMORY] = {gItemIcon_SteelMemory, gItemIconPalette_SteelMemory}, - [ITEM_FAIRY_MEMORY] = {gItemIcon_FairyMemory, gItemIconPalette_FairyMemory}, - [ITEM_RUSTED_SWORD] = {gItemIcon_RustedSword, gItemIconPalette_RustedWeapons}, - [ITEM_RUSTED_SHIELD] = {gItemIcon_RustedShield, gItemIconPalette_RustedWeapons}, - // Colored Orbs - [ITEM_RED_ORB] = {gItemIcon_RedOrb, gItemIconPalette_RedOrb}, - [ITEM_BLUE_ORB] = {gItemIcon_BlueOrb, gItemIconPalette_BlueOrb}, - // Mega Stones - [ITEM_VENUSAURITE] = {gItemIcon_Venusaurite, gItemIconPalette_Venusaurite}, - [ITEM_CHARIZARDITE_X] = {gItemIcon_CharizarditeX, gItemIconPalette_CharizarditeX}, - [ITEM_CHARIZARDITE_Y] = {gItemIcon_CharizarditeY, gItemIconPalette_CharizarditeY}, - [ITEM_BLASTOISINITE] = {gItemIcon_Blastoisinite, gItemIconPalette_Blastoisinite}, - [ITEM_BEEDRILLITE] = {gItemIcon_Beedrillite, gItemIconPalette_Beedrillite}, - [ITEM_PIDGEOTITE] = {gItemIcon_Pidgeotite, gItemIconPalette_Pidgeotite}, - [ITEM_ALAKAZITE] = {gItemIcon_Alakazite, gItemIconPalette_Alakazite}, - [ITEM_SLOWBRONITE] = {gItemIcon_Slowbronite, gItemIconPalette_Slowbronite}, - [ITEM_GENGARITE] = {gItemIcon_Gengarite, gItemIconPalette_Gengarite}, - [ITEM_KANGASKHANITE] = {gItemIcon_Kangaskhanite, gItemIconPalette_Kangaskhanite}, - [ITEM_PINSIRITE] = {gItemIcon_Pinsirite, gItemIconPalette_Pinsirite}, - [ITEM_GYARADOSITE] = {gItemIcon_Gyaradosite, gItemIconPalette_Gyaradosite}, - [ITEM_AERODACTYLITE] = {gItemIcon_Aerodactylite, gItemIconPalette_Aerodactylite}, - [ITEM_MEWTWONITE_X] = {gItemIcon_MewtwoniteX, gItemIconPalette_MewtwoniteX}, - [ITEM_MEWTWONITE_Y] = {gItemIcon_MewtwoniteY, gItemIconPalette_MewtwoniteY}, - [ITEM_AMPHAROSITE] = {gItemIcon_Ampharosite, gItemIconPalette_Ampharosite}, - [ITEM_STEELIXITE] = {gItemIcon_Steelixite, gItemIconPalette_Steelixite}, - [ITEM_SCIZORITE] = {gItemIcon_Scizorite, gItemIconPalette_Scizorite}, - [ITEM_HERACRONITE] = {gItemIcon_Heracronite, gItemIconPalette_Heracronite}, - [ITEM_HOUNDOOMINITE] = {gItemIcon_Houndoominite, gItemIconPalette_Houndoominite}, - [ITEM_TYRANITARITE] = {gItemIcon_Tyranitarite, gItemIconPalette_Tyranitarite}, - [ITEM_SCEPTILITE] = {gItemIcon_Sceptilite, gItemIconPalette_Sceptilite}, - [ITEM_BLAZIKENITE] = {gItemIcon_Blazikenite, gItemIconPalette_Blazikenite}, - [ITEM_SWAMPERTITE] = {gItemIcon_Swampertite, gItemIconPalette_Swampertite}, - [ITEM_GARDEVOIRITE] = {gItemIcon_Gardevoirite, gItemIconPalette_Gardevoirite}, - [ITEM_SABLENITE] = {gItemIcon_Sablenite, gItemIconPalette_Sablenite}, - [ITEM_MAWILITE] = {gItemIcon_Mawilite, gItemIconPalette_Mawilite}, - [ITEM_AGGRONITE] = {gItemIcon_Aggronite, gItemIconPalette_Aggronite}, - [ITEM_MEDICHAMITE] = {gItemIcon_Medichamite, gItemIconPalette_Medichamite}, - [ITEM_MANECTITE] = {gItemIcon_Manectite, gItemIconPalette_Manectite}, - [ITEM_SHARPEDONITE] = {gItemIcon_Sharpedonite, gItemIconPalette_Sharpedonite}, - [ITEM_CAMERUPTITE] = {gItemIcon_Cameruptite, gItemIconPalette_Cameruptite}, - [ITEM_ALTARIANITE] = {gItemIcon_Altarianite, gItemIconPalette_Altarianite}, - [ITEM_BANETTITE] = {gItemIcon_Banettite, gItemIconPalette_Banettite}, - [ITEM_ABSOLITE] = {gItemIcon_Absolite, gItemIconPalette_Absolite}, - [ITEM_GLALITITE] = {gItemIcon_Glalitite, gItemIconPalette_Glalitite}, - [ITEM_SALAMENCITE] = {gItemIcon_Salamencite, gItemIconPalette_Salamencite}, - [ITEM_METAGROSSITE] = {gItemIcon_Metagrossite, gItemIconPalette_Metagrossite}, - [ITEM_LATIASITE] = {gItemIcon_Latiasite, gItemIconPalette_Latiasite}, - [ITEM_LATIOSITE] = {gItemIcon_Latiosite, gItemIconPalette_Latiosite}, - [ITEM_LOPUNNITE] = {gItemIcon_Lopunnite, gItemIconPalette_Lopunnite}, - [ITEM_GARCHOMPITE] = {gItemIcon_Garchompite, gItemIconPalette_Garchompite}, - [ITEM_LUCARIONITE] = {gItemIcon_Lucarionite, gItemIconPalette_Lucarionite}, - [ITEM_ABOMASITE] = {gItemIcon_Abomasite, gItemIconPalette_Abomasite}, - [ITEM_GALLADITE] = {gItemIcon_Galladite, gItemIconPalette_Galladite}, - [ITEM_AUDINITE] = {gItemIcon_Audinite, gItemIconPalette_Audinite}, - [ITEM_DIANCITE] = {gItemIcon_Diancite, gItemIconPalette_Diancite}, - // Gems - [ITEM_NORMAL_GEM] = {gItemIcon_NormalGem, gItemIconPalette_NormalGem}, - [ITEM_FIRE_GEM] = {gItemIcon_FireGem, gItemIconPalette_FireGem}, - [ITEM_WATER_GEM] = {gItemIcon_WaterGem, gItemIconPalette_WaterGem}, - [ITEM_ELECTRIC_GEM] = {gItemIcon_ElectricGem, gItemIconPalette_ElectricGem}, - [ITEM_GRASS_GEM] = {gItemIcon_GrassGem, gItemIconPalette_GrassGem}, - [ITEM_ICE_GEM] = {gItemIcon_IceGem, gItemIconPalette_IceGem}, - [ITEM_FIGHTING_GEM] = {gItemIcon_FightingGem, gItemIconPalette_FightingGem}, - [ITEM_POISON_GEM] = {gItemIcon_PoisonGem, gItemIconPalette_PoisonGem}, - [ITEM_GROUND_GEM] = {gItemIcon_GroundGem, gItemIconPalette_GroundGem}, - [ITEM_FLYING_GEM] = {gItemIcon_FlyingGem, gItemIconPalette_FlyingGem}, - [ITEM_PSYCHIC_GEM] = {gItemIcon_PsychicGem, gItemIconPalette_PsychicGem}, - [ITEM_BUG_GEM] = {gItemIcon_BugGem, gItemIconPalette_BugGem}, - [ITEM_ROCK_GEM] = {gItemIcon_RockGem, gItemIconPalette_RockGem}, - [ITEM_GHOST_GEM] = {gItemIcon_GhostGem, gItemIconPalette_GhostGem}, - [ITEM_DRAGON_GEM] = {gItemIcon_DragonGem, gItemIconPalette_DragonGem}, - [ITEM_DARK_GEM] = {gItemIcon_DarkGem, gItemIconPalette_DarkGem}, - [ITEM_STEEL_GEM] = {gItemIcon_SteelGem, gItemIconPalette_SteelGem}, - [ITEM_FAIRY_GEM] = {gItemIcon_FairyGem, gItemIconPalette_FairyGem}, - // Z-Crystals - [ITEM_NORMALIUM_Z] = {gItemIcon_NormaliumZ, gItemIconPalette_NormaliumZ}, - [ITEM_FIRIUM_Z] = {gItemIcon_FiriumZ, gItemIconPalette_FiriumZ}, - [ITEM_WATERIUM_Z] = {gItemIcon_WateriumZ, gItemIconPalette_WateriumZ}, - [ITEM_ELECTRIUM_Z] = {gItemIcon_ElectriumZ, gItemIconPalette_ElectriumZ}, - [ITEM_GRASSIUM_Z] = {gItemIcon_GrassiumZ, gItemIconPalette_GrassiumZ}, - [ITEM_ICIUM_Z] = {gItemIcon_IciumZ, gItemIconPalette_IciumZ}, - [ITEM_FIGHTINIUM_Z] = {gItemIcon_FightiniumZ, gItemIconPalette_FightiniumZ}, - [ITEM_POISONIUM_Z] = {gItemIcon_PoisoniumZ, gItemIconPalette_PoisoniumZ}, - [ITEM_GROUNDIUM_Z] = {gItemIcon_GroundiumZ, gItemIconPalette_GroundiumZ}, - [ITEM_FLYINIUM_Z] = {gItemIcon_FlyiniumZ, gItemIconPalette_FlyiniumZ}, - [ITEM_PSYCHIUM_Z] = {gItemIcon_PsychiumZ, gItemIconPalette_PsychiumZ}, - [ITEM_BUGINIUM_Z] = {gItemIcon_BuginiumZ, gItemIconPalette_BuginiumZ}, - [ITEM_ROCKIUM_Z] = {gItemIcon_RockiumZ, gItemIconPalette_RockiumZ}, - [ITEM_GHOSTIUM_Z] = {gItemIcon_GhostiumZ, gItemIconPalette_GhostiumZ}, - [ITEM_DRAGONIUM_Z] = {gItemIcon_DragoniumZ, gItemIconPalette_DragoniumZ}, - [ITEM_DARKINIUM_Z] = {gItemIcon_DarkiniumZ, gItemIconPalette_DarkiniumZ}, - [ITEM_STEELIUM_Z] = {gItemIcon_SteeliumZ, gItemIconPalette_SteeliumZ}, - [ITEM_FAIRIUM_Z] = {gItemIcon_FairiumZ, gItemIconPalette_FairiumZ}, - [ITEM_PIKANIUM_Z] = {gItemIcon_PikaniumZ, gItemIconPalette_PikaniumZ}, - [ITEM_EEVIUM_Z] = {gItemIcon_EeviumZ, gItemIconPalette_EeviumZ}, - [ITEM_SNORLIUM_Z] = {gItemIcon_SnorliumZ, gItemIconPalette_SnorliumZ}, - [ITEM_MEWNIUM_Z] = {gItemIcon_MewniumZ, gItemIconPalette_MewniumZ}, - [ITEM_DECIDIUM_Z] = {gItemIcon_DecidiumZ, gItemIconPalette_DecidiumZ}, - [ITEM_INCINIUM_Z] = {gItemIcon_InciniumZ, gItemIconPalette_InciniumZ}, - [ITEM_PRIMARIUM_Z] = {gItemIcon_PrimariumZ, gItemIconPalette_PrimariumZ}, - [ITEM_LYCANIUM_Z] = {gItemIcon_LycaniumZ, gItemIconPalette_LycaniumZ}, - [ITEM_MIMIKIUM_Z] = {gItemIcon_MimikiumZ, gItemIconPalette_MimikiumZ}, - [ITEM_KOMMONIUM_Z] = {gItemIcon_KommoniumZ, gItemIconPalette_KommoniumZ}, - [ITEM_TAPUNIUM_Z] = {gItemIcon_TapuniumZ, gItemIconPalette_TapuniumZ}, - [ITEM_SOLGANIUM_Z] = {gItemIcon_SolganiumZ, gItemIconPalette_SolganiumZ}, - [ITEM_LUNALIUM_Z] = {gItemIcon_LunaliumZ, gItemIconPalette_LunaliumZ}, - [ITEM_MARSHADIUM_Z] = {gItemIcon_MarshadiumZ, gItemIconPalette_MarshadiumZ}, - [ITEM_ALORAICHIUM_Z] = {gItemIcon_AloraichiumZ, gItemIconPalette_AloraichiumZ}, - [ITEM_PIKASHUNIUM_Z] = {gItemIcon_PikashuniumZ, gItemIconPalette_PikashuniumZ}, - [ITEM_ULTRANECROZIUM_Z] = {gItemIcon_UltranecroziumZ, gItemIconPalette_UltranecroziumZ}, - // Species-specific Held Items - [ITEM_LIGHT_BALL] = {gItemIcon_LightBall, gItemIconPalette_LightBall}, - [ITEM_LEEK] = {gItemIcon_Leek, gItemIconPalette_Leek}, - [ITEM_THICK_CLUB] = {gItemIcon_ThickClub, gItemIconPalette_ThickClub}, - [ITEM_LUCKY_PUNCH] = {gItemIcon_LuckyPunch, gItemIconPalette_LuckyPunch}, - [ITEM_METAL_POWDER] = {gItemIcon_MetalPowder, gItemIconPalette_MetalPowder}, - [ITEM_QUICK_POWDER] = {gItemIcon_QuickPowder, gItemIconPalette_QuickPowder}, - [ITEM_DEEP_SEA_SCALE] = {gItemIcon_DeepSeaScale, gItemIconPalette_DeepSeaScale}, - [ITEM_DEEP_SEA_TOOTH] = {gItemIcon_DeepSeaTooth, gItemIconPalette_DeepSeaTooth}, - [ITEM_SOUL_DEW] = {gItemIcon_SoulDew, gItemIconPalette_SoulDew}, - [ITEM_ADAMANT_ORB] = {gItemIcon_AdamantOrb, gItemIconPalette_AdamantOrb}, - [ITEM_LUSTROUS_ORB] = {gItemIcon_LustrousOrb, gItemIconPalette_LustrousOrb}, - [ITEM_GRISEOUS_ORB] = {gItemIcon_GriseousOrb, gItemIconPalette_GriseousOrb}, - // Incenses - [ITEM_SEA_INCENSE] = {gItemIcon_SeaIncense, gItemIconPalette_SeaIncense}, - [ITEM_LAX_INCENSE] = {gItemIcon_LaxIncense, gItemIconPalette_LaxIncense}, - [ITEM_ODD_INCENSE] = {gItemIcon_OddIncense, gItemIconPalette_OddIncense}, - [ITEM_ROCK_INCENSE] = {gItemIcon_RockIncense, gItemIconPalette_RockIncense}, - [ITEM_FULL_INCENSE] = {gItemIcon_FullIncense, gItemIconPalette_FullIncense}, - [ITEM_WAVE_INCENSE] = {gItemIcon_WaveIncense, gItemIconPalette_WaveIncense}, - [ITEM_ROSE_INCENSE] = {gItemIcon_RoseIncense, gItemIconPalette_RoseIncense}, - [ITEM_LUCK_INCENSE] = {gItemIcon_LuckIncense, gItemIconPalette_LuckIncense}, - [ITEM_PURE_INCENSE] = {gItemIcon_PureIncense, gItemIconPalette_PureIncense}, - // Contest Scarves - [ITEM_RED_SCARF] = {gItemIcon_Scarf, gItemIconPalette_RedScarf}, - [ITEM_BLUE_SCARF] = {gItemIcon_Scarf, gItemIconPalette_BlueScarf}, - [ITEM_PINK_SCARF] = {gItemIcon_Scarf, gItemIconPalette_PinkScarf}, - [ITEM_GREEN_SCARF] = {gItemIcon_Scarf, gItemIconPalette_GreenScarf}, - [ITEM_YELLOW_SCARF] = {gItemIcon_Scarf, gItemIconPalette_YellowScarf}, - // EV Gain Modifiers - [ITEM_MACHO_BRACE] = {gItemIcon_MachoBrace, gItemIconPalette_MachoBrace}, - [ITEM_POWER_WEIGHT] = {gItemIcon_PowerWeight, gItemIconPalette_PowerWeight}, - [ITEM_POWER_BRACER] = {gItemIcon_PowerBracer, gItemIconPalette_PowerBracer}, - [ITEM_POWER_BELT] = {gItemIcon_PowerBelt, gItemIconPalette_PowerBelt}, - [ITEM_POWER_LENS] = {gItemIcon_PowerLens, gItemIconPalette_PowerLens}, - [ITEM_POWER_BAND] = {gItemIcon_PowerBand, gItemIconPalette_PowerBand}, - [ITEM_POWER_ANKLET] = {gItemIcon_PowerAnklet, gItemIconPalette_PowerAnklet}, - // Type-boosting Held Items - [ITEM_SILK_SCARF] = {gItemIcon_SilkScarf, gItemIconPalette_SilkScarf}, - [ITEM_CHARCOAL] = {gItemIcon_Charcoal, gItemIconPalette_Charcoal}, - [ITEM_MYSTIC_WATER] = {gItemIcon_MysticWater, gItemIconPalette_MysticWater}, - [ITEM_MAGNET] = {gItemIcon_Magnet, gItemIconPalette_Magnet}, - [ITEM_MIRACLE_SEED] = {gItemIcon_MiracleSeed, gItemIconPalette_MiracleSeed}, - [ITEM_NEVER_MELT_ICE] = {gItemIcon_NeverMeltIce, gItemIconPalette_NeverMeltIce}, - [ITEM_BLACK_BELT] = {gItemIcon_BlackBelt, gItemIconPalette_BlackTypeEnhancingItem}, - [ITEM_POISON_BARB] = {gItemIcon_PoisonBarb, gItemIconPalette_PoisonBarb}, - [ITEM_SOFT_SAND] = {gItemIcon_SoftSand, gItemIconPalette_SoftSand}, - [ITEM_SHARP_BEAK] = {gItemIcon_SharpBeak, gItemIconPalette_SharpBeak}, - [ITEM_TWISTED_SPOON] = {gItemIcon_TwistedSpoon, gItemIconPalette_TwistedSpoon}, - [ITEM_SILVER_POWDER] = {gItemIcon_SilverPowder, gItemIconPalette_SilverPowder}, - [ITEM_HARD_STONE] = {gItemIcon_HardStone, gItemIconPalette_HardStone}, - [ITEM_SPELL_TAG] = {gItemIcon_SpellTag, gItemIconPalette_SpellTag}, - [ITEM_DRAGON_FANG] = {gItemIcon_DragonFang, gItemIconPalette_DragonFang}, - [ITEM_BLACK_GLASSES] = {gItemIcon_BlackGlasses, gItemIconPalette_BlackTypeEnhancingItem}, - [ITEM_METAL_COAT] = {gItemIcon_MetalCoat, gItemIconPalette_MetalCoat}, - // Choice Items - [ITEM_CHOICE_BAND] = {gItemIcon_ChoiceBand, gItemIconPalette_ChoiceBand}, - [ITEM_CHOICE_SPECS] = {gItemIcon_ChoiceSpecs, gItemIconPalette_ChoiceSpecs}, - [ITEM_CHOICE_SCARF] = {gItemIcon_ChoiceScarf, gItemIconPalette_ChoiceScarf}, - // Status Orbs - [ITEM_FLAME_ORB] = {gItemIcon_FlameOrb, gItemIconPalette_FlameOrb}, - [ITEM_TOXIC_ORB] = {gItemIcon_ToxicOrb, gItemIconPalette_ToxicOrb}, - // Weather Rocks - [ITEM_DAMP_ROCK] = {gItemIcon_DampRock, gItemIconPalette_DampRock}, - [ITEM_HEAT_ROCK] = {gItemIcon_HeatRock, gItemIconPalette_HeatRock}, - [ITEM_SMOOTH_ROCK] = {gItemIcon_SmoothRock, gItemIconPalette_SmoothRock}, - [ITEM_ICY_ROCK] = {gItemIcon_IcyRock, gItemIconPalette_IcyRock}, - // Terrain Seeds - [ITEM_ELECTRIC_SEED] = {gItemIcon_ElectricSeed, gItemIconPalette_ElectricSeed}, - [ITEM_PSYCHIC_SEED] = {gItemIcon_PsychicSeed, gItemIconPalette_PsychicSeed}, - [ITEM_MISTY_SEED] = {gItemIcon_MistySeed, gItemIconPalette_MistySeed}, - [ITEM_GRASSY_SEED] = {gItemIcon_GrassySeed, gItemIconPalette_GrassySeed}, - // Type-activated Stat Modifiers - [ITEM_ABSORB_BULB] = {gItemIcon_AbsorbBulb, gItemIconPalette_AbsorbBulb}, - [ITEM_CELL_BATTERY] = {gItemIcon_CellBattery, gItemIconPalette_CellBattery}, - [ITEM_LUMINOUS_MOSS] = {gItemIcon_LuminousMoss, gItemIconPalette_LuminousMoss}, - [ITEM_SNOWBALL] = {gItemIcon_Snowball, gItemIconPalette_Snowball}, - // Misc. Held Items - [ITEM_BRIGHT_POWDER] = {gItemIcon_BrightPowder, gItemIconPalette_BrightPowder}, - [ITEM_WHITE_HERB] = {gItemIcon_InBattleHerb, gItemIconPalette_WhiteHerb}, - [ITEM_EXP_SHARE] = {gItemIcon_ExpShare, gItemIconPalette_ExpShare}, - [ITEM_QUICK_CLAW] = {gItemIcon_QuickClaw, gItemIconPalette_QuickClaw}, - [ITEM_SOOTHE_BELL] = {gItemIcon_SootheBell, gItemIconPalette_SootheBell}, - [ITEM_MENTAL_HERB] = {gItemIcon_InBattleHerb, gItemIconPalette_MentalHerb}, - [ITEM_KINGS_ROCK] = {gItemIcon_KingsRock, gItemIconPalette_KingsRock}, - [ITEM_AMULET_COIN] = {gItemIcon_AmuletCoin, gItemIconPalette_AmuletCoin}, - [ITEM_CLEANSE_TAG] = {gItemIcon_CleanseTag, gItemIconPalette_CleanseTag}, - [ITEM_SMOKE_BALL] = {gItemIcon_SmokeBall, gItemIconPalette_SmokeBall}, - [ITEM_FOCUS_BAND] = {gItemIcon_FocusBand, gItemIconPalette_FocusBand}, - [ITEM_LUCKY_EGG] = {gItemIcon_LuckyEgg, gItemIconPalette_LuckyEgg}, - [ITEM_SCOPE_LENS] = {gItemIcon_ScopeLens, gItemIconPalette_ScopeLens}, - [ITEM_LEFTOVERS] = {gItemIcon_Leftovers, gItemIconPalette_Leftovers}, - [ITEM_SHELL_BELL] = {gItemIcon_ShellBell, gItemIconPalette_Shell}, - [ITEM_WIDE_LENS] = {gItemIcon_WideLens, gItemIconPalette_WideLens}, - [ITEM_MUSCLE_BAND] = {gItemIcon_MuscleBand, gItemIconPalette_MuscleBand}, - [ITEM_WISE_GLASSES] = {gItemIcon_WiseGlasses, gItemIconPalette_WiseGlasses}, - [ITEM_EXPERT_BELT] = {gItemIcon_ExpertBelt, gItemIconPalette_ExpertBelt}, - [ITEM_LIGHT_CLAY] = {gItemIcon_LightClay, gItemIconPalette_LightClay}, - [ITEM_LIFE_ORB] = {gItemIcon_LifeOrb, gItemIconPalette_LifeOrb}, - [ITEM_POWER_HERB] = {gItemIcon_PowerHerb, gItemIconPalette_PowerHerb}, - [ITEM_FOCUS_SASH] = {gItemIcon_FocusSash, gItemIconPalette_FocusSash}, - [ITEM_ZOOM_LENS] = {gItemIcon_ZoomLens, gItemIconPalette_ZoomLens}, - [ITEM_METRONOME] = {gItemIcon_Metronome, gItemIconPalette_Metronome}, - [ITEM_IRON_BALL] = {gItemIcon_IronBall, gItemIconPalette_IronBall}, - [ITEM_LAGGING_TAIL] = {gItemIcon_LaggingTail, gItemIconPalette_LaggingTail}, - [ITEM_DESTINY_KNOT] = {gItemIcon_DestinyKnot, gItemIconPalette_DestinyKnot}, - [ITEM_BLACK_SLUDGE] = {gItemIcon_BlackSludge, gItemIconPalette_BlackSludge}, - [ITEM_GRIP_CLAW] = {gItemIcon_GripClaw, gItemIconPalette_GripClaw}, - [ITEM_STICKY_BARB] = {gItemIcon_StickyBarb, gItemIconPalette_StickyBarb}, - [ITEM_SHED_SHELL] = {gItemIcon_ShedShell, gItemIconPalette_ShedShell}, - [ITEM_BIG_ROOT] = {gItemIcon_BigRoot, gItemIconPalette_BigRoot}, - [ITEM_RAZOR_CLAW] = {gItemIcon_RazorClaw, gItemIconPalette_RazorClaw}, - [ITEM_RAZOR_FANG] = {gItemIcon_RazorFang, gItemIconPalette_RazorFang}, - [ITEM_EVIOLITE] = {gItemIcon_Eviolite, gItemIconPalette_Eviolite}, - [ITEM_FLOAT_STONE] = {gItemIcon_FloatStone, gItemIconPalette_FloatStone}, - [ITEM_ROCKY_HELMET] = {gItemIcon_RockyHelmet, gItemIconPalette_RockyHelmet}, - [ITEM_AIR_BALLOON] = {gItemIcon_AirBalloon, gItemIconPalette_AirBalloon}, - [ITEM_RED_CARD] = {gItemIcon_RedCard, gItemIconPalette_RedCard}, - [ITEM_RING_TARGET] = {gItemIcon_RingTarget, gItemIconPalette_RingTarget}, - [ITEM_BINDING_BAND] = {gItemIcon_BindingBand, gItemIconPalette_BindingBand}, - [ITEM_EJECT_BUTTON] = {gItemIcon_EjectButton, gItemIconPalette_EjectButton}, - [ITEM_WEAKNESS_POLICY] = {gItemIcon_WeaknessPolicy, gItemIconPalette_WeaknessPolicy}, - [ITEM_ASSAULT_VEST] = {gItemIcon_AssaultVest, gItemIconPalette_AssaultVest}, - [ITEM_SAFETY_GOGGLES] = {gItemIcon_SafetyGoggles, gItemIconPalette_SafetyGoggles}, - [ITEM_ADRENALINE_ORB] = {gItemIcon_AdrenalineOrb, gItemIconPalette_AdrenalineOrb}, - [ITEM_TERRAIN_EXTENDER] = {gItemIcon_TerrainExtender, gItemIconPalette_TerrainExtender}, - [ITEM_PROTECTIVE_PADS] = {gItemIcon_ProtectivePads, gItemIconPalette_ProtectivePads}, - [ITEM_THROAT_SPRAY] = {gItemIcon_ThroatSpray, gItemIconPalette_ThroatSpray}, - [ITEM_EJECT_PACK] = {gItemIcon_EjectPack, gItemIconPalette_EjectPack}, - [ITEM_HEAVY_DUTY_BOOTS] = {gItemIcon_HeavyDutyBoots, gItemIconPalette_HeavyDutyBoots}, - [ITEM_BLUNDER_POLICY] = {gItemIcon_BlunderPolicy, gItemIconPalette_BlunderPolicy}, - [ITEM_ROOM_SERVICE] = {gItemIcon_RoomService, gItemIconPalette_RoomService}, - [ITEM_UTILITY_UMBRELLA] = {gItemIcon_UtilityUmbrella, gItemIconPalette_UtilityUmbrella}, - // Berries - [ITEM_CHERI_BERRY] = {gItemIcon_CheriBerry, gItemIconPalette_CheriBerry}, - [ITEM_CHESTO_BERRY] = {gItemIcon_ChestoBerry, gItemIconPalette_ChestoBerry}, - [ITEM_PECHA_BERRY] = {gItemIcon_PechaBerry, gItemIconPalette_PechaBerry}, - [ITEM_RAWST_BERRY] = {gItemIcon_RawstBerry, gItemIconPalette_RawstBerry}, - [ITEM_ASPEAR_BERRY] = {gItemIcon_AspearBerry, gItemIconPalette_AspearBerry}, - [ITEM_LEPPA_BERRY] = {gItemIcon_LeppaBerry, gItemIconPalette_LeppaBerry}, - [ITEM_ORAN_BERRY] = {gItemIcon_OranBerry, gItemIconPalette_OranBerry}, - [ITEM_PERSIM_BERRY] = {gItemIcon_PersimBerry, gItemIconPalette_PersimBerry}, - [ITEM_LUM_BERRY] = {gItemIcon_LumBerry, gItemIconPalette_LumBerry}, - [ITEM_SITRUS_BERRY] = {gItemIcon_SitrusBerry, gItemIconPalette_SitrusBerry}, - [ITEM_FIGY_BERRY] = {gItemIcon_FigyBerry, gItemIconPalette_FigyBerry}, - [ITEM_WIKI_BERRY] = {gItemIcon_WikiBerry, gItemIconPalette_WikiBerry}, - [ITEM_MAGO_BERRY] = {gItemIcon_MagoBerry, gItemIconPalette_MagoBerry}, - [ITEM_AGUAV_BERRY] = {gItemIcon_AguavBerry, gItemIconPalette_AguavBerry}, - [ITEM_IAPAPA_BERRY] = {gItemIcon_IapapaBerry, gItemIconPalette_IapapaBerry}, - [ITEM_RAZZ_BERRY] = {gItemIcon_RazzBerry, gItemIconPalette_RazzBerry}, - [ITEM_BLUK_BERRY] = {gItemIcon_BlukBerry, gItemIconPalette_BlukBerry}, - [ITEM_NANAB_BERRY] = {gItemIcon_NanabBerry, gItemIconPalette_NanabBerry}, - [ITEM_WEPEAR_BERRY] = {gItemIcon_WepearBerry, gItemIconPalette_WepearBerry}, - [ITEM_PINAP_BERRY] = {gItemIcon_PinapBerry, gItemIconPalette_PinapBerry}, - [ITEM_POMEG_BERRY] = {gItemIcon_PomegBerry, gItemIconPalette_PomegBerry}, - [ITEM_KELPSY_BERRY] = {gItemIcon_KelpsyBerry, gItemIconPalette_KelpsyBerry}, - [ITEM_QUALOT_BERRY] = {gItemIcon_QualotBerry, gItemIconPalette_QualotBerry}, - [ITEM_HONDEW_BERRY] = {gItemIcon_HondewBerry, gItemIconPalette_HondewBerry}, - [ITEM_GREPA_BERRY] = {gItemIcon_GrepaBerry, gItemIconPalette_GrepaBerry}, - [ITEM_TAMATO_BERRY] = {gItemIcon_TamatoBerry, gItemIconPalette_TamatoBerry}, - [ITEM_CORNN_BERRY] = {gItemIcon_CornnBerry, gItemIconPalette_CornnBerry}, - [ITEM_MAGOST_BERRY] = {gItemIcon_MagostBerry, gItemIconPalette_MagostBerry}, - [ITEM_RABUTA_BERRY] = {gItemIcon_RabutaBerry, gItemIconPalette_RabutaBerry}, - [ITEM_NOMEL_BERRY] = {gItemIcon_NomelBerry, gItemIconPalette_NomelBerry}, - [ITEM_SPELON_BERRY] = {gItemIcon_SpelonBerry, gItemIconPalette_SpelonBerry}, - [ITEM_PAMTRE_BERRY] = {gItemIcon_PamtreBerry, gItemIconPalette_PamtreBerry}, - [ITEM_WATMEL_BERRY] = {gItemIcon_WatmelBerry, gItemIconPalette_WatmelBerry}, - [ITEM_DURIN_BERRY] = {gItemIcon_DurinBerry, gItemIconPalette_DurinBerry}, - [ITEM_BELUE_BERRY] = {gItemIcon_BelueBerry, gItemIconPalette_BelueBerry}, - [ITEM_CHILAN_BERRY] = {gItemIcon_ChilanBerry, gItemIconPalette_ChilanBerry}, - [ITEM_OCCA_BERRY] = {gItemIcon_OccaBerry, gItemIconPalette_OccaBerry}, - [ITEM_PASSHO_BERRY] = {gItemIcon_PasshoBerry, gItemIconPalette_PasshoBerry}, - [ITEM_WACAN_BERRY] = {gItemIcon_WacanBerry, gItemIconPalette_WacanBerry}, - [ITEM_RINDO_BERRY] = {gItemIcon_RindoBerry, gItemIconPalette_RindoBerry}, - [ITEM_YACHE_BERRY] = {gItemIcon_YacheBerry, gItemIconPalette_YacheBerry}, - [ITEM_CHOPLE_BERRY] = {gItemIcon_ChopleBerry, gItemIconPalette_ChopleBerry}, - [ITEM_KEBIA_BERRY] = {gItemIcon_KebiaBerry, gItemIconPalette_KebiaBerry}, - [ITEM_SHUCA_BERRY] = {gItemIcon_ShucaBerry, gItemIconPalette_ShucaBerry}, - [ITEM_COBA_BERRY] = {gItemIcon_CobaBerry, gItemIconPalette_CobaBerry}, - [ITEM_PAYAPA_BERRY] = {gItemIcon_PayapaBerry, gItemIconPalette_PayapaBerry}, - [ITEM_TANGA_BERRY] = {gItemIcon_TangaBerry, gItemIconPalette_TangaBerry}, - [ITEM_CHARTI_BERRY] = {gItemIcon_ChartiBerry, gItemIconPalette_ChartiBerry}, - [ITEM_KASIB_BERRY] = {gItemIcon_KasibBerry, gItemIconPalette_KasibBerry}, - [ITEM_HABAN_BERRY] = {gItemIcon_HabanBerry, gItemIconPalette_HabanBerry}, - [ITEM_COLBUR_BERRY] = {gItemIcon_ColburBerry, gItemIconPalette_ColburBerry}, - [ITEM_BABIRI_BERRY] = {gItemIcon_BabiriBerry, gItemIconPalette_BabiriBerry}, - [ITEM_ROSELI_BERRY] = {gItemIcon_RoseliBerry, gItemIconPalette_RoseliBerry}, - [ITEM_LIECHI_BERRY] = {gItemIcon_LiechiBerry, gItemIconPalette_LiechiBerry}, - [ITEM_GANLON_BERRY] = {gItemIcon_GanlonBerry, gItemIconPalette_GanlonBerry}, - [ITEM_SALAC_BERRY] = {gItemIcon_SalacBerry, gItemIconPalette_SalacBerry}, - [ITEM_PETAYA_BERRY] = {gItemIcon_PetayaBerry, gItemIconPalette_PetayaBerry}, - [ITEM_APICOT_BERRY] = {gItemIcon_ApicotBerry, gItemIconPalette_ApicotBerry}, - [ITEM_LANSAT_BERRY] = {gItemIcon_LansatBerry, gItemIconPalette_LansatBerry}, - [ITEM_STARF_BERRY] = {gItemIcon_StarfBerry, gItemIconPalette_StarfBerry}, - [ITEM_ENIGMA_BERRY] = {gItemIcon_EnigmaBerry, gItemIconPalette_EnigmaBerry}, - [ITEM_MICLE_BERRY] = {gItemIcon_MicleBerry, gItemIconPalette_MicleBerry}, - [ITEM_CUSTAP_BERRY] = {gItemIcon_CustapBerry, gItemIconPalette_CustapBerry}, - [ITEM_JABOCA_BERRY] = {gItemIcon_JabocaBerry, gItemIconPalette_JabocaBerry}, - [ITEM_ROWAP_BERRY] = {gItemIcon_RowapBerry, gItemIconPalette_RowapBerry}, - [ITEM_KEE_BERRY] = {gItemIcon_KeeBerry, gItemIconPalette_KeeBerry}, - [ITEM_MARANGA_BERRY] = {gItemIcon_MarangaBerry, gItemIconPalette_MarangaBerry}, - [ITEM_ENIGMA_BERRY_E_READER] = {gItemIcon_EnigmaBerry, gItemIconPalette_EnigmaBerry}, - // Charms - [ITEM_OVAL_CHARM] = {gItemIcon_OvalCharm, gItemIconPalette_OvalCharm}, - [ITEM_SHINY_CHARM] = {gItemIcon_ShinyCharm, gItemIconPalette_ShinyCharm}, - [ITEM_CATCHING_CHARM] = {gItemIcon_CatchingCharm, gItemIconPalette_CatchingCharm}, - [ITEM_EXP_CHARM] = {gItemIcon_ExpCharm, gItemIconPalette_ExpCharm}, - // Form-changing Key Items - [ITEM_ROTOM_CATALOG] = {gItemIcon_RotomCatalog, gItemIconPalette_RotomCatalog}, - [ITEM_GRACIDEA] = {gItemIcon_Gracidea, gItemIconPalette_Gracidea}, - [ITEM_REVEAL_GLASS] = {gItemIcon_RevealGlass, gItemIconPalette_RevealGlass}, - [ITEM_DNA_SPLICERS] = {gItemIcon_DNASplicers, gItemIconPalette_DNASplicers}, - [ITEM_ZYGARDE_CUBE] = {gItemIcon_ZygardeCube, gItemIconPalette_ZygardeCube}, - [ITEM_PRISON_BOTTLE] = {gItemIcon_PrisonBottle, gItemIconPalette_PrisonBottle}, - [ITEM_N_SOLARIZER] = {gItemIcon_NecrozmaFuser, gItemIconPalette_NSolarizer}, - [ITEM_N_LUNARIZER] = {gItemIcon_NecrozmaFuser, gItemIconPalette_NLunarizer}, - [ITEM_REINS_OF_UNITY] = {gItemIcon_ReinsOfUnity, gItemIconPalette_ReinsOfUnity}, - // Battle Mechanic Key Items - [ITEM_MEGA_RING] = {gItemIcon_MegaRing, gItemIconPalette_MegaRing}, - [ITEM_Z_POWER_RING] = {gItemIcon_ZPowerRing, gItemIconPalette_ZPowerRing}, - [ITEM_DYNAMAX_BAND] = {gItemIcon_DynamaxBand, gItemIconPalette_DynamaxBand}, - // Misc. Key Items - [ITEM_BICYCLE] = {gItemIcon_Bicycle, gItemIconPalette_Bicycle}, - [ITEM_MACH_BIKE] = {gItemIcon_MachBike, gItemIconPalette_MachBike}, - [ITEM_ACRO_BIKE] = {gItemIcon_AcroBike, gItemIconPalette_AcroBike}, - [ITEM_OLD_ROD] = {gItemIcon_OldRod, gItemIconPalette_OldRod}, - [ITEM_GOOD_ROD] = {gItemIcon_GoodRod, gItemIconPalette_GoodRod}, - [ITEM_SUPER_ROD] = {gItemIcon_SuperRod, gItemIconPalette_SuperRod}, - [ITEM_DOWSING_MACHINE] = {gItemIcon_DowsingMachine, gItemIconPalette_DowsingMachine}, - [ITEM_TOWN_MAP] = {gItemIcon_TownMap, gItemIconPalette_TownMap}, - [ITEM_VS_SEEKER] = {gItemIcon_VsSeeker, gItemIconPalette_VsSeeker}, - [ITEM_TM_CASE] = {gItemIcon_TMCase, gItemIconPalette_TMCase}, - [ITEM_BERRY_POUCH] = {gItemIcon_BerryPouch, gItemIconPalette_BerryPouch}, - [ITEM_POKEMON_BOX_LINK] = {gItemIcon_PokemonBoxLink, gItemIconPalette_PokemonBoxLink}, - [ITEM_COIN_CASE] = {gItemIcon_CoinCase, gItemIconPalette_CoinCase}, - [ITEM_POWDER_JAR] = {gItemIcon_PowderJar, gItemIconPalette_PowderJar}, - [ITEM_WAILMER_PAIL] = {gItemIcon_WailmerPail, gItemIconPalette_WailmerPail}, - [ITEM_POKE_RADAR] = {gItemIcon_PokeRadar, gItemIconPalette_PokeRadar}, - [ITEM_POKEBLOCK_CASE] = {gItemIcon_PokeblockCase, gItemIconPalette_PokeblockCase}, - [ITEM_SOOT_SACK] = {gItemIcon_SootSack, gItemIconPalette_SootSack}, - [ITEM_POKE_FLUTE] = {gItemIcon_PokeFlute, gItemIconPalette_PokeFlute}, - [ITEM_FAME_CHECKER] = {gItemIcon_FameChecker, gItemIconPalette_FameChecker}, - [ITEM_TEACHY_TV] = {gItemIcon_TeachyTV, gItemIconPalette_TeachyTV}, - // Story Key Items - [ITEM_SS_TICKET] = {gItemIcon_SSTicket, gItemIconPalette_SSTicket}, - [ITEM_EON_TICKET] = {gItemIcon_EonTicket, gItemIconPalette_EonTicket}, - [ITEM_MYSTIC_TICKET] = {gItemIcon_MysticTicket, gItemIconPalette_MysticTicket}, - [ITEM_AURORA_TICKET] = {gItemIcon_AuroraTicket, gItemIconPalette_AuroraTicket}, - [ITEM_OLD_SEA_MAP] = {gItemIcon_OldSeaMap, gItemIconPalette_OldSeaMap}, - [ITEM_LETTER] = {gItemIcon_Letter, gItemIconPalette_LavaCookieAndLetter}, - [ITEM_DEVON_PARTS] = {gItemIcon_DevonParts, gItemIconPalette_DevonParts}, - [ITEM_GO_GOGGLES] = {gItemIcon_GoGoggles, gItemIconPalette_GoGoggles}, - [ITEM_DEVON_SCOPE] = {gItemIcon_DevonScope, gItemIconPalette_DevonScope}, - [ITEM_BASEMENT_KEY] = {gItemIcon_BasementKey, gItemIconPalette_OldKey}, - [ITEM_SCANNER] = {gItemIcon_Scanner, gItemIconPalette_Scanner}, - [ITEM_STORAGE_KEY] = {gItemIcon_StorageKey, gItemIconPalette_OldKey}, - [ITEM_KEY_TO_ROOM_1] = {gItemIcon_KeyToRoom1, gItemIconPalette_Key}, - [ITEM_KEY_TO_ROOM_2] = {gItemIcon_KeyToRoom2, gItemIconPalette_Key}, - [ITEM_KEY_TO_ROOM_4] = {gItemIcon_KeyToRoom4, gItemIconPalette_Key}, - [ITEM_KEY_TO_ROOM_6] = {gItemIcon_KeyToRoom6, gItemIconPalette_Key}, - [ITEM_METEORITE] = {gItemIcon_Meteorite, gItemIconPalette_Meteorite}, - [ITEM_MAGMA_EMBLEM] = {gItemIcon_MagmaEmblem, gItemIconPalette_MagmaEmblem}, - [ITEM_CONTEST_PASS] = {gItemIcon_ContestPass, gItemIconPalette_ContestPass}, - [ITEM_PARCEL] = {gItemIcon_Parcel, gItemIconPalette_Parcel}, - [ITEM_SECRET_KEY] = {gItemIcon_SecretKey, gItemIconPalette_SecretKey}, - [ITEM_BIKE_VOUCHER] = {gItemIcon_BikeVoucher, gItemIconPalette_BikeVoucher}, - [ITEM_GOLD_TEETH] = {gItemIcon_GoldTeeth, gItemIconPalette_GoldTeeth}, - [ITEM_CARD_KEY] = {gItemIcon_CardKey, gItemIconPalette_CardKey}, - [ITEM_LIFT_KEY] = {gItemIcon_LiftKey, gItemIconPalette_Key}, - [ITEM_SILPH_SCOPE] = {gItemIcon_SilphScope, gItemIconPalette_SilphScope}, - [ITEM_TRI_PASS] = {gItemIcon_TriPass, gItemIconPalette_TriPass}, - [ITEM_RAINBOW_PASS] = {gItemIcon_RainbowPass, gItemIconPalette_RainbowPass}, - [ITEM_TEA] = {gItemIcon_Tea, gItemIconPalette_Tea}, - [ITEM_RUBY] = {gItemIcon_Gem, gItemIconPalette_Ruby}, - [ITEM_SAPPHIRE] = {gItemIcon_Gem, gItemIconPalette_Sapphire}, - [ITEM_ABILITY_SHIELD] = {gItemIcon_AbilityShield, gItemIconPalette_AbilityShield}, - [ITEM_CLEAR_AMULET] = {gItemIcon_ClearAmulet, gItemIconPalette_ClearAmulet}, - [ITEM_PUNCHING_GLOVE] = {gItemIcon_PunchingGlove, gItemIconPalette_PunchingGlove}, - [ITEM_COVERT_CLOAK] = {gItemIcon_CovertCloak, gItemIconPalette_CovertCloak}, - [ITEM_LOADED_DICE] = {gItemIcon_LoadedDice, gItemIconPalette_LoadedDice}, - [ITEM_AUSPICIOUS_ARMOR] = {gItemIcon_AuspiciousArmor, gItemIconPalette_AuspiciousArmor}, - [ITEM_BOOSTER_ENERGY] = {gItemIcon_BoosterEnergy, gItemIconPalette_BoosterEnergy}, - [ITEM_BIG_BAMBOO_SHOOT] = {gItemIcon_BigBambooShoot, gItemIconPalette_BigBambooShoot}, - [ITEM_GIMMIGHOUL_COIN] = {gItemIcon_GimmighoulCoin, gItemIconPalette_GimmighoulCoin}, - [ITEM_LEADERS_CREST] = {gItemIcon_LeadersCrest, gItemIconPalette_LeadersCrest}, - [ITEM_MALICIOUS_ARMOR] = {gItemIcon_MaliciousArmor, gItemIconPalette_MaliciousArmor}, - [ITEM_MIRROR_HERB] = {gItemIcon_MirrorHerb, gItemIconPalette_MirrorHerb}, - [ITEM_SCROLL_OF_DARKNESS] = {gItemIcon_ScrollOfDarkness, gItemIconPalette_ScrollOfDarkness}, - [ITEM_SCROLL_OF_WATERS] = {gItemIcon_ScrollOfWaters, gItemIconPalette_ScrollOfWaters}, - [ITEM_TERA_ORB] = {gItemIcon_TeraOrb, gItemIconPalette_TeraOrb}, - [ITEM_TINY_BAMBOO_SHOOT] = {gItemIcon_TinyBambooShoot, gItemIconPalette_TinyBambooShoot}, - [ITEM_BUG_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_BugTeraShard}, - [ITEM_DARK_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_DarkTeraShard}, - [ITEM_DRAGON_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_DragonTeraShard}, - [ITEM_ELECTRIC_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_ElectricTeraShard}, - [ITEM_FAIRY_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_FairyTeraShard}, - [ITEM_FIGHTING_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_FightingTeraShard}, - [ITEM_FIRE_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_FireTeraShard}, - [ITEM_FLYING_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_FlyingTeraShard}, - [ITEM_GHOST_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_GhostTeraShard}, - [ITEM_GRASS_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_GrassTeraShard}, - [ITEM_GROUND_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_GroundTeraShard}, - [ITEM_ICE_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_IceTeraShard}, - [ITEM_NORMAL_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_NormalTeraShard}, - [ITEM_POISON_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_PoisonTeraShard}, - [ITEM_PSYCHIC_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_PsychicTeraShard}, - [ITEM_ROCK_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_RockTeraShard}, - [ITEM_STEEL_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_SteelTeraShard}, - [ITEM_WATER_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_WaterTeraShard}, - [ITEM_ADAMANT_CRYSTAL] = {gItemIcon_AdamantCrystal, gItemIconPalette_AdamantCrystal}, - [ITEM_GRISEOUS_CORE] = {gItemIcon_GriseousCore, gItemIconPalette_GriseousCore}, - [ITEM_LUSTROUS_GLOBE] = {gItemIcon_LustrousGlobe, gItemIconPalette_LustrousGlobe}, - [ITEM_BLACK_AUGURITE] = {gItemIcon_BlackAugurite, gItemIconPalette_BlackAugurite}, - [ITEM_LINKING_CORD] = {gItemIcon_LinkingCord, gItemIconPalette_LinkingCord}, - [ITEM_PEAT_BLOCK] = {gItemIcon_PeatBlock, gItemIconPalette_PeatBlock}, - [ITEM_BERSERK_GENE] = {gItemIcon_BerserkGene, gItemIconPalette_BerserkGene}, - [ITEM_FAIRY_FEATHER] = {gItemIcon_FairyFeather, gItemIconPalette_FairyFeather}, - [ITEM_SYRUPY_APPLE] = {gItemIcon_SyrupyApple, gItemIconPalette_SyrupyApple}, - [ITEM_UNREMARKABLE_TEACUP] = {gItemIcon_UnremarkableTeacup, gItemIconPalette_UnremarkableTeacup}, - [ITEM_MASTERPIECE_TEACUP] = {gItemIcon_MasterpieceTeacup, gItemIconPalette_MasterpieceTeacup}, - [ITEM_CORNERSTONE_MASK] = {gItemIcon_CornerstoneMask, gItemIconPalette_CornerstoneMask}, - [ITEM_WELLSPRING_MASK] = {gItemIcon_WellspringMask, gItemIconPalette_WellspringMask}, - [ITEM_HEARTHFLAME_MASK] = {gItemIcon_HearthflameMask, gItemIconPalette_HearthflameMask}, - [ITEM_HEALTH_MOCHI] = {gItemIcon_Mochi, gItemIconPalette_HealthMochi}, - [ITEM_MUSCLE_MOCHI] = {gItemIcon_Mochi, gItemIconPalette_MuscleMochi}, - [ITEM_RESIST_MOCHI] = {gItemIcon_Mochi, gItemIconPalette_ResistMochi}, - [ITEM_GENIUS_MOCHI] = {gItemIcon_Mochi, gItemIconPalette_GeniusMochi}, - [ITEM_CLEVER_MOCHI] = {gItemIcon_Mochi, gItemIconPalette_CleverMochi}, - [ITEM_SWIFT_MOCHI] = {gItemIcon_Mochi, gItemIconPalette_SwiftMochi}, - [ITEM_FRESH_START_MOCHI] = {gItemIcon_Mochi, gItemIconPalette_FreshStartMochi}, - [ITEM_GLIMMERING_CHARM] = {gItemIcon_GlimmeringCharm, gItemIconPalette_GlimmeringCharm}, - [ITEM_METAL_ALLOY] = {gItemIcon_MetalAlloy, gItemIconPalette_MetalAlloy}, - [ITEM_STELLAR_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, //{gItemIcon_TeraShard, gItemIconPalette_StellarTeraShard}, - [ITEM_JUBILIFE_MUFFIN] = {gItemIcon_JubilifeMuffin, gItemIconPalette_JubilifeMuffin}, - [ITEM_REMEDY] = {gItemIcon_Remedy, gItemIconPalette_Remedy}, - [ITEM_FINE_REMEDY] = {gItemIcon_FineRemedy, gItemIconPalette_FineRemedy}, - [ITEM_SUPERB_REMEDY] = {gItemIcon_SuperbRemedy, gItemIconPalette_SuperbRemedy}, - [ITEM_AUX_EVASION] = {gItemIcon_AuxBottle, gItemIconPalette_AuxEvasion}, - [ITEM_AUX_GUARD] = {gItemIcon_AuxBottle, gItemIconPalette_AuxGuard}, - [ITEM_AUX_POWER] = {gItemIcon_AuxBottle, gItemIconPalette_AuxPower}, - [ITEM_AUX_POWERGUARD] = {gItemIcon_AuxPowerguard, gItemIconPalette_AuxPowerguard}, - [ITEM_CHOICE_DUMPLING] = {gItemIcon_ChoiceDumpling, gItemIconPalette_ChoiceDumpling}, - [ITEM_SWAP_SNACK] = {gItemIcon_SwapSnack, gItemIconPalette_SwapSnack}, - [ITEM_TWICE_SPICED_RADISH] = {gItemIcon_TwiceSpicedRadish, gItemIconPalette_TwiceSpicedRadish}, - [ITEM_POKESHI_DOLL] = {gItemIcon_PokeshiDoll, gItemIconPalette_PokeshiDoll}, - // Return to field arrow - [ITEMS_COUNT] = {gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow}, -}; + diff --git a/src/data/items.h b/src/data/items.h index 07cf0b25ae74..eac38769e78b 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1,5 +1,3 @@ -#include "constants/moves.h" - #if I_EXPANDED_ITEM_NAMES == TRUE #define HANDLE_EXPANDED_ITEM_NAME(_name, ...) _(DEFAULT(_name, __VA_ARGS__)) #else @@ -156,6 +154,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_QuestionMark, + .iconPalette = gItemIconPalette_QuestionMark, }, // Poké Balls @@ -172,6 +172,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_POKE_BALL - FIRST_BALL, + .iconSprite = gItemIcon_PokeBall, + .iconPalette = gItemIconPalette_PokeBall, }, [ITEM_GREAT_BALL] = @@ -186,6 +188,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_GREAT_BALL - FIRST_BALL, + .iconSprite = gItemIcon_GreatBall, + .iconPalette = gItemIconPalette_GreatBall, }, [ITEM_ULTRA_BALL] = @@ -200,6 +204,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_ULTRA_BALL - FIRST_BALL, + .iconSprite = gItemIcon_UltraBall, + .iconPalette = gItemIconPalette_UltraBall, }, [ITEM_MASTER_BALL] = @@ -214,6 +220,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_MASTER_BALL - FIRST_BALL, + .iconSprite = gItemIcon_MasterBall, + .iconPalette = gItemIconPalette_MasterBall, }, [ITEM_PREMIER_BALL] = @@ -228,6 +236,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_PREMIER_BALL - FIRST_BALL, + .iconSprite = gItemIcon_PremierBall, + .iconPalette = gItemIconPalette_LuxuryBall, }, [ITEM_HEAL_BALL] = @@ -242,6 +252,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_HEAL_BALL - FIRST_BALL, + .iconSprite = gItemIcon_HealBall, + .iconPalette = gItemIconPalette_HealBall, }, [ITEM_NET_BALL] = @@ -256,6 +268,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_NET_BALL - FIRST_BALL, + .iconSprite = gItemIcon_NetBall, + .iconPalette = gItemIconPalette_NetBall, }, [ITEM_NEST_BALL] = @@ -270,6 +284,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_NEST_BALL - FIRST_BALL, + .iconSprite = gItemIcon_NestBall, + .iconPalette = gItemIconPalette_NestBall, }, [ITEM_DIVE_BALL] = @@ -284,6 +300,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_DIVE_BALL - FIRST_BALL, + .iconSprite = gItemIcon_DiveBall, + .iconPalette = gItemIconPalette_DiveBall, }, [ITEM_DUSK_BALL] = @@ -298,6 +316,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_DUSK_BALL - FIRST_BALL, + .iconSprite = gItemIcon_DuskBall, + .iconPalette = gItemIconPalette_DuskBall, }, [ITEM_TIMER_BALL] = @@ -312,6 +332,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_TIMER_BALL - FIRST_BALL, + .iconSprite = gItemIcon_TimerBall, + .iconPalette = gItemIconPalette_RepeatBall, }, [ITEM_QUICK_BALL] = @@ -326,6 +348,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_QUICK_BALL - FIRST_BALL, + .iconSprite = gItemIcon_QuickBall, + .iconPalette = gItemIconPalette_QuickBall, }, [ITEM_REPEAT_BALL] = @@ -340,6 +364,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_REPEAT_BALL - FIRST_BALL, + .iconSprite = gItemIcon_RepeatBall, + .iconPalette = gItemIconPalette_RepeatBall, }, [ITEM_LUXURY_BALL] = @@ -354,6 +380,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_LUXURY_BALL - FIRST_BALL, + .iconSprite = gItemIcon_LuxuryBall, + .iconPalette = gItemIconPalette_LuxuryBall, }, [ITEM_LEVEL_BALL] = @@ -368,6 +396,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_LEVEL_BALL - FIRST_BALL, + .iconSprite = gItemIcon_LevelBall, + .iconPalette = gItemIconPalette_LevelBall, }, [ITEM_LURE_BALL] = @@ -382,6 +412,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_LURE_BALL - FIRST_BALL, + .iconSprite = gItemIcon_LureBall, + .iconPalette = gItemIconPalette_LureBall, }, [ITEM_MOON_BALL] = @@ -396,6 +428,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_MOON_BALL - FIRST_BALL, + .iconSprite = gItemIcon_MoonBall, + .iconPalette = gItemIconPalette_MoonBall, }, [ITEM_FRIEND_BALL] = @@ -410,6 +444,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_FRIEND_BALL - FIRST_BALL, + .iconSprite = gItemIcon_FriendBall, + .iconPalette = gItemIconPalette_FriendBall, }, [ITEM_LOVE_BALL] = @@ -424,6 +460,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_LOVE_BALL - FIRST_BALL, + .iconSprite = gItemIcon_LoveBall, + .iconPalette = gItemIconPalette_LoveBall, }, [ITEM_FAST_BALL] = @@ -438,6 +476,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_FAST_BALL - FIRST_BALL, + .iconSprite = gItemIcon_FastBall, + .iconPalette = gItemIconPalette_FastBall, }, [ITEM_HEAVY_BALL] = @@ -452,6 +492,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_HEAVY_BALL - FIRST_BALL, + .iconSprite = gItemIcon_HeavyBall, + .iconPalette = gItemIconPalette_HeavyBall, }, [ITEM_DREAM_BALL] = @@ -471,6 +513,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_DREAM_BALL - FIRST_BALL, + .iconSprite = gItemIcon_DreamBall, + .iconPalette = gItemIconPalette_DreamBall, }, [ITEM_SAFARI_BALL] = @@ -485,6 +529,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_SAFARI_BALL - FIRST_BALL, + .iconSprite = gItemIcon_SafariBall, + .iconPalette = gItemIconPalette_SafariBall, }, [ITEM_SPORT_BALL] = @@ -499,6 +545,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_SPORT_BALL - FIRST_BALL, + .iconSprite = gItemIcon_SportBall, + .iconPalette = gItemIconPalette_SportBall, }, [ITEM_PARK_BALL] = @@ -512,6 +560,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_PARK_BALL - FIRST_BALL, + .iconSprite = gItemIcon_ParkBall, + .iconPalette = gItemIconPalette_ParkBall, }, [ITEM_BEAST_BALL] = @@ -525,6 +575,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_BEAST_BALL - FIRST_BALL, + .iconSprite = gItemIcon_BeastBall, + .iconPalette = gItemIconPalette_BeastBall, }, [ITEM_CHERISH_BALL] = @@ -539,6 +591,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = ITEM_CHERISH_BALL - FIRST_BALL, + .iconSprite = gItemIcon_CherishBall, + .iconPalette = gItemIconPalette_CherishBall, }, // Medicine @@ -558,6 +612,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_Potion, .flingPower = 30, + .iconSprite = gItemIcon_Potion, + .iconPalette = gItemIconPalette_Potion, }, [ITEM_SUPER_POTION] = @@ -579,6 +635,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_SuperPotion, .flingPower = 30, + .iconSprite = gItemIcon_Potion, + .iconPalette = gItemIconPalette_SuperPotion, }, [ITEM_HYPER_POTION] = @@ -600,6 +658,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_HyperPotion, .flingPower = 30, + .iconSprite = gItemIcon_Potion, + .iconPalette = gItemIconPalette_HyperPotion, }, [ITEM_MAX_POTION] = @@ -616,6 +676,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_MaxPotion, .flingPower = 30, + .iconSprite = gItemIcon_LargePotion, + .iconPalette = gItemIconPalette_MaxPotion, }, [ITEM_FULL_RESTORE] = @@ -633,6 +695,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_HEAL_AND_CURE_STATUS, .effect = gItemEffect_FullRestore, .flingPower = 30, + .iconSprite = gItemIcon_LargePotion, + .iconPalette = gItemIconPalette_FullRestore, }, [ITEM_REVIVE] = @@ -649,6 +713,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_REVIVE, .effect = gItemEffect_Revive, .flingPower = 30, + .iconSprite = gItemIcon_Revive, + .iconPalette = gItemIconPalette_Revive, }, [ITEM_MAX_REVIVE] = @@ -662,6 +728,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_REVIVE, .effect = gItemEffect_MaxRevive, .flingPower = 30, + .iconSprite = gItemIcon_MaxRevive, + .iconPalette = gItemIconPalette_Revive, }, [ITEM_FRESH_WATER] = @@ -683,6 +751,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_FreshWater, .flingPower = 30, + .iconSprite = gItemIcon_FreshWater, + .iconPalette = gItemIconPalette_FreshWater, }, [ITEM_SODA_POP] = @@ -704,6 +774,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_SodaPop, .flingPower = 30, + .iconSprite = gItemIcon_SodaPop, + .iconPalette = gItemIconPalette_SodaPop, }, [ITEM_LEMONADE] = @@ -728,6 +800,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_Lemonade, .flingPower = 30, + .iconSprite = gItemIcon_Lemonade, + .iconPalette = gItemIconPalette_Lemonade, }, [ITEM_MOOMOO_MILK] = @@ -746,6 +820,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_MoomooMilk, .flingPower = 30, + .iconSprite = gItemIcon_MoomooMilk, + .iconPalette = gItemIconPalette_MoomooMilk, }, [ITEM_ENERGY_POWDER] = @@ -767,6 +843,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_EnergyPowder, .flingPower = 30, + .iconSprite = gItemIcon_Powder, + .iconPalette = gItemIconPalette_EnergyPowder, }, [ITEM_ENERGY_ROOT] = @@ -787,6 +865,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_EnergyRoot, .flingPower = 30, + .iconSprite = gItemIcon_EnergyRoot, + .iconPalette = gItemIconPalette_EnergyRoot, }, [ITEM_HEAL_POWDER] = @@ -804,6 +884,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_HealPowder, .flingPower = 30, + .iconSprite = gItemIcon_Powder, + .iconPalette = gItemIconPalette_HealPowder, }, [ITEM_REVIVAL_HERB] = @@ -820,6 +902,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_REVIVE, .effect = gItemEffect_RevivalHerb, .flingPower = 30, + .iconSprite = gItemIcon_RevivalHerb, + .iconPalette = gItemIconPalette_RevivalHerb, }, [ITEM_ANTIDOTE] = @@ -835,6 +919,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_Antidote, .flingPower = 30, + .iconSprite = gItemIcon_Antidote, + .iconPalette = gItemIconPalette_Antidote, }, [ITEM_PARALYZE_HEAL] = @@ -850,6 +936,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_ParalyzeHeal, .flingPower = 30, + .iconSprite = gItemIcon_StatusHeal, + .iconPalette = gItemIconPalette_ParalyzeHeal, }, [ITEM_BURN_HEAL] = @@ -865,6 +953,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_BurnHeal, .flingPower = 30, + .iconSprite = gItemIcon_StatusHeal, + .iconPalette = gItemIconPalette_BurnHeal, }, [ITEM_ICE_HEAL] = @@ -880,6 +970,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_IceHeal, .flingPower = 30, + .iconSprite = gItemIcon_StatusHeal, + .iconPalette = gItemIconPalette_IceHeal, }, [ITEM_AWAKENING] = @@ -895,6 +987,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_Awakening, .flingPower = 30, + .iconSprite = gItemIcon_StatusHeal, + .iconPalette = gItemIconPalette_Awakening, }, [ITEM_FULL_HEAL] = @@ -908,6 +1002,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconSprite = gItemIcon_FullHeal, + .iconPalette = gItemIconPalette_FullHeal, }, [ITEM_ETHER] = @@ -925,6 +1021,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_PP, .effect = gItemEffect_Ether, .flingPower = 30, + .iconSprite = gItemIcon_Ether, + .iconPalette = gItemIconPalette_Ether, }, [ITEM_MAX_ETHER] = @@ -942,6 +1040,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_PP, .effect = gItemEffect_MaxEther, .flingPower = 30, + .iconSprite = gItemIcon_Ether, + .iconPalette = gItemIconPalette_MaxEther, }, [ITEM_ELIXIR] = @@ -958,6 +1058,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_PP, .effect = gItemEffect_Elixir, .flingPower = 30, + .iconSprite = gItemIcon_Ether, + .iconPalette = gItemIconPalette_Elixir, }, [ITEM_MAX_ELIXIR] = @@ -975,6 +1077,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_PP, .effect = gItemEffect_MaxElixir, .flingPower = 30, + .iconSprite = gItemIcon_Ether, + .iconPalette = gItemIconPalette_MaxElixir, }, [ITEM_BERRY_JUICE] = @@ -994,6 +1098,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_Potion, .flingPower = 30, + .iconSprite = gItemIcon_BerryJuice, + .iconPalette = gItemIconPalette_BerryJuice, }, [ITEM_SACRED_ASH] = @@ -1010,6 +1116,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_SacredAsh, .effect = gItemEffect_SacredAsh, .flingPower = 30, + .iconSprite = gItemIcon_SacredAsh, + .iconPalette = gItemIconPalette_SacredAsh, }, [ITEM_SWEET_HEART] = @@ -1027,6 +1135,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_Potion, .flingPower = 30, + .iconSprite = gItemIcon_SweetHeart, + .iconPalette = gItemIconPalette_SweetHeart, }, [ITEM_MAX_HONEY] = @@ -1041,6 +1151,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_REVIVE, .effect = gItemEffect_MaxRevive, .flingPower = 30, + .iconSprite = gItemIcon_MaxHoney, + .iconPalette = gItemIconPalette_MaxHoney, }, // Regional Specialties @@ -1057,6 +1169,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconSprite = gItemIcon_PewterCrunchies, + .iconPalette = gItemIconPalette_PewterCrunchies, }, [ITEM_RAGE_CANDY_BAR] = @@ -1070,6 +1184,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconSprite = gItemIcon_RageCandyBar, + .iconPalette = gItemIconPalette_RageCandyBar, }, [ITEM_LAVA_COOKIE] = @@ -1086,6 +1202,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconSprite = gItemIcon_LavaCookie, + .iconPalette = gItemIconPalette_LavaCookieAndLetter, }, [ITEM_OLD_GATEAU] = @@ -1100,6 +1218,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconSprite = gItemIcon_OldGateau, + .iconPalette = gItemIconPalette_OldGateau, }, [ITEM_CASTELIACONE] = @@ -1113,6 +1233,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconSprite = gItemIcon_Casteliacone, + .iconPalette = gItemIconPalette_Casteliacone, }, [ITEM_LUMIOSE_GALETTE] = @@ -1126,6 +1248,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconSprite = gItemIcon_LumioseGalette, + .iconPalette = gItemIconPalette_LumioseGalette, }, [ITEM_SHALOUR_SABLE] = @@ -1139,6 +1263,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconSprite = gItemIcon_ShalourSable, + .iconPalette = gItemIconPalette_ShalourSable, }, [ITEM_BIG_MALASADA] = @@ -1152,6 +1278,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 30, + .iconSprite = gItemIcon_BigMalasada, + .iconPalette = gItemIconPalette_BigMalasada, }, // Vitamins @@ -1168,6 +1296,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_HPUp, .flingPower = 30, + .iconSprite = gItemIcon_HPUp, + .iconPalette = gItemIconPalette_HPUp, }, [ITEM_PROTEIN] = @@ -1183,6 +1313,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_Protein, .flingPower = 30, + .iconSprite = gItemIcon_Vitamin, + .iconPalette = gItemIconPalette_Protein, }, [ITEM_IRON] = @@ -1198,6 +1330,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_Iron, .flingPower = 30, + .iconSprite = gItemIcon_Vitamin, + .iconPalette = gItemIconPalette_Iron, }, [ITEM_CALCIUM] = @@ -1213,6 +1347,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_Calcium, .flingPower = 30, + .iconSprite = gItemIcon_Vitamin, + .iconPalette = gItemIconPalette_Calcium, }, [ITEM_ZINC] = @@ -1228,6 +1364,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_Zinc, .flingPower = 30, + .iconSprite = gItemIcon_Vitamin, + .iconPalette = gItemIconPalette_Zinc, }, [ITEM_CARBOS] = @@ -1244,6 +1382,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_Carbos, .flingPower = 30, + .iconSprite = gItemIcon_Vitamin, + .iconPalette = gItemIconPalette_Carbos, }, [ITEM_PP_UP] = @@ -1259,6 +1399,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_PPUp, .effect = gItemEffect_PPUp, .flingPower = 30, + .iconSprite = gItemIcon_PPUp, + .iconPalette = gItemIconPalette_PPUp, }, [ITEM_PP_MAX] = @@ -1275,6 +1417,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_PPUp, .effect = gItemEffect_PPMax, .flingPower = 30, + .iconSprite = gItemIcon_PPMax, + .iconPalette = gItemIconPalette_PPMax, }, // EV Feathers @@ -1289,6 +1433,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_HpFeather, .flingPower = 20, + .iconSprite = gItemIcon_HealthFeather, + .iconPalette = gItemIconPalette_HealthFeather, }, [ITEM_MUSCLE_FEATHER] = @@ -1301,6 +1447,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_AtkFeather, .flingPower = 20, + .iconSprite = gItemIcon_MuscleFeather, + .iconPalette = gItemIconPalette_MuscleFeather, }, [ITEM_RESIST_FEATHER] = @@ -1313,6 +1461,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_DefFeather, .flingPower = 20, + .iconSprite = gItemIcon_ResistFeather, + .iconPalette = gItemIconPalette_ResistFeather, }, [ITEM_GENIUS_FEATHER] = @@ -1325,6 +1475,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_SpatkFeather, .flingPower = 20, + .iconSprite = gItemIcon_GeniusFeather, + .iconPalette = gItemIconPalette_GeniusFeather, }, [ITEM_CLEVER_FEATHER] = @@ -1337,6 +1489,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_SpdefFeather, .flingPower = 20, + .iconSprite = gItemIcon_CleverFeather, + .iconPalette = gItemIconPalette_CleverFeather, }, [ITEM_SWIFT_FEATHER] = @@ -1349,6 +1503,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_SpeedFeather, .flingPower = 20, + .iconSprite = gItemIcon_SwiftFeather, + .iconPalette = gItemIconPalette_SwiftFeather, }, // Ability Modifiers @@ -1364,6 +1520,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_AbilityCapsule, + .iconSprite = gItemIcon_AbilityCapsule, + .iconPalette = gItemIconPalette_AbilityCapsule, }, [ITEM_ABILITY_PATCH] = @@ -1379,6 +1537,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_AbilityPatch, + .iconSprite = gItemIcon_AbilityPatch, + .iconPalette = gItemIconPalette_AbilityPatch, }, // Mints @@ -1396,6 +1556,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_LONELY, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_RedMint, }, [ITEM_ADAMANT_MINT] = @@ -1411,6 +1573,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_ADAMANT, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_RedMint, }, [ITEM_NAUGHTY_MINT] = @@ -1426,6 +1590,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_NAUGHTY, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_RedMint, }, [ITEM_BRAVE_MINT] = @@ -1441,6 +1607,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_BRAVE, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_RedMint, }, [ITEM_BOLD_MINT] = @@ -1456,6 +1624,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_BOLD, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_BlueMint, }, [ITEM_IMPISH_MINT] = @@ -1471,6 +1641,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_IMPISH, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_BlueMint, }, [ITEM_LAX_MINT] = @@ -1486,6 +1658,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_LAX, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_BlueMint, }, [ITEM_RELAXED_MINT] = @@ -1501,6 +1675,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_RELAXED, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_BlueMint, }, [ITEM_MODEST_MINT] = @@ -1516,6 +1692,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_MODEST, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_LightBlueMint, }, [ITEM_MILD_MINT] = @@ -1531,6 +1709,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_MILD, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_LightBlueMint, }, [ITEM_RASH_MINT] = @@ -1546,6 +1726,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_RASH, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_LightBlueMint, }, [ITEM_QUIET_MINT] = @@ -1561,6 +1743,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_QUIET, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_LightBlueMint, }, [ITEM_CALM_MINT] = @@ -1576,6 +1760,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_CALM, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_PinkMint, }, [ITEM_GENTLE_MINT] = @@ -1591,6 +1777,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_GENTLE, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_PinkMint, }, [ITEM_CAREFUL_MINT] = @@ -1606,6 +1794,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_CAREFUL, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_PinkMint, }, [ITEM_SASSY_MINT] = @@ -1621,6 +1811,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_SASSY, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_PinkMint, }, [ITEM_TIMID_MINT] = @@ -1636,6 +1828,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_TIMID, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_GreenMint, }, [ITEM_HASTY_MINT] = @@ -1651,6 +1845,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_HASTY, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_GreenMint, }, [ITEM_JOLLY_MINT] = @@ -1666,6 +1862,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_JOLLY, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_GreenMint, }, [ITEM_NAIVE_MINT] = @@ -1681,6 +1879,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_NAIVE, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_GreenMint, }, [ITEM_SERIOUS_MINT] = @@ -1696,6 +1896,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Mint, .secondaryId = NATURE_SERIOUS, .flingPower = 10, + .iconSprite = gItemIcon_Mint, + .iconPalette = gItemIconPalette_YellowMint, }, // Candy @@ -1714,6 +1916,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_RareCandy, .effect = gItemEffect_RareCandy, .flingPower = 30, + .iconSprite = gItemIcon_RareCandy, + .iconPalette = gItemIconPalette_RareCandy, }, [ITEM_EXP_CANDY_XS] = @@ -1731,6 +1935,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_RareCandy, .effect = gItemEffect_RareCandy, .flingPower = 30, + .iconSprite = gItemIcon_ExpCandyXS, + .iconPalette = gItemIconPalette_ExpCandies, }, [ITEM_EXP_CANDY_S] = @@ -1748,6 +1954,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_RareCandy, .effect = gItemEffect_RareCandy, .flingPower = 30, + .iconSprite = gItemIcon_ExpCandyS, + .iconPalette = gItemIconPalette_ExpCandies, }, [ITEM_EXP_CANDY_M] = @@ -1765,6 +1973,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_RareCandy, .effect = gItemEffect_RareCandy, .flingPower = 30, + .iconSprite = gItemIcon_ExpCandyM, + .iconPalette = gItemIconPalette_ExpCandies, }, [ITEM_EXP_CANDY_L] = @@ -1782,6 +1992,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_RareCandy, .effect = gItemEffect_RareCandy, .flingPower = 30, + .iconSprite = gItemIcon_ExpCandyL, + .iconPalette = gItemIconPalette_ExpCandies, }, [ITEM_EXP_CANDY_XL] = @@ -1799,6 +2011,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_RareCandy, .effect = gItemEffect_RareCandy, .flingPower = 30, + .iconSprite = gItemIcon_ExpCandyXL, + .iconPalette = gItemIconPalette_ExpCandies, }, [ITEM_DYNAMAX_CANDY] = @@ -1814,6 +2028,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_DynamaxCandy, .flingPower = 30, + .iconSprite = gItemIcon_DynamaxCandy, + .iconPalette = gItemIconPalette_DynamaxCandy, }, // Medicinal Flutes @@ -1832,6 +2048,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_Awakening, .flingPower = 30, + .iconSprite = gItemIcon_Flute, + .iconPalette = gItemIconPalette_BlueFlute, }, [ITEM_YELLOW_FLUTE] = @@ -1848,6 +2066,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_YellowFlute, .flingPower = 30, + .iconSprite = gItemIcon_Flute, + .iconPalette = gItemIconPalette_YellowFlute, }, [ITEM_RED_FLUTE] = @@ -1864,6 +2084,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_RedFlute, .flingPower = 30, + .iconSprite = gItemIcon_Flute, + .iconPalette = gItemIconPalette_RedFlute, }, // Encounter-modifying Flutes @@ -1881,6 +2103,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_BlackWhiteFlute, .flingPower = 30, + .iconSprite = gItemIcon_Flute, + .iconPalette = gItemIconPalette_BlackFlute, }, [ITEM_WHITE_FLUTE] = @@ -1895,6 +2119,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_BlackWhiteFlute, .flingPower = 30, + .iconSprite = gItemIcon_Flute, + .iconPalette = gItemIconPalette_WhiteFlute, }, // Encounter Modifiers @@ -1912,6 +2138,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_Repel, .flingPower = 30, + .iconSprite = gItemIcon_Repel, + .iconPalette = gItemIconPalette_Repel, }, [ITEM_SUPER_REPEL] = @@ -1927,6 +2155,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_Repel, .flingPower = 30, + .iconSprite = gItemIcon_Repel, + .iconPalette = gItemIconPalette_SuperRepel, }, [ITEM_MAX_REPEL] = @@ -1942,6 +2172,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_Repel, .flingPower = 30, + .iconSprite = gItemIcon_Repel, + .iconPalette = gItemIconPalette_MaxRepel, }, [ITEM_LURE] = @@ -1958,6 +2190,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Lure, .secondaryId = 0, .flingPower = 30, + .iconSprite = gItemIcon_Lure, + .iconPalette = gItemIconPalette_Lure, }, [ITEM_SUPER_LURE] = @@ -1974,6 +2208,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Lure, .secondaryId = 0, .flingPower = 30, + .iconSprite = gItemIcon_Lure, + .iconPalette = gItemIconPalette_SuperLure, }, [ITEM_MAX_LURE] = @@ -1990,6 +2226,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Lure, .secondaryId = 0, .flingPower = 30, + .iconSprite = gItemIcon_Lure, + .iconPalette = gItemIconPalette_MaxLure, }, [ITEM_ESCAPE_ROPE] = @@ -2010,6 +2248,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_EscapeRope, .flingPower = 30, + .iconSprite = gItemIcon_EscapeRope, + .iconPalette = gItemIconPalette_EscapeRope, }, // X Items @@ -2035,6 +2275,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_INCREASE_STAT, .effect = gItemEffect_XAttack, .flingPower = 30, + .iconSprite = gItemIcon_BattleStatItem, + .iconPalette = gItemIconPalette_XAttack, }, [ITEM_X_DEFENSE] = @@ -2058,6 +2300,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_INCREASE_STAT, .effect = gItemEffect_XDefense, .flingPower = 30, + .iconSprite = gItemIcon_BattleStatItem, + .iconPalette = gItemIconPalette_XDefend, }, [ITEM_X_SP_ATK] = @@ -2081,6 +2325,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_INCREASE_STAT, .effect = gItemEffect_XSpecialAttack, .flingPower = 30, + .iconSprite = gItemIcon_BattleStatItem, + .iconPalette = gItemIconPalette_XSpecial, }, [ITEM_X_SP_DEF] = @@ -2104,6 +2350,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_INCREASE_STAT, .effect = gItemEffect_XSpecialDefense, .flingPower = 30, + .iconSprite = gItemIcon_XSpecialDefense, + .iconPalette = gItemIconPalette_XSpecialDefense, }, [ITEM_X_SPEED] = @@ -2127,6 +2375,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_INCREASE_STAT, .effect = gItemEffect_XSpeed, .flingPower = 30, + .iconSprite = gItemIcon_BattleStatItem, + .iconPalette = gItemIconPalette_XSpeed, }, [ITEM_X_ACCURACY] = @@ -2151,6 +2401,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_INCREASE_STAT, .effect = gItemEffect_XAccuracy, .flingPower = 30, + .iconSprite = gItemIcon_BattleStatItem, + .iconPalette = gItemIconPalette_XAccuracy, }, [ITEM_DIRE_HIT] = @@ -2167,6 +2419,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_SET_FOCUS_ENERGY, .effect = gItemEffect_DireHit, .flingPower = 30, + .iconSprite = gItemIcon_BattleStatItem, + .iconPalette = gItemIconPalette_DireHit, }, [ITEM_GUARD_SPEC] = @@ -2184,6 +2438,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_SET_MIST, .effect = gItemEffect_GuardSpec, .flingPower = 30, + .iconSprite = gItemIcon_BattleStatItem, + .iconPalette = gItemIconPalette_GuardSpec, }, [ITEM_POKE_DOLL] = @@ -2196,6 +2452,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = EFFECT_ITEM_ESCAPE, .flingPower = 30, + .iconSprite = gItemIcon_PokeDoll, + .iconPalette = gItemIconPalette_PokeDoll, }, [ITEM_FLUFFY_TAIL] = @@ -2208,6 +2466,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = EFFECT_ITEM_ESCAPE, .flingPower = 30, + .iconSprite = gItemIcon_FluffyTail, + .iconPalette = gItemIconPalette_FluffyTail, }, [ITEM_POKE_TOY] = @@ -2220,6 +2480,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = EFFECT_ITEM_ESCAPE, .flingPower = 30, + .iconSprite = gItemIcon_PokeToy, + .iconPalette = gItemIconPalette_PokeToy, }, [ITEM_MAX_MUSHROOMS] = @@ -2236,6 +2498,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .battleUsage = EFFECT_ITEM_INCREASE_ALL_STATS, .flingPower = 30, + .iconSprite = gItemIcon_MaxMushrooms, + .iconPalette = gItemIconPalette_MaxMushrooms, }, // Treasures @@ -2252,6 +2516,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_BottleCap, + .iconPalette = gItemIconPalette_BottleCap, }, [ITEM_GOLD_BOTTLE_CAP] = @@ -2266,6 +2532,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_BottleCap, + .iconPalette = gItemIconPalette_GoldBottleCap, }, [ITEM_NUGGET] = @@ -2280,6 +2548,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_Nugget, + .iconPalette = gItemIconPalette_Nugget, }, [ITEM_BIG_NUGGET] = @@ -2294,6 +2564,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 130, + .iconSprite = gItemIcon_BigNugget, + .iconPalette = gItemIconPalette_BigNugget, }, [ITEM_TINY_MUSHROOM] = @@ -2308,6 +2580,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_TinyMushroom, + .iconPalette = gItemIconPalette_Mushroom, }, [ITEM_BIG_MUSHROOM] = @@ -2319,6 +2593,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_BigMushroom, + .iconPalette = gItemIconPalette_Mushroom, }, [ITEM_BALM_MUSHROOM] = @@ -2330,6 +2606,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_BalmMushroom, + .iconPalette = gItemIconPalette_BalmMushroom, }, [ITEM_PEARL] = @@ -2344,6 +2622,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_Pearl, + .iconPalette = gItemIconPalette_Pearl, }, [ITEM_BIG_PEARL] = @@ -2358,6 +2638,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_BigPearl, + .iconPalette = gItemIconPalette_Pearl, }, [ITEM_PEARL_STRING] = @@ -2372,6 +2654,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_PearlString, + .iconPalette = gItemIconPalette_PearlString, }, [ITEM_STARDUST] = @@ -2387,6 +2671,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_Stardust, + .iconPalette = gItemIconPalette_Star, }, [ITEM_STAR_PIECE] = @@ -2401,6 +2687,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_StarPiece, + .iconPalette = gItemIconPalette_Star, }, [ITEM_COMET_SHARD] = @@ -2415,6 +2703,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_CometShard, + .iconPalette = gItemIconPalette_CometShard, }, [ITEM_SHOAL_SALT] = @@ -2430,6 +2720,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_Powder, + .iconPalette = gItemIconPalette_ShoalSalt, }, [ITEM_SHOAL_SHELL] = @@ -2444,6 +2736,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_ShoalShell, + .iconPalette = gItemIconPalette_Shell, }, [ITEM_RED_SHARD] = @@ -2455,6 +2749,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_Shard, + .iconPalette = gItemIconPalette_RedShard, }, [ITEM_BLUE_SHARD] = @@ -2466,6 +2762,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_Shard, + .iconPalette = gItemIconPalette_BlueShard, }, [ITEM_YELLOW_SHARD] = @@ -2477,6 +2775,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_Shard, + .iconPalette = gItemIconPalette_YellowShard, }, [ITEM_GREEN_SHARD] = @@ -2488,6 +2788,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_Shard, + .iconPalette = gItemIconPalette_GreenShard, }, [ITEM_HEART_SCALE] = @@ -2502,6 +2804,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_HeartScale, + .iconPalette = gItemIconPalette_HeartScale, }, [ITEM_HONEY] = @@ -2517,6 +2821,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Honey, .flingPower = 30, + .iconSprite = gItemIcon_Honey, + .iconPalette = gItemIconPalette_Honey, }, [ITEM_RARE_BONE] = @@ -2531,6 +2837,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_RareBone, + .iconPalette = gItemIconPalette_RareBone, }, [ITEM_ODD_KEYSTONE] = @@ -2545,6 +2853,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_OddKeystone, + .iconPalette = gItemIconPalette_OddKeystone, }, [ITEM_PRETTY_FEATHER] = @@ -2559,6 +2869,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 20, + .iconSprite = gItemIcon_PrettyFeather, + .iconPalette = gItemIconPalette_PrettyFeather, }, [ITEM_RELIC_COPPER] = @@ -2573,6 +2885,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_RelicCoin, + .iconPalette = gItemIconPalette_RelicCopper, }, [ITEM_RELIC_SILVER] = @@ -2587,6 +2901,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_RelicCoin, + .iconPalette = gItemIconPalette_RelicSilver, }, [ITEM_RELIC_GOLD] = @@ -2601,6 +2917,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_RelicCoin, + .iconPalette = gItemIconPalette_RelicGold, }, [ITEM_RELIC_VASE] = @@ -2615,6 +2933,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_RelicVase, + .iconPalette = gItemIconPalette_Relics, }, [ITEM_RELIC_BAND] = @@ -2629,6 +2949,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_RelicBand, + .iconPalette = gItemIconPalette_Relics, }, [ITEM_RELIC_STATUE] = @@ -2643,6 +2965,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_RelicStatue, + .iconPalette = gItemIconPalette_Relics, }, [ITEM_RELIC_CROWN] = @@ -2657,6 +2981,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_RelicCrown, + .iconPalette = gItemIconPalette_Relics, }, [ITEM_STRANGE_SOUVENIR] = @@ -2671,6 +2997,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_StrangeSouvenir, + .iconPalette = gItemIconPalette_StrangeSouvenir, }, // Fossils @@ -2693,6 +3021,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_HelixFossil, + .iconPalette = gItemIconPalette_KantoFossil, }, [ITEM_DOME_FOSSIL] = @@ -2713,6 +3043,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_DomeFossil, + .iconPalette = gItemIconPalette_KantoFossil, }, [ITEM_OLD_AMBER] = @@ -2733,6 +3065,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_OldAmber, + .iconPalette = gItemIconPalette_OldAmber, }, [ITEM_ROOT_FOSSIL] = @@ -2750,6 +3084,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_RootFossil, + .iconPalette = gItemIconPalette_HoennFossil, }, [ITEM_CLAW_FOSSIL] = @@ -2767,6 +3103,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_ClawFossil, + .iconPalette = gItemIconPalette_HoennFossil, }, [ITEM_ARMOR_FOSSIL] = @@ -2781,6 +3119,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_ArmorFossil, + .iconPalette = gItemIconPalette_ArmorFossil, }, [ITEM_SKULL_FOSSIL] = @@ -2795,6 +3135,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_SkullFossil, + .iconPalette = gItemIconPalette_SkullFossil, }, [ITEM_COVER_FOSSIL] = @@ -2809,6 +3151,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_CoverFossil, + .iconPalette = gItemIconPalette_CoverFossil, }, [ITEM_PLUME_FOSSIL] = @@ -2823,6 +3167,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_PlumeFossil, + .iconPalette = gItemIconPalette_PlumeFossil, }, [ITEM_JAW_FOSSIL] = @@ -2837,6 +3183,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_JawFossil, + .iconPalette = gItemIconPalette_JawFossil, }, [ITEM_SAIL_FOSSIL] = @@ -2851,6 +3199,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_SailFossil, + .iconPalette = gItemIconPalette_SailFossil, }, [ITEM_FOSSILIZED_BIRD] = @@ -2865,6 +3215,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_FossilizedBird, + .iconPalette = gItemIconPalette_FossilizedBird, }, [ITEM_FOSSILIZED_FISH] = @@ -2877,6 +3229,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_FossilizedFish, + .iconPalette = gItemIconPalette_FossilizedFish, }, [ITEM_FOSSILIZED_DRAKE] = @@ -2891,6 +3245,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_FossilizedDrake, + .iconPalette = gItemIconPalette_FossilizedDrake, }, [ITEM_FOSSILIZED_DINO] = @@ -2902,6 +3258,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_FossilizedDino, + .iconPalette = gItemIconPalette_FossilizedDino, }, // Mulch @@ -2924,6 +3282,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = ITEM_TO_MULCH(ITEM_GROWTH_MULCH), .flingPower = 30, + .iconSprite = gItemIcon_Mulch, + .iconPalette = gItemIconPalette_GrowthMulch, }, [ITEM_DAMP_MULCH] = @@ -2944,6 +3304,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = ITEM_TO_MULCH(ITEM_DAMP_MULCH), .flingPower = 30, + .iconSprite = gItemIcon_Mulch, + .iconPalette = gItemIconPalette_DampMulch, }, [ITEM_STABLE_MULCH] = @@ -2964,6 +3326,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = ITEM_TO_MULCH(ITEM_STABLE_MULCH), .flingPower = 30, + .iconSprite = gItemIcon_StableMulch, + .iconPalette = gItemIconPalette_StableMulch, }, [ITEM_GOOEY_MULCH] = @@ -2984,6 +3348,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = ITEM_TO_MULCH(ITEM_GOOEY_MULCH), .flingPower = 30, + .iconSprite = gItemIcon_Mulch, + .iconPalette = gItemIconPalette_GooeyMulch, }, [ITEM_RICH_MULCH] = @@ -3004,6 +3370,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = ITEM_TO_MULCH(ITEM_RICH_MULCH), .flingPower = 30, + .iconSprite = gItemIcon_Mulch, + .iconPalette = gItemIconPalette_RichMulch, }, [ITEM_SURPRISE_MULCH] = @@ -3024,6 +3392,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = ITEM_TO_MULCH(ITEM_SURPRISE_MULCH), .flingPower = 30, + .iconSprite = gItemIcon_Mulch, + .iconPalette = gItemIconPalette_SurpriseMulch, }, [ITEM_BOOST_MULCH] = @@ -3044,6 +3414,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = ITEM_TO_MULCH(ITEM_BOOST_MULCH), .flingPower = 30, + .iconSprite = gItemIcon_Mulch, + .iconPalette = gItemIconPalette_BoostMulch, }, [ITEM_AMAZE_MULCH] = @@ -3064,6 +3436,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = ITEM_TO_MULCH(ITEM_AMAZE_MULCH), .flingPower = 30, + .iconSprite = gItemIcon_Mulch, + .iconPalette = gItemIconPalette_AmazeMulch, }, // Apricorns @@ -3079,6 +3453,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_RedApricorn, + .iconPalette = gItemIconPalette_RedApricorn, }, [ITEM_BLUE_APRICORN] = @@ -3092,6 +3468,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_BlueApricorn, + .iconPalette = gItemIconPalette_BlueApricorn, }, [ITEM_YELLOW_APRICORN] = @@ -3105,6 +3483,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_YellowApricorn, + .iconPalette = gItemIconPalette_YellowApricorn, }, [ITEM_GREEN_APRICORN] = @@ -3118,6 +3498,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_GreenApricorn, + .iconPalette = gItemIconPalette_GreenApricorn, }, [ITEM_PINK_APRICORN] = @@ -3131,6 +3513,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_PinkApricorn, + .iconPalette = gItemIconPalette_PinkApricorn, }, [ITEM_WHITE_APRICORN] = @@ -3144,6 +3528,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_WhiteApricorn, + .iconPalette = gItemIconPalette_WhiteApricorn, }, [ITEM_BLACK_APRICORN] = @@ -3157,6 +3543,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_BlackApricorn, + .iconPalette = gItemIconPalette_BlackApricorn, }, [ITEM_WISHING_PIECE] = @@ -3171,6 +3559,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo .flingPower = 50, + .iconSprite = gItemIcon_WishingPiece, + .iconPalette = gItemIconPalette_WishingPiece, }, [ITEM_GALARICA_TWIG] = @@ -3185,6 +3575,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_GalaricaTwig, + .iconPalette = gItemIconPalette_GalaricaItem, }, [ITEM_ARMORITE_ORE] = @@ -3200,6 +3592,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_ArmoriteOre, + .iconPalette = gItemIconPalette_ArmoriteOre, }, [ITEM_DYNITE_ORE] = @@ -3215,6 +3609,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_DyniteOre, + .iconPalette = gItemIconPalette_DyniteOre, }, // Mail @@ -3232,6 +3628,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_ORANGE_MAIL), + .iconSprite = gItemIcon_OrangeMail, + .iconPalette = gItemIconPalette_OrangeMail, }, [ITEM_HARBOR_MAIL] = @@ -3247,6 +3645,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_HARBOR_MAIL), + .iconSprite = gItemIcon_HarborMail, + .iconPalette = gItemIconPalette_HarborMail, }, [ITEM_GLITTER_MAIL] = @@ -3262,6 +3662,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_GLITTER_MAIL), + .iconSprite = gItemIcon_GlitterMail, + .iconPalette = gItemIconPalette_GlitterMail, }, [ITEM_MECH_MAIL] = @@ -3277,6 +3679,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_MECH_MAIL), + .iconSprite = gItemIcon_MechMail, + .iconPalette = gItemIconPalette_MechMail, }, [ITEM_WOOD_MAIL] = @@ -3292,6 +3696,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_WOOD_MAIL), + .iconSprite = gItemIcon_WoodMail, + .iconPalette = gItemIconPalette_WoodMail, }, [ITEM_WAVE_MAIL] = @@ -3307,6 +3713,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_WAVE_MAIL), + .iconSprite = gItemIcon_WaveMail, + .iconPalette = gItemIconPalette_WaveMail, }, [ITEM_BEAD_MAIL] = @@ -3319,6 +3727,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_BEAD_MAIL), + .iconSprite = gItemIcon_BeadMail, + .iconPalette = gItemIconPalette_BeadMail, }, [ITEM_SHADOW_MAIL] = @@ -3334,6 +3744,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_SHADOW_MAIL), + .iconSprite = gItemIcon_ShadowMail, + .iconPalette = gItemIconPalette_ShadowMail, }, [ITEM_TROPIC_MAIL] = @@ -3349,6 +3761,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_TROPIC_MAIL), + .iconSprite = gItemIcon_TropicMail, + .iconPalette = gItemIconPalette_TropicMail, }, [ITEM_DREAM_MAIL] = @@ -3361,6 +3775,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_DREAM_MAIL), + .iconSprite = gItemIcon_DreamMail, + .iconPalette = gItemIconPalette_DreamMail, }, [ITEM_FAB_MAIL] = @@ -3376,6 +3792,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_FAB_MAIL), + .iconSprite = gItemIcon_FabMail, + .iconPalette = gItemIconPalette_FabMail, }, [ITEM_RETRO_MAIL] = @@ -3391,6 +3809,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, .secondaryId = ITEM_TO_MAIL(ITEM_RETRO_MAIL), + .iconSprite = gItemIcon_RetroMail, + .iconPalette = gItemIconPalette_RetroMail, }, // Evolution Items @@ -3405,6 +3825,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_FireStone, + .iconPalette = gItemIconPalette_FireStone, }, [ITEM_WATER_STONE] = @@ -3417,6 +3839,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_WaterStone, + .iconPalette = gItemIconPalette_WaterStone, }, [ITEM_THUNDER_STONE] = @@ -3429,6 +3853,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_ThunderStone, + .iconPalette = gItemIconPalette_ThunderStone, }, [ITEM_LEAF_STONE] = @@ -3441,6 +3867,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_LeafStone, + .iconPalette = gItemIconPalette_LeafStone, }, [ITEM_ICE_STONE] = @@ -3453,6 +3881,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_IceStone, + .iconPalette = gItemIconPalette_IceStone, }, [ITEM_SUN_STONE] = @@ -3465,6 +3895,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_SunStone, + .iconPalette = gItemIconPalette_SunStone, }, [ITEM_MOON_STONE] = @@ -3477,6 +3909,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_MoonStone, + .iconPalette = gItemIconPalette_MoonStone, }, [ITEM_SHINY_STONE] = @@ -3489,6 +3923,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_ShinyStone, + .iconPalette = gItemIconPalette_ShinyStone, }, [ITEM_DUSK_STONE] = @@ -3501,6 +3937,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconSprite = gItemIcon_DuskStone, + .iconPalette = gItemIconPalette_DuskStone, }, [ITEM_DAWN_STONE] = @@ -3513,6 +3951,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconSprite = gItemIcon_DawnStone, + .iconPalette = gItemIconPalette_DawnStone, }, [ITEM_SWEET_APPLE] = @@ -3528,6 +3968,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_SweetApple, + .iconPalette = gItemIconPalette_SweetApple, }, [ITEM_TART_APPLE] = @@ -3543,6 +3985,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_TartApple, + .iconPalette = gItemIconPalette_TartApple, }, [ITEM_CRACKED_POT] = @@ -3558,6 +4002,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconSprite = gItemIcon_CrackedPot, + .iconPalette = gItemIconPalette_Pot, }, [ITEM_CHIPPED_POT] = @@ -3573,6 +4019,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconSprite = gItemIcon_ChippedPot, + .iconPalette = gItemIconPalette_Pot, }, [ITEM_GALARICA_CUFF] = @@ -3588,6 +4036,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_GalaricaCuff, + .iconPalette = gItemIconPalette_GalaricaItem, }, [ITEM_GALARICA_WREATH] = @@ -3604,6 +4054,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_GalaricaWreath, + .iconPalette = gItemIconPalette_GalaricaItem, }, [ITEM_DRAGON_SCALE] = @@ -3621,6 +4073,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_DragonScale, + .iconPalette = gItemIconPalette_DragonScale, }, [ITEM_UPGRADE] = @@ -3636,6 +4090,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_Upgrade, + .iconPalette = gItemIconPalette_Upgrade, }, [ITEM_PROTECTOR] = @@ -3651,6 +4107,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconSprite = gItemIcon_Protector, + .iconPalette = gItemIconPalette_Protector, }, [ITEM_ELECTIRIZER] = @@ -3666,6 +4124,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconSprite = gItemIcon_Electirizer, + .iconPalette = gItemIconPalette_Electirizer, }, [ITEM_MAGMARIZER] = @@ -3681,6 +4141,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconSprite = gItemIcon_Magmarizer, + .iconPalette = gItemIconPalette_Magmarizer, }, [ITEM_DUBIOUS_DISC] = @@ -3696,6 +4158,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 50, + .iconSprite = gItemIcon_DubiousDisc, + .iconPalette = gItemIconPalette_DubiousDisc, }, [ITEM_REAPER_CLOTH] = @@ -3712,6 +4176,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 10, + .iconSprite = gItemIcon_ReaperCloth, + .iconPalette = gItemIconPalette_ReaperCloth, }, [ITEM_PRISM_SCALE] = @@ -3727,6 +4193,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_PrismScale, + .iconPalette = gItemIconPalette_PrismScale, }, [ITEM_WHIPPED_DREAM] = @@ -3743,6 +4211,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconSprite = gItemIcon_WhippedDream, + .iconPalette = gItemIconPalette_WhippedDream, }, [ITEM_SACHET] = @@ -3758,6 +4228,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconSprite = gItemIcon_Sachet, + .iconPalette = gItemIconPalette_Sachet, }, [ITEM_OVAL_STONE] = @@ -3773,6 +4245,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconSprite = gItemIcon_OvalStone, + .iconPalette = gItemIconPalette_OvalStone, }, [ITEM_STRAWBERRY_SWEET] = @@ -3787,6 +4261,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_StrawberrySweet, + .iconPalette = gItemIconPalette_StrawberrySweet, }, [ITEM_LOVE_SWEET] = @@ -3801,6 +4277,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_LoveSweet, + .iconPalette = gItemIconPalette_LoveSweet, }, [ITEM_BERRY_SWEET] = @@ -3815,6 +4293,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_BerrySweet, + .iconPalette = gItemIconPalette_BerrySweet, }, [ITEM_CLOVER_SWEET] = @@ -3829,6 +4309,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_CloverSweet, + .iconPalette = gItemIconPalette_CloverSweet, }, [ITEM_FLOWER_SWEET] = @@ -3843,6 +4325,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_FlowerSweet, + .iconPalette = gItemIconPalette_FlowerSweet, }, [ITEM_STAR_SWEET] = @@ -3857,6 +4341,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_StarSweet, + .iconPalette = gItemIconPalette_StarSweet, }, [ITEM_RIBBON_SWEET] = @@ -3871,6 +4357,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_RibbonSweet, + .iconPalette = gItemIconPalette_RibbonSweet, }, [ITEM_EVERSTONE] = @@ -3886,6 +4374,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_Everstone, + .iconPalette = gItemIconPalette_Everstone, }, // Nectars @@ -3900,6 +4390,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse, .flingPower = 10, + .iconSprite = gItemIcon_RedNectar, + .iconPalette = gItemIconPalette_RedNectar, }, [ITEM_YELLOW_NECTAR] = @@ -3912,6 +4404,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse, .flingPower = 10, + .iconSprite = gItemIcon_YellowNectar, + .iconPalette = gItemIconPalette_YellowNectar, }, [ITEM_PINK_NECTAR] = @@ -3924,6 +4418,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse, .flingPower = 10, + .iconSprite = gItemIcon_PinkNectar, + .iconPalette = gItemIconPalette_PinkNectar, }, [ITEM_PURPLE_NECTAR] = @@ -3936,6 +4432,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse, .flingPower = 10, + .iconSprite = gItemIcon_PurpleNectar, + .iconPalette = gItemIconPalette_PurpleNectar, }, // Plates @@ -3955,6 +4453,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, .flingPower = 90, + .iconSprite = gItemIcon_FlamePlate, + .iconPalette = gItemIconPalette_FlamePlate, }, [ITEM_SPLASH_PLATE] = @@ -3972,6 +4472,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, .flingPower = 90, + .iconSprite = gItemIcon_SplashPlate, + .iconPalette = gItemIconPalette_SplashPlate, }, [ITEM_ZAP_PLATE] = @@ -3989,6 +4491,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, .flingPower = 90, + .iconSprite = gItemIcon_ZapPlate, + .iconPalette = gItemIconPalette_ZapPlate, }, [ITEM_MEADOW_PLATE] = @@ -4006,6 +4510,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GRASS, .flingPower = 90, + .iconSprite = gItemIcon_MeadowPlate, + .iconPalette = gItemIconPalette_MeadowPlate, }, [ITEM_ICICLE_PLATE] = @@ -4023,6 +4529,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, .flingPower = 90, + .iconSprite = gItemIcon_IciclePlate, + .iconPalette = gItemIconPalette_IciclePlate, }, [ITEM_FIST_PLATE] = @@ -4040,6 +4548,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIGHTING, .flingPower = 90, + .iconSprite = gItemIcon_FistPlate, + .iconPalette = gItemIconPalette_FistPlate, }, [ITEM_TOXIC_PLATE] = @@ -4057,6 +4567,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_POISON, .flingPower = 90, + .iconSprite = gItemIcon_ToxicPlate, + .iconPalette = gItemIconPalette_ToxicPlate, }, [ITEM_EARTH_PLATE] = @@ -4074,6 +4586,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GROUND, .flingPower = 90, + .iconSprite = gItemIcon_EarthPlate, + .iconPalette = gItemIconPalette_EarthPlate, }, [ITEM_SKY_PLATE] = @@ -4091,6 +4605,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FLYING, .flingPower = 90, + .iconSprite = gItemIcon_SkyPlate, + .iconPalette = gItemIconPalette_SkyPlate, }, [ITEM_MIND_PLATE] = @@ -4108,6 +4624,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_PSYCHIC, .flingPower = 90, + .iconSprite = gItemIcon_MindPlate, + .iconPalette = gItemIconPalette_MindPlate, }, [ITEM_INSECT_PLATE] = @@ -4125,6 +4643,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_BUG, .flingPower = 90, + .iconSprite = gItemIcon_InsectPlate, + .iconPalette = gItemIconPalette_InsectPlate, }, [ITEM_STONE_PLATE] = @@ -4142,6 +4662,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ROCK, .flingPower = 90, + .iconSprite = gItemIcon_StonePlate, + .iconPalette = gItemIconPalette_StonePlate, }, [ITEM_SPOOKY_PLATE] = @@ -4159,6 +4681,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GHOST, .flingPower = 90, + .iconSprite = gItemIcon_SpookyPlate, + .iconPalette = gItemIconPalette_SpookyPlate, }, [ITEM_DRACO_PLATE] = @@ -4176,6 +4700,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DRAGON, .flingPower = 90, + .iconSprite = gItemIcon_DracoPlate, + .iconPalette = gItemIconPalette_DracoPlate, }, [ITEM_DREAD_PLATE] = @@ -4193,6 +4719,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DARK, .flingPower = 90, + .iconSprite = gItemIcon_DreadPlate, + .iconPalette = gItemIconPalette_DreadPlate, }, [ITEM_IRON_PLATE] = @@ -4210,6 +4738,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_STEEL, .flingPower = 90, + .iconSprite = gItemIcon_IronPlate, + .iconPalette = gItemIconPalette_IronPlate, }, [ITEM_PIXIE_PLATE] = @@ -4227,6 +4757,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FAIRY, .flingPower = 90, + .iconSprite = gItemIcon_PixiePlate, + .iconPalette = gItemIconPalette_PixiePlate, }, // Drives @@ -4245,6 +4777,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, .flingPower = 70, + .iconSprite = gItemIcon_DouseDrive, + .iconPalette = gItemIconPalette_DouseDrive, }, [ITEM_SHOCK_DRIVE] = @@ -4261,6 +4795,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, .flingPower = 70, + .iconSprite = gItemIcon_ShockDrive, + .iconPalette = gItemIconPalette_ShockDrive, }, [ITEM_BURN_DRIVE] = @@ -4277,6 +4813,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, .flingPower = 70, + .iconSprite = gItemIcon_BurnDrive, + .iconPalette = gItemIconPalette_BurnDrive, }, [ITEM_CHILL_DRIVE] = @@ -4293,6 +4831,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, .flingPower = 70, + .iconSprite = gItemIcon_ChillDrive, + .iconPalette = gItemIconPalette_ChillDrive, }, // Memories @@ -4313,6 +4853,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, .flingPower = 50, + .iconSprite = gItemIcon_FireMemory, + .iconPalette = gItemIconPalette_FireMemory, }, [ITEM_WATER_MEMORY] = @@ -4331,6 +4873,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, .flingPower = 50, + .iconSprite = gItemIcon_WaterMemory, + .iconPalette = gItemIconPalette_WaterMemory, }, [ITEM_ELECTRIC_MEMORY] = @@ -4349,6 +4893,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, .flingPower = 50, + .iconSprite = gItemIcon_ElectricMemory, + .iconPalette = gItemIconPalette_ElectricMemory, }, [ITEM_GRASS_MEMORY] = @@ -4367,6 +4913,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GRASS, .flingPower = 50, + .iconSprite = gItemIcon_GrassMemory, + .iconPalette = gItemIconPalette_GrassMemory, }, [ITEM_ICE_MEMORY] = @@ -4385,6 +4933,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, .flingPower = 50, + .iconSprite = gItemIcon_IceMemory, + .iconPalette = gItemIconPalette_IceMemory, }, [ITEM_FIGHTING_MEMORY] = @@ -4403,6 +4953,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIGHTING, .flingPower = 50, + .iconSprite = gItemIcon_FightingMemory, + .iconPalette = gItemIconPalette_FightingMemory, }, [ITEM_POISON_MEMORY] = @@ -4421,6 +4973,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_POISON, .flingPower = 50, + .iconSprite = gItemIcon_PoisonMemory, + .iconPalette = gItemIconPalette_PoisonMemory, }, [ITEM_GROUND_MEMORY] = @@ -4439,6 +4993,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GROUND, .flingPower = 50, + .iconSprite = gItemIcon_GroundMemory, + .iconPalette = gItemIconPalette_GroundMemory, }, [ITEM_FLYING_MEMORY] = @@ -4457,6 +5013,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FLYING, .flingPower = 50, + .iconSprite = gItemIcon_FlyingMemory, + .iconPalette = gItemIconPalette_FlyingMemory, }, [ITEM_PSYCHIC_MEMORY] = @@ -4475,6 +5033,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_PSYCHIC, .flingPower = 50, + .iconSprite = gItemIcon_PsychicMemory, + .iconPalette = gItemIconPalette_PsychicMemory, }, [ITEM_BUG_MEMORY] = @@ -4493,6 +5053,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_BUG, .flingPower = 50, + .iconSprite = gItemIcon_BugMemory, + .iconPalette = gItemIconPalette_BugMemory, }, [ITEM_ROCK_MEMORY] = @@ -4511,6 +5073,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ROCK, .flingPower = 50, + .iconSprite = gItemIcon_RockMemory, + .iconPalette = gItemIconPalette_RockMemory, }, [ITEM_GHOST_MEMORY] = @@ -4529,6 +5093,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GHOST, .flingPower = 50, + .iconSprite = gItemIcon_GhostMemory, + .iconPalette = gItemIconPalette_GhostMemory, }, [ITEM_DRAGON_MEMORY] = @@ -4547,6 +5113,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DRAGON, .flingPower = 50, + .iconSprite = gItemIcon_DragonMemory, + .iconPalette = gItemIconPalette_DragonMemory, }, [ITEM_DARK_MEMORY] = @@ -4565,6 +5133,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DARK, .flingPower = 50, + .iconSprite = gItemIcon_DarkMemory, + .iconPalette = gItemIconPalette_DarkMemory, }, [ITEM_STEEL_MEMORY] = @@ -4583,6 +5153,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_STEEL, .flingPower = 50, + .iconSprite = gItemIcon_SteelMemory, + .iconPalette = gItemIconPalette_SteelMemory, }, [ITEM_FAIRY_MEMORY] = @@ -4601,6 +5173,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FAIRY, .flingPower = 50, + .iconSprite = gItemIcon_FairyMemory, + .iconPalette = gItemIconPalette_FairyMemory, }, [ITEM_RUSTED_SWORD] = @@ -4614,6 +5188,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_RustedSword, + .iconPalette = gItemIconPalette_RustedWeapons, }, [ITEM_RUSTED_SHIELD] = @@ -4627,6 +5203,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_RustedShield, + .iconPalette = gItemIconPalette_RustedWeapons, }, // Colored Orbs @@ -4643,6 +5221,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_RedOrb, + .iconPalette = gItemIconPalette_RedOrb, }, [ITEM_BLUE_ORB] = @@ -4657,6 +5237,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_BlueOrb, + .iconPalette = gItemIconPalette_BlueOrb, }, // Mega Stones @@ -4674,6 +5256,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Venusaurite, + .iconPalette = gItemIconPalette_Venusaurite, }, [ITEM_CHARIZARDITE_X] = @@ -4687,6 +5271,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_CharizarditeX, + .iconPalette = gItemIconPalette_CharizarditeX, }, [ITEM_CHARIZARDITE_Y] = @@ -4700,6 +5286,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_CharizarditeY, + .iconPalette = gItemIconPalette_CharizarditeY, }, [ITEM_BLASTOISINITE] = @@ -4715,6 +5303,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Blastoisinite, + .iconPalette = gItemIconPalette_Blastoisinite, }, [ITEM_BEEDRILLITE] = @@ -4730,6 +5320,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Beedrillite, + .iconPalette = gItemIconPalette_Beedrillite, }, [ITEM_PIDGEOTITE] = @@ -4745,6 +5337,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Pidgeotite, + .iconPalette = gItemIconPalette_Pidgeotite, }, [ITEM_ALAKAZITE] = @@ -4760,6 +5354,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Alakazite, + .iconPalette = gItemIconPalette_Alakazite, }, [ITEM_SLOWBRONITE] = @@ -4775,6 +5371,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Slowbronite, + .iconPalette = gItemIconPalette_Slowbronite, }, [ITEM_GENGARITE] = @@ -4790,6 +5388,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Gengarite, + .iconPalette = gItemIconPalette_Gengarite, }, [ITEM_KANGASKHANITE] = @@ -4805,6 +5405,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Kangaskhanite, + .iconPalette = gItemIconPalette_Kangaskhanite, }, [ITEM_PINSIRITE] = @@ -4820,6 +5422,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Pinsirite, + .iconPalette = gItemIconPalette_Pinsirite, }, [ITEM_GYARADOSITE] = @@ -4835,6 +5439,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Gyaradosite, + .iconPalette = gItemIconPalette_Gyaradosite, }, [ITEM_AERODACTYLITE] = @@ -4850,6 +5456,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Aerodactylite, + .iconPalette = gItemIconPalette_Aerodactylite, }, [ITEM_MEWTWONITE_X] = @@ -4863,6 +5471,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_MewtwoniteX, + .iconPalette = gItemIconPalette_MewtwoniteX, }, [ITEM_MEWTWONITE_Y] = @@ -4876,6 +5486,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_MewtwoniteY, + .iconPalette = gItemIconPalette_MewtwoniteY, }, [ITEM_AMPHAROSITE] = @@ -4891,6 +5503,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Ampharosite, + .iconPalette = gItemIconPalette_Ampharosite, }, [ITEM_STEELIXITE] = @@ -4906,6 +5520,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Steelixite, + .iconPalette = gItemIconPalette_Steelixite, }, [ITEM_SCIZORITE] = @@ -4921,6 +5537,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Scizorite, + .iconPalette = gItemIconPalette_Scizorite, }, [ITEM_HERACRONITE] = @@ -4936,6 +5554,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Heracronite, + .iconPalette = gItemIconPalette_Heracronite, }, [ITEM_HOUNDOOMINITE] = @@ -4951,6 +5571,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Houndoominite, + .iconPalette = gItemIconPalette_Houndoominite, }, [ITEM_TYRANITARITE] = @@ -4966,6 +5588,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Tyranitarite, + .iconPalette = gItemIconPalette_Tyranitarite, }, [ITEM_SCEPTILITE] = @@ -4981,6 +5605,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Sceptilite, + .iconPalette = gItemIconPalette_Sceptilite, }, [ITEM_BLAZIKENITE] = @@ -4996,6 +5622,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Blazikenite, + .iconPalette = gItemIconPalette_Blazikenite, }, [ITEM_SWAMPERTITE] = @@ -5011,6 +5639,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Swampertite, + .iconPalette = gItemIconPalette_Swampertite, }, [ITEM_GARDEVOIRITE] = @@ -5026,6 +5656,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Gardevoirite, + .iconPalette = gItemIconPalette_Gardevoirite, }, [ITEM_SABLENITE] = @@ -5041,6 +5673,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Sablenite, + .iconPalette = gItemIconPalette_Sablenite, }, [ITEM_MAWILITE] = @@ -5056,6 +5690,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Mawilite, + .iconPalette = gItemIconPalette_Mawilite, }, [ITEM_AGGRONITE] = @@ -5071,6 +5707,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Aggronite, + .iconPalette = gItemIconPalette_Aggronite, }, [ITEM_MEDICHAMITE] = @@ -5086,6 +5724,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Medichamite, + .iconPalette = gItemIconPalette_Medichamite, }, [ITEM_MANECTITE] = @@ -5101,6 +5741,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Manectite, + .iconPalette = gItemIconPalette_Manectite, }, [ITEM_SHARPEDONITE] = @@ -5116,6 +5758,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Sharpedonite, + .iconPalette = gItemIconPalette_Sharpedonite, }, [ITEM_CAMERUPTITE] = @@ -5131,6 +5775,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Cameruptite, + .iconPalette = gItemIconPalette_Cameruptite, }, [ITEM_ALTARIANITE] = @@ -5146,6 +5792,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Altarianite, + .iconPalette = gItemIconPalette_Altarianite, }, [ITEM_BANETTITE] = @@ -5161,6 +5809,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Banettite, + .iconPalette = gItemIconPalette_Banettite, }, [ITEM_ABSOLITE] = @@ -5176,6 +5826,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Absolite, + .iconPalette = gItemIconPalette_Absolite, }, [ITEM_GLALITITE] = @@ -5191,6 +5843,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Glalitite, + .iconPalette = gItemIconPalette_Glalitite, }, [ITEM_SALAMENCITE] = @@ -5206,6 +5860,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Salamencite, + .iconPalette = gItemIconPalette_Salamencite, }, [ITEM_METAGROSSITE] = @@ -5221,6 +5877,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Metagrossite, + .iconPalette = gItemIconPalette_Metagrossite, }, [ITEM_LATIASITE] = @@ -5236,6 +5894,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Latiasite, + .iconPalette = gItemIconPalette_Latiasite, }, [ITEM_LATIOSITE] = @@ -5251,6 +5911,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Latiosite, + .iconPalette = gItemIconPalette_Latiosite, }, [ITEM_LOPUNNITE] = @@ -5266,6 +5928,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Lopunnite, + .iconPalette = gItemIconPalette_Lopunnite, }, [ITEM_GARCHOMPITE] = @@ -5281,6 +5945,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Garchompite, + .iconPalette = gItemIconPalette_Garchompite, }, [ITEM_LUCARIONITE] = @@ -5296,6 +5962,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Lucarionite, + .iconPalette = gItemIconPalette_Lucarionite, }, [ITEM_ABOMASITE] = @@ -5311,6 +5979,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Abomasite, + .iconPalette = gItemIconPalette_Abomasite, }, [ITEM_GALLADITE] = @@ -5326,6 +5996,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Galladite, + .iconPalette = gItemIconPalette_Galladite, }, [ITEM_AUDINITE] = @@ -5341,6 +6013,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Audinite, + .iconPalette = gItemIconPalette_Audinite, }, [ITEM_DIANCITE] = @@ -5356,6 +6030,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_Diancite, + .iconPalette = gItemIconPalette_Diancite, }, // Gems @@ -5374,6 +6050,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_NORMAL, + .iconSprite = gItemIcon_NormalGem, + .iconPalette = gItemIconPalette_NormalGem, }, [ITEM_FIRE_GEM] = @@ -5390,6 +6068,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, + .iconSprite = gItemIcon_FireGem, + .iconPalette = gItemIconPalette_FireGem, }, [ITEM_WATER_GEM] = @@ -5406,6 +6086,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, + .iconSprite = gItemIcon_WaterGem, + .iconPalette = gItemIconPalette_WaterGem, }, [ITEM_ELECTRIC_GEM] = @@ -5422,6 +6104,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, + .iconSprite = gItemIcon_ElectricGem, + .iconPalette = gItemIconPalette_ElectricGem, }, [ITEM_GRASS_GEM] = @@ -5438,6 +6122,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GRASS, + .iconSprite = gItemIcon_GrassGem, + .iconPalette = gItemIconPalette_GrassGem, }, [ITEM_ICE_GEM] = @@ -5454,6 +6140,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, + .iconSprite = gItemIcon_IceGem, + .iconPalette = gItemIconPalette_IceGem, }, [ITEM_FIGHTING_GEM] = @@ -5470,6 +6158,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIGHTING, + .iconSprite = gItemIcon_FightingGem, + .iconPalette = gItemIconPalette_FightingGem, }, [ITEM_POISON_GEM] = @@ -5486,6 +6176,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_POISON, + .iconSprite = gItemIcon_PoisonGem, + .iconPalette = gItemIconPalette_PoisonGem, }, [ITEM_GROUND_GEM] = @@ -5502,6 +6194,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GROUND, + .iconSprite = gItemIcon_GroundGem, + .iconPalette = gItemIconPalette_GroundGem, }, [ITEM_FLYING_GEM] = @@ -5518,6 +6212,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FLYING, + .iconSprite = gItemIcon_FlyingGem, + .iconPalette = gItemIconPalette_FlyingGem, }, [ITEM_PSYCHIC_GEM] = @@ -5534,6 +6230,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_PSYCHIC, + .iconSprite = gItemIcon_PsychicGem, + .iconPalette = gItemIconPalette_PsychicGem, }, [ITEM_BUG_GEM] = @@ -5550,6 +6248,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_BUG, + .iconSprite = gItemIcon_BugGem, + .iconPalette = gItemIconPalette_BugGem, }, [ITEM_ROCK_GEM] = @@ -5566,6 +6266,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ROCK, + .iconSprite = gItemIcon_RockGem, + .iconPalette = gItemIconPalette_RockGem, }, [ITEM_GHOST_GEM] = @@ -5582,6 +6284,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GHOST, + .iconSprite = gItemIcon_GhostGem, + .iconPalette = gItemIconPalette_GhostGem, }, [ITEM_DRAGON_GEM] = @@ -5598,6 +6302,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DRAGON, + .iconSprite = gItemIcon_DragonGem, + .iconPalette = gItemIconPalette_DragonGem, }, [ITEM_DARK_GEM] = @@ -5614,6 +6320,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DARK, + .iconSprite = gItemIcon_DarkGem, + .iconPalette = gItemIconPalette_DarkGem, }, [ITEM_STEEL_GEM] = @@ -5630,6 +6338,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_STEEL, + .iconSprite = gItemIcon_SteelGem, + .iconPalette = gItemIconPalette_SteelGem, }, [ITEM_FAIRY_GEM] = @@ -5646,6 +6356,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FAIRY, + .iconSprite = gItemIcon_FairyGem, + .iconPalette = gItemIconPalette_FairyGem, }, // Z-Crystals @@ -5662,7 +6374,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_NORMAL + .secondaryId = TYPE_NORMAL, + .iconSprite = gItemIcon_NormaliumZ, + .iconPalette = gItemIconPalette_NormaliumZ, }, [ITEM_FIRIUM_Z] = @@ -5677,7 +6391,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_FIRE + .secondaryId = TYPE_FIRE, + .iconSprite = gItemIcon_FiriumZ, + .iconPalette = gItemIconPalette_FiriumZ, }, [ITEM_WATERIUM_Z] = @@ -5692,7 +6408,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_WATER + .secondaryId = TYPE_WATER, + .iconSprite = gItemIcon_WateriumZ, + .iconPalette = gItemIconPalette_WateriumZ, }, [ITEM_ELECTRIUM_Z] = @@ -5707,7 +6425,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_ELECTRIC + .secondaryId = TYPE_ELECTRIC, + .iconSprite = gItemIcon_ElectriumZ, + .iconPalette = gItemIconPalette_ElectriumZ, }, [ITEM_GRASSIUM_Z] = @@ -5722,7 +6442,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_GRASS + .secondaryId = TYPE_GRASS, + .iconSprite = gItemIcon_GrassiumZ, + .iconPalette = gItemIconPalette_GrassiumZ, }, [ITEM_ICIUM_Z] = @@ -5737,7 +6459,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_ICE + .secondaryId = TYPE_ICE, + .iconSprite = gItemIcon_IciumZ, + .iconPalette = gItemIconPalette_IciumZ, }, [ITEM_FIGHTINIUM_Z] = @@ -5752,7 +6476,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_FIGHTING + .secondaryId = TYPE_FIGHTING, + .iconSprite = gItemIcon_FightiniumZ, + .iconPalette = gItemIconPalette_FightiniumZ, }, [ITEM_POISONIUM_Z] = @@ -5767,7 +6493,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_POISON + .secondaryId = TYPE_POISON, + .iconSprite = gItemIcon_PoisoniumZ, + .iconPalette = gItemIconPalette_PoisoniumZ, }, [ITEM_GROUNDIUM_Z] = @@ -5782,7 +6510,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_GROUND + .secondaryId = TYPE_GROUND, + .iconSprite = gItemIcon_GroundiumZ, + .iconPalette = gItemIconPalette_GroundiumZ, }, [ITEM_FLYINIUM_Z] = @@ -5797,7 +6527,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_FLYING + .secondaryId = TYPE_FLYING, + .iconSprite = gItemIcon_FlyiniumZ, + .iconPalette = gItemIconPalette_FlyiniumZ, }, [ITEM_PSYCHIUM_Z] = @@ -5812,7 +6544,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_PSYCHIC + .secondaryId = TYPE_PSYCHIC, + .iconSprite = gItemIcon_PsychiumZ, + .iconPalette = gItemIconPalette_PsychiumZ, }, [ITEM_BUGINIUM_Z] = @@ -5827,7 +6561,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_BUG + .secondaryId = TYPE_BUG, + .iconSprite = gItemIcon_BuginiumZ, + .iconPalette = gItemIconPalette_BuginiumZ, }, [ITEM_ROCKIUM_Z] = @@ -5842,7 +6578,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_ROCK + .secondaryId = TYPE_ROCK, + .iconSprite = gItemIcon_RockiumZ, + .iconPalette = gItemIconPalette_RockiumZ, }, [ITEM_GHOSTIUM_Z] = @@ -5857,7 +6595,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_GHOST + .secondaryId = TYPE_GHOST, + .iconSprite = gItemIcon_GhostiumZ, + .iconPalette = gItemIconPalette_GhostiumZ, }, [ITEM_DRAGONIUM_Z] = @@ -5872,7 +6612,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_DRAGON + .secondaryId = TYPE_DRAGON, + .iconSprite = gItemIcon_DragoniumZ, + .iconPalette = gItemIconPalette_DragoniumZ, }, [ITEM_DARKINIUM_Z] = @@ -5887,7 +6629,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_DARK + .secondaryId = TYPE_DARK, + .iconSprite = gItemIcon_DarkiniumZ, + .iconPalette = gItemIconPalette_DarkiniumZ, }, [ITEM_STEELIUM_Z] = @@ -5902,7 +6646,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_STEEL + .secondaryId = TYPE_STEEL, + .iconSprite = gItemIcon_SteeliumZ, + .iconPalette = gItemIconPalette_SteeliumZ, }, [ITEM_FAIRIUM_Z] = @@ -5917,7 +6663,9 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = TYPE_FAIRY + .secondaryId = TYPE_FAIRY, + .iconSprite = gItemIcon_FairiumZ, + .iconPalette = gItemIconPalette_FairiumZ, }, [ITEM_PIKANIUM_Z] = @@ -5932,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 + .iconSprite = gItemIcon_PikaniumZ, + .iconPalette = gItemIconPalette_PikaniumZ, }, [ITEM_EEVIUM_Z] = @@ -5947,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 + .iconSprite = gItemIcon_EeviumZ, + .iconPalette = gItemIconPalette_EeviumZ, }, [ITEM_SNORLIUM_Z] = @@ -5962,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 + .iconSprite = gItemIcon_SnorliumZ, + .iconPalette = gItemIconPalette_SnorliumZ, }, [ITEM_MEWNIUM_Z] = @@ -5977,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 + .iconSprite = gItemIcon_MewniumZ, + .iconPalette = gItemIconPalette_MewniumZ, }, [ITEM_DECIDIUM_Z] = @@ -5992,7 +6748,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 + .iconSprite = gItemIcon_DecidiumZ, + .iconPalette = gItemIconPalette_DecidiumZ, }, [ITEM_INCINIUM_Z] = @@ -6007,7 +6765,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 + .iconSprite = gItemIcon_InciniumZ, + .iconPalette = gItemIconPalette_InciniumZ, }, [ITEM_PRIMARIUM_Z] = @@ -6022,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 + .iconSprite = gItemIcon_PrimariumZ, + .iconPalette = gItemIconPalette_PrimariumZ, }, [ITEM_LYCANIUM_Z] = @@ -6037,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 + .iconSprite = gItemIcon_LycaniumZ, + .iconPalette = gItemIconPalette_LycaniumZ, }, [ITEM_MIMIKIUM_Z] = @@ -6052,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 + .iconSprite = gItemIcon_MimikiumZ, + .iconPalette = gItemIconPalette_MimikiumZ, }, [ITEM_KOMMONIUM_Z] = @@ -6067,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 + .iconSprite = gItemIcon_KommoniumZ, + .iconPalette = gItemIconPalette_KommoniumZ, }, [ITEM_TAPUNIUM_Z] = @@ -6082,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 + .iconSprite = gItemIcon_TapuniumZ, + .iconPalette = gItemIconPalette_TapuniumZ, }, [ITEM_SOLGANIUM_Z] = @@ -6097,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 + .iconSprite = gItemIcon_SolganiumZ, + .iconPalette = gItemIconPalette_SolganiumZ, }, [ITEM_LUNALIUM_Z] = @@ -6112,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 + .iconSprite = gItemIcon_LunaliumZ, + .iconPalette = gItemIconPalette_LunaliumZ, }, [ITEM_MARSHADIUM_Z] = @@ -6127,7 +6901,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 + .iconSprite = gItemIcon_MarshadiumZ, + .iconPalette = gItemIconPalette_MarshadiumZ, }, [ITEM_ALORAICHIUM_Z] = @@ -6142,7 +6918,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 + .iconSprite = gItemIcon_AloraichiumZ, + .iconPalette = gItemIconPalette_AloraichiumZ, }, [ITEM_PIKASHUNIUM_Z] = @@ -6157,7 +6935,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 + .iconSprite = gItemIcon_PikashuniumZ, + .iconPalette = gItemIconPalette_PikashuniumZ, }, [ITEM_ULTRANECROZIUM_Z] = @@ -6172,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 + .iconSprite = gItemIcon_UltranecroziumZ, + .iconPalette = gItemIconPalette_UltranecroziumZ, }, // Species-specific Held Items @@ -6190,6 +6972,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_LightBall, + .iconPalette = gItemIconPalette_LightBall, }, [ITEM_LEEK] = @@ -6205,6 +6989,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconSprite = gItemIcon_Leek, + .iconPalette = gItemIconPalette_Leek, }, [ITEM_THICK_CLUB] = @@ -6220,6 +7006,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 90, + .iconSprite = gItemIcon_ThickClub, + .iconPalette = gItemIconPalette_ThickClub, }, [ITEM_LUCKY_PUNCH] = @@ -6236,6 +7024,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 40, + .iconSprite = gItemIcon_LuckyPunch, + .iconPalette = gItemIconPalette_LuckyPunch, }, [ITEM_METAL_POWDER] = @@ -6252,6 +7042,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_MetalPowder, + .iconPalette = gItemIconPalette_MetalPowder, }, [ITEM_QUICK_POWDER] = @@ -6268,6 +7060,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_QuickPowder, + .iconPalette = gItemIconPalette_QuickPowder, }, [ITEM_DEEP_SEA_SCALE] = @@ -6284,6 +7078,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_DeepSeaScale, + .iconPalette = gItemIconPalette_DeepSeaScale, }, [ITEM_DEEP_SEA_TOOTH] = @@ -6301,6 +7097,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 90, + .iconSprite = gItemIcon_DeepSeaTooth, + .iconPalette = gItemIconPalette_DeepSeaTooth, }, [ITEM_SOUL_DEW] = @@ -6323,6 +7121,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_SoulDew, + .iconPalette = gItemIconPalette_SoulDew, }, [ITEM_ADAMANT_ORB] = @@ -6339,6 +7139,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconSprite = gItemIcon_AdamantOrb, + .iconPalette = gItemIconPalette_AdamantOrb, }, [ITEM_LUSTROUS_ORB] = @@ -6355,6 +7157,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconSprite = gItemIcon_LustrousOrb, + .iconPalette = gItemIconPalette_LustrousOrb, }, [ITEM_GRISEOUS_ORB] = @@ -6371,6 +7175,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconSprite = gItemIcon_GriseousOrb, + .iconPalette = gItemIconPalette_GriseousOrb, }, // Incenses @@ -6386,6 +7192,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_SeaIncense, + .iconPalette = gItemIconPalette_SeaIncense, }, [ITEM_LAX_INCENSE] = @@ -6402,6 +7210,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_LaxIncense, + .iconPalette = gItemIconPalette_LaxIncense, }, [ITEM_ODD_INCENSE] = @@ -6415,6 +7225,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_OddIncense, + .iconPalette = gItemIconPalette_OddIncense, }, [ITEM_ROCK_INCENSE] = @@ -6428,6 +7240,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_RockIncense, + .iconPalette = gItemIconPalette_RockIncense, }, [ITEM_FULL_INCENSE] = @@ -6441,6 +7255,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_FullIncense, + .iconPalette = gItemIconPalette_FullIncense, }, [ITEM_WAVE_INCENSE] = @@ -6454,6 +7270,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_WaveIncense, + .iconPalette = gItemIconPalette_WaveIncense, }, [ITEM_ROSE_INCENSE] = @@ -6467,6 +7285,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_RoseIncense, + .iconPalette = gItemIconPalette_RoseIncense, }, [ITEM_LUCK_INCENSE] = @@ -6479,6 +7299,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_LuckIncense, + .iconPalette = gItemIconPalette_LuckIncense, }, [ITEM_PURE_INCENSE] = @@ -6491,6 +7313,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_PureIncense, + .iconPalette = gItemIconPalette_PureIncense, }, // Contest Scarves @@ -6508,6 +7332,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_Scarf, + .iconPalette = gItemIconPalette_RedScarf, }, [ITEM_BLUE_SCARF] = @@ -6523,6 +7349,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_Scarf, + .iconPalette = gItemIconPalette_BlueScarf, }, [ITEM_PINK_SCARF] = @@ -6538,6 +7366,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_Scarf, + .iconPalette = gItemIconPalette_PinkScarf, }, [ITEM_GREEN_SCARF] = @@ -6553,6 +7383,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_Scarf, + .iconPalette = gItemIconPalette_GreenScarf, }, [ITEM_YELLOW_SCARF] = @@ -6568,6 +7400,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_Scarf, + .iconPalette = gItemIconPalette_YellowScarf, }, // EV Gain Modifiers @@ -6585,6 +7419,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconSprite = gItemIcon_MachoBrace, + .iconPalette = gItemIconPalette_MachoBrace, }, [ITEM_POWER_WEIGHT] = @@ -6602,6 +7438,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_HP, .flingPower = 70, + .iconSprite = gItemIcon_PowerWeight, + .iconPalette = gItemIconPalette_PowerWeight, }, [ITEM_POWER_BRACER] = @@ -6619,6 +7457,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_ATK, .flingPower = 70, + .iconSprite = gItemIcon_PowerBracer, + .iconPalette = gItemIconPalette_PowerBracer, }, [ITEM_POWER_BELT] = @@ -6636,6 +7476,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_DEF, .flingPower = 70, + .iconSprite = gItemIcon_PowerBelt, + .iconPalette = gItemIconPalette_PowerBelt, }, [ITEM_POWER_LENS] = @@ -6654,6 +7496,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_SPATK, .flingPower = 70, + .iconSprite = gItemIcon_PowerLens, + .iconPalette = gItemIconPalette_PowerLens, }, [ITEM_POWER_BAND] = @@ -6671,6 +7515,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_SPDEF, .flingPower = 70, + .iconSprite = gItemIcon_PowerBand, + .iconPalette = gItemIconPalette_PowerBand, }, [ITEM_POWER_ANKLET] = @@ -6688,6 +7534,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = STAT_SPEED, .flingPower = 70, + .iconSprite = gItemIcon_PowerAnklet, + .iconPalette = gItemIconPalette_PowerAnklet, }, // Type-boosting Held Items @@ -6707,6 +7555,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_SilkScarf, + .iconPalette = gItemIconPalette_SilkScarf, }, [ITEM_CHARCOAL] = @@ -6723,6 +7573,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_Charcoal, + .iconPalette = gItemIconPalette_Charcoal, }, [ITEM_MYSTIC_WATER] = @@ -6740,6 +7592,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_MysticWater, + .iconPalette = gItemIconPalette_MysticWater, }, [ITEM_MAGNET] = @@ -6756,6 +7610,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_Magnet, + .iconPalette = gItemIconPalette_Magnet, }, [ITEM_MIRACLE_SEED] = @@ -6769,6 +7625,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_MiracleSeed, + .iconPalette = gItemIconPalette_MiracleSeed, }, [ITEM_NEVER_MELT_ICE] = @@ -6786,6 +7644,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_NeverMeltIce, + .iconPalette = gItemIconPalette_NeverMeltIce, }, [ITEM_BLACK_BELT] = @@ -6802,6 +7662,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_BlackBelt, + .iconPalette = gItemIconPalette_BlackTypeEnhancingItem, }, [ITEM_POISON_BARB] = @@ -6818,6 +7680,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 70, + .iconSprite = gItemIcon_PoisonBarb, + .iconPalette = gItemIconPalette_PoisonBarb, }, [ITEM_SOFT_SAND] = @@ -6835,6 +7699,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_SoftSand, + .iconPalette = gItemIconPalette_SoftSand, }, [ITEM_SHARP_BEAK] = @@ -6851,6 +7717,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 50, + .iconSprite = gItemIcon_SharpBeak, + .iconPalette = gItemIconPalette_SharpBeak, }, [ITEM_TWISTED_SPOON] = @@ -6864,6 +7732,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_TwistedSpoon, + .iconPalette = gItemIconPalette_TwistedSpoon, }, [ITEM_SILVER_POWDER] = @@ -6881,6 +7751,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_SilverPowder, + .iconPalette = gItemIconPalette_SilverPowder, }, [ITEM_HARD_STONE] = @@ -6894,6 +7766,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_HardStone, + .iconPalette = gItemIconPalette_HardStone, }, [ITEM_SPELL_TAG] = @@ -6910,6 +7784,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_SpellTag, + .iconPalette = gItemIconPalette_SpellTag, }, [ITEM_DRAGON_FANG] = @@ -6926,6 +7802,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 70, + .iconSprite = gItemIcon_DragonFang, + .iconPalette = gItemIconPalette_DragonFang, }, [ITEM_BLACK_GLASSES] = @@ -6943,6 +7821,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_BlackGlasses, + .iconPalette = gItemIconPalette_BlackTypeEnhancingItem, }, [ITEM_METAL_COAT] = @@ -6960,6 +7840,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_MetalCoat, + .iconPalette = gItemIconPalette_MetalCoat, }, // Choice Items @@ -6977,6 +7859,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_ChoiceBand, + .iconPalette = gItemIconPalette_ChoiceBand, }, [ITEM_CHOICE_SPECS] = @@ -6993,6 +7877,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_ChoiceSpecs, + .iconPalette = gItemIconPalette_ChoiceSpecs, }, [ITEM_CHOICE_SCARF] = @@ -7009,6 +7895,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_ChoiceScarf, + .iconPalette = gItemIconPalette_ChoiceScarf, }, // Status Orbs @@ -7026,6 +7914,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_FlameOrb, + .iconPalette = gItemIconPalette_FlameOrb, }, [ITEM_TOXIC_ORB] = @@ -7041,6 +7931,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_ToxicOrb, + .iconPalette = gItemIconPalette_ToxicOrb, }, // Weather Rocks @@ -7058,6 +7950,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconSprite = gItemIcon_DampRock, + .iconPalette = gItemIconPalette_DampRock, }, [ITEM_HEAT_ROCK] = @@ -7073,6 +7967,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconSprite = gItemIcon_HeatRock, + .iconPalette = gItemIconPalette_HeatRock, }, [ITEM_SMOOTH_ROCK] = @@ -7088,6 +7984,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_SmoothRock, + .iconPalette = gItemIconPalette_SmoothRock, }, [ITEM_ICY_ROCK] = @@ -7103,6 +8001,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 40, + .iconSprite = gItemIcon_IcyRock, + .iconPalette = gItemIconPalette_IcyRock, }, // Terrain Seeds @@ -7121,6 +8021,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_ElectricSeed, + .iconPalette = gItemIconPalette_ElectricSeed, }, [ITEM_PSYCHIC_SEED] = @@ -7137,6 +8039,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_PsychicSeed, + .iconPalette = gItemIconPalette_PsychicSeed, }, [ITEM_MISTY_SEED] = @@ -7153,6 +8057,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_MistySeed, + .iconPalette = gItemIconPalette_MistySeed, }, [ITEM_GRASSY_SEED] = @@ -7169,6 +8075,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_GrassySeed, + .iconPalette = gItemIconPalette_GrassySeed, }, // Type-activated Stat Modifiers @@ -7187,6 +8095,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_AbsorbBulb, + .iconPalette = gItemIconPalette_AbsorbBulb, }, [ITEM_CELL_BATTERY] = @@ -7204,6 +8114,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_CellBattery, + .iconPalette = gItemIconPalette_CellBattery, }, [ITEM_LUMINOUS_MOSS] = @@ -7221,6 +8133,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_LuminousMoss, + .iconPalette = gItemIconPalette_LuminousMoss, }, [ITEM_SNOWBALL] = @@ -7237,6 +8151,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_Snowball, + .iconPalette = gItemIconPalette_Snowball, }, // Misc. Held Items @@ -7256,6 +8172,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_BrightPowder, + .iconPalette = gItemIconPalette_BrightPowder, }, [ITEM_WHITE_HERB] = @@ -7271,6 +8189,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_InBattleHerb, + .iconPalette = gItemIconPalette_WhiteHerb, }, [ITEM_EXP_SHARE] = @@ -7294,6 +8214,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_ExpShare, .flingPower = 30, + .iconSprite = gItemIcon_ExpShare, + .iconPalette = gItemIconPalette_ExpShare, }, [ITEM_QUICK_CLAW] = @@ -7310,6 +8232,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_QuickClaw, + .iconPalette = gItemIconPalette_QuickClaw, }, [ITEM_SOOTHE_BELL] = @@ -7325,6 +8249,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_SootheBell, + .iconPalette = gItemIconPalette_SootheBell, }, [ITEM_MENTAL_HERB] = @@ -7346,6 +8272,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_InBattleHerb, + .iconPalette = gItemIconPalette_MentalHerb, }, [ITEM_KINGS_ROCK] = @@ -7360,6 +8288,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_KingsRock, + .iconPalette = gItemIconPalette_KingsRock, }, [ITEM_AMULET_COIN] = @@ -7372,6 +8302,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_AmuletCoin, + .iconPalette = gItemIconPalette_AmuletCoin, }, [ITEM_CLEANSE_TAG] = @@ -7384,6 +8316,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_CleanseTag, + .iconPalette = gItemIconPalette_CleanseTag, }, [ITEM_SMOKE_BALL] = @@ -7399,6 +8333,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_SmokeBall, + .iconPalette = gItemIconPalette_SmokeBall, }, [ITEM_FOCUS_BAND] = @@ -7415,6 +8351,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_FocusBand, + .iconPalette = gItemIconPalette_FocusBand, }, [ITEM_LUCKY_EGG] = @@ -7430,6 +8368,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_LuckyEgg, + .iconPalette = gItemIconPalette_LuckyEgg, }, [ITEM_SCOPE_LENS] = @@ -7446,6 +8386,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_ScopeLens, + .iconPalette = gItemIconPalette_ScopeLens, }, [ITEM_LEFTOVERS] = @@ -7463,6 +8405,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_Leftovers, + .iconPalette = gItemIconPalette_Leftovers, }, [ITEM_SHELL_BELL] = @@ -7479,6 +8423,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_ShellBell, + .iconPalette = gItemIconPalette_Shell, }, [ITEM_WIDE_LENS] = @@ -7496,6 +8442,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_WideLens, + .iconPalette = gItemIconPalette_WideLens, }, [ITEM_MUSCLE_BAND] = @@ -7512,6 +8460,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_MuscleBand, + .iconPalette = gItemIconPalette_MuscleBand, }, [ITEM_WISE_GLASSES] = @@ -7529,6 +8479,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_WiseGlasses, + .iconPalette = gItemIconPalette_WiseGlasses, }, [ITEM_EXPERT_BELT] = @@ -7545,6 +8497,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_ExpertBelt, + .iconPalette = gItemIconPalette_ExpertBelt, }, [ITEM_LIGHT_CLAY] = @@ -7561,6 +8515,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_LightClay, + .iconPalette = gItemIconPalette_LightClay, }, [ITEM_LIFE_ORB] = @@ -7576,6 +8532,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_LifeOrb, + .iconPalette = gItemIconPalette_LifeOrb, }, [ITEM_POWER_HERB] = @@ -7591,6 +8549,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_PowerHerb, + .iconPalette = gItemIconPalette_PowerHerb, }, [ITEM_FOCUS_SASH] = @@ -7607,6 +8567,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_FocusSash, + .iconPalette = gItemIconPalette_FocusSash, }, [ITEM_ZOOM_LENS] = @@ -7624,6 +8586,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_ZoomLens, + .iconPalette = gItemIconPalette_ZoomLens, }, [ITEM_METRONOME] = @@ -7640,6 +8604,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_Metronome, + .iconPalette = gItemIconPalette_Metronome, }, [ITEM_IRON_BALL] = @@ -7655,6 +8621,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 130, + .iconSprite = gItemIcon_IronBall, + .iconPalette = gItemIconPalette_IronBall, }, [ITEM_LAGGING_TAIL] = @@ -7667,6 +8635,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_LaggingTail, + .iconPalette = gItemIconPalette_LaggingTail, }, [ITEM_DESTINY_KNOT] = @@ -7682,6 +8652,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_DestinyKnot, + .iconPalette = gItemIconPalette_DestinyKnot, }, [ITEM_BLACK_SLUDGE] = @@ -7698,6 +8670,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_BlackSludge, + .iconPalette = gItemIconPalette_BlackSludge, }, [ITEM_GRIP_CLAW] = @@ -7713,6 +8687,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 90, + .iconSprite = gItemIcon_GripClaw, + .iconPalette = gItemIconPalette_GripClaw, }, [ITEM_STICKY_BARB] = @@ -7728,6 +8704,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_StickyBarb, + .iconPalette = gItemIconPalette_StickyBarb, }, [ITEM_SHED_SHELL] = @@ -7743,6 +8721,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_ShedShell, + .iconPalette = gItemIconPalette_ShedShell, }, [ITEM_BIG_ROOT] = @@ -7759,6 +8739,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_BigRoot, + .iconPalette = gItemIconPalette_BigRoot, }, [ITEM_RAZOR_CLAW] = @@ -7775,6 +8757,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconSprite = gItemIcon_RazorClaw, + .iconPalette = gItemIconPalette_RazorClaw, }, [ITEM_RAZOR_FANG] = @@ -7789,6 +8773,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_RazorFang, + .iconPalette = gItemIconPalette_RazorFang, }, [ITEM_EVIOLITE] = @@ -7805,6 +8791,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 40, + .iconSprite = gItemIcon_Eviolite, + .iconPalette = gItemIconPalette_Eviolite, }, [ITEM_FLOAT_STONE] = @@ -7820,6 +8808,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_FloatStone, + .iconPalette = gItemIconPalette_FloatStone, }, [ITEM_ROCKY_HELMET] = @@ -7836,6 +8826,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconSprite = gItemIcon_RockyHelmet, + .iconPalette = gItemIconPalette_RockyHelmet, }, [ITEM_AIR_BALLOON] = @@ -7852,6 +8844,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_AirBalloon, + .iconPalette = gItemIconPalette_AirBalloon, }, [ITEM_RED_CARD] = @@ -7868,6 +8862,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_RedCard, + .iconPalette = gItemIconPalette_RedCard, }, [ITEM_RING_TARGET] = @@ -7884,6 +8880,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_RingTarget, + .iconPalette = gItemIconPalette_RingTarget, }, [ITEM_BINDING_BAND] = @@ -7899,6 +8897,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_BindingBand, + .iconPalette = gItemIconPalette_BindingBand, }, [ITEM_EJECT_BUTTON] = @@ -7915,6 +8915,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_EjectButton, + .iconPalette = gItemIconPalette_EjectButton, }, [ITEM_WEAKNESS_POLICY] = @@ -7932,6 +8934,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_WeaknessPolicy, + .iconPalette = gItemIconPalette_WeaknessPolicy, }, [ITEM_ASSAULT_VEST] = @@ -7948,6 +8952,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_AssaultVest, + .iconPalette = gItemIconPalette_AssaultVest, }, [ITEM_SAFETY_GOGGLES] = @@ -7964,6 +8970,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_SafetyGoggles, + .iconPalette = gItemIconPalette_SafetyGoggles, }, [ITEM_ADRENALINE_ORB] = @@ -7979,6 +8987,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_AdrenalineOrb, + .iconPalette = gItemIconPalette_AdrenalineOrb, }, [ITEM_TERRAIN_EXTENDER] = @@ -7994,6 +9004,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconSprite = gItemIcon_TerrainExtender, + .iconPalette = gItemIconPalette_TerrainExtender, }, [ITEM_PROTECTIVE_PADS] = @@ -8010,6 +9022,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_ProtectivePads, + .iconPalette = gItemIconPalette_ProtectivePads, }, [ITEM_THROAT_SPRAY] = @@ -8025,6 +9039,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_ThroatSpray, + .iconPalette = gItemIconPalette_ThroatSpray, }, [ITEM_EJECT_PACK] = @@ -8040,6 +9056,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 50, + .iconSprite = gItemIcon_EjectPack, + .iconPalette = gItemIconPalette_EjectPack, }, [ITEM_HEAVY_DUTY_BOOTS] = @@ -8056,6 +9074,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_HeavyDutyBoots, + .iconPalette = gItemIconPalette_HeavyDutyBoots, }, [ITEM_BLUNDER_POLICY] = @@ -8072,6 +9092,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 80, + .iconSprite = gItemIcon_BlunderPolicy, + .iconPalette = gItemIconPalette_BlunderPolicy, }, [ITEM_ROOM_SERVICE] = @@ -8087,6 +9109,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, + .iconSprite = gItemIcon_RoomService, + .iconPalette = gItemIconPalette_RoomService, }, [ITEM_UTILITY_UMBRELLA] = @@ -8102,6 +9126,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconSprite = gItemIcon_UtilityUmbrella, + .iconPalette = gItemIconPalette_UtilityUmbrella, }, // Berries @@ -8122,6 +9148,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_ParalyzeHeal, .flingPower = 10, + .iconSprite = gItemIcon_CheriBerry, + .iconPalette = gItemIconPalette_CheriBerry, }, [ITEM_CHESTO_BERRY] = @@ -8140,6 +9168,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_Awakening, .flingPower = 10, + .iconSprite = gItemIcon_ChestoBerry, + .iconPalette = gItemIconPalette_ChestoBerry, }, [ITEM_PECHA_BERRY] = @@ -8158,6 +9188,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_Antidote, .flingPower = 10, + .iconSprite = gItemIcon_PechaBerry, + .iconPalette = gItemIconPalette_PechaBerry, }, [ITEM_RAWST_BERRY] = @@ -8176,6 +9208,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_BurnHeal, .flingPower = 10, + .iconSprite = gItemIcon_RawstBerry, + .iconPalette = gItemIconPalette_RawstBerry, }, [ITEM_ASPEAR_BERRY] = @@ -8194,6 +9228,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_IceHeal, .flingPower = 10, + .iconSprite = gItemIcon_AspearBerry, + .iconPalette = gItemIconPalette_AspearBerry, }, [ITEM_LEPPA_BERRY] = @@ -8213,6 +9249,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_PP, .effect = gItemEffect_LeppaBerry, .flingPower = 10, + .iconSprite = gItemIcon_LeppaBerry, + .iconPalette = gItemIconPalette_LeppaBerry, }, [ITEM_ORAN_BERRY] = @@ -8232,6 +9270,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_OranBerry, .flingPower = 10, + .iconSprite = gItemIcon_OranBerry, + .iconPalette = gItemIconPalette_OranBerry, }, [ITEM_PERSIM_BERRY] = @@ -8250,6 +9290,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_PersimBerry, .flingPower = 10, + .iconSprite = gItemIcon_PersimBerry, + .iconPalette = gItemIconPalette_PersimBerry, }, [ITEM_LUM_BERRY] = @@ -8268,6 +9310,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_FullHeal, .flingPower = 10, + .iconSprite = gItemIcon_LumBerry, + .iconPalette = gItemIconPalette_LumBerry, }, [ITEM_SITRUS_BERRY] = @@ -8296,6 +9340,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_SitrusBerry, .flingPower = 10, + .iconSprite = gItemIcon_SitrusBerry, + .iconPalette = gItemIconPalette_SitrusBerry, }, [ITEM_FIGY_BERRY] = @@ -8310,6 +9356,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_FigyBerry, + .iconPalette = gItemIconPalette_FigyBerry, }, [ITEM_WIKI_BERRY] = @@ -8324,6 +9372,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_WikiBerry, + .iconPalette = gItemIconPalette_WikiBerry, }, [ITEM_MAGO_BERRY] = @@ -8338,6 +9388,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_MagoBerry, + .iconPalette = gItemIconPalette_MagoBerry, }, [ITEM_AGUAV_BERRY] = @@ -8352,6 +9404,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_AguavBerry, + .iconPalette = gItemIconPalette_AguavBerry, }, [ITEM_IAPAPA_BERRY] = @@ -8366,6 +9420,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_IapapaBerry, + .iconPalette = gItemIconPalette_IapapaBerry, }, [ITEM_RAZZ_BERRY] = @@ -8381,6 +9437,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_RazzBerry, + .iconPalette = gItemIconPalette_RazzBerry, }, [ITEM_BLUK_BERRY] = @@ -8396,6 +9454,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_BlukBerry, + .iconPalette = gItemIconPalette_BlukBerry, }, [ITEM_NANAB_BERRY] = @@ -8411,6 +9471,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_NanabBerry, + .iconPalette = gItemIconPalette_NanabBerry, }, [ITEM_WEPEAR_BERRY] = @@ -8426,6 +9488,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_WepearBerry, + .iconPalette = gItemIconPalette_WepearBerry, }, [ITEM_PINAP_BERRY] = @@ -8441,6 +9505,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_PinapBerry, + .iconPalette = gItemIconPalette_PinapBerry, }, [ITEM_POMEG_BERRY] = @@ -8457,6 +9523,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_PomegBerry, .flingPower = 10, + .iconSprite = gItemIcon_PomegBerry, + .iconPalette = gItemIconPalette_PomegBerry, }, [ITEM_KELPSY_BERRY] = @@ -8473,6 +9541,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_KelpsyBerry, .flingPower = 10, + .iconSprite = gItemIcon_KelpsyBerry, + .iconPalette = gItemIconPalette_KelpsyBerry, }, [ITEM_QUALOT_BERRY] = @@ -8489,6 +9559,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_QualotBerry, .flingPower = 10, + .iconSprite = gItemIcon_QualotBerry, + .iconPalette = gItemIconPalette_QualotBerry, }, [ITEM_HONDEW_BERRY] = @@ -8505,6 +9577,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_HondewBerry, .flingPower = 10, + .iconSprite = gItemIcon_HondewBerry, + .iconPalette = gItemIconPalette_HondewBerry, }, [ITEM_GREPA_BERRY] = @@ -8521,6 +9595,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_GrepaBerry, .flingPower = 10, + .iconSprite = gItemIcon_GrepaBerry, + .iconPalette = gItemIconPalette_GrepaBerry, }, [ITEM_TAMATO_BERRY] = @@ -8537,6 +9613,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, .effect = gItemEffect_TamatoBerry, .flingPower = 10, + .iconSprite = gItemIcon_TamatoBerry, + .iconPalette = gItemIconPalette_TamatoBerry, }, [ITEM_CORNN_BERRY] = @@ -8552,6 +9630,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_CornnBerry, + .iconPalette = gItemIconPalette_CornnBerry, }, [ITEM_MAGOST_BERRY] = @@ -8567,6 +9647,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_MagostBerry, + .iconPalette = gItemIconPalette_MagostBerry, }, [ITEM_RABUTA_BERRY] = @@ -8582,6 +9664,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_RabutaBerry, + .iconPalette = gItemIconPalette_RabutaBerry, }, [ITEM_NOMEL_BERRY] = @@ -8597,6 +9681,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_NomelBerry, + .iconPalette = gItemIconPalette_NomelBerry, }, [ITEM_SPELON_BERRY] = @@ -8612,6 +9698,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_SpelonBerry, + .iconPalette = gItemIconPalette_SpelonBerry, }, [ITEM_PAMTRE_BERRY] = @@ -8627,6 +9715,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_PamtreBerry, + .iconPalette = gItemIconPalette_PamtreBerry, }, [ITEM_WATMEL_BERRY] = @@ -8642,6 +9732,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_WatmelBerry, + .iconPalette = gItemIconPalette_WatmelBerry, }, [ITEM_DURIN_BERRY] = @@ -8657,6 +9749,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_DurinBerry, + .iconPalette = gItemIconPalette_DurinBerry, }, [ITEM_BELUE_BERRY] = @@ -8672,6 +9766,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_BelueBerry, + .iconPalette = gItemIconPalette_BelueBerry, }, [ITEM_CHILAN_BERRY] = @@ -8689,6 +9785,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_ChilanBerry, + .iconPalette = gItemIconPalette_ChilanBerry, }, [ITEM_OCCA_BERRY] = @@ -8706,6 +9804,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_OccaBerry, + .iconPalette = gItemIconPalette_OccaBerry, }, [ITEM_PASSHO_BERRY] = @@ -8723,6 +9823,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_PasshoBerry, + .iconPalette = gItemIconPalette_PasshoBerry, }, [ITEM_WACAN_BERRY] = @@ -8740,6 +9842,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_WacanBerry, + .iconPalette = gItemIconPalette_WacanBerry, }, [ITEM_RINDO_BERRY] = @@ -8757,6 +9861,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_RindoBerry, + .iconPalette = gItemIconPalette_RindoBerry, }, [ITEM_YACHE_BERRY] = @@ -8774,6 +9880,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_YacheBerry, + .iconPalette = gItemIconPalette_YacheBerry, }, [ITEM_CHOPLE_BERRY] = @@ -8791,6 +9899,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_ChopleBerry, + .iconPalette = gItemIconPalette_ChopleBerry, }, [ITEM_KEBIA_BERRY] = @@ -8808,6 +9918,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_KebiaBerry, + .iconPalette = gItemIconPalette_KebiaBerry, }, [ITEM_SHUCA_BERRY] = @@ -8825,6 +9937,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_ShucaBerry, + .iconPalette = gItemIconPalette_ShucaBerry, }, [ITEM_COBA_BERRY] = @@ -8842,6 +9956,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_CobaBerry, + .iconPalette = gItemIconPalette_CobaBerry, }, [ITEM_PAYAPA_BERRY] = @@ -8859,6 +9975,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_PayapaBerry, + .iconPalette = gItemIconPalette_PayapaBerry, }, [ITEM_TANGA_BERRY] = @@ -8876,6 +9994,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_TangaBerry, + .iconPalette = gItemIconPalette_TangaBerry, }, [ITEM_CHARTI_BERRY] = @@ -8893,6 +10013,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_ChartiBerry, + .iconPalette = gItemIconPalette_ChartiBerry, }, [ITEM_KASIB_BERRY] = @@ -8910,6 +10032,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_KasibBerry, + .iconPalette = gItemIconPalette_KasibBerry, }, [ITEM_HABAN_BERRY] = @@ -8927,6 +10051,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_HabanBerry, + .iconPalette = gItemIconPalette_HabanBerry, }, [ITEM_COLBUR_BERRY] = @@ -8944,6 +10070,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_ColburBerry, + .iconPalette = gItemIconPalette_ColburBerry, }, [ITEM_BABIRI_BERRY] = @@ -8961,6 +10089,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_BabiriBerry, + .iconPalette = gItemIconPalette_BabiriBerry, }, [ITEM_ROSELI_BERRY] = @@ -8978,6 +10108,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_RoseliBerry, + .iconPalette = gItemIconPalette_RoseliBerry, }, [ITEM_LIECHI_BERRY] = @@ -8995,6 +10127,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_LiechiBerry, + .iconPalette = gItemIconPalette_LiechiBerry, }, [ITEM_GANLON_BERRY] = @@ -9012,6 +10146,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_GanlonBerry, + .iconPalette = gItemIconPalette_GanlonBerry, }, [ITEM_SALAC_BERRY] = @@ -9029,6 +10165,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_SalacBerry, + .iconPalette = gItemIconPalette_SalacBerry, }, [ITEM_PETAYA_BERRY] = @@ -9046,6 +10184,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_PetayaBerry, + .iconPalette = gItemIconPalette_PetayaBerry, }, [ITEM_APICOT_BERRY] = @@ -9063,6 +10203,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_ApicotBerry, + .iconPalette = gItemIconPalette_ApicotBerry, }, [ITEM_LANSAT_BERRY] = @@ -9080,6 +10222,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_LansatBerry, + .iconPalette = gItemIconPalette_LansatBerry, }, [ITEM_STARF_BERRY] = @@ -9097,6 +10241,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_StarfBerry, + .iconPalette = gItemIconPalette_StarfBerry, }, [ITEM_ENIGMA_BERRY] = @@ -9113,6 +10259,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_EnigmaBerry, + .iconPalette = gItemIconPalette_EnigmaBerry, }, [ITEM_MICLE_BERRY] = @@ -9130,6 +10278,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_MicleBerry, + .iconPalette = gItemIconPalette_MicleBerry, }, [ITEM_CUSTAP_BERRY] = @@ -9147,6 +10297,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_CustapBerry, + .iconPalette = gItemIconPalette_CustapBerry, }, [ITEM_JABOCA_BERRY] = @@ -9163,6 +10315,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_JabocaBerry, + .iconPalette = gItemIconPalette_JabocaBerry, }, [ITEM_ROWAP_BERRY] = @@ -9179,6 +10333,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_RowapBerry, + .iconPalette = gItemIconPalette_RowapBerry, }, [ITEM_KEE_BERRY] = @@ -9195,6 +10351,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_KeeBerry, + .iconPalette = gItemIconPalette_KeeBerry, }, [ITEM_MARANGA_BERRY] = @@ -9211,6 +10369,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_MarangaBerry, + .iconPalette = gItemIconPalette_MarangaBerry, }, [ITEM_ENIGMA_BERRY_E_READER] = @@ -9227,6 +10387,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EnigmaBerry, .battleUsage = EFFECT_ITEM_ENIGMA_BERRY_EREADER, .flingPower = 10, + .iconSprite = gItemIcon_EnigmaBerry, + .iconPalette = gItemIconPalette_EnigmaBerry, }, // TMs/HMs. They don't have a set flingPower, as that's handled by GetFlingPowerFromItemId. @@ -10726,6 +11888,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_OvalCharm, + .iconPalette = gItemIconPalette_OvalCharm, }, [ITEM_SHINY_CHARM] = @@ -10740,6 +11904,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_ShinyCharm, + .iconPalette = gItemIconPalette_ShinyCharm, }, [ITEM_CATCHING_CHARM] = @@ -10754,6 +11920,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_CatchingCharm, + .iconPalette = gItemIconPalette_CatchingCharm, }, [ITEM_EXP_CHARM] = @@ -10768,6 +11936,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_ExpCharm, + .iconPalette = gItemIconPalette_ExpCharm, }, // Form-changing Key Items @@ -10784,6 +11954,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_RotomCatalog, + .iconSprite = gItemIcon_RotomCatalog, + .iconPalette = gItemIconPalette_RotomCatalog, }, [ITEM_GRACIDEA] = @@ -10798,6 +11970,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .iconSprite = gItemIcon_Gracidea, + .iconPalette = gItemIconPalette_Gracidea, }, [ITEM_REVEAL_GLASS] = @@ -10813,6 +11987,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .iconSprite = gItemIcon_RevealGlass, + .iconPalette = gItemIconPalette_RevealGlass, }, [ITEM_DNA_SPLICERS] = @@ -10828,6 +12004,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Fusion, + .iconSprite = gItemIcon_DNASplicers, + .iconPalette = gItemIconPalette_DNASplicers, }, [ITEM_ZYGARDE_CUBE] = @@ -10842,6 +12020,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ZygardeCube, + .iconSprite = gItemIcon_ZygardeCube, + .iconPalette = gItemIconPalette_ZygardeCube, }, [ITEM_PRISON_BOTTLE] = @@ -10856,6 +12036,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .iconSprite = gItemIcon_PrisonBottle, + .iconPalette = gItemIconPalette_PrisonBottle, }, [ITEM_N_SOLARIZER] = @@ -10870,6 +12052,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Fusion, + .iconSprite = gItemIcon_NecrozmaFuser, + .iconPalette = gItemIconPalette_NSolarizer, }, [ITEM_N_LUNARIZER] = @@ -10884,6 +12068,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Fusion, + .iconSprite = gItemIcon_NecrozmaFuser, + .iconPalette = gItemIconPalette_NLunarizer, }, [ITEM_REINS_OF_UNITY] = @@ -10899,6 +12085,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Fusion, + .iconSprite = gItemIcon_ReinsOfUnity, + .iconPalette = gItemIconPalette_ReinsOfUnity, }, // Battle Mechanic Key Items @@ -10915,6 +12103,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_MegaRing, + .iconPalette = gItemIconPalette_MegaRing, }, [ITEM_Z_POWER_RING] = @@ -10929,6 +12119,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_ZPowerRing, + .iconPalette = gItemIconPalette_ZPowerRing, }, [ITEM_DYNAMAX_BAND] = @@ -10942,6 +12134,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_DynamaxBand, + .iconPalette = gItemIconPalette_DynamaxBand, }, // Misc. Key Items @@ -10958,6 +12152,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_Bicycle, + .iconPalette = gItemIconPalette_Bicycle, }, [ITEM_MACH_BIKE] = @@ -10973,6 +12169,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Bike, .secondaryId = MACH_BIKE, + .iconSprite = gItemIcon_MachBike, + .iconPalette = gItemIconPalette_MachBike, }, [ITEM_ACRO_BIKE] = @@ -10988,6 +12186,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Bike, .secondaryId = ACRO_BIKE, + .iconSprite = gItemIcon_AcroBike, + .iconPalette = gItemIconPalette_AcroBike, }, [ITEM_OLD_ROD] = @@ -11003,6 +12203,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Rod, .secondaryId = OLD_ROD, + .iconSprite = gItemIcon_OldRod, + .iconPalette = gItemIconPalette_OldRod, }, [ITEM_GOOD_ROD] = @@ -11018,6 +12220,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Rod, .secondaryId = GOOD_ROD, + .iconSprite = gItemIcon_GoodRod, + .iconPalette = gItemIconPalette_GoodRod, }, [ITEM_SUPER_ROD] = @@ -11033,6 +12237,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Rod, .secondaryId = SUPER_ROD, + .iconSprite = gItemIcon_SuperRod, + .iconPalette = gItemIconPalette_SuperRod, }, [ITEM_DOWSING_MACHINE] = @@ -11047,6 +12253,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Itemfinder, + .iconSprite = gItemIcon_DowsingMachine, + .iconPalette = gItemIconPalette_DowsingMachine, }, [ITEM_TOWN_MAP] = @@ -11061,6 +12269,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TownMap, + .iconPalette = gItemIconPalette_TownMap, }, [ITEM_VS_SEEKER] = @@ -11079,6 +12289,8 @@ const struct Item gItemsInfo[] = #else .fieldUseFunc = ItemUseOutOfBattle_CannotUse, #endif + .iconSprite = gItemIcon_VsSeeker, + .iconPalette = gItemIconPalette_VsSeeker, }, [ITEM_TM_CASE] = @@ -11093,6 +12305,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TMCase, + .iconPalette = gItemIconPalette_TMCase, }, [ITEM_BERRY_POUCH] = @@ -11108,6 +12322,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_BerryPouch, + .iconPalette = gItemIconPalette_BerryPouch, }, [ITEM_POKEMON_BOX_LINK] = @@ -11122,6 +12338,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_PokemonBoxLink, + .iconSprite = gItemIcon_PokemonBoxLink, + .iconPalette = gItemIconPalette_PokemonBoxLink, }, [ITEM_COIN_CASE] = @@ -11135,6 +12353,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CoinCase, + .iconSprite = gItemIcon_CoinCase, + .iconPalette = gItemIconPalette_CoinCase, }, [ITEM_POWDER_JAR] = @@ -11149,6 +12369,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_PowderJar, + .iconSprite = gItemIcon_PowderJar, + .iconPalette = gItemIconPalette_PowderJar, }, [ITEM_WAILMER_PAIL] = @@ -11163,6 +12385,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_WailmerPail, + .iconSprite = gItemIcon_WailmerPail, + .iconPalette = gItemIconPalette_WailmerPail, }, [ITEM_POKE_RADAR] = @@ -11177,6 +12401,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Todo + .iconSprite = gItemIcon_PokeRadar, + .iconPalette = gItemIconPalette_PokeRadar, }, [ITEM_POKEBLOCK_CASE] = @@ -11191,6 +12417,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PBLOCK_CASE, .fieldUseFunc = ItemUseOutOfBattle_PokeblockCase, + .iconSprite = gItemIcon_PokeblockCase, + .iconPalette = gItemIconPalette_PokeblockCase, }, [ITEM_SOOT_SACK] = @@ -11205,6 +12433,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_SootSack, + .iconPalette = gItemIconPalette_SootSack, }, [ITEM_POKE_FLUTE] = @@ -11219,6 +12449,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_PokeFlute, + .iconPalette = gItemIconPalette_PokeFlute, }, [ITEM_FAME_CHECKER] = @@ -11233,6 +12465,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_FameChecker, + .iconPalette = gItemIconPalette_FameChecker, }, [ITEM_TEACHY_TV] = @@ -11247,6 +12481,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeachyTV, + .iconPalette = gItemIconPalette_TeachyTV, }, // Story Key Items @@ -11263,6 +12499,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_SSTicket, + .iconPalette = gItemIconPalette_SSTicket, }, [ITEM_EON_TICKET] = @@ -11278,6 +12516,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = 1, + .iconSprite = gItemIcon_EonTicket, + .iconPalette = gItemIconPalette_EonTicket, }, [ITEM_MYSTIC_TICKET] = @@ -11292,6 +12532,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_MysticTicket, + .iconPalette = gItemIconPalette_MysticTicket, }, [ITEM_AURORA_TICKET] = @@ -11306,6 +12548,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_AuroraTicket, + .iconPalette = gItemIconPalette_AuroraTicket, }, [ITEM_OLD_SEA_MAP] = @@ -11320,6 +12564,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_OldSeaMap, + .iconPalette = gItemIconPalette_OldSeaMap, }, [ITEM_LETTER] = @@ -11334,6 +12580,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_Letter, + .iconPalette = gItemIconPalette_LavaCookieAndLetter, }, [ITEM_DEVON_PARTS] = @@ -11349,6 +12597,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_DevonParts, + .iconPalette = gItemIconPalette_DevonParts, }, [ITEM_GO_GOGGLES] = @@ -11364,6 +12614,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_GoGoggles, + .iconPalette = gItemIconPalette_GoGoggles, }, [ITEM_DEVON_SCOPE] = @@ -11378,6 +12630,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_DevonScope, + .iconPalette = gItemIconPalette_DevonScope, }, [ITEM_BASEMENT_KEY] = @@ -11392,6 +12646,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_BasementKey, + .iconPalette = gItemIconPalette_OldKey, }, [ITEM_SCANNER] = @@ -11406,6 +12662,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_Scanner, + .iconPalette = gItemIconPalette_Scanner, }, [ITEM_STORAGE_KEY] = @@ -11420,6 +12678,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_StorageKey, + .iconPalette = gItemIconPalette_OldKey, }, [ITEM_KEY_TO_ROOM_1] = @@ -11432,6 +12692,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_KeyToRoom1, + .iconPalette = gItemIconPalette_Key, }, [ITEM_KEY_TO_ROOM_2] = @@ -11444,6 +12706,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_KeyToRoom2, + .iconPalette = gItemIconPalette_Key, }, [ITEM_KEY_TO_ROOM_4] = @@ -11456,6 +12720,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_KeyToRoom4, + .iconPalette = gItemIconPalette_Key, }, [ITEM_KEY_TO_ROOM_6] = @@ -11468,6 +12734,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_KeyToRoom6, + .iconPalette = gItemIconPalette_Key, }, [ITEM_METEORITE] = @@ -11481,6 +12749,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange, + .iconSprite = gItemIcon_Meteorite, + .iconPalette = gItemIconPalette_Meteorite, }, [ITEM_MAGMA_EMBLEM] = @@ -11495,6 +12765,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_MagmaEmblem, + .iconPalette = gItemIconPalette_MagmaEmblem, }, [ITEM_CONTEST_PASS] = @@ -11510,6 +12782,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_ContestPass, + .iconPalette = gItemIconPalette_ContestPass, }, [ITEM_PARCEL] = @@ -11524,6 +12798,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_Parcel, + .iconPalette = gItemIconPalette_Parcel, }, [ITEM_SECRET_KEY] = @@ -11538,6 +12814,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_SecretKey, + .iconPalette = gItemIconPalette_SecretKey, }, [ITEM_BIKE_VOUCHER] = @@ -11552,6 +12830,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_BikeVoucher, + .iconPalette = gItemIconPalette_BikeVoucher, }, [ITEM_GOLD_TEETH] = @@ -11567,6 +12847,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_GoldTeeth, + .iconPalette = gItemIconPalette_GoldTeeth, }, [ITEM_CARD_KEY] = @@ -11581,6 +12863,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_CardKey, + .iconPalette = gItemIconPalette_CardKey, }, [ITEM_LIFT_KEY] = @@ -11595,6 +12879,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_LiftKey, + .iconPalette = gItemIconPalette_Key, }, [ITEM_SILPH_SCOPE] = @@ -11609,6 +12895,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_SilphScope, + .iconPalette = gItemIconPalette_SilphScope, }, [ITEM_TRI_PASS] = @@ -11624,6 +12912,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TriPass, + .iconPalette = gItemIconPalette_TriPass, }, [ITEM_RAINBOW_PASS] = @@ -11639,6 +12929,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_RainbowPass, + .iconPalette = gItemIconPalette_RainbowPass, }, [ITEM_TEA] = @@ -11654,6 +12946,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_Tea, + .iconPalette = gItemIconPalette_Tea, }, [ITEM_RUBY] = @@ -11669,6 +12963,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_Gem, + .iconPalette = gItemIconPalette_Ruby, }, [ITEM_SAPPHIRE] = @@ -11683,6 +12979,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_Gem, + .iconPalette = gItemIconPalette_Sapphire, }, [ITEM_ABILITY_SHIELD] = @@ -11698,6 +12996,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_AbilityShield, + .iconPalette = gItemIconPalette_AbilityShield, }, // GEN 9 ITEMS @@ -11715,6 +13015,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_ClearAmulet, + .iconPalette = gItemIconPalette_ClearAmulet, }, [ITEM_PUNCHING_GLOVE] = @@ -11730,6 +13032,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_PunchingGlove, + .iconPalette = gItemIconPalette_PunchingGlove, }, [ITEM_COVERT_CLOAK] = @@ -11745,6 +13049,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_CovertCloak, + .iconPalette = gItemIconPalette_CovertCloak, }, [ITEM_LOADED_DICE] = @@ -11761,6 +13067,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_LoadedDice, + .iconPalette = gItemIconPalette_LoadedDice, }, [ITEM_AUSPICIOUS_ARMOR] = @@ -11776,6 +13084,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_AuspiciousArmor, + .iconPalette = gItemIconPalette_AuspiciousArmor, }, [ITEM_BOOSTER_ENERGY] = @@ -11792,6 +13102,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_BoosterEnergy, + .iconPalette = gItemIconPalette_BoosterEnergy, }, [ITEM_BIG_BAMBOO_SHOOT] = @@ -11806,6 +13118,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_BigBambooShoot, + .iconPalette = gItemIconPalette_BigBambooShoot, }, [ITEM_GIMMIGHOUL_COIN] = @@ -11819,6 +13133,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_GimmighoulCoin, + .iconPalette = gItemIconPalette_GimmighoulCoin, }, [ITEM_LEADERS_CREST] = @@ -11832,6 +13148,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_LeadersCrest, + .iconPalette = gItemIconPalette_LeadersCrest, }, [ITEM_MALICIOUS_ARMOR] = @@ -11847,6 +13165,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_MaliciousArmor, + .iconPalette = gItemIconPalette_MaliciousArmor, }, [ITEM_MIRROR_HERB] = @@ -11862,6 +13182,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_MirrorHerb, + .iconPalette = gItemIconPalette_MirrorHerb, }, [ITEM_SCROLL_OF_DARKNESS] = @@ -11878,6 +13200,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, + .iconSprite = gItemIcon_ScrollOfDarkness, + .iconPalette = gItemIconPalette_ScrollOfDarkness, }, [ITEM_SCROLL_OF_WATERS] = @@ -11894,6 +13218,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, + .iconSprite = gItemIcon_ScrollOfWaters, + .iconPalette = gItemIconPalette_ScrollOfWaters, }, [ITEM_TERA_ORB] = @@ -11908,6 +13234,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraOrb, + .iconPalette = gItemIconPalette_TeraOrb, }, [ITEM_TINY_BAMBOO_SHOOT] = @@ -11922,6 +13250,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, + .iconSprite = gItemIcon_TinyBambooShoot, + .iconPalette = gItemIconPalette_TinyBambooShoot, }, [ITEM_BUG_TERA_SHARD] = @@ -11932,6 +13262,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_BugTeraShard, }, [ITEM_DARK_TERA_SHARD] = @@ -11942,6 +13274,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_DarkTeraShard, }, [ITEM_DRAGON_TERA_SHARD] = @@ -11952,6 +13286,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_DragonTeraShard, }, [ITEM_ELECTRIC_TERA_SHARD] = @@ -11962,6 +13298,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_ElectricTeraShard, }, [ITEM_FAIRY_TERA_SHARD] = @@ -11972,6 +13310,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_FairyTeraShard, }, [ITEM_FIGHTING_TERA_SHARD] = @@ -11982,6 +13322,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_FightingTeraShard, }, [ITEM_FIRE_TERA_SHARD] = @@ -11992,6 +13334,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_FireTeraShard, }, [ITEM_FLYING_TERA_SHARD] = @@ -12002,6 +13346,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_FlyingTeraShard, }, [ITEM_GHOST_TERA_SHARD] = @@ -12012,6 +13358,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_GhostTeraShard, }, [ITEM_GRASS_TERA_SHARD] = @@ -12022,6 +13370,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_GrassTeraShard, }, [ITEM_GROUND_TERA_SHARD] = @@ -12032,6 +13382,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_GroundTeraShard, }, [ITEM_ICE_TERA_SHARD] = @@ -12042,6 +13394,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_IceTeraShard, }, [ITEM_NORMAL_TERA_SHARD] = @@ -12052,6 +13406,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_NormalTeraShard, }, [ITEM_POISON_TERA_SHARD] = @@ -12062,6 +13418,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_PoisonTeraShard, }, [ITEM_PSYCHIC_TERA_SHARD] = @@ -12072,6 +13430,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_PsychicTeraShard, }, [ITEM_ROCK_TERA_SHARD] = @@ -12082,6 +13442,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_RockTeraShard, }, [ITEM_STEEL_TERA_SHARD] = @@ -12092,6 +13454,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_SteelTeraShard, }, [ITEM_WATER_TERA_SHARD] = @@ -12102,6 +13466,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_TeraShard, + .iconPalette = gItemIconPalette_WaterTeraShard, }, [ITEM_ADAMANT_CRYSTAL] = @@ -12116,6 +13482,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconSprite = gItemIcon_AdamantCrystal, + .iconPalette = gItemIconPalette_AdamantCrystal, }, [ITEM_GRISEOUS_CORE] = @@ -12130,6 +13498,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconSprite = gItemIcon_GriseousCore, + .iconPalette = gItemIconPalette_GriseousCore, }, [ITEM_LUSTROUS_GLOBE] = @@ -12144,6 +13514,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 60, + .iconSprite = gItemIcon_LustrousGlobe, + .iconPalette = gItemIconPalette_LustrousGlobe, }, [ITEM_BLACK_AUGURITE] = @@ -12159,6 +13531,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_BlackAugurite, + .iconPalette = gItemIconPalette_BlackAugurite, }, [ITEM_LINKING_CORD] = @@ -12174,6 +13548,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_LinkingCord, + .iconPalette = gItemIconPalette_LinkingCord, }, [ITEM_PEAT_BLOCK] = @@ -12189,6 +13565,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_PeatBlock, + .iconPalette = gItemIconPalette_PeatBlock, }, [ITEM_BERSERK_GENE] = @@ -12204,6 +13582,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_BerserkGene, + .iconPalette = gItemIconPalette_BerserkGene, }, [ITEM_FAIRY_FEATHER] = @@ -12220,6 +13600,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, + .iconSprite = gItemIcon_FairyFeather, + .iconPalette = gItemIconPalette_FairyFeather, }, [ITEM_SYRUPY_APPLE] = @@ -12235,6 +13617,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 30, + .iconSprite = gItemIcon_SyrupyApple, + .iconPalette = gItemIconPalette_SyrupyApple, }, [ITEM_UNREMARKABLE_TEACUP] = @@ -12250,6 +13634,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconSprite = gItemIcon_UnremarkableTeacup, + .iconPalette = gItemIconPalette_UnremarkableTeacup, }, [ITEM_MASTERPIECE_TEACUP] = @@ -12265,6 +13651,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, .flingPower = 80, + .iconSprite = gItemIcon_MasterpieceTeacup, + .iconPalette = gItemIconPalette_MasterpieceTeacup, }, [ITEM_CORNERSTONE_MASK] = @@ -12278,6 +13666,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_CornerstoneMask, + .iconPalette = gItemIconPalette_CornerstoneMask, }, [ITEM_WELLSPRING_MASK] = @@ -12291,6 +13681,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_WellspringMask, + .iconPalette = gItemIconPalette_WellspringMask, }, [ITEM_HEARTHFLAME_MASK] = @@ -12304,6 +13696,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_HearthflameMask, + .iconPalette = gItemIconPalette_HearthflameMask, }, [ITEM_HEALTH_MOCHI] = @@ -12317,6 +13711,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_HpMochi, .flingPower = 30, + .iconSprite = gItemIcon_Mochi, + .iconPalette = gItemIconPalette_HealthMochi, }, [ITEM_MUSCLE_MOCHI] = @@ -12330,6 +13726,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_AtkMochi, .flingPower = 30, + .iconSprite = gItemIcon_Mochi, + .iconPalette = gItemIconPalette_MuscleMochi, }, [ITEM_RESIST_MOCHI] = @@ -12343,6 +13741,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_DefMochi, .flingPower = 30, + .iconSprite = gItemIcon_Mochi, + .iconPalette = gItemIconPalette_ResistMochi, }, [ITEM_GENIUS_MOCHI] = @@ -12356,6 +13756,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_SpatkMochi, .flingPower = 30, + .iconSprite = gItemIcon_Mochi, + .iconPalette = gItemIconPalette_GeniusMochi, }, [ITEM_CLEVER_MOCHI] = @@ -12369,6 +13771,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_SpdefMochi, .flingPower = 30, + .iconSprite = gItemIcon_Mochi, + .iconPalette = gItemIconPalette_CleverMochi, }, [ITEM_SWIFT_MOCHI] = @@ -12382,6 +13786,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_SpeedMochi, .flingPower = 30, + .iconSprite = gItemIcon_Mochi, + .iconPalette = gItemIconPalette_SwiftMochi, }, [ITEM_FRESH_START_MOCHI] = @@ -12398,6 +13804,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_ResetEVs, .effect = gItemEffect_ResetMochi, .flingPower = 30, + .iconSprite = gItemIcon_Mochi, + .iconPalette = gItemIconPalette_FreshStartMochi, }, [ITEM_GLIMMERING_CHARM] = @@ -12412,6 +13820,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_KEY_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_GlimmeringCharm, + .iconPalette = gItemIconPalette_GlimmeringCharm, }, [ITEM_METAL_ALLOY] = @@ -12426,6 +13836,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, .effect = gItemEffect_EvoItem, + .iconSprite = gItemIcon_MetalAlloy, + .iconPalette = gItemIconPalette_MetalAlloy, }, [ITEM_STELLAR_TERA_SHARD] = @@ -12436,6 +13848,8 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_QuestionMark, + .iconPalette = gItemIconPalette_QuestionMark, }, [ITEM_JUBILIFE_MUFFIN] = @@ -12448,6 +13862,8 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .battleUsage = EFFECT_ITEM_CURE_STATUS, .flingPower = 30, + .iconSprite = gItemIcon_JubilifeMuffin, + .iconPalette = gItemIconPalette_JubilifeMuffin, }, [ITEM_REMEDY] = @@ -12464,6 +13880,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_Remedy, .flingPower = 30, + .iconSprite = gItemIcon_Remedy, + .iconPalette = gItemIconPalette_Remedy, }, [ITEM_FINE_REMEDY] = @@ -12484,6 +13902,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_FineRemedy, .flingPower = 30, + .iconSprite = gItemIcon_FineRemedy, + .iconPalette = gItemIconPalette_FineRemedy, }, [ITEM_SUPERB_REMEDY] = @@ -12504,6 +13924,8 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_RESTORE_HP, .effect = gItemEffect_SuperbRemedy, .flingPower = 30, + .iconSprite = gItemIcon_SuperbRemedy, + .iconPalette = gItemIconPalette_SuperbRemedy, }, [ITEM_AUX_EVASION] = @@ -12524,6 +13946,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, //.effect = currently missing + .iconSprite = gItemIcon_AuxBottle, + .iconPalette = gItemIconPalette_AuxEvasion, }, [ITEM_AUX_GUARD] = @@ -12544,6 +13968,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, //.effect = currently missing + .iconSprite = gItemIcon_AuxBottle, + .iconPalette = gItemIconPalette_AuxGuard, }, [ITEM_AUX_POWER] = @@ -12564,6 +13990,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, //.effect = currently missing + .iconSprite = gItemIcon_AuxBottle, + .iconPalette = gItemIconPalette_AuxPower, }, [ITEM_AUX_POWERGUARD] = @@ -12585,6 +14013,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, //.effect = currently missing + .iconSprite = gItemIcon_AuxPowerguard, + .iconPalette = gItemIconPalette_AuxPowerguard, }, [ITEM_CHOICE_DUMPLING] = @@ -12596,6 +14026,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, //.effect = currently missing + .iconSprite = gItemIcon_ChoiceDumpling, + .iconPalette = gItemIconPalette_ChoiceDumpling, }, [ITEM_SWAP_SNACK] = @@ -12607,6 +14039,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, //.effect = currently missing + .iconSprite = gItemIcon_SwapSnack, + .iconPalette = gItemIconPalette_SwapSnack, }, [ITEM_TWICE_SPICED_RADISH] = @@ -12618,6 +14052,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, //.effect = currently missing + .iconSprite = gItemIcon_TwiceSpicedRadish, + .iconPalette = gItemIconPalette_TwiceSpicedRadish, }, [ITEM_POKESHI_DOLL] = @@ -12631,5 +14067,7 @@ const struct Item gItemsInfo[] = .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .iconSprite = gItemIcon_PokeshiDoll, + .iconPalette = gItemIconPalette_PokeshiDoll, }, }; diff --git a/src/item.c b/src/item.c index 0823f9205997..205719fb530d 100644 --- a/src/item.c +++ b/src/item.c @@ -13,8 +13,10 @@ #include "item_use.h" #include "battle_pyramid.h" #include "battle_pyramid_bag.h" +#include "graphics.h" #include "constants/battle.h" #include "constants/items.h" +#include "constants/moves.h" #include "constants/item_effects.h" #include "constants/hold_effects.h" diff --git a/src/item_icon.c b/src/item_icon.c index 627b7894d5de..f4871380a2ea 100644 --- a/src/item_icon.c +++ b/src/item_icon.c @@ -98,14 +98,14 @@ u8 AddItemIconSprite(u16 tilesTag, u16 paletteTag, u16 itemId) struct CompressedSpritePalette spritePalette; struct SpriteTemplate *spriteTemplate; - LZDecompressWram(GetItemIconPicOrPalette(itemId, 0), gItemIconDecompressionBuffer); + LZDecompressWram(GetItemIconSprite(itemId), gItemIconDecompressionBuffer); CopyItemIconPicTo4x4Buffer(gItemIconDecompressionBuffer, gItemIcon4x4Buffer); spriteSheet.data = gItemIcon4x4Buffer; spriteSheet.size = 0x200; spriteSheet.tag = tilesTag; LoadSpriteSheet(&spriteSheet); - spritePalette.data = GetItemIconPicOrPalette(itemId, 1); + spritePalette.data = GetItemIconPalette(itemId); spritePalette.tag = paletteTag; LoadCompressedSpritePalette(&spritePalette); @@ -135,14 +135,14 @@ u8 AddCustomItemIconSprite(const struct SpriteTemplate *customSpriteTemplate, u1 struct CompressedSpritePalette spritePalette; struct SpriteTemplate *spriteTemplate; - LZDecompressWram(GetItemIconPicOrPalette(itemId, 0), gItemIconDecompressionBuffer); + LZDecompressWram(GetItemIconSprite(itemId), gItemIconDecompressionBuffer); CopyItemIconPicTo4x4Buffer(gItemIconDecompressionBuffer, gItemIcon4x4Buffer); spriteSheet.data = gItemIcon4x4Buffer; spriteSheet.size = 0x200; spriteSheet.tag = tilesTag; LoadSpriteSheet(&spriteSheet); - spritePalette.data = GetItemIconPicOrPalette(itemId, 1); + spritePalette.data = GetItemIconPalette(itemId); spritePalette.tag = paletteTag; LoadCompressedSpritePalette(&spritePalette); @@ -159,19 +159,30 @@ u8 AddCustomItemIconSprite(const struct SpriteTemplate *customSpriteTemplate, u1 } } -const void *GetItemIconPicOrPalette(u16 itemId, u8 which) +const void *GetItemIconSprite(u16 itemId) { if (itemId == ITEM_LIST_END) - return gItemIconTable[ITEMS_COUNT][which]; // Use last icon, the "return to field" arrow + return gItemIcon_ReturnToFieldArrow; // Use last icon, the "return to field" arrow if (itemId >= ITEMS_COUNT) - return gItemIconTable[0][which]; + return gItemsInfo[0].iconSprite; if (itemId >= ITEM_TM01 && itemId < ITEM_HM01 + NUM_HIDDEN_MACHINES) { - if (which) - return gTypesInfo[gMovesInfo[gItemsInfo[itemId].secondaryId].type].paletteTMHM; if (itemId < ITEM_TM01 + NUM_TECHNICAL_MACHINES) return gItemIcon_TM; return gItemIcon_HM; } - return gItemIconTable[itemId][which]; + + return gItemsInfo[itemId].iconSprite; +} + +const void *GetItemIconPalette(u16 itemId) +{ + if (itemId == ITEM_LIST_END) + return gItemIconPalette_ReturnToFieldArrow; + if (itemId >= ITEMS_COUNT) + return gItemsInfo[0].iconPalette; + if (itemId >= ITEM_TM01 && itemId < ITEM_HM01 + NUM_HIDDEN_MACHINES) + return gTypesInfo[gMovesInfo[gItemsInfo[itemId].secondaryId].type].paletteTMHM; + + return gItemsInfo[itemId].iconPalette; } diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 592f634e0abf..5044407c59bc 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -726,8 +726,6 @@ static void MultiMove_DeselectColumn(u8, u8, u8); // Move Items mode static bool32 IsItemIconAtPosition(u8, u8); -static const u32 *GetItemIconPic(u16); -static const u32 *GetItemIconPalette(u16); static u8 GetNewItemIconIdx(void); static void SetItemIconPosition(u8, u8, u8); static void LoadItemIconGfx(u8, const u32 *, const u32 *); @@ -8880,7 +8878,7 @@ static void TryLoadItemIconAtPos(u8 cursorArea, u8 cursorPos) if (heldItem != ITEM_NONE) { - const u32 *tiles = GetItemIconPic(heldItem); + const u32 *tiles = GetItemIconSprite(heldItem); const u32 *pal = GetItemIconPalette(heldItem); u8 id = GetNewItemIconIdx(); @@ -8935,7 +8933,7 @@ static void TakeItemFromMon(u8 cursorArea, u8 cursorPos) static void InitItemIconInCursor(u16 itemId) { - const u32 *tiles = GetItemIconPic(itemId); + const u32 *tiles = GetItemIconSprite(itemId); const u32 *pal = GetItemIconPalette(itemId); u8 id = GetNewItemIconIdx(); LoadItemIconGfx(id, tiles, pal); @@ -9275,16 +9273,6 @@ static void SetItemIconActive(u8 id, bool8 active) sStorage->itemIcons[id].sprite->invisible = (active == FALSE); } -static const u32 *GetItemIconPic(u16 itemId) -{ - return GetItemIconPicOrPalette(itemId, 0); -} - -static const u32 *GetItemIconPalette(u16 itemId) -{ - return GetItemIconPicOrPalette(itemId, 1); -} - static void PrintItemDescription(void) { const u8 *description;