diff --git a/graphics/items/icon_palettes/metal_alloy.pal b/graphics/items/icon_palettes/metal_alloy.pal new file mode 100644 index 0000000000..8375639923 --- /dev/null +++ b/graphics/items/icon_palettes/metal_alloy.pal @@ -0,0 +1,18 @@ +JASC-PAL +0100 +15 +0 0 0 +249 253 255 +224 232 243 +169 163 177 +136 130 156 +178 194 220 +123 146 180 +162 164 202 +153 208 247 +85 96 152 +136 150 213 +186 212 247 +90 118 181 +154 195 255 +49 49 49 diff --git a/graphics/items/icons/metal_alloy.png b/graphics/items/icons/metal_alloy.png new file mode 100644 index 0000000000..408e13dd5b Binary files /dev/null and b/graphics/items/icons/metal_alloy.png differ diff --git a/include/constants/items.h b/include/constants/items.h index dbe8c9acd2..0be82dcb5f 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -986,8 +986,8 @@ #define ITEM_SWIFT_MOCHI 811 #define ITEM_FRESH_START_MOCHI 812 #define ITEM_GLIMMERING_CHARM 813 -#define ITEM_814 814 // TWV0YWwgQWxsb3k= -#define ITEM_815 815 // U3RlbGxhciBUZXJhIFNoYXJk +#define ITEM_METAL_ALLOY 814 +#define ITEM_STELLAR_TERA_SHARD 815 #define ITEMS_COUNT 816 #define ITEM_FIELD_ARROW ITEMS_COUNT diff --git a/include/graphics.h b/include/graphics.h index 9d7258e32d..d8248575f8 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -785,6 +785,8 @@ extern const u32 gItemIcon_UnremarkableTeacup[]; extern const u32 gItemIconPalette_UnremarkableTeacup[]; extern const u32 gItemIcon_MasterpieceTeacup[]; extern const u32 gItemIconPalette_MasterpieceTeacup[]; +extern const u32 gItemIcon_MetalAlloy[]; +extern const u32 gItemIconPalette_MetalAlloy[]; // Nectars extern const u32 gItemIcon_RedNectar[]; extern const u32 gItemIconPalette_RedNectar[]; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index f273b6d3b0..0a41ce6279 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -663,6 +663,9 @@ const u32 gItemIconPalette_UnremarkableTeacup[] = INCBIN_U32("graphics/items/ico const u32 gItemIcon_MasterpieceTeacup[] = INCBIN_U32("graphics/items/icons/masterpiece_teacup.4bpp.lz"); const u32 gItemIconPalette_MasterpieceTeacup[] = INCBIN_U32("graphics/items/icon_palettes/masterpiece_teacup.gbapal.lz"); +const u32 gItemIcon_MetalAlloy[] = INCBIN_U32("graphics/items/icons/metal_alloy.4bpp.lz"); +const u32 gItemIconPalette_MetalAlloy[] = INCBIN_U32("graphics/items/icon_palettes/metal_alloy.gbapal.lz"); + // Nectars const u32 gItemIcon_RedNectar[] = INCBIN_U32("graphics/items/icons/red_nectar.4bpp.lz"); diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index 33ed4aed8d..e048cf8d4e 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -859,6 +859,8 @@ const u32 *const gItemIconTable[ITEMS_COUNT + 1][2] = [ITEM_SWIFT_MOCHI] = {gItemIcon_Mochi, gItemIconPalette_SwiftMochi}, [ITEM_FRESH_START_MOCHI] = {gItemIcon_Mochi, gItemIconPalette_FreshStartMochi}, [ITEM_GLIMMERING_CHARM] = {gItemIcon_GlimmeringCharm, gItemIconPalette_GlimmeringCharm}, + [ITEM_METAL_ALLOY] = {gItemIcon_MetalAlloy, gItemIconPalette_MetalAlloy}, + [ITEM_STELLAR_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, //{gItemIcon_TeraShard, gItemIconPalette_StellarTeraShard}, // Return to field arrow [ITEMS_COUNT] = {gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow}, }; diff --git a/src/data/items.h b/src/data/items.h index 6646ab98c6..cc8c646223 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -11377,4 +11377,26 @@ const struct Item gItems[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, }, + + [ITEM_METAL_ALLOY] = + { + .name = _("Metal Alloy"), + .price = 6000, + .description = COMPOUND_STRING("A peculiar metal\n" + "that makes certain\n" + "Pokémon evolve."), + .pocket = POCKET_ITEMS, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + }, + + [ITEM_STELLAR_TERA_SHARD] = + { + .name = _("StllrTeraShrd"), + .price = 0, + .description = sTeraShardDesc, + .pocket = POCKET_ITEMS, + .type = ITEM_USE_BAG_MENU, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + }, };