requested changes

2 files changed, 874 insertions, 872 deletions

diff --git a/include/data/item_icon_table.h b/include/data/item_icon_table.h
index c1d802e6e..0a24c0572 100644
--- a/include/data/item_icon_table.h
+++ b/include/data/item_icon_table.h
@@ -2,906 +2,413 @@
 #define GUARD_DATA_ITEM_ICON_TABLE_H
 
 #include "global.h"
-//external declarations from "data/graphics/items/item_graphics.inc"
-extern const u8 gItemIcon_QuestionMark[];
-extern const u8 gItemIconPalette_QuestionMark[];
-// Pokeballs
-extern const u8 gItemIcon_MasterBall[]; 	
-extern const u8 gItemIconPalette_MasterBall[];
-extern const u8 gItemIcon_UltraBall[];
-extern const u8 gItemIconPalette_UltraBall[];
-extern const u8 gItemIcon_GreatBall[];
-extern const u8 gItemIconPalette_GreatBall[];
-extern const u8 gItemIcon_PokeBall[];
-extern const u8 gItemIconPalette_PokeBall[];
-extern const u8 gItemIcon_SafariBall[];
-extern const u8 gItemIconPalette_SafariBall[];
-extern const u8 gItemIcon_NetBall[];
-extern const u8 gItemIconPalette_NetBall[];
-extern const u8 gItemIcon_DiveBall[];
-extern const u8 gItemIconPalette_DiveBall[];
-extern const u8 gItemIcon_NestBall[];
-extern const u8 gItemIconPalette_NestBall[];
-extern const u8 gItemIcon_RepeatBall[];
-extern const u8 gItemIconPalette_RepeatBall[];
-extern const u8 gItemIcon_TimerBall[];
-extern const u8 gItemIcon_LuxuryBall[];
-extern const u8 gItemIconPalette_LuxuryBall[];
-extern const u8 gItemIcon_PremierBall[];
-// Medicine
-extern const u8 gItemIcon_Potion[];
-extern const u8 gItemIconPalette_Potion[];
-extern const u8 gItemIcon_Antidote[];
-extern const u8 gItemIconPalette_Antidote[];
-extern const u8 gItemIcon_StatusHeal[];
-extern const u8 gItemIconPalette_BurnHeal[];
-extern const u8 gItemIconPalette_IceHeal[];
-extern const u8 gItemIconPalette_Awakening[];
-extern const u8 gItemIconPalette_ParalyzeHeal[];
-extern const u8 gItemIcon_LargePotion[];
-extern const u8 gItemIconPalette_FullRestore[];
-extern const u8 gItemIconPalette_MaxPotion[];
-extern const u8 gItemIconPalette_HyperPotion[];
-extern const u8 gItemIconPalette_SuperPotion[];
-extern const u8 gItemIcon_FullHeal[];
-extern const u8 gItemIconPalette_FullHeal[];
-extern const u8 gItemIcon_Revive[];
-extern const u8 gItemIconPalette_Revive[];
-extern const u8 gItemIcon_MaxRevive[];
-extern const u8 gItemIcon_FreshWater[];
-extern const u8 gItemIconPalette_FreshWater[];
-extern const u8 gItemIcon_SodaPop[];
-extern const u8 gItemIconPalette_SodaPop[];
-extern const u8 gItemIcon_Lemonade[];
-extern const u8 gItemIconPalette_Lemonade[];
-extern const u8 gItemIcon_MoomooMilk[];
-extern const u8 gItemIconPalette_MoomooMilk[];
-extern const u8 gItemIcon_Powder[];
-extern const u8 gItemIconPalette_EnergyPowder[];
-extern const u8 gItemIcon_EnergyRoot[];
-extern const u8 gItemIconPalette_EnergyRoot[];
-extern const u8 gItemIconPalette_HealPowder[];
-extern const u8 gItemIcon_RevivalHerb[];
-extern const u8 gItemIconPalette_RevivalHerb[];
-extern const u8 gItemIcon_Ether[];
-extern const u8 gItemIconPalette_Ether[];
-extern const u8 gItemIconPalette_MaxEther[];
-extern const u8 gItemIconPalette_Elixir[];
-extern const u8 gItemIconPalette_MaxElixir[];
-extern const u8 gItemIcon_LavaCookie[];
-extern const u8 gItemIconPalette_LavaCookieAndLetter[];
-extern const u8 gItemIcon_Flute[];
-extern const u8 gItemIconPalette_BlueFlute[];
-extern const u8 gItemIconPalette_YellowFlute[];
-extern const u8 gItemIconPalette_RedFlute[];
-extern const u8 gItemIconPalette_BlackFlute[];
-extern const u8 gItemIconPalette_WhiteFlute[];
-extern const u8 gItemIcon_BerryJuice[];
-extern const u8 gItemIconPalette_BerryJuice[];
-extern const u8 gItemIcon_SacredAsh[];
-extern const u8 gItemIconPalette_SacredAsh[];
-// Collectibles
-extern const u8 gItemIconPalette_ShoalSalt[];
-extern const u8 gItemIcon_ShoalShell[];
-extern const u8 gItemIconPalette_Shell[];
-extern const u8 gItemIcon_Shard[];
-extern const u8 gItemIconPalette_RedShard[];
-extern const u8 gItemIconPalette_BlueShard[];
-extern const u8 gItemIconPalette_YellowShard[];
-extern const u8 gItemIconPalette_GreenShard[];
-// Vitamins
-extern const u8 gItemIcon_HPUp[];
-extern const u8 gItemIconPalette_HPUp[];
-extern const u8 gItemIcon_Vitamin[];
-extern const u8 gItemIconPalette_Protein[];
-extern const u8 gItemIconPalette_Iron[];
-extern const u8 gItemIconPalette_Carbos[];
-extern const u8 gItemIconPalette_Calcium[];
-extern const u8 gItemIcon_RareCandy[];
-extern const u8 gItemIconPalette_RareCandy[];
-extern const u8 gItemIcon_PPUp[];
-extern const u8 gItemIconPalette_PPUp[];
-extern const u8 gItemIconPalette_Zinc[];
-extern const u8 gItemIcon_PPMax[];
-extern const u8 gItemIconPalette_PPMax[];
-// Battle items
-extern const u8 gItemIcon_BattleStatItem[];
-extern const u8 gItemIconPalette_GuardSpec[];
-extern const u8 gItemIconPalette_DireHit[];
-extern const u8 gItemIconPalette_XAttack[];
-extern const u8 gItemIconPalette_XDefend[];
-extern const u8 gItemIconPalette_XSpeed[];
-extern const u8 gItemIconPalette_XAccuracy[];
-extern const u8 gItemIconPalette_XSpecial[];
-extern const u8 gItemIcon_PokeDoll[];
-extern const u8 gItemIconPalette_PokeDoll[];
-extern const u8 gItemIcon_FluffyTail[];
-extern const u8 gItemIconPalette_FluffyTail[];
-// Field items
-extern const u8 gItemIcon_Repel[];
-extern const u8 gItemIconPalette_SuperRepel[];
-extern const u8 gItemIconPalette_MaxRepel[];
-extern const u8 gItemIcon_EscapeRope[];
-extern const u8 gItemIconPalette_EscapeRope[];
-extern const u8 gItemIcon_Repel[];
-extern const u8 gItemIconPalette_Repel[];
-// Evolution stones
-extern const u8 gItemIcon_SunStone[];
-extern const u8 gItemIconPalette_SunStone[];
-extern const u8 gItemIcon_MoonStone[];
-extern const u8 gItemIconPalette_MoonStone[];
-extern const u8 gItemIcon_FireStone[];
-extern const u8 gItemIconPalette_FireStone[];
-extern const u8 gItemIcon_ThunderStone[];
-extern const u8 gItemIconPalette_ThunderStone[];
-extern const u8 gItemIcon_WaterStone[];
-extern const u8 gItemIconPalette_WaterStone[];
-extern const u8 gItemIcon_LeafStone[];
-extern const u8 gItemIconPalette_LeafStone[];
-// Valuables
-extern const u8 gItemIcon_TinyMushroom[];
-extern const u8 gItemIconPalette_Mushroom[];
-extern const u8 gItemIcon_BigMushroom[];
-extern const u8 gItemIcon_Pearl[];
-extern const u8 gItemIconPalette_Pearl[];
-extern const u8 gItemIcon_BigPearl[];
-extern const u8 gItemIcon_Stardust[];
-extern const u8 gItemIconPalette_Star[];
-extern const u8 gItemIcon_StarPiece[];
-extern const u8 gItemIcon_Nugget[];
-extern const u8 gItemIconPalette_Nugget[];
-extern const u8 gItemIcon_HeartScale[];
-extern const u8 gItemIconPalette_HeartScale[];
-// Mail
-extern const u8 gItemIcon_OrangeMail[];
-extern const u8 gItemIconPalette_OrangeMail[];
-extern const u8 gItemIcon_HarborMail[];
-extern const u8 gItemIconPalette_HarborMail[];
-extern const u8 gItemIcon_GlitterMail[];
-extern const u8 gItemIconPalette_GlitterMail[];
-extern const u8 gItemIcon_MechMail[];
-extern const u8 gItemIconPalette_MechMail[];
-extern const u8 gItemIcon_WoodMail[];
-extern const u8 gItemIconPalette_WoodMail[];
-extern const u8 gItemIcon_WaveMail[];
-extern const u8 gItemIconPalette_WaveMail[];
-extern const u8 gItemIcon_BeadMail[];
-extern const u8 gItemIconPalette_BeadMail[];
-extern const u8 gItemIcon_ShadowMail[];
-extern const u8 gItemIconPalette_ShadowMail[];
-extern const u8 gItemIcon_TropicMail[];
-extern const u8 gItemIconPalette_TropicMail[];
-extern const u8 gItemIcon_DreamMail[];
-extern const u8 gItemIconPalette_DreamMail[];
-extern const u8 gItemIcon_FabMail[];
-extern const u8 gItemIconPalette_FabMail[];
-extern const u8 gItemIcon_RetroMail[];
-extern const u8 gItemIconPalette_RetroMail[];
-// Berries
-extern const u8 gItemIcon_CheriBerry[];
-extern const u8 gItemIconPalette_CheriBerry[];
-extern const u8 gItemIcon_ChestoBerry[];
-extern const u8 gItemIconPalette_ChestoBerry[];
-extern const u8 gItemIcon_PechaBerry[];
-extern const u8 gItemIconPalette_PechaBerry[];
-extern const u8 gItemIcon_RawstBerry[];
-extern const u8 gItemIconPalette_RawstBerry[];
-extern const u8 gItemIcon_AspearBerry[];
-extern const u8 gItemIconPalette_AspearBerry[];
-extern const u8 gItemIcon_LeppaBerry[];
-extern const u8 gItemIconPalette_LeppaBerry[];
-extern const u8 gItemIcon_OranBerry[];
-extern const u8 gItemIconPalette_OranBerry[];
-extern const u8 gItemIcon_PersimBerry[];
-extern const u8 gItemIconPalette_PersimBerry[];
-extern const u8 gItemIcon_LumBerry[];
-extern const u8 gItemIconPalette_LumBerry[];
-extern const u8 gItemIcon_SitrusBerry[];
-extern const u8 gItemIconPalette_SitrusBerry[];
-extern const u8 gItemIcon_FigyBerry[];
-extern const u8 gItemIconPalette_FigyBerry[];
-extern const u8 gItemIcon_WikiBerry[];
-extern const u8 gItemIconPalette_WikiBerry[];
-extern const u8 gItemIcon_MagoBerry[];
-extern const u8 gItemIconPalette_MagoBerry[];
-extern const u8 gItemIcon_AguavBerry[];
-extern const u8 gItemIconPalette_AguavBerry[];
-extern const u8 gItemIcon_IapapaBerry[];
-extern const u8 gItemIconPalette_IapapaBerry[];
-extern const u8 gItemIcon_RazzBerry[];
-extern const u8 gItemIconPalette_RazzBerry[];
-extern const u8 gItemIcon_BlukBerry[];
-extern const u8 gItemIconPalette_BlukBerry[];
-extern const u8 gItemIcon_NanabBerry[];
-extern const u8 gItemIconPalette_NanabBerry[];
-extern const u8 gItemIcon_WepearBerry[];
-extern const u8 gItemIconPalette_WepearBerry[];
-extern const u8 gItemIcon_PinapBerry[];
-extern const u8 gItemIconPalette_PinapBerry[];
-extern const u8 gItemIcon_PomegBerry[];
-extern const u8 gItemIconPalette_PomegBerry[];
-extern const u8 gItemIcon_KelpsyBerry[];
-extern const u8 gItemIconPalette_KelpsyBerry[];
-extern const u8 gItemIcon_QualotBerry[];
-extern const u8 gItemIconPalette_QualotBerry[];
-extern const u8 gItemIcon_HondewBerry[];
-extern const u8 gItemIconPalette_HondewBerry[];
-extern const u8 gItemIcon_GrepaBerry[];
-extern const u8 gItemIconPalette_GrepaBerry[];
-extern const u8 gItemIcon_TamatoBerry[];
-extern const u8 gItemIconPalette_TamatoBerry[];
-extern const u8 gItemIcon_CornnBerry[];
-extern const u8 gItemIconPalette_CornnBerry[];
-extern const u8 gItemIcon_MagostBerry[];
-extern const u8 gItemIconPalette_MagostBerry[];
-extern const u8 gItemIcon_RabutaBerry[];
-extern const u8 gItemIconPalette_RabutaBerry[];
-extern const u8 gItemIcon_NomelBerry[];
-extern const u8 gItemIconPalette_NomelBerry[];
-extern const u8 gItemIcon_SpelonBerry[];
-extern const u8 gItemIconPalette_SpelonBerry[];
-extern const u8 gItemIcon_PamtreBerry[];
-extern const u8 gItemIconPalette_PamtreBerry[];
-extern const u8 gItemIcon_WatmelBerry[];
-extern const u8 gItemIconPalette_WatmelBerry[];
-extern const u8 gItemIcon_DurinBerry[];
-extern const u8 gItemIconPalette_DurinBerry[];
-extern const u8 gItemIcon_BelueBerry[];
-extern const u8 gItemIconPalette_BelueBerry[];
-extern const u8 gItemIcon_LiechiBerry[];
-extern const u8 gItemIconPalette_LiechiBerry[];
-extern const u8 gItemIcon_GanlonBerry[];
-extern const u8 gItemIconPalette_GanlonBerry[];
-extern const u8 gItemIcon_SalacBerry[];
-extern const u8 gItemIconPalette_SalacBerry[];
-extern const u8 gItemIcon_PetayaBerry[];
-extern const u8 gItemIconPalette_PetayaBerry[];
-extern const u8 gItemIcon_ApicotBerry[];
-extern const u8 gItemIconPalette_ApicotBerry[];
-extern const u8 gItemIcon_LansatBerry[];
-extern const u8 gItemIconPalette_LansatBerry[];
-extern const u8 gItemIcon_StarfBerry[];
-extern const u8 gItemIconPalette_StarfBerry[];
-extern const u8 gItemIcon_EnigmaBerry[];
-extern const u8 gItemIconPalette_EnigmaBerry[];
-// Hold items
-extern const u8 gItemIcon_BrightPowder[];
-extern const u8 gItemIconPalette_BrightPowder[];
-extern const u8 gItemIcon_InBattleHerb[];
-extern const u8 gItemIconPalette_WhiteHerb[];
-extern const u8 gItemIcon_MachoBrace[];
-extern const u8 gItemIconPalette_MachoBrace[];
-extern const u8 gItemIcon_ExpShare[];
-extern const u8 gItemIconPalette_ExpShare[];
-extern const u8 gItemIcon_QuickClaw[];
-extern const u8 gItemIconPalette_QuickClaw[];
-extern const u8 gItemIcon_SootheBell[];
-extern const u8 gItemIconPalette_SootheBell[];
-extern const u8 gItemIcon_InBattleHerb[];
-extern const u8 gItemIconPalette_MentalHerb[];
-extern const u8 gItemIcon_ChoiceBand[];
-extern const u8 gItemIconPalette_ChoiceBand[];
-extern const u8 gItemIcon_KingsRock[];
-extern const u8 gItemIconPalette_KingsRock[];
-extern const u8 gItemIcon_SilverPowder[];
-extern const u8 gItemIconPalette_SilverPowder[];
-extern const u8 gItemIcon_AmuletCoin[];
-extern const u8 gItemIconPalette_AmuletCoin[];
-extern const u8 gItemIcon_CleanseTag[];
-extern const u8 gItemIconPalette_CleanseTag[];
-extern const u8 gItemIcon_SoulDew[];
-extern const u8 gItemIconPalette_SoulDew[];
-extern const u8 gItemIcon_DeepSeaTooth[];
-extern const u8 gItemIconPalette_DeepSeaTooth[];
-extern const u8 gItemIcon_DeepSeaScale[];
-extern const u8 gItemIconPalette_DeepSeaScale[];
-extern const u8 gItemIcon_SmokeBall[];
-extern const u8 gItemIconPalette_SmokeBall[];
-extern const u8 gItemIcon_Everstone[];
-extern const u8 gItemIconPalette_Everstone[];
-extern const u8 gItemIcon_FocusBand[];
-extern const u8 gItemIconPalette_FocusBand[];
-extern const u8 gItemIcon_LuckyEgg[];
-extern const u8 gItemIconPalette_LuckyEgg[];
-extern const u8 gItemIcon_ScopeLens[];
-extern const u8 gItemIconPalette_ScopeLens[];
-extern const u8 gItemIcon_MetalCoat[];
-extern const u8 gItemIconPalette_MetalCoat[];
-extern const u8 gItemIcon_Leftovers[];
-extern const u8 gItemIconPalette_Leftovers[];
-extern const u8 gItemIcon_DragonScale[];
-extern const u8 gItemIconPalette_DragonScale[];
-extern const u8 gItemIcon_LightBall[];
-extern const u8 gItemIconPalette_LightBall[];
-extern const u8 gItemIcon_SoftSand[];
-extern const u8 gItemIconPalette_SoftSand[];
-extern const u8 gItemIcon_HardStone[];
-extern const u8 gItemIconPalette_HardStone[];
-extern const u8 gItemIcon_MiracleSeed[];
-extern const u8 gItemIconPalette_MiracleSeed[];
-extern const u8 gItemIcon_BlackGlasses[];
-extern const u8 gItemIconPalette_BlackTypeEnhancingItem[];
-extern const u8 gItemIcon_BlackBelt[];
-extern const u8 gItemIconPalette_BlackTypeEnhancingItem[];
-extern const u8 gItemIcon_Magnet[];
-extern const u8 gItemIconPalette_Magnet[];
-extern const u8 gItemIcon_MysticWater[];
-extern const u8 gItemIconPalette_MysticWater[];
-extern const u8 gItemIcon_SharpBeak[];
-extern const u8 gItemIconPalette_SharpBeak[];
-extern const u8 gItemIcon_PoisonBarb[];
-extern const u8 gItemIconPalette_PoisonBarb[];
-extern const u8 gItemIcon_NeverMeltIce[];
-extern const u8 gItemIconPalette_NeverMeltIce[];
-extern const u8 gItemIcon_SpellTag[];
-extern const u8 gItemIconPalette_SpellTag[];
-extern const u8 gItemIcon_TwistedSpoon[];
-extern const u8 gItemIconPalette_TwistedSpoon[];
-extern const u8 gItemIcon_Charcoal[];
-extern const u8 gItemIconPalette_Charcoal[];
-extern const u8 gItemIcon_DragonFang[];
-extern const u8 gItemIconPalette_DragonFang[];
-extern const u8 gItemIcon_SilkScarf[];
-extern const u8 gItemIconPalette_SilkScarf[];
-extern const u8 gItemIcon_UpGrade[];
-extern const u8 gItemIconPalette_UpGrade[];
-extern const u8 gItemIcon_ShellBell[];
-extern const u8 gItemIconPalette_Shell[];
-extern const u8 gItemIcon_SeaIncense[];
-extern const u8 gItemIconPalette_SeaIncense[];
-extern const u8 gItemIcon_LaxIncense[];
-extern const u8 gItemIconPalette_LaxIncense[];
-extern const u8 gItemIcon_LuckyPunch[];
-extern const u8 gItemIconPalette_LuckyPunch[];
-extern const u8 gItemIcon_MetalPowder[];
-extern const u8 gItemIconPalette_MetalPowder[];
-extern const u8 gItemIcon_ThickClub[];
-extern const u8 gItemIconPalette_ThickClub[];
-extern const u8 gItemIcon_Stick[];
-extern const u8 gItemIconPalette_Stick[];
-// Contest hold items
-extern const u8 gItemIcon_Scarf[];
-extern const u8 gItemIconPalette_RedScarf[];
-extern const u8 gItemIconPalette_BlueScarf[];
-extern const u8 gItemIconPalette_PinkScarf[];
-extern const u8 gItemIconPalette_GreenScarf[];
-extern const u8 gItemIconPalette_YellowScarf[];
-// Key items
-extern const u8 gItemIcon_MachBike[];
-extern const u8 gItemIconPalette_MachBike[];
-extern const u8 gItemIcon_CoinCase[];
-extern const u8 gItemIconPalette_CoinCase[];
-extern const u8 gItemIcon_Itemfinder[];
-extern const u8 gItemIconPalette_Itemfinder[];
-extern const u8 gItemIcon_OldRod[];
-extern const u8 gItemIconPalette_OldRod[];
-extern const u8 gItemIcon_GoodRod[];
-extern const u8 gItemIconPalette_GoodRod[];
-extern const u8 gItemIcon_SuperRod[];
-extern const u8 gItemIconPalette_SuperRod[];
-extern const u8 gItemIcon_SSTicket[];
-extern const u8 gItemIconPalette_SSTicket[];
-extern const u8 gItemIcon_ContestPass[];
-extern const u8 gItemIconPalette_ContestPass[];
-extern const u8 gItemIcon_WailmerPail[];
-extern const u8 gItemIconPalette_WailmerPail[];
-extern const u8 gItemIcon_DevonGoods[];
-extern const u8 gItemIconPalette_DevonGoods[];
-extern const u8 gItemIcon_SootSack[];
-extern const u8 gItemIconPalette_SootSack[];
-extern const u8 gItemIcon_BasementKey[];
-extern const u8 gItemIconPalette_OldKey[];
-extern const u8 gItemIcon_AcroBike[];
-extern const u8 gItemIconPalette_AcroBike[];
-extern const u8 gItemIcon_PokeblockCase[];
-extern const u8 gItemIconPalette_PokeblockCase[];
-extern const u8 gItemIcon_Letter[];
-extern const u8 gItemIcon_EonTicket[];
-extern const u8 gItemIconPalette_EonTicket[];
-extern const u8 gItemIcon_Orb[];
-extern const u8 gItemIconPalette_RedOrb[];
-extern const u8 gItemIconPalette_BlueOrb[];
-extern const u8 gItemIcon_Scanner[];
-extern const u8 gItemIconPalette_Scanner[];
-extern const u8 gItemIcon_GoGoggles[];
-extern const u8 gItemIconPalette_GoGoggles[];
-extern const u8 gItemIcon_Meteorite[];
-extern const u8 gItemIconPalette_Meteorite[];
-extern const u8 gItemIcon_Room1Key[];
-extern const u8 gItemIconPalette_Key[];
-extern const u8 gItemIcon_Room2Key[];
-extern const u8 gItemIcon_Room4Key[];
-extern const u8 gItemIcon_Room6Key[];
-extern const u8 gItemIcon_StorageKey[];
-extern const u8 gItemIcon_RootFossil[];
-extern const u8 gItemIconPalette_HoennFossil[];
-extern const u8 gItemIcon_ClawFossil[];
-extern const u8 gItemIcon_DevonScope[];
-extern const u8 gItemIconPalette_DevonScope[];
-// TMs/HMs
-extern const u8 gItemIcon_TM[];
-extern const u8 gItemIconPalette_FightingTMHM[];
-extern const u8 gItemIconPalette_DragonTMHM[];
-extern const u8 gItemIconPalette_WaterTMHM[];
-extern const u8 gItemIconPalette_PsychicTMHM[];
-extern const u8 gItemIconPalette_NormalTMHM[];
-extern const u8 gItemIconPalette_PoisonTMHM[];
-extern const u8 gItemIconPalette_IceTMHM[];
-extern const u8 gItemIconPalette_GrassTMHM[];
-extern const u8 gItemIconPalette_FireTMHM[];
-extern const u8 gItemIconPalette_DarkTMHM[];
-extern const u8 gItemIconPalette_SteelTMHM[];
-extern const u8 gItemIconPalette_ElectricTMHM[];
-extern const u8 gItemIconPalette_GroundTMHM[];
-extern const u8 gItemIconPalette_GhostTMHM[];
-extern const u8 gItemIconPalette_RockTMHM[];
-extern const u8 gItemIconPalette_FlyingTMHM[];
-extern const u8 gItemIcon_HM[];
-// FireRed/LeafGreen key items
-extern const u8 gItemIcon_OaksParcel[];
-extern const u8 gItemIconPalette_OaksParcel[];
-extern const u8 gItemIcon_PokeFlute[];
-extern const u8 gItemIconPalette_PokeFlute[];
-extern const u8 gItemIcon_SecretKey[];
-extern const u8 gItemIconPalette_SecretKey[];
-extern const u8 gItemIcon_BikeVoucher[];
-extern const u8 gItemIconPalette_BikeVoucher[];
-extern const u8 gItemIcon_GoldTeeth[];
-extern const u8 gItemIconPalette_GoldTeeth[];
-extern const u8 gItemIcon_OldAmber[];
-extern const u8 gItemIconPalette_OldAmber[];
-extern const u8 gItemIcon_CardKey[];
-extern const u8 gItemIconPalette_CardKey[];
-extern const u8 gItemIcon_LiftKey[];
-extern const u8 gItemIconPalette_Key[];
-extern const u8 gItemIcon_HelixFossil[];
-extern const u8 gItemIconPalette_KantoFossil[];
-extern const u8 gItemIcon_DomeFossil[];
-extern const u8 gItemIcon_SilphScope[];
-extern const u8 gItemIconPalette_SilphScope[];
-extern const u8 gItemIcon_Bicycle[];
-extern const u8 gItemIconPalette_Bicycle[];
-extern const u8 gItemIcon_TownMap[];
-extern const u8 gItemIconPalette_TownMap[];
-extern const u8 gItemIcon_VSSeeker[];
-extern const u8 gItemIconPalette_VSSeeker[];
-extern const u8 gItemIcon_FameChecker[];
-extern const u8 gItemIconPalette_FameChecker[];
-extern const u8 gItemIcon_TMCase[];
-extern const u8 gItemIconPalette_TMCase[];
-extern const u8 gItemIcon_BerryPouch[];
-extern const u8 gItemIconPalette_BerryPouch[];
-extern const u8 gItemIcon_TeachyTV[];
-extern const u8 gItemIconPalette_TeachyTV[];
-extern const u8 gItemIcon_TriPass[];
-extern const u8 gItemIconPalette_TriPass[];
-extern const u8 gItemIcon_RainbowPass[];
-extern const u8 gItemIconPalette_RainbowPass[];
-extern const u8 gItemIcon_Tea[];
-extern const u8 gItemIconPalette_Tea[];
-extern const u8 gItemIcon_MysticTicket[];
-extern const u8 gItemIconPalette_MysticTicket[];
-extern const u8 gItemIcon_AuroraTicket[];
-extern const u8 gItemIconPalette_AuroraTicket[];
-extern const u8 gItemIcon_PowderJar[];
-extern const u8 gItemIconPalette_PowderJar[];
-extern const u8 gItemIcon_Gem[];
-extern const u8 gItemIconPalette_Ruby[];
-extern const u8 gItemIconPalette_Sapphire[];
-// Emerald-only key items
-extern const u8 gItemIcon_MagmaEmblem[];
-extern const u8 gItemIconPalette_MagmaEmblem[];
-extern const u8 gItemIcon_OldSeaMap[];
-extern const u8 gItemIconPalette_OldSeaMap[];
-
-extern const u8 gItemIcon_ReturnToFieldArrow[];
-extern const u8 gItemIconPalette_ReturnToFieldArrow[];
+#include "graphics.h"
 
 const u8 * const gItemIconTable[][2] = 
 {
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark,    gItemIconPalette_QuestionMark,
 // Pokeballs
-	gItemIcon_MasterBall, 	gItemIconPalette_MasterBall,
-	gItemIcon_UltraBall, 	gItemIconPalette_UltraBall,
-	gItemIcon_GreatBall, 	gItemIconPalette_GreatBall,
-	gItemIcon_PokeBall, 	gItemIconPalette_PokeBall,
-	gItemIcon_SafariBall, 	gItemIconPalette_SafariBall,
-	gItemIcon_NetBall, 	gItemIconPalette_NetBall,
-	gItemIcon_DiveBall, 	gItemIconPalette_DiveBall,
-	gItemIcon_NestBall, 	gItemIconPalette_NestBall,
-	gItemIcon_RepeatBall, 	gItemIconPalette_RepeatBall,
-	gItemIcon_TimerBall, 	gItemIconPalette_RepeatBall,
-	gItemIcon_LuxuryBall, 	gItemIconPalette_LuxuryBall,
-	gItemIcon_PremierBall, 	gItemIconPalette_LuxuryBall,
+    gItemIcon_MasterBall,     gItemIconPalette_MasterBall,
+    gItemIcon_UltraBall,      gItemIconPalette_UltraBall,
+    gItemIcon_GreatBall,      gItemIconPalette_GreatBall,
+    gItemIcon_PokeBall,       gItemIconPalette_PokeBall,
+    gItemIcon_SafariBall,     gItemIconPalette_SafariBall,
+    gItemIcon_NetBall,        gItemIconPalette_NetBall,
+    gItemIcon_DiveBall,       gItemIconPalette_DiveBall,
+    gItemIcon_NestBall,       gItemIconPalette_NestBall,
+    gItemIcon_RepeatBall,     gItemIconPalette_RepeatBall,
+    gItemIcon_TimerBall,      gItemIconPalette_RepeatBall,
+    gItemIcon_LuxuryBall,     gItemIconPalette_LuxuryBall,
+    gItemIcon_PremierBall,    gItemIconPalette_LuxuryBall,
 // Medicine
-	gItemIcon_Potion, 	gItemIconPalette_Potion,
-	gItemIcon_Antidote, 	gItemIconPalette_Antidote,
-	gItemIcon_StatusHeal, 	gItemIconPalette_BurnHeal,
-	gItemIcon_StatusHeal, 	gItemIconPalette_IceHeal,
-	gItemIcon_StatusHeal, 	gItemIconPalette_Awakening,
-	gItemIcon_StatusHeal, 	gItemIconPalette_ParalyzeHeal,
-	gItemIcon_LargePotion, 	gItemIconPalette_FullRestore,
-	gItemIcon_LargePotion, 	gItemIconPalette_MaxPotion,
-	gItemIcon_Potion, 	gItemIconPalette_HyperPotion,
-	gItemIcon_Potion, 	gItemIconPalette_SuperPotion,
-	gItemIcon_FullHeal, 	gItemIconPalette_FullHeal,
-	gItemIcon_Revive, 	gItemIconPalette_Revive,
-	gItemIcon_MaxRevive, 	gItemIconPalette_Revive,
-	gItemIcon_FreshWater, 	gItemIconPalette_FreshWater,
-	gItemIcon_SodaPop, 	gItemIconPalette_SodaPop,
-	gItemIcon_Lemonade, 	gItemIconPalette_Lemonade,
-	gItemIcon_MoomooMilk, 	gItemIconPalette_MoomooMilk,
-	gItemIcon_Powder, 	gItemIconPalette_EnergyPowder,
-	gItemIcon_EnergyRoot, 	gItemIconPalette_EnergyRoot,
-	gItemIcon_Powder, 	gItemIconPalette_HealPowder,
-	gItemIcon_RevivalHerb, 	gItemIconPalette_RevivalHerb,
-	gItemIcon_Ether, 	gItemIconPalette_Ether,
-	gItemIcon_Ether, 	gItemIconPalette_MaxEther,
-	gItemIcon_Ether, 	gItemIconPalette_Elixir,
-	gItemIcon_Ether, 	gItemIconPalette_MaxElixir,
-	gItemIcon_LavaCookie, 	gItemIconPalette_LavaCookieAndLetter,
-	gItemIcon_Flute, 	gItemIconPalette_BlueFlute,
-	gItemIcon_Flute, 	gItemIconPalette_YellowFlute,
-	gItemIcon_Flute, 	gItemIconPalette_RedFlute,
-	gItemIcon_Flute, 	gItemIconPalette_BlackFlute,
-	gItemIcon_Flute, 	gItemIconPalette_WhiteFlute,
-	gItemIcon_BerryJuice, 	gItemIconPalette_BerryJuice,
-	gItemIcon_SacredAsh, 	gItemIconPalette_SacredAsh,
+    gItemIcon_Potion,         gItemIconPalette_Potion,
+    gItemIcon_Antidote,       gItemIconPalette_Antidote,
+    gItemIcon_StatusHeal,     gItemIconPalette_BurnHeal,
+    gItemIcon_StatusHeal,     gItemIconPalette_IceHeal,
+    gItemIcon_StatusHeal,     gItemIconPalette_Awakening,
+    gItemIcon_StatusHeal,     gItemIconPalette_ParalyzeHeal,
+    gItemIcon_LargePotion,    gItemIconPalette_FullRestore,
+    gItemIcon_LargePotion,    gItemIconPalette_MaxPotion,
+    gItemIcon_Potion,         gItemIconPalette_HyperPotion,
+    gItemIcon_Potion,         gItemIconPalette_SuperPotion,
+    gItemIcon_FullHeal,       gItemIconPalette_FullHeal,
+    gItemIcon_Revive,         gItemIconPalette_Revive,
+    gItemIcon_MaxRevive,      gItemIconPalette_Revive,
+    gItemIcon_FreshWater,     gItemIconPalette_FreshWater,
+    gItemIcon_SodaPop,        gItemIconPalette_SodaPop,
+    gItemIcon_Lemonade,       gItemIconPalette_Lemonade,
+    gItemIcon_MoomooMilk,     gItemIconPalette_MoomooMilk,
+    gItemIcon_Powder,         gItemIconPalette_EnergyPowder,
+    gItemIcon_EnergyRoot,     gItemIconPalette_EnergyRoot,
+    gItemIcon_Powder,         gItemIconPalette_HealPowder,
+    gItemIcon_RevivalHerb,    gItemIconPalette_RevivalHerb,
+    gItemIcon_Ether,          gItemIconPalette_Ether,
+    gItemIcon_Ether,          gItemIconPalette_MaxEther,
+    gItemIcon_Ether,          gItemIconPalette_Elixir,
+    gItemIcon_Ether,          gItemIconPalette_MaxElixir,
+    gItemIcon_LavaCookie,     gItemIconPalette_LavaCookieAndLetter,
+    gItemIcon_Flute,          gItemIconPalette_BlueFlute,
+    gItemIcon_Flute,          gItemIconPalette_YellowFlute,
+    gItemIcon_Flute,          gItemIconPalette_RedFlute,
+    gItemIcon_Flute,          gItemIconPalette_BlackFlute,
+    gItemIcon_Flute,          gItemIconPalette_WhiteFlute,
+    gItemIcon_BerryJuice,     gItemIconPalette_BerryJuice,
+    gItemIcon_SacredAsh,      gItemIconPalette_SacredAsh,
 // Collectibles
-	gItemIcon_Powder, 	gItemIconPalette_ShoalSalt,
-	gItemIcon_ShoalShell, 	gItemIconPalette_Shell,
-	gItemIcon_Shard, 	gItemIconPalette_RedShard,
-	gItemIcon_Shard, 	gItemIconPalette_BlueShard,
-	gItemIcon_Shard, 	gItemIconPalette_YellowShard,
-	gItemIcon_Shard, 	gItemIconPalette_GreenShard,
+    gItemIcon_Powder,        gItemIconPalette_ShoalSalt,
+    gItemIcon_ShoalShell,    gItemIconPalette_Shell,
+    gItemIcon_Shard,         gItemIconPalette_RedShard,
+    gItemIcon_Shard,         gItemIconPalette_BlueShard,
+    gItemIcon_Shard,         gItemIconPalette_YellowShard,
+    gItemIcon_Shard,         gItemIconPalette_GreenShard,
 // ????????
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
 // Vitamins
-	gItemIcon_HPUp, 	gItemIconPalette_HPUp,
-	gItemIcon_Vitamin, 	gItemIconPalette_Protein,
-	gItemIcon_Vitamin, 	gItemIconPalette_Iron,
-	gItemIcon_Vitamin, 	gItemIconPalette_Carbos,
-	gItemIcon_Vitamin, 	gItemIconPalette_Calcium,
-	gItemIcon_RareCandy, 	gItemIconPalette_RareCandy,
-	gItemIcon_PPUp, 	gItemIconPalette_PPUp,
-	gItemIcon_Vitamin, 	gItemIconPalette_Zinc,
-	gItemIcon_PPMax, 	gItemIconPalette_PPMax,
+    gItemIcon_HPUp,         gItemIconPalette_HPUp,
+    gItemIcon_Vitamin,      gItemIconPalette_Protein,
+    gItemIcon_Vitamin,      gItemIconPalette_Iron,
+    gItemIcon_Vitamin,      gItemIconPalette_Carbos,
+    gItemIcon_Vitamin,      gItemIconPalette_Calcium,
+    gItemIcon_RareCandy,    gItemIconPalette_RareCandy,
+    gItemIcon_PPUp,         gItemIconPalette_PPUp,
+    gItemIcon_Vitamin,      gItemIconPalette_Zinc,
+    gItemIcon_PPMax,        gItemIconPalette_PPMax,
 // ????????
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
 // Battle items
-	gItemIcon_BattleStatItem, 	gItemIconPalette_GuardSpec,
-	gItemIcon_BattleStatItem, 	gItemIconPalette_DireHit,
-	gItemIcon_BattleStatItem, 	gItemIconPalette_XAttack,
-	gItemIcon_BattleStatItem, 	gItemIconPalette_XDefend,
-	gItemIcon_BattleStatItem, 	gItemIconPalette_XSpeed,
-	gItemIcon_BattleStatItem, 	gItemIconPalette_XAccuracy,
-	gItemIcon_BattleStatItem,	gItemIconPalette_XSpecial,
-	gItemIcon_PokeDoll,		gItemIconPalette_PokeDoll,
-	gItemIcon_FluffyTail, 		gItemIconPalette_FluffyTail,
+    gItemIcon_BattleStatItem,    gItemIconPalette_GuardSpec,
+    gItemIcon_BattleStatItem,    gItemIconPalette_DireHit,
+    gItemIcon_BattleStatItem,    gItemIconPalette_XAttack,
+    gItemIcon_BattleStatItem,    gItemIconPalette_XDefend,
+    gItemIcon_BattleStatItem,    gItemIconPalette_XSpeed,
+    gItemIcon_BattleStatItem,    gItemIconPalette_XAccuracy,
+    gItemIcon_BattleStatItem,    gItemIconPalette_XSpecial,
+    gItemIcon_PokeDoll,          gItemIconPalette_PokeDoll,
+    gItemIcon_FluffyTail,        gItemIconPalette_FluffyTail,
 // ????????
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
 // Field items
-	gItemIcon_Repel, 	gItemIconPalette_SuperRepel,
-	gItemIcon_Repel, 	gItemIconPalette_MaxRepel,
-	gItemIcon_EscapeRope, 	gItemIconPalette_EscapeRope,
-	gItemIcon_Repel, 	gItemIconPalette_Repel,
+    gItemIcon_Repel,         gItemIconPalette_SuperRepel,
+    gItemIcon_Repel,         gItemIconPalette_MaxRepel,
+    gItemIcon_EscapeRope,    gItemIconPalette_EscapeRope,
+    gItemIcon_Repel,         gItemIconPalette_Repel,
 // ????????
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
 // Evolution stones
-	gItemIcon_SunStone, 	gItemIconPalette_SunStone,
-	gItemIcon_MoonStone, 	gItemIconPalette_MoonStone,
-	gItemIcon_FireStone, 	gItemIconPalette_FireStone,
-	gItemIcon_ThunderStone, gItemIconPalette_ThunderStone,
-	gItemIcon_WaterStone, 	gItemIconPalette_WaterStone,
-	gItemIcon_LeafStone, 	gItemIconPalette_LeafStone,
+    gItemIcon_SunStone,      gItemIconPalette_SunStone,
+    gItemIcon_MoonStone,     gItemIconPalette_MoonStone,
+    gItemIcon_FireStone,     gItemIconPalette_FireStone,
+    gItemIcon_ThunderStone,  gItemIconPalette_ThunderStone,
+    gItemIcon_WaterStone,    gItemIconPalette_WaterStone,
+    gItemIcon_LeafStone,     gItemIconPalette_LeafStone,
 // ????????
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
 // Valuables
-	gItemIcon_TinyMushroom, gItemIconPalette_Mushroom,
-	gItemIcon_BigMushroom, 	gItemIconPalette_Mushroom,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_Pearl, 	gItemIconPalette_Pearl,
-	gItemIcon_BigPearl, 	gItemIconPalette_Pearl,
-	gItemIcon_Stardust, 	gItemIconPalette_Star,
-	gItemIcon_StarPiece, 	gItemIconPalette_Star,
-	gItemIcon_Nugget, 	gItemIconPalette_Nugget,
-	gItemIcon_HeartScale, 	gItemIconPalette_HeartScale,
+    gItemIcon_TinyMushroom,    gItemIconPalette_Mushroom,
+    gItemIcon_BigMushroom,     gItemIconPalette_Mushroom,
+    gItemIcon_QuestionMark,    gItemIconPalette_QuestionMark,
+    gItemIcon_Pearl,           gItemIconPalette_Pearl,
+    gItemIcon_BigPearl,        gItemIconPalette_Pearl,
+    gItemIcon_Stardust,        gItemIconPalette_Star,
+    gItemIcon_StarPiece,       gItemIconPalette_Star,
+    gItemIcon_Nugget,          gItemIconPalette_Nugget,
+    gItemIcon_HeartScale,      gItemIconPalette_HeartScale,
 // ????????
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
 // Mail
-	gItemIcon_OrangeMail, 	gItemIconPalette_OrangeMail,
-	gItemIcon_HarborMail, 	gItemIconPalette_HarborMail,
-	gItemIcon_GlitterMail, 	gItemIconPalette_GlitterMail,
-	gItemIcon_MechMail, 	gItemIconPalette_MechMail,
-	gItemIcon_WoodMail, 	gItemIconPalette_WoodMail,
-	gItemIcon_WaveMail, 	gItemIconPalette_WaveMail,
-	gItemIcon_BeadMail, 	gItemIconPalette_BeadMail,
-	gItemIcon_ShadowMail, 	gItemIconPalette_ShadowMail,
-	gItemIcon_TropicMail, 	gItemIconPalette_TropicMail,
-	gItemIcon_DreamMail, 	gItemIconPalette_DreamMail,
-	gItemIcon_FabMail, 	gItemIconPalette_FabMail,
-	gItemIcon_RetroMail, 	gItemIconPalette_RetroMail,
+    gItemIcon_OrangeMail,     gItemIconPalette_OrangeMail,
+    gItemIcon_HarborMail,     gItemIconPalette_HarborMail,
+    gItemIcon_GlitterMail,    gItemIconPalette_GlitterMail,
+    gItemIcon_MechMail,       gItemIconPalette_MechMail,
+    gItemIcon_WoodMail,       gItemIconPalette_WoodMail,
+    gItemIcon_WaveMail,       gItemIconPalette_WaveMail,
+    gItemIcon_BeadMail,       gItemIconPalette_BeadMail,
+    gItemIcon_ShadowMail,     gItemIconPalette_ShadowMail,
+    gItemIcon_TropicMail,     gItemIconPalette_TropicMail,
+    gItemIcon_DreamMail,      gItemIconPalette_DreamMail,
+    gItemIcon_FabMail,        gItemIconPalette_FabMail,
+    gItemIcon_RetroMail,      gItemIconPalette_RetroMail,
 // Berries
-	gItemIcon_CheriBerry, 	gItemIconPalette_CheriBerry,
-	gItemIcon_ChestoBerry, 	gItemIconPalette_ChestoBerry,
-	gItemIcon_PechaBerry, 	gItemIconPalette_PechaBerry,
-	gItemIcon_RawstBerry, 	gItemIconPalette_RawstBerry,
-	gItemIcon_AspearBerry, 	gItemIconPalette_AspearBerry,
-	gItemIcon_LeppaBerry, 	gItemIconPalette_LeppaBerry,
-	gItemIcon_OranBerry, 	gItemIconPalette_OranBerry,
-	gItemIcon_PersimBerry, 	gItemIconPalette_PersimBerry,
-	gItemIcon_LumBerry, 	gItemIconPalette_LumBerry,
-	gItemIcon_SitrusBerry, 	gItemIconPalette_SitrusBerry,
-	gItemIcon_FigyBerry, 	gItemIconPalette_FigyBerry,
-	gItemIcon_WikiBerry, 	gItemIconPalette_WikiBerry,
-	gItemIcon_MagoBerry, 	gItemIconPalette_MagoBerry,
-	gItemIcon_AguavBerry, 	gItemIconPalette_AguavBerry,
-	gItemIcon_IapapaBerry, 	gItemIconPalette_IapapaBerry,
-	gItemIcon_RazzBerry, 	gItemIconPalette_RazzBerry,
-	gItemIcon_BlukBerry, 	gItemIconPalette_BlukBerry,
-	gItemIcon_NanabBerry, 	gItemIconPalette_NanabBerry,
-	gItemIcon_WepearBerry, 	gItemIconPalette_WepearBerry,
-	gItemIcon_PinapBerry, 	gItemIconPalette_PinapBerry,
-	gItemIcon_PomegBerry, 	gItemIconPalette_PomegBerry,
-	gItemIcon_KelpsyBerry, 	gItemIconPalette_KelpsyBerry,
-	gItemIcon_QualotBerry, 	gItemIconPalette_QualotBerry,
-	gItemIcon_HondewBerry, 	gItemIconPalette_HondewBerry,
-	gItemIcon_GrepaBerry, 	gItemIconPalette_GrepaBerry,
-	gItemIcon_TamatoBerry, 	gItemIconPalette_TamatoBerry,
-	gItemIcon_CornnBerry, 	gItemIconPalette_CornnBerry,
-	gItemIcon_MagostBerry, 	gItemIconPalette_MagostBerry,
-	gItemIcon_RabutaBerry, 	gItemIconPalette_RabutaBerry,
-	gItemIcon_NomelBerry, 	gItemIconPalette_NomelBerry,
-	gItemIcon_SpelonBerry, 	gItemIconPalette_SpelonBerry,
-	gItemIcon_PamtreBerry, 	gItemIconPalette_PamtreBerry,
-	gItemIcon_WatmelBerry, 	gItemIconPalette_WatmelBerry,
-	gItemIcon_DurinBerry, 	gItemIconPalette_DurinBerry,
-	gItemIcon_BelueBerry, 	gItemIconPalette_BelueBerry,
-	gItemIcon_LiechiBerry, 	gItemIconPalette_LiechiBerry,
-	gItemIcon_GanlonBerry, 	gItemIconPalette_GanlonBerry,
-	gItemIcon_SalacBerry, 	gItemIconPalette_SalacBerry,
-	gItemIcon_PetayaBerry, 	gItemIconPalette_PetayaBerry,
-	gItemIcon_ApicotBerry, 	gItemIconPalette_ApicotBerry,
-	gItemIcon_LansatBerry, 	gItemIconPalette_LansatBerry,
-	gItemIcon_StarfBerry, 	gItemIconPalette_StarfBerry,
-	gItemIcon_EnigmaBerry, 	gItemIconPalette_EnigmaBerry,
+    gItemIcon_CheriBerry,     gItemIconPalette_CheriBerry,
+    gItemIcon_ChestoBerry,    gItemIconPalette_ChestoBerry,
+    gItemIcon_PechaBerry,     gItemIconPalette_PechaBerry,
+    gItemIcon_RawstBerry,     gItemIconPalette_RawstBerry,
+    gItemIcon_AspearBerry,    gItemIconPalette_AspearBerry,
+    gItemIcon_LeppaBerry,     gItemIconPalette_LeppaBerry,
+    gItemIcon_OranBerry,      gItemIconPalette_OranBerry,
+    gItemIcon_PersimBerry,    gItemIconPalette_PersimBerry,
+    gItemIcon_LumBerry,       gItemIconPalette_LumBerry,
+    gItemIcon_SitrusBerry,    gItemIconPalette_SitrusBerry,
+    gItemIcon_FigyBerry,      gItemIconPalette_FigyBerry,
+    gItemIcon_WikiBerry,      gItemIconPalette_WikiBerry,
+    gItemIcon_MagoBerry,      gItemIconPalette_MagoBerry,
+    gItemIcon_AguavBerry,     gItemIconPalette_AguavBerry,
+    gItemIcon_IapapaBerry,    gItemIconPalette_IapapaBerry,
+    gItemIcon_RazzBerry,      gItemIconPalette_RazzBerry,
+    gItemIcon_BlukBerry,      gItemIconPalette_BlukBerry,
+    gItemIcon_NanabBerry,     gItemIconPalette_NanabBerry,
+    gItemIcon_WepearBerry,    gItemIconPalette_WepearBerry,
+    gItemIcon_PinapBerry,     gItemIconPalette_PinapBerry,
+    gItemIcon_PomegBerry,     gItemIconPalette_PomegBerry,
+    gItemIcon_KelpsyBerry,    gItemIconPalette_KelpsyBerry,
+    gItemIcon_QualotBerry,    gItemIconPalette_QualotBerry,
+    gItemIcon_HondewBerry,    gItemIconPalette_HondewBerry,
+    gItemIcon_GrepaBerry,     gItemIconPalette_GrepaBerry,
+    gItemIcon_TamatoBerry,    gItemIconPalette_TamatoBerry,
+    gItemIcon_CornnBerry,     gItemIconPalette_CornnBerry,
+    gItemIcon_MagostBerry,    gItemIconPalette_MagostBerry,
+    gItemIcon_RabutaBerry,    gItemIconPalette_RabutaBerry,
+    gItemIcon_NomelBerry,     gItemIconPalette_NomelBerry,
+    gItemIcon_SpelonBerry,    gItemIconPalette_SpelonBerry,
+    gItemIcon_PamtreBerry,    gItemIconPalette_PamtreBerry,
+    gItemIcon_WatmelBerry,    gItemIconPalette_WatmelBerry,
+    gItemIcon_DurinBerry,     gItemIconPalette_DurinBerry,
+    gItemIcon_BelueBerry,     gItemIconPalette_BelueBerry,
+    gItemIcon_LiechiBerry,    gItemIconPalette_LiechiBerry,
+    gItemIcon_GanlonBerry,    gItemIconPalette_GanlonBerry,
+    gItemIcon_SalacBerry,     gItemIconPalette_SalacBerry,
+    gItemIcon_PetayaBerry,    gItemIconPalette_PetayaBerry,
+    gItemIcon_ApicotBerry,    gItemIconPalette_ApicotBerry,
+    gItemIcon_LansatBerry,    gItemIconPalette_LansatBerry,
+    gItemIcon_StarfBerry,     gItemIconPalette_StarfBerry,
+    gItemIcon_EnigmaBerry,    gItemIconPalette_EnigmaBerry,
 // ????????
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
 // Hold items
-	gItemIcon_BrightPowder, gItemIconPalette_BrightPowder,
-	gItemIcon_InBattleHerb, gItemIconPalette_WhiteHerb,
-	gItemIcon_MachoBrace, 	gItemIconPalette_MachoBrace,
-	gItemIcon_ExpShare, 	gItemIconPalette_ExpShare,
-	gItemIcon_QuickClaw, 	gItemIconPalette_QuickClaw,
-	gItemIcon_SootheBell, 	gItemIconPalette_SootheBell,
-	gItemIcon_InBattleHerb,	gItemIconPalette_MentalHerb,
-	gItemIcon_ChoiceBand, 	gItemIconPalette_ChoiceBand,
-	gItemIcon_KingsRock, 	gItemIconPalette_KingsRock,
-	gItemIcon_SilverPowder,	gItemIconPalette_SilverPowder,
-	gItemIcon_AmuletCoin, 	gItemIconPalette_AmuletCoin,
-	gItemIcon_CleanseTag, 	gItemIconPalette_CleanseTag,
-	gItemIcon_SoulDew, 	gItemIconPalette_SoulDew,
-	gItemIcon_DeepSeaTooth,	gItemIconPalette_DeepSeaTooth,
-	gItemIcon_DeepSeaScale,	gItemIconPalette_DeepSeaScale,
-	gItemIcon_SmokeBall, 	gItemIconPalette_SmokeBall,
-	gItemIcon_Everstone, 	gItemIconPalette_Everstone,
-	gItemIcon_FocusBand, 	gItemIconPalette_FocusBand,
-	gItemIcon_LuckyEgg, 	gItemIconPalette_LuckyEgg,
-	gItemIcon_ScopeLens, 	gItemIconPalette_ScopeLens,
-	gItemIcon_MetalCoat, 	gItemIconPalette_MetalCoat,
-	gItemIcon_Leftovers, 	gItemIconPalette_Leftovers,
-	gItemIcon_DragonScale, 	gItemIconPalette_DragonScale,
-	gItemIcon_LightBall, 	gItemIconPalette_LightBall,
-	gItemIcon_SoftSand, 	gItemIconPalette_SoftSand,
-	gItemIcon_HardStone, 	gItemIconPalette_HardStone,
-	gItemIcon_MiracleSeed, 	gItemIconPalette_MiracleSeed,
-	gItemIcon_BlackGlasses,	gItemIconPalette_BlackTypeEnhancingItem,
-	gItemIcon_BlackBelt, 	gItemIconPalette_BlackTypeEnhancingItem,
-	gItemIcon_Magnet, 	gItemIconPalette_Magnet,
-	gItemIcon_MysticWater, 	gItemIconPalette_MysticWater,
-	gItemIcon_SharpBeak, 	gItemIconPalette_SharpBeak,
-	gItemIcon_PoisonBarb, 	gItemIconPalette_PoisonBarb,
-	gItemIcon_NeverMeltIce,	gItemIconPalette_NeverMeltIce,
-	gItemIcon_SpellTag, 	gItemIconPalette_SpellTag,
-	gItemIcon_TwistedSpoon,	gItemIconPalette_TwistedSpoon,
-	gItemIcon_Charcoal, 	gItemIconPalette_Charcoal,
-	gItemIcon_DragonFang, 	gItemIconPalette_DragonFang,
-	gItemIcon_SilkScarf, 	gItemIconPalette_SilkScarf,
-	gItemIcon_UpGrade, 	gItemIconPalette_UpGrade,
-	gItemIcon_ShellBell, 	gItemIconPalette_Shell,
-	gItemIcon_SeaIncense, 	gItemIconPalette_SeaIncense,
-	gItemIcon_LaxIncense, 	gItemIconPalette_LaxIncense,
-	gItemIcon_LuckyPunch, 	gItemIconPalette_LuckyPunch,
-	gItemIcon_MetalPowder, 	gItemIconPalette_MetalPowder,
-	gItemIcon_ThickClub, 	gItemIconPalette_ThickClub,
-	gItemIcon_Stick, 	gItemIconPalette_Stick,
+    gItemIcon_BrightPowder,    gItemIconPalette_BrightPowder,
+    gItemIcon_InBattleHerb,    gItemIconPalette_WhiteHerb,
+    gItemIcon_MachoBrace,      gItemIconPalette_MachoBrace,
+    gItemIcon_ExpShare,        gItemIconPalette_ExpShare,
+    gItemIcon_QuickClaw,       gItemIconPalette_QuickClaw,
+    gItemIcon_SootheBell,      gItemIconPalette_SootheBell,
+    gItemIcon_InBattleHerb,    gItemIconPalette_MentalHerb,
+    gItemIcon_ChoiceBand,      gItemIconPalette_ChoiceBand,
+    gItemIcon_KingsRock,       gItemIconPalette_KingsRock,
+    gItemIcon_SilverPowder,    gItemIconPalette_SilverPowder,
+    gItemIcon_AmuletCoin,      gItemIconPalette_AmuletCoin,
+    gItemIcon_CleanseTag,      gItemIconPalette_CleanseTag,
+    gItemIcon_SoulDew,         gItemIconPalette_SoulDew,
+    gItemIcon_DeepSeaTooth,    gItemIconPalette_DeepSeaTooth,
+    gItemIcon_DeepSeaScale,    gItemIconPalette_DeepSeaScale,
+    gItemIcon_SmokeBall,       gItemIconPalette_SmokeBall,
+    gItemIcon_Everstone,       gItemIconPalette_Everstone,
+    gItemIcon_FocusBand,       gItemIconPalette_FocusBand,
+    gItemIcon_LuckyEgg,        gItemIconPalette_LuckyEgg,
+    gItemIcon_ScopeLens,       gItemIconPalette_ScopeLens,
+    gItemIcon_MetalCoat,       gItemIconPalette_MetalCoat,
+    gItemIcon_Leftovers,       gItemIconPalette_Leftovers,
+    gItemIcon_DragonScale,     gItemIconPalette_DragonScale,
+    gItemIcon_LightBall,       gItemIconPalette_LightBall,
+    gItemIcon_SoftSand,        gItemIconPalette_SoftSand,
+    gItemIcon_HardStone,       gItemIconPalette_HardStone,
+    gItemIcon_MiracleSeed,     gItemIconPalette_MiracleSeed,
+    gItemIcon_BlackGlasses,    gItemIconPalette_BlackTypeEnhancingItem,
+    gItemIcon_BlackBelt,       gItemIconPalette_BlackTypeEnhancingItem,
+    gItemIcon_Magnet,          gItemIconPalette_Magnet,
+    gItemIcon_MysticWater,     gItemIconPalette_MysticWater,
+    gItemIcon_SharpBeak,       gItemIconPalette_SharpBeak,
+    gItemIcon_PoisonBarb,      gItemIconPalette_PoisonBarb,
+    gItemIcon_NeverMeltIce,    gItemIconPalette_NeverMeltIce,
+    gItemIcon_SpellTag,        gItemIconPalette_SpellTag,
+    gItemIcon_TwistedSpoon,    gItemIconPalette_TwistedSpoon,
+    gItemIcon_Charcoal,        gItemIconPalette_Charcoal,
+    gItemIcon_DragonFang,      gItemIconPalette_DragonFang,
+    gItemIcon_SilkScarf,       gItemIconPalette_SilkScarf,
+    gItemIcon_UpGrade,         gItemIconPalette_UpGrade,
+    gItemIcon_ShellBell,       gItemIconPalette_Shell,
+    gItemIcon_SeaIncense,      gItemIconPalette_SeaIncense,
+    gItemIcon_LaxIncense,      gItemIconPalette_LaxIncense,
+    gItemIcon_LuckyPunch,      gItemIconPalette_LuckyPunch,
+    gItemIcon_MetalPowder,     gItemIconPalette_MetalPowder,
+    gItemIcon_ThickClub,       gItemIconPalette_ThickClub,
+    gItemIcon_Stick,           gItemIconPalette_Stick,
 // ????????
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
 // Contest hold items
-	gItemIcon_Scarf, gItemIconPalette_RedScarf,
-	gItemIcon_Scarf, gItemIconPalette_BlueScarf,
-	gItemIcon_Scarf, gItemIconPalette_PinkScarf,
-	gItemIcon_Scarf, gItemIconPalette_GreenScarf,
-	gItemIcon_Scarf, gItemIconPalette_YellowScarf,
+    gItemIcon_Scarf, gItemIconPalette_RedScarf,
+    gItemIcon_Scarf, gItemIconPalette_BlueScarf,
+    gItemIcon_Scarf, gItemIconPalette_PinkScarf,
+    gItemIcon_Scarf, gItemIconPalette_GreenScarf,
+    gItemIcon_Scarf, gItemIconPalette_YellowScarf,
 // Key items
-	gItemIcon_MachBike, 		gItemIconPalette_MachBike,
-	gItemIcon_CoinCase, 		gItemIconPalette_CoinCase,
-	gItemIcon_Itemfinder, 		gItemIconPalette_Itemfinder,
-	gItemIcon_OldRod, 		gItemIconPalette_OldRod,
-	gItemIcon_GoodRod, 		gItemIconPalette_GoodRod,
-	gItemIcon_SuperRod, 		gItemIconPalette_SuperRod,
-	gItemIcon_SSTicket, 		gItemIconPalette_SSTicket,
-	gItemIcon_ContestPass, 		gItemIconPalette_ContestPass,
-	gItemIcon_QuestionMark, 	gItemIconPalette_QuestionMark,
-	gItemIcon_WailmerPail, 		gItemIconPalette_WailmerPail,
-	gItemIcon_DevonGoods, 		gItemIconPalette_DevonGoods,
-	gItemIcon_SootSack, 		gItemIconPalette_SootSack,
-	gItemIcon_BasementKey, 		gItemIconPalette_OldKey,
-	gItemIcon_AcroBike, 		gItemIconPalette_AcroBike,
-	gItemIcon_PokeblockCase, 	gItemIconPalette_PokeblockCase,
-	gItemIcon_Letter, 		gItemIconPalette_LavaCookieAndLetter,
-	gItemIcon_EonTicket, 		gItemIconPalette_EonTicket,
-	gItemIcon_Orb, 			gItemIconPalette_RedOrb,
-	gItemIcon_Orb, 			gItemIconPalette_BlueOrb,
-	gItemIcon_Scanner, 		gItemIconPalette_Scanner,
-	gItemIcon_GoGoggles, 		gItemIconPalette_GoGoggles,
-	gItemIcon_Meteorite, 		gItemIconPalette_Meteorite,
-	gItemIcon_Room1Key, 		gItemIconPalette_Key,
-	gItemIcon_Room2Key, 		gItemIconPalette_Key,
-	gItemIcon_Room4Key, 		gItemIconPalette_Key,
-	gItemIcon_Room6Key, 		gItemIconPalette_Key,
-	gItemIcon_StorageKey, 		gItemIconPalette_OldKey,
-	gItemIcon_RootFossil, 		gItemIconPalette_HoennFossil,
-	gItemIcon_ClawFossil, 		gItemIconPalette_HoennFossil,
-	gItemIcon_DevonScope, 		gItemIconPalette_DevonScope,
+    gItemIcon_MachBike,         gItemIconPalette_MachBike,
+    gItemIcon_CoinCase,         gItemIconPalette_CoinCase,
+    gItemIcon_Itemfinder,       gItemIconPalette_Itemfinder,
+    gItemIcon_OldRod,           gItemIconPalette_OldRod,
+    gItemIcon_GoodRod,          gItemIconPalette_GoodRod,
+    gItemIcon_SuperRod,         gItemIconPalette_SuperRod,
+    gItemIcon_SSTicket,         gItemIconPalette_SSTicket,
+    gItemIcon_ContestPass,      gItemIconPalette_ContestPass,
+    gItemIcon_QuestionMark,     gItemIconPalette_QuestionMark,
+    gItemIcon_WailmerPail,      gItemIconPalette_WailmerPail,
+    gItemIcon_DevonGoods,       gItemIconPalette_DevonGoods,
+    gItemIcon_SootSack,         gItemIconPalette_SootSack,
+    gItemIcon_BasementKey,      gItemIconPalette_OldKey,
+    gItemIcon_AcroBike,         gItemIconPalette_AcroBike,
+    gItemIcon_PokeblockCase,    gItemIconPalette_PokeblockCase,
+    gItemIcon_Letter,           gItemIconPalette_LavaCookieAndLetter,
+    gItemIcon_EonTicket,        gItemIconPalette_EonTicket,
+    gItemIcon_Orb,              gItemIconPalette_RedOrb,
+    gItemIcon_Orb,              gItemIconPalette_BlueOrb,
+    gItemIcon_Scanner,          gItemIconPalette_Scanner,
+    gItemIcon_GoGoggles,        gItemIconPalette_GoGoggles,
+    gItemIcon_Meteorite,        gItemIconPalette_Meteorite,
+    gItemIcon_Room1Key,         gItemIconPalette_Key,
+    gItemIcon_Room2Key,         gItemIconPalette_Key,
+    gItemIcon_Room4Key,         gItemIconPalette_Key,
+    gItemIcon_Room6Key,         gItemIconPalette_Key,
+    gItemIcon_StorageKey,       gItemIconPalette_OldKey,
+    gItemIcon_RootFossil,       gItemIconPalette_HoennFossil,
+    gItemIcon_ClawFossil,       gItemIconPalette_HoennFossil,
+    gItemIcon_DevonScope,       gItemIconPalette_DevonScope,
 // TMs/HMs
-	gItemIcon_TM, gItemIconPalette_FightingTMHM,	// TM01
-	gItemIcon_TM, gItemIconPalette_DragonTMHM,	// TM02
-	gItemIcon_TM, gItemIconPalette_WaterTMHM,	// TM03
-	gItemIcon_TM, gItemIconPalette_PsychicTMHM,	// TM04
-	gItemIcon_TM, gItemIconPalette_NormalTMHM,	// TM05
-	gItemIcon_TM, gItemIconPalette_PoisonTMHM,	// TM06
-	gItemIcon_TM, gItemIconPalette_IceTMHM,		// TM07
-	gItemIcon_TM, gItemIconPalette_FightingTMHM,	// TM08
-	gItemIcon_TM, gItemIconPalette_GrassTMHM,	// TM09
-	gItemIcon_TM, gItemIconPalette_NormalTMHM,	// TM10
-	gItemIcon_TM, gItemIconPalette_FireTMHM,	// TM11
-	gItemIcon_TM, gItemIconPalette_DarkTMHM,	// TM12
-	gItemIcon_TM, gItemIconPalette_IceTMHM,		// TM13
-	gItemIcon_TM, gItemIconPalette_IceTMHM,		// TM14
-	gItemIcon_TM, gItemIconPalette_NormalTMHM,	// TM15
-	gItemIcon_TM, gItemIconPalette_PsychicTMHM,	// TM16
-	gItemIcon_TM, gItemIconPalette_NormalTMHM,	// TM17
-	gItemIcon_TM, gItemIconPalette_WaterTMHM,	// TM18
-	gItemIcon_TM, gItemIconPalette_GrassTMHM,	// TM19
-	gItemIcon_TM, gItemIconPalette_NormalTMHM,	// TM20
-	gItemIcon_TM, gItemIconPalette_NormalTMHM,	// TM21
-	gItemIcon_TM, gItemIconPalette_GrassTMHM,	// TM22
-	gItemIcon_TM, gItemIconPalette_SteelTMHM,	// TM23
-	gItemIcon_TM, gItemIconPalette_ElectricTMHM,	// TM24
-	gItemIcon_TM, gItemIconPalette_ElectricTMHM,	// TM25
-	gItemIcon_TM, gItemIconPalette_GroundTMHM,	// TM26
-	gItemIcon_TM, gItemIconPalette_NormalTMHM,	// TM27
-	gItemIcon_TM, gItemIconPalette_GroundTMHM,	// TM28
-	gItemIcon_TM, gItemIconPalette_PsychicTMHM,	// TM29
-	gItemIcon_TM, gItemIconPalette_GhostTMHM,	// TM30
-	gItemIcon_TM, gItemIconPalette_FightingTMHM,	// TM31
-	gItemIcon_TM, gItemIconPalette_NormalTMHM,	// TM32
-	gItemIcon_TM, gItemIconPalette_PsychicTMHM,	// TM33
-	gItemIcon_TM, gItemIconPalette_ElectricTMHM,	// TM34
-	gItemIcon_TM, gItemIconPalette_FireTMHM,	// TM35
-	gItemIcon_TM, gItemIconPalette_PoisonTMHM,	// TM36
-	gItemIcon_TM, gItemIconPalette_RockTMHM,	// TM37
-	gItemIcon_TM, gItemIconPalette_FireTMHM,	// TM38
-	gItemIcon_TM, gItemIconPalette_RockTMHM,	// TM39
-	gItemIcon_TM, gItemIconPalette_FlyingTMHM,	// TM40
-	gItemIcon_TM, gItemIconPalette_DarkTMHM,	// TM41
-	gItemIcon_TM, gItemIconPalette_NormalTMHM,	// TM42
-	gItemIcon_TM, gItemIconPalette_NormalTMHM,	// TM43
-	gItemIcon_TM, gItemIconPalette_PsychicTMHM,	// TM44
-	gItemIcon_TM, gItemIconPalette_NormalTMHM,	// TM45
-	gItemIcon_TM, gItemIconPalette_DarkTMHM,	// TM46
-	gItemIcon_TM, gItemIconPalette_SteelTMHM,	// TM47
-	gItemIcon_TM, gItemIconPalette_PsychicTMHM,	// TM48
-	gItemIcon_TM, gItemIconPalette_DarkTMHM,	// TM49
-	gItemIcon_TM, gItemIconPalette_FireTMHM,	// TM50
-	gItemIcon_HM, gItemIconPalette_NormalTMHM,	// HM01
-	gItemIcon_HM, gItemIconPalette_FlyingTMHM,	// HM02
-	gItemIcon_HM, gItemIconPalette_WaterTMHM,	// HM03
-	gItemIcon_HM, gItemIconPalette_NormalTMHM,	// HM04
-	gItemIcon_HM, gItemIconPalette_NormalTMHM,	// HM05
-	gItemIcon_HM, gItemIconPalette_FightingTMHM,	// HM06
-	gItemIcon_HM, gItemIconPalette_WaterTMHM,	// HM07
-	gItemIcon_HM, gItemIconPalette_WaterTMHM,	// HM08
+    gItemIcon_TM, gItemIconPalette_FightingTMHM,    // TM01
+    gItemIcon_TM, gItemIconPalette_DragonTMHM,      // TM02
+    gItemIcon_TM, gItemIconPalette_WaterTMHM,       // TM03
+    gItemIcon_TM, gItemIconPalette_PsychicTMHM,     // TM04
+    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM05
+    gItemIcon_TM, gItemIconPalette_PoisonTMHM,      // TM06
+    gItemIcon_TM, gItemIconPalette_IceTMHM,         // TM07
+    gItemIcon_TM, gItemIconPalette_FightingTMHM,    // TM08
+    gItemIcon_TM, gItemIconPalette_GrassTMHM,       // TM09
+    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM10
+    gItemIcon_TM, gItemIconPalette_FireTMHM,        // TM11
+    gItemIcon_TM, gItemIconPalette_DarkTMHM,        // TM12
+    gItemIcon_TM, gItemIconPalette_IceTMHM,         // TM13
+    gItemIcon_TM, gItemIconPalette_IceTMHM,         // TM14
+    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM15
+    gItemIcon_TM, gItemIconPalette_PsychicTMHM,     // TM16
+    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM17
+    gItemIcon_TM, gItemIconPalette_WaterTMHM,       // TM18
+    gItemIcon_TM, gItemIconPalette_GrassTMHM,       // TM19
+    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM20
+    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM21
+    gItemIcon_TM, gItemIconPalette_GrassTMHM,       // TM22
+    gItemIcon_TM, gItemIconPalette_SteelTMHM,       // TM23
+    gItemIcon_TM, gItemIconPalette_ElectricTMHM,    // TM24
+    gItemIcon_TM, gItemIconPalette_ElectricTMHM,    // TM25
+    gItemIcon_TM, gItemIconPalette_GroundTMHM,      // TM26
+    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM27
+    gItemIcon_TM, gItemIconPalette_GroundTMHM,      // TM28
+    gItemIcon_TM, gItemIconPalette_PsychicTMHM,     // TM29
+    gItemIcon_TM, gItemIconPalette_GhostTMHM,       // TM30
+    gItemIcon_TM, gItemIconPalette_FightingTMHM,    // TM31
+    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM32
+    gItemIcon_TM, gItemIconPalette_PsychicTMHM,     // TM33
+    gItemIcon_TM, gItemIconPalette_ElectricTMHM,    // TM34
+    gItemIcon_TM, gItemIconPalette_FireTMHM,        // TM35
+    gItemIcon_TM, gItemIconPalette_PoisonTMHM,      // TM36
+    gItemIcon_TM, gItemIconPalette_RockTMHM,        // TM37
+    gItemIcon_TM, gItemIconPalette_FireTMHM,        // TM38
+    gItemIcon_TM, gItemIconPalette_RockTMHM,        // TM39
+    gItemIcon_TM, gItemIconPalette_FlyingTMHM,      // TM40
+    gItemIcon_TM, gItemIconPalette_DarkTMHM,        // TM41
+    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM42
+    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM43
+    gItemIcon_TM, gItemIconPalette_PsychicTMHM,     // TM44
+    gItemIcon_TM, gItemIconPalette_NormalTMHM,      // TM45
+    gItemIcon_TM, gItemIconPalette_DarkTMHM,        // TM46
+    gItemIcon_TM, gItemIconPalette_SteelTMHM,       // TM47
+    gItemIcon_TM, gItemIconPalette_PsychicTMHM,     // TM48
+    gItemIcon_TM, gItemIconPalette_DarkTMHM,        // TM49
+    gItemIcon_TM, gItemIconPalette_FireTMHM,        // TM50
+    gItemIcon_HM, gItemIconPalette_NormalTMHM,      // HM01
+    gItemIcon_HM, gItemIconPalette_FlyingTMHM,      // HM02
+    gItemIcon_HM, gItemIconPalette_WaterTMHM,       // HM03
+    gItemIcon_HM, gItemIconPalette_NormalTMHM,      // HM04
+    gItemIcon_HM, gItemIconPalette_NormalTMHM,      // HM05
+    gItemIcon_HM, gItemIconPalette_FightingTMHM,    // HM06
+    gItemIcon_HM, gItemIconPalette_WaterTMHM,       // HM07
+    gItemIcon_HM, gItemIconPalette_WaterTMHM,       // HM08
 // ????????
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
-	gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
+    gItemIcon_QuestionMark, gItemIconPalette_QuestionMark,
 // FireRed/LeafGreen key items
-	gItemIcon_OaksParcel, 	gItemIconPalette_OaksParcel,
-	gItemIcon_PokeFlute, 	gItemIconPalette_PokeFlute,
-	gItemIcon_SecretKey, 	gItemIconPalette_SecretKey,
-	gItemIcon_BikeVoucher, 	gItemIconPalette_BikeVoucher,
-	gItemIcon_GoldTeeth, 	gItemIconPalette_GoldTeeth,
-	gItemIcon_OldAmber, 	gItemIconPalette_OldAmber,
-	gItemIcon_CardKey, 	gItemIconPalette_CardKey,
-	gItemIcon_LiftKey, 	gItemIconPalette_Key,
-	gItemIcon_HelixFossil, 	gItemIconPalette_KantoFossil,
-	gItemIcon_DomeFossil, 	gItemIconPalette_KantoFossil,
-	gItemIcon_SilphScope, 	gItemIconPalette_SilphScope,
-	gItemIcon_Bicycle, 	gItemIconPalette_Bicycle,
-	gItemIcon_TownMap, 	gItemIconPalette_TownMap,
-	gItemIcon_VSSeeker, 	gItemIconPalette_VSSeeker,
-	gItemIcon_FameChecker, 	gItemIconPalette_FameChecker,
-	gItemIcon_TMCase, 	gItemIconPalette_TMCase,
-	gItemIcon_BerryPouch, 	gItemIconPalette_BerryPouch,
-	gItemIcon_TeachyTV, 	gItemIconPalette_TeachyTV,
-	gItemIcon_TriPass, 	gItemIconPalette_TriPass,
-	gItemIcon_RainbowPass, 	gItemIconPalette_RainbowPass,
-	gItemIcon_Tea, 		gItemIconPalette_Tea,
-	gItemIcon_MysticTicket,	gItemIconPalette_MysticTicket,
-	gItemIcon_AuroraTicket,	gItemIconPalette_AuroraTicket,
-	gItemIcon_PowderJar, 	gItemIconPalette_PowderJar,
-	gItemIcon_Gem, 		gItemIconPalette_Ruby,
-	gItemIcon_Gem, 		gItemIconPalette_Sapphire,
+    gItemIcon_OaksParcel,      gItemIconPalette_OaksParcel,
+    gItemIcon_PokeFlute,       gItemIconPalette_PokeFlute,
+    gItemIcon_SecretKey,       gItemIconPalette_SecretKey,
+    gItemIcon_BikeVoucher,     gItemIconPalette_BikeVoucher,
+    gItemIcon_GoldTeeth,       gItemIconPalette_GoldTeeth,
+    gItemIcon_OldAmber,        gItemIconPalette_OldAmber,
+    gItemIcon_CardKey,         gItemIconPalette_CardKey,
+    gItemIcon_LiftKey,         gItemIconPalette_Key,
+    gItemIcon_HelixFossil,     gItemIconPalette_KantoFossil,
+    gItemIcon_DomeFossil,      gItemIconPalette_KantoFossil,
+    gItemIcon_SilphScope,      gItemIconPalette_SilphScope,
+    gItemIcon_Bicycle,         gItemIconPalette_Bicycle,
+    gItemIcon_TownMap,         gItemIconPalette_TownMap,
+    gItemIcon_VSSeeker,        gItemIconPalette_VSSeeker,
+    gItemIcon_FameChecker,     gItemIconPalette_FameChecker,
+    gItemIcon_TMCase,          gItemIconPalette_TMCase,
+    gItemIcon_BerryPouch,      gItemIconPalette_BerryPouch,
+    gItemIcon_TeachyTV,        gItemIconPalette_TeachyTV,
+    gItemIcon_TriPass,         gItemIconPalette_TriPass,
+    gItemIcon_RainbowPass,     gItemIconPalette_RainbowPass,
+    gItemIcon_Tea,             gItemIconPalette_Tea,
+    gItemIcon_MysticTicket,    gItemIconPalette_MysticTicket,
+    gItemIcon_AuroraTicket,    gItemIconPalette_AuroraTicket,
+    gItemIcon_PowderJar,       gItemIconPalette_PowderJar,
+    gItemIcon_Gem,             gItemIconPalette_Ruby,
+    gItemIcon_Gem,             gItemIconPalette_Sapphire,
 // Emerald-only key items
-	gItemIcon_MagmaEmblem, 	gItemIconPalette_MagmaEmblem,
-	gItemIcon_OldSeaMap, 	gItemIconPalette_OldSeaMap,
+    gItemIcon_MagmaEmblem,     gItemIconPalette_MagmaEmblem,
+    gItemIcon_OldSeaMap,       gItemIconPalette_OldSeaMap,
 // Return to field arrow
-	gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow,
+    gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow,
 };
 #endif // GUARD_DATA_ITEM_ICON_TABLE_H
