diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index 759931cd16..f96e7df4d5 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -137,23 +137,7 @@ #define HOLD_EFFECT_TERRAIN_EXTENDER 150 #define HOLD_EFFECT_SEEDS 151 #define HOLD_EFFECT_ADRENALINE_ORB 152 -#define HOLD_EFFECT_BUG_MEMORY 153 -#define HOLD_EFFECT_DARK_MEMORY 154 -#define HOLD_EFFECT_DRAGON_MEMORY 155 -#define HOLD_EFFECT_ELECTRIC_MEMORY 156 -#define HOLD_EFFECT_FAIRY_MEMORY 157 -#define HOLD_EFFECT_FIGHTING_MEMORY 158 -#define HOLD_EFFECT_FIRE_MEMORY 159 -#define HOLD_EFFECT_FLYING_MEMORY 160 -#define HOLD_EFFECT_GHOST_MEMORY 161 -#define HOLD_EFFECT_GRASS_MEMORY 162 -#define HOLD_EFFECT_GROUND_MEMORY 163 -#define HOLD_EFFECT_ICE_MEMORY 164 -#define HOLD_EFFECT_POISON_MEMORY 165 -#define HOLD_EFFECT_PSYCHIC_MEMORY 166 -#define HOLD_EFFECT_ROCK_MEMORY 167 -#define HOLD_EFFECT_STEEL_MEMORY 168 -#define HOLD_EFFECT_WATER_MEMORY 169 +#define HOLD_EFFECT_MEMORY 153 #define HOLD_EFFECT_CHOICE(holdEffect)((holdEffect == HOLD_EFFECT_CHOICE_BAND || holdEffect == HOLD_EFFECT_CHOICE_SCARF || holdEffect == HOLD_EFFECT_CHOICE_SPECS)) diff --git a/src/data/items.h b/src/data/items.h index a6e5026121..1722b329f3 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -5570,13 +5570,13 @@ const struct Item gItems[] = .name = _("Bug Memory"), .itemId = ITEM_BUG_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_BUG_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sBugMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_BUG, }, [ITEM_DARK_MEMORY] = @@ -5584,13 +5584,13 @@ const struct Item gItems[] = .name = _("Dark Memory"), .itemId = ITEM_DARK_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_DARK_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sDarkMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_DARK, }, [ITEM_DRAGON_MEMORY] = @@ -5598,13 +5598,13 @@ const struct Item gItems[] = .name = _("Dragon Memory"), .itemId = ITEM_DRAGON_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_DRAGON_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sDragonMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_DRAGON, }, [ITEM_ELECTRIC_MEMORY] = @@ -5612,13 +5612,13 @@ const struct Item gItems[] = .name = _("Elec. Memory"), .itemId = ITEM_ELECTRIC_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_ELECTRIC_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sElectricMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_ELECTRIC, }, [ITEM_FAIRY_MEMORY] = @@ -5626,13 +5626,13 @@ const struct Item gItems[] = .name = _("Fairy Memory"), .itemId = ITEM_FAIRY_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_FAIRY_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sFairyMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_FAIRY, }, [ITEM_FIGHTING_MEMORY] = @@ -5640,13 +5640,13 @@ const struct Item gItems[] = .name = _("Fight Memory"), .itemId = ITEM_FIGHTING_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_FIGHTING_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sFightingMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_FIGHTING, }, [ITEM_FIRE_MEMORY] = @@ -5654,13 +5654,13 @@ const struct Item gItems[] = .name = _("Fire Memory"), .itemId = ITEM_FIRE_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_FIRE_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sFireMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_FIRE, }, [ITEM_FLYING_MEMORY] = @@ -5668,13 +5668,13 @@ const struct Item gItems[] = .name = _("Flying Memory"), .itemId = ITEM_FLYING_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_FLYING_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sFlyingMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_FLYING, }, [ITEM_GHOST_MEMORY] = @@ -5682,13 +5682,13 @@ const struct Item gItems[] = .name = _("Ghost Memory"), .itemId = ITEM_GHOST_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_GHOST_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sGhostMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_GHOST, }, [ITEM_GRASS_MEMORY] = @@ -5696,13 +5696,13 @@ const struct Item gItems[] = .name = _("Grass Memory"), .itemId = ITEM_GRASS_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_GRASS_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sGrassMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_GRASS, }, [ITEM_GROUND_MEMORY] = @@ -5710,13 +5710,13 @@ const struct Item gItems[] = .name = _("Ground Memory"), .itemId = ITEM_GROUND_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_GROUND_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sGroundMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_GROUND, }, [ITEM_ICE_MEMORY] = @@ -5724,13 +5724,13 @@ const struct Item gItems[] = .name = _("Ice Memory"), .itemId = ITEM_ICE_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_ICE_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sIceMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_ICE, }, [ITEM_POISON_MEMORY] = @@ -5738,13 +5738,13 @@ const struct Item gItems[] = .name = _("Poison Memory"), .itemId = ITEM_POISON_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_POISON_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sPoisonMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_POISON, }, [ITEM_PSYCHIC_MEMORY] = @@ -5752,13 +5752,13 @@ const struct Item gItems[] = .name = _("PsychicMemory"), .itemId = ITEM_PSYCHIC_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_PSYCHIC_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sPsychicMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_PSYCHIC, }, [ITEM_ROCK_MEMORY] = @@ -5766,13 +5766,13 @@ const struct Item gItems[] = .name = _("Rock Memory"), .itemId = ITEM_ROCK_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_ROCK_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sRockMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_ROCK, }, [ITEM_STEEL_MEMORY] = @@ -5780,13 +5780,13 @@ const struct Item gItems[] = .name = _("Steel Memory"), .itemId = ITEM_STEEL_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_STEEL_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sSteelMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_STEEL, }, [ITEM_WATER_MEMORY] = @@ -5794,13 +5794,13 @@ const struct Item gItems[] = .name = _("Water Memory"), .itemId = ITEM_WATER_MEMORY, .price = 1000, - .holdEffect = HOLD_EFFECT_WATER_MEMORY, + .holdEffect = HOLD_EFFECT_MEMORY, .holdEffectParam = 0, .description = sWaterMemoryDesc, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, + .secondaryId = TYPE_WATER, }, [ITEM_FLAME_PLATE] =