Add new item variables and defines

This commit is contained in:
Bassoonian 2023-03-19 20:55:39 +01:00
parent 509da952ff
commit 372c6a1afa
5 changed files with 452 additions and 2 deletions

View File

@ -159,6 +159,7 @@
#define HOLD_EFFECT_PUNCHING_GLOVE 178
#define HOLD_EFFECT_COVERT_CLOAK 179
#define HOLD_EFFECT_LOADED_DICE 180
#define HOLD_EFFECT_BOOSTER_ENERGY 181 // Not implemented.
#define HOLD_EFFECT_CHOICE(holdEffect)((holdEffect == HOLD_EFFECT_CHOICE_BAND || holdEffect == HOLD_EFFECT_CHOICE_SCARF || holdEffect == HOLD_EFFECT_CHOICE_SPECS))

View File

@ -928,13 +928,44 @@
#define ITEM_RUBY 756
#define ITEM_SAPPHIRE 757
// GEN IX ITEMS
#define ITEM_ABILITY_SHIELD 758
#define ITEM_CLEAR_AMULET 759
#define ITEM_PUNCHING_GLOVE 760
#define ITEM_COVERT_CLOAK 761
#define ITEM_LOADED_DICE 762
#define ITEM_AUSPICIOUS_ARMOR 763
#define ITEM_BOOSTER_ENERGY 764
#define ITEM_BIG_BAMBOO_SHOOT 765
#define ITEM_GIMMIGHOUL_COIN 766
#define ITEM_LEADERS_CREST 767
#define ITEM_MALICIOUS_ARMOR 768
#define ITEM_MIRROR_HERB 769
#define ITEM_SCROLL_OF_DARKNESS 770
#define ITEM_SCROLL_OF_WATERS 771
#define ITEM_TERA_ORB 772
#define ITEM_TINY_BAMBOO_SHOOT 773
#define ITEMS_COUNT 763
#define ITEM_BUG_TERA_SHARD 774
#define ITEM_DARK_TERA_SHARD 775
#define ITEM_DRAGON_TERA_SHARD 776
#define ITEM_ELECTRIC_TERA_SHARD 777
#define ITEM_FAIRY_TERA_SHARD 778
#define ITEM_FIGHTING_TERA_SHARD 779
#define ITEM_FIRE_TERA_SHARD 780
#define ITEM_FLYING_TERA_SHARD 781
#define ITEM_GHOST_TERA_SHARD 782
#define ITEM_GRASS_TERA_SHARD 783
#define ITEM_GROUND_TERA_SHARD 784
#define ITEM_ICE_TERA_SHARD 785
#define ITEM_NORMAL_TERA_SHARD 786
#define ITEM_POISON_TERA_SHARD 787
#define ITEM_PSYCHIC_TERA_SHARD 788
#define ITEM_ROCK_TERA_SHARD 789
#define ITEM_STEEL_TERA_SHARD 790
#define ITEM_WATER_TERA_SHARD 791
#define ITEMS_COUNT 792
#define ITEM_FIELD_ARROW ITEMS_COUNT
// A special item id associated with "Cancel"/"Exit" etc. in a list of items or decorations

View File

