diff --git a/src/data/items.h b/src/data/items.h index 47fce26dc..45f9d056b 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -828,6 +828,20 @@ const struct Item gItems[] = .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] = { .name = _("Sacred Ash"), @@ -1112,10 +1126,24 @@ const struct Item gItems[] = [ITEM_X_SP_ATK] = { - .name = _("X Special"), + .name = _("X Sp. Atk."), .itemId = ITEM_X_SP_ATK, .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, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index b0dc15925..c2a11d782 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -163,6 +163,10 @@ const u8 gItemEffect_BigMalasada[6] = { [3] = ITEM3_STATUS_ALL, }; +const u8 gItemEffect_OldGateau[6] = { + [3] = ITEM3_STATUS_ALL, +}; + const u8 gItemEffect_SacredAsh[7] = { [0] = ITEM0_SACRED_ASH, [4] = ITEM4_REVIVE | ITEM4_HEAL_HP, @@ -286,7 +290,14 @@ const u8 gItemEffect_XAccuracy[8] = { [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, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [6] = 1, @@ -424,6 +435,7 @@ const u8 *const gItemEffectTable[] = [ITEM_BERRY_JUICE - ITEM_POTION] = gItemEffect_BerryJuice, [ITEM_SWEET_HEART - ITEM_POTION] = gItemEffect_SweetHeart, [ITEM_BIG_MALASADA - ITEM_POTION] = gItemEffect_BigMalasada, + [ITEM_OLD_GATEAU - ITEM_POTION] = gItemEffect_OldGateau, [ITEM_SACRED_ASH - ITEM_POTION] = gItemEffect_SacredAsh, [ITEM_HP_UP - ITEM_POTION] = gItemEffect_HPUp, [ITEM_PROTEIN - ITEM_POTION] = gItemEffect_Protein, @@ -440,7 +452,8 @@ const u8 *const gItemEffectTable[] = [ITEM_X_DEFENSE - ITEM_POTION] = gItemEffect_XDefend, [ITEM_X_SPEED - ITEM_POTION] = gItemEffect_XSpeed, [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_MOON_STONE - ITEM_POTION] = gItemEffect_EvoStone, [ITEM_FIRE_STONE - ITEM_POTION] = gItemEffect_EvoStone, diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index a4dc8df07..813753505 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -280,6 +280,11 @@ static const u8 sBigMalasadaDesc[] = _( "status problems of\n" "one POKéMON."); +static const u8 sOldGateauDesc[] = _( + "Heals all the\n" + "status problems of\n" + "one POKéMON."); + static const u8 sSacredAshDesc[] = _( "Fully revives and\n" "restores all\n" @@ -392,11 +397,16 @@ static const u8 sXAccuracyDesc[] = _( "of attack moves\n" "during one battle."); -static const u8 sXSpecialDesc[] = _( +static const u8 sXSpecialAttackDesc[] = _( "Raises the stat\n" "SP. ATK during one\n" "battle."); +static const u8 sXSpecialDefenseDesc[] = _( + "Raises the stat\n" + "SP. DEF during one\n" + "battle."); + static const u8 sPokeDollDesc[] = _( "Use to flee from\n" "any battle with\n"