mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-20 18:30:18 +01:00
Renamed X Special to X Special Attack and added the item data for Old Gateau and X Special Defense.
This commit is contained in:
parent
8e3f2d1e2d
commit
c5f6f5e588
@ -828,6 +828,20 @@ const struct Item gItems[] =
|
|||||||
.secondaryId = 0,
|
.secondaryId = 0,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
[ITEM_OLD_GATEAU] =
|
||||||
|
{
|
||||||
|
.name = _("Old Gateau"),
|
||||||
|
.itemId = ITEM_OLD_GATEAU,
|
||||||
|
.price = 350,
|
||||||
|
.description = sOldGateauDesc,
|
||||||
|
.pocket = POCKET_ITEMS,
|
||||||
|
.type = 1,
|
||||||
|
.fieldUseFunc = ItemUseOutOfBattle_Medicine,
|
||||||
|
.battleUsage = 1,
|
||||||
|
.battleUseFunc = ItemUseInBattle_Medicine,
|
||||||
|
.secondaryId = 0,
|
||||||
|
},
|
||||||
|
|
||||||
[ITEM_SACRED_ASH] =
|
[ITEM_SACRED_ASH] =
|
||||||
{
|
{
|
||||||
.name = _("Sacred Ash"),
|
.name = _("Sacred Ash"),
|
||||||
@ -1112,10 +1126,24 @@ const struct Item gItems[] =
|
|||||||
|
|
||||||
[ITEM_X_SP_ATK] =
|
[ITEM_X_SP_ATK] =
|
||||||
{
|
{
|
||||||
.name = _("X Special"),
|
.name = _("X Sp. Atk."),
|
||||||
.itemId = ITEM_X_SP_ATK,
|
.itemId = ITEM_X_SP_ATK,
|
||||||
.price = 350,
|
.price = 350,
|
||||||
.description = sXSpecialDesc,
|
.description = sXSpecialAttackDesc,
|
||||||
|
.pocket = POCKET_ITEMS,
|
||||||
|
.type = 4,
|
||||||
|
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||||
|
.battleUsage = 2,
|
||||||
|
.battleUseFunc = ItemUseInBattle_StatIncrease,
|
||||||
|
.secondaryId = 0,
|
||||||
|
},
|
||||||
|
|
||||||
|
[ITEM_X_SP_DEF] =
|
||||||
|
{
|
||||||
|
.name = _("X Sp. Def."),
|
||||||
|
.itemId = ITEM_X_SP_DEF,
|
||||||
|
.price = 2000,
|
||||||
|
.description = sXSpecialDefenseDesc,
|
||||||
.pocket = POCKET_ITEMS,
|
.pocket = POCKET_ITEMS,
|
||||||
.type = 4,
|
.type = 4,
|
||||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||||
|
@ -163,6 +163,10 @@ const u8 gItemEffect_BigMalasada[6] = {
|
|||||||
[3] = ITEM3_STATUS_ALL,
|
[3] = ITEM3_STATUS_ALL,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const u8 gItemEffect_OldGateau[6] = {
|
||||||
|
[3] = ITEM3_STATUS_ALL,
|
||||||
|
};
|
||||||
|
|
||||||
const u8 gItemEffect_SacredAsh[7] = {
|
const u8 gItemEffect_SacredAsh[7] = {
|
||||||
[0] = ITEM0_SACRED_ASH,
|
[0] = ITEM0_SACRED_ASH,
|
||||||
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
|
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
|
||||||
@ -286,7 +290,14 @@ const u8 gItemEffect_XAccuracy[8] = {
|
|||||||
[7] = 1,
|
[7] = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
const u8 gItemEffect_XSpecial[8] = {
|
const u8 gItemEffect_XSpecialAttack[8] = {
|
||||||
|
[2] = 1,
|
||||||
|
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
|
||||||
|
[6] = 1,
|
||||||
|
[7] = 1,
|
||||||
|
};
|
||||||
|
|
||||||
|
const u8 gItemEffect_XSpecialDefense[8] = {
|
||||||
[2] = 1,
|
[2] = 1,
|
||||||
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
|
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
|
||||||
[6] = 1,
|
[6] = 1,
|
||||||
@ -424,6 +435,7 @@ const u8 *const gItemEffectTable[] =
|
|||||||
[ITEM_BERRY_JUICE - ITEM_POTION] = gItemEffect_BerryJuice,
|
[ITEM_BERRY_JUICE - ITEM_POTION] = gItemEffect_BerryJuice,
|
||||||
[ITEM_SWEET_HEART - ITEM_POTION] = gItemEffect_SweetHeart,
|
[ITEM_SWEET_HEART - ITEM_POTION] = gItemEffect_SweetHeart,
|
||||||
[ITEM_BIG_MALASADA - ITEM_POTION] = gItemEffect_BigMalasada,
|
[ITEM_BIG_MALASADA - ITEM_POTION] = gItemEffect_BigMalasada,
|
||||||
|
[ITEM_OLD_GATEAU - ITEM_POTION] = gItemEffect_OldGateau,
|
||||||
[ITEM_SACRED_ASH - ITEM_POTION] = gItemEffect_SacredAsh,
|
[ITEM_SACRED_ASH - ITEM_POTION] = gItemEffect_SacredAsh,
|
||||||
[ITEM_HP_UP - ITEM_POTION] = gItemEffect_HPUp,
|
[ITEM_HP_UP - ITEM_POTION] = gItemEffect_HPUp,
|
||||||
[ITEM_PROTEIN - ITEM_POTION] = gItemEffect_Protein,
|
[ITEM_PROTEIN - ITEM_POTION] = gItemEffect_Protein,
|
||||||
@ -440,7 +452,8 @@ const u8 *const gItemEffectTable[] =
|
|||||||
[ITEM_X_DEFENSE - ITEM_POTION] = gItemEffect_XDefend,
|
[ITEM_X_DEFENSE - ITEM_POTION] = gItemEffect_XDefend,
|
||||||
[ITEM_X_SPEED - ITEM_POTION] = gItemEffect_XSpeed,
|
[ITEM_X_SPEED - ITEM_POTION] = gItemEffect_XSpeed,
|
||||||
[ITEM_X_ACCURACY - ITEM_POTION] = gItemEffect_XAccuracy,
|
[ITEM_X_ACCURACY - ITEM_POTION] = gItemEffect_XAccuracy,
|
||||||
[ITEM_X_SP_ATK - ITEM_POTION] = gItemEffect_XSpecial,
|
[ITEM_X_SP_ATK - ITEM_POTION] = gItemEffect_XSpecialAttack,
|
||||||
|
[ITEM_X_SP_DEF - ITEM_POTION] = gItemEffect_XSpecialDefense,
|
||||||
[ITEM_SUN_STONE - ITEM_POTION] = gItemEffect_EvoStone,
|
[ITEM_SUN_STONE - ITEM_POTION] = gItemEffect_EvoStone,
|
||||||
[ITEM_MOON_STONE - ITEM_POTION] = gItemEffect_EvoStone,
|
[ITEM_MOON_STONE - ITEM_POTION] = gItemEffect_EvoStone,
|
||||||
[ITEM_FIRE_STONE - ITEM_POTION] = gItemEffect_EvoStone,
|
[ITEM_FIRE_STONE - ITEM_POTION] = gItemEffect_EvoStone,
|
||||||
|
@ -280,6 +280,11 @@ static const u8 sBigMalasadaDesc[] = _(
|
|||||||
"status problems of\n"
|
"status problems of\n"
|
||||||
"one POKéMON.");
|
"one POKéMON.");
|
||||||
|
|
||||||
|
static const u8 sOldGateauDesc[] = _(
|
||||||
|
"Heals all the\n"
|
||||||
|
"status problems of\n"
|
||||||
|
"one POKéMON.");
|
||||||
|
|
||||||
static const u8 sSacredAshDesc[] = _(
|
static const u8 sSacredAshDesc[] = _(
|
||||||
"Fully revives and\n"
|
"Fully revives and\n"
|
||||||
"restores all\n"
|
"restores all\n"
|
||||||
@ -392,11 +397,16 @@ static const u8 sXAccuracyDesc[] = _(
|
|||||||
"of attack moves\n"
|
"of attack moves\n"
|
||||||
"during one battle.");
|
"during one battle.");
|
||||||
|
|
||||||
static const u8 sXSpecialDesc[] = _(
|
static const u8 sXSpecialAttackDesc[] = _(
|
||||||
"Raises the stat\n"
|
"Raises the stat\n"
|
||||||
"SP. ATK during one\n"
|
"SP. ATK during one\n"
|
||||||
"battle.");
|
"battle.");
|
||||||
|
|
||||||
|
static const u8 sXSpecialDefenseDesc[] = _(
|
||||||
|
"Raises the stat\n"
|
||||||
|
"SP. DEF during one\n"
|
||||||
|
"battle.");
|
||||||
|
|
||||||
static const u8 sPokeDollDesc[] = _(
|
static const u8 sPokeDollDesc[] = _(
|
||||||
"Use to flee from\n"
|
"Use to flee from\n"
|
||||||
"any battle with\n"
|
"any battle with\n"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user