@ -808,6 +808,35 @@ const u32 *const gItemIconTable[ITEMS_COUNT + 1][2] =
[ITEM_PUNCHING_GLOVE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_PunchingGlove, gItemIconPalette_PunchingGlove},
[ITEM_COVERT_CLOAK] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_CovertCloak, gItemIconPalette_CovertCloak},
[ITEM_LOADED_DICE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_LoadedDice, gItemIconPalette_LoadedDice},
[ITEM_AUSPICIOUS_ARMOR] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_AuspiciousArmor, gItemIconPalette_AuspiciousArmor},
[ITEM_BOOSTER_ENERGY] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_BoosterEnergy, gItemIconPalette_BoosterEnergy},
[ITEM_BIG_BAMBOO_SHOOT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_BigBambooShoot, gItemIconPalette_BigBambooShoot},
[ITEM_GIMMIGHOUL_COIN] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_GimmighoulCoin, gItemIconPalette_GimmighoulCoin},
[ITEM_LEADERS_CREST] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_LeadersCrest, gItemIconPalette_LeadersCrest},
[ITEM_MALICIOUS_ARMOR] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_MaliciousArmor, gItemIconPalette_MaliciousArmor},
[ITEM_MIRROR_HERB] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_MirrorHerb, gItemIconPalette_MirrorHerb},
[ITEM_SCROLL_OF_DARKNESS] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_ScrollOfDarkness, gItemIconPalette_ScrollOfDarkness},
[ITEM_SCROLL_OF_WATERS] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_ScrollOfWaters, gItemIconPalette_ScrollOfWaters},
[ITEM_TERA_ORB] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_TeraOrb, gItemIconPalette_TeraOrb},
[ITEM_TINY_BAMBOO_SHOOT] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_TinyBambooShoot, gItemIconPalette_TinyBambooShoot},
[ITEM_BUG_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_BugTeraShard, gItemIconPalette_BugTeraShard},
[ITEM_DARK_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_DarkTeraShard, gItemIconPalette_DarkTeraShard},
[ITEM_DRAGON_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_DragonTeraShard, gItemIconPalette_DragonTeraShard},
[ITEM_ELECTRIC_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_ElectricTeraShard, gItemIconPalette_ElectricTeraShard},
[ITEM_FAIRY_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_FairyTeraShard, gItemIconPalette_FairyTeraShard},
[ITEM_FIGHTING_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_FightingTeraShard, gItemIconPalette_FightingTeraShard},
[ITEM_FIRE_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_FireTeraShard, gItemIconPalette_FireTeraShard},
[ITEM_FLYING_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_FlyingTeraShard, gItemIconPalette_FlyingTeraShard},
[ITEM_GHOST_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_GhostTeraShard, gItemIconPalette_GhostTeraShard},
[ITEM_GRASS_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_GrassTeraShard, gItemIconPalette_GrassTeraShard},
[ITEM_GROUND_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_GroundTeraShard, gItemIconPalette_GroundTeraShard},
[ITEM_ICE_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_IceTeraShard, gItemIconPalette_IceTeraShard},
[ITEM_NORMAL_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_NormalTeraShard, gItemIconPalette_NormalTeraShard},
[ITEM_POISON_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_PoisonTeraShard, gItemIconPalette_PoisonTeraShard},
[ITEM_PSYCHIC_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_PsychicTeraShard, gItemIconPalette_PsychicTeraShard},
[ITEM_ROCK_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_RockTeraShard, gItemIconPalette_RockTeraShard},
[ITEM_STEEL_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_SteelTeraShard, gItemIconPalette_SteelTeraShard},
[ITEM_WATER_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_WaterTeraShard, gItemIconPalette_WaterTeraShard},
// Return to field arrow
[ITEMS_COUNT] = {gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow},
};

View File

@ -9907,7 +9907,6 @@ const struct Item gItems[] =
[ITEM_LOADED_DICE] =
{
//YellwApricorn
.name = _("Loaded Dice"),
.itemId = ITEM_LOADED_DICE,
.price = 20000,
@ -9918,4 +9917,334 @@ const struct Item gItems[] =
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.flingPower = 30,
},
[ITEM_AUSPICIOUS_ARMOR] =
{
.name = _("AuspciousArmr"),
.itemId = ITEM_AUSPICIOUS_ARMOR,
.price = 3000,
.description = sAuspiciousArmorDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_EvolutionStone,
.flingPower = 30,
},
[ITEM_BOOSTER_ENERGY] =
{
.name = _("BoosterEnergy"),
.itemId = ITEM_BOOSTER_ENERGY,
.price = 0,
.holdEffect = HOLD_EFFECT_BOOSTER_ENERGY,
.description = sBoosterEnergyDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.flingPower = 30,
},
[ITEM_BIG_BAMBOO_SHOOT] =
{
.name = _("BigBmbooShoot"),
.itemId = ITEM_BIG_BAMBOO_SHOOT,
.price = 3000,
.description = sBigBambooShootDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.flingPower = 30,
},
[ITEM_GIMMIGHOUL_COIN] =
{
.name = _("GimighoulCoin"),
.itemId = ITEM_GIMMIGHOUL_COIN,
.price = 400,
.description = sGimmighoulCoinDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_LEADERS_CREST] =
{
.name = _("Leader'sCrest"),
.itemId = ITEM_LEADERS_CREST,
.price = 3000,
.description = sLeadersCrestDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_MALICIOUS_ARMOR] =
{
.name = _("MaliciousArmr"),
.itemId = ITEM_MALICIOUS_ARMOR,
.price = 3000,
.description = sMaliciousArmorDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_EvolutionStone,
.flingPower = 30,
},
[ITEM_MIRROR_HERB] =
{
.name = _("Mirror Herb"),
.itemId = ITEM_MIRROR_HERB,
.price = 30000,
.holdEffect = HOLD_EFFECT_MIRROR_HERB,
.description = sMirrorHerbDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.flingPower = 30,
},
[ITEM_SCROLL_OF_DARKNESS] =
{
.name = _("ScrllOfDrknss"),
.itemId = ITEM_SCROLL_OF_DARKNESS,
.price = 0,
.description = sScrollOfDarknessDesc,
.importance = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_EvolutionStone,
},
[ITEM_SCROLL_OF_WATERS] =
{
.name = _("ScrollOfWatrs"),
.itemId = ITEM_SCROLL_OF_WATERS,
.price = 0,
.description = sScrollOfWatersDesc,
.importance = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_EvolutionStone,
},
[ITEM_TERA_ORB] =
{
.name = _("Tera Orb"),
.itemId = ITEM_TERA_ORB,
.price = 0,
.description = sTeraOrbDesc,
.importance = 1,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_TINY_BAMBOO_SHOOT] =
{
.name = _("TinyBmbooShot"),
.itemId = ITEM_TINY_BAMBOO_SHOOT,
.price = 750,
.description = sTinyBambooShootDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.flingPower = 30,
},
[ITEM_BUG_TERA_SHARD] =
{
.name = _("Bug TeraShard"),
.itemId = ITEM_BUG_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_DARK_TERA_SHARD] =
{
.name = _("DarkTeraShard"),
.itemId = ITEM_DARK_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_DRAGON_TERA_SHARD] =
{
.name = _("DragnTeraShrd"),
.itemId = ITEM_DRAGON_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_ELECTRIC_TERA_SHARD] =
{
.name = _("EltrcTeraShrd"),
.itemId = ITEM_ELECTRIC_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_FAIRY_TERA_SHARD] =
{
.name = _("FairyTeraShrd"),
.itemId = ITEM_FAIRY_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_FIGHTING_TERA_SHARD] =
{
.name = _("FghtngTerShrd"),
.itemId = ITEM_FIGHTING_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_FIRE_TERA_SHARD] =
{
.name = _("FireTeraShard"),
.itemId = ITEM_FIRE_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_FLYING_TERA_SHARD] =
{
.name = _("FlyngTeraShrd"),
.itemId = ITEM_FLYING_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_GHOST_TERA_SHARD] =
{
.name = _("GhostTeraShrd"),
.itemId = ITEM_GHOST_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_GRASS_TERA_SHARD] =
{
.name = _("GrassTeraShrd"),
.itemId = ITEM_GRASS_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_GROUND_TERA_SHARD] =
{
.name = _("GrondTeraShrd"),
.itemId = ITEM_GROUND_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_ICE_TERA_SHARD] =
{
.name = _("Ice TeraShard"),
.itemId = ITEM_ICE_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_NORMAL_TERA_SHARD] =
{
.name = _("NormlTeraShrd"),
.itemId = ITEM_NORMAL_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_POISON_TERA_SHARD] =
{
.name = _("PoisnTeraShrd"),
.itemId = ITEM_POISON_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_PSYCHIC_TERA_SHARD] =
{
.name = _("PschcTeraShrd"),
.itemId = ITEM_PSYCHIC_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_ROCK_TERA_SHARD] =
{
.name = _("RockTeraShard"),
.itemId = ITEM_ROCK_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_STEEL_TERA_SHARD] =
{
.name = _("SteelTeraShrd"),
.itemId = ITEM_STEEL_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
[ITEM_WATER_TERA_SHARD] =
{
.name = _("WaterTeraShrd"),
.itemId = ITEM_WATER_TERA_SHARD,
.price = 0,
.description = sTeraShardDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
};

View File

@ -3817,3 +3817,63 @@ static const u8 sLoadedDiceDesc[] = _(
"Rolls high numbers.\n"
"Multihit strikes\n"
"hit more times.");
static const u8 sAuspiciousArmorDesc[] = _(
"Armor inhabited by\n"
"auspicious wishes.\n"
"Causes evolution.");
static const u8 sBoosterEnergyDesc[] = _(
"Encapsuled energy\n"
"ups Pokémon with\n"
"certain Abilities.");
static const u8 sBigBambooShootDesc[] = _(
"A large and rare\n"
"bamboo shoot. Best\n"
"sold to gourmands.");
static const u8 sGimmighoulCoinDesc[] = _(
"Gimmighoul hoard\n"
"and treasure these\n"
"curious coins.");
static const u8 sLeadersCrestDesc[] = _(
"A shard of an old\n"
"blade of some sort.\n"
"Held by Bisharp.");
static const u8 sMaliciousArmorDesc[] = _(
"Armor inhabited by\n"
"malicious will.\n"
"Causes evolution.");
static const u8 sMirrorHerbDesc[] = _(
"Mirrors an enemy's\n"
"stat increases\n"
"but only once.");
static const u8 sScrollOfDarknessDesc[] = _(
"A peculiar scroll\n"
"with secrets of\n"
"the dark path.");
static const u8 sScrollOfWatersDesc[] = _(
"A peculiar scroll\n"
"with secrets of\n"
"the water path.");
static const u8 sTeraOrbDesc[] = _(
"Energy charges can\n"
"be used to cause\n"
"Terastallization.");
static const u8 sTinyBambooShootDesc[] = _(
"A small and rare\n"
"bamboo shoot. Best\n"
"sold to gourmands.");
static const u8 sTeraShardDesc[] = _(
"These shards may\n"
"form when a Tera\n"
"Pokémon faints.");