ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-24 21:25:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated the effects of the Sea and Lax Incenses, and added the item data of the Gen. 4 incenses.

Browse Source
This commit is contained in:
LOuroboros 2019-04-30 20:07:12 -03:00
parent cda17700c3
commit e77960d2f3
2 changed files with 136 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
src/data/items.h
View File

@ -3365,9 +3365,9 @@ const struct Item gItems[] =
{
.name = _("Sea Incense"),
.itemId = ITEM_SEA_INCENSE,
.price = 9600,
.price = 2000,
.holdEffect = HOLD_EFFECT_WATER_POWER,
.holdEffectParam = 5,
.holdEffectParam = 20,
.description = sSeaIncenseDesc,
.pocket = POCKET_ITEMS,
.type = 4,
@ -3379,9 +3379,9 @@ const struct Item gItems[] =
{
.name = _("Lax Incense"),
.itemId = ITEM_LAX_INCENSE,
.price = 9600,
.price = 5000,
.holdEffect = HOLD_EFFECT_EVASION_UP,
.holdEffectParam = 5,
.holdEffectParam = 10,
.description = sLaxIncenseDesc,
.pocket = POCKET_ITEMS,
.type = 4,
@ -3389,6 +3389,103 @@ const struct Item gItems[] =
.secondaryId = 0,
},
[ITEM_ODD_INCENSE] =
{
.name = _("Odd Incense"),
.itemId = ITEM_ODD_INCENSE,
.price = 2000,
.holdEffect = HOLD_EFFECT_PSYCHIC_POWER,
.holdEffectParam = 20,
.description = sOddIncenseDesc,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
[ITEM_ROCK_INCENSE] =
{
.name = _("Rock Incense"),
.itemId = ITEM_ROCK_INCENSE,
.price = 2000,
.holdEffect = HOLD_EFFECT_ROCK_POWER,
.holdEffectParam = 20,
.description = sRockIncenseDesc,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
[ITEM_FULL_INCENSE] =
{
.name = _("Full Incense"),
.itemId = ITEM_FULL_INCENSE,
.price = 5000,
.holdEffect = HOLD_EFFECT_LAGGING_TAIL,
.holdEffectParam = 5,
.description = sFullIncenseDesc,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
[ITEM_WAVE_INCENSE] =
{
.name = _("Wave Incense"),
.itemId = ITEM_WAVE_INCENSE,
.price = 2000,
.holdEffect = HOLD_EFFECT_WATER_POWER,
.holdEffectParam = 20,
.description = sWaveIncenseDesc,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
[ITEM_ROSE_INCENSE] =
{
.name = _("Rose Incense"),
.itemId = ITEM_ROSE_INCENSE,
.price = 2000,
.holdEffect = HOLD_EFFECT_GRASS_POWER,
.holdEffectParam = 20,
.description = sRoseIncenseDesc,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
[ITEM_LUCK_INCENSE] =
{
.name = _("Luck Incense"),
.itemId = ITEM_LUCK_INCENSE,
.price = 11000,
.holdEffect = HOLD_EFFECT_DOUBLE_PRIZE,
.holdEffectParam = 10,
.description = sLuckIncenseDesc,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
[ITEM_PURE_INCENSE] =
{
.name = _("Pure Incense"),
.itemId = ITEM_PURE_INCENSE,
.price = 6000,
.holdEffect = HOLD_EFFECT_REPEL,
.description = sPureIncenseDesc,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
[ITEM_LUCKY_PUNCH] =
{
.name = _("Lucky Punch"),

35
src/data/text/item_descriptions.h
View File

@ -1262,6 +1262,41 @@ static const u8 sLaxIncenseDesc[] = _(
"slightly lowers the\n"
"foe's accuracy.");
static const u8 sOddIncenseDesc[] = _(
"A hold item that\n"
"boosts PSYCHIC-\n"
"type moves.");
static const u8 sRockIncenseDesc[] = _(
"A hold item that\n"
"raises the power of\n"
"ROCK-type moves.");
static const u8 sFullIncenseDesc[] = _(
"A held item that\n"
"makes the holder\n"
"move slower.");
static const u8 sWaveIncenseDesc[] = _(
"A hold item that\n"
"slightly boosts\n"
"WATER-type moves.");
static const u8 sRoseIncenseDesc[] = _(
"A hold item that\n"
"raises the power of\n"
"GRASS-type moves.");
static const u8 sLuckIncenseDesc[] = _(
"Doubles money in\n"
"battle if the\n"
"holder takes part.");
static const u8 sPureIncenseDesc[] = _(
"A hold item that\n"
"helps repel wild\n"
"POKéMON.");
static const u8 sLuckyPunchDesc[] = _(
"A hold item that\n"
"raises CHANSEY's\n"