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

Merge pull request #1687 from LOuroboros/mentalHerb

Browse source 
Sync include/constants/hold_effects.h
This commit is contained in:
Eduardo Quezada D'Ottone 2021-09-26 11:19:15 -03:00 committed by GitHub
commit 3ab909f165
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/constants/hold_effects.h
View file

@ -29,7 +29,7 @@
#define HOLD_EFFECT_EXP_SHARE 25
#define HOLD_EFFECT_QUICK_CLAW 26
#define HOLD_EFFECT_FRIENDSHIP_UP 27
#define HOLD_EFFECT_CURE_ATTRACT 28
#define HOLD_EFFECT_MENTAL_HERB 28
#define HOLD_EFFECT_CHOICE_BAND 29
#define HOLD_EFFECT_FLINCH 30
#define HOLD_EFFECT_BUG_POWER 31
@ -154,4 +154,10 @@
#define HOLD_EFFECT_CHOICE(holdEffect)((holdEffect == HOLD_EFFECT_CHOICE_BAND || holdEffect == HOLD_EFFECT_CHOICE_SCARF || holdEffect == HOLD_EFFECT_CHOICE_SPECS))
// Terrain seed params
#define HOLD_EFFECT_PARAM_ELECTRIC_TERRAIN 0
#define HOLD_EFFECT_PARAM_GRASSY_TERRAIN 1
#define HOLD_EFFECT_PARAM_MISTY_TERRAIN 2
#define HOLD_EFFECT_PARAM_PSYCHIC_TERRAIN 3
#endif // GUARD_HOLD_EFFECTS_H

4
src/battle_util.c
View file

@ -3666,7 +3666,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
effect = ITEM_STATUS_CHANGE;
}
break;
case HOLD_EFFECT_CURE_ATTRACT:
case HOLD_EFFECT_MENTAL_HERB:
if (gBattleMons[battlerId].status2 & STATUS2_INFATUATION)
{
gBattleMons[battlerId].status2 &= ~(STATUS2_INFATUATION);
@ -3769,7 +3769,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
effect = ITEM_EFFECT_OTHER;
}
break;
case HOLD_EFFECT_CURE_ATTRACT:
case HOLD_EFFECT_MENTAL_HERB:
if (gBattleMons[battlerId].status2 & STATUS2_INFATUATION)
{
gBattleMons[battlerId].status2 &= ~(STATUS2_INFATUATION);

6
src/data/items.h
View file

@ -2640,7 +2640,7 @@ const struct Item gItems[] =
.name = _("Mental Herb"),
.itemId = ITEM_MENTAL_HERB,
.price = 4000,
.holdEffect = HOLD_EFFECT_CURE_ATTRACT,
.holdEffect = HOLD_EFFECT_MENTAL_HERB,
.description = sMentalHerbDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
@ -6939,6 +6939,7 @@ const struct Item gItems[] =
.itemId = ITEM_ELECTRIC_SEED,
.price = 4000,
.holdEffect = HOLD_EFFECT_SEEDS,
.holdEffectParam = HOLD_EFFECT_PARAM_ELECTRIC_TERRAIN,
.description = sElectricSeedDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
@ -6951,6 +6952,7 @@ const struct Item gItems[] =
.itemId = ITEM_GRASSY_SEED,
.price = 4000,
.holdEffect = HOLD_EFFECT_SEEDS,
.holdEffectParam = HOLD_EFFECT_PARAM_GRASSY_TERRAIN,
.description = sGrassySeedDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
@ -6963,6 +6965,7 @@ const struct Item gItems[] =
.itemId = ITEM_MISTY_SEED,
.price = 4000,
.holdEffect = HOLD_EFFECT_SEEDS,
.holdEffectParam = HOLD_EFFECT_PARAM_MISTY_TERRAIN,
.description = sMistySeedDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
@ -6975,6 +6978,7 @@ const struct Item gItems[] =
.itemId = ITEM_PSYCHIC_SEED,
.price = 4000,
.holdEffect = HOLD_EFFECT_SEEDS,
.holdEffectParam = HOLD_EFFECT_PARAM_PSYCHIC_TERRAIN,
.description = sPsychicSeedDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,