From 8e3f2d1e2d2bf4cf8cb20cb431f5c72a9d654ae9 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 30 Apr 2019 12:38:51 -0300 Subject: [PATCH] Sweet Heart and Big Malasada data. --- src/data/items.h | 29 +++++++++++++++++++++++++++++ src/data/pokemon/item_effects.h | 11 +++++++++++ src/data/text/item_descriptions.h | 10 ++++++++++ 3 files changed, 50 insertions(+) diff --git a/src/data/items.h b/src/data/items.h index 71860eb8d0..47fce26dc1 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -799,6 +799,35 @@ const struct Item gItems[] = .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] = { .name = _("Sacred Ash"), diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index 37efcc08ac..b0dc159254 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -154,6 +154,15 @@ const u8 gItemEffect_BerryJuice[7] = { [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] = { [0] = ITEM0_SACRED_ASH, [4] = ITEM4_REVIVE | ITEM4_HEAL_HP, @@ -413,6 +422,8 @@ const u8 *const gItemEffectTable[] = [ITEM_YELLOW_FLUTE - ITEM_POTION] = gItemEffect_YellowFlute, [ITEM_RED_FLUTE - ITEM_POTION] = gItemEffect_RedFlute, [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_HP_UP - ITEM_POTION] = gItemEffect_HPUp, [ITEM_PROTEIN - ITEM_POTION] = gItemEffect_Protein, diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index f76e03a2a9..a4dc8df071 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -270,6 +270,16 @@ static const u8 sBerryJuiceDesc[] = _( "that restores HP\n" "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[] = _( "Fully revives and\n" "restores all\n"