From b1ab37820bb5a238a2c557d430f55ac55d8a9130 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 30 Apr 2019 13:39:58 -0300 Subject: [PATCH] Dawn, Dusk, Shiny and Ice Stones data. --- src/data/items.h | 61 +++++++++++++++++++++++++++++++ src/data/text/item_descriptions.h | 24 ++++++++++++ 2 files changed, 85 insertions(+) diff --git a/src/data/items.h b/src/data/items.h index 45f9d056b..ad42737af 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1208,6 +1208,19 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_ABILITY_CAPSULE] = + { + .name = _("Ab. Capsule"), + .itemId = ITEM_ABILITY_CAPSULE, + .price = 10000, + .holdEffectParam = 0, + .description = sAbilityCapsuleDesc, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, // Placeholder + .secondaryId = 0, + }, + [ITEM_ESCAPE_ROPE] = { .name = _("Escape Rope"), @@ -1307,6 +1320,54 @@ const struct Item gItems[] = .secondaryId = 0, }, + [ITEM_DAWN_STONE] = + { + .name = _("Dawn Stone"), + .itemId = ITEM_DAWN_STONE, + .price = 2100, + .description = sDawnStoneDesc, + .pocket = POCKET_ITEMS, + .type = 1, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .secondaryId = 0, + }, + + [ITEM_DUSK_STONE] = + { + .name = _("Dusk Stone"), + .itemId = ITEM_DUSK_STONE, + .price = 2100, + .description = sDuskStoneDesc, + .pocket = POCKET_ITEMS, + .type = 1, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .secondaryId = 0, + }, + + [ITEM_SHINY_STONE] = + { + .name = _("Shiny Stone"), + .itemId = ITEM_SHINY_STONE, + .price = 2100, + .description = sShinyStoneDesc, + .pocket = POCKET_ITEMS, + .type = 1, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .secondaryId = 0, + }, + + [ITEM_ICE_STONE] = + { + .name = _("Ice Stone"), + .itemId = ITEM_ICE_STONE, + .price = 2100, + .description = sIceStoneDesc, + .pocket = POCKET_ITEMS, + .type = 1, + .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, + .secondaryId = 0, + }, + // Valuable items [ITEM_TINY_MUSHROOM] = diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 813753505..3959afc77 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -428,6 +428,10 @@ static const u8 sMaxRepelDesc[] = _( "POKéMON for 250\n" "steps."); +static const u8 sAbilityCapsuleDesc[] = _( + "Switches a POKé-\n" + "MON's ability."); + static const u8 sEscapeRopeDesc[] = _( "Use to escape\n" "instantly from a\n" @@ -469,6 +473,26 @@ static const u8 sLeafStoneDesc[] = _( "species of POKéMON\n" "evolve."); +static const u8 sDawnStoneDesc[] = _( + "Makes certain\n" + "species of POKéMON\n" + "evolve."); + +static const u8 sDuskStoneDesc[] = _( + "Makes certain\n" + "species of POKéMON\n" + "evolve."); + +static const u8 sShinyStoneDesc[] = _( + "Makes certain\n" + "species of POKéMON\n" + "evolve."); + +static const u8 sIceStoneDesc[] = _( + "Makes certain\n" + "species of POKéMON\n" + "evolve."); + // Valuable items static const u8 sTinyMushroomDesc[] = _( "A plain mushroom\n"