From f521bec102cb5e36926caded99c1b8ad18ae200f Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 30 Apr 2019 14:09:51 -0300 Subject: [PATCH] Added the 7 Apricorns' data. --- src/data/items.h | 84 +++++++++++++++++++++++++++++++ src/data/text/item_descriptions.h | 36 +++++++++++++ 2 files changed, 120 insertions(+) diff --git a/src/data/items.h b/src/data/items.h index ad42737afd..048e06e06c 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1370,6 +1370,90 @@ const struct Item gItems[] = // Valuable items + [ITEM_RED_APRICORN] = + { + .name = _("Red Apricorn"), + .itemId = ITEM_RED_APRICORN, + .price = 200, + .description = sRedApricornDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_BLUE_APRICORN] = + { + .name = _("Blu Apricorn"), + .itemId = ITEM_BLUE_APRICORN, + .price = 200, + .description = sBlueApricornDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_YELLOW_APRICORN] = + { + .name = _("Ylw Apricorn"), + .itemId = ITEM_YELLOW_APRICORN, + .price = 200, + .description = sYellowApricornDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_GREEN_APRICORN] = + { + .name = _("Grn Apricorn"), + .itemId = ITEM_GREEN_APRICORN, + .price = 200, + .description = sGreenApricornDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_PINK_APRICORN] = + { + .name = _("Pnk Apricorn"), + .itemId = ITEM_PINK_APRICORN, + .price = 200, + .description = sPinkApricornDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_WHITE_APRICORN] = + { + .name = _("Wht Apricorn"), + .itemId = ITEM_WHITE_APRICORN, + .price = 200, + .description = sWhiteApricornDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + + [ITEM_BLACK_APRICORN] = + { + .name = _("Blk Apricorn"), + .itemId = ITEM_BLACK_APRICORN, + .price = 200, + .description = sBlackApricornDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .secondaryId = 0, + }, + [ITEM_TINY_MUSHROOM] = { .name = _("TinyMushroom"), diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 3959afc778..9dfbdd93cc 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -494,6 +494,42 @@ static const u8 sIceStoneDesc[] = _( "evolve."); // Valuable items + +static const u8 sRedApricornDesc[] = _( + "A red apricorn.\n" + "It assails your\n" + "nostrils."); + +static const u8 sBlueApricornDesc[] = _( + "A blue apricorn.\n" + "It smells a bit\n" + "like grass."); + +static const u8 sYellowApricornDesc[] = _( + "A yellow apricorn.\n" + "It has an invigor-\n" + "ating scent."); + +static const u8 sGreenApricornDesc[] = _( + "A green apricorn.\n" + "It has a strange,\n" + "aromatic scent."); + +static const u8 sPinkApricornDesc[] = _( + "A pink apricorn.\n" + "It has a nice,\n" + "sweet scent."); + +static const u8 sWhiteApricornDesc[] = _( + "A white apricorn.\n" + "It doesn't smell\n" + "like anything."); + +static const u8 sBlackApricornDesc[] = _( + "A black apricorn.\n" + "It has an inde-\n" + "scribable scent."); + static const u8 sTinyMushroomDesc[] = _( "A plain mushroom\n" "that would sell\n"