diff --git a/include/graphics.h b/include/graphics.h
index 1313ddc3a..3feed6d08 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2713,6 +2713,501 @@ extern const u8 gRaySceneHushBg_Pal[];
 extern const u8 gRaySceneHushBg_Gfx[];
 extern const u8 gRaySceneHushRing_Gfx[];
 
+// Item icons
+extern const u8 gItemIcon_QuestionMark[];
+extern const u8 gItemIconPalette_QuestionMark[];
+// Pokeballs
+extern const u8 gItemIcon_MasterBall[]; 	
+extern const u8 gItemIconPalette_MasterBall[];
+extern const u8 gItemIcon_UltraBall[];
+extern const u8 gItemIconPalette_UltraBall[];
+extern const u8 gItemIcon_GreatBall[];
+extern const u8 gItemIconPalette_GreatBall[];
+extern const u8 gItemIcon_PokeBall[];
+extern const u8 gItemIconPalette_PokeBall[];
+extern const u8 gItemIcon_SafariBall[];
+extern const u8 gItemIconPalette_SafariBall[];
+extern const u8 gItemIcon_NetBall[];
+extern const u8 gItemIconPalette_NetBall[];
+extern const u8 gItemIcon_DiveBall[];
+extern const u8 gItemIconPalette_DiveBall[];
+extern const u8 gItemIcon_NestBall[];
+extern const u8 gItemIconPalette_NestBall[];
+extern const u8 gItemIcon_RepeatBall[];
+extern const u8 gItemIconPalette_RepeatBall[];
+extern const u8 gItemIcon_TimerBall[];
+extern const u8 gItemIcon_LuxuryBall[];
+extern const u8 gItemIconPalette_LuxuryBall[];
+extern const u8 gItemIcon_PremierBall[];
+// Medicine
+extern const u8 gItemIcon_Potion[];
+extern const u8 gItemIconPalette_Potion[];
+extern const u8 gItemIcon_Antidote[];
+extern const u8 gItemIconPalette_Antidote[];
+extern const u8 gItemIcon_StatusHeal[];
+extern const u8 gItemIconPalette_BurnHeal[];
+extern const u8 gItemIconPalette_IceHeal[];
+extern const u8 gItemIconPalette_Awakening[];
+extern const u8 gItemIconPalette_ParalyzeHeal[];
+extern const u8 gItemIcon_LargePotion[];
+extern const u8 gItemIconPalette_FullRestore[];
+extern const u8 gItemIconPalette_MaxPotion[];
+extern const u8 gItemIconPalette_HyperPotion[];
+extern const u8 gItemIconPalette_SuperPotion[];
+extern const u8 gItemIcon_FullHeal[];
+extern const u8 gItemIconPalette_FullHeal[];
+extern const u8 gItemIcon_Revive[];
+extern const u8 gItemIconPalette_Revive[];
+extern const u8 gItemIcon_MaxRevive[];
+extern const u8 gItemIcon_FreshWater[];
+extern const u8 gItemIconPalette_FreshWater[];
+extern const u8 gItemIcon_SodaPop[];
+extern const u8 gItemIconPalette_SodaPop[];
+extern const u8 gItemIcon_Lemonade[];
+extern const u8 gItemIconPalette_Lemonade[];
+extern const u8 gItemIcon_MoomooMilk[];
+extern const u8 gItemIconPalette_MoomooMilk[];
+extern const u8 gItemIcon_Powder[];
+extern const u8 gItemIconPalette_EnergyPowder[];
+extern const u8 gItemIcon_EnergyRoot[];
+extern const u8 gItemIconPalette_EnergyRoot[];
+extern const u8 gItemIconPalette_HealPowder[];
+extern const u8 gItemIcon_RevivalHerb[];
+extern const u8 gItemIconPalette_RevivalHerb[];
+extern const u8 gItemIcon_Ether[];
+extern const u8 gItemIconPalette_Ether[];
+extern const u8 gItemIconPalette_MaxEther[];
+extern const u8 gItemIconPalette_Elixir[];
+extern const u8 gItemIconPalette_MaxElixir[];
+extern const u8 gItemIcon_LavaCookie[];
+extern const u8 gItemIconPalette_LavaCookieAndLetter[];
+extern const u8 gItemIcon_Flute[];
+extern const u8 gItemIconPalette_BlueFlute[];
+extern const u8 gItemIconPalette_YellowFlute[];
+extern const u8 gItemIconPalette_RedFlute[];
+extern const u8 gItemIconPalette_BlackFlute[];
+extern const u8 gItemIconPalette_WhiteFlute[];
+extern const u8 gItemIcon_BerryJuice[];
+extern const u8 gItemIconPalette_BerryJuice[];
+extern const u8 gItemIcon_SacredAsh[];
+extern const u8 gItemIconPalette_SacredAsh[];
+// Collectibles
+extern const u8 gItemIconPalette_ShoalSalt[];
+extern const u8 gItemIcon_ShoalShell[];
+extern const u8 gItemIconPalette_Shell[];
+extern const u8 gItemIcon_Shard[];
+extern const u8 gItemIconPalette_RedShard[];
+extern const u8 gItemIconPalette_BlueShard[];
+extern const u8 gItemIconPalette_YellowShard[];
+extern const u8 gItemIconPalette_GreenShard[];
+// Vitamins
+extern const u8 gItemIcon_HPUp[];
+extern const u8 gItemIconPalette_HPUp[];
+extern const u8 gItemIcon_Vitamin[];
+extern const u8 gItemIconPalette_Protein[];
+extern const u8 gItemIconPalette_Iron[];
+extern const u8 gItemIconPalette_Carbos[];
+extern const u8 gItemIconPalette_Calcium[];
+extern const u8 gItemIcon_RareCandy[];
+extern const u8 gItemIconPalette_RareCandy[];
+extern const u8 gItemIcon_PPUp[];
+extern const u8 gItemIconPalette_PPUp[];
+extern const u8 gItemIconPalette_Zinc[];
+extern const u8 gItemIcon_PPMax[];
+extern const u8 gItemIconPalette_PPMax[];
+// Battle items
+extern const u8 gItemIcon_BattleStatItem[];
+extern const u8 gItemIconPalette_GuardSpec[];
+extern const u8 gItemIconPalette_DireHit[];
+extern const u8 gItemIconPalette_XAttack[];
+extern const u8 gItemIconPalette_XDefend[];
+extern const u8 gItemIconPalette_XSpeed[];
+extern const u8 gItemIconPalette_XAccuracy[];
+extern const u8 gItemIconPalette_XSpecial[];
+extern const u8 gItemIcon_PokeDoll[];
+extern const u8 gItemIconPalette_PokeDoll[];
+extern const u8 gItemIcon_FluffyTail[];
+extern const u8 gItemIconPalette_FluffyTail[];
+// Field items
+extern const u8 gItemIcon_Repel[];
+extern const u8 gItemIconPalette_SuperRepel[];
+extern const u8 gItemIconPalette_MaxRepel[];
+extern const u8 gItemIcon_EscapeRope[];
+extern const u8 gItemIconPalette_EscapeRope[];
+extern const u8 gItemIcon_Repel[];
+extern const u8 gItemIconPalette_Repel[];
+// Evolution stones
+extern const u8 gItemIcon_SunStone[];
+extern const u8 gItemIconPalette_SunStone[];
+extern const u8 gItemIcon_MoonStone[];
+extern const u8 gItemIconPalette_MoonStone[];
+extern const u8 gItemIcon_FireStone[];
+extern const u8 gItemIconPalette_FireStone[];
+extern const u8 gItemIcon_ThunderStone[];
+extern const u8 gItemIconPalette_ThunderStone[];
+extern const u8 gItemIcon_WaterStone[];
+extern const u8 gItemIconPalette_WaterStone[];
+extern const u8 gItemIcon_LeafStone[];
+extern const u8 gItemIconPalette_LeafStone[];
+// Valuables
+extern const u8 gItemIcon_TinyMushroom[];
+extern const u8 gItemIconPalette_Mushroom[];
+extern const u8 gItemIcon_BigMushroom[];
+extern const u8 gItemIcon_Pearl[];
+extern const u8 gItemIconPalette_Pearl[];
+extern const u8 gItemIcon_BigPearl[];
+extern const u8 gItemIcon_Stardust[];
+extern const u8 gItemIconPalette_Star[];
+extern const u8 gItemIcon_StarPiece[];
+extern const u8 gItemIcon_Nugget[];
+extern const u8 gItemIconPalette_Nugget[];
+extern const u8 gItemIcon_HeartScale[];
+extern const u8 gItemIconPalette_HeartScale[];
+// Mail
+extern const u8 gItemIcon_OrangeMail[];
+extern const u8 gItemIconPalette_OrangeMail[];
+extern const u8 gItemIcon_HarborMail[];
+extern const u8 gItemIconPalette_HarborMail[];
+extern const u8 gItemIcon_GlitterMail[];
+extern const u8 gItemIconPalette_GlitterMail[];
+extern const u8 gItemIcon_MechMail[];
+extern const u8 gItemIconPalette_MechMail[];
+extern const u8 gItemIcon_WoodMail[];
+extern const u8 gItemIconPalette_WoodMail[];
+extern const u8 gItemIcon_WaveMail[];
+extern const u8 gItemIconPalette_WaveMail[];
+extern const u8 gItemIcon_BeadMail[];
+extern const u8 gItemIconPalette_BeadMail[];
+extern const u8 gItemIcon_ShadowMail[];
+extern const u8 gItemIconPalette_ShadowMail[];
+extern const u8 gItemIcon_TropicMail[];
+extern const u8 gItemIconPalette_TropicMail[];
+extern const u8 gItemIcon_DreamMail[];
+extern const u8 gItemIconPalette_DreamMail[];
+extern const u8 gItemIcon_FabMail[];
+extern const u8 gItemIconPalette_FabMail[];
+extern const u8 gItemIcon_RetroMail[];
+extern const u8 gItemIconPalette_RetroMail[];
+// Berries
+extern const u8 gItemIcon_CheriBerry[];
+extern const u8 gItemIconPalette_CheriBerry[];
+extern const u8 gItemIcon_ChestoBerry[];
+extern const u8 gItemIconPalette_ChestoBerry[];
+extern const u8 gItemIcon_PechaBerry[];
+extern const u8 gItemIconPalette_PechaBerry[];
+extern const u8 gItemIcon_RawstBerry[];
+extern const u8 gItemIconPalette_RawstBerry[];
+extern const u8 gItemIcon_AspearBerry[];
+extern const u8 gItemIconPalette_AspearBerry[];
+extern const u8 gItemIcon_LeppaBerry[];
+extern const u8 gItemIconPalette_LeppaBerry[];
+extern const u8 gItemIcon_OranBerry[];
+extern const u8 gItemIconPalette_OranBerry[];
+extern const u8 gItemIcon_PersimBerry[];
+extern const u8 gItemIconPalette_PersimBerry[];
+extern const u8 gItemIcon_LumBerry[];
+extern const u8 gItemIconPalette_LumBerry[];
+extern const u8 gItemIcon_SitrusBerry[];
+extern const u8 gItemIconPalette_SitrusBerry[];
+extern const u8 gItemIcon_FigyBerry[];
+extern const u8 gItemIconPalette_FigyBerry[];
+extern const u8 gItemIcon_WikiBerry[];
+extern const u8 gItemIconPalette_WikiBerry[];
+extern const u8 gItemIcon_MagoBerry[];
+extern const u8 gItemIconPalette_MagoBerry[];
+extern const u8 gItemIcon_AguavBerry[];
+extern const u8 gItemIconPalette_AguavBerry[];
+extern const u8 gItemIcon_IapapaBerry[];
+extern const u8 gItemIconPalette_IapapaBerry[];
+extern const u8 gItemIcon_RazzBerry[];
+extern const u8 gItemIconPalette_RazzBerry[];
+extern const u8 gItemIcon_BlukBerry[];
+extern const u8 gItemIconPalette_BlukBerry[];
+extern const u8 gItemIcon_NanabBerry[];
+extern const u8 gItemIconPalette_NanabBerry[];
+extern const u8 gItemIcon_WepearBerry[];
+extern const u8 gItemIconPalette_WepearBerry[];
+extern const u8 gItemIcon_PinapBerry[];
+extern const u8 gItemIconPalette_PinapBerry[];
+extern const u8 gItemIcon_PomegBerry[];
+extern const u8 gItemIconPalette_PomegBerry[];
+extern const u8 gItemIcon_KelpsyBerry[];
+extern const u8 gItemIconPalette_KelpsyBerry[];
+extern const u8 gItemIcon_QualotBerry[];
+extern const u8 gItemIconPalette_QualotBerry[];
+extern const u8 gItemIcon_HondewBerry[];
+extern const u8 gItemIconPalette_HondewBerry[];
+extern const u8 gItemIcon_GrepaBerry[];
+extern const u8 gItemIconPalette_GrepaBerry[];
+extern const u8 gItemIcon_TamatoBerry[];
+extern const u8 gItemIconPalette_TamatoBerry[];
+extern const u8 gItemIcon_CornnBerry[];
+extern const u8 gItemIconPalette_CornnBerry[];
+extern const u8 gItemIcon_MagostBerry[];
+extern const u8 gItemIconPalette_MagostBerry[];
+extern const u8 gItemIcon_RabutaBerry[];
+extern const u8 gItemIconPalette_RabutaBerry[];
+extern const u8 gItemIcon_NomelBerry[];
+extern const u8 gItemIconPalette_NomelBerry[];
+extern const u8 gItemIcon_SpelonBerry[];
+extern const u8 gItemIconPalette_SpelonBerry[];
+extern const u8 gItemIcon_PamtreBerry[];
+extern const u8 gItemIconPalette_PamtreBerry[];
+extern const u8 gItemIcon_WatmelBerry[];
+extern const u8 gItemIconPalette_WatmelBerry[];
+extern const u8 gItemIcon_DurinBerry[];
+extern const u8 gItemIconPalette_DurinBerry[];
+extern const u8 gItemIcon_BelueBerry[];
+extern const u8 gItemIconPalette_BelueBerry[];
+extern const u8 gItemIcon_LiechiBerry[];
+extern const u8 gItemIconPalette_LiechiBerry[];
+extern const u8 gItemIcon_GanlonBerry[];
+extern const u8 gItemIconPalette_GanlonBerry[];
+extern const u8 gItemIcon_SalacBerry[];
+extern const u8 gItemIconPalette_SalacBerry[];
+extern const u8 gItemIcon_PetayaBerry[];
+extern const u8 gItemIconPalette_PetayaBerry[];
+extern const u8 gItemIcon_ApicotBerry[];
+extern const u8 gItemIconPalette_ApicotBerry[];
+extern const u8 gItemIcon_LansatBerry[];
+extern const u8 gItemIconPalette_LansatBerry[];
+extern const u8 gItemIcon_StarfBerry[];
+extern const u8 gItemIconPalette_StarfBerry[];
+extern const u8 gItemIcon_EnigmaBerry[];
+extern const u8 gItemIconPalette_EnigmaBerry[];
+// Hold items
+extern const u8 gItemIcon_BrightPowder[];
+extern const u8 gItemIconPalette_BrightPowder[];
+extern const u8 gItemIcon_InBattleHerb[];
+extern const u8 gItemIconPalette_WhiteHerb[];
+extern const u8 gItemIcon_MachoBrace[];
+extern const u8 gItemIconPalette_MachoBrace[];
+extern const u8 gItemIcon_ExpShare[];
+extern const u8 gItemIconPalette_ExpShare[];
+extern const u8 gItemIcon_QuickClaw[];
+extern const u8 gItemIconPalette_QuickClaw[];
+extern const u8 gItemIcon_SootheBell[];
+extern const u8 gItemIconPalette_SootheBell[];
+extern const u8 gItemIcon_InBattleHerb[];
+extern const u8 gItemIconPalette_MentalHerb[];
+extern const u8 gItemIcon_ChoiceBand[];
+extern const u8 gItemIconPalette_ChoiceBand[];
+extern const u8 gItemIcon_KingsRock[];
+extern const u8 gItemIconPalette_KingsRock[];
+extern const u8 gItemIcon_SilverPowder[];
+extern const u8 gItemIconPalette_SilverPowder[];
+extern const u8 gItemIcon_AmuletCoin[];
+extern const u8 gItemIconPalette_AmuletCoin[];
+extern const u8 gItemIcon_CleanseTag[];
+extern const u8 gItemIconPalette_CleanseTag[];
+extern const u8 gItemIcon_SoulDew[];
+extern const u8 gItemIconPalette_SoulDew[];
+extern const u8 gItemIcon_DeepSeaTooth[];
+extern const u8 gItemIconPalette_DeepSeaTooth[];
+extern const u8 gItemIcon_DeepSeaScale[];
+extern const u8 gItemIconPalette_DeepSeaScale[];
+extern const u8 gItemIcon_SmokeBall[];
+extern const u8 gItemIconPalette_SmokeBall[];
+extern const u8 gItemIcon_Everstone[];
+extern const u8 gItemIconPalette_Everstone[];
+extern const u8 gItemIcon_FocusBand[];
+extern const u8 gItemIconPalette_FocusBand[];
+extern const u8 gItemIcon_LuckyEgg[];
+extern const u8 gItemIconPalette_LuckyEgg[];
+extern const u8 gItemIcon_ScopeLens[];
+extern const u8 gItemIconPalette_ScopeLens[];
+extern const u8 gItemIcon_MetalCoat[];
+extern const u8 gItemIconPalette_MetalCoat[];
+extern const u8 gItemIcon_Leftovers[];
+extern const u8 gItemIconPalette_Leftovers[];
+extern const u8 gItemIcon_DragonScale[];
+extern const u8 gItemIconPalette_DragonScale[];
+extern const u8 gItemIcon_LightBall[];
+extern const u8 gItemIconPalette_LightBall[];
+extern const u8 gItemIcon_SoftSand[];
+extern const u8 gItemIconPalette_SoftSand[];
+extern const u8 gItemIcon_HardStone[];
+extern const u8 gItemIconPalette_HardStone[];
+extern const u8 gItemIcon_MiracleSeed[];
+extern const u8 gItemIconPalette_MiracleSeed[];
+extern const u8 gItemIcon_BlackGlasses[];
+extern const u8 gItemIconPalette_BlackTypeEnhancingItem[];
+extern const u8 gItemIcon_BlackBelt[];
+extern const u8 gItemIconPalette_BlackTypeEnhancingItem[];
+extern const u8 gItemIcon_Magnet[];
+extern const u8 gItemIconPalette_Magnet[];
+extern const u8 gItemIcon_MysticWater[];
+extern const u8 gItemIconPalette_MysticWater[];
+extern const u8 gItemIcon_SharpBeak[];
+extern const u8 gItemIconPalette_SharpBeak[];
+extern const u8 gItemIcon_PoisonBarb[];
+extern const u8 gItemIconPalette_PoisonBarb[];
+extern const u8 gItemIcon_NeverMeltIce[];
+extern const u8 gItemIconPalette_NeverMeltIce[];
+extern const u8 gItemIcon_SpellTag[];
+extern const u8 gItemIconPalette_SpellTag[];
+extern const u8 gItemIcon_TwistedSpoon[];
+extern const u8 gItemIconPalette_TwistedSpoon[];
+extern const u8 gItemIcon_Charcoal[];
+extern const u8 gItemIconPalette_Charcoal[];
+extern const u8 gItemIcon_DragonFang[];
+extern const u8 gItemIconPalette_DragonFang[];
+extern const u8 gItemIcon_SilkScarf[];
+extern const u8 gItemIconPalette_SilkScarf[];
+extern const u8 gItemIcon_UpGrade[];
+extern const u8 gItemIconPalette_UpGrade[];
+extern const u8 gItemIcon_ShellBell[];
+extern const u8 gItemIconPalette_Shell[];
+extern const u8 gItemIcon_SeaIncense[];
+extern const u8 gItemIconPalette_SeaIncense[];
+extern const u8 gItemIcon_LaxIncense[];
+extern const u8 gItemIconPalette_LaxIncense[];
+extern const u8 gItemIcon_LuckyPunch[];
+extern const u8 gItemIconPalette_LuckyPunch[];
+extern const u8 gItemIcon_MetalPowder[];
+extern const u8 gItemIconPalette_MetalPowder[];
+extern const u8 gItemIcon_ThickClub[];
+extern const u8 gItemIconPalette_ThickClub[];
+extern const u8 gItemIcon_Stick[];
+extern const u8 gItemIconPalette_Stick[];
+// Contest hold items
+extern const u8 gItemIcon_Scarf[];
+extern const u8 gItemIconPalette_RedScarf[];
+extern const u8 gItemIconPalette_BlueScarf[];
+extern const u8 gItemIconPalette_PinkScarf[];
+extern const u8 gItemIconPalette_GreenScarf[];
+extern const u8 gItemIconPalette_YellowScarf[];
+// Key items
+extern const u8 gItemIcon_MachBike[];
+extern const u8 gItemIconPalette_MachBike[];
+extern const u8 gItemIcon_CoinCase[];
+extern const u8 gItemIconPalette_CoinCase[];
+extern const u8 gItemIcon_Itemfinder[];
+extern const u8 gItemIconPalette_Itemfinder[];
+extern const u8 gItemIcon_OldRod[];
+extern const u8 gItemIconPalette_OldRod[];
+extern const u8 gItemIcon_GoodRod[];
+extern const u8 gItemIconPalette_GoodRod[];
+extern const u8 gItemIcon_SuperRod[];
+extern const u8 gItemIconPalette_SuperRod[];
+extern const u8 gItemIcon_SSTicket[];
+extern const u8 gItemIconPalette_SSTicket[];
+extern const u8 gItemIcon_ContestPass[];
+extern const u8 gItemIconPalette_ContestPass[];
+extern const u8 gItemIcon_WailmerPail[];
+extern const u8 gItemIconPalette_WailmerPail[];
+extern const u8 gItemIcon_DevonGoods[];
+extern const u8 gItemIconPalette_DevonGoods[];
+extern const u8 gItemIcon_SootSack[];
+extern const u8 gItemIconPalette_SootSack[];
+extern const u8 gItemIcon_BasementKey[];
+extern const u8 gItemIconPalette_OldKey[];
+extern const u8 gItemIcon_AcroBike[];
+extern const u8 gItemIconPalette_AcroBike[];
+extern const u8 gItemIcon_PokeblockCase[];
+extern const u8 gItemIconPalette_PokeblockCase[];
+extern const u8 gItemIcon_Letter[];
+extern const u8 gItemIcon_EonTicket[];
+extern const u8 gItemIconPalette_EonTicket[];
+extern const u8 gItemIcon_Orb[];
+extern const u8 gItemIconPalette_RedOrb[];
+extern const u8 gItemIconPalette_BlueOrb[];
+extern const u8 gItemIcon_Scanner[];
+extern const u8 gItemIconPalette_Scanner[];
+extern const u8 gItemIcon_GoGoggles[];
+extern const u8 gItemIconPalette_GoGoggles[];
+extern const u8 gItemIcon_Meteorite[];
+extern const u8 gItemIconPalette_Meteorite[];
+extern const u8 gItemIcon_Room1Key[];
+extern const u8 gItemIconPalette_Key[];
+extern const u8 gItemIcon_Room2Key[];
+extern const u8 gItemIcon_Room4Key[];
+extern const u8 gItemIcon_Room6Key[];
+extern const u8 gItemIcon_StorageKey[];
+extern const u8 gItemIcon_RootFossil[];
+extern const u8 gItemIconPalette_HoennFossil[];
+extern const u8 gItemIcon_ClawFossil[];
+extern const u8 gItemIcon_DevonScope[];
+extern const u8 gItemIconPalette_DevonScope[];
+// TMs/HMs
+extern const u8 gItemIcon_TM[];
+extern const u8 gItemIconPalette_FightingTMHM[];
+extern const u8 gItemIconPalette_DragonTMHM[];
+extern const u8 gItemIconPalette_WaterTMHM[];
+extern const u8 gItemIconPalette_PsychicTMHM[];
+extern const u8 gItemIconPalette_NormalTMHM[];
+extern const u8 gItemIconPalette_PoisonTMHM[];
+extern const u8 gItemIconPalette_IceTMHM[];
+extern const u8 gItemIconPalette_GrassTMHM[];
+extern const u8 gItemIconPalette_FireTMHM[];
+extern const u8 gItemIconPalette_DarkTMHM[];
+extern const u8 gItemIconPalette_SteelTMHM[];
+extern const u8 gItemIconPalette_ElectricTMHM[];
+extern const u8 gItemIconPalette_GroundTMHM[];
+extern const u8 gItemIconPalette_GhostTMHM[];
+extern const u8 gItemIconPalette_RockTMHM[];
+extern const u8 gItemIconPalette_FlyingTMHM[];
+extern const u8 gItemIcon_HM[];
+// FireRed/LeafGreen key items
+extern const u8 gItemIcon_OaksParcel[];
+extern const u8 gItemIconPalette_OaksParcel[];
+extern const u8 gItemIcon_PokeFlute[];
+extern const u8 gItemIconPalette_PokeFlute[];
+extern const u8 gItemIcon_SecretKey[];
+extern const u8 gItemIconPalette_SecretKey[];
+extern const u8 gItemIcon_BikeVoucher[];
+extern const u8 gItemIconPalette_BikeVoucher[];
+extern const u8 gItemIcon_GoldTeeth[];
+extern const u8 gItemIconPalette_GoldTeeth[];
+extern const u8 gItemIcon_OldAmber[];
+extern const u8 gItemIconPalette_OldAmber[];
+extern const u8 gItemIcon_CardKey[];
+extern const u8 gItemIconPalette_CardKey[];
+extern const u8 gItemIcon_LiftKey[];
+extern const u8 gItemIconPalette_Key[];
+extern const u8 gItemIcon_HelixFossil[];
+extern const u8 gItemIconPalette_KantoFossil[];
+extern const u8 gItemIcon_DomeFossil[];
+extern const u8 gItemIcon_SilphScope[];
+extern const u8 gItemIconPalette_SilphScope[];
+extern const u8 gItemIcon_Bicycle[];
+extern const u8 gItemIconPalette_Bicycle[];
+extern const u8 gItemIcon_TownMap[];
+extern const u8 gItemIconPalette_TownMap[];
+extern const u8 gItemIcon_VSSeeker[];
+extern const u8 gItemIconPalette_VSSeeker[];
+extern const u8 gItemIcon_FameChecker[];
+extern const u8 gItemIconPalette_FameChecker[];
+extern const u8 gItemIcon_TMCase[];
+extern const u8 gItemIconPalette_TMCase[];
+extern const u8 gItemIcon_BerryPouch[];
+extern const u8 gItemIconPalette_BerryPouch[];
+extern const u8 gItemIcon_TeachyTV[];
+extern const u8 gItemIconPalette_TeachyTV[];
+extern const u8 gItemIcon_TriPass[];
+extern const u8 gItemIconPalette_TriPass[];
+extern const u8 gItemIcon_RainbowPass[];
+extern const u8 gItemIconPalette_RainbowPass[];
+extern const u8 gItemIcon_Tea[];
+extern const u8 gItemIconPalette_Tea[];
+extern const u8 gItemIcon_MysticTicket[];
+extern const u8 gItemIconPalette_MysticTicket[];
+extern const u8 gItemIcon_AuroraTicket[];
+extern const u8 gItemIconPalette_AuroraTicket[];
+extern const u8 gItemIcon_PowderJar[];
+extern const u8 gItemIconPalette_PowderJar[];
+extern const u8 gItemIcon_Gem[];
+extern const u8 gItemIconPalette_Ruby[];
+extern const u8 gItemIconPalette_Sapphire[];
+// Emerald-only key items
+extern const u8 gItemIcon_MagmaEmblem[];
+extern const u8 gItemIconPalette_MagmaEmblem[];
+extern const u8 gItemIcon_OldSeaMap[];
+extern const u8 gItemIconPalette_OldSeaMap[];
+
+extern const u8 gItemIcon_ReturnToFieldArrow[];
+extern const u8 gItemIconPalette_ReturnToFieldArrow[];
+
 //menu graphics
 extern const u16 gFireRedMenuElements1_Pal[16];
 extern const u16 gFireRedMenuElements2_Pal[16];