atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #540 from LOuroboros/item_expansion_fixes

Browse source 
Items corrections
This commit is contained in:
ExpoSeed 2020-10-25 01:17:51 -05:00 committed by GitHub
commit 640d94960c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 191 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
graphics/items/icon_palettes/honey.pal
View file

@ -1,16 +1,16 @@
JASC-PAL JASC-PAL
0100 0100
16 16
48 48 48 163 73 164
120 80 32
200 112 0
80 152 152
232 144 0
96 184 192
248 184 72
248 240 184 248 240 184
248 184 72
232 144 0
200 112 0
120 80 32
216 248 248 216 248 248
0 0 0 96 184 192
80 152 152
48 48 48
0 0 0 0 0 0
0 0 0 0 0 0
0 0 0 0 0 0

BIN
graphics/items/icons/honey.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 263 B

82
src/data/items.h
View file

@ -2658,6 +2658,76 @@ const struct Item gItems[] =
.secondaryId = 0, .secondaryId = 0,
}, },
[ITEM_CUSTAP_BERRY] =
{
.name = _("Custap Berry"),
.itemId = ITEM_CUSTAP_BERRY,
.price = 20,
.holdEffect = HOLD_EFFECT_NONE, // To Do
.holdEffectParam = TYPE_FAIRY,
.description = sCustapBerryDesc,
.pocket = POCKET_BERRIES,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
[ITEM_JABOCA_BERRY] =
{
.name = _("Jaboca Berry"),
.itemId = ITEM_JABOCA_BERRY,
.price = 20,
.holdEffect = HOLD_EFFECT_NONE, // To Do
.holdEffectParam = TYPE_FAIRY,
.description = sJabocaBerryDesc,
.pocket = POCKET_BERRIES,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
[ITEM_ROWAP_BERRY] =
{
.name = _("Rowap Berry"),
.itemId = ITEM_ROWAP_BERRY,
.price = 20,
.holdEffect = HOLD_EFFECT_NONE, // To Do
.holdEffectParam = TYPE_FAIRY,
.description = sRowapBerryDesc,
.pocket = POCKET_BERRIES,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
[ITEM_KEE_BERRY] =
{
.name = _("Kee Berry"),
.itemId = ITEM_KEE_BERRY,
.price = 20,
.holdEffect = HOLD_EFFECT_NONE, // To Do
.holdEffectParam = TYPE_FAIRY,
.description = sKeeBerryDesc,
.pocket = POCKET_BERRIES,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
[ITEM_MARANGA_BERRY] =
{
.name = _("Maranga Berry"),
.itemId = ITEM_MARANGA_BERRY,
.price = 20,
.holdEffect = HOLD_EFFECT_NONE, // To Do
.holdEffectParam = TYPE_FAIRY,
.description = sMarangaBerryDesc,
.pocket = POCKET_BERRIES,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
// Hold items // Hold items
[ITEM_BRIGHT_POWDER] = [ITEM_BRIGHT_POWDER] =
@ -5589,6 +5659,18 @@ const struct Item gItems[] =
.secondaryId = 0, .secondaryId = 0,
}, },
[ITEM_ODD_KEYSTONE] =
{
.name = _("Odd Keystone"),
.itemId = ITEM_ODD_KEYSTONE,
.price = 2100,
.description = sOddKeystoneDesc,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
[ITEM_ADAMANT_ORB] = [ITEM_ADAMANT_ORB] =
{ {
.name = _("Adamant Orb"), .name = _("Adamant Orb"),

172
src/data/text/item_descriptions.h
View file

@ -985,6 +985,31 @@ static const u8 sRoseliBerryDesc[] = _(
"weakens a Fairy\n" "weakens a Fairy\n"
"move if weak to it."); "move if weak to it.");
static const u8 sCustapBerryDesc[] = _(
"It allows a Pokémon\n"
"in a pinch to move\n"
"first just once.");
static const u8 sJabocaBerryDesc[] = _(
"If hit by a physical\n"
"move, it will hurt\n"
"the attacker a bit.");
static const u8 sRowapBerryDesc[] = _(
"If hit by a special\n"
"move, it will hurt\n"
"the attacker a bit.");
static const u8 sKeeBerryDesc[] = _(
"If hit by a physical\n"
"move, it raises the\n"
"DEFENSE a bit.");
static const u8 sMarangaBerryDesc[] = _(
"If hit by a special\n"
"move, it raises the\n"
"SP. DEF. a bit.");
// Hold items // Hold items
static const u8 sBrightPowderDesc[] = _( static const u8 sBrightPowderDesc[] = _(
"A hold item that\n" "A hold item that\n"
@ -1986,7 +2011,7 @@ static const u8 sMuscleBandDesc[] = _(
static const u8 sWiseGlassesDesc[] = _( static const u8 sWiseGlassesDesc[] = _(
"A pair of glasses\n" "A pair of glasses\n"
"that boosts the power\n" "that ups the power\n"
"of special moves."); "of special moves.");
static const u8 sExpertBeltDesc[] = _( static const u8 sExpertBeltDesc[] = _(
@ -1995,7 +2020,7 @@ static const u8 sExpertBeltDesc[] = _(
"effective moves."); "effective moves.");
static const u8 sLightClayDesc[] = _( static const u8 sLightClayDesc[] = _(
"Extends the duration\n" "Extends the length\n"
"of barrier moves\n" "of barrier moves\n"
"used by the holder."); "used by the holder.");
@ -2005,7 +2030,7 @@ static const u8 sLifeOrbDesc[] = _(
"of some HP per turn."); "of some HP per turn.");
static const u8 sPowerHerbDesc[] = _( static const u8 sPowerHerbDesc[] = _(
"Allows the immediate\n" "Allows immediate\n"
"use of a move that\n" "use of a move that\n"
"charges first."); "charges first.");
@ -2027,12 +2052,12 @@ static const u8 sQuickPowderDesc[] = _(
static const u8 sFocusSashDesc[] = _( static const u8 sFocusSashDesc[] = _(
"If the holder has\n" "If the holder has\n"
"full HP, it endures\n" "full HP, it endures\n"
"KO attacks with 1 HP."); "KO hits with 1 HP.");
static const u8 sZoomLensDesc[] = _( static const u8 sZoomLensDesc[] = _(
"If the holder moves\n" "If the holder moves\n"
"after the foe, its\n" "after the foe, it'll\n"
"accuracy is boosted."); "boost accuracy.");
static const u8 sMetronomeDesc[] = _( static const u8 sMetronomeDesc[] = _(
"A held item that\n" "A held item that\n"
@ -2040,9 +2065,9 @@ static const u8 sMetronomeDesc[] = _(
"consecutively."); "consecutively.");
static const u8 sIronBallDesc[] = _( static const u8 sIronBallDesc[] = _(
"Lowers Speed and\n" "Cuts Speed and lets\n"
"lets Flying-types be\n" "Flying-types be hit\n"
"hit by Ground moves."); "by Ground moves.");
static const u8 sLaggingTailDesc[] = _( static const u8 sLaggingTailDesc[] = _(
"A held item that\n" "A held item that\n"
@ -2050,9 +2075,9 @@ static const u8 sLaggingTailDesc[] = _(
"move slower."); "move slower.");
static const u8 sDestinyKnotDesc[] = _( static const u8 sDestinyKnotDesc[] = _(
"If the holder becomes\n" "If the holder falls\n"
"infatuated, the\n" "in love, the foe\n"
"foe does too."); "does too.");
static const u8 sBlackSludgeDesc[] = _( static const u8 sBlackSludgeDesc[] = _(
"Gradually restores\n" "Gradually restores\n"
@ -2060,22 +2085,22 @@ static const u8 sBlackSludgeDesc[] = _(
"Damages others."); "Damages others.");
static const u8 sIcyRockDesc[] = _( static const u8 sIcyRockDesc[] = _(
"Extends the duration\n" "Extends the length\n"
"of the move Hail\n" "of the move Hail\n"
"used by the holder."); "used by the holder.");
static const u8 sSmoothRockDesc[] = _( static const u8 sSmoothRockDesc[] = _(
"Extends the duration\n" "Extends the length\n"
"of Sandstorm if\n" "of Sandstorm if\n"
"used by the holder."); "used by the holder.");
static const u8 sHeatRockDesc[] = _( static const u8 sHeatRockDesc[] = _(
"Extends the duration\n" "Extends the length\n"
"of Sunny Day if\n" "of Sunny Day if\n"
"used by the holder."); "used by the holder.");
static const u8 sDampRockDesc[] = _( static const u8 sDampRockDesc[] = _(
"Extends the duration\n" "Extends the length\n"
"of Rain Dance if\n" "of Rain Dance if\n"
"used by the holder."); "used by the holder.");
@ -2109,6 +2134,11 @@ static const u8 sChoiceSpecsDesc[] = _(
"allows the use of\n" "allows the use of\n"
"only one move."); "only one move.");
static const u8 sOddKeystoneDesc[] = _(
"Voices can be heard\n"
"from this odd stone\n"
"occasionally.");
static const u8 sAdamantOrbDesc[] = _( static const u8 sAdamantOrbDesc[] = _(
"Boosts the power of\n" "Boosts the power of\n"
"Dialga's Dragon and\n" "Dialga's Dragon and\n"
@ -2120,9 +2150,9 @@ static const u8 sLustrousOrbDesc[] = _(
"Water-type moves."); "Water-type moves.");
static const u8 sGriseousOrbDesc[] = _( static const u8 sGriseousOrbDesc[] = _(
"Boosts the power of\n" "Powers up Giratina's\n"
"Giratina's Dragon\n" "Dragon and Ghost-\n"
"and Ghost-type moves."); "type moves.");
static const u8 sGracideaDesc[] = _( static const u8 sGracideaDesc[] = _(
"Bouquets made with\n" "Bouquets made with\n"
@ -2215,83 +2245,83 @@ static const u8 sWaterMemoryDesc[] = _(
"Silvally's type."); "Silvally's type.");
static const u8 sFlamePlateDesc[] = _( static const u8 sFlamePlateDesc[] = _(
"A stone tablet that\n" "A tablet that ups\n"
"boosts the power of\n" "the power of\n"
"Fire-type moves."); "Fire-type moves.");
static const u8 sSplashPlateDesc[] = _( static const u8 sSplashPlateDesc[] = _(
"A stone tablet that\n" "A tablet that ups\n"
"boosts the power of\n" "the power of\n"
"Water-type moves."); "Water-type moves.");
static const u8 sZapPlateDesc[] = _( static const u8 sZapPlateDesc[] = _(
"A stone tablet that\n" "A tablet that ups\n"
"boosts the power of\n" "the power of Elec-\n"
"Electric-type moves."); "tric-type moves.");
static const u8 sMeadowPlateDesc[] = _( static const u8 sMeadowPlateDesc[] = _(
"A stone tablet that\n" "A tablet that ups\n"
"boosts the power of\n" "the power of\n"
"Grass-type moves."); "Grass-type moves.");
static const u8 sIciclePlateDesc[] = _( static const u8 sIciclePlateDesc[] = _(
"A stone tablet that\n" "A tablet that ups\n"
"boosts the power of\n" "the power of\n"
"Ice-type moves."); "Ice-type moves.");
static const u8 sFistPlateDesc[] = _( static const u8 sFistPlateDesc[] = _(
"A stone tablet that\n" "A tablet that ups\n"
"boosts the power of\n" "the power of Fight-\n"
"Fighting-type moves."); "ing-type moves.");
static const u8 sToxicPlateDesc[] = _( static const u8 sToxicPlateDesc[] = _(
"A stone tablet that\n" "A tablet that ups\n"
"boosts the power of\n" "the power of\n"
"Poison-type moves."); "Poison-type moves.");
static const u8 sEarthPlateDesc[] = _( static const u8 sEarthPlateDesc[] = _(
"A stone tablet that\n" "A tablet that ups\n"
"boosts the power of\n" "the power of\n"
"Ground-type moves."); "Ground-type moves.");
static const u8 sSkyPlateDesc[] = _( static const u8 sSkyPlateDesc[] = _(
"A stone tablet that\n" "A tablet that ups\n"
"boosts the power of\n" "the power of\n"
"Flying-type moves."); "Flying-type moves.");
static const u8 sMindPlateDesc[] = _( static const u8 sMindPlateDesc[] = _(
"A stone tablet that\n" "A tablet that ups\n"
"boosts the power of\n" "the power of Psy\n"
"Psychic-type moves."); "chic-type moves.");
static const u8 sInsectPlateDesc[] = _( static const u8 sInsectPlateDesc[] = _(
"A stone tablet that\n" "A tablet that ups\n"
"boosts the power of\n" "the power of\n"
"Bug-type moves."); "Bug-type moves.");
static const u8 sStonePlateDesc[] = _( static const u8 sStonePlateDesc[] = _(
"A stone tablet that\n" "A tablet that ups\n"
"boosts the power of\n" "the power of\n"
"Rock-type moves."); "Rock-type moves.");
static const u8 sSpookyPlateDesc[] = _( static const u8 sSpookyPlateDesc[] = _(
"A stone tablet that\n" "A tablet that ups\n"
"boosts the power of\n" "the power of\n"
"Ghost-type moves."); "Ghost-type moves.");
static const u8 sDracoPlateDesc[] = _( static const u8 sDracoPlateDesc[] = _(
"A stone tablet that\n" "A tablet that ups\n"
"boosts the power of\n" "the power of\n"
"Dragon-type moves."); "Dragon-type moves.");
static const u8 sDreadPlateDesc[] = _( static const u8 sDreadPlateDesc[] = _(
"A stone tablet that\n" "A tablet that ups\n"
"boosts the power of\n" "the power of\n"
"Dark-type moves."); "Dark-type moves.");
static const u8 sIronPlateDesc[] = _( static const u8 sIronPlateDesc[] = _(
"A stone tablet that\n" "A tablet that ups\n"
"boosts the power of\n" "the power of\n"
"Steel-type moves."); "Steel-type moves.");
static const u8 sEvioliteDesc[] = _( static const u8 sEvioliteDesc[] = _(
@ -2300,9 +2330,9 @@ static const u8 sEvioliteDesc[] = _(
"that can evolve."); "that can evolve.");
static const u8 sFloatStoneDesc[] = _( static const u8 sFloatStoneDesc[] = _(
"A light stone that\n" "It's so light that\n"
"reduces the weight\n" "when held, it halves\n"
"of Pokémon when held."); "a Pokémon's weight.");
static const u8 sRockyHelmetDesc[] = _( static const u8 sRockyHelmetDesc[] = _(
"Hurts the foe if\n" "Hurts the foe if\n"
@ -2361,23 +2391,23 @@ static const u8 sWeaknessPolicyDesc[] = _(
static const u8 sDouseDriveDesc[] = _( static const u8 sDouseDriveDesc[] = _(
"Changes Genesect's\n" "Changes Genesect's\n"
"Techno Blast so it\n" "Techno Blast to\n"
"becomes Water type."); "Water-type.");
static const u8 sShockDriveDesc[] = _( static const u8 sShockDriveDesc[] = _(
"Changes Genesect's\n" "Changes Genesect's\n"
"Techno Blast so it\n" "Techno Blast to\n"
"becomes Electric type."); "Electric-type.");
static const u8 sBurnDriveDesc[] = _( static const u8 sBurnDriveDesc[] = _(
"Changes Genesect's\n" "Changes Genesect's\n"
"Techno Blast so it\n" "Techno Blast to\n"
"becomes Fire type."); "Fire-type.");
static const u8 sChillDriveDesc[] = _( static const u8 sChillDriveDesc[] = _(
"Changes Genesect's\n" "Changes Genesect's\n"
"Techno Blast so it\n" "Techno Blast to\n"
"becomes Ice type."); "Ice-type.");
static const u8 sFireGemDesc[] = _( static const u8 sFireGemDesc[] = _(
"Increases the\n" "Increases the\n"
@ -2710,9 +2740,9 @@ static const u8 sBeedrilliteDesc[] = _(
"Evolve in battle."); "Evolve in battle.");
static const u8 sMegaBraceletDesc[] = _( static const u8 sMegaBraceletDesc[] = _(
"Allows Pokémon holding\n" "Enables {PKMN} holding\n"
"a Mega Stone to Mega\n" "their Mega Stone to\n"
"Evolve in battle."); "Mega Evolve.");
static const u8 sProtectPadsDesc[] = _( static const u8 sProtectPadsDesc[] = _(
"Guard the holder\n" "Guard the holder\n"
@ -2750,9 +2780,9 @@ static const u8 sAdrenalineOrbDesc[] = _(
"but only one time."); "but only one time.");
static const u8 sHoneyDesc[] = _( static const u8 sHoneyDesc[] = _(
"A sweet honey that\n" "Sweet honey that\n"
"attracts wild Pokémon\n" "attracts wild\n"
"in grass or on trees."); "Pokémon when used.");
static const u8 sHealthWingDesc[] = _( static const u8 sHealthWingDesc[] = _(
"An item that raises\n" "An item that raises\n"