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

Partly fixed the description of the Protective Pads, fixed their price tag and also added the data for the other Gen. 7 hold items.

Browse Source
This commit is contained in:
LOuroboros 2019-03-07 07:13:37 -03:00
parent 2f4aceb4a9
commit f3babe1e51
2 changed files with 116 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
src/data/items.h
View File

@ -8997,7 +8997,7 @@ const struct Item gItems[] =
{
.name = _("Protect Pads"), // Shortened name from Protective Pads
.itemId = ITEM_PROTECTIVE_PADS,
.price = 200,
.price = 4000,
.holdEffect = HOLD_EFFECT_PROTECTIVE_PADS,
.holdEffectParam = 0,
.description = gProtectPadsItemDescription,
@ -9010,4 +9010,112 @@ const struct Item gItems[] =
.battleUseFunc = NULL,
.secondaryId = 0,
},
[ITEM_TERRAIN_EXTENDER] =
{
.name = _("Terrain Exte."),
.itemId = ITEM_TERRAIN_EXTENDER,
.price = 4000,
.holdEffect = HOLD_EFFECT_TERRAIN_EXTENDER,
.holdEffectParam = 0,
.description = gTerrainExtenderItemDescription,
.importance = 0,
.unk19 = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 0,
},
[ITEM_ELECTRIC_SEED] =
{
.name = _("Electric Seed"),
.itemId = ITEM_ELECTRIC_SEED,
.price = 4000,
.holdEffect = HOLD_EFFECT_SEEDS,
.holdEffectParam = 0,
.description = gElectricSeedItemDescription,
.importance = 0,
.unk19 = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 0,
},
[ITEM_GRASSY_SEED] =
{
.name = _("Grassy Seed"),
.itemId = ITEM_GRASSY_SEED,
.price = 4000,
.holdEffect = HOLD_EFFECT_SEEDS,
.holdEffectParam = 0,
.description = gGrassySeedItemDescription,
.importance = 0,
.unk19 = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 0,
},
[ITEM_MISTY_SEED] =
{
.name = _("Misty Seed"),
.itemId = ITEM_MISTY_SEED,
.price = 4000,
.holdEffect = HOLD_EFFECT_SEEDS,
.holdEffectParam = 0,
.description = gMistySeedItemDescription,
.importance = 0,
.unk19 = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 0,
},
[ITEM_PSYCHIC_SEED] =
{
.name = _("Psychic Seed"),
.itemId = ITEM_PSYCHIC_SEED,
.price = 4000,
.holdEffect = HOLD_EFFECT_SEEDS,
.holdEffectParam = 0,
.description = gPsychicSeedItemDescription,
.importance = 0,
.unk19 = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 0,
},
[ITEM_ADRENALINE_ORB] =
{
.name = _("AdrenalineOrb"),
.itemId = ITEM_ADRENALINE_ORB,
.price = 300,
.holdEffect = HOLD_EFFECT_ADRENALINE_ORB,
.holdEffectParam = 0,
.description = gAdrenalineOrbItemDescription,
.importance = 0,
.unk19 = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 0,
},
};

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

@ -444,4 +444,10 @@ const u8 gLopunniteItemDescription[] = _("This stone enables\nLopunny to Mega\nE
const u8 gSalamenciteItemDescription[] = _("This stone enables\nSalamence to Mega\nEvolve in battle.");
const u8 gBeedrilliteItemDescription[] = _("This stone enables\nBeedrill to Mega\nEvolve in battle.");
const u8 gMegaBraceletItemDescription[] = _("Allows Pokémon holding\na Mega Stone to Mega\nEvolve in battle.");
const u8 gProtectPadsItemDescription[] = _("Protects the holder\nfrom effects caused\nby contact moves.");
const u8 gProtectPadsItemDescription[] = _("Guards the holder\nfrom effects caused\nby contact moves.");
const u8 gTerrainExtenderItemDescription[] = _("Extends the length\nof the active\nbattle terrain.");
const u8 gElectricSeedItemDescription[] = _("Boosts Defense on\nElectric Terrain,\nbut only one time.");
const u8 gGrassySeedItemDescription[] = _("Boosts Defense on\nGrassy Terrain,\nbut only one time.");
const u8 gMistySeedItemDescription[] = _("Boosts Sp. Def. on\nMisty Terrain,\nbut only one time.");
const u8 gPsychicSeedItemDescription[] = _("Boosts Sp. Def. on\nPsychic Terrain,\nbut only one time.");
const u8 gAdrenalineOrbItemDescription[] = _("Boosts Speed if the\nuser is intimidated,\nbut only one time.");