From 5a8e51d858e2d179eb7b0add49333ad7e0888068 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 31 Dec 2021 14:02:44 -0300 Subject: [PATCH] Filled in missing items' sprite data --- include/graphics.h | 380 ++++++++++++++------------------- src/data/graphics/items.h | 427 ++++++++++++++----------------------- src/data/item_icon_table.h | 316 +++++++++++++-------------- 3 files changed, 480 insertions(+), 643 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index 2328535c2..7d1d3ce49 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3491,23 +3491,23 @@ extern const u32 gItemIcon_SacredAsh[]; extern const u32 gItemIconPalette_SacredAsh[]; extern const u32 gItemIcon_SweetHeart[]; extern const u32 gItemIconPalette_SweetHeart[]; -//extern const u32 gItemIcon_MaxHoney[]; -//extern const u32 gItemIconPalette_MaxHoney[]; +extern const u32 gItemIcon_MaxHoney[]; +extern const u32 gItemIconPalette_MaxHoney[]; // Regional Specialties -//extern const u32 gItemIcon_PewterCrunchies[]; -//extern const u32 gItemIconPalette_PewterCrunchies[]; -//extern const u32 gItemIcon_RageCandyBar[]; -//extern const u32 gItemIconPalette_RageCandyBar[]; +extern const u32 gItemIcon_PewterCrunchies[]; +extern const u32 gItemIconPalette_PewterCrunchies[]; +extern const u32 gItemIcon_RageCandyBar[]; +extern const u32 gItemIconPalette_RageCandyBar[]; extern const u32 gItemIcon_LavaCookie[]; extern const u32 gItemIconPalette_LavaCookieAndLetter[]; extern const u32 gItemIcon_OldGateau[]; extern const u32 gItemIconPalette_OldGateau[]; -//extern const u32 gItemIcon_CasteliaCone[]; -//extern const u32 gItemIconPalette_CasteliaCone[]; -//extern const u32 gItemIcon_LumioseGalette[]; -//extern const u32 gItemIconPalette_LumioseGalette[]; -//extern const u32 gItemIcon_ShalourSable[]; -//extern const u32 gItemIconPalette_ShalourSable[]; +extern const u32 gItemIcon_Casteliacone[]; +extern const u32 gItemIconPalette_Casteliacone[]; +extern const u32 gItemIcon_LumioseGalette[]; +extern const u32 gItemIconPalette_LumioseGalette[]; +extern const u32 gItemIcon_ShalourSable[]; +extern const u32 gItemIconPalette_ShalourSable[]; extern const u32 gItemIcon_BigMalasada[]; extern const u32 gItemIconPalette_BigMalasada[]; // Vitamins @@ -3539,66 +3539,27 @@ extern const u32 gItemIconPalette_SwiftFeather[]; // Ability Modifiers extern const u32 gItemIcon_AbilityCapsule[]; extern const u32 gItemIconPalette_AbilityCapsule[]; -//extern const u32 gItemIcon_AbilityPatch[]; -//extern const u32 gItemIconPalette_AbilityPatch[]; +extern const u32 gItemIcon_AbilityPatch[]; +extern const u32 gItemIconPalette_AbilityPatch[]; // Mints -//extern const u32 gItemIcon_LonelyMint[]; -//extern const u32 gItemIconPalette_LonelyMint[]; -//extern const u32 gItemIcon_AdamantMint[]; -//extern const u32 gItemIconPalette_AdamantMint[]; -//extern const u32 gItemIcon_NaughtyMint[]; -//extern const u32 gItemIconPalette_NaughtyMint[]; -//extern const u32 gItemIcon_BraveMint[]; -//extern const u32 gItemIconPalette_BraveMint[]; -//extern const u32 gItemIcon_BoldMint[]; -//extern const u32 gItemIconPalette_BoldMint[]; -//extern const u32 gItemIcon_ImpishMint[]; -//extern const u32 gItemIconPalette_ImpishMint[]; -//extern const u32 gItemIcon_LaxMint[]; -//extern const u32 gItemIconPalette_LaxMint[]; -//extern const u32 gItemIcon_RelaxedMint[]; -//extern const u32 gItemIconPalette_RelaxedMint[]; -//extern const u32 gItemIcon_ModestMint[]; -//extern const u32 gItemIconPalette_ModestMint[]; -//extern const u32 gItemIcon_MildMint[]; -//extern const u32 gItemIconPalette_MildMint[]; -//extern const u32 gItemIcon_RashMint[]; -//extern const u32 gItemIconPalette_RashMint[]; -//extern const u32 gItemIcon_QuietMint[]; -//extern const u32 gItemIconPalette_QuietMint[]; -//extern const u32 gItemIcon_CalmMint[]; -//extern const u32 gItemIconPalette_CalmMint[]; -//extern const u32 gItemIcon_GentleMint[]; -//extern const u32 gItemIconPalette_GentleMint[]; -//extern const u32 gItemIcon_CarefulMint[]; -//extern const u32 gItemIconPalette_CarefulMint[]; -//extern const u32 gItemIcon_SassyMint[]; -//extern const u32 gItemIconPalette_SassyMint[]; -//extern const u32 gItemIcon_TimidMint[]; -//extern const u32 gItemIconPalette_TimidMint[]; -//extern const u32 gItemIcon_HastyMint[]; -//extern const u32 gItemIconPalette_HastyMint[]; -//extern const u32 gItemIcon_JollyMint[]; -//extern const u32 gItemIconPalette_JollyMint[]; -//extern const u32 gItemIcon_NaiveMint[]; -//extern const u32 gItemIconPalette_NaiveMint[]; -//extern const u32 gItemIcon_SeriousMint[]; -//extern const u32 gItemIconPalette_SeriousMint[]; +extern const u32 gItemIcon_Mint[]; +extern const u32 gItemIconPalette_RedMint[]; +extern const u32 gItemIconPalette_BlueMint[]; +extern const u32 gItemIconPalette_LightBlueMint[]; +extern const u32 gItemIconPalette_PinkMint[]; +extern const u32 gItemIconPalette_GreenMint[]; +extern const u32 gItemIconPalette_YellowMint[]; // Candy extern const u32 gItemIcon_RareCandy[]; extern const u32 gItemIconPalette_RareCandy[]; -//extern const u32 gItemIcon_EXPCandyXS[]; -//extern const u32 gItemIconPalette_EXPCandyXS[]; -//extern const u32 gItemIcon_EXPCandyS[]; -//extern const u32 gItemIconPalette_EXPCandyS[]; -//extern const u32 gItemIcon_EXPCandyM[]; -//extern const u32 gItemIconPalette_EXPCandyM[]; -//extern const u32 gItemIcon_EXPCandyL[]; -//extern const u32 gItemIconPalette_EXPCandyL[]; -//extern const u32 gItemIcon_EXPCandyXL[]; -//extern const u32 gItemIconPalette_EXPCandyXL[]; -//extern const u32 gItemIcon_DynamaxCandy[]; -//extern const u32 gItemIconPalette_DynamaxCandy[]; +extern const u32 gItemIcon_ExpCandyXS[]; +extern const u32 gItemIcon_ExpCandyS[]; +extern const u32 gItemIcon_ExpCandyM[]; +extern const u32 gItemIcon_ExpCandyL[]; +extern const u32 gItemIcon_ExpCandyXL[]; +extern const u32 gItemIconPalette_ExpCandies[]; +extern const u32 gItemIcon_DynamaxCandy[]; +extern const u32 gItemIconPalette_DynamaxCandy[]; // Medicinal Flutes extern const u32 gItemIcon_Flute[]; extern const u32 gItemIconPalette_BlueFlute[]; @@ -3612,12 +3573,12 @@ extern const u32 gItemIcon_Repel[]; extern const u32 gItemIconPalette_Repel[]; extern const u32 gItemIconPalette_SuperRepel[]; extern const u32 gItemIconPalette_MaxRepel[]; -//extern const u32 gItemIcon_Lure[]; -//extern const u32 gItemIconPalette_Lure[]; -//extern const u32 gItemIcon_SuperLure[]; -//extern const u32 gItemIconPalette_SuperLure[]; -//extern const u32 gItemIcon_MaxLure[]; -//extern const u32 gItemIconPalette_MaxLure[]; +extern const u32 gItemIcon_Lure[]; +extern const u32 gItemIconPalette_Lure[]; +extern const u32 gItemIcon_SuperLure[]; +extern const u32 gItemIconPalette_SuperLure[]; +extern const u32 gItemIcon_MaxLure[]; +extern const u32 gItemIconPalette_MaxLure[]; extern const u32 gItemIcon_EscapeRope[]; extern const u32 gItemIconPalette_EscapeRope[]; // X Items @@ -3636,34 +3597,33 @@ extern const u32 gItemIcon_PokeDoll[]; extern const u32 gItemIconPalette_PokeDoll[]; extern const u32 gItemIcon_FluffyTail[]; extern const u32 gItemIconPalette_FluffyTail[]; -//extern const u32 gItemIcon_PokeToy[]; -//extern const u32 gItemIconPalette_PokeToy[]; -//extern const u32 gItemIcon_MaxMushrooms[]; -//extern const u32 gItemIconPalette_MaxMushrooms[]; +extern const u32 gItemIcon_PokeToy[]; +extern const u32 gItemIconPalette_PokeToy[]; +extern const u32 gItemIcon_MaxMushrooms[]; +extern const u32 gItemIconPalette_MaxMushrooms[]; // Treasures -//extern const u32 gItemIcon_BottleCap[]; -//extern const u32 gItemIconPalette_BottleCap[]; -//extern const u32 gItemIcon_GoldBottleCap[]; -//extern const u32 gItemIconPalette_GoldBottleCap[]; +extern const u32 gItemIcon_BottleCap[]; +extern const u32 gItemIconPalette_BottleCap[]; +extern const u32 gItemIconPalette_GoldBottleCap[]; extern const u32 gItemIcon_Nugget[]; extern const u32 gItemIconPalette_Nugget[]; -//extern const u32 gItemIcon_BigNugget[]; -//extern const u32 gItemIconPalette_BigNugget[]; +extern const u32 gItemIcon_BigNugget[]; +extern const u32 gItemIconPalette_BigNugget[]; extern const u32 gItemIcon_TinyMushroom[]; extern const u32 gItemIconPalette_Mushroom[]; extern const u32 gItemIcon_BigMushroom[]; -//extern const u32 gItemIcon_BalmMushroom[]; -//extern const u32 gItemIconPalette_BalmMushroom[]; +extern const u32 gItemIcon_BalmMushroom[]; +extern const u32 gItemIconPalette_BalmMushroom[]; extern const u32 gItemIcon_Pearl[]; extern const u32 gItemIconPalette_Pearl[]; extern const u32 gItemIcon_BigPearl[]; -//extern const u32 gItemIcon_PearlString[]; -//extern const u32 gItemIconPalette_PearlString[]; +extern const u32 gItemIcon_PearlString[]; +extern const u32 gItemIconPalette_PearlString[]; extern const u32 gItemIcon_Stardust[]; extern const u32 gItemIconPalette_Star[]; extern const u32 gItemIcon_StarPiece[]; -//extern const u32 gItemIcon_CometShard[]; -//extern const u32 gItemIconPalette_CometShard[]; +extern const u32 gItemIcon_CometShard[]; +extern const u32 gItemIconPalette_CometShard[]; extern const u32 gItemIconPalette_ShoalSalt[]; extern const u32 gItemIcon_ShoalShell[]; extern const u32 gItemIconPalette_Shell[]; @@ -3682,24 +3642,17 @@ extern const u32 gItemIcon_OddKeystone[]; extern const u32 gItemIconPalette_OddKeystone[]; extern const u32 gItemIcon_PrettyFeather[]; extern const u32 gItemIconPalette_PrettyFeather[]; -//extern const u32 gItemIcon_RelicCopper[]; -//extern const u32 gItemIconPalette_RelicCopper[]; -//extern const u32 gItemIcon_RelicCopper[]; -//extern const u32 gItemIconPalette_RelicCopper[]; -//extern const u32 gItemIcon_RelicSilver[]; -//extern const u32 gItemIconPalette_RelicSilver[]; -//extern const u32 gItemIcon_RelicGold[]; -//extern const u32 gItemIconPalette_RelicGold[]; -//extern const u32 gItemIcon_RelicVase[]; -//extern const u32 gItemIconPalette_RelicVase[]; -//extern const u32 gItemIcon_RelicBand[]; -//extern const u32 gItemIconPalette_RelicBand[]; -//extern const u32 gItemIcon_RelicStatue[]; -//extern const u32 gItemIconPalette_RelicStatue[]; -//extern const u32 gItemIcon_RelicCrown[]; -//extern const u32 gItemIconPalette_RelicCrown[]; -//extern const u32 gItemIcon_StrangeSouvenir[]; -//extern const u32 gItemIconPalette_StrangeSouvenir[]; +extern const u32 gItemIcon_RelicCoin[]; +extern const u32 gItemIconPalette_RelicCopper[]; +extern const u32 gItemIconPalette_RelicSilver[]; +extern const u32 gItemIconPalette_RelicGold[]; +extern const u32 gItemIcon_RelicVase[]; +extern const u32 gItemIconPalette_Relics[]; +extern const u32 gItemIcon_RelicBand[]; +extern const u32 gItemIcon_RelicStatue[]; +extern const u32 gItemIcon_RelicCrown[]; +extern const u32 gItemIcon_StrangeSouvenir[]; +extern const u32 gItemIconPalette_StrangeSouvenir[]; // Fossils extern const u32 gItemIcon_HelixFossil[]; extern const u32 gItemIconPalette_KantoFossil[]; @@ -3721,31 +3674,25 @@ extern const u32 gItemIcon_JawFossil[]; extern const u32 gItemIconPalette_JawFossil[]; extern const u32 gItemIcon_SailFossil[]; extern const u32 gItemIconPalette_SailFossil[]; -//extern const u32 gItemIcon_FossilizedBird[]; -//extern const u32 gItemIconPalette_FossilizedBird[]; -//extern const u32 gItemIcon_FossilizedFish[]; -//extern const u32 gItemIconPalette_FossilizedFish[]; -//extern const u32 gItemIcon_FossilizedDrake[]; -//extern const u32 gItemIconPalette_FossilizedDrake[]; -//extern const u32 gItemIcon_FossilizedDino[]; -//extern const u32 gItemIconPalette_FossilizedDino[]; +extern const u32 gItemIcon_FossilizedBird[]; +extern const u32 gItemIconPalette_FossilizedBird[]; +extern const u32 gItemIcon_FossilizedFish[]; +extern const u32 gItemIconPalette_FossilizedFish[]; +extern const u32 gItemIcon_FossilizedDrake[]; +extern const u32 gItemIconPalette_FossilizedDrake[]; +extern const u32 gItemIcon_FossilizedDino[]; +extern const u32 gItemIconPalette_FossilizedDino[]; // Mulch -//extern const u32 gItemIcon_GrowthMulch[]; -//extern const u32 gItemIconPalette_GrowthMulch[]; -//extern const u32 gItemIcon_DampMulch[]; -//extern const u32 gItemIconPalette_DampMulch[]; -//extern const u32 gItemIcon_StableMulch[]; -//extern const u32 gItemIconPalette_StableMulch[]; -//extern const u32 gItemIcon_GooeyMulch[]; -//extern const u32 gItemIconPalette_GooeyMulch[]; -//extern const u32 gItemIcon_RichMulch[]; -//extern const u32 gItemIconPalette_RichMulch[]; -//extern const u32 gItemIcon_SurpriseMulch[]; -//extern const u32 gItemIconPalette_SurpriseMulch[]; -//extern const u32 gItemIcon_BoostMulch[]; -//extern const u32 gItemIconPalette_BoostMulch[]; -//extern const u32 gItemIcon_AmazeMulch[]; -//extern const u32 gItemIconPalette_AmazeMulch[]; +extern const u32 gItemIcon_Mulch[]; +extern const u32 gItemIconPalette_GrowthMulch[]; +extern const u32 gItemIconPalette_DampMulch[]; +extern const u32 gItemIcon_StableMulch[]; +extern const u32 gItemIconPalette_StableMulch[]; +extern const u32 gItemIconPalette_GooeyMulch[]; +extern const u32 gItemIconPalette_RichMulch[]; +extern const u32 gItemIconPalette_SurpriseMulch[]; +extern const u32 gItemIconPalette_BoostMulch[]; +extern const u32 gItemIconPalette_AmazeMulch[]; // Apricorns extern const u32 gItemIcon_RedApricorn[]; extern const u32 gItemIconPalette_RedApricorn[]; @@ -3761,14 +3708,14 @@ extern const u32 gItemIcon_WhiteApricorn[]; extern const u32 gItemIconPalette_WhiteApricorn[]; extern const u32 gItemIcon_BlackApricorn[]; extern const u32 gItemIconPalette_BlackApricorn[]; -//extern const u32 gItemIcon_WishingPiece[]; -//extern const u32 gItemIconPalette_WishingPiece[]; -//extern const u32 gItemIcon_GalaricaTwig[]; -//extern const u32 gItemIconPalette_GalaricaTwig[]; -//extern const u32 gItemIcon_ArmoriteOre[]; -//extern const u32 gItemIconPalette_ArmoriteOre[]; -//extern const u32 gItemIcon_DyniteOre[]; -//extern const u32 gItemIconPalette_DyniteOre[]; +extern const u32 gItemIcon_WishingPiece[]; +extern const u32 gItemIconPalette_WishingPiece[]; +extern const u32 gItemIcon_GalaricaTwig[]; +extern const u32 gItemIconPalette_GalaricaItem[]; +extern const u32 gItemIcon_ArmoriteOre[]; +extern const u32 gItemIconPalette_ArmoriteOre[]; +extern const u32 gItemIcon_DyniteOre[]; +extern const u32 gItemIconPalette_DyniteOre[]; // Mail extern const u32 gItemIcon_OrangeMail[]; extern const u32 gItemIconPalette_OrangeMail[]; @@ -3815,18 +3762,15 @@ extern const u32 gItemIcon_DuskStone[]; extern const u32 gItemIconPalette_DuskStone[]; extern const u32 gItemIcon_DawnStone[]; extern const u32 gItemIconPalette_DawnStone[]; -//extern const u32 gItemIcon_SweetApple[]; -//extern const u32 gItemIconPalette_SweetApple[]; -//extern const u32 gItemIcon_TartApple[]; -//extern const u32 gItemIconPalette_TartApple[]; -//extern const u32 gItemIcon_CrackedPot[]; -//extern const u32 gItemIconPalette_CrackedPot[]; -//extern const u32 gItemIcon_ChippedPot[]; -//extern const u32 gItemIconPalette_ChippedPot[]; -//extern const u32 gItemIcon_GalaricaCuff[]; -//extern const u32 gItemIconPalette_GalaricaCuff[]; -//extern const u32 gItemIcon_GalaricaWreath[]; -//extern const u32 gItemIconPalette_GalaricaWreath[]; +extern const u32 gItemIcon_SweetApple[]; +extern const u32 gItemIconPalette_SweetApple[]; +extern const u32 gItemIcon_TartApple[]; +extern const u32 gItemIconPalette_TartApple[]; +extern const u32 gItemIcon_CrackedPot[]; +extern const u32 gItemIcon_ChippedPot[]; +extern const u32 gItemIconPalette_Pot[]; +extern const u32 gItemIcon_GalaricaCuff[]; +extern const u32 gItemIcon_GalaricaWreath[]; extern const u32 gItemIcon_DragonScale[]; extern const u32 gItemIconPalette_DragonScale[]; extern const u32 gItemIcon_Upgrade[]; @@ -3849,20 +3793,20 @@ extern const u32 gItemIcon_Sachet[]; extern const u32 gItemIconPalette_Sachet[]; extern const u32 gItemIcon_OvalStone[]; extern const u32 gItemIconPalette_OvalStone[]; -//extern const u32 gItemIcon_StrawberrySweet[]; -//extern const u32 gItemIconPalette_StrawberrySweet[]; -//extern const u32 gItemIcon_LoveSweet[]; -//extern const u32 gItemIconPalette_LoveSweet[]; -//extern const u32 gItemIcon_BerrySweet[]; -//extern const u32 gItemIconPalette_BerrySweet[]; -//extern const u32 gItemIcon_CloverSweet[]; -//extern const u32 gItemIconPalette_CloverSweet[]; -//extern const u32 gItemIcon_FlowerSweet[]; -//extern const u32 gItemIconPalette_FlowerSweet[]; -//extern const u32 gItemIcon_StarSweet[]; -//extern const u32 gItemIconPalette_StarSweet[]; -//extern const u32 gItemIcon_RibbonSweet[]; -//extern const u32 gItemIconPalette_RibbonSweet[]; +extern const u32 gItemIcon_StrawberrySweet[]; +extern const u32 gItemIconPalette_StrawberrySweet[]; +extern const u32 gItemIcon_LoveSweet[]; +extern const u32 gItemIconPalette_LoveSweet[]; +extern const u32 gItemIcon_BerrySweet[]; +extern const u32 gItemIconPalette_BerrySweet[]; +extern const u32 gItemIcon_CloverSweet[]; +extern const u32 gItemIconPalette_CloverSweet[]; +extern const u32 gItemIcon_FlowerSweet[]; +extern const u32 gItemIconPalette_FlowerSweet[]; +extern const u32 gItemIcon_StarSweet[]; +extern const u32 gItemIconPalette_StarSweet[]; +extern const u32 gItemIcon_RibbonSweet[]; +extern const u32 gItemIconPalette_RibbonSweet[]; extern const u32 gItemIcon_Everstone[]; extern const u32 gItemIconPalette_Everstone[]; // Nectars @@ -3953,17 +3897,16 @@ extern const u32 gItemIcon_SteelMemory[]; extern const u32 gItemIconPalette_SteelMemory[]; extern const u32 gItemIcon_FairyMemory[]; extern const u32 gItemIconPalette_FairyMemory[]; -//extern const u32 gItemIcon_RustedSword[]; -//extern const u32 gItemIconPalette_RustedSword[]; -//extern const u32 gItemIcon_RustedShield[]; -//extern const u32 gItemIconPalette_RustedShield[]; +extern const u32 gItemIcon_RustedSword[]; +extern const u32 gItemIcon_RustedShield[]; +extern const u32 gItemIconPalette_RustedWeapons[]; // Colored Orbs extern const u32 gItemIcon_RedOrb[]; extern const u32 gItemIconPalette_RedOrb[]; extern const u32 gItemIcon_BlueOrb[]; extern const u32 gItemIconPalette_BlueOrb[]; -//extern const u32 gItemIcon_JadeOrb[]; -//extern const u32 gItemIconPalette_JadeOrb[]; +extern const u32 gItemIcon_JadeOrb[]; +extern const u32 gItemIconPalette_JadeOrb[]; // Mega Stones extern const u32 gItemIcon_Venusaurite[]; extern const u32 gItemIconPalette_Venusaurite[]; @@ -4403,18 +4346,18 @@ extern const u32 gItemIcon_TerrainExtender[]; extern const u32 gItemIconPalette_TerrainExtender[]; extern const u32 gItemIcon_ProtectivePads[]; extern const u32 gItemIconPalette_ProtectivePads[]; -//extern const u32 gItemIcon_ThroatSpray[]; -//extern const u32 gItemIconPalette_ThroatSpray[]; -//extern const u32 gItemIcon_EjectPack[]; -//extern const u32 gItemIconPalette_EjectPack[]; -//extern const u32 gItemIcon_HeavyDutyBoots[]; -//extern const u32 gItemIconPalette_HeavyDutyBoots[]; -//extern const u32 gItemIcon_BlunderPolicy[]; -//extern const u32 gItemIconPalette_BlunderPolicy[]; -//extern const u32 gItemIcon_RoomService[]; -//extern const u32 gItemIconPalette_RoomService[]; -//extern const u32 gItemIcon_UtilityUmbrella[]; -//extern const u32 gItemIconPalette_UtilityUmbrella[]; +extern const u32 gItemIcon_ThroatSpray[]; +extern const u32 gItemIconPalette_ThroatSpray[]; +extern const u32 gItemIcon_EjectPack[]; +extern const u32 gItemIconPalette_EjectPack[]; +extern const u32 gItemIcon_HeavyDutyBoots[]; +extern const u32 gItemIconPalette_HeavyDutyBoots[]; +extern const u32 gItemIcon_BlunderPolicy[]; +extern const u32 gItemIconPalette_BlunderPolicy[]; +extern const u32 gItemIcon_RoomService[]; +extern const u32 gItemIconPalette_RoomService[]; +extern const u32 gItemIcon_UtilityUmbrella[]; +extern const u32 gItemIconPalette_UtilityUmbrella[]; // Berries extern const u32 gItemIcon_CheriBerry[]; extern const u32 gItemIconPalette_CheriBerry[]; @@ -4536,8 +4479,8 @@ extern const u32 gItemIcon_LansatBerry[]; extern const u32 gItemIconPalette_LansatBerry[]; extern const u32 gItemIcon_StarfBerry[]; extern const u32 gItemIconPalette_StarfBerry[]; -//extern const u32 gItemIcon_EnigmaBerry[]; -//extern const u32 gItemIconPalette_EnigmaBerry[]; +extern const u32 gItemIcon_EnigmaBerry[]; +extern const u32 gItemIconPalette_EnigmaBerry[]; extern const u32 gItemIcon_MicleBerry[]; extern const u32 gItemIconPalette_MicleBerry[]; extern const u32 gItemIcon_CustapBerry[]; @@ -4550,8 +4493,6 @@ extern const u32 gItemIcon_KeeBerry[]; extern const u32 gItemIconPalette_KeeBerry[]; extern const u32 gItemIcon_MarangaBerry[]; extern const u32 gItemIconPalette_MarangaBerry[]; -extern const u32 gItemIcon_EnigmaBerry[]; -extern const u32 gItemIconPalette_EnigmaBerry[]; // TMs/HMs extern const u32 gItemIcon_TM[]; extern const u32 gItemIcon_HM[]; @@ -4578,38 +4519,37 @@ extern const u32 gItemIcon_OvalCharm[]; extern const u32 gItemIconPalette_OvalCharm[]; extern const u32 gItemIcon_ShinyCharm[]; extern const u32 gItemIconPalette_ShinyCharm[]; -//extern const u32 gItemIcon_CatchingCharm[]; -//extern const u32 gItemIconPalette_CatchingCharm[]; -//extern const u32 gItemIcon_ExpCharm[]; -//extern const u32 gItemIconPalette_ExpCharm[]; +extern const u32 gItemIcon_CatchingCharm[]; +extern const u32 gItemIconPalette_CatchingCharm[]; +extern const u32 gItemIcon_ExpCharm[]; +extern const u32 gItemIconPalette_ExpCharm[]; // Form-changing Key Items -//extern const u32 gItemIcon_RotomCatalog[]; -//extern const u32 gItemIconPalette_RotomCatalog[]; +extern const u32 gItemIcon_RotomCatalog[]; +extern const u32 gItemIconPalette_RotomCatalog[]; extern const u32 gItemIcon_Gracidea[]; extern const u32 gItemIconPalette_Gracidea[]; -//extern const u32 gItemIcon_RevealGlass[]; -//extern const u32 gItemIconPalette_RevealGlass[]; -//extern const u32 gItemIcon_DNASplicers[]; -//extern const u32 gItemIconPalette_DNASplicers[]; -//extern const u32 gItemIcon_ZygardeCube[]; -//extern const u32 gItemIconPalette_ZygardeCube[]; -//extern const u32 gItemIcon_PrisonBottle[]; -//extern const u32 gItemIconPalette_PrisonBottle[]; -//extern const u32 gItemIcon_NSolarizer[]; -//extern const u32 gItemIconPalette_NSolarizer[]; -//extern const u32 gItemIcon_NLunarizer[]; -//extern const u32 gItemIconPalette_NLunarizer[]; -//extern const u32 gItemIcon_ReinsOfUnity[]; -//extern const u32 gItemIconPalette_ReinsOfUnity[]; +extern const u32 gItemIcon_RevealGlass[]; +extern const u32 gItemIconPalette_RevealGlass[]; +extern const u32 gItemIcon_DNASplicers[]; +extern const u32 gItemIconPalette_DNASplicers[]; +extern const u32 gItemIcon_ZygardeCube[]; +extern const u32 gItemIconPalette_ZygardeCube[]; +extern const u32 gItemIcon_PrisonBottle[]; +extern const u32 gItemIconPalette_PrisonBottle[]; +extern const u32 gItemIcon_NecrozmaFuser[]; +extern const u32 gItemIconPalette_NSolarizer[]; +extern const u32 gItemIconPalette_NLunarizer[]; +extern const u32 gItemIcon_ReinsOfUnity[]; +extern const u32 gItemIconPalette_ReinsOfUnity[]; // Battle Mechanic Key Items -//extern const u32 gItemIcon_KeyStone[]; -//extern const u32 gItemIconPalette_KeyStone[]; -//extern const u32 gItemIcon_MegaRing[]; -//extern const u32 gItemIconPalette_MegaRing[]; -//extern const u32 gItemIcon_ZPowerRing[]; -//extern const u32 gItemIconPalette_ZPowerRing[]; -//extern const u32 gItemIcon_DynamaxBand[]; -//extern const u32 gItemIconPalette_DynamaxBand[]; +extern const u32 gItemIcon_KeyStone[]; +extern const u32 gItemIconPalette_KeyStone[]; +extern const u32 gItemIcon_MegaRing[]; +extern const u32 gItemIconPalette_MegaRing[]; +extern const u32 gItemIcon_ZPowerRing[]; +extern const u32 gItemIconPalette_ZPowerRing[]; +extern const u32 gItemIcon_DynamaxBand[]; +extern const u32 gItemIconPalette_DynamaxBand[]; // Misc. Key Items extern const u32 gItemIcon_Bicycle[]; extern const u32 gItemIconPalette_Bicycle[]; @@ -4633,16 +4573,16 @@ extern const u32 gItemIcon_TMCase[]; extern const u32 gItemIconPalette_TMCase[]; extern const u32 gItemIcon_BerryPouch[]; extern const u32 gItemIconPalette_BerryPouch[]; -//extern const u32 gItemIcon_PokemonBoxLink[]; -//extern const u32 gItemIconPalette_PokemonBoxLink[]; +extern const u32 gItemIcon_PokemonBoxLink[]; +extern const u32 gItemIconPalette_PokemonBoxLink[]; extern const u32 gItemIcon_CoinCase[]; extern const u32 gItemIconPalette_CoinCase[]; extern const u32 gItemIcon_PowderJar[]; extern const u32 gItemIconPalette_PowderJar[]; extern const u32 gItemIcon_WailmerPail[]; extern const u32 gItemIconPalette_WailmerPail[]; -//extern const u32 gItemIcon_PokeRadar[]; -//extern const u32 gItemIconPalette_PokeRadar[]; +extern const u32 gItemIcon_PokeRadar[]; +extern const u32 gItemIconPalette_PokeRadar[]; extern const u32 gItemIcon_PokeblockCase[]; extern const u32 gItemIconPalette_PokeblockCase[]; extern const u32 gItemIcon_SootSack[]; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index ccb874cbb..3ecbd6851 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -160,16 +160,16 @@ const u32 gItemIconPalette_SacredAsh[] = INCBIN_U32("graphics/items/icon_palette const u32 gItemIcon_SweetHeart[] = INCBIN_U32("graphics/items/icons/sweet_heart.4bpp.lz"); const u32 gItemIconPalette_SweetHeart[] = INCBIN_U32("graphics/items/icon_palettes/sweet_heart.gbapal.lz"); -//const u32 gItemIcon_MaxHoney[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_MaxHoney[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_MaxHoney[] = INCBIN_U32("graphics/items/icons/max_honey.4bpp.lz"); +const u32 gItemIconPalette_MaxHoney[] = INCBIN_U32("graphics/items/icon_palettes/max_honey.gbapal.lz"); // Regional Specialties -//const u32 gItemIcon_PewterCrunchies[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_PewterCrunchies[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_PewterCrunchies[] = INCBIN_U32("graphics/items/icons/pewter_crunchies.4bpp.lz"); +const u32 gItemIconPalette_PewterCrunchies[] = INCBIN_U32("graphics/items/icon_palettes/pewter_crunchies.gbapal.lz"); -//const u32 gItemIcon_RageCandyBar[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RageCandyBar[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_RageCandyBar[] = INCBIN_U32("graphics/items/icons/rage_candy_bar.4bpp.lz"); +const u32 gItemIconPalette_RageCandyBar[] = INCBIN_U32("graphics/items/icon_palettes/rage_candy_bar.gbapal.lz"); const u32 gItemIcon_LavaCookie[] = INCBIN_U32("graphics/items/icons/lava_cookie.4bpp.lz"); const u32 gItemIconPalette_LavaCookieAndLetter[] = INCBIN_U32("graphics/items/icon_palettes/lava_cookie_and_letter.gbapal.lz"); @@ -177,14 +177,14 @@ const u32 gItemIconPalette_LavaCookieAndLetter[] = INCBIN_U32("graphics/items/ic const u32 gItemIcon_OldGateau[] = INCBIN_U32("graphics/items/icons/old_gateau.4bpp.lz"); const u32 gItemIconPalette_OldGateau[] = INCBIN_U32("graphics/items/icon_palettes/old_gateau.gbapal.lz"); -//const u32 gItemIcon_CasteliaCone[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_CasteliaCone[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_Casteliacone[] = INCBIN_U32("graphics/items/icons/casteliacone.4bpp.lz"); +const u32 gItemIconPalette_Casteliacone[] = INCBIN_U32("graphics/items/icon_palettes/casteliacone.gbapal.lz"); -//const u32 gItemIcon_LumioseGalette[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_LumioseGalette[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_LumioseGalette[] = INCBIN_U32("graphics/items/icons/lumiose_galette.4bpp.lz"); +const u32 gItemIconPalette_LumioseGalette[] = INCBIN_U32("graphics/items/icon_palettes/lumiose_galette.gbapal.lz"); -//const u32 gItemIcon_ShalourSable[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ShalourSable[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_ShalourSable[] = INCBIN_U32("graphics/items/icons/shalour_sable.4bpp.lz"); +const u32 gItemIconPalette_ShalourSable[] = INCBIN_U32("graphics/items/icon_palettes/shalour_sable.gbapal.lz"); const u32 gItemIcon_BigMalasada[] = INCBIN_U32("graphics/items/icons/big_malasada.4bpp.lz"); const u32 gItemIconPalette_BigMalasada[] = INCBIN_U32("graphics/items/icon_palettes/big_malasada.gbapal.lz"); @@ -236,96 +236,33 @@ const u32 gItemIconPalette_SwiftFeather[] = INCBIN_U32("graphics/items/icon_pale const u32 gItemIcon_AbilityCapsule[] = INCBIN_U32("graphics/items/icons/ability_capsule.4bpp.lz"); const u32 gItemIconPalette_AbilityCapsule[] = INCBIN_U32("graphics/items/icon_palettes/ability_capsule.gbapal.lz"); -//const u32 gItemIcon_AbilityPatch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_AbilityPatch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_AbilityPatch[] = INCBIN_U32("graphics/items/icons/ability_patch.4bpp.lz"); +const u32 gItemIconPalette_AbilityPatch[] = INCBIN_U32("graphics/items/icon_palettes/ability_patch.gbapal.lz"); // Mints -//const u32 gItemIcon_LonelyMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_LonelyMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_AdamantMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_AdamantMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_NaughtyMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_NaughtyMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_BraveMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_BraveMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_BoldMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_BoldMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_ImpishMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ImpishMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_LaxMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_LaxMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RelaxedMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelaxedMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_ModestMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ModestMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_MildMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_MildMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RashMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RashMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_QuietMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_QuietMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_CalmMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_CalmMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_GentleMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_GentleMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_CarefulMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_CarefulMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_SassyMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_SassyMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_TimidMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_TimidMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_HastyMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_HastyMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_JollyMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_JollyMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_NaiveMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_NaiveMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_SeriousMint[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_SeriousMint[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_Mint[] = INCBIN_U32("graphics/items/icons/mint.4bpp.lz"); +const u32 gItemIconPalette_RedMint[] = INCBIN_U32("graphics/items/icon_palettes/red_mint.gbapal.lz"); +const u32 gItemIconPalette_BlueMint[] = INCBIN_U32("graphics/items/icon_palettes/blue_mint.gbapal.lz"); +const u32 gItemIconPalette_LightBlueMint[] = INCBIN_U32("graphics/items/icon_palettes/light_blue_mint.gbapal.lz"); +const u32 gItemIconPalette_PinkMint[] = INCBIN_U32("graphics/items/icon_palettes/pink_mint.gbapal.lz"); +const u32 gItemIconPalette_GreenMint[] = INCBIN_U32("graphics/items/icon_palettes/green_mint.gbapal.lz"); +const u32 gItemIconPalette_YellowMint[] = INCBIN_U32("graphics/items/icon_palettes/yellow_mint.gbapal.lz"); // Candy const u32 gItemIcon_RareCandy[] = INCBIN_U32("graphics/items/icons/rare_candy.4bpp.lz"); const u32 gItemIconPalette_RareCandy[] = INCBIN_U32("graphics/items/icon_palettes/rare_candy.gbapal.lz"); -//const u32 gItemIcon_EXPCandyXS[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_EXPCandyXS[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_ExpCandyXS[] = INCBIN_U32("graphics/items/icons/exp_candy_xs.4bpp.lz"); +const u32 gItemIcon_ExpCandyS[] = INCBIN_U32("graphics/items/icons/exp_candy_s.4bpp.lz"); +const u32 gItemIcon_ExpCandyM[] = INCBIN_U32("graphics/items/icons/exp_candy_m.4bpp.lz"); +const u32 gItemIcon_ExpCandyL[] = INCBIN_U32("graphics/items/icons/exp_candy_l.4bpp.lz"); +const u32 gItemIcon_ExpCandyXL[] = INCBIN_U32("graphics/items/icons/exp_candy_xl.4bpp.lz"); +const u32 gItemIconPalette_ExpCandies[] = INCBIN_U32("graphics/items/icon_palettes/exp_candies.gbapal.lz"); -//const u32 gItemIcon_EXPCandyS[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_EXPCandyS[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_EXPCandyM[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_EXPCandyM[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_EXPCandyL[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_EXPCandyL[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_EXPCandyXL[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_EXPCandyXL[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_DynamaxCandy[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_DynamaxCandy[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_DynamaxCandy[] = INCBIN_U32("graphics/items/icons/dynamax_candy.4bpp.lz"); +const u32 gItemIconPalette_DynamaxCandy[] = INCBIN_U32("graphics/items/icon_palettes/dynamax_candy.gbapal.lz"); // Medicinal Flutes @@ -351,14 +288,14 @@ const u32 gItemIconPalette_SuperRepel[] = INCBIN_U32("graphics/items/icon_palett const u32 gItemIconPalette_MaxRepel[] = INCBIN_U32("graphics/items/icon_palettes/max_repel.gbapal.lz"); -//const u32 gItemIcon_Lure[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_Lure[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_Lure[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +const u32 gItemIconPalette_Lure[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); -//const u32 gItemIcon_SuperLure[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_SuperLure[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_SuperLure[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +const u32 gItemIconPalette_SuperLure[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); -//const u32 gItemIcon_MaxLure[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_MaxLure[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_MaxLure[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); +const u32 gItemIconPalette_MaxLure[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); const u32 gItemIcon_EscapeRope[] = INCBIN_U32("graphics/items/icons/escape_rope.4bpp.lz"); const u32 gItemIconPalette_EscapeRope[] = INCBIN_U32("graphics/items/icon_palettes/escape_rope.gbapal.lz"); @@ -391,49 +328,47 @@ const u32 gItemIconPalette_PokeDoll[] = INCBIN_U32("graphics/items/icon_palettes const u32 gItemIcon_FluffyTail[] = INCBIN_U32("graphics/items/icons/fluffy_tail.4bpp.lz"); const u32 gItemIconPalette_FluffyTail[] = INCBIN_U32("graphics/items/icon_palettes/fluffy_tail.gbapal.lz"); -//const u32 gItemIcon_PokeToy[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_PokeToy[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_PokeToy[] = INCBIN_U32("graphics/items/icons/poke_toy.4bpp.lz"); +const u32 gItemIconPalette_PokeToy[] = INCBIN_U32("graphics/items/icon_palettes/poke_toy.gbapal.lz"); -//const u32 gItemIcon_MaxMushrooms[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_MaxMushrooms[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_MaxMushrooms[] = INCBIN_U32("graphics/items/icons/max_mushrooms.4bpp.lz"); +const u32 gItemIconPalette_MaxMushrooms[] = INCBIN_U32("graphics/items/icon_palettes/max_mushrooms.gbapal.lz"); // Treasures -//const u32 gItemIcon_BottleCap[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_BottleCap[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_GoldBottleCap[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_GoldBottleCap[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_BottleCap[] = INCBIN_U32("graphics/items/icons/bottle_cap.4bpp.lz"); +const u32 gItemIconPalette_BottleCap[] = INCBIN_U32("graphics/items/icon_palettes/bottle_cap.gbapal.lz"); +const u32 gItemIconPalette_GoldBottleCap[] = INCBIN_U32("graphics/items/icon_palettes/gold_bottle_cap.gbapal.lz"); const u32 gItemIcon_Nugget[] = INCBIN_U32("graphics/items/icons/nugget.4bpp.lz"); const u32 gItemIconPalette_Nugget[] = INCBIN_U32("graphics/items/icon_palettes/nugget.gbapal.lz"); -//const u32 gItemIcon_BigNugget[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_BigNugget[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_BigNugget[] = INCBIN_U32("graphics/items/icons/big_nugget.4bpp.lz"); +const u32 gItemIconPalette_BigNugget[] = INCBIN_U32("graphics/items/icon_palettes/big_nugget.gbapal.lz"); const u32 gItemIcon_TinyMushroom[] = INCBIN_U32("graphics/items/icons/tiny_mushroom.4bpp.lz"); const u32 gItemIconPalette_Mushroom[] = INCBIN_U32("graphics/items/icon_palettes/mushroom.gbapal.lz"); const u32 gItemIcon_BigMushroom[] = INCBIN_U32("graphics/items/icons/big_mushroom.4bpp.lz"); -//const u32 gItemIcon_BalmMushroom[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_BalmMushroom[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_BalmMushroom[] = INCBIN_U32("graphics/items/icons/balm_mushroom.4bpp.lz"); +const u32 gItemIconPalette_BalmMushroom[] = INCBIN_U32("graphics/items/icon_palettes/balm_mushroom.gbapal.lz"); const u32 gItemIcon_Pearl[] = INCBIN_U32("graphics/items/icons/pearl.4bpp.lz"); const u32 gItemIconPalette_Pearl[] = INCBIN_U32("graphics/items/icon_palettes/pearl.gbapal.lz"); const u32 gItemIcon_BigPearl[] = INCBIN_U32("graphics/items/icons/big_pearl.4bpp.lz"); -//const u32 gItemIcon_PearlString[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_PearlString[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_PearlString[] = INCBIN_U32("graphics/items/icons/pearl_string.4bpp.lz"); +const u32 gItemIconPalette_PearlString[] = INCBIN_U32("graphics/items/icon_palettes/pearl_string.gbapal.lz"); const u32 gItemIcon_Stardust[] = INCBIN_U32("graphics/items/icons/stardust.4bpp.lz"); const u32 gItemIconPalette_Star[] = INCBIN_U32("graphics/items/icon_palettes/star.gbapal.lz"); const u32 gItemIcon_StarPiece[] = INCBIN_U32("graphics/items/icons/star_piece.4bpp.lz"); -//const u32 gItemIcon_CometShard[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_CometShard[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_CometShard[] = INCBIN_U32("graphics/items/icons/comet_shard.4bpp.lz"); +const u32 gItemIconPalette_CometShard[] = INCBIN_U32("graphics/items/icon_palettes/comet_shard.gbapal.lz"); const u32 gItemIconPalette_ShoalSalt[] = INCBIN_U32("graphics/items/icon_palettes/shoal_salt.gbapal.lz"); @@ -464,32 +399,19 @@ const u32 gItemIconPalette_OddKeystone[] = INCBIN_U32("graphics/items/icon_palet const u32 gItemIcon_PrettyFeather[] = INCBIN_U32("graphics/items/icons/pretty_feather.4bpp.lz"); const u32 gItemIconPalette_PrettyFeather[] = INCBIN_U32("graphics/items/icon_palettes/pretty_feather.gbapal.lz"); -//const u32 gItemIcon_RelicCopper[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelicCopper[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_RelicCoin[] = INCBIN_U32("graphics/items/icons/relic_coin.4bpp.lz"); +const u32 gItemIconPalette_RelicCopper[] = INCBIN_U32("graphics/items/icon_palettes/relic_copper.gbapal.lz"); +const u32 gItemIconPalette_RelicSilver[] = INCBIN_U32("graphics/items/icon_palettes/relic_silver.gbapal.lz"); +const u32 gItemIconPalette_RelicGold[] = INCBIN_U32("graphics/items/icon_palettes/relic_gold.gbapal.lz"); -//const u32 gItemIcon_RelicCopper[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelicCopper[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_RelicVase[] = INCBIN_U32("graphics/items/icons/relic_vase.4bpp.lz"); +const u32 gItemIconPalette_Relics[] = INCBIN_U32("graphics/items/icon_palettes/relics.gbapal.lz"); +const u32 gItemIcon_RelicBand[] = INCBIN_U32("graphics/items/icons/relic_band.4bpp.lz"); +const u32 gItemIcon_RelicStatue[] = INCBIN_U32("graphics/items/icons/relic_statue.4bpp.lz"); +const u32 gItemIcon_RelicCrown[] = INCBIN_U32("graphics/items/icons/relic_crown.4bpp.lz"); -//const u32 gItemIcon_RelicSilver[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelicSilver[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RelicGold[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelicGold[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RelicVase[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelicVase[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RelicBand[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelicBand[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RelicStatue[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelicStatue[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RelicCrown[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RelicCrown[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_StrangeSouvenir[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_StrangeSouvenir[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_StrangeSouvenir[] = INCBIN_U32("graphics/items/icons/strange_souvenir.4bpp.lz"); +const u32 gItemIconPalette_StrangeSouvenir[] = INCBIN_U32("graphics/items/icon_palettes/strange_souvenir.gbapal.lz"); // Fossils @@ -524,43 +446,32 @@ const u32 gItemIconPalette_JawFossil[] = INCBIN_U32("graphics/items/icon_palette const u32 gItemIcon_SailFossil[] = INCBIN_U32("graphics/items/icons/sail_fossil.4bpp.lz"); const u32 gItemIconPalette_SailFossil[] = INCBIN_U32("graphics/items/icon_palettes/sail_fossil.gbapal.lz"); -//const u32 gItemIcon_FossilizedBird[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_FossilizedBird[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_FossilizedBird[] = INCBIN_U32("graphics/items/icons/fossilized_bird.4bpp.lz"); +const u32 gItemIconPalette_FossilizedBird[] = INCBIN_U32("graphics/items/icon_palettes/fossilized_bird.gbapal.lz"); -//const u32 gItemIcon_FossilizedFish[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_FossilizedFish[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_FossilizedFish[] = INCBIN_U32("graphics/items/icons/fossilized_fish.4bpp.lz"); +const u32 gItemIconPalette_FossilizedFish[] = INCBIN_U32("graphics/items/icon_palettes/fossilized_fish.gbapal.lz"); -//const u32 gItemIcon_FossilizedDrake[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_FossilizedDrake[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_FossilizedDrake[] = INCBIN_U32("graphics/items/icons/fossilized_drake.4bpp.lz"); +const u32 gItemIconPalette_FossilizedDrake[] = INCBIN_U32("graphics/items/icon_palettes/fossilized_drake.gbapal.lz"); -//const u32 gItemIcon_FossilizedDino[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_FossilizedDino[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_FossilizedDino[] = INCBIN_U32("graphics/items/icons/fossilized_dino.4bpp.lz"); +const u32 gItemIconPalette_FossilizedDino[] = INCBIN_U32("graphics/items/icon_palettes/fossilized_dino.gbapal.lz"); // Mulch -//const u32 gItemIcon_GrowthMulch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_GrowthMulch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_Mulch[] = INCBIN_U32("graphics/items/icons/mulch.4bpp.lz"); +const u32 gItemIconPalette_GrowthMulch[] = INCBIN_U32("graphics/items/icon_palettes/growth_mulch.gbapal.lz"); +const u32 gItemIconPalette_DampMulch[] = INCBIN_U32("graphics/items/icon_palettes/damp_mulch.gbapal.lz"); -//const u32 gItemIcon_DampMulch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_DampMulch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_StableMulch[] = INCBIN_U32("graphics/items/icons/stable_mulch.4bpp.lz"); +const u32 gItemIconPalette_StableMulch[] = INCBIN_U32("graphics/items/icon_palettes/stable_mulch.gbapal.lz"); -//const u32 gItemIcon_StableMulch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_StableMulch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_GooeyMulch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_GooeyMulch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RichMulch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RichMulch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_SurpriseMulch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_SurpriseMulch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_BoostMulch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_BoostMulch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_AmazeMulch[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_AmazeMulch[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIconPalette_GooeyMulch[] = INCBIN_U32("graphics/items/icon_palettes/gooey_mulch.gbapal.lz"); +const u32 gItemIconPalette_RichMulch[] = INCBIN_U32("graphics/items/icon_palettes/rich_mulch.gbapal.lz"); +const u32 gItemIconPalette_SurpriseMulch[] = INCBIN_U32("graphics/items/icon_palettes/surprise_mulch.gbapal.lz"); +const u32 gItemIconPalette_BoostMulch[] = INCBIN_U32("graphics/items/icon_palettes/boost_mulch.gbapal.lz"); +const u32 gItemIconPalette_AmazeMulch[] = INCBIN_U32("graphics/items/icon_palettes/amaze_mulch.gbapal.lz"); // Apricorns @@ -585,17 +496,17 @@ const u32 gItemIconPalette_WhiteApricorn[] = INCBIN_U32("graphics/items/icon_pal const u32 gItemIcon_BlackApricorn[] = INCBIN_U32("graphics/items/icons/black_apricorn.4bpp.lz"); const u32 gItemIconPalette_BlackApricorn[] = INCBIN_U32("graphics/items/icon_palettes/black_apricorn.gbapal.lz"); -//const u32 gItemIcon_WishingPiece[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_WishingPiece[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_WishingPiece[] = INCBIN_U32("graphics/items/icons/wishing_piece.4bpp.lz"); +const u32 gItemIconPalette_WishingPiece[] = INCBIN_U32("graphics/items/icon_palettes/wishing_piece.gbapal.lz"); -//const u32 gItemIcon_GalaricaTwig[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_GalaricaTwig[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_GalaricaTwig[] = INCBIN_U32("graphics/items/icons/galarica_twig.4bpp.lz"); +const u32 gItemIconPalette_GalaricaItem[] = INCBIN_U32("graphics/items/icon_palettes/galarica_item.gbapal.lz"); -//const u32 gItemIcon_ArmoriteOre[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ArmoriteOre[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_ArmoriteOre[] = INCBIN_U32("graphics/items/icons/armorite_ore.4bpp.lz"); +const u32 gItemIconPalette_ArmoriteOre[] = INCBIN_U32("graphics/items/icon_palettes/armorite_ore.gbapal.lz"); -//const u32 gItemIcon_DyniteOre[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_DyniteOre[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_DyniteOre[] = INCBIN_U32("graphics/items/icons/dynite_ore.4bpp.lz"); +const u32 gItemIconPalette_DyniteOre[] = INCBIN_U32("graphics/items/icon_palettes/dynite_ore.gbapal.lz"); // Mail @@ -667,23 +578,19 @@ const u32 gItemIconPalette_DuskStone[] = INCBIN_U32("graphics/items/icon_palette const u32 gItemIcon_DawnStone[] = INCBIN_U32("graphics/items/icons/dawn_stone.4bpp.lz"); const u32 gItemIconPalette_DawnStone[] = INCBIN_U32("graphics/items/icon_palettes/dawn_stone.gbapal.lz"); -//const u32 gItemIcon_SweetApple[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_SweetApple[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_SweetApple[] = INCBIN_U32("graphics/items/icons/sweet_apple.4bpp.lz"); +const u32 gItemIconPalette_SweetApple[] = INCBIN_U32("graphics/items/icon_palettes/sweet_apple.gbapal.lz"); -//const u32 gItemIcon_TartApple[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_TartApple[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_TartApple[] = INCBIN_U32("graphics/items/icons/tart_apple.4bpp.lz"); +const u32 gItemIconPalette_TartApple[] = INCBIN_U32("graphics/items/icon_palettes/tart_apple.gbapal.lz"); -//const u32 gItemIcon_CrackedPot[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_CrackedPot[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_CrackedPot[] = INCBIN_U32("graphics/items/icons/cracked_pot.4bpp.lz"); +const u32 gItemIcon_ChippedPot[] = INCBIN_U32("graphics/items/icons/chipped_pot.4bpp.lz"); +const u32 gItemIconPalette_Pot[] = INCBIN_U32("graphics/items/icon_palettes/pot.gbapal.lz"); -//const u32 gItemIcon_ChippedPot[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ChippedPot[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_GalaricaCuff[] = INCBIN_U32("graphics/items/icons/galarica_cuff.4bpp.lz"); -//const u32 gItemIcon_GalaricaCuff[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_GalaricaCuff[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_GalaricaWreath[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_GalaricaWreath[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_GalaricaWreath[] = INCBIN_U32("graphics/items/icons/galarica_wreath.4bpp.lz"); const u32 gItemIcon_DragonScale[] = INCBIN_U32("graphics/items/icons/dragon_scale.4bpp.lz"); const u32 gItemIconPalette_DragonScale[] = INCBIN_U32("graphics/items/icon_palettes/dragon_scale.gbapal.lz"); @@ -718,26 +625,26 @@ const u32 gItemIconPalette_Sachet[] = INCBIN_U32("graphics/items/icon_palettes/s const u32 gItemIcon_OvalStone[] = INCBIN_U32("graphics/items/icons/oval_stone.4bpp.lz"); const u32 gItemIconPalette_OvalStone[] = INCBIN_U32("graphics/items/icon_palettes/oval_stone.gbapal.lz"); -//const u32 gItemIcon_StrawberrySweet[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_StrawberrySweet[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_StrawberrySweet[] = INCBIN_U32("graphics/items/icons/strawberry_sweet.4bpp.lz"); +const u32 gItemIconPalette_StrawberrySweet[] = INCBIN_U32("graphics/items/icon_palettes/strawberry_sweet.gbapal.lz"); -//const u32 gItemIcon_LoveSweet[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_LoveSweet[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_LoveSweet[] = INCBIN_U32("graphics/items/icons/love_sweet.4bpp.lz"); +const u32 gItemIconPalette_LoveSweet[] = INCBIN_U32("graphics/items/icon_palettes/love_sweet.gbapal.lz"); -//const u32 gItemIcon_BerrySweet[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_BerrySweet[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_BerrySweet[] = INCBIN_U32("graphics/items/icons/berry_sweet.4bpp.lz"); +const u32 gItemIconPalette_BerrySweet[] = INCBIN_U32("graphics/items/icon_palettes/berry_sweet.gbapal.lz"); -//const u32 gItemIcon_CloverSweet[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_CloverSweet[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_CloverSweet[] = INCBIN_U32("graphics/items/icons/clover_sweet.4bpp.lz"); +const u32 gItemIconPalette_CloverSweet[] = INCBIN_U32("graphics/items/icon_palettes/clover_sweet.gbapal.lz"); -//const u32 gItemIcon_FlowerSweet[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_FlowerSweet[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_FlowerSweet[] = INCBIN_U32("graphics/items/icons/flower_sweet.4bpp.lz"); +const u32 gItemIconPalette_FlowerSweet[] = INCBIN_U32("graphics/items/icon_palettes/flower_sweet.gbapal.lz"); -//const u32 gItemIcon_StarSweet[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_StarSweet[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_StarSweet[] = INCBIN_U32("graphics/items/icons/star_sweet.4bpp.lz"); +const u32 gItemIconPalette_StarSweet[] = INCBIN_U32("graphics/items/icon_palettes/star_sweet.gbapal.lz"); -//const u32 gItemIcon_RibbonSweet[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RibbonSweet[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_RibbonSweet[] = INCBIN_U32("graphics/items/icons/ribbon_sweet.4bpp.lz"); +const u32 gItemIconPalette_RibbonSweet[] = INCBIN_U32("graphics/items/icon_palettes/ribbon_sweet.gbapal.lz"); const u32 gItemIcon_Everstone[] = INCBIN_U32("graphics/items/icons/everstone.4bpp.lz"); const u32 gItemIconPalette_Everstone[] = INCBIN_U32("graphics/items/icon_palettes/everstone.gbapal.lz"); @@ -876,11 +783,9 @@ const u32 gItemIconPalette_SteelMemory[] = INCBIN_U32("graphics/items/icon_palet const u32 gItemIcon_FairyMemory[] = INCBIN_U32("graphics/items/icons/fairy_memory.4bpp.lz"); const u32 gItemIconPalette_FairyMemory[] = INCBIN_U32("graphics/items/icon_palettes/fairy_memory.gbapal.lz"); -//const u32 gItemIcon_RustedSword[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RustedSword[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_RustedShield[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RustedShield[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_RustedSword[] = INCBIN_U32("graphics/items/icons/rusted_sword.4bpp.lz"); +const u32 gItemIcon_RustedShield[] = INCBIN_U32("graphics/items/icons/rusted_shield.4bpp.lz"); +const u32 gItemIconPalette_RustedWeapons[] = INCBIN_U32("graphics/items/icon_palettes/rusted_weapons.gbapal.lz"); // Colored Orbs @@ -890,8 +795,8 @@ const u32 gItemIconPalette_RedOrb[] = INCBIN_U32("graphics/items/icon_palettes/r const u32 gItemIcon_BlueOrb[] = INCBIN_U32("graphics/items/icons/blue_orb.4bpp.lz"); const u32 gItemIconPalette_BlueOrb[] = INCBIN_U32("graphics/items/icon_palettes/blue_orb.gbapal.lz"); -//const u32 gItemIcon_JadeOrb[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_JadeOrb[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_JadeOrb[] = INCBIN_U32("graphics/items/icons/jade_orb.4bpp.lz"); +const u32 gItemIconPalette_JadeOrb[] = INCBIN_U32("graphics/items/icon_palettes/jade_orb.gbapal.lz"); // Mega Stones @@ -1562,23 +1467,23 @@ const u32 gItemIconPalette_TerrainExtender[] = INCBIN_U32("graphics/items/icon_p const u32 gItemIcon_ProtectivePads[] = INCBIN_U32("graphics/items/icons/protective_pads.4bpp.lz"); const u32 gItemIconPalette_ProtectivePads[] = INCBIN_U32("graphics/items/icon_palettes/protective_pads.gbapal.lz"); -//const u32 gItemIcon_ThroatSpray[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ThroatSpray[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_ThroatSpray[] = INCBIN_U32("graphics/items/icons/throat_spray.4bpp.lz"); +const u32 gItemIconPalette_ThroatSpray[] = INCBIN_U32("graphics/items/icon_palettes/throat_spray.gbapal.lz"); -//const u32 gItemIcon_EjectPack[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_EjectPack[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_EjectPack[] = INCBIN_U32("graphics/items/icons/eject_pack.4bpp.lz"); +const u32 gItemIconPalette_EjectPack[] = INCBIN_U32("graphics/items/icon_palettes/eject_pack.gbapal.lz"); -//const u32 gItemIcon_HeavyDutyBoots[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_HeavyDutyBoots[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_HeavyDutyBoots[] = INCBIN_U32("graphics/items/icons/heavy_duty_boots.4bpp.lz"); +const u32 gItemIconPalette_HeavyDutyBoots[] = INCBIN_U32("graphics/items/icon_palettes/heavy_duty_boots.gbapal.lz"); -//const u32 gItemIcon_BlunderPolicy[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_BlunderPolicy[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_BlunderPolicy[] = INCBIN_U32("graphics/items/icons/blunder_policy.4bpp.lz"); +const u32 gItemIconPalette_BlunderPolicy[] = INCBIN_U32("graphics/items/icon_palettes/blunder_policy.gbapal.lz"); -//const u32 gItemIcon_RoomService[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RoomService[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_RoomService[] = INCBIN_U32("graphics/items/icons/room_service.4bpp.lz"); +const u32 gItemIconPalette_RoomService[] = INCBIN_U32("graphics/items/icon_palettes/room_service.gbapal.lz"); -//const u32 gItemIcon_UtilityUmbrella[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_UtilityUmbrella[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_UtilityUmbrella[] = INCBIN_U32("graphics/items/icons/utility_umbrella.4bpp.lz"); +const u32 gItemIconPalette_UtilityUmbrella[] = INCBIN_U32("graphics/items/icon_palettes/utility_umbrella.gbapal.lz"); // Berries @@ -1762,8 +1667,8 @@ const u32 gItemIconPalette_LansatBerry[] = INCBIN_U32("graphics/items/icon_palet const u32 gItemIcon_StarfBerry[] = INCBIN_U32("graphics/items/icons/starf_berry.4bpp.lz"); const u32 gItemIconPalette_StarfBerry[] = INCBIN_U32("graphics/items/icon_palettes/starf_berry.gbapal.lz"); -//const u32 gItemIcon_EnigmaBerry[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_EnigmaBerry[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_EnigmaBerry[] = INCBIN_U32("graphics/items/icons/enigma_berry.4bpp.lz"); +const u32 gItemIconPalette_EnigmaBerry[] = INCBIN_U32("graphics/items/icon_palettes/enigma_berry.gbapal.lz"); const u32 gItemIcon_MicleBerry[] = INCBIN_U32("graphics/items/icons/micle_berry.4bpp.lz"); const u32 gItemIconPalette_MicleBerry[] = INCBIN_U32("graphics/items/icon_palettes/micle_berry.gbapal.lz"); @@ -1783,9 +1688,6 @@ const u32 gItemIconPalette_KeeBerry[] = INCBIN_U32("graphics/items/icon_palettes const u32 gItemIcon_MarangaBerry[] = INCBIN_U32("graphics/items/icons/maranga_berry.4bpp.lz"); const u32 gItemIconPalette_MarangaBerry[] = INCBIN_U32("graphics/items/icon_palettes/maranga_berry.gbapal.lz"); -const u32 gItemIcon_EnigmaBerry[] = INCBIN_U32("graphics/items/icons/enigma_berry.4bpp.lz"); -const u32 gItemIconPalette_EnigmaBerry[] = INCBIN_U32("graphics/items/icon_palettes/enigma_berry.gbapal.lz"); - // TMs/HMs const u32 gItemIcon_TM[] = INCBIN_U32("graphics/items/icons/tm.4bpp.lz"); @@ -1836,60 +1738,55 @@ const u32 gItemIconPalette_OvalCharm[] = INCBIN_U32("graphics/items/icon_palette const u32 gItemIcon_ShinyCharm[] = INCBIN_U32("graphics/items/icons/shiny_charm.4bpp.lz"); const u32 gItemIconPalette_ShinyCharm[] = INCBIN_U32("graphics/items/icon_palettes/shiny_charm.gbapal.lz"); -//const u32 gItemIcon_CatchingCharm[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_CatchingCharm[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_CatchingCharm[] = INCBIN_U32("graphics/items/icons/catching_charm.4bpp.lz"); +const u32 gItemIconPalette_CatchingCharm[] = INCBIN_U32("graphics/items/icon_palettes/catching_charm.gbapal.lz"); -//const u32 gItemIcon_ExpCharm[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ExpCharm[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_ExpCharm[] = INCBIN_U32("graphics/items/icons/exp_charm.4bpp.lz"); +const u32 gItemIconPalette_ExpCharm[] = INCBIN_U32("graphics/items/icon_palettes/exp_charm.gbapal.lz"); // Form-changing Key Items -//const u32 gItemIcon_RotomCatalog[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RotomCatalog[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_RotomCatalog[] = INCBIN_U32("graphics/items/icons/rotom_catalog.4bpp.lz"); +const u32 gItemIconPalette_RotomCatalog[] = INCBIN_U32("graphics/items/icon_palettes/rotom_catalog.gbapal.lz"); const u32 gItemIcon_Gracidea[] = INCBIN_U32("graphics/items/icons/gracidea.4bpp.lz"); const u32 gItemIconPalette_Gracidea[] = INCBIN_U32("graphics/items/icon_palettes/gracidea.gbapal.lz"); -//const u32 gItemIcon_RevealGlass[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_RevealGlass[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_RevealGlass[] = INCBIN_U32("graphics/items/icons/reveal_glass.4bpp.lz"); +const u32 gItemIconPalette_RevealGlass[] = INCBIN_U32("graphics/items/icon_palettes/reveal_glass.gbapal.lz"); -//const u32 gItemIcon_DNASplicers[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_DNASplicers[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_DNASplicers[] = INCBIN_U32("graphics/items/icons/dna_splicers.4bpp.lz"); +const u32 gItemIconPalette_DNASplicers[] = INCBIN_U32("graphics/items/icon_palettes/dna_splicers.gbapal.lz"); -//const u32 gItemIcon_ZygardeCube[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ZygardeCube[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_ZygardeCube[] = INCBIN_U32("graphics/items/icons/zygarde_cube.4bpp.lz"); +const u32 gItemIconPalette_ZygardeCube[] = INCBIN_U32("graphics/items/icon_palettes/zygarde_cube.gbapal.lz"); -//const u32 gItemIcon_PrisonBottle[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_PrisonBottle[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_PrisonBottle[] = INCBIN_U32("graphics/items/icons/prison_bottle.4bpp.lz"); +const u32 gItemIconPalette_PrisonBottle[] = INCBIN_U32("graphics/items/icon_palettes/prison_bottle.gbapal.lz"); -//const u32 gItemIcon_NSolarizer[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_NSolarizer[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_NecrozmaFuser[] = INCBIN_U32("graphics/items/icons/necrozma_fuser.4bpp.lz"); +const u32 gItemIconPalette_NSolarizer[] = INCBIN_U32("graphics/items/icon_palettes/n_solarizer.gbapal.lz"); +const u32 gItemIconPalette_NLunarizer[] = INCBIN_U32("graphics/items/icon_palettes/n_lunarizer.gbapal.lz"); -//const u32 gItemIcon_NLunarizer[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_NLunarizer[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); - -//const u32 gItemIcon_ReinsOfUnity[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ReinsOfUnity[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_ReinsOfUnity[] = INCBIN_U32("graphics/items/icons/reins_of_unity.4bpp.lz"); +const u32 gItemIconPalette_ReinsOfUnity[] = INCBIN_U32("graphics/items/icon_palettes/reins_of_unity.gbapal.lz"); // Battle Mechanic Key Items -//const u32 gItemIcon_KeyStone[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_KeyStone[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_KeyStone[] = INCBIN_U32("graphics/items/icons/key_stone.4bpp.lz"); +const u32 gItemIconPalette_KeyStone[] = INCBIN_U32("graphics/items/icon_palettes/key_stone.gbapal.lz"); -//const u32 gItemIcon_MegaRing[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_MegaRing[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_MegaRing[] = INCBIN_U32("graphics/items/icons/mega_ring.4bpp.lz"); +const u32 gItemIconPalette_MegaRing[] = INCBIN_U32("graphics/items/icon_palettes/mega_ring.gbapal.lz"); -//const u32 gItemIcon_MegaBracelet[] = INCBIN_U32("graphics/items/icons/mega_bracelet.4bpp.lz"); // Remove -//const u32 gItemIconPalette_MegaBracelet[] = INCBIN_U32("graphics/items/icon_palettes/mega_bracelet.gbapal.lz"); // Remove +const u32 gItemIcon_ZPowerRing[] = INCBIN_U32("graphics/items/icons/z_power_ring.4bpp.lz"); +const u32 gItemIconPalette_ZPowerRing[] = INCBIN_U32("graphics/items/icon_palettes/z_power_ring.gbapal.lz"); -//const u32 gItemIcon_ZPowerRing[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_ZPowerRing[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_ZRing[] = INCBIN_U32("graphics/items/icons/z_ring.4bpp.lz"); // Remove +const u32 gItemIconPalette_ZRing[] = INCBIN_U32("graphics/items/icon_palettes/z_ring.gbapal.lz"); // Remove -//const u32 gItemIcon_ZRing[] = INCBIN_U32("graphics/items/icons/z_ring.4bpp.lz"); // Remove -//const u32 gItemIconPalette_ZRing[] = INCBIN_U32("graphics/items/icon_palettes/z_ring.gbapal.lz"); // Remove - -//const u32 gItemIcon_DynamaxBand[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_DynamaxBand[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_DynamaxBand[] = INCBIN_U32("graphics/items/icons/dynamax_band.4bpp.lz"); +const u32 gItemIconPalette_DynamaxBand[] = INCBIN_U32("graphics/items/icon_palettes/dynamax_band.gbapal.lz"); // Misc. Key Items @@ -1926,8 +1823,8 @@ const u32 gItemIconPalette_TMCase[] = INCBIN_U32("graphics/items/icon_palettes/t const u32 gItemIcon_BerryPouch[] = INCBIN_U32("graphics/items/icons/berry_pouch.4bpp.lz"); const u32 gItemIconPalette_BerryPouch[] = INCBIN_U32("graphics/items/icon_palettes/berry_pouch.gbapal.lz"); -//const u32 gItemIcon_PokemonBoxLink[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_PokemonBoxLink[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_PokemonBoxLink[] = INCBIN_U32("graphics/items/icons/pokemon_box_link.4bpp.lz"); +const u32 gItemIconPalette_PokemonBoxLink[] = INCBIN_U32("graphics/items/icon_palettes/pokemon_box_link.gbapal.lz"); const u32 gItemIcon_CoinCase[] = INCBIN_U32("graphics/items/icons/coin_case.4bpp.lz"); const u32 gItemIconPalette_CoinCase[] = INCBIN_U32("graphics/items/icon_palettes/coin_case.gbapal.lz"); @@ -1938,8 +1835,8 @@ const u32 gItemIconPalette_PowderJar[] = INCBIN_U32("graphics/items/icon_palette const u32 gItemIcon_WailmerPail[] = INCBIN_U32("graphics/items/icons/wailmer_pail.4bpp.lz"); const u32 gItemIconPalette_WailmerPail[] = INCBIN_U32("graphics/items/icon_palettes/wailmer_pail.gbapal.lz"); -//const u32 gItemIcon_PokeRadar[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz"); -//const u32 gItemIconPalette_PokeRadar[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz"); +const u32 gItemIcon_PokeRadar[] = INCBIN_U32("graphics/items/icons/poke_radar.4bpp.lz"); +const u32 gItemIconPalette_PokeRadar[] = INCBIN_U32("graphics/items/icon_palettes/poke_radar.gbapal.lz"); const u32 gItemIcon_PokeblockCase[] = INCBIN_U32("graphics/items/icons/pokeblock_case.4bpp.lz"); const u32 gItemIconPalette_PokeblockCase[] = INCBIN_U32("graphics/items/icon_palettes/pokeblock_case.gbapal.lz"); diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index 20ecada73..4dc8b50d9 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -58,15 +58,15 @@ const u32 *const gItemIconTable[][2] = [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_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_MAX_HONEY] = {gItemIcon_MaxHoney, gItemIconPalette_MaxHoney}, // Regional Specialties - [ITEM_PEWTER_CRUNCHIES] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RAGE_CANDY_BAR] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_LUMIOSE_GALETTE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_SHALOUR_SABLE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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}, @@ -86,37 +86,37 @@ const u32 *const gItemIconTable[][2] = [ITEM_SWIFT_FEATHER] = {gItemIcon_SwiftFeather, gItemIconPalette_SwiftFeather}, // Ability Modifiers [ITEM_ABILITY_CAPSULE] = {gItemIcon_AbilityCapsule, gItemIconPalette_AbilityCapsule}, - [ITEM_ABILITY_PATCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_ABILITY_PATCH] = {gItemIcon_AbilityPatch, gItemIconPalette_AbilityPatch}, // Mints - [ITEM_LONELY_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_ADAMANT_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_NAUGHTY_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_BRAVE_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_BOLD_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_IMPISH_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_LAX_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RELAXED_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_MODEST_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_MILD_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RASH_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_QUIET_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_CALM_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_GENTLE_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_CAREFUL_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_SASSY_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_TIMID_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_HASTY_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_JOLLY_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_NAIVE_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_SERIOUS_MINT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_EXP_CANDY_S] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_EXP_CANDY_M] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_EXP_CANDY_L] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_EXP_CANDY_XL] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_DYNAMAX_CANDY] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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}, @@ -128,9 +128,9 @@ const u32 *const gItemIconTable[][2] = [ITEM_REPEL] = {gItemIcon_Repel, gItemIconPalette_Repel}, [ITEM_SUPER_REPEL] = {gItemIcon_Repel, gItemIconPalette_SuperRepel}, [ITEM_MAX_REPEL] = {gItemIcon_Repel, gItemIconPalette_MaxRepel}, - [ITEM_LURE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_SUPER_LURE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_MAX_LURE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_LURE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_SUPER_LURE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, + [ITEM_MAX_LURE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, [ITEM_ESCAPE_ROPE] = {gItemIcon_EscapeRope, gItemIconPalette_EscapeRope}, // X Items [ITEM_X_ATTACK] = {gItemIcon_BattleStatItem, gItemIconPalette_XAttack}, @@ -144,22 +144,22 @@ const u32 *const gItemIconTable[][2] = // Escape Items [ITEM_POKE_DOLL] = {gItemIcon_PokeDoll, gItemIconPalette_PokeDoll}, [ITEM_FLUFFY_TAIL] = {gItemIcon_FluffyTail, gItemIconPalette_FluffyTail}, - [ITEM_POKE_TOY] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_MAX_MUSHROOMS] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_POKE_TOY] = {gItemIcon_PokeToy, gItemIconPalette_PokeToy}, + [ITEM_MAX_MUSHROOMS] = {gItemIcon_MaxMushrooms, gItemIconPalette_MaxMushrooms}, // Treasures - [ITEM_BOTTLE_CAP] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_GOLD_BOTTLE_CAP] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_BALM_MUSHROOM] = {gItemIcon_BalmMushroom, gItemIconPalette_BalmMushroom}, [ITEM_PEARL] = {gItemIcon_Pearl, gItemIconPalette_Pearl}, [ITEM_BIG_PEARL] = {gItemIcon_BigPearl, gItemIconPalette_Pearl}, - [ITEM_PEARL_STRING] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_PEARL_STRING] = {gItemIcon_PearlString, gItemIconPalette_PearlString}, [ITEM_STARDUST] = {gItemIcon_Stardust, gItemIconPalette_Star}, [ITEM_STAR_PIECE] = {gItemIcon_StarPiece, gItemIconPalette_Star}, - [ITEM_COMET_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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}, @@ -171,14 +171,14 @@ const u32 *const gItemIconTable[][2] = [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_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RELIC_SILVER] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RELIC_GOLD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RELIC_VASE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RELIC_BAND] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RELIC_STATUE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RELIC_CROWN] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_STRANGE_SOUVENIR] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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}, @@ -191,19 +191,19 @@ const u32 *const gItemIconTable[][2] = [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_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_FOSSILIZED_FISH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_FOSSILIZED_DRAKE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_FOSSILIZED_DINO] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_DAMP_MULCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_STABLE_MULCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_GOOEY_MULCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RICH_MULCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_SURPRISE_MULCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_BOOST_MULCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_AMAZE_MULCH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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}, @@ -212,10 +212,10 @@ const u32 *const gItemIconTable[][2] = [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_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_GALARICA_TWIG] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_ARMORITE_ORE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_DYNITE_ORE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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}, @@ -240,12 +240,12 @@ const u32 *const gItemIconTable[][2] = [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_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_TART_APPLE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_CRACKED_POT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_CHIPPED_POT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_GALARICA_CUFF] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_GALARICA_WREATH] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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}, @@ -257,13 +257,13 @@ const u32 *const gItemIconTable[][2] = [ITEM_WHIPPED_DREAM] = {gItemIcon_WhippedDream, gItemIconPalette_WhippedDream}, [ITEM_SACHET] = {gItemIcon_Sachet, gItemIconPalette_Sachet}, [ITEM_OVAL_STONE] = {gItemIcon_OvalStone, gItemIconPalette_OvalStone}, - [ITEM_STRAWBERRY_SWEET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_LOVE_SWEET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_BERRY_SWEET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_CLOVER_SWEET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_FLOWER_SWEET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_STAR_SWEET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RIBBON_SWEET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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}, @@ -311,12 +311,12 @@ const u32 *const gItemIconTable[][2] = [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_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_RUSTED_SHIELD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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}, - [ITEM_JADE_ORB] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_JADE_ORB] = {gItemIcon_JadeOrb, gItemIconPalette_JadeOrb}, // Mega Stones [ITEM_VENUSAURITE] = {gItemIcon_Venusaurite, gItemIconPalette_Venusaurite}, [ITEM_CHARIZARDITE_X] = {gItemIcon_CharizarditeX, gItemIconPalette_CharizarditeX}, @@ -547,12 +547,12 @@ const u32 *const gItemIconTable[][2] = [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_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_EJECT_PACK] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_HEAVY_DUTY_BOOTS] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_BLUNDER_POLICY] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_ROOM_SERVICE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_UTILITY_UMBRELLA] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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}, @@ -614,7 +614,7 @@ const u32 *const gItemIconTable[][2] = [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_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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}, @@ -673,56 +673,56 @@ const u32 *const gItemIconTable[][2] = [ITEM_TM48] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, [ITEM_TM49] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, [ITEM_TM50] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, - [ITEM_TM51] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM52] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM53] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM54] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM55] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM56] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM57] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM58] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM59] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM60] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM61] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM62] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM63] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM64] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM65] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM66] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM67] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM68] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM69] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM70] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM71] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM72] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM73] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM74] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM75] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM76] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM77] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM78] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM79] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM80] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM81] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM82] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM83] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM84] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM85] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM86] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM87] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM88] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM89] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM90] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM91] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM92] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM93] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM94] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM95] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM96] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM97] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM98] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM99] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo - [ITEM_TM100] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // Todo + [ITEM_TM51] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM52] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM53] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM54] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM55] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM56] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM57] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM58] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM59] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM60] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM61] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM62] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM63] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM64] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM65] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM66] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM67] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM68] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM69] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM70] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM71] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM72] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM73] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM74] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM75] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM76] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM77] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM78] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM79] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM80] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM81] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM82] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM83] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM84] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM85] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM86] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM87] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM88] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM89] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM90] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM91] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM92] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM93] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM94] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM95] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM96] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM97] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM98] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM99] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, + [ITEM_TM100] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, [ITEM_HM01] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, [ITEM_HM02] = {gItemIcon_HM, gItemIconPalette_FlyingTMHM}, [ITEM_HM03] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, @@ -734,23 +734,23 @@ const u32 *const gItemIconTable[][2] = // Charms [ITEM_OVAL_CHARM] = {gItemIcon_OvalCharm, gItemIconPalette_OvalCharm}, [ITEM_SHINY_CHARM] = {gItemIcon_ShinyCharm, gItemIconPalette_ShinyCharm}, - [ITEM_CATCHING_CHARM] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_EXP_CHARM] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_CATCHING_CHARM] = {gItemIcon_CatchingCharm, gItemIconPalette_CatchingCharm}, + [ITEM_EXP_CHARM] = {gItemIcon_ExpCharm, gItemIconPalette_ExpCharm}, // Form-changing Key Items - [ITEM_ROTOM_CATALOG] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_ROTOM_CATALOG] = {gItemIcon_RotomCatalog, gItemIconPalette_RotomCatalog}, [ITEM_GRACIDEA] = {gItemIcon_Gracidea, gItemIconPalette_Gracidea}, - [ITEM_REVEAL_GLASS] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_DNA_SPLICERS] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_ZYGARDE_CUBE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_PRISON_BOTTLE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_N_SOLARIZER] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_N_LUNARIZER] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_REINS_OF_UNITY] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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_KEY_STONE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_MEGA_RING] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_Z_POWER_RING] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo - [ITEM_DYNAMAX_BAND] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [ITEM_KEY_STONE] = {gItemIcon_KeyStone, gItemIconPalette_KeyStone}, + [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}, @@ -763,11 +763,11 @@ const u32 *const gItemIconTable[][2] = [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_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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_QuestionMark, gItemIconPalette_QuestionMark}, // Todo + [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},