atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Indigo Disk item data (#3854)

Browse source
This commit is contained in:
kittenchilly 2023-12-28 16:00:34 -06:00 committed by GitHub
parent bc3737772a
commit 1e958ada8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 49 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
graphics/items/icon_palettes/metal_alloy.pal Normal file
View file

@ -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

BIN
graphics/items/icons/metal_alloy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 299 B

4
include/constants/items.h
View file

@ -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

2
include/graphics.h
View file

@ -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[];

3
src/data/graphics/items.h
View file

@ -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");

2
src/data/item_icon_table.h
View file

@ -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},
};

22
src/data/items.h
View file

@ -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,
},
};