ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-18 04:27:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sweet Heart and Big Malasada data.

Browse Source
This commit is contained in:
LOuroboros 2019-04-30 12:38:51 -03:00
parent e9a104a0c1
commit 8e3f2d1e2d
3 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/data/items.h
View File

@ -799,6 +799,35 @@ const struct Item gItems[] =
.secondaryId = 0, .secondaryId = 0,
}, },
[ITEM_SWEET_HEART] =
{
.name = _("Sweet Heart"),
.itemId = ITEM_SWEET_HEART,
.price = 3000,
.holdEffectParam = 20,
.description = sSweetHeartDesc,
.pocket = POCKET_ITEMS,
.type = 1,
.fieldUseFunc = ItemUseOutOfBattle_Medicine,
.battleUsage = 1,
.battleUseFunc = ItemUseInBattle_Medicine,
.secondaryId = 0,
},
[ITEM_BIG_MALASADA] =
{
.name = _("Big Malasada"),
.itemId = ITEM_BIG_MALASADA,
.price = 350,
.description = sBigMalasadaDesc,
.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"),

11
src/data/pokemon/item_effects.h
View File

@ -154,6 +154,15 @@ const u8 gItemEffect_BerryJuice[7] = {
[6] = 20, [6] = 20,
}; };
const u8 gItemEffect_SweetHeart[7] = {
[4] = ITEM4_HEAL_HP,
[6] = 20,
};
const u8 gItemEffect_BigMalasada[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,
@ -413,6 +422,8 @@ const u8 *const gItemEffectTable[] =
[ITEM_YELLOW_FLUTE - ITEM_POTION] = gItemEffect_YellowFlute, [ITEM_YELLOW_FLUTE - ITEM_POTION] = gItemEffect_YellowFlute,
[ITEM_RED_FLUTE - ITEM_POTION] = gItemEffect_RedFlute, [ITEM_RED_FLUTE - ITEM_POTION] = gItemEffect_RedFlute,
[ITEM_BERRY_JUICE - ITEM_POTION] = gItemEffect_BerryJuice, [ITEM_BERRY_JUICE - ITEM_POTION] = gItemEffect_BerryJuice,
[ITEM_SWEET_HEART - ITEM_POTION] = gItemEffect_SweetHeart,
[ITEM_BIG_MALASADA - ITEM_POTION] = gItemEffect_BigMalasada,
[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,

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

@ -270,6 +270,16 @@ static const u8 sBerryJuiceDesc[] = _(
"that restores HP\n" "that restores HP\n"
"by 20 points."); "by 20 points.");
static const u8 sSweetHeartDesc[] = _(
"A sweet chocolate\n"
"that restores HP\n"
"by 20 points.");
static const u8 sBigMalasadaDesc[] = _(
"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"