Plate type data and hold effect #1207 from ExpoSeed

This commit is contained in:
Eduardo Quezada D'Ottone 2020-11-09 15:24:13 -03:00 committed by GitHub
commit 6f29abbe0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 34 deletions

View File

@ -134,6 +134,7 @@
#define HOLD_EFFECT_SEEDS 151 #define HOLD_EFFECT_SEEDS 151
#define HOLD_EFFECT_ADRENALINE_ORB 152 #define HOLD_EFFECT_ADRENALINE_ORB 152
#define HOLD_EFFECT_MEMORY 153 #define HOLD_EFFECT_MEMORY 153
#define HOLD_EFFECT_PLATE 154
#define HOLD_EFFECT_CHOICE(holdEffect)((holdEffect == HOLD_EFFECT_CHOICE_BAND || holdEffect == HOLD_EFFECT_CHOICE_SCARF || holdEffect == HOLD_EFFECT_CHOICE_SPECS)) #define HOLD_EFFECT_CHOICE(holdEffect)((holdEffect == HOLD_EFFECT_CHOICE_BAND || holdEffect == HOLD_EFFECT_CHOICE_SCARF || holdEffect == HOLD_EFFECT_CHOICE_SPECS))

View File

@ -5998,13 +5998,13 @@ const struct Item gItems[] =
.name = _("Flame Plate"), .name = _("Flame Plate"),
.itemId = ITEM_FLAME_PLATE, .itemId = ITEM_FLAME_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_FIRE_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sFlamePlateDesc, .description = sFlamePlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_FIRE,
}, },
[ITEM_SPLASH_PLATE] = [ITEM_SPLASH_PLATE] =
@ -6012,13 +6012,13 @@ const struct Item gItems[] =
.name = _("Splash Plate"), .name = _("Splash Plate"),
.itemId = ITEM_SPLASH_PLATE, .itemId = ITEM_SPLASH_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_WATER_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sSplashPlateDesc, .description = sSplashPlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_WATER,
}, },
[ITEM_ZAP_PLATE] = [ITEM_ZAP_PLATE] =
@ -6026,13 +6026,13 @@ const struct Item gItems[] =
.name = _("Zap Plate"), .name = _("Zap Plate"),
.itemId = ITEM_ZAP_PLATE, .itemId = ITEM_ZAP_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_ELECTRIC_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sZapPlateDesc, .description = sZapPlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_ELECTRIC,
}, },
[ITEM_MEADOW_PLATE] = [ITEM_MEADOW_PLATE] =
@ -6040,13 +6040,13 @@ const struct Item gItems[] =
.name = _("Meadow Plate"), .name = _("Meadow Plate"),
.itemId = ITEM_MEADOW_PLATE, .itemId = ITEM_MEADOW_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_GRASS_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sMeadowPlateDesc, .description = sMeadowPlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_GRASS,
}, },
[ITEM_ICICLE_PLATE] = [ITEM_ICICLE_PLATE] =
@ -6054,13 +6054,13 @@ const struct Item gItems[] =
.name = _("Icicle Plate"), .name = _("Icicle Plate"),
.itemId = ITEM_ICICLE_PLATE, .itemId = ITEM_ICICLE_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_ICE_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sIciclePlateDesc, .description = sIciclePlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_ICE,
}, },
[ITEM_FIST_PLATE] = [ITEM_FIST_PLATE] =
@ -6068,13 +6068,13 @@ const struct Item gItems[] =
.name = _("Fist Plate"), .name = _("Fist Plate"),
.itemId = ITEM_FIST_PLATE, .itemId = ITEM_FIST_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_FIGHTING_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sFistPlateDesc, .description = sFistPlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_FIGHTING,
}, },
[ITEM_TOXIC_PLATE] = [ITEM_TOXIC_PLATE] =
@ -6082,13 +6082,13 @@ const struct Item gItems[] =
.name = _("Toxic Plate"), .name = _("Toxic Plate"),
.itemId = ITEM_TOXIC_PLATE, .itemId = ITEM_TOXIC_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_POISON_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sToxicPlateDesc, .description = sToxicPlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_POISON,
}, },
[ITEM_EARTH_PLATE] = [ITEM_EARTH_PLATE] =
@ -6096,13 +6096,13 @@ const struct Item gItems[] =
.name = _("Earth Plate"), .name = _("Earth Plate"),
.itemId = ITEM_EARTH_PLATE, .itemId = ITEM_EARTH_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_GROUND_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sEarthPlateDesc, .description = sEarthPlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_GROUND,
}, },
[ITEM_SKY_PLATE] = [ITEM_SKY_PLATE] =
@ -6110,13 +6110,13 @@ const struct Item gItems[] =
.name = _("Sky Plate"), .name = _("Sky Plate"),
.itemId = ITEM_SKY_PLATE, .itemId = ITEM_SKY_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_FLYING_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sSkyPlateDesc, .description = sSkyPlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_FLYING,
}, },
[ITEM_MIND_PLATE] = [ITEM_MIND_PLATE] =
@ -6124,13 +6124,13 @@ const struct Item gItems[] =
.name = _("Mind Plate"), .name = _("Mind Plate"),
.itemId = ITEM_MIND_PLATE, .itemId = ITEM_MIND_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_PSYCHIC_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sMindPlateDesc, .description = sMindPlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_PSYCHIC,
}, },
[ITEM_INSECT_PLATE] = [ITEM_INSECT_PLATE] =
@ -6138,13 +6138,13 @@ const struct Item gItems[] =
.name = _("Insect Plate"), .name = _("Insect Plate"),
.itemId = ITEM_INSECT_PLATE, .itemId = ITEM_INSECT_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_BUG_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sInsectPlateDesc, .description = sInsectPlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_BUG,
}, },
[ITEM_STONE_PLATE] = [ITEM_STONE_PLATE] =
@ -6152,13 +6152,13 @@ const struct Item gItems[] =
.name = _("Stone Plate"), .name = _("Stone Plate"),
.itemId = ITEM_STONE_PLATE, .itemId = ITEM_STONE_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_ROCK_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sStonePlateDesc, .description = sStonePlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_ROCK,
}, },
[ITEM_SPOOKY_PLATE] = [ITEM_SPOOKY_PLATE] =
@ -6166,13 +6166,13 @@ const struct Item gItems[] =
.name = _("Spooky Plate"), .name = _("Spooky Plate"),
.itemId = ITEM_SPOOKY_PLATE, .itemId = ITEM_SPOOKY_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_GHOST_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sSpookyPlateDesc, .description = sSpookyPlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_GHOST,
}, },
[ITEM_DRACO_PLATE] = [ITEM_DRACO_PLATE] =
@ -6180,13 +6180,13 @@ const struct Item gItems[] =
.name = _("Draco Plate"), .name = _("Draco Plate"),
.itemId = ITEM_DRACO_PLATE, .itemId = ITEM_DRACO_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_DRAGON_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sDracoPlateDesc, .description = sDracoPlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_DRAGON,
}, },
[ITEM_DREAD_PLATE] = [ITEM_DREAD_PLATE] =
@ -6194,13 +6194,13 @@ const struct Item gItems[] =
.name = _("Dread Plate"), .name = _("Dread Plate"),
.itemId = ITEM_DREAD_PLATE, .itemId = ITEM_DREAD_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_DARK_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sDreadPlateDesc, .description = sDreadPlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_DARK,
}, },
[ITEM_IRON_PLATE] = [ITEM_IRON_PLATE] =
@ -6208,13 +6208,13 @@ const struct Item gItems[] =
.name = _("Iron Plate"), .name = _("Iron Plate"),
.itemId = ITEM_IRON_PLATE, .itemId = ITEM_IRON_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_STEEL_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sIronPlateDesc, .description = sIronPlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_STEEL,
}, },
[ITEM_EVIOLITE] = [ITEM_EVIOLITE] =
@ -6720,13 +6720,13 @@ const struct Item gItems[] =
.name = _("Pixie Plate"), .name = _("Pixie Plate"),
.itemId = ITEM_PIXIE_PLATE, .itemId = ITEM_PIXIE_PLATE,
.price = 200, .price = 200,
.holdEffect = HOLD_EFFECT_FAIRY_POWER, .holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20, .holdEffectParam = 20,
.description = sPixiePlateDesc, .description = sPixiePlateDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = 4, .type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0, .secondaryId = TYPE_FAIRY,
}, },
[ITEM_SAFETY_GOGGLES] = [ITEM_SAFETY_GOGGLES] =