From 2e5575385a775d6117eafe04be8811e7771aeeee Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Wed, 30 Dec 2020 20:27:37 -0500 Subject: [PATCH 1/9] pr commit --- src/data/items.h | 417 +++++++++--------- src/data/pokemon/item_effects.h | 14 +- src/data/text/item_descriptions.h | 684 +++++++++++++++--------------- 3 files changed, 561 insertions(+), 554 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index 15d769cea..cb6837474 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -186,7 +186,7 @@ const struct Item gItems[] = { .name = _("Level Ball"), .itemId = ITEM_LEVEL_BALL, - .price = 2000, + .price = 300, .description = sLevelBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -200,7 +200,7 @@ const struct Item gItems[] = { .name = _("Lure Ball"), .itemId = ITEM_LURE_BALL, - .price = 2000, + .price = 300, .description = sLureBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -214,7 +214,7 @@ const struct Item gItems[] = { .name = _("Moon Ball"), .itemId = ITEM_MOON_BALL, - .price = 2000, + .price = 300, .description = sMoonBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -228,7 +228,7 @@ const struct Item gItems[] = { .name = _("Friend Ball"), .itemId = ITEM_FRIEND_BALL, - .price = 2000, + .price = 300, .description = sFriendBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -242,7 +242,7 @@ const struct Item gItems[] = { .name = _("Love Ball"), .itemId = ITEM_LOVE_BALL, - .price = 2000, + .price = 300, .description = sLoveBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -256,7 +256,7 @@ const struct Item gItems[] = { .name = _("Heavy Ball"), .itemId = ITEM_HEAVY_BALL, - .price = 2000, + .price = 300, .description = sHeavyBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -270,7 +270,7 @@ const struct Item gItems[] = { .name = _("Fast Ball"), .itemId = ITEM_FAST_BALL, - .price = 2000, + .price = 300, .description = sFastBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -298,7 +298,7 @@ const struct Item gItems[] = { .name = _("Quick Ball"), .itemId = ITEM_QUICK_BALL, - .price = 3000, + .price = 1000, .description = sQuickBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -312,7 +312,7 @@ const struct Item gItems[] = { .name = _("Dusk Ball"), .itemId = ITEM_DUSK_BALL, - .price = 3000, + .price = 1000, .description = sDuskBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -326,7 +326,7 @@ const struct Item gItems[] = { .name = _("Cherish Ball"), .itemId = ITEM_CHERISH_BALL, - .price = 10, + .price = 0, .description = sCherishBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -340,7 +340,7 @@ const struct Item gItems[] = { .name = _("Sport Ball"), .itemId = ITEM_SPORT_BALL, - .price = 10, + .price = 300, .description = sSportBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -354,7 +354,7 @@ const struct Item gItems[] = { .name = _("Park Ball"), .itemId = ITEM_PARK_BALL, - .price = 10, + .price = 0, .description = sParkBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -368,7 +368,7 @@ const struct Item gItems[] = { .name = _("Dream Ball"), .itemId = ITEM_DREAM_BALL, - .price = 10, + .price = 0, .description = sDreamBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -382,7 +382,7 @@ const struct Item gItems[] = { .name = _("Beast Ball"), .itemId = ITEM_BEAST_BALL, - .price = 10, + .price = 1000, .description = sBeastBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -467,7 +467,7 @@ const struct Item gItems[] = [ITEM_PARALYZE_HEAL] = { - .name = _("Parlyz Heal"), + .name = _("Paralyze Heal"), .itemId = ITEM_PARALYZE_HEAL, .price = 200, .description = sParalyzeHealDesc, @@ -514,7 +514,7 @@ const struct Item gItems[] = .name = _("Hyper Potion"), .itemId = ITEM_HYPER_POTION, .price = 1200, - .holdEffectParam = 200, + .holdEffectParam = 120, .description = sHyperPotionDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -529,7 +529,7 @@ const struct Item gItems[] = .name = _("Super Potion"), .itemId = ITEM_SUPER_POTION, .price = 700, - .holdEffectParam = 50, + .holdEffectParam = 60, .description = sSuperPotionDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -586,7 +586,7 @@ const struct Item gItems[] = .name = _("Fresh Water"), .itemId = ITEM_FRESH_WATER, .price = 200, - .holdEffectParam = 50, + .holdEffectParam = 30, .description = sFreshWaterDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -601,7 +601,7 @@ const struct Item gItems[] = .name = _("Soda Pop"), .itemId = ITEM_SODA_POP, .price = 300, - .holdEffectParam = 60, + .holdEffectParam = 50, .description = sSodaPopDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -616,7 +616,7 @@ const struct Item gItems[] = .name = _("Lemonade"), .itemId = ITEM_LEMONADE, .price = 350, - .holdEffectParam = 80, + .holdEffectParam = 70, .description = sLemonadeDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -643,7 +643,7 @@ const struct Item gItems[] = [ITEM_ENERGY_POWDER] = { - .name = _("Energypowder"), + .name = _("Energy Powder"), .itemId = ITEM_ENERGY_POWDER, .price = 500, .description = sEnergyPowderDesc, @@ -859,7 +859,7 @@ const struct Item gItems[] = { .name = _("Sweet Heart"), .itemId = ITEM_SWEET_HEART, - .price = 3000, + .price = 100, .holdEffectParam = 20, .description = sSweetHeartDesc, .pocket = POCKET_ITEMS, @@ -888,7 +888,7 @@ const struct Item gItems[] = { .name = _("Old Gateau"), .itemId = ITEM_OLD_GATEAU, - .price = 350, + .price = 200, .description = sOldGateauDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1128,7 +1128,7 @@ const struct Item gItems[] = { .name = _("X Attack"), .itemId = ITEM_X_ATTACK, - .price = 1000, + .price = 500, .description = sXAttackDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1140,9 +1140,9 @@ const struct Item gItems[] = [ITEM_X_DEFENSE] = { - .name = _("X Defend"), + .name = _("X Defense"), .itemId = ITEM_X_DEFENSE, - .price = 2000, + .price = 550, .description = sXDefendDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1156,7 +1156,7 @@ const struct Item gItems[] = { .name = _("X Speed"), .itemId = ITEM_X_SPEED, - .price = 1000, + .price = 350, .description = sXSpeedDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1170,7 +1170,7 @@ const struct Item gItems[] = { .name = _("X Accuracy"), .itemId = ITEM_X_ACCURACY, - .price = 1000, + .price = 950, .description = sXAccuracyDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1182,9 +1182,9 @@ const struct Item gItems[] = [ITEM_X_SP_ATK] = { - .name = _("X Sp. Atk."), + .name = _("X Sp. Atk"), .itemId = ITEM_X_SP_ATK, - .price = 1000, + .price = 350, .description = sXSpecialAttackDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1196,9 +1196,9 @@ const struct Item gItems[] = [ITEM_X_SP_DEF] = { - .name = _("X Sp. Def."), + .name = _("X Sp. Def"), .itemId = ITEM_X_SP_DEF, - .price = 2000, + .price = 350, .description = sXSpecialDefenseDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1268,7 +1268,7 @@ const struct Item gItems[] = { .name = _("Ab. Capsule"), .itemId = ITEM_ABILITY_CAPSULE, - .price = 10000, + .price = 1000, .holdEffectParam = 0, .description = sAbilityCapsuleDesc, .pocket = POCKET_ITEMS, @@ -1327,7 +1327,7 @@ const struct Item gItems[] = { .name = _("Moon Stone"), .itemId = ITEM_MOON_STONE, - .price = 0, + .price = 2100, .description = sMoonStoneDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1349,7 +1349,7 @@ const struct Item gItems[] = [ITEM_THUNDER_STONE] = { - .name = _("ThunderStone"), + .name = _("Thunder Stone"), .itemId = ITEM_THUNDER_STONE, .price = 2100, .description = sThunderStoneDesc, @@ -1437,7 +1437,7 @@ const struct Item gItems[] = { .name = _("Red Apricorn"), .itemId = ITEM_RED_APRICORN, - .price = 200, + .price = 20, .description = sRedApricornDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1447,9 +1447,9 @@ const struct Item gItems[] = [ITEM_BLUE_APRICORN] = { - .name = _("Blu Apricorn"), + .name = _("Blue Apricorn"), .itemId = ITEM_BLUE_APRICORN, - .price = 200, + .price = 20, .description = sBlueApricornDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1461,7 +1461,7 @@ const struct Item gItems[] = { .name = _("Ylw Apricorn"), .itemId = ITEM_YELLOW_APRICORN, - .price = 200, + .price = 20, .description = sYellowApricornDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1473,7 +1473,7 @@ const struct Item gItems[] = { .name = _("Grn Apricorn"), .itemId = ITEM_GREEN_APRICORN, - .price = 200, + .price = 20, .description = sGreenApricornDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1483,9 +1483,9 @@ const struct Item gItems[] = [ITEM_PINK_APRICORN] = { - .name = _("Pnk Apricorn"), + .name = _("Pink Apricorn"), .itemId = ITEM_PINK_APRICORN, - .price = 200, + .price = 20, .description = sPinkApricornDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1497,7 +1497,7 @@ const struct Item gItems[] = { .name = _("Wht Apricorn"), .itemId = ITEM_WHITE_APRICORN, - .price = 200, + .price = 20, .description = sWhiteApricornDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1509,7 +1509,7 @@ const struct Item gItems[] = { .name = _("Blk Apricorn"), .itemId = ITEM_BLACK_APRICORN, - .price = 200, + .price = 20, .description = sBlackApricornDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1519,7 +1519,7 @@ const struct Item gItems[] = [ITEM_TINY_MUSHROOM] = { - .name = _("TinyMushroom"), + .name = _("Tiny Mushroom"), .itemId = ITEM_TINY_MUSHROOM, .price = 500, .description = sTinyMushroomDesc, @@ -1669,7 +1669,7 @@ const struct Item gItems[] = { .name = _("Rare Bone"), .itemId = ITEM_RARE_BONE, - .price = 5000, + .price = 10000, .description = sRareBoneDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1814,7 +1814,7 @@ const struct Item gItems[] = { .name = _("Retro Mail"), .itemId = ITEM_RETRO_MAIL, - .price = 0, + .price = 50, .description = sRetroMailDesc, .pocket = POCKET_ITEMS, .type = 0, @@ -2739,7 +2739,7 @@ const struct Item gItems[] = [ITEM_BRIGHT_POWDER] = { - .name = _("BrightPowder"), + .name = _("Bright Powder"), .itemId = ITEM_BRIGHT_POWDER, .price = 10, .holdEffect = HOLD_EFFECT_EVASION_UP, @@ -2859,7 +2859,7 @@ const struct Item gItems[] = [ITEM_SILVER_POWDER] = { - .name = _("SilverPowder"), + .name = _("Silver Powder"), .itemId = ITEM_SILVER_POWDER, .price = 100, .holdEffect = HOLD_EFFECT_BUG_POWER, @@ -3049,7 +3049,7 @@ const struct Item gItems[] = { .name = _("Oval Stone"), .itemId = ITEM_OVAL_STONE, - .price = 2000, + .price = 2100, .description = sOvalStoneDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3061,7 +3061,7 @@ const struct Item gItems[] = { .name = _("Protector"), .itemId = ITEM_PROTECTOR, - .price = 2000, + .price = 2100, .description = sProtectorDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3073,7 +3073,7 @@ const struct Item gItems[] = { .name = _("Electirizer"), .itemId = ITEM_ELECTIRIZER, - .price = 2000, + .price = 2100, .description = sElectirizerDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3085,7 +3085,7 @@ const struct Item gItems[] = { .name = _("Magmarizer"), .itemId = ITEM_MAGMARIZER, - .price = 2000, + .price = 2100, .description = sMagmarizerDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3097,7 +3097,7 @@ const struct Item gItems[] = { .name = _("Dubious Disc"), .itemId = ITEM_DUBIOUS_DISC, - .price = 2000, + .price = 2100, .description = sDubiousDiscDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3109,7 +3109,7 @@ const struct Item gItems[] = { .name = _("Reaper Cloth"), .itemId = ITEM_REAPER_CLOTH, - .price = 2000, + .price = 2100, .description = sReaperClothDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3121,7 +3121,7 @@ const struct Item gItems[] = { .name = _("Razor Claw"), .itemId = ITEM_RAZOR_CLAW, - .price = 2000, + .price = 2100, .holdEffect = HOLD_EFFECT_NONE, // Placeholder. .description = sRazorClawDesc, .pocket = POCKET_ITEMS, @@ -3134,7 +3134,7 @@ const struct Item gItems[] = { .name = _("Razor Fang"), .itemId = ITEM_RAZOR_FANG, - .price = 2000, + .price = 2100, .holdEffect = HOLD_EFFECT_FLINCH, .holdEffectParam = 10, .description = sRazorFangDesc, @@ -3148,7 +3148,7 @@ const struct Item gItems[] = { .name = _("Prism Scale"), .itemId = ITEM_PRISM_SCALE, - .price = 2000, + .price = 500, .description = sPrismScaleDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3158,9 +3158,9 @@ const struct Item gItems[] = [ITEM_WHIPPED_DREAM] = { - .name = _("WhippedDream"), + .name = _("Whipped Dream"), .itemId = ITEM_WHIPPED_DREAM, - .price = 2000, + .price = 2100, .description = sWhippedDreamDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3172,7 +3172,7 @@ const struct Item gItems[] = { .name = _("Sachet"), .itemId = ITEM_SACHET, - .price = 2000, + .price = 2100, .description = sSachetDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3237,7 +3237,7 @@ const struct Item gItems[] = [ITEM_BLACK_GLASSES] = { - .name = _("BlackGlasses"), + .name = _("Black Glasses"), .itemId = ITEM_BLACK_GLASSES, .price = 100, .holdEffect = HOLD_EFFECT_DARK_POWER, @@ -3349,7 +3349,7 @@ const struct Item gItems[] = [ITEM_TWISTED_SPOON] = { - .name = _("Twistedspoon"), + .name = _("Twisted Spoon"), .itemId = ITEM_TWISTED_SPOON, .price = 100, .holdEffect = HOLD_EFFECT_PSYCHIC_POWER, @@ -3405,7 +3405,7 @@ const struct Item gItems[] = [ITEM_UP_GRADE] = { - .name = _("Up-Grade"), + .name = _("Upgrade"), .itemId = ITEM_UP_GRADE, .price = 2100, .holdEffect = HOLD_EFFECT_UP_GRADE, @@ -3436,7 +3436,7 @@ const struct Item gItems[] = .itemId = ITEM_POWER_BRACER, .price = 3000, .holdEffect = HOLD_EFFECT_POWER_ITEM, - .holdEffectParam = 4, + .holdEffectParam = 8, .description = sPowerBracerDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3450,7 +3450,7 @@ const struct Item gItems[] = .itemId = ITEM_POWER_BELT, .price = 3000, .holdEffect = HOLD_EFFECT_POWER_ITEM, - .holdEffectParam = 4, + .holdEffectParam = 8, .description = sPowerBeltDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3464,7 +3464,7 @@ const struct Item gItems[] = .itemId = ITEM_POWER_LENS, .price = 3000, .holdEffect = HOLD_EFFECT_POWER_ITEM, - .holdEffectParam = 4, + .holdEffectParam = 8, .description = sPowerLensDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3478,7 +3478,7 @@ const struct Item gItems[] = .itemId = ITEM_POWER_BAND, .price = 3000, .holdEffect = HOLD_EFFECT_POWER_ITEM, - .holdEffectParam = 4, + .holdEffectParam = 8, .description = sPowerBandDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3492,7 +3492,7 @@ const struct Item gItems[] = .itemId = ITEM_POWER_ANKLET, .price = 3000, .holdEffect = HOLD_EFFECT_POWER_ITEM, - .holdEffectParam = 4, + .holdEffectParam = 8, .description = sPowerAnkletDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3506,7 +3506,7 @@ const struct Item gItems[] = .itemId = ITEM_POWER_WEIGHT, .price = 3000, .holdEffect = HOLD_EFFECT_POWER_ITEM, - .holdEffectParam = 4, + .holdEffectParam = 8, .description = sPowerWeightDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3518,7 +3518,7 @@ const struct Item gItems[] = { .name = _("Sea Incense"), .itemId = ITEM_SEA_INCENSE, - .price = 2000, + .price = 9600, .holdEffect = HOLD_EFFECT_WATER_POWER, .holdEffectParam = 20, .description = sSeaIncenseDesc, @@ -3532,7 +3532,7 @@ const struct Item gItems[] = { .name = _("Lax Incense"), .itemId = ITEM_LAX_INCENSE, - .price = 5000, + .price = 9600, .holdEffect = HOLD_EFFECT_EVASION_UP, .holdEffectParam = 10, .description = sLaxIncenseDesc, @@ -3546,7 +3546,7 @@ const struct Item gItems[] = { .name = _("Odd Incense"), .itemId = ITEM_ODD_INCENSE, - .price = 2000, + .price = 9600, .holdEffect = HOLD_EFFECT_PSYCHIC_POWER, .holdEffectParam = 20, .description = sOddIncenseDesc, @@ -3560,7 +3560,7 @@ const struct Item gItems[] = { .name = _("Rock Incense"), .itemId = ITEM_ROCK_INCENSE, - .price = 2000, + .price = 9600, .holdEffect = HOLD_EFFECT_ROCK_POWER, .holdEffectParam = 20, .description = sRockIncenseDesc, @@ -3574,7 +3574,7 @@ const struct Item gItems[] = { .name = _("Full Incense"), .itemId = ITEM_FULL_INCENSE, - .price = 5000, + .price = 9600, .holdEffect = HOLD_EFFECT_LAGGING_TAIL, .holdEffectParam = 5, .description = sFullIncenseDesc, @@ -3588,7 +3588,7 @@ const struct Item gItems[] = { .name = _("Wave Incense"), .itemId = ITEM_WAVE_INCENSE, - .price = 2000, + .price = 9600, .holdEffect = HOLD_EFFECT_WATER_POWER, .holdEffectParam = 20, .description = sWaveIncenseDesc, @@ -3602,7 +3602,7 @@ const struct Item gItems[] = { .name = _("Rose Incense"), .itemId = ITEM_ROSE_INCENSE, - .price = 2000, + .price = 9600, .holdEffect = HOLD_EFFECT_GRASS_POWER, .holdEffectParam = 20, .description = sRoseIncenseDesc, @@ -3616,7 +3616,7 @@ const struct Item gItems[] = { .name = _("Luck Incense"), .itemId = ITEM_LUCK_INCENSE, - .price = 11000, + .price = 9600, .holdEffect = HOLD_EFFECT_DOUBLE_PRIZE, .holdEffectParam = 10, .description = sLuckIncenseDesc, @@ -3630,7 +3630,7 @@ const struct Item gItems[] = { .name = _("Pure Incense"), .itemId = ITEM_PURE_INCENSE, - .price = 6000, + .price = 9600, .holdEffect = HOLD_EFFECT_REPEL, .description = sPureIncenseDesc, .pocket = POCKET_ITEMS, @@ -3680,7 +3680,7 @@ const struct Item gItems[] = [ITEM_STICK] = { - .name = _("Stick"), + .name = _("Leek"), .itemId = ITEM_STICK, .price = 200, .holdEffect = HOLD_EFFECT_STICK, @@ -3782,7 +3782,7 @@ const struct Item gItems[] = [ITEM_ITEMFINDER] = { - .name = _("Itemfinder"), + .name = _("Dowsing MCHN"), .itemId = ITEM_ITEMFINDER, .price = 0, .description = sItemfinderDesc, @@ -3877,7 +3877,7 @@ const struct Item gItems[] = [ITEM_DEVON_GOODS] = { - .name = _("Devon Goods"), + .name = _("Devon Parts"), .itemId = ITEM_DEVON_GOODS, .price = 0, .description = sDevonGoodsDesc, @@ -4035,7 +4035,7 @@ const struct Item gItems[] = [ITEM_ROOM_1_KEY] = { - .name = _("Rm. 1 Key"), + .name = _("Key to Room 1"), .itemId = ITEM_ROOM_1_KEY, .price = 0, .description = sRoom1KeyDesc, @@ -4048,7 +4048,7 @@ const struct Item gItems[] = [ITEM_ROOM_2_KEY] = { - .name = _("Rm. 2 Key"), + .name = _("Key to Room 2"), .itemId = ITEM_ROOM_2_KEY, .price = 0, .description = sRoom2KeyDesc, @@ -4061,7 +4061,7 @@ const struct Item gItems[] = [ITEM_ROOM_4_KEY] = { - .name = _("Rm. 4 Key"), + .name = _("Key to Room 4"), .itemId = ITEM_ROOM_4_KEY, .price = 0, .description = sRoom4KeyDesc, @@ -4074,7 +4074,7 @@ const struct Item gItems[] = [ITEM_ROOM_6_KEY] = { - .name = _("Rm. 6 Key"), + .name = _("Key to Room 6"), .itemId = ITEM_ROOM_6_KEY, .price = 0, .description = sRoom6KeyDesc, @@ -4821,7 +4821,7 @@ const struct Item gItems[] = [ITEM_OAKS_PARCEL] = { - .name = _("Oak's Parcel"), + .name = _("Parcel"), .itemId = ITEM_OAKS_PARCEL, .price = 0, .description = sOaksParcelDesc, @@ -4888,12 +4888,13 @@ const struct Item gItems[] = { .name = _("Old Amber"), .itemId = ITEM_OLD_AMBER, - .price = 0, .description = sOldAmberDesc, #if I_KEY_FOSSILS >= GEN_4 + .price = 1000, .importance = 0, .pocket = POCKET_ITEMS, #else + .price = 0, .importance = 1, .pocket = POCKET_KEY_ITEMS, #endif @@ -4932,7 +4933,7 @@ const struct Item gItems[] = { .name = _("Armor Fossil"), .itemId = ITEM_ARMOR_FOSSIL, - .price = 0, + .price = 1000, .description = sArmorFossilDesc, .importance = 0, .pocket = POCKET_ITEMS, @@ -4945,7 +4946,7 @@ const struct Item gItems[] = { .name = _("Skull Fossil"), .itemId = ITEM_SKULL_FOSSIL, - .price = 0, + .price = 1000, .description = sSkullFossilDesc, .importance = 0, .pocket = POCKET_ITEMS, @@ -4958,12 +4959,13 @@ const struct Item gItems[] = { .name = _("Helix Fossil"), .itemId = ITEM_HELIX_FOSSIL, - .price = 0, .description = sHelixFossilDesc, #if I_KEY_FOSSILS >= GEN_4 + .price = 1000, .importance = 0, .pocket = POCKET_ITEMS, #else + .price = 0, .importance = 1, .pocket = POCKET_KEY_ITEMS, #endif @@ -4976,12 +4978,13 @@ const struct Item gItems[] = { .name = _("Dome Fossil"), .itemId = ITEM_DOME_FOSSIL, - .price = 0, .description = sDomeFossilDesc, #if I_KEY_FOSSILS >= GEN_4 + .price = 1000, .importance = 0, .pocket = POCKET_ITEMS, #else + .price = 0, .importance = 1, .pocket = POCKET_KEY_ITEMS, #endif @@ -4994,12 +4997,13 @@ const struct Item gItems[] = { .name = _("Root Fossil"), .itemId = ITEM_ROOT_FOSSIL, - .price = 0, .description = sRootFossilDesc, #if I_KEY_FOSSILS >= GEN_4 + .price = 1000, .importance = 0, .pocket = POCKET_ITEMS, #else + .price = 0, .importance = 1, .pocket = POCKET_KEY_ITEMS, #endif @@ -5012,12 +5016,13 @@ const struct Item gItems[] = { .name = _("Claw Fossil"), .itemId = ITEM_CLAW_FOSSIL, - .price = 0, .description = sClawFossilDesc, #if I_KEY_FOSSILS >= GEN_4 + .price = 1000, .importance = 0, .pocket = POCKET_ITEMS, #else + .price = 0, .importance = 1, .pocket = POCKET_KEY_ITEMS, #endif @@ -5030,7 +5035,7 @@ const struct Item gItems[] = { .name = _("Cover Fossil"), .itemId = ITEM_COVER_FOSSIL, - .price = 0, + .price = 1000, .description = sCoverFossilDesc, .importance = 0, .pocket = POCKET_ITEMS, @@ -5043,7 +5048,7 @@ const struct Item gItems[] = { .name = _("Plume Fossil"), .itemId = ITEM_PLUME_FOSSIL, - .price = 0, + .price = 1000, .description = sPlumeFossilDesc, .importance = 0, .pocket = POCKET_ITEMS, @@ -5056,7 +5061,7 @@ const struct Item gItems[] = { .name = _("Jaw Fossil"), .itemId = ITEM_JAW_FOSSIL, - .price = 0, + .price = 1000, .description = sJawFossilDesc, .importance = 0, .pocket = POCKET_ITEMS, @@ -5069,7 +5074,7 @@ const struct Item gItems[] = { .name = _("Sail Fossil"), .itemId = ITEM_SAIL_FOSSIL, - .price = 0, + .price = 1000, .description = sSailFossilDesc, .importance = 0, .pocket = POCKET_ITEMS, @@ -5121,7 +5126,7 @@ const struct Item gItems[] = [ITEM_VS_SEEKER] = { - .name = _("Vs Seeker"), + .name = _("Vs. Seeker"), .itemId = ITEM_VS_SEEKER, .price = 0, .description = sVSSeekerDesc, @@ -5233,7 +5238,7 @@ const struct Item gItems[] = [ITEM_MYSTIC_TICKET] = { - .name = _("MysticTicket"), + .name = _("Mystic Ticket"), .itemId = ITEM_MYSTIC_TICKET, .price = 0, .description = sMysticTicketDesc, @@ -5247,7 +5252,7 @@ const struct Item gItems[] = [ITEM_AURORA_TICKET] = { - .name = _("AuroraTicket"), + .name = _("Aurora Ticket"), .itemId = ITEM_AURORA_TICKET, .price = 0, .description = sAuroraTicketDesc, @@ -5419,7 +5424,7 @@ const struct Item gItems[] = { .name = _("Power Herb"), .itemId = ITEM_POWER_HERB, - .price = 200, + .price = 100, .holdEffect = HOLD_EFFECT_POWER_HERB, .description = sPowerHerbDesc, .pocket = POCKET_ITEMS, @@ -5458,7 +5463,7 @@ const struct Item gItems[] = { .name = _("Quick Powder"), .itemId = ITEM_QUICK_POWDER, - .price = 200, + .price = 10, .holdEffect = HOLD_EFFECT_QUICK_POWDER, .description = sQuickPowderDesc, .pocket = POCKET_ITEMS, @@ -5668,7 +5673,7 @@ const struct Item gItems[] = { .name = _("Big Root"), .itemId = ITEM_BIG_ROOT, - .price = 200, + .price = 100, .holdEffect = HOLD_EFFECT_BIG_ROOT, .holdEffectParam = 30, .description = sBigRootDesc, @@ -5707,7 +5712,7 @@ const struct Item gItems[] = { .name = _("Adamant Orb"), .itemId = ITEM_ADAMANT_ORB, - .price = 200, + .price = 10000, .holdEffect = HOLD_EFFECT_ADAMANT_ORB, .description = sAdamantOrbDesc, .pocket = POCKET_ITEMS, @@ -5720,7 +5725,7 @@ const struct Item gItems[] = { .name = _("Lustrous Orb"), .itemId = ITEM_LUSTROUS_ORB, - .price = 200, + .price = 10000, .holdEffect = HOLD_EFFECT_LUSTROUS_ORB, .description = sLustrousOrbDesc, .pocket = POCKET_ITEMS, @@ -5733,7 +5738,7 @@ const struct Item gItems[] = { .name = _("Griseous Orb"), .itemId = ITEM_GRISEOUS_ORB, - .price = 200, + .price = 10000, .holdEffect = HOLD_EFFECT_GRISEOUS_ORB, .description = sGriseousOrbDesc, .pocket = POCKET_ITEMS, @@ -5746,7 +5751,7 @@ const struct Item gItems[] = { .name = _("Gracidea"), .itemId = ITEM_GRACIDEA, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_GRACIDEA, .description = sGracideaDesc, .pocket = POCKET_ITEMS, @@ -5997,7 +6002,7 @@ const struct Item gItems[] = { .name = _("Flame Plate"), .itemId = ITEM_FLAME_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sFlamePlateDesc, @@ -6011,7 +6016,7 @@ const struct Item gItems[] = { .name = _("Splash Plate"), .itemId = ITEM_SPLASH_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sSplashPlateDesc, @@ -6025,7 +6030,7 @@ const struct Item gItems[] = { .name = _("Zap Plate"), .itemId = ITEM_ZAP_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sZapPlateDesc, @@ -6039,7 +6044,7 @@ const struct Item gItems[] = { .name = _("Meadow Plate"), .itemId = ITEM_MEADOW_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sMeadowPlateDesc, @@ -6053,7 +6058,7 @@ const struct Item gItems[] = { .name = _("Icicle Plate"), .itemId = ITEM_ICICLE_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sIciclePlateDesc, @@ -6067,7 +6072,7 @@ const struct Item gItems[] = { .name = _("Fist Plate"), .itemId = ITEM_FIST_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sFistPlateDesc, @@ -6081,7 +6086,7 @@ const struct Item gItems[] = { .name = _("Toxic Plate"), .itemId = ITEM_TOXIC_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sToxicPlateDesc, @@ -6095,7 +6100,7 @@ const struct Item gItems[] = { .name = _("Earth Plate"), .itemId = ITEM_EARTH_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sEarthPlateDesc, @@ -6109,7 +6114,7 @@ const struct Item gItems[] = { .name = _("Sky Plate"), .itemId = ITEM_SKY_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sSkyPlateDesc, @@ -6123,7 +6128,7 @@ const struct Item gItems[] = { .name = _("Mind Plate"), .itemId = ITEM_MIND_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sMindPlateDesc, @@ -6137,7 +6142,7 @@ const struct Item gItems[] = { .name = _("Insect Plate"), .itemId = ITEM_INSECT_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sInsectPlateDesc, @@ -6151,7 +6156,7 @@ const struct Item gItems[] = { .name = _("Stone Plate"), .itemId = ITEM_STONE_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sStonePlateDesc, @@ -6165,7 +6170,7 @@ const struct Item gItems[] = { .name = _("Spooky Plate"), .itemId = ITEM_SPOOKY_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sSpookyPlateDesc, @@ -6179,7 +6184,7 @@ const struct Item gItems[] = { .name = _("Draco Plate"), .itemId = ITEM_DRACO_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sDracoPlateDesc, @@ -6193,7 +6198,7 @@ const struct Item gItems[] = { .name = _("Dread Plate"), .itemId = ITEM_DREAD_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sDreadPlateDesc, @@ -6207,7 +6212,7 @@ const struct Item gItems[] = { .name = _("Iron Plate"), .itemId = ITEM_IRON_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sIronPlateDesc, @@ -6248,7 +6253,7 @@ const struct Item gItems[] = { .name = _("Rocky Helmet"), .itemId = ITEM_ROCKY_HELMET, - .price = 2000, + .price = 200, .holdEffect = HOLD_EFFECT_ROCKY_HELMET, .holdEffectParam = 0, .description = sRockyHelmetDesc, @@ -6262,7 +6267,7 @@ const struct Item gItems[] = { .name = _("Air Balloon"), .itemId = ITEM_AIR_BALLOON, - .price = 2000, + .price = 200, .holdEffect = HOLD_EFFECT_AIR_BALLOON, .holdEffectParam = 0, .description = sAirBalloonDesc, @@ -6276,7 +6281,7 @@ const struct Item gItems[] = { .name = _("Red Card"), .itemId = ITEM_RED_CARD, - .price = 2000, + .price = 200, .holdEffect = HOLD_EFFECT_RED_CARD, .holdEffectParam = 0, .description = sRedCardDesc, @@ -6290,7 +6295,7 @@ const struct Item gItems[] = { .name = _("Ring Target"), .itemId = ITEM_RING_TARGET, - .price = 2000, + .price = 200, .holdEffect = HOLD_EFFECT_RING_TARGET, .holdEffectParam = 0, .description = sRingTargetDesc, @@ -6304,7 +6309,7 @@ const struct Item gItems[] = { .name = _("Binding Band"), .itemId = ITEM_BINDING_BAND, - .price = 2000, + .price = 200, .holdEffect = HOLD_EFFECT_BINDING_BAND, .description = sBindingBandDesc, .pocket = POCKET_ITEMS, @@ -6317,7 +6322,7 @@ const struct Item gItems[] = { .name = _("Eject Button"), .itemId = ITEM_EJECT_BUTTON, - .price = 2000, + .price = 200, .holdEffect = HOLD_EFFECT_EJECT_BUTTON, .holdEffectParam = 0, .description = sEjectButtonDesc, @@ -6331,7 +6336,7 @@ const struct Item gItems[] = { .name = _("Absorb Bulb"), .itemId = ITEM_ABSORB_BULB, - .price = 2000, + .price = 200, .holdEffect = HOLD_EFFECT_ABSORB_BULB, .holdEffectParam = 0, .description = sAbsorbBulbDesc, @@ -6345,7 +6350,7 @@ const struct Item gItems[] = { .name = _("Cell Battery"), .itemId = ITEM_CELL_BATTERY, - .price = 2000, + .price = 200, .holdEffect = HOLD_EFFECT_CELL_BATTERY, .holdEffectParam = 0, .description = sCellBatteryDesc, @@ -6357,9 +6362,9 @@ const struct Item gItems[] = [ITEM_LUMINOUS_MOSS] = { - .name = _("LuminousMoss"), + .name = _("Luminous Moss"), .itemId = ITEM_LUMINOUS_MOSS, - .price = 2000, + .price = 1000, .holdEffect = HOLD_EFFECT_LUMINOUS_MOSS, .holdEffectParam = 0, .description = sLuminousMossDesc, @@ -6373,7 +6378,7 @@ const struct Item gItems[] = { .name = _("Snowball"), .itemId = ITEM_SNOWBALL, - .price = 2000, + .price = 200, .holdEffect = HOLD_EFFECT_SNOWBALL, .holdEffectParam = 0, .description = sSnowballDesc, @@ -6401,7 +6406,7 @@ const struct Item gItems[] = { .name = _("Douse Drive"), .itemId = ITEM_DOUSE_DRIVE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_DRIVE, .description = sDouseDriveDesc, .pocket = POCKET_ITEMS, @@ -6414,7 +6419,7 @@ const struct Item gItems[] = { .name = _("Shock Drive"), .itemId = ITEM_SHOCK_DRIVE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_DRIVE, .description = sShockDriveDesc, .pocket = POCKET_ITEMS, @@ -6427,7 +6432,7 @@ const struct Item gItems[] = { .name = _("Burn Drive"), .itemId = ITEM_BURN_DRIVE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_DRIVE, .description = sBurnDriveDesc, .pocket = POCKET_ITEMS, @@ -6440,7 +6445,7 @@ const struct Item gItems[] = { .name = _("Chill Drive"), .itemId = ITEM_CHILL_DRIVE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_DRIVE, .description = sChillDriveDesc, .pocket = POCKET_ITEMS, @@ -6705,7 +6710,7 @@ const struct Item gItems[] = { .name = _("Assault Vest"), .itemId = ITEM_ASSAULT_VEST, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_ASSAULT_VEST, .holdEffectParam = 50, .description = sAssaultVestDesc, @@ -6719,7 +6724,7 @@ const struct Item gItems[] = { .name = _("Pixie Plate"), .itemId = ITEM_PIXIE_PLATE, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_PLATE, .holdEffectParam = 20, .description = sPixiePlateDesc, @@ -6733,7 +6738,7 @@ const struct Item gItems[] = { .name = _("SafetyGoggles"), .itemId = ITEM_SAFETY_GOGGLES, - .price = 4000, + .price = 1000, .holdEffect = HOLD_EFFECT_SAFETY_GOOGLES, .description = sSafetyGogglesDesc, .pocket = POCKET_ITEMS, @@ -6746,7 +6751,7 @@ const struct Item gItems[] = { .name = _("Gengarite"), .itemId = ITEM_GENGARITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sGengariteDesc, .pocket = POCKET_ITEMS, @@ -6759,7 +6764,7 @@ const struct Item gItems[] = { .name = _("Gardevoirite"), .itemId = ITEM_GARDEVOIRITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sGardevoiriteDesc, .pocket = POCKET_ITEMS, @@ -6772,7 +6777,7 @@ const struct Item gItems[] = { .name = _("Ampharosite"), .itemId = ITEM_AMPHAROSITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sAmpharositeDesc, .pocket = POCKET_ITEMS, @@ -6785,7 +6790,7 @@ const struct Item gItems[] = { .name = _("Venusaurite"), .itemId = ITEM_VENUSAURITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sVenusauriteDesc, .pocket = POCKET_ITEMS, @@ -6798,7 +6803,7 @@ const struct Item gItems[] = { .name = _("CharizarditeX"), .itemId = ITEM_CHARIZARDITE_X, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sCharizarditeDesc, .pocket = POCKET_ITEMS, @@ -6811,7 +6816,7 @@ const struct Item gItems[] = { .name = _("Blastoisinite"), .itemId = ITEM_BLASTOISINITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sBlastoisiniteDesc, .pocket = POCKET_ITEMS, @@ -6824,7 +6829,7 @@ const struct Item gItems[] = { .name = _("Mewtwonite X"), .itemId = ITEM_MEWTWONITE_X, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sMewtwoniteDesc, .pocket = POCKET_ITEMS, @@ -6837,7 +6842,7 @@ const struct Item gItems[] = { .name = _("Mewtwonite Y"), .itemId = ITEM_MEWTWONITE_Y, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sMewtwoniteDesc, .pocket = POCKET_ITEMS, @@ -6850,7 +6855,7 @@ const struct Item gItems[] = { .name = _("Blazikenite"), .itemId = ITEM_BLAZIKENITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sBlazikeniteDesc, .pocket = POCKET_ITEMS, @@ -6863,7 +6868,7 @@ const struct Item gItems[] = { .name = _("Medichamite"), .itemId = ITEM_MEDICHAMITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sMedichamiteDesc, .pocket = POCKET_ITEMS, @@ -6876,7 +6881,7 @@ const struct Item gItems[] = { .name = _("Houndoominite"), .itemId = ITEM_HOUNDOOMINITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sHoundoominiteDesc, .pocket = POCKET_ITEMS, @@ -6889,7 +6894,7 @@ const struct Item gItems[] = { .name = _("Aggronite"), .itemId = ITEM_AGGRONITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sAggroniteDesc, .pocket = POCKET_ITEMS, @@ -6902,7 +6907,7 @@ const struct Item gItems[] = { .name = _("Banettite"), .itemId = ITEM_BANETTITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sBanettiteDesc, .pocket = POCKET_ITEMS, @@ -6915,7 +6920,7 @@ const struct Item gItems[] = { .name = _("Tyranitarite"), .itemId = ITEM_TYRANITARITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sTyranitariteDesc, .pocket = POCKET_ITEMS, @@ -6928,7 +6933,7 @@ const struct Item gItems[] = { .name = _("Scizorite"), .itemId = ITEM_SCIZORITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sScizoriteDesc, .pocket = POCKET_ITEMS, @@ -6941,7 +6946,7 @@ const struct Item gItems[] = { .name = _("Pinsirite"), .itemId = ITEM_PINSIRITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sPinsiriteDesc, .pocket = POCKET_ITEMS, @@ -6954,7 +6959,7 @@ const struct Item gItems[] = { .name = _("Aerodactylite"), .itemId = ITEM_AERODACTYLITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sAerodactyliteDesc, .pocket = POCKET_ITEMS, @@ -6967,7 +6972,7 @@ const struct Item gItems[] = { .name = _("Lucarionite"), .itemId = ITEM_LUCARIONITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sLucarioniteDesc, .pocket = POCKET_ITEMS, @@ -6980,7 +6985,7 @@ const struct Item gItems[] = { .name = _("Abomasite"), .itemId = ITEM_ABOMASITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sAbomasiteDesc, .pocket = POCKET_ITEMS, @@ -6993,7 +6998,7 @@ const struct Item gItems[] = { .name = _("Kangaskhanite"), .itemId = ITEM_KANGASKHANITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sKangaskhaniteDesc, .pocket = POCKET_ITEMS, @@ -7006,7 +7011,7 @@ const struct Item gItems[] = { .name = _("Gyaradosite"), .itemId = ITEM_GYARADOSITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sGyaradositeDesc, .pocket = POCKET_ITEMS, @@ -7019,7 +7024,7 @@ const struct Item gItems[] = { .name = _("Absolite"), .itemId = ITEM_ABSOLITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sAbsoliteDesc, .pocket = POCKET_ITEMS, @@ -7032,7 +7037,7 @@ const struct Item gItems[] = { .name = _("CharizarditeY"), .itemId = ITEM_CHARIZARDITE_Y, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sCharizarditeDesc, .pocket = POCKET_ITEMS, @@ -7045,7 +7050,7 @@ const struct Item gItems[] = { .name = _("Alakazite"), .itemId = ITEM_ALAKAZITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sAlakaziteDesc, .pocket = POCKET_ITEMS, @@ -7058,7 +7063,7 @@ const struct Item gItems[] = { .name = _("Heracronite"), .itemId = ITEM_HERACRONITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sHeracroniteDesc, .pocket = POCKET_ITEMS, @@ -7071,7 +7076,7 @@ const struct Item gItems[] = { .name = _("Mawilite"), .itemId = ITEM_MAWILITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sMawiliteDesc, .pocket = POCKET_ITEMS, @@ -7084,7 +7089,7 @@ const struct Item gItems[] = { .name = _("Manectite"), .itemId = ITEM_MANECTITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sManectiteDesc, .pocket = POCKET_ITEMS, @@ -7097,7 +7102,7 @@ const struct Item gItems[] = { .name = _("Garchompite"), .itemId = ITEM_GARCHOMPITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sGarchompiteDesc, .pocket = POCKET_ITEMS, @@ -7110,7 +7115,7 @@ const struct Item gItems[] = { .name = _("Latiasite"), .itemId = ITEM_LATIASITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sLatiasiteDesc, .pocket = POCKET_ITEMS, @@ -7123,7 +7128,7 @@ const struct Item gItems[] = { .name = _("Latiosite"), .itemId = ITEM_LATIOSITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sLatiositeDesc, .pocket = POCKET_ITEMS, @@ -7136,7 +7141,7 @@ const struct Item gItems[] = { .name = _("Swampertite"), .itemId = ITEM_SWAMPERTITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sSwampertiteDesc, .pocket = POCKET_ITEMS, @@ -7149,7 +7154,7 @@ const struct Item gItems[] = { .name = _("Sceptilite"), .itemId = ITEM_SCEPTILITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sSceptiliteDesc, .pocket = POCKET_ITEMS, @@ -7162,7 +7167,7 @@ const struct Item gItems[] = { .name = _("Sablenite"), .itemId = ITEM_SABLENITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sSableniteDesc, .pocket = POCKET_ITEMS, @@ -7175,7 +7180,7 @@ const struct Item gItems[] = { .name = _("Altarianite"), .itemId = ITEM_ALTARIANITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sAltarianiteDesc, .pocket = POCKET_ITEMS, @@ -7188,7 +7193,7 @@ const struct Item gItems[] = { .name = _("Galladite"), .itemId = ITEM_GALLADITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sGalladiteDesc, .pocket = POCKET_ITEMS, @@ -7201,7 +7206,7 @@ const struct Item gItems[] = { .name = _("Audinite"), .itemId = ITEM_AUDINITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sAudiniteDesc, .pocket = POCKET_ITEMS, @@ -7214,7 +7219,7 @@ const struct Item gItems[] = { .name = _("Metagrossite"), .itemId = ITEM_METAGROSSITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sMetagrossiteDesc, .pocket = POCKET_ITEMS, @@ -7227,7 +7232,7 @@ const struct Item gItems[] = { .name = _("Sharpedonite"), .itemId = ITEM_SHARPEDONITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sSharpedoniteDesc, .pocket = POCKET_ITEMS, @@ -7240,7 +7245,7 @@ const struct Item gItems[] = { .name = _("Slowbronite"), .itemId = ITEM_SLOWBRONITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sSlowbroniteDesc, .pocket = POCKET_ITEMS, @@ -7253,7 +7258,7 @@ const struct Item gItems[] = { .name = _("Steelixite"), .itemId = ITEM_STEELIXITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sSteelixiteDesc, .pocket = POCKET_ITEMS, @@ -7266,7 +7271,7 @@ const struct Item gItems[] = { .name = _("Pidgeotite"), .itemId = ITEM_PIDGEOTITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sPidgeotiteDesc, .pocket = POCKET_ITEMS, @@ -7279,7 +7284,7 @@ const struct Item gItems[] = { .name = _("Glalitite"), .itemId = ITEM_GLALITITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sGlalititeDesc, .pocket = POCKET_ITEMS, @@ -7292,7 +7297,7 @@ const struct Item gItems[] = { .name = _("Diancite"), .itemId = ITEM_DIANCITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sDianciteDesc, .pocket = POCKET_ITEMS, @@ -7305,7 +7310,7 @@ const struct Item gItems[] = { .name = _("Cameruptite"), .itemId = ITEM_CAMERUPTITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sCameruptiteDesc, .pocket = POCKET_ITEMS, @@ -7318,7 +7323,7 @@ const struct Item gItems[] = { .name = _("Lopunnite"), .itemId = ITEM_LOPUNNITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sLopunniteDesc, .pocket = POCKET_ITEMS, @@ -7331,7 +7336,7 @@ const struct Item gItems[] = { .name = _("Salamencite"), .itemId = ITEM_SALAMENCITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sSalamenciteDesc, .pocket = POCKET_ITEMS, @@ -7344,7 +7349,7 @@ const struct Item gItems[] = { .name = _("Beedrillite"), .itemId = ITEM_BEEDRILLITE, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sBeedrilliteDesc, .pocket = POCKET_ITEMS, @@ -7357,7 +7362,8 @@ const struct Item gItems[] = { .name = _("Mega Bracelet"), .itemId = ITEM_MEGA_BRACELET, - .price = 200, + .price = 0, + .importance = 1, .description = sMegaBraceletDesc, .pocket = POCKET_KEY_ITEMS, .type = 4, @@ -7460,7 +7466,7 @@ const struct Item gItems[] = { .name = _("Honey"), .itemId = ITEM_HONEY, - .price = 100, + .price = 300, .description = sHoneyDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -7470,9 +7476,9 @@ const struct Item gItems[] = [ITEM_HEALTH_WING] = { - .name = _("Health Wing"), + .name = _("HealthFeather"), .itemId = ITEM_HEALTH_WING, - .price = 300, + .price = 3000, .holdEffect = 0, .holdEffectParam = 4, .description = sHealthWingDesc, @@ -7484,9 +7490,9 @@ const struct Item gItems[] = [ITEM_MUSCLE_WING] = { - .name = _("Muscle Wing"), + .name = _("MuscleFeather"), .itemId = ITEM_MUSCLE_WING, - .price = 300, + .price = 3000, .holdEffect = 0, .holdEffectParam = 4, .description = sMuscleWingDesc, @@ -7498,9 +7504,9 @@ const struct Item gItems[] = [ITEM_RESIST_WING] = { - .name = _("Resist Wing"), + .name = _("ResistFeather"), .itemId = ITEM_RESIST_WING, - .price = 300, + .price = 3000, .holdEffect = 0, .holdEffectParam = 4, .description = sResistWingDesc, @@ -7512,9 +7518,9 @@ const struct Item gItems[] = [ITEM_GENIUS_WING] = { - .name = _("Genius Wing"), + .name = _("GeniusFeather"), .itemId = ITEM_GENIUS_WING, - .price = 300, + .price = 3000, .holdEffect = 0, .holdEffectParam = 4, .description = sGeniusWingDesc, @@ -7526,9 +7532,9 @@ const struct Item gItems[] = [ITEM_CLEVER_WING] = { - .name = _("Clever Wing"), + .name = _("CleverFeather"), .itemId = ITEM_CLEVER_WING, - .price = 300, + .price = 3000, .holdEffect = 0, .holdEffectParam = 4, .description = sCleverWingDesc, @@ -7540,9 +7546,9 @@ const struct Item gItems[] = [ITEM_SWIFT_WING] = { - .name = _("Swift Wing"), + .name = _("Swift Feather"), .itemId = ITEM_SWIFT_WING, - .price = 300, + .price = 3000, .holdEffect = 0, .holdEffectParam = 4, .description = sSwiftWingDesc, @@ -7554,9 +7560,9 @@ const struct Item gItems[] = [ITEM_PRETTY_WING] = { - .name = _("Pretty Wing"), + .name = _("PrettyFeather"), .itemId = ITEM_PRETTY_WING, - .price = 1000, + .price = 200, .description = sPrettyWingDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -7569,6 +7575,7 @@ const struct Item gItems[] = .name = _("Shiny Charm"), .itemId = ITEM_SHINY_CHARM, .price = 0, + .importance = 1, .description = sShinyCharmDesc, .pocket = POCKET_KEY_ITEMS, .type = 4, diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index 9d9f05023..c69a12e7c 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -36,12 +36,12 @@ const u8 gItemEffect_MaxPotion[7] = { const u8 gItemEffect_HyperPotion[7] = { [4] = ITEM4_HEAL_HP, - [6] = 200, + [6] = 120, }; const u8 gItemEffect_SuperPotion[7] = { [4] = ITEM4_HEAL_HP, - [6] = 50, + [6] = 60, }; const u8 gItemEffect_FullHeal[6] = { @@ -60,17 +60,17 @@ const u8 gItemEffect_MaxRevive[7] = { const u8 gItemEffect_FreshWater[7] = { [4] = ITEM4_HEAL_HP, - [6] = 50, + [6] = 30, }; const u8 gItemEffect_SodaPop[7] = { [4] = ITEM4_HEAL_HP, - [6] = 60, + [6] = 50, }; const u8 gItemEffect_Lemonade[7] = { [4] = ITEM4_HEAL_HP, - [6] = 80, + [6] = 70, }; const u8 gItemEffect_MoomooMilk[7] = { @@ -81,7 +81,7 @@ const u8 gItemEffect_MoomooMilk[7] = { const u8 gItemEffect_EnergyPowder[10] = { [4] = ITEM4_HEAL_HP, [5] = ITEM5_FRIENDSHIP_ALL, - [6] = 50, + [6] = 60, [7] = -5, [8] = -5, [9] = -10, @@ -90,7 +90,7 @@ const u8 gItemEffect_EnergyPowder[10] = { const u8 gItemEffect_EnergyRoot[10] = { [4] = ITEM4_HEAL_HP, [5] = ITEM5_FRIENDSHIP_ALL, - [6] = 200, + [6] = 120, [7] = -10, [8] = -10, [9] = -15, diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 56cba4296..892e4c077 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -3,74 +3,74 @@ static const u8 sDummyDesc[] = _( // Pokeballs static const u8 sMasterBallDesc[] = _( - "The best BALL that\n" - "catches a POKéMON\n" + "The best Ball that\n" + "catches a Pokémon\n" "without fail."); static const u8 sUltraBallDesc[] = _( - "A better BALL with\n" + "A better Ball with\n" "a higher catch rate\n" - "than a GREAT BALL."); + "than a Great Ball."); static const u8 sGreatBallDesc[] = _( - "A good BALL with a\n" + "A good Ball with a\n" "higher catch rate\n" - "than a POKé BALL."); + "than a Poké Ball."); static const u8 sPokeBallDesc[] = _( "A tool used for\n" "catching wild\n" - "POKéMON."); + "Pokémon."); static const u8 sSafariBallDesc[] = _( - "A special BALL that\n" + "A special Ball that\n" "is used only in the\n" - "SAFARI ZONE."); + "Safari Zone."); static const u8 sNetBallDesc[] = _( - "A BALL that works\n" - "well on WATER- and\n" - "BUG-type POKéMON."); + "A Ball that works\n" + "well on Water- and\n" + "Bug-type Pokémon."); static const u8 sDiveBallDesc[] = _( - "A BALL that works\n" - "better on POKéMON\n" + "A Ball that works\n" + "better on Pokémon\n" "on the ocean floor."); static const u8 sNestBallDesc[] = _( - "A BALL that works\n" + "A Ball that works\n" "better on weaker\n" - "POKéMON."); + "Pokémon."); static const u8 sRepeatBallDesc[] = _( - "A BALL that works\n" - "better on POKéMON\n" + "A Ball that works\n" + "better on Pokémon\n" "caught before."); static const u8 sTimerBallDesc[] = _( - "A BALL that gains\n" + "A Ball that gains\n" "power in battles\n" "taking many turns."); static const u8 sLuxuryBallDesc[] = _( - "A cozy BALL that\n" - "makes POKéMON\n" + "A cozy Ball that\n" + "makes Pokémon\n" "more friendly."); static const u8 sPremierBallDesc[] = _( - "A rare BALL made\n" + "A rare Ball made\n" "in commemoration\n" "of some event."); static const u8 sLevelBallDesc[] = _( "A Ball that works\n" "well on lower\n" - "level POKéMON."); + "level Pokémon."); static const u8 sLureBallDesc[] = _( "A Ball that works\n" "well on fished\n" - "up POKéMON."); + "up Pokémon."); static const u8 sMoonBallDesc[] = _( "A Ball that works\n" @@ -79,28 +79,28 @@ static const u8 sMoonBallDesc[] = _( static const u8 sFriendBallDesc[] = _( "A Ball that makes\n" - "a POKéMON friendly\n" + "a Pokémon friendly\n" "when caught."); static const u8 sLoveBallDesc[] = _( "Works well on\n" - "POKéMON of the\n" + "Pokémon of the\n" "opposite gender."); static const u8 sHeavyBallDesc[] = _( "Works well on\n" "very heavy\n" - "POKéMON."); + "Pokémon."); static const u8 sFastBallDesc[] = _( "Works well on\n" "very fast\n" - "POKéMON."); + "Pokémon."); static const u8 sHealBallDesc[] = _( "A remedial Ball\n" "that restores\n" - "caught POKéMON."); + "caught Pokémon."); static const u8 sQuickBallDesc[] = _( "Works well if\n" @@ -138,77 +138,77 @@ static const u8 sBeastBallDesc[] = _( // Medicine static const u8 sPotionDesc[] = _( "Restores the HP of\n" - "a POKéMON by\n" + "a Pokémon by\n" "20 points."); static const u8 sAntidoteDesc[] = _( "Heals a poisoned\n" - "POKéMON."); + "Pokémon."); static const u8 sBurnHealDesc[] = _( - "Heals POKéMON\n" + "Heals Pokémon\n" "of a burn."); static const u8 sIceHealDesc[] = _( "Defrosts a frozen\n" - "POKéMON."); + "Pokémon."); static const u8 sAwakeningDesc[] = _( "Awakens a sleeping\n" - "POKéMON."); + "Pokémon."); static const u8 sParalyzeHealDesc[] = _( "Heals a paralyzed\n" - "POKéMON."); + "Pokémon."); static const u8 sFullRestoreDesc[] = _( "Fully restores the\n" "HP and status of a\n" - "POKéMON."); + "Pokémon."); static const u8 sMaxPotionDesc[] = _( "Fully restores the\n" - "HP of a POKéMON."); + "HP of a Pokémon."); static const u8 sHyperPotionDesc[] = _( "Restores the HP of\n" - "a POKéMON by\n" - "200 points."); + "a Pokémon by\n" + "120 points."); static const u8 sSuperPotionDesc[] = _( "Restores the HP of\n" - "a POKéMON by\n" - "50 points."); + "a Pokémon by\n" + "60 points."); static const u8 sFullHealDesc[] = _( "Heals all the\n" "status problems of\n" - "one POKéMON."); + "one Pokémon."); static const u8 sReviveDesc[] = _( "Revives a fainted\n" - "POKéMON with half\n" + "Pokémon with half\n" "its HP."); static const u8 sMaxReviveDesc[] = _( "Revives a fainted\n" - "POKéMON with all\n" + "Pokémon with all\n" "its HP."); static const u8 sFreshWaterDesc[] = _( "A mineral water\n" "that restores HP\n" - "by 50 points."); + "by 30 points."); static const u8 sSodaPopDesc[] = _( "A fizzy soda drink\n" "that restores HP\n" - "by 60 points."); + "by 50 points."); static const u8 sLemonadeDesc[] = _( "A very sweet drink\n" "that restores HP\n" - "by 80 points."); + "by 70 points."); static const u8 sMoomooMilkDesc[] = _( "A nutritious milk\n" @@ -218,12 +218,12 @@ static const u8 sMoomooMilkDesc[] = _( static const u8 sEnergyPowderDesc[] = _( "A bitter powder\n" "that restores HP\n" - "by 50 points."); + "by 60 points."); static const u8 sEnergyRootDesc[] = _( "A bitter root\n" "that restores HP\n" - "by 200 points."); + "by 120 points."); static const u8 sHealPowderDesc[] = _( "A bitter powder\n" @@ -233,7 +233,7 @@ static const u8 sHealPowderDesc[] = _( static const u8 sRevivalHerbDesc[] = _( "A very bitter herb\n" "that revives a\n" - "fainted POKéMON."); + "fainted Pokémon."); static const u8 sEtherDesc[] = _( "Restores the PP\n" @@ -251,7 +251,7 @@ static const u8 sElixirDesc[] = _( static const u8 sMaxElixirDesc[] = _( "Fully restores the\n" - "PP of a POKéMON's\n" + "PP of a Pokémon's\n" "moves."); static const u8 sLavaCookieDesc[] = _( @@ -262,26 +262,26 @@ static const u8 sLavaCookieDesc[] = _( static const u8 sBlueFluteDesc[] = _( "A glass flute that\n" "awakens sleeping\n" - "POKéMON."); + "Pokémon."); static const u8 sYellowFluteDesc[] = _( "A glass flute that\n" - "snaps POKéMON\n" + "snaps Pokémon\n" "out of confusion."); static const u8 sRedFluteDesc[] = _( "A glass flute that\n" - "snaps POKéMON\n" + "snaps Pokémon\n" "out of attraction."); static const u8 sBlackFluteDesc[] = _( "A glass flute that\n" "keeps away wild\n" - "POKéMON."); + "Pokémon."); static const u8 sWhiteFluteDesc[] = _( "A glass flute that\n" - "lures wild POKéMON."); + "lures wild Pokémon."); static const u8 sBerryJuiceDesc[] = _( "A 100% pure juice\n" @@ -296,28 +296,28 @@ static const u8 sSweetHeartDesc[] = _( static const u8 sBigMalasadaDesc[] = _( "Heals all the\n" "status problems of\n" - "one POKéMON."); + "one Pokémon."); static const u8 sOldGateauDesc[] = _( "Heals all the\n" "status problems of\n" - "one POKéMON."); + "one Pokémon."); static const u8 sSacredAshDesc[] = _( "Fully revives and\n" "restores all\n" - "fainted POKéMON."); + "fainted Pokémon."); // Collectibles static const u8 sShoalSaltDesc[] = _( "Salt obtained from\n" "deep inside the\n" - "SHOAL CAVE."); + "Shoal Cave."); static const u8 sShoalShellDesc[] = _( "A seashell found\n" "deep inside the\n" - "SHOAL CAVE."); + "Shoal Cave."); static const u8 sRedShardDesc[] = _( "A shard from an\n" @@ -342,31 +342,31 @@ static const u8 sGreenShardDesc[] = _( // Vitamins static const u8 sHPUpDesc[] = _( "Raises the base HP\n" - "of one POKéMON."); + "of one Pokémon."); static const u8 sProteinDesc[] = _( "Raises the base\n" - "ATTACK stat of one\n" - "POKéMON."); + "Attack stat of one\n" + "Pokémon."); static const u8 sIronDesc[] = _( "Raises the base\n" - "DEFENSE stat of\n" - "one POKéMON."); + "Defense stat of\n" + "one Pokémon."); static const u8 sCarbosDesc[] = _( "Raises the base\n" - "SPEED stat of one\n" - "POKéMON."); + "Speed stat of one\n" + "Pokémon."); static const u8 sCalciumDesc[] = _( "Raises the base\n" - "SP. ATK stat of one\n" - "POKéMON."); + "Sp. Atk stat of one\n" + "Pokémon."); static const u8 sRareCandyDesc[] = _( "Raises the level\n" - "of a POKéMON by\n" + "of a Pokémon by\n" "one."); static const u8 sPPUpDesc[] = _( @@ -376,8 +376,8 @@ static const u8 sPPUpDesc[] = _( static const u8 sZincDesc[] = _( "Raises the base\n" - "SP. DEF stat of one\n" - "POKéMON."); + "Sp. Def stat of one\n" + "Pokémon."); static const u8 sPPMaxDesc[] = _( "Raises the PP of a\n" @@ -397,17 +397,17 @@ static const u8 sDireHitDesc[] = _( static const u8 sXAttackDesc[] = _( "Raises the stat\n" - "ATTACK during one\n" + "Attack during one\n" "battle."); static const u8 sXDefendDesc[] = _( "Raises the stat\n" - "DEFENSE during one\n" + "Defense during one\n" "battle."); static const u8 sXSpeedDesc[] = _( "Raises the stat\n" - "SPEED during one\n" + "Speed during one\n" "battle."); static const u8 sXAccuracyDesc[] = _( @@ -417,38 +417,38 @@ static const u8 sXAccuracyDesc[] = _( static const u8 sXSpecialAttackDesc[] = _( "Raises the stat\n" - "SP. ATK during one\n" + "Sp. Atk during one\n" "battle."); static const u8 sXSpecialDefenseDesc[] = _( "Raises the stat\n" - "SP. DEF during one\n" + "Sp. Def during one\n" "battle."); static const u8 sPokeDollDesc[] = _( "Use to flee from\n" "any battle with\n" - "a wild POKéMON."); + "a wild Pokémon."); static const u8 sFluffyTailDesc[] = _( "Use to flee from\n" "any battle with\n" - "a wild POKéMON."); + "a wild Pokémon."); // Field items static const u8 sSuperRepelDesc[] = _( "Repels weak wild\n" - "POKéMON for 200\n" + "Pokémon for 200\n" "steps."); static const u8 sMaxRepelDesc[] = _( "Repels weak wild\n" - "POKéMON for 250\n" + "Pokémon for 250\n" "steps."); static const u8 sAbilityCapsuleDesc[] = _( - "Switches a POKé-\n" - "MON's ability."); + "Switches a Poké-\n" + "mon's ability."); static const u8 sEscapeRopeDesc[] = _( "Use to escape\n" @@ -457,58 +457,58 @@ static const u8 sEscapeRopeDesc[] = _( static const u8 sRepelDesc[] = _( "Repels weak wild\n" - "POKéMON for 100\n" + "Pokémon for 100\n" "steps."); // Evolution stones static const u8 sSunStoneDesc[] = _( "Makes certain\n" - "species of POKéMON\n" + "species of Pokémon\n" "evolve."); static const u8 sMoonStoneDesc[] = _( "Makes certain\n" - "species of POKéMON\n" + "species of Pokémon\n" "evolve."); static const u8 sFireStoneDesc[] = _( "Makes certain\n" - "species of POKéMON\n" + "species of Pokémon\n" "evolve."); static const u8 sThunderStoneDesc[] = _( "Makes certain\n" - "species of POKéMON\n" + "species of Pokémon\n" "evolve."); static const u8 sWaterStoneDesc[] = _( "Makes certain\n" - "species of POKéMON\n" + "species of Pokémon\n" "evolve."); static const u8 sLeafStoneDesc[] = _( "Makes certain\n" - "species of POKéMON\n" + "species of Pokémon\n" "evolve."); static const u8 sDawnStoneDesc[] = _( "Makes certain\n" - "species of POKéMON\n" + "species of Pokémon\n" "evolve."); static const u8 sDuskStoneDesc[] = _( "Makes certain\n" - "species of POKéMON\n" + "species of Pokémon\n" "evolve."); static const u8 sShinyStoneDesc[] = _( "Makes certain\n" - "species of POKéMON\n" + "species of Pokémon\n" "evolve."); static const u8 sIceStoneDesc[] = _( "Makes certain\n" - "species of POKéMON\n" + "species of Pokémon\n" "evolve."); // Valuable items @@ -591,22 +591,22 @@ static const u8 sHeartScaleDesc[] = _( static const u8 sRedNectarDesc[] = _( "Flower nectar that\n" "changes the form\n" - "of certain POKéMON."); + "of certain Pokémon."); static const u8 sYellowNectarDesc[] = _( "Flower nectar that\n" "changes the form\n" - "of certain POKéMON."); + "of certain Pokémon."); static const u8 sPinkNectarDesc[] = _( "Flower nectar that\n" "changes the form\n" - "of certain POKéMON."); + "of certain Pokémon."); static const u8 sPurpleNectarDesc[] = _( "Flower nectar that\n" "changes the form\n" - "of certain POKéMON."); + "of certain Pokémon."); static const u8 sRareBoneDesc[] = _( "A very rare bone.\n" @@ -615,64 +615,64 @@ static const u8 sRareBoneDesc[] = _( // Mail static const u8 sOrangeMailDesc[] = _( - "A ZIGZAGOON-print\n" - "MAIL to be held by\n" - "a POKéMON."); + "A Zigzagoon-print\n" + "Mail to be held by\n" + "a Pokémon."); static const u8 sHarborMailDesc[] = _( - "A WINGULL-print\n" - "MAIL to be held by\n" - "a POKéMON."); + "A Wingull-print\n" + "Mail to be held by\n" + "a Pokémon."); static const u8 sGlitterMailDesc[] = _( - "A PIKACHU-print\n" - "MAIL to be held by\n" - "a POKéMON."); + "A Pikachu-print\n" + "Mail to be held by\n" + "a Pokémon."); static const u8 sMechMailDesc[] = _( - "A MAGNEMITE-print\n" - "MAIL to be held by\n" - "a POKéMON."); + "A Magnemite-print\n" + "Mail to be held by\n" + "a Pokémon."); static const u8 sWoodMailDesc[] = _( - "A SLAKOTH-print\n" - "MAIL to be held by\n" - "a POKéMON."); + "A Slakoth-print\n" + "Mail to be held by\n" + "a Pokémon."); static const u8 sWaveMailDesc[] = _( - "A WAILMER-print\n" - "MAIL to be held by\n" - "a POKéMON."); + "A Wailmer-print\n" + "Mail to be held by\n" + "a Pokémon."); static const u8 sBeadMailDesc[] = _( - "MAIL featuring a\n" + "Mail featuring a\n" "sketch of the\n" - "holding POKéMON."); + "holding Pokémon."); static const u8 sShadowMailDesc[] = _( - "A DUSKULL-print\n" - "MAIL to be held by\n" - "a POKéMON."); + "A Duskull-print\n" + "Mail to be held by\n" + "a Pokémon."); static const u8 sTropicMailDesc[] = _( - "A BELLOSSOM-print\n" - "MAIL to be held by\n" - "a POKéMON."); + "A Bellossom-print\n" + "Mail to be held by\n" + "a Pokémon."); static const u8 sDreamMailDesc[] = _( - "MAIL featuring a\n" + "Mail featuring a\n" "sketch of the\n" - "holding POKéMON."); + "holding Pokémon."); static const u8 sFabMailDesc[] = _( "A gorgeous-print\n" - "MAIL to be held\n" - "by a POKéMON."); + "Mail to be held\n" + "by a Pokémon."); static const u8 sRetroMailDesc[] = _( - "MAIL featuring the\n" + "Mail featuring the\n" "drawings of three\n" - "POKéMON."); + "Pokémon."); // Berries static const u8 sCheriBerryDesc[] = _( @@ -682,7 +682,7 @@ static const u8 sCheriBerryDesc[] = _( static const u8 sChestoBerryDesc[] = _( "A hold item that\n" - "awakens POKéMON\n" + "awakens Pokémon\n" "in battle."); static const u8 sPechaBerryDesc[] = _( @@ -697,7 +697,7 @@ static const u8 sRawstBerryDesc[] = _( static const u8 sAspearBerryDesc[] = _( "A hold item that\n" - "defrosts POKéMON\n" + "defrosts Pokémon\n" "in battle."); static const u8 sLeppaBerryDesc[] = _( @@ -753,126 +753,126 @@ static const u8 sIapapaBerryDesc[] = _( static const u8 sRazzBerryDesc[] = _( "{POKEBLOCK} ingredient.\n" "Plant in loamy soil\n" - "to grow RAZZ."); + "to grow Razz."); static const u8 sBlukBerryDesc[] = _( "{POKEBLOCK} ingredient.\n" "Plant in loamy soil\n" - "to grow BLUK."); + "to grow Bluk."); static const u8 sNanabBerryDesc[] = _( "{POKEBLOCK} ingredient.\n" "Plant in loamy soil\n" - "to grow NANAB."); + "to grow Nanab."); static const u8 sWepearBerryDesc[] = _( "{POKEBLOCK} ingredient.\n" "Plant in loamy soil\n" - "to grow WEPEAR."); + "to grow Wepear."); static const u8 sPinapBerryDesc[] = _( "{POKEBLOCK} ingredient.\n" "Plant in loamy soil\n" - "to grow PINAP."); + "to grow Pinap."); static const u8 sPomegBerryDesc[] = _( - "Makes a POKéMON\n" + "Makes a Pokémon\n" "friendly but lowers\n" "base HP."); static const u8 sKelpsyBerryDesc[] = _( - "Makes a POKéMON\n" + "Makes a Pokémon\n" "friendly but lowers\n" - "base ATTACK."); + "base Attack."); static const u8 sQualotBerryDesc[] = _( - "Makes a POKéMON\n" + "Makes a Pokémon\n" "friendly but lowers\n" - "base DEFENSE."); + "base Defense."); static const u8 sHondewBerryDesc[] = _( - "Makes a POKéMON\n" + "Makes a Pokémon\n" "friendly but lowers\n" - "base SP. ATK."); + "base Sp. Atk."); static const u8 sGrepaBerryDesc[] = _( - "Makes a POKéMON\n" + "Makes a Pokémon\n" "friendly but lowers\n" - "base SP. DEF."); + "base Sp. Def."); static const u8 sTamatoBerryDesc[] = _( - "Makes a POKéMON\n" + "Makes a Pokémon\n" "friendly but lowers\n" - "base SPEED."); + "base Speed."); static const u8 sCornnBerryDesc[] = _( "{POKEBLOCK} ingredient.\n" "Plant in loamy soil\n" - "to grow CORNN."); + "to grow Cornn."); static const u8 sMagostBerryDesc[] = _( "{POKEBLOCK} ingredient.\n" "Plant in loamy soil\n" - "to grow MAGOST."); + "to grow Magost."); static const u8 sRabutaBerryDesc[] = _( "{POKEBLOCK} ingredient.\n" "Plant in loamy soil\n" - "to grow RABUTA."); + "to grow Rabuta."); static const u8 sNomelBerryDesc[] = _( "{POKEBLOCK} ingredient.\n" "Plant in loamy soil\n" - "to grow NOMEL."); + "to grow Nomel."); static const u8 sSpelonBerryDesc[] = _( "{POKEBLOCK} ingredient.\n" "Plant in loamy soil\n" - "to grow SPELON."); + "to grow Spelon."); static const u8 sPamtreBerryDesc[] = _( "{POKEBLOCK} ingredient.\n" "Plant in loamy soil\n" - "to grow PAMTRE."); + "to grow Pamtre."); static const u8 sWatmelBerryDesc[] = _( "{POKEBLOCK} ingredient.\n" "Plant in loamy soil\n" - "to grow WATMEL."); + "to grow Watmel."); static const u8 sDurinBerryDesc[] = _( "{POKEBLOCK} ingredient.\n" "Plant in loamy soil\n" - "to grow DURIN."); + "to grow Durin."); static const u8 sBelueBerryDesc[] = _( "{POKEBLOCK} ingredient.\n" "Plant in loamy soil\n" - "to grow BELUE."); + "to grow Belue."); static const u8 sLiechiBerryDesc[] = _( "A hold item that\n" - "raises ATTACK in\n" + "raises Attack in\n" "a pinch."); static const u8 sGanlonBerryDesc[] = _( "A hold item that\n" - "raises DEFENSE in\n" + "raises Defense in\n" "a pinch."); static const u8 sSalacBerryDesc[] = _( "A hold item that\n" - "raises SPEED in\n" + "raises Speed in\n" "a pinch."); static const u8 sPetayaBerryDesc[] = _( "A hold item that\n" - "raises SP. ATK in\n" + "raises Sp. Atk in\n" "a pinch."); static const u8 sApicotBerryDesc[] = _( "A hold item that\n" - "raises SP. DEF in\n" + "raises Sp. Def in\n" "a pinch."); static const u8 sLansatBerryDesc[] = _( @@ -1003,12 +1003,12 @@ static const u8 sRowapBerryDesc[] = _( static const u8 sKeeBerryDesc[] = _( "If hit by a physical\n" "move, it raises the\n" - "DEFENSE a bit."); + "Defense a bit."); static const u8 sMarangaBerryDesc[] = _( "If hit by a special\n" "move, it raises the\n" - "SP. DEF. a bit."); + "Sp. Def. a bit."); // Hold items static const u8 sBrightPowderDesc[] = _( @@ -1024,11 +1024,11 @@ static const u8 sWhiteHerbDesc[] = _( static const u8 sMachoBraceDesc[] = _( "A hold item that\n" "promotes growth,\n" - "but reduces SPEED."); + "but reduces Speed."); static const u8 sExpShareDesc[] = _( "A hold item that\n" - "gets EXP. points\n" + "gets Exp. points\n" "from battles."); static const u8 sQuickClawDesc[] = _( @@ -1043,7 +1043,7 @@ static const u8 sSootheBellDesc[] = _( static const u8 sMentalHerbDesc[] = _( "A hold item that\n" - "snaps POKéMON out\n" + "snaps Pokémon out\n" "of infatuation."); static const u8 sChoiceBandDesc[] = _( @@ -1059,7 +1059,7 @@ static const u8 sKingsRockDesc[] = _( static const u8 sSilverPowderDesc[] = _( "A hold item that\n" "raises the power of\n" - "BUG-type moves."); + "Bug-type moves."); static const u8 sAmuletCoinDesc[] = _( "Doubles money in\n" @@ -1069,27 +1069,27 @@ static const u8 sAmuletCoinDesc[] = _( static const u8 sCleanseTagDesc[] = _( "A hold item that\n" "helps repel wild\n" - "POKéMON."); + "Pokémon."); static const u8 sSoulDewDesc[] = _( "Hold item: raises\n" - "SP. ATK & SP. DEF of\n" - "LATIOS & LATIAS."); + "Sp. Atk & Sp. Def of\n" + "Latios & Latias."); static const u8 sDeepSeaToothDesc[] = _( "A hold item that\n" - "raises the SP. ATK\n" - "of CLAMPERL."); + "raises the Sp. Atk\n" + "of Clamperl."); static const u8 sDeepSeaScaleDesc[] = _( "A hold item that\n" - "raises the SP. DEF\n" - "of CLAMPERL."); + "raises the Sp. Def\n" + "of Clamperl."); static const u8 sSmokeBallDesc[] = _( "A hold item that\n" "assures fleeing\n" - "from wild POKéMON."); + "from wild Pokémon."); static const u8 sEverstoneDesc[] = _( "A wondrous hold\n" @@ -1103,7 +1103,7 @@ static const u8 sFocusBandDesc[] = _( static const u8 sLuckyEggDesc[] = _( "A hold item that\n" - "boosts EXP. points\n" + "boosts Exp. points\n" "earned in battle."); static const u8 sScopeLensDesc[] = _( @@ -1114,7 +1114,7 @@ static const u8 sScopeLensDesc[] = _( static const u8 sMetalCoatDesc[] = _( "A hold item that\n" "raises the power of\n" - "STEEL-type moves."); + "Steel-type moves."); static const u8 sLeftoversDesc[] = _( "A hold item that\n" @@ -1123,147 +1123,147 @@ static const u8 sLeftoversDesc[] = _( static const u8 sDragonScaleDesc[] = _( "A strange scale\n" - "held by DRAGON-\n" - "type POKéMON."); + "held by Dragon-\n" + "type Pokémon."); static const u8 sOvalStoneDesc[] = _( "Helps a certain\n" - "POKéMON to evolve.\n" + "Pokémon to evolve.\n" "Looks like an egg."); static const u8 sProtectorDesc[] = _( - "A certain POKéMON\n" + "A certain Pokémon\n" "loves it. It's quite\n" "heavy."); static const u8 sElectirizerDesc[] = _( - "A certain POKéMON\n" + "A certain Pokémon\n" "loves it. It's full\n" "of electricity."); static const u8 sMagmarizerDesc[] = _( - "A certain POKéMON\n" + "A certain Pokémon\n" "loves it. It's full\n" "of magma energy."); static const u8 sDubiousDiscDesc[] = _( - "A certain POKéMON\n" + "A certain Pokémon\n" "loves it. It's over-\n" "flowing with data."); static const u8 sReaperClothDesc[] = _( "Loved by a certain\n" - "POKéMON. Imbued\n" + "Pokémon. Imbued\n" "with strong energy."); static const u8 sRazorClawDesc[] = _( "Helps a certain\n" - "POKéMON to evolve.\n" + "Pokémon to evolve.\n" "It's a sharp claw."); static const u8 sRazorFangDesc[] = _( "Helps a certain\n" - "POKéMON to evolve.\n" + "Pokémon to evolve.\n" "It's a sharp fang."); static const u8 sPrismScaleDesc[] = _( "A mysterious scale.\n" "It helps a certain\n" - "POKéMON to evolve."); + "Pokémon to evolve."); static const u8 sWhippedDreamDesc[] = _( "A soft and sweet\n" "treat loved by some\n" - "POKéMON."); + "Pokémon."); static const u8 sSachetDesc[] = _( "A sachet filled with\n" "perfumes loved by\n" - "some POKéMON."); + "some Pokémon."); static const u8 sLightBallDesc[] = _( "A hold item that\n" - "raises the SP. ATK\n" - "of PIKACHU."); + "raises the Sp. Atk\n" + "of Pikachu."); static const u8 sSoftSandDesc[] = _( "A hold item that\n" "raises the power of\n" - "GROUND-type moves."); + "Ground-type moves."); static const u8 sHardStoneDesc[] = _( "A hold item that\n" "raises the power of\n" - "ROCK-type moves."); + "Rock-type moves."); static const u8 sMiracleSeedDesc[] = _( "A hold item that\n" "raises the power of\n" - "GRASS-type moves."); + "Grass-type moves."); static const u8 sBlackGlassesDesc[] = _( "A hold item that\n" "raises the power of\n" - "DARK-type moves."); + "Dark-type moves."); static const u8 sBlackBeltDesc[] = _( "A hold item that\n" - "boosts FIGHTING-\n" + "boosts Fighting-\n" "type moves."); static const u8 sMagnetDesc[] = _( "A hold item that\n" - "boosts ELECTRIC-\n" + "boosts Electric-\n" "type moves."); static const u8 sMysticWaterDesc[] = _( "A hold item that\n" "raises the power of\n" - "WATER-type moves."); + "Water-type moves."); static const u8 sSharpBeakDesc[] = _( "A hold item that\n" "raises the power of\n" - "FLYING-type moves."); + "Flying-type moves."); static const u8 sPoisonBarbDesc[] = _( "A hold item that\n" "raises the power of\n" - "POISON-type moves."); + "Poison-type moves."); static const u8 sNeverMeltIceDesc[] = _( "A hold item that\n" "raises the power of\n" - "ICE-type moves."); + "Ice-type moves."); static const u8 sSpellTagDesc[] = _( "A hold item that\n" "raises the power of\n" - "GHOST-type moves."); + "Ghost-type moves."); static const u8 sTwistedSpoonDesc[] = _( "A hold item that\n" - "boosts PSYCHIC-\n" + "boosts Psychic-\n" "type moves."); static const u8 sCharcoalDesc[] = _( "A hold item that\n" "raises the power of\n" - "FIRE-type moves."); + "Fire-type moves."); static const u8 sDragonFangDesc[] = _( "A hold item that\n" "raises the power of\n" - "DRAGON-type moves."); + "Dragon-type moves."); static const u8 sSilkScarfDesc[] = _( "A hold item that\n" "raises the power of\n" - "NORMAL-type moves."); + "Normal-type moves."); static const u8 sUpGradeDesc[] = _( "A peculiar box made\n" - "by SILPH CO."); + "by Silph Co."); static const u8 sShellBellDesc[] = _( "A hold item that\n" @@ -1272,38 +1272,38 @@ static const u8 sShellBellDesc[] = _( static const u8 sPowerBracerDesc[] = _( "A hold item that\n" - "promotes ATK gain,\n" - "but reduces SPEED."); + "promotes Atk gain,\n" + "but reduces Speed."); static const u8 sPowerBeltDesc[] = _( "A hold item that\n" - "promotes DEF gain,\n" - "but reduces SPEED."); + "promotes Def gain,\n" + "but reduces Speed."); static const u8 sPowerLensDesc[] = _( "Hold item that pro-\n" - "motes SP. ATK gain,\n" - "but reduces SPEED."); + "motes Sp. Atk gain,\n" + "but reduces Speed."); static const u8 sPowerBandDesc[] = _( "Hold item that pro-\n" - "motes SP. DEF gain,\n" - "but reduces SPEED."); + "motes Sp. Def gain,\n" + "but reduces Speed."); static const u8 sPowerAnkletDesc[] = _( "A hold item that\n" - "promotes SPD gain,\n" - "but reduces SPEED."); + "promotes Spd gain,\n" + "but reduces Speed."); static const u8 sPowerWeightDesc[] = _( "A hold item that\n" "promotes HP gain,\n" - "but reduces SPEED."); + "but reduces Speed."); static const u8 sSeaIncenseDesc[] = _( "A hold item that\n" "slightly boosts\n" - "WATER-type moves."); + "Water-type moves."); static const u8 sLaxIncenseDesc[] = _( "A hold item that\n" @@ -1312,13 +1312,13 @@ static const u8 sLaxIncenseDesc[] = _( static const u8 sOddIncenseDesc[] = _( "A hold item that\n" - "boosts PSYCHIC-\n" + "boosts Psychic-\n" "type moves."); static const u8 sRockIncenseDesc[] = _( "A hold item that\n" "raises the power of\n" - "ROCK-type moves."); + "Rock-type moves."); static const u8 sFullIncenseDesc[] = _( "A held item that\n" @@ -1328,12 +1328,12 @@ static const u8 sFullIncenseDesc[] = _( static const u8 sWaveIncenseDesc[] = _( "A hold item that\n" "slightly boosts\n" - "WATER-type moves."); + "Water-type moves."); static const u8 sRoseIncenseDesc[] = _( "A hold item that\n" "raises the power of\n" - "GRASS-type moves."); + "Grass-type moves."); static const u8 sLuckIncenseDesc[] = _( "Doubles money in\n" @@ -1343,52 +1343,52 @@ static const u8 sLuckIncenseDesc[] = _( static const u8 sPureIncenseDesc[] = _( "A hold item that\n" "helps repel wild\n" - "POKéMON."); + "Pokémon."); static const u8 sLuckyPunchDesc[] = _( "A hold item that\n" - "raises CHANSEY's\n" + "raises Chansey's\n" "critical-hit rate."); static const u8 sMetalPowderDesc[] = _( "A hold item that\n" - "raises DITTO's\n" - "DEFENSE."); + "raises Ditto's\n" + "Defense."); static const u8 sThickClubDesc[] = _( "A hold item that \n" - "raises CUBONE or\n" - "MAROWAK's ATTACK."); + "raises Cubone or\n" + "Marowak's Attack."); static const u8 sStickDesc[] = _( "A hold item that\n" - "raises FARFETCH'D's\n" + "raises Farfetch'd's\n" "critical-hit ratio."); static const u8 sRedScarfDesc[] = _( "A hold item that\n" - "raises COOL in\n" - "CONTESTS."); + "raises Cool in\n" + "Contests."); static const u8 sBlueScarfDesc[] = _( "A hold item that\n" - "raises BEAUTY in\n" - "CONTESTS."); + "raises Beauty in\n" + "Contests."); static const u8 sPinkScarfDesc[] = _( "A hold item that\n" - "raises CUTE in\n" - "CONTESTS."); + "raises Cute in\n" + "Contests."); static const u8 sGreenScarfDesc[] = _( "A hold item that\n" - "raises SMART in\n" - "CONTESTS."); + "raises Smart in\n" + "Contests."); static const u8 sYellowScarfDesc[] = _( "A hold item that\n" - "raises TOUGH in\n" - "CONTESTS."); + "raises Tough in\n" + "Contests."); // Key items static const u8 sMachBikeDesc[] = _( @@ -1398,7 +1398,7 @@ static const u8 sMachBikeDesc[] = _( static const u8 sCoinCaseDesc[] = _( "A case that holds\n" - "up to 9,999 COINS."); + "up to 9,999 Coins."); static const u8 sItemfinderDesc[] = _( "A device that\n" @@ -1408,17 +1408,17 @@ static const u8 sItemfinderDesc[] = _( static const u8 sOldRodDesc[] = _( "Use by any body of\n" "water to fish for\n" - "wild POKéMON."); + "wild Pokémon."); static const u8 sGoodRodDesc[] = _( "A decent fishing\n" "rod for catching\n" - "wild POKéMON."); + "wild Pokémon."); static const u8 sSuperRodDesc[] = _( "The best fishing\n" "rod for catching\n" - "wild POKéMON."); + "wild Pokémon."); static const u8 sSSTicketDesc[] = _( "The ticket required\n" @@ -1428,16 +1428,16 @@ static const u8 sSSTicketDesc[] = _( static const u8 sContestPassDesc[] = _( "The pass required\n" "for entering\n" - "POKéMON CONTESTS."); + "Pokémon Contests."); static const u8 sWailmerPailDesc[] = _( "A tool used for\n" - "watering BERRIES\n" + "watering Berries\n" "and plants."); static const u8 sDevonGoodsDesc[] = _( "A package that\n" - "contains DEVON's\n" + "contains Devon's\n" "machine parts."); static const u8 sSootSackDesc[] = _( @@ -1446,9 +1446,9 @@ static const u8 sSootSackDesc[] = _( "volcanic ash."); static const u8 sBasementKeyDesc[] = _( - "The key for NEW\n" - "MAUVILLE beneath\n" - "MAUVILLE CITY."); + "The key for New\n" + "Mauville beneath\n" + "Mauville City."); static const u8 sAcroBikeDesc[] = _( "A folding bicycle\n" @@ -1458,12 +1458,12 @@ static const u8 sAcroBikeDesc[] = _( static const u8 sPokeblockCaseDesc[] = _( "A case for holding\n" "{POKEBLOCK}S made with\n" - "a BERRY BLENDER."); + "a Berry Blender."); static const u8 sLetterDesc[] = _( - "A letter to STEVEN\n" - "from the PRESIDENT\n" - "of the DEVON CORP."); + "A letter to Steven\n" + "from the President\n" + "of the Devon Corp."); static const u8 sEonTicketDesc[] = _( "The ticket for a\n" @@ -1483,7 +1483,7 @@ static const u8 sBlueOrbDesc[] = _( static const u8 sScannerDesc[] = _( "A device found\n" "inside the\n" - "ABANDONED SHIP."); + "Abandoned Ship."); static const u8 sGoGogglesDesc[] = _( "Nifty goggles that\n" @@ -1492,47 +1492,47 @@ static const u8 sGoGogglesDesc[] = _( static const u8 sMeteoriteDesc[] = _( "A meteorite found\n" - "at METEOR FALLS."); + "at Meteor Falls."); static const u8 sRoom1KeyDesc[] = _( "A key that opens a\n" "door inside the\n" - "ABANDONED SHIP."); + "Abandoned Ship."); static const u8 sRoom2KeyDesc[] = _( "A key that opens a\n" "door inside the\n" - "ABANDONED SHIP."); + "Abandoned Ship."); static const u8 sRoom4KeyDesc[] = _( "A key that opens a\n" "door inside the\n" - "ABANDONED SHIP."); + "Abandoned Ship."); static const u8 sRoom6KeyDesc[] = _( "A key that opens a\n" "door inside the\n" - "ABANDONED SHIP."); + "Abandoned Ship."); static const u8 sStorageKeyDesc[] = _( "The key to the\n" "storage inside the\n" - "ABANDONED SHIP."); + "Abandoned Ship."); static const u8 sRootFossilDesc[] = _( "A fossil of an\n" "ancient, seafloor-\n" - "dwelling POKéMON."); + "dwelling Pokémon."); static const u8 sClawFossilDesc[] = _( "A fossil of an\n" "ancient, seafloor-\n" - "dwelling POKéMON."); + "dwelling Pokémon."); static const u8 sDevonScopeDesc[] = _( - "A device by DEVON\n" + "A device by Devon\n" "that signals any\n" - "unseeable POKéMON."); + "unseeable Pokémon."); // TMs/HMs static const u8 sTM01Desc[] = _( @@ -1551,8 +1551,8 @@ static const u8 sTM03Desc[] = _( "that may confuse."); static const u8 sTM04Desc[] = _( - "Raises SP. ATK and\n" - "SP. DEF by focusing\n" + "Raises Sp. Atk and\n" + "Sp. Def by focusing\n" "the mind."); static const u8 sTM05Desc[] = _( @@ -1568,12 +1568,12 @@ static const u8 sTM06Desc[] = _( static const u8 sTM07Desc[] = _( "Creates a hailstorm\n" "that damages all\n" - "types except ICE."); + "types except Ice."); static const u8 sTM08Desc[] = _( "Bulks up the body\n" "to boost both\n" - "ATTACK & DEFENSE."); + "Attack & Defense."); static const u8 sTM09Desc[] = _( "Shoots 2 to 5 seeds\n" @@ -1583,11 +1583,11 @@ static const u8 sTM09Desc[] = _( static const u8 sTM10Desc[] = _( "The attack power\n" "varies among\n" - "different POKéMON."); + "different Pokémon."); static const u8 sTM11Desc[] = _( "Raises the power of\n" - "FIRE-type moves\n" + "Fire-type moves\n" "for 5 turns."); static const u8 sTM12Desc[] = _( @@ -1613,7 +1613,7 @@ static const u8 sTM15Desc[] = _( static const u8 sTM16Desc[] = _( "Creates a wall of\n" "light that lowers\n" - "SP. ATK damage."); + "Sp. Atk damage."); static const u8 sTM17Desc[] = _( "Negates all damage,\n" @@ -1622,7 +1622,7 @@ static const u8 sTM17Desc[] = _( static const u8 sTM18Desc[] = _( "Raises the power of\n" - "WATER-type moves\n" + "Water-type moves\n" "for 5 turns."); static const u8 sTM19Desc[] = _( @@ -1648,7 +1648,7 @@ static const u8 sTM22Desc[] = _( static const u8 sTM23Desc[] = _( "Slams the foe with\n" "a hard tail. It may\n" - "lower DEFENSE."); + "lower Defense."); static const u8 sTM24Desc[] = _( "A powerful electric\n" @@ -1678,16 +1678,16 @@ static const u8 sTM28Desc[] = _( static const u8 sTM29Desc[] = _( "A powerful psychic\n" "attack that may\n" - "lower SP. DEF."); + "lower Sp. Def."); static const u8 sTM30Desc[] = _( "Hurls a dark lump\n" "at the foe. It may\n" - "lower SP. DEF."); + "lower Sp. Def."); static const u8 sTM31Desc[] = _( "Destroys barriers\n" - "like LIGHT SCREEN\n" + "like Light Screen\n" "and causes damage."); static const u8 sTM32Desc[] = _( @@ -1728,7 +1728,7 @@ static const u8 sTM38Desc[] = _( static const u8 sTM39Desc[] = _( "Stops the foe from\n" "moving with rocks.\n" - "May lower SPEED."); + "May lower Speed."); static const u8 sTM40Desc[] = _( "An extremely fast\n" @@ -1741,7 +1741,7 @@ static const u8 sTM41Desc[] = _( "move in a row."); static const u8 sTM42Desc[] = _( - "Raises ATTACK when\n" + "Raises Attack when\n" "poisoned, burned,\n" "or paralyzed."); @@ -1783,7 +1783,7 @@ static const u8 sTM49Desc[] = _( static const u8 sTM50Desc[] = _( "Enables full-power\n" "attack, but sharply\n" - "lowers SP. ATK."); + "lowers Sp. Atk."); static const u8 sHM01Desc[] = _( @@ -1814,7 +1814,7 @@ static const u8 sHM05Desc[] = _( static const u8 sHM06Desc[] = _( "A rock-crushingly\n" "tough attack that\n" - "may lower DEFENSE."); + "may lower Defense."); static const u8 sHM07Desc[] = _( "Attacks the foe\n" @@ -1828,94 +1828,94 @@ static const u8 sHM08Desc[] = _( // FireRed/LeafGreen key items static const u8 sOaksParcelDesc[] = _( - "A parcel for PROF.\n" - "OAK from a POKéMON\n" - "MART's clerk."); + "A parcel for Prof.\n" + "Oak from a Pokémon\n" + "Mart's clerk."); static const u8 sPokeFluteDesc[] = _( "A sweet-sounding\n" "flute that awakens\n" - "POKéMON."); + "Pokémon."); static const u8 sSecretKeyDesc[] = _( "The key to the\n" - "CINNABAR ISLAND\n" - "GYM's entrance."); + "Cinnabar Island\n" + "Gym's entrance."); static const u8 sBikeVoucherDesc[] = _( "A voucher for\n" "obtaining a bicycle\n" - "from the BIKE SHOP."); + "from the Bike Shop."); static const u8 sGoldTeethDesc[] = _( "Gold dentures lost\n" - "by the SAFARI\n" - "ZONE's WARDEN."); + "by the Safari\n" + "Zone's Warden."); static const u8 sOldAmberDesc[] = _( "A stone containing\n" "the genes of an\n" - "ancient POKéMON."); + "ancient Pokémon."); static const u8 sCardKeyDesc[] = _( "A card-type door\n" - "key used in SILPH\n" - "CO's office."); + "key used in Silph\n" + "Co's office."); static const u8 sLiftKeyDesc[] = _( "An elevator key\n" - "used in TEAM\n" - "ROCKET's HIDEOUT."); + "used in Team\n" + "Rocket's Hideout."); static const u8 sArmorFossilDesc[] = _( "A piece of a\n" - "prehistoric POKé-\n" - "MON's head."); + "prehistoric Poké-\n" + "mon's head."); static const u8 sSkullFossilDesc[] = _( "A piece of a\n" - "prehistoric POKé-\n" - "MON's head."); + "prehistoric Poké-\n" + "mon's head."); static const u8 sHelixFossilDesc[] = _( "A piece of an\n" "ancient marine\n" - "POKéMON's seashell."); + "Pokémon's seashell."); static const u8 sDomeFossilDesc[] = _( "A piece of an\n" "ancient marine\n" - "POKéMON's shell."); + "Pokémon's shell."); static const u8 sCoverFossilDesc[] = _( "A piece of a\n" - "prehistoric POKé-\n" - "MON's back."); + "prehistoric Poké-\n" + "mon's back."); static const u8 sPlumeFossilDesc[] = _( "A piece of a\n" - "prehistoric POKé-\n" - "MON's wing."); + "prehistoric Poké-\n" + "mon's wing."); static const u8 sJawFossilDesc[] = _( "A piece of a prehis-\n" - "toric POKéMON's\n" + "toric Pokémon's\n" "large jaw."); static const u8 sSailFossilDesc[] = _( "A piece of a prehis-\n" - "toric POKéMON's\n" + "toric Pokémon's\n" "skin sail."); static const u8 sSilphScopeDesc[] = _( - "SILPH CO's scope\n" + "Silph Co's scope\n" "makes unseeable\n" - "POKéMON visible."); + "Pokémon visible."); static const u8 sBicycleDesc[] = _( "A folding bicycle\n" "that is faster than\n" - "the RUNNING SHOES."); + "the Running Shoes."); static const u8 sTownMapDesc[] = _( "Can be viewed\n" @@ -1925,7 +1925,7 @@ static const u8 sTownMapDesc[] = _( static const u8 sVSSeekerDesc[] = _( "A rechargeable unit\n" "that flags battle-\n" - "ready TRAINERS."); + "ready Trainers."); static const u8 sFameCheckerDesc[] = _( "Stores information\n" @@ -1940,22 +1940,22 @@ static const u8 sTMCaseDesc[] = _( static const u8 sBerryPouchDesc[] = _( "A convenient\n" "container that\n" - "holds BERRIES."); + "holds Berries."); static const u8 sTeachyTVDesc[] = _( "A TV set tuned to\n" "an advice program\n" - "for TRAINERS."); + "for Trainers."); static const u8 sTriPassDesc[] = _( "A pass for ferries\n" - "between ONE, TWO,\n" - "and THREE ISLAND."); + "between One, Two,\n" + "and Three Island."); static const u8 sRainbowPassDesc[] = _( "For ferries serving\n" - "VERMILION and the\n" - "SEVII ISLANDS."); + "Vermilion and the\n" + "Sevii Islands."); static const u8 sTeaDesc[] = _( "A thirst-quenching\n" @@ -1965,17 +1965,17 @@ static const u8 sTeaDesc[] = _( static const u8 sMysticTicketDesc[] = _( "A ticket required\n" "to board the ship\n" - "to NAVEL ROCK."); + "to Navel Rock."); static const u8 sAuroraTicketDesc[] = _( "A ticket required\n" "to board the ship\n" - "to BIRTH ISLAND."); + "to Birth Island."); static const u8 sPowderJarDesc[] = _( - "Stores BERRY\n" - "POWDER made using\n" - "a BERRY CRUSHER."); + "Stores Berry\n" + "Powder made using\n" + "a Berry Crusher."); static const u8 sRubyDesc[] = _( "An exquisite, red-\n" @@ -1991,7 +1991,7 @@ static const u8 sSapphireDesc[] = _( static const u8 sMagmaEmblemDesc[] = _( "A medal-like item in\n" "the same shape as\n" - "TEAM MAGMA's mark."); + "Team Magma's mark."); static const u8 sOldSeaMapDesc[] = _( "A faded sea chart\n" @@ -2365,29 +2365,29 @@ static const u8 sEjectButtonDesc[] = _( "by the foe."); static const u8 sAbsorbBulbDesc[] = _( - "Raises SP. ATK if\n" + "Raises Sp. Atk if\n" "the holder is hit by\n" "a Water-type move."); static const u8 sCellBatteryDesc[] = _( - "Raises ATK if the\n" + "Raises Atk if the\n" "holder is hit by an\n" "Electric-type move."); static const u8 sLuminousMossDesc[] = _( - "Raises SP. DEF if\n" + "Raises Sp. Def if\n" "the holder is hit by\n" "a Water-type move."); static const u8 sSnowballDesc[] = _( - "Raises ATK if its\n" + "Raises Atk if its\n" "holder is hit by an\n" "Ice-type move."); static const u8 sWeaknessPolicyDesc[] = _( "If hit by a Super\n" "Effective move, ups\n" - "ATK and SP. ATK."); + "Atk and Sp. Atk."); static const u8 sDouseDriveDesc[] = _( "Changes Genesect's\n" @@ -2787,32 +2787,32 @@ static const u8 sHoneyDesc[] = _( static const u8 sHealthWingDesc[] = _( "An item that raises\n" "the base HP of\n" - "a POKéMON."); + "a Pokémon."); static const u8 sMuscleWingDesc[] = _( "An item that raises\n" - "the base ATTACK of\n" - "a POKéMON."); + "the base Attack of\n" + "a Pokémon."); static const u8 sResistWingDesc[] = _( "An item that raises\n" - "the base DEFENSE\n" - "of a POKéMON."); + "the base Defense\n" + "of a Pokémon."); static const u8 sGeniusWingDesc[] = _( "An item that raises\n" - "the base SP. ATK.\n" - "of a POKéMON."); + "the base Sp. Atk.\n" + "of a Pokémon."); static const u8 sCleverWingDesc[] = _( "An item that raises\n" - "the base SP. DEF.\n" - "of a POKéMON."); + "the base Sp. Def.\n" + "of a Pokémon."); static const u8 sSwiftWingDesc[] = _( "An item that raises\n" - "the base SPEED of\n" - "a POKéMON."); + "the base Speed of\n" + "a Pokémon."); static const u8 sPrettyWingDesc[] = _( "A beautiful yet\n" From 5392c101d00432dbf6480d1df7be448699610a4f Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Sun, 3 Jan 2021 19:11:24 -0500 Subject: [PATCH 2/9] tabs --- src/data/items.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index cb6837474..b1c68f32c 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -4890,11 +4890,11 @@ const struct Item gItems[] = .itemId = ITEM_OLD_AMBER, .description = sOldAmberDesc, #if I_KEY_FOSSILS >= GEN_4 - .price = 1000, + .price = 1000, .importance = 0, .pocket = POCKET_ITEMS, #else - .price = 0, + .price = 0, .importance = 1, .pocket = POCKET_KEY_ITEMS, #endif @@ -4961,11 +4961,11 @@ const struct Item gItems[] = .itemId = ITEM_HELIX_FOSSIL, .description = sHelixFossilDesc, #if I_KEY_FOSSILS >= GEN_4 - .price = 1000, + .price = 1000, .importance = 0, .pocket = POCKET_ITEMS, #else - .price = 0, + .price = 0, .importance = 1, .pocket = POCKET_KEY_ITEMS, #endif @@ -4980,11 +4980,11 @@ const struct Item gItems[] = .itemId = ITEM_DOME_FOSSIL, .description = sDomeFossilDesc, #if I_KEY_FOSSILS >= GEN_4 - .price = 1000, + .price = 1000, .importance = 0, .pocket = POCKET_ITEMS, #else - .price = 0, + .price = 0, .importance = 1, .pocket = POCKET_KEY_ITEMS, #endif @@ -4999,11 +4999,11 @@ const struct Item gItems[] = .itemId = ITEM_ROOT_FOSSIL, .description = sRootFossilDesc, #if I_KEY_FOSSILS >= GEN_4 - .price = 1000, + .price = 1000, .importance = 0, .pocket = POCKET_ITEMS, #else - .price = 0, + .price = 0, .importance = 1, .pocket = POCKET_KEY_ITEMS, #endif @@ -5018,11 +5018,11 @@ const struct Item gItems[] = .itemId = ITEM_CLAW_FOSSIL, .description = sClawFossilDesc, #if I_KEY_FOSSILS >= GEN_4 - .price = 1000, + .price = 1000, .importance = 0, .pocket = POCKET_ITEMS, #else - .price = 0, + .price = 0, .importance = 1, .pocket = POCKET_KEY_ITEMS, #endif @@ -7363,7 +7363,7 @@ const struct Item gItems[] = .name = _("Mega Bracelet"), .itemId = ITEM_MEGA_BRACELET, .price = 0, - .importance = 1, + .importance = 1, .description = sMegaBraceletDesc, .pocket = POCKET_KEY_ITEMS, .type = 4, @@ -7575,7 +7575,7 @@ const struct Item gItems[] = .name = _("Shiny Charm"), .itemId = ITEM_SHINY_CHARM, .price = 0, - .importance = 1, + .importance = 1, .description = sShinyCharmDesc, .pocket = POCKET_KEY_ITEMS, .type = 4, From 8d7d819cdeb8ddf8f1741d13e46c7dd6a0e94002 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Sun, 10 Jan 2021 15:08:48 -0500 Subject: [PATCH 3/9] beast ball cannot be sold --- src/data/items.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index b1c68f32c..b66893648 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -382,7 +382,7 @@ const struct Item gItems[] = { .name = _("Beast Ball"), .itemId = ITEM_BEAST_BALL, - .price = 1000, + .price = 0, .description = sBeastBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, From 3aadd693036e969c296cc23a99ccaa05d993da31 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Mon, 11 Jan 2021 19:49:03 -0500 Subject: [PATCH 4/9] fixes pokeblock berries and evolution items --- src/data/text/item_descriptions.h | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 892e4c077..6f29dbe00 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -751,27 +751,27 @@ static const u8 sIapapaBerryDesc[] = _( "may confuse."); static const u8 sRazzBerryDesc[] = _( - "{POKEBLOCK} ingredient.\n" + "Pokéblock ingredient.\n" "Plant in loamy soil\n" "to grow Razz."); static const u8 sBlukBerryDesc[] = _( - "{POKEBLOCK} ingredient.\n" + "Pokéblock ingredient.\n" "Plant in loamy soil\n" "to grow Bluk."); static const u8 sNanabBerryDesc[] = _( - "{POKEBLOCK} ingredient.\n" + "Pokéblock ingredient.\n" "Plant in loamy soil\n" "to grow Nanab."); static const u8 sWepearBerryDesc[] = _( - "{POKEBLOCK} ingredient.\n" + "Pokéblock ingredient.\n" "Plant in loamy soil\n" "to grow Wepear."); static const u8 sPinapBerryDesc[] = _( - "{POKEBLOCK} ingredient.\n" + "Pokéblock ingredient.\n" "Plant in loamy soil\n" "to grow Pinap."); @@ -806,47 +806,47 @@ static const u8 sTamatoBerryDesc[] = _( "base Speed."); static const u8 sCornnBerryDesc[] = _( - "{POKEBLOCK} ingredient.\n" + "Pokéblock ingredient.\n" "Plant in loamy soil\n" "to grow Cornn."); static const u8 sMagostBerryDesc[] = _( - "{POKEBLOCK} ingredient.\n" + "Pokéblock ingredient.\n" "Plant in loamy soil\n" "to grow Magost."); static const u8 sRabutaBerryDesc[] = _( - "{POKEBLOCK} ingredient.\n" + "Pokéblock ingredient.\n" "Plant in loamy soil\n" "to grow Rabuta."); static const u8 sNomelBerryDesc[] = _( - "{POKEBLOCK} ingredient.\n" + "Pokéblock ingredient.\n" "Plant in loamy soil\n" "to grow Nomel."); static const u8 sSpelonBerryDesc[] = _( - "{POKEBLOCK} ingredient.\n" + "Pokéblock ingredient.\n" "Plant in loamy soil\n" "to grow Spelon."); static const u8 sPamtreBerryDesc[] = _( - "{POKEBLOCK} ingredient.\n" + "Pokéblock ingredient.\n" "Plant in loamy soil\n" "to grow Pamtre."); static const u8 sWatmelBerryDesc[] = _( - "{POKEBLOCK} ingredient.\n" + "Pokéblock ingredient.\n" "Plant in loamy soil\n" "to grow Watmel."); static const u8 sDurinBerryDesc[] = _( - "{POKEBLOCK} ingredient.\n" + "Pokéblock ingredient.\n" "Plant in loamy soil\n" "to grow Durin."); static const u8 sBelueBerryDesc[] = _( - "{POKEBLOCK} ingredient.\n" + "Pokéblock ingredient.\n" "Plant in loamy soil\n" "to grow Belue."); @@ -891,7 +891,7 @@ static const u8 sMicleBerryDesc[] = _( "move in a pinch."); static const u8 sEnigmaBerryDesc[] = _( - "{POKEBLOCK} ingredient.\n" + "Pokéblock ingredient.\n" "Plant in loamy soil\n" "to grow a mystery."); @@ -1132,23 +1132,23 @@ static const u8 sOvalStoneDesc[] = _( "Looks like an egg."); static const u8 sProtectorDesc[] = _( - "A certain Pokémon\n" - "loves it. It's quite\n" + "Loved by a certain\n" + "Pokémon. It's quite\n" "heavy."); static const u8 sElectirizerDesc[] = _( - "A certain Pokémon\n" - "loves it. It's full\n" + "Loved by a certain\n" + "Pokémon. It's full\n" "of electricity."); static const u8 sMagmarizerDesc[] = _( - "A certain Pokémon\n" - "loves it. It's full\n" + "Loved by a certain\n" + "Pokémon. It's full\n" "of magma energy."); static const u8 sDubiousDiscDesc[] = _( - "A certain Pokémon\n" - "loves it. It's over-\n" + "Loved by a certain\n" + "Pokémon. It's over-\n" "flowing with data."); static const u8 sReaperClothDesc[] = _( @@ -1457,7 +1457,7 @@ static const u8 sAcroBikeDesc[] = _( static const u8 sPokeblockCaseDesc[] = _( "A case for holding\n" - "{POKEBLOCK}S made with\n" + "Pokéblocks made with\n" "a Berry Blender."); static const u8 sLetterDesc[] = _( From eaca98787986d606cb64717f62ee314d9d08b5a3 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Mon, 11 Jan 2021 19:54:41 -0500 Subject: [PATCH 5/9] more fixes light ball and gen 6 evolution held items --- src/data/text/item_descriptions.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 6f29dbe00..a4ba627c7 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -1173,18 +1173,18 @@ static const u8 sPrismScaleDesc[] = _( static const u8 sWhippedDreamDesc[] = _( "A soft and sweet\n" - "treat loved by some\n" - "Pokémon."); + "treat loved by\n" + "a certain Pokémon."); static const u8 sSachetDesc[] = _( "A sachet filled with\n" "perfumes loved by\n" - "some Pokémon."); + "a certain Pokémon."); static const u8 sLightBallDesc[] = _( "A hold item that\n" - "raises the Sp. Atk\n" - "of Pikachu."); + "raises the Atk and\n" + "Sp. Atk of Pikachu."); static const u8 sSoftSandDesc[] = _( "A hold item that\n" From 7e91129332dc00977d230220d915dd4b6ea449c5 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Mon, 11 Jan 2021 20:18:23 -0500 Subject: [PATCH 6/9] may as well do the rest --- src/data/text/item_descriptions.h | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index a4ba627c7..e961f2b5c 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -1127,19 +1127,19 @@ static const u8 sDragonScaleDesc[] = _( "type Pokémon."); static const u8 sOvalStoneDesc[] = _( - "Helps a certain\n" - "Pokémon to evolve.\n" - "Looks like an egg."); + "Makes a certain\n" + "Pokémon evolve. It's\n" + "shaped like an egg."); static const u8 sProtectorDesc[] = _( "Loved by a certain\n" - "Pokémon. It's quite\n" - "heavy."); + "Pokémon. It's stiff\n" + "and heavy."); static const u8 sElectirizerDesc[] = _( "Loved by a certain\n" "Pokémon. It's full\n" - "of electricity."); + "of electric energy."); static const u8 sMagmarizerDesc[] = _( "Loved by a certain\n" @@ -1147,29 +1147,29 @@ static const u8 sMagmarizerDesc[] = _( "of magma energy."); static const u8 sDubiousDiscDesc[] = _( - "Loved by a certain\n" - "Pokémon. It's over-\n" - "flowing with data."); + "A transparent device\n" + "overflowing with\n" + "dubious data."); static const u8 sReaperClothDesc[] = _( "Loved by a certain\n" - "Pokémon. Imbued\n" - "with strong energy."); + "Pokémon. Imbued with\n" + "spiritual energy."); static const u8 sRazorClawDesc[] = _( - "Helps a certain\n" - "Pokémon to evolve.\n" - "It's a sharp claw."); + "A hooked claw that\n" + "ups the holder's\n" + "critical-hit ratio."); static const u8 sRazorFangDesc[] = _( - "Helps a certain\n" - "Pokémon to evolve.\n" - "It's a sharp fang."); + "A hold item that\n" + "may cause flinching\n" + "when the foe is hit."); static const u8 sPrismScaleDesc[] = _( - "A mysterious scale.\n" - "It helps a certain\n" - "Pokémon to evolve."); + "A mysterious scale\n" + "that evolves certain\n" + "Pokémon. It shines."); static const u8 sWhippedDreamDesc[] = _( "A soft and sweet\n" From 184dad1874f0377a2e2f7fbd9b1e795d41df6722 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Thu, 21 Jan 2021 19:04:26 -0500 Subject: [PATCH 7/9] changes according to review --- src/data/items.h | 416 +++++++++++++++++++++++------------------------ 1 file changed, 208 insertions(+), 208 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index b66893648..0d8c4687f 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -32,7 +32,7 @@ const struct Item gItems[] = { .name = _("Ultra Ball"), .itemId = ITEM_ULTRA_BALL, - .price = 1200, + .price = 800, .description = sUltraBallDesc, .pocket = POCKET_POKE_BALLS, .type = 1, @@ -172,7 +172,7 @@ const struct Item gItems[] = { .name = _("Premier Ball"), .itemId = ITEM_PREMIER_BALL, - .price = 200, + .price = 20, .description = sPremierBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -186,7 +186,7 @@ const struct Item gItems[] = { .name = _("Level Ball"), .itemId = ITEM_LEVEL_BALL, - .price = 300, + .price = 0, .description = sLevelBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -200,7 +200,7 @@ const struct Item gItems[] = { .name = _("Lure Ball"), .itemId = ITEM_LURE_BALL, - .price = 300, + .price = 0, .description = sLureBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -214,7 +214,7 @@ const struct Item gItems[] = { .name = _("Moon Ball"), .itemId = ITEM_MOON_BALL, - .price = 300, + .price = 0, .description = sMoonBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -228,7 +228,7 @@ const struct Item gItems[] = { .name = _("Friend Ball"), .itemId = ITEM_FRIEND_BALL, - .price = 300, + .price = 0, .description = sFriendBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -242,7 +242,7 @@ const struct Item gItems[] = { .name = _("Love Ball"), .itemId = ITEM_LOVE_BALL, - .price = 300, + .price = 0, .description = sLoveBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -256,7 +256,7 @@ const struct Item gItems[] = { .name = _("Heavy Ball"), .itemId = ITEM_HEAVY_BALL, - .price = 300, + .price = 0, .description = sHeavyBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -270,7 +270,7 @@ const struct Item gItems[] = { .name = _("Fast Ball"), .itemId = ITEM_FAST_BALL, - .price = 300, + .price = 0, .description = sFastBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -340,7 +340,7 @@ const struct Item gItems[] = { .name = _("Sport Ball"), .itemId = ITEM_SPORT_BALL, - .price = 300, + .price = 0, .description = sSportBallDesc, .pocket = POCKET_POKE_BALLS, .type = 11, @@ -398,7 +398,7 @@ const struct Item gItems[] = { .name = _("Potion"), .itemId = ITEM_POTION, - .price = 300, + .price = 200, .holdEffectParam = 20, .description = sPotionDesc, .pocket = POCKET_ITEMS, @@ -413,7 +413,7 @@ const struct Item gItems[] = { .name = _("Antidote"), .itemId = ITEM_ANTIDOTE, - .price = 100, + .price = 200, .description = sAntidoteDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -427,7 +427,7 @@ const struct Item gItems[] = { .name = _("Burn Heal"), .itemId = ITEM_BURN_HEAL, - .price = 250, + .price = 300, .description = sBurnHealDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -441,7 +441,7 @@ const struct Item gItems[] = { .name = _("Ice Heal"), .itemId = ITEM_ICE_HEAL, - .price = 250, + .price = 100, .description = sIceHealDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -455,7 +455,7 @@ const struct Item gItems[] = { .name = _("Awakening"), .itemId = ITEM_AWAKENING, - .price = 250, + .price = 100, .description = sAwakeningDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -469,7 +469,7 @@ const struct Item gItems[] = { .name = _("Paralyze Heal"), .itemId = ITEM_PARALYZE_HEAL, - .price = 200, + .price = 300, .description = sParalyzeHealDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -513,7 +513,7 @@ const struct Item gItems[] = { .name = _("Hyper Potion"), .itemId = ITEM_HYPER_POTION, - .price = 1200, + .price = 1500, .holdEffectParam = 120, .description = sHyperPotionDesc, .pocket = POCKET_ITEMS, @@ -543,7 +543,7 @@ const struct Item gItems[] = { .name = _("Full Heal"), .itemId = ITEM_FULL_HEAL, - .price = 600, + .price = 400, .description = sFullHealDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -557,7 +557,7 @@ const struct Item gItems[] = { .name = _("Revive"), .itemId = ITEM_REVIVE, - .price = 1500, + .price = 2000, .description = sReviveDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -615,7 +615,7 @@ const struct Item gItems[] = { .name = _("Lemonade"), .itemId = ITEM_LEMONADE, - .price = 350, + .price = 400, .holdEffectParam = 70, .description = sLemonadeDesc, .pocket = POCKET_ITEMS, @@ -630,7 +630,7 @@ const struct Item gItems[] = { .name = _("Moomoo Milk"), .itemId = ITEM_MOOMOO_MILK, - .price = 500, + .price = 600, .holdEffectParam = 100, .description = sMoomooMilkDesc, .pocket = POCKET_ITEMS, @@ -659,7 +659,7 @@ const struct Item gItems[] = { .name = _("Energy Root"), .itemId = ITEM_ENERGY_ROOT, - .price = 800, + .price = 1200, .description = sEnergyRootDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -673,7 +673,7 @@ const struct Item gItems[] = { .name = _("Heal Powder"), .itemId = ITEM_HEAL_POWDER, - .price = 450, + .price = 300, .description = sHealPowderDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -761,7 +761,7 @@ const struct Item gItems[] = { .name = _("Lava Cookie"), .itemId = ITEM_LAVA_COOKIE, - .price = 200, + .price = 350, .description = sLavaCookieDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -775,7 +775,7 @@ const struct Item gItems[] = { .name = _("Blue Flute"), .itemId = ITEM_BLUE_FLUTE, - .price = 100, + .price = 20, .description = sBlueFluteDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -789,7 +789,7 @@ const struct Item gItems[] = { .name = _("Yellow Flute"), .itemId = ITEM_YELLOW_FLUTE, - .price = 200, + .price = 20, .description = sYellowFluteDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -803,7 +803,7 @@ const struct Item gItems[] = { .name = _("Red Flute"), .itemId = ITEM_RED_FLUTE, - .price = 300, + .price = 20, .description = sRedFluteDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -817,7 +817,7 @@ const struct Item gItems[] = { .name = _("Black Flute"), .itemId = ITEM_BLACK_FLUTE, - .price = 400, + .price = 20, .holdEffectParam = 50, .description = sBlackFluteDesc, .pocket = POCKET_ITEMS, @@ -830,7 +830,7 @@ const struct Item gItems[] = { .name = _("White Flute"), .itemId = ITEM_WHITE_FLUTE, - .price = 500, + .price = 20, .holdEffectParam = 150, .description = sWhiteFluteDesc, .pocket = POCKET_ITEMS, @@ -843,7 +843,7 @@ const struct Item gItems[] = { .name = _("Berry Juice"), .itemId = ITEM_BERRY_JUICE, - .price = 100, + .price = 200, .holdEffect = HOLD_EFFECT_RESTORE_HP, .holdEffectParam = 20, .description = sBerryJuiceDesc, @@ -859,7 +859,7 @@ const struct Item gItems[] = { .name = _("Sweet Heart"), .itemId = ITEM_SWEET_HEART, - .price = 100, + .price = 3000, .holdEffectParam = 20, .description = sSweetHeartDesc, .pocket = POCKET_ITEMS, @@ -888,7 +888,7 @@ const struct Item gItems[] = { .name = _("Old Gateau"), .itemId = ITEM_OLD_GATEAU, - .price = 200, + .price = 350, .description = sOldGateauDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -902,7 +902,7 @@ const struct Item gItems[] = { .name = _("Sacred Ash"), .itemId = ITEM_SACRED_ASH, - .price = 200, + .price = 50000, .description = sSacredAshDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -940,7 +940,7 @@ const struct Item gItems[] = { .name = _("Red Shard"), .itemId = ITEM_RED_SHARD, - .price = 200, + .price = 1000, .description = sRedShardDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -952,7 +952,7 @@ const struct Item gItems[] = { .name = _("Blue Shard"), .itemId = ITEM_BLUE_SHARD, - .price = 200, + .price = 1000, .description = sBlueShardDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -964,7 +964,7 @@ const struct Item gItems[] = { .name = _("Yellow Shard"), .itemId = ITEM_YELLOW_SHARD, - .price = 200, + .price = 1000, .description = sYellowShardDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -976,7 +976,7 @@ const struct Item gItems[] = { .name = _("Green Shard"), .itemId = ITEM_GREEN_SHARD, - .price = 200, + .price = 1000, .description = sGreenShardDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -990,7 +990,7 @@ const struct Item gItems[] = { .name = _("HP Up"), .itemId = ITEM_HP_UP, - .price = 9800, + .price = 10000, .description = sHPUpDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1002,7 +1002,7 @@ const struct Item gItems[] = { .name = _("Protein"), .itemId = ITEM_PROTEIN, - .price = 9800, + .price = 10000, .description = sProteinDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1014,7 +1014,7 @@ const struct Item gItems[] = { .name = _("Iron"), .itemId = ITEM_IRON, - .price = 9800, + .price = 10000, .description = sIronDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1026,7 +1026,7 @@ const struct Item gItems[] = { .name = _("Carbos"), .itemId = ITEM_CARBOS, - .price = 9800, + .price = 10000, .description = sCarbosDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1038,7 +1038,7 @@ const struct Item gItems[] = { .name = _("Calcium"), .itemId = ITEM_CALCIUM, - .price = 9800, + .price = 10000, .description = sCalciumDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1050,7 +1050,7 @@ const struct Item gItems[] = { .name = _("Rare Candy"), .itemId = ITEM_RARE_CANDY, - .price = 4800, + .price = 10000, .description = sRareCandyDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1062,7 +1062,7 @@ const struct Item gItems[] = { .name = _("PP Up"), .itemId = ITEM_PP_UP, - .price = 9800, + .price = 10000, .description = sPPUpDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1074,7 +1074,7 @@ const struct Item gItems[] = { .name = _("Zinc"), .itemId = ITEM_ZINC, - .price = 9800, + .price = 10000, .description = sZincDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1086,7 +1086,7 @@ const struct Item gItems[] = { .name = _("PP Max"), .itemId = ITEM_PP_MAX, - .price = 9800, + .price = 10000, .description = sPPMaxDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1100,7 +1100,7 @@ const struct Item gItems[] = { .name = _("Guard Spec."), .itemId = ITEM_GUARD_SPEC, - .price = 700, + .price = 1500, .description = sGuardSpecDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1114,7 +1114,7 @@ const struct Item gItems[] = { .name = _("Dire Hit"), .itemId = ITEM_DIRE_HIT, - .price = 650, + .price = 1000, .description = sDireHitDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1128,7 +1128,7 @@ const struct Item gItems[] = { .name = _("X Attack"), .itemId = ITEM_X_ATTACK, - .price = 500, + .price = 1000, .description = sXAttackDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1142,7 +1142,7 @@ const struct Item gItems[] = { .name = _("X Defense"), .itemId = ITEM_X_DEFENSE, - .price = 550, + .price = 2000, .description = sXDefendDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1156,7 +1156,7 @@ const struct Item gItems[] = { .name = _("X Speed"), .itemId = ITEM_X_SPEED, - .price = 350, + .price = 1000, .description = sXSpeedDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1170,7 +1170,7 @@ const struct Item gItems[] = { .name = _("X Accuracy"), .itemId = ITEM_X_ACCURACY, - .price = 950, + .price = 1000, .description = sXAccuracyDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1184,7 +1184,7 @@ const struct Item gItems[] = { .name = _("X Sp. Atk"), .itemId = ITEM_X_SP_ATK, - .price = 350, + .price = 1000, .description = sXSpecialAttackDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1198,7 +1198,7 @@ const struct Item gItems[] = { .name = _("X Sp. Def"), .itemId = ITEM_X_SP_DEF, - .price = 350, + .price = 2000, .description = sXSpecialDefenseDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1212,7 +1212,7 @@ const struct Item gItems[] = { .name = _("Poké Doll"), .itemId = ITEM_POKE_DOLL, - .price = 1000, + .price = 100, .description = sPokeDollDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1226,7 +1226,7 @@ const struct Item gItems[] = { .name = _("Fluffy Tail"), .itemId = ITEM_FLUFFY_TAIL, - .price = 1000, + .price = 100, .description = sFluffyTailDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1242,7 +1242,7 @@ const struct Item gItems[] = { .name = _("Super Repel"), .itemId = ITEM_SUPER_REPEL, - .price = 500, + .price = 700, .holdEffectParam = 200, .description = sSuperRepelDesc, .pocket = POCKET_ITEMS, @@ -1255,7 +1255,7 @@ const struct Item gItems[] = { .name = _("Max Repel"), .itemId = ITEM_MAX_REPEL, - .price = 700, + .price = 900, .holdEffectParam = 250, .description = sMaxRepelDesc, .pocket = POCKET_ITEMS, @@ -1266,9 +1266,9 @@ const struct Item gItems[] = [ITEM_ABILITY_CAPSULE] = { - .name = _("Ab. Capsule"), + .name = _("AbilityCapsle"), .itemId = ITEM_ABILITY_CAPSULE, - .price = 1000, + .price = 10000, .holdEffectParam = 0, .description = sAbilityCapsuleDesc, .pocket = POCKET_ITEMS, @@ -1287,7 +1287,7 @@ const struct Item gItems[] = .importance = 1, .pocket = POCKET_KEY_ITEMS, #else - .price = 550, + .price = 1000, .importance = 0, .pocket = POCKET_ITEMS, #endif @@ -1300,7 +1300,7 @@ const struct Item gItems[] = { .name = _("Repel"), .itemId = ITEM_REPEL, - .price = 350, + .price = 400, .holdEffectParam = 100, .description = sRepelDesc, .pocket = POCKET_ITEMS, @@ -1315,7 +1315,7 @@ const struct Item gItems[] = { .name = _("Sun Stone"), .itemId = ITEM_SUN_STONE, - .price = 2100, + .price = 3000, .description = sSunStoneDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1327,7 +1327,7 @@ const struct Item gItems[] = { .name = _("Moon Stone"), .itemId = ITEM_MOON_STONE, - .price = 2100, + .price = 3000, .description = sMoonStoneDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1339,7 +1339,7 @@ const struct Item gItems[] = { .name = _("Fire Stone"), .itemId = ITEM_FIRE_STONE, - .price = 2100, + .price = 3000, .description = sFireStoneDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1351,7 +1351,7 @@ const struct Item gItems[] = { .name = _("Thunder Stone"), .itemId = ITEM_THUNDER_STONE, - .price = 2100, + .price = 3000, .description = sThunderStoneDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1363,7 +1363,7 @@ const struct Item gItems[] = { .name = _("Water Stone"), .itemId = ITEM_WATER_STONE, - .price = 2100, + .price = 3000, .description = sWaterStoneDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1375,7 +1375,7 @@ const struct Item gItems[] = { .name = _("Leaf Stone"), .itemId = ITEM_LEAF_STONE, - .price = 2100, + .price = 3000, .description = sLeafStoneDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1387,7 +1387,7 @@ const struct Item gItems[] = { .name = _("Dawn Stone"), .itemId = ITEM_DAWN_STONE, - .price = 2100, + .price = 3000, .description = sDawnStoneDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1399,7 +1399,7 @@ const struct Item gItems[] = { .name = _("Dusk Stone"), .itemId = ITEM_DUSK_STONE, - .price = 2100, + .price = 3000, .description = sDuskStoneDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1411,7 +1411,7 @@ const struct Item gItems[] = { .name = _("Shiny Stone"), .itemId = ITEM_SHINY_STONE, - .price = 2100, + .price = 3000, .description = sShinyStoneDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1423,7 +1423,7 @@ const struct Item gItems[] = { .name = _("Ice Stone"), .itemId = ITEM_ICE_STONE, - .price = 2100, + .price = 3000, .description = sIceStoneDesc, .pocket = POCKET_ITEMS, .type = 1, @@ -1437,7 +1437,7 @@ const struct Item gItems[] = { .name = _("Red Apricorn"), .itemId = ITEM_RED_APRICORN, - .price = 20, + .price = 200, .description = sRedApricornDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1449,7 +1449,7 @@ const struct Item gItems[] = { .name = _("Blue Apricorn"), .itemId = ITEM_BLUE_APRICORN, - .price = 20, + .price = 200, .description = sBlueApricornDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1459,9 +1459,9 @@ const struct Item gItems[] = [ITEM_YELLOW_APRICORN] = { - .name = _("Ylw Apricorn"), + .name = _("YelowApricorn"), .itemId = ITEM_YELLOW_APRICORN, - .price = 20, + .price = 200, .description = sYellowApricornDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1471,9 +1471,9 @@ const struct Item gItems[] = [ITEM_GREEN_APRICORN] = { - .name = _("Grn Apricorn"), + .name = _("GreenApricorn"), .itemId = ITEM_GREEN_APRICORN, - .price = 20, + .price = 200, .description = sGreenApricornDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1485,7 +1485,7 @@ const struct Item gItems[] = { .name = _("Pink Apricorn"), .itemId = ITEM_PINK_APRICORN, - .price = 20, + .price = 200, .description = sPinkApricornDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1495,9 +1495,9 @@ const struct Item gItems[] = [ITEM_WHITE_APRICORN] = { - .name = _("Wht Apricorn"), + .name = _("WhiteApricorn"), .itemId = ITEM_WHITE_APRICORN, - .price = 20, + .price = 200, .description = sWhiteApricornDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1507,9 +1507,9 @@ const struct Item gItems[] = [ITEM_BLACK_APRICORN] = { - .name = _("Blk Apricorn"), + .name = _("BlackApricorn"), .itemId = ITEM_BLACK_APRICORN, - .price = 20, + .price = 200, .description = sBlackApricornDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1545,7 +1545,7 @@ const struct Item gItems[] = { .name = _("Pearl"), .itemId = ITEM_PEARL, - .price = 1400, + .price = 2000, .description = sPearlDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1557,7 +1557,7 @@ const struct Item gItems[] = { .name = _("Big Pearl"), .itemId = ITEM_BIG_PEARL, - .price = 7500, + .price = 8000, .description = sBigPearlDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1569,7 +1569,7 @@ const struct Item gItems[] = { .name = _("Stardust"), .itemId = ITEM_STARDUST, - .price = 2000, + .price = 3000, .description = sStardustDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1581,7 +1581,7 @@ const struct Item gItems[] = { .name = _("Star Piece"), .itemId = ITEM_STAR_PIECE, - .price = 9800, + .price = 12000, .description = sStarPieceDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -1669,7 +1669,7 @@ const struct Item gItems[] = { .name = _("Rare Bone"), .itemId = ITEM_RARE_BONE, - .price = 10000, + .price = 5000, .description = sRareBoneDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -2741,7 +2741,7 @@ const struct Item gItems[] = { .name = _("Bright Powder"), .itemId = ITEM_BRIGHT_POWDER, - .price = 10, + .price = 4000, .holdEffect = HOLD_EFFECT_EVASION_UP, .holdEffectParam = 10, .description = sBrightPowderDesc, @@ -2755,7 +2755,7 @@ const struct Item gItems[] = { .name = _("White Herb"), .itemId = ITEM_WHITE_HERB, - .price = 100, + .price = 4000, .holdEffect = HOLD_EFFECT_RESTORE_STATS, .description = sWhiteHerbDesc, .pocket = POCKET_ITEMS, @@ -2794,7 +2794,7 @@ const struct Item gItems[] = { .name = _("Quick Claw"), .itemId = ITEM_QUICK_CLAW, - .price = 100, + .price = 4000, .holdEffect = HOLD_EFFECT_QUICK_CLAW, .holdEffectParam = 20, .description = sQuickClawDesc, @@ -2808,7 +2808,7 @@ const struct Item gItems[] = { .name = _("Soothe Bell"), .itemId = ITEM_SOOTHE_BELL, - .price = 100, + .price = 4000, .holdEffect = HOLD_EFFECT_HAPPINESS_UP, .description = sSootheBellDesc, .pocket = POCKET_ITEMS, @@ -2821,7 +2821,7 @@ const struct Item gItems[] = { .name = _("Mental Herb"), .itemId = ITEM_MENTAL_HERB, - .price = 100, + .price = 4000, .holdEffect = HOLD_EFFECT_CURE_ATTRACT, .description = sMentalHerbDesc, .pocket = POCKET_ITEMS, @@ -2834,7 +2834,7 @@ const struct Item gItems[] = { .name = _("Choice Band"), .itemId = ITEM_CHOICE_BAND, - .price = 100, + .price = 4000, .holdEffect = HOLD_EFFECT_CHOICE_BAND, .description = sChoiceBandDesc, .pocket = POCKET_ITEMS, @@ -2847,7 +2847,7 @@ const struct Item gItems[] = { .name = _("King's Rock"), .itemId = ITEM_KINGS_ROCK, - .price = 100, + .price = 5000, .holdEffect = HOLD_EFFECT_FLINCH, .holdEffectParam = 10, .description = sKingsRockDesc, @@ -2861,7 +2861,7 @@ const struct Item gItems[] = { .name = _("Silver Powder"), .itemId = ITEM_SILVER_POWDER, - .price = 100, + .price = 1000, .holdEffect = HOLD_EFFECT_BUG_POWER, .holdEffectParam = 10, .description = sSilverPowderDesc, @@ -2875,7 +2875,7 @@ const struct Item gItems[] = { .name = _("Amulet Coin"), .itemId = ITEM_AMULET_COIN, - .price = 100, + .price = 10000, .holdEffect = HOLD_EFFECT_DOUBLE_PRIZE, .holdEffectParam = 10, .description = sAmuletCoinDesc, @@ -2889,7 +2889,7 @@ const struct Item gItems[] = { .name = _("Cleanse Tag"), .itemId = ITEM_CLEANSE_TAG, - .price = 200, + .price = 5000, .holdEffect = HOLD_EFFECT_REPEL, .description = sCleanseTagDesc, .pocket = POCKET_ITEMS, @@ -2902,7 +2902,7 @@ const struct Item gItems[] = { .name = _("Soul Dew"), .itemId = ITEM_SOUL_DEW, - .price = 200, + .price = 0, .holdEffect = HOLD_EFFECT_SOUL_DEW, .description = sSoulDewDesc, .pocket = POCKET_ITEMS, @@ -2915,7 +2915,7 @@ const struct Item gItems[] = { .name = _("DeepSeaTooth"), .itemId = ITEM_DEEP_SEA_TOOTH, - .price = 200, + .price = 2000, .holdEffect = HOLD_EFFECT_DEEP_SEA_TOOTH, .description = sDeepSeaToothDesc, .pocket = POCKET_ITEMS, @@ -2928,7 +2928,7 @@ const struct Item gItems[] = { .name = _("DeepSeaScale"), .itemId = ITEM_DEEP_SEA_SCALE, - .price = 200, + .price = 2000, .holdEffect = HOLD_EFFECT_DEEP_SEA_SCALE, .description = sDeepSeaScaleDesc, .pocket = POCKET_ITEMS, @@ -2941,7 +2941,7 @@ const struct Item gItems[] = { .name = _("Smoke Ball"), .itemId = ITEM_SMOKE_BALL, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_CAN_ALWAYS_RUN, .description = sSmokeBallDesc, .pocket = POCKET_ITEMS, @@ -2954,7 +2954,7 @@ const struct Item gItems[] = { .name = _("Everstone"), .itemId = ITEM_EVERSTONE, - .price = 200, + .price = 3000, .holdEffect = HOLD_EFFECT_PREVENT_EVOLVE, .description = sEverstoneDesc, .pocket = POCKET_ITEMS, @@ -2967,7 +2967,7 @@ const struct Item gItems[] = { .name = _("Focus Band"), .itemId = ITEM_FOCUS_BAND, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_FOCUS_BAND, .holdEffectParam = 10, .description = sFocusBandDesc, @@ -2981,7 +2981,7 @@ const struct Item gItems[] = { .name = _("Lucky Egg"), .itemId = ITEM_LUCKY_EGG, - .price = 200, + .price = 10000, .holdEffect = HOLD_EFFECT_LUCKY_EGG, .description = sLuckyEggDesc, .pocket = POCKET_ITEMS, @@ -2994,7 +2994,7 @@ const struct Item gItems[] = { .name = _("Scope Lens"), .itemId = ITEM_SCOPE_LENS, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_SCOPE_LENS, .description = sScopeLensDesc, .pocket = POCKET_ITEMS, @@ -3007,7 +3007,7 @@ const struct Item gItems[] = { .name = _("Metal Coat"), .itemId = ITEM_METAL_COAT, - .price = 100, + .price = 2000, .holdEffect = HOLD_EFFECT_STEEL_POWER, .holdEffectParam = 10, .description = sMetalCoatDesc, @@ -3021,7 +3021,7 @@ const struct Item gItems[] = { .name = _("Leftovers"), .itemId = ITEM_LEFTOVERS, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_LEFTOVERS, .holdEffectParam = 10, .description = sLeftoversDesc, @@ -3035,7 +3035,7 @@ const struct Item gItems[] = { .name = _("Dragon Scale"), .itemId = ITEM_DRAGON_SCALE, - .price = 2100, + .price = 2000, .holdEffect = HOLD_EFFECT_DRAGON_SCALE, .holdEffectParam = 10, .description = sDragonScaleDesc, @@ -3049,7 +3049,7 @@ const struct Item gItems[] = { .name = _("Oval Stone"), .itemId = ITEM_OVAL_STONE, - .price = 2100, + .price = 2000, .description = sOvalStoneDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3061,7 +3061,7 @@ const struct Item gItems[] = { .name = _("Protector"), .itemId = ITEM_PROTECTOR, - .price = 2100, + .price = 2000, .description = sProtectorDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3073,7 +3073,7 @@ const struct Item gItems[] = { .name = _("Electirizer"), .itemId = ITEM_ELECTIRIZER, - .price = 2100, + .price = 2000, .description = sElectirizerDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3085,7 +3085,7 @@ const struct Item gItems[] = { .name = _("Magmarizer"), .itemId = ITEM_MAGMARIZER, - .price = 2100, + .price = 2000, .description = sMagmarizerDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3097,7 +3097,7 @@ const struct Item gItems[] = { .name = _("Dubious Disc"), .itemId = ITEM_DUBIOUS_DISC, - .price = 2100, + .price = 2000, .description = sDubiousDiscDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3109,7 +3109,7 @@ const struct Item gItems[] = { .name = _("Reaper Cloth"), .itemId = ITEM_REAPER_CLOTH, - .price = 2100, + .price = 2000, .description = sReaperClothDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3121,7 +3121,7 @@ const struct Item gItems[] = { .name = _("Razor Claw"), .itemId = ITEM_RAZOR_CLAW, - .price = 2100, + .price = 5000, .holdEffect = HOLD_EFFECT_NONE, // Placeholder. .description = sRazorClawDesc, .pocket = POCKET_ITEMS, @@ -3134,7 +3134,7 @@ const struct Item gItems[] = { .name = _("Razor Fang"), .itemId = ITEM_RAZOR_FANG, - .price = 2100, + .price = 5000, .holdEffect = HOLD_EFFECT_FLINCH, .holdEffectParam = 10, .description = sRazorFangDesc, @@ -3148,7 +3148,7 @@ const struct Item gItems[] = { .name = _("Prism Scale"), .itemId = ITEM_PRISM_SCALE, - .price = 500, + .price = 2000, .description = sPrismScaleDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3160,7 +3160,7 @@ const struct Item gItems[] = { .name = _("Whipped Dream"), .itemId = ITEM_WHIPPED_DREAM, - .price = 2100, + .price = 2000, .description = sWhippedDreamDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3172,7 +3172,7 @@ const struct Item gItems[] = { .name = _("Sachet"), .itemId = ITEM_SACHET, - .price = 2100, + .price = 2000, .description = sSachetDesc, .pocket = POCKET_ITEMS, .type = 4, @@ -3184,7 +3184,7 @@ const struct Item gItems[] = { .name = _("Light Ball"), .itemId = ITEM_LIGHT_BALL, - .price = 100, + .price = 1000, .holdEffect = HOLD_EFFECT_LIGHT_BALL, .description = sLightBallDesc, .pocket = POCKET_ITEMS, @@ -3197,7 +3197,7 @@ const struct Item gItems[] = { .name = _("Soft Sand"), .itemId = ITEM_SOFT_SAND, - .price = 100, + .price = 1000, .holdEffect = HOLD_EFFECT_GROUND_POWER, .holdEffectParam = 10, .description = sSoftSandDesc, @@ -3211,7 +3211,7 @@ const struct Item gItems[] = { .name = _("Hard Stone"), .itemId = ITEM_HARD_STONE, - .price = 100, + .price = 1000, .holdEffect = HOLD_EFFECT_ROCK_POWER, .holdEffectParam = 10, .description = sHardStoneDesc, @@ -3225,7 +3225,7 @@ const struct Item gItems[] = { .name = _("Miracle Seed"), .itemId = ITEM_MIRACLE_SEED, - .price = 100, + .price = 1000, .holdEffect = HOLD_EFFECT_GRASS_POWER, .holdEffectParam = 10, .description = sMiracleSeedDesc, @@ -3239,7 +3239,7 @@ const struct Item gItems[] = { .name = _("Black Glasses"), .itemId = ITEM_BLACK_GLASSES, - .price = 100, + .price = 1000, .holdEffect = HOLD_EFFECT_DARK_POWER, .holdEffectParam = 10, .description = sBlackGlassesDesc, @@ -3253,7 +3253,7 @@ const struct Item gItems[] = { .name = _("Black Belt"), .itemId = ITEM_BLACK_BELT, - .price = 100, + .price = 1000, .holdEffect = HOLD_EFFECT_FIGHTING_POWER, .holdEffectParam = 10, .description = sBlackBeltDesc, @@ -3267,7 +3267,7 @@ const struct Item gItems[] = { .name = _("Magnet"), .itemId = ITEM_MAGNET, - .price = 100, + .price = 1000, .holdEffect = HOLD_EFFECT_ELECTRIC_POWER, .holdEffectParam = 10, .description = sMagnetDesc, @@ -3281,7 +3281,7 @@ const struct Item gItems[] = { .name = _("Mystic Water"), .itemId = ITEM_MYSTIC_WATER, - .price = 100, + .price = 1000, .holdEffect = HOLD_EFFECT_WATER_POWER, .holdEffectParam = 10, .description = sMysticWaterDesc, @@ -3295,7 +3295,7 @@ const struct Item gItems[] = { .name = _("Sharp Beak"), .itemId = ITEM_SHARP_BEAK, - .price = 100, + .price = 1000, .holdEffect = HOLD_EFFECT_FLYING_POWER, .holdEffectParam = 10, .description = sSharpBeakDesc, @@ -3309,7 +3309,7 @@ const struct Item gItems[] = { .name = _("Poison Barb"), .itemId = ITEM_POISON_BARB, - .price = 100, + .price = 1000, .holdEffect = HOLD_EFFECT_POISON_POWER, .holdEffectParam = 10, .description = sPoisonBarbDesc, @@ -3321,9 +3321,9 @@ const struct Item gItems[] = [ITEM_NEVER_MELT_ICE] = { - .name = _("NeverMeltIce"), + .name = _("Never-MeltIce"), .itemId = ITEM_NEVER_MELT_ICE, - .price = 100, + .price = 1000, .holdEffect = HOLD_EFFECT_ICE_POWER, .holdEffectParam = 10, .description = sNeverMeltIceDesc, @@ -3337,7 +3337,7 @@ const struct Item gItems[] = { .name = _("Spell Tag"), .itemId = ITEM_SPELL_TAG, - .price = 100, + .price = 1000, .holdEffect = HOLD_EFFECT_GHOST_POWER, .holdEffectParam = 10, .description = sSpellTagDesc, @@ -3351,7 +3351,7 @@ const struct Item gItems[] = { .name = _("Twisted Spoon"), .itemId = ITEM_TWISTED_SPOON, - .price = 100, + .price = 1000, .holdEffect = HOLD_EFFECT_PSYCHIC_POWER, .holdEffectParam = 10, .description = sTwistedSpoonDesc, @@ -3365,7 +3365,7 @@ const struct Item gItems[] = { .name = _("Charcoal"), .itemId = ITEM_CHARCOAL, - .price = 9800, + .price = 1000, .holdEffect = HOLD_EFFECT_FIRE_POWER, .holdEffectParam = 10, .description = sCharcoalDesc, @@ -3379,7 +3379,7 @@ const struct Item gItems[] = { .name = _("Dragon Fang"), .itemId = ITEM_DRAGON_FANG, - .price = 100, + .price = 1000, .holdEffect = HOLD_EFFECT_DRAGON_POWER, .holdEffectParam = 10, .description = sDragonFangDesc, @@ -3393,7 +3393,7 @@ const struct Item gItems[] = { .name = _("Silk Scarf"), .itemId = ITEM_SILK_SCARF, - .price = 100, + .price = 1000, .holdEffect = HOLD_EFFECT_NORMAL_POWER, .holdEffectParam = 10, .description = sSilkScarfDesc, @@ -3407,7 +3407,7 @@ const struct Item gItems[] = { .name = _("Upgrade"), .itemId = ITEM_UP_GRADE, - .price = 2100, + .price = 2000, .holdEffect = HOLD_EFFECT_UP_GRADE, .description = sUpGradeDesc, .pocket = POCKET_ITEMS, @@ -3420,7 +3420,7 @@ const struct Item gItems[] = { .name = _("Shell Bell"), .itemId = ITEM_SHELL_BELL, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_SHELL_BELL, .holdEffectParam = 8, .description = sShellBellDesc, @@ -3518,7 +3518,7 @@ const struct Item gItems[] = { .name = _("Sea Incense"), .itemId = ITEM_SEA_INCENSE, - .price = 9600, + .price = 2000, .holdEffect = HOLD_EFFECT_WATER_POWER, .holdEffectParam = 20, .description = sSeaIncenseDesc, @@ -3532,7 +3532,7 @@ const struct Item gItems[] = { .name = _("Lax Incense"), .itemId = ITEM_LAX_INCENSE, - .price = 9600, + .price = 5000, .holdEffect = HOLD_EFFECT_EVASION_UP, .holdEffectParam = 10, .description = sLaxIncenseDesc, @@ -3546,7 +3546,7 @@ const struct Item gItems[] = { .name = _("Odd Incense"), .itemId = ITEM_ODD_INCENSE, - .price = 9600, + .price = 2000, .holdEffect = HOLD_EFFECT_PSYCHIC_POWER, .holdEffectParam = 20, .description = sOddIncenseDesc, @@ -3560,7 +3560,7 @@ const struct Item gItems[] = { .name = _("Rock Incense"), .itemId = ITEM_ROCK_INCENSE, - .price = 9600, + .price = 2000, .holdEffect = HOLD_EFFECT_ROCK_POWER, .holdEffectParam = 20, .description = sRockIncenseDesc, @@ -3574,7 +3574,7 @@ const struct Item gItems[] = { .name = _("Full Incense"), .itemId = ITEM_FULL_INCENSE, - .price = 9600, + .price = 5000, .holdEffect = HOLD_EFFECT_LAGGING_TAIL, .holdEffectParam = 5, .description = sFullIncenseDesc, @@ -3588,7 +3588,7 @@ const struct Item gItems[] = { .name = _("Wave Incense"), .itemId = ITEM_WAVE_INCENSE, - .price = 9600, + .price = 2000, .holdEffect = HOLD_EFFECT_WATER_POWER, .holdEffectParam = 20, .description = sWaveIncenseDesc, @@ -3602,7 +3602,7 @@ const struct Item gItems[] = { .name = _("Rose Incense"), .itemId = ITEM_ROSE_INCENSE, - .price = 9600, + .price = 2000, .holdEffect = HOLD_EFFECT_GRASS_POWER, .holdEffectParam = 20, .description = sRoseIncenseDesc, @@ -3616,7 +3616,7 @@ const struct Item gItems[] = { .name = _("Luck Incense"), .itemId = ITEM_LUCK_INCENSE, - .price = 9600, + .price = 11000, .holdEffect = HOLD_EFFECT_DOUBLE_PRIZE, .holdEffectParam = 10, .description = sLuckIncenseDesc, @@ -3630,7 +3630,7 @@ const struct Item gItems[] = { .name = _("Pure Incense"), .itemId = ITEM_PURE_INCENSE, - .price = 9600, + .price = 6000, .holdEffect = HOLD_EFFECT_REPEL, .description = sPureIncenseDesc, .pocket = POCKET_ITEMS, @@ -4890,7 +4890,7 @@ const struct Item gItems[] = .itemId = ITEM_OLD_AMBER, .description = sOldAmberDesc, #if I_KEY_FOSSILS >= GEN_4 - .price = 1000, + .price = 10000, .importance = 0, .pocket = POCKET_ITEMS, #else @@ -4933,7 +4933,7 @@ const struct Item gItems[] = { .name = _("Armor Fossil"), .itemId = ITEM_ARMOR_FOSSIL, - .price = 1000, + .price = 7000, .description = sArmorFossilDesc, .importance = 0, .pocket = POCKET_ITEMS, @@ -4946,7 +4946,7 @@ const struct Item gItems[] = { .name = _("Skull Fossil"), .itemId = ITEM_SKULL_FOSSIL, - .price = 1000, + .price = 7000, .description = sSkullFossilDesc, .importance = 0, .pocket = POCKET_ITEMS, @@ -4961,7 +4961,7 @@ const struct Item gItems[] = .itemId = ITEM_HELIX_FOSSIL, .description = sHelixFossilDesc, #if I_KEY_FOSSILS >= GEN_4 - .price = 1000, + .price = 7000, .importance = 0, .pocket = POCKET_ITEMS, #else @@ -4980,7 +4980,7 @@ const struct Item gItems[] = .itemId = ITEM_DOME_FOSSIL, .description = sDomeFossilDesc, #if I_KEY_FOSSILS >= GEN_4 - .price = 1000, + .price = 7000, .importance = 0, .pocket = POCKET_ITEMS, #else @@ -4999,7 +4999,7 @@ const struct Item gItems[] = .itemId = ITEM_ROOT_FOSSIL, .description = sRootFossilDesc, #if I_KEY_FOSSILS >= GEN_4 - .price = 1000, + .price = 7000, .importance = 0, .pocket = POCKET_ITEMS, #else @@ -5018,7 +5018,7 @@ const struct Item gItems[] = .itemId = ITEM_CLAW_FOSSIL, .description = sClawFossilDesc, #if I_KEY_FOSSILS >= GEN_4 - .price = 1000, + .price = 7000, .importance = 0, .pocket = POCKET_ITEMS, #else @@ -5035,7 +5035,7 @@ const struct Item gItems[] = { .name = _("Cover Fossil"), .itemId = ITEM_COVER_FOSSIL, - .price = 1000, + .price = 7000, .description = sCoverFossilDesc, .importance = 0, .pocket = POCKET_ITEMS, @@ -5048,7 +5048,7 @@ const struct Item gItems[] = { .name = _("Plume Fossil"), .itemId = ITEM_PLUME_FOSSIL, - .price = 1000, + .price = 7000, .description = sPlumeFossilDesc, .importance = 0, .pocket = POCKET_ITEMS, @@ -5061,7 +5061,7 @@ const struct Item gItems[] = { .name = _("Jaw Fossil"), .itemId = ITEM_JAW_FOSSIL, - .price = 1000, + .price = 7000, .description = sJawFossilDesc, .importance = 0, .pocket = POCKET_ITEMS, @@ -5074,7 +5074,7 @@ const struct Item gItems[] = { .name = _("Sail Fossil"), .itemId = ITEM_SAIL_FOSSIL, - .price = 1000, + .price = 7000, .description = sSailFossilDesc, .importance = 0, .pocket = POCKET_ITEMS, @@ -5712,7 +5712,7 @@ const struct Item gItems[] = { .name = _("Adamant Orb"), .itemId = ITEM_ADAMANT_ORB, - .price = 10000, + .price = 0, .holdEffect = HOLD_EFFECT_ADAMANT_ORB, .description = sAdamantOrbDesc, .pocket = POCKET_ITEMS, @@ -5725,7 +5725,7 @@ const struct Item gItems[] = { .name = _("Lustrous Orb"), .itemId = ITEM_LUSTROUS_ORB, - .price = 10000, + .price = 0, .holdEffect = HOLD_EFFECT_LUSTROUS_ORB, .description = sLustrousOrbDesc, .pocket = POCKET_ITEMS, @@ -5738,7 +5738,7 @@ const struct Item gItems[] = { .name = _("Griseous Orb"), .itemId = ITEM_GRISEOUS_ORB, - .price = 10000, + .price = 0, .holdEffect = HOLD_EFFECT_GRISEOUS_ORB, .description = sGriseousOrbDesc, .pocket = POCKET_ITEMS, @@ -5804,7 +5804,7 @@ const struct Item gItems[] = [ITEM_ELECTRIC_MEMORY] = { - .name = _("Elec. Memory"), + .name = _("ElectrcMemory"), .itemId = ITEM_ELECTRIC_MEMORY, .price = 1000, .holdEffect = HOLD_EFFECT_MEMORY, @@ -5832,7 +5832,7 @@ const struct Item gItems[] = [ITEM_FIGHTING_MEMORY] = { - .name = _("Fight Memory"), + .name = _("FightngMemory"), .itemId = ITEM_FIGHTING_MEMORY, .price = 1000, .holdEffect = HOLD_EFFECT_MEMORY, @@ -6226,7 +6226,7 @@ const struct Item gItems[] = { .name = _("Eviolite"), .itemId = ITEM_EVIOLITE, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_EVIOLITE, .holdEffectParam = 50, .description = sEvioliteDesc, @@ -6240,7 +6240,7 @@ const struct Item gItems[] = { .name = _("Float Stone"), .itemId = ITEM_FLOAT_STONE, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_FLOAT_STONE, .description = sFloatStoneDesc, .pocket = POCKET_ITEMS, @@ -6253,7 +6253,7 @@ const struct Item gItems[] = { .name = _("Rocky Helmet"), .itemId = ITEM_ROCKY_HELMET, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_ROCKY_HELMET, .holdEffectParam = 0, .description = sRockyHelmetDesc, @@ -6267,7 +6267,7 @@ const struct Item gItems[] = { .name = _("Air Balloon"), .itemId = ITEM_AIR_BALLOON, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_AIR_BALLOON, .holdEffectParam = 0, .description = sAirBalloonDesc, @@ -6281,7 +6281,7 @@ const struct Item gItems[] = { .name = _("Red Card"), .itemId = ITEM_RED_CARD, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_RED_CARD, .holdEffectParam = 0, .description = sRedCardDesc, @@ -6295,7 +6295,7 @@ const struct Item gItems[] = { .name = _("Ring Target"), .itemId = ITEM_RING_TARGET, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_RING_TARGET, .holdEffectParam = 0, .description = sRingTargetDesc, @@ -6309,7 +6309,7 @@ const struct Item gItems[] = { .name = _("Binding Band"), .itemId = ITEM_BINDING_BAND, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_BINDING_BAND, .description = sBindingBandDesc, .pocket = POCKET_ITEMS, @@ -6322,7 +6322,7 @@ const struct Item gItems[] = { .name = _("Eject Button"), .itemId = ITEM_EJECT_BUTTON, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_EJECT_BUTTON, .holdEffectParam = 0, .description = sEjectButtonDesc, @@ -6336,7 +6336,7 @@ const struct Item gItems[] = { .name = _("Absorb Bulb"), .itemId = ITEM_ABSORB_BULB, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_ABSORB_BULB, .holdEffectParam = 0, .description = sAbsorbBulbDesc, @@ -6350,7 +6350,7 @@ const struct Item gItems[] = { .name = _("Cell Battery"), .itemId = ITEM_CELL_BATTERY, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_CELL_BATTERY, .holdEffectParam = 0, .description = sCellBatteryDesc, @@ -6364,7 +6364,7 @@ const struct Item gItems[] = { .name = _("Luminous Moss"), .itemId = ITEM_LUMINOUS_MOSS, - .price = 1000, + .price = 4000, .holdEffect = HOLD_EFFECT_LUMINOUS_MOSS, .holdEffectParam = 0, .description = sLuminousMossDesc, @@ -6378,7 +6378,7 @@ const struct Item gItems[] = { .name = _("Snowball"), .itemId = ITEM_SNOWBALL, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_SNOWBALL, .holdEffectParam = 0, .description = sSnowballDesc, @@ -6390,7 +6390,7 @@ const struct Item gItems[] = [ITEM_WEAKNESS_POLICY] = { - .name = _("Weak. Policy"), + .name = _("WeaknssPolicy"), .itemId = ITEM_WEAKNESS_POLICY, .price = 1000, .holdEffect = HOLD_EFFECT_WEAKNESS_POLICY, @@ -6406,7 +6406,7 @@ const struct Item gItems[] = { .name = _("Douse Drive"), .itemId = ITEM_DOUSE_DRIVE, - .price = 1000, + .price = 0, .holdEffect = HOLD_EFFECT_DRIVE, .description = sDouseDriveDesc, .pocket = POCKET_ITEMS, @@ -6419,7 +6419,7 @@ const struct Item gItems[] = { .name = _("Shock Drive"), .itemId = ITEM_SHOCK_DRIVE, - .price = 1000, + .price = 0, .holdEffect = HOLD_EFFECT_DRIVE, .description = sShockDriveDesc, .pocket = POCKET_ITEMS, @@ -6432,7 +6432,7 @@ const struct Item gItems[] = { .name = _("Burn Drive"), .itemId = ITEM_BURN_DRIVE, - .price = 1000, + .price = 0, .holdEffect = HOLD_EFFECT_DRIVE, .description = sBurnDriveDesc, .pocket = POCKET_ITEMS, @@ -6445,7 +6445,7 @@ const struct Item gItems[] = { .name = _("Chill Drive"), .itemId = ITEM_CHILL_DRIVE, - .price = 1000, + .price = 0, .holdEffect = HOLD_EFFECT_DRIVE, .description = sChillDriveDesc, .pocket = POCKET_ITEMS, @@ -6458,7 +6458,7 @@ const struct Item gItems[] = { .name = _("Fire Gem"), .itemId = ITEM_FIRE_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sFireGemDesc, @@ -6472,7 +6472,7 @@ const struct Item gItems[] = { .name = _("Water Gem"), .itemId = ITEM_WATER_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sWaterGemDesc, @@ -6486,7 +6486,7 @@ const struct Item gItems[] = { .name = _("Electric Gem"), .itemId = ITEM_ELECTRIC_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sElectricGemDesc, @@ -6500,7 +6500,7 @@ const struct Item gItems[] = { .name = _("Grass Gem"), .itemId = ITEM_GRASS_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sGrassGemDesc, @@ -6514,7 +6514,7 @@ const struct Item gItems[] = { .name = _("Ice Gem"), .itemId = ITEM_ICE_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sIceGemDesc, @@ -6528,7 +6528,7 @@ const struct Item gItems[] = { .name = _("Fighting Gem"), .itemId = ITEM_FIGHTING_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sFightingGemDesc, @@ -6542,7 +6542,7 @@ const struct Item gItems[] = { .name = _("Poison Gem"), .itemId = ITEM_POISON_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sPoisonGemDesc, @@ -6556,7 +6556,7 @@ const struct Item gItems[] = { .name = _("Ground Gem"), .itemId = ITEM_GROUND_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sGroundGemDesc, @@ -6570,7 +6570,7 @@ const struct Item gItems[] = { .name = _("Flying Gem"), .itemId = ITEM_FLYING_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sFlyingGemDesc, @@ -6584,7 +6584,7 @@ const struct Item gItems[] = { .name = _("Psychic Gem"), .itemId = ITEM_PSYCHIC_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sPsychicGemDesc, @@ -6598,7 +6598,7 @@ const struct Item gItems[] = { .name = _("Bug Gem"), .itemId = ITEM_BUG_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sBugGemDesc, @@ -6612,7 +6612,7 @@ const struct Item gItems[] = { .name = _("Rock Gem"), .itemId = ITEM_ROCK_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sRockGemDesc, @@ -6626,7 +6626,7 @@ const struct Item gItems[] = { .name = _("Ghost Gem"), .itemId = ITEM_GHOST_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sGhostGemDesc, @@ -6640,7 +6640,7 @@ const struct Item gItems[] = { .name = _("Dragon Gem"), .itemId = ITEM_DRAGON_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sDragonGemDesc, @@ -6654,7 +6654,7 @@ const struct Item gItems[] = { .name = _("Dark Gem"), .itemId = ITEM_DARK_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sDarkGemDesc, @@ -6668,7 +6668,7 @@ const struct Item gItems[] = { .name = _("Steel Gem"), .itemId = ITEM_STEEL_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sSteelGemDesc, @@ -6682,7 +6682,7 @@ const struct Item gItems[] = { .name = _("Normal Gem"), .itemId = ITEM_NORMAL_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sNormalGemDesc, @@ -6696,7 +6696,7 @@ const struct Item gItems[] = { .name = _("Fairy Gem"), .itemId = ITEM_FAIRY_GEM, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = 30, .description = sFairyGemDesc, @@ -7373,7 +7373,7 @@ const struct Item gItems[] = [ITEM_PROTECTIVE_PADS] = { - .name = _("Protect Pads"), // Shortened name from Protective Pads + .name = _("ProtectvePads"), .itemId = ITEM_PROTECTIVE_PADS, .price = 4000, .holdEffect = HOLD_EFFECT_PROTECTIVE_PADS, @@ -7386,7 +7386,7 @@ const struct Item gItems[] = [ITEM_TERRAIN_EXTENDER] = { - .name = _("Terrain Exte."), + .name = _("TerainExtendr"), .itemId = ITEM_TERRAIN_EXTENDER, .price = 4000, .holdEffect = HOLD_EFFECT_TERRAIN_EXTENDER, @@ -7478,7 +7478,7 @@ const struct Item gItems[] = { .name = _("HealthFeather"), .itemId = ITEM_HEALTH_WING, - .price = 3000, + .price = 300, .holdEffect = 0, .holdEffectParam = 4, .description = sHealthWingDesc, @@ -7492,7 +7492,7 @@ const struct Item gItems[] = { .name = _("MuscleFeather"), .itemId = ITEM_MUSCLE_WING, - .price = 3000, + .price = 300, .holdEffect = 0, .holdEffectParam = 4, .description = sMuscleWingDesc, @@ -7506,7 +7506,7 @@ const struct Item gItems[] = { .name = _("ResistFeather"), .itemId = ITEM_RESIST_WING, - .price = 3000, + .price = 300, .holdEffect = 0, .holdEffectParam = 4, .description = sResistWingDesc, @@ -7520,7 +7520,7 @@ const struct Item gItems[] = { .name = _("GeniusFeather"), .itemId = ITEM_GENIUS_WING, - .price = 3000, + .price = 300, .holdEffect = 0, .holdEffectParam = 4, .description = sGeniusWingDesc, @@ -7534,7 +7534,7 @@ const struct Item gItems[] = { .name = _("CleverFeather"), .itemId = ITEM_CLEVER_WING, - .price = 3000, + .price = 300, .holdEffect = 0, .holdEffectParam = 4, .description = sCleverWingDesc, @@ -7548,7 +7548,7 @@ const struct Item gItems[] = { .name = _("Swift Feather"), .itemId = ITEM_SWIFT_WING, - .price = 3000, + .price = 300, .holdEffect = 0, .holdEffectParam = 4, .description = sSwiftWingDesc, @@ -7562,7 +7562,7 @@ const struct Item gItems[] = { .name = _("PrettyFeather"), .itemId = ITEM_PRETTY_WING, - .price = 200, + .price = 1000, .description = sPrettyWingDesc, .pocket = POCKET_ITEMS, .type = 4, From 9456382a328cf6b1e9257df2734474bb1d2e88c7 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Thu, 21 Jan 2021 19:05:01 -0500 Subject: [PATCH 8/9] yellow shmellow --- src/data/items.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index 0d8c4687f..eb573a73d 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1459,7 +1459,7 @@ const struct Item gItems[] = [ITEM_YELLOW_APRICORN] = { - .name = _("YelowApricorn"), + .name = _("YellwApricorn"), .itemId = ITEM_YELLOW_APRICORN, .price = 200, .description = sYellowApricornDesc, From 44a09836248b74df1a84d5a19f2b8b0048e1737c Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Fri, 22 Jan 2021 07:43:48 -0500 Subject: [PATCH 9/9] missed some --- src/data/items.h | 64 ++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index eb573a73d..f1d36f5a7 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -3643,7 +3643,7 @@ const struct Item gItems[] = { .name = _("Lucky Punch"), .itemId = ITEM_LUCKY_PUNCH, - .price = 10, + .price = 1000, .holdEffect = HOLD_EFFECT_LUCKY_PUNCH, .description = sLuckyPunchDesc, .pocket = POCKET_ITEMS, @@ -3656,7 +3656,7 @@ const struct Item gItems[] = { .name = _("Metal Powder"), .itemId = ITEM_METAL_POWDER, - .price = 10, + .price = 1000, .holdEffect = HOLD_EFFECT_METAL_POWDER, .description = sMetalPowderDesc, .pocket = POCKET_ITEMS, @@ -3669,7 +3669,7 @@ const struct Item gItems[] = { .name = _("Thick Club"), .itemId = ITEM_THICK_CLUB, - .price = 500, + .price = 1000, .holdEffect = HOLD_EFFECT_THICK_CLUB, .description = sThickClubDesc, .pocket = POCKET_ITEMS, @@ -3682,7 +3682,7 @@ const struct Item gItems[] = { .name = _("Leek"), .itemId = ITEM_STICK, - .price = 200, + .price = 1000, .holdEffect = HOLD_EFFECT_STICK, .description = sStickDesc, .pocket = POCKET_ITEMS, @@ -5342,7 +5342,7 @@ const struct Item gItems[] = { .name = _("Wide Lens"), .itemId = ITEM_WIDE_LENS, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_WIDE_LENS, .holdEffectParam = 10, .description = sWideLensDesc, @@ -5356,7 +5356,7 @@ const struct Item gItems[] = { .name = _("Muscle Band"), .itemId = ITEM_MUSCLE_BAND, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_MUSCLE_BAND, .holdEffectParam = 10, .description = sMuscleBandDesc, @@ -5370,7 +5370,7 @@ const struct Item gItems[] = { .name = _("Wise Glasses"), .itemId = ITEM_WISE_GLASSES, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_WISE_GLASSES, .holdEffectParam = 10, .description = sWiseGlassesDesc, @@ -5384,7 +5384,7 @@ const struct Item gItems[] = { .name = _("Expert Belt"), .itemId = ITEM_EXPERT_BELT, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_EXPERT_BELT, .holdEffectParam = 20, .description = sExpertBeltDesc, @@ -5398,7 +5398,7 @@ const struct Item gItems[] = { .name = _("Light Clay"), .itemId = ITEM_LIGHT_CLAY, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_LIGHT_CLAY, .description = sLightClayDesc, .pocket = POCKET_ITEMS, @@ -5411,7 +5411,7 @@ const struct Item gItems[] = { .name = _("Life Orb"), .itemId = ITEM_LIFE_ORB, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_LIFE_ORB, .description = sLifeOrbDesc, .pocket = POCKET_ITEMS, @@ -5424,7 +5424,7 @@ const struct Item gItems[] = { .name = _("Power Herb"), .itemId = ITEM_POWER_HERB, - .price = 100, + .price = 4000, .holdEffect = HOLD_EFFECT_POWER_HERB, .description = sPowerHerbDesc, .pocket = POCKET_ITEMS, @@ -5437,7 +5437,7 @@ const struct Item gItems[] = { .name = _("Toxic Orb"), .itemId = ITEM_TOXIC_ORB, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_TOXIC_ORB, .description = sToxicOrbDesc, .pocket = POCKET_ITEMS, @@ -5450,7 +5450,7 @@ const struct Item gItems[] = { .name = _("Flame Orb"), .itemId = ITEM_FLAME_ORB, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_FLAME_ORB, .description = sFlameOrbDesc, .pocket = POCKET_ITEMS, @@ -5463,7 +5463,7 @@ const struct Item gItems[] = { .name = _("Quick Powder"), .itemId = ITEM_QUICK_POWDER, - .price = 10, + .price = 1000, .holdEffect = HOLD_EFFECT_QUICK_POWDER, .description = sQuickPowderDesc, .pocket = POCKET_ITEMS, @@ -5476,7 +5476,7 @@ const struct Item gItems[] = { .name = _("Focus Sash"), .itemId = ITEM_FOCUS_SASH, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_FOCUS_SASH, .description = sFocusSashDesc, .pocket = POCKET_ITEMS, @@ -5489,7 +5489,7 @@ const struct Item gItems[] = { .name = _("Zoom Lens"), .itemId = ITEM_ZOOM_LENS, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_ZOOM_LENS, .holdEffectParam = 20, .description = sZoomLensDesc, @@ -5503,7 +5503,7 @@ const struct Item gItems[] = { .name = _("Metronome"), .itemId = ITEM_METRONOME, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_METRONOME, .holdEffectParam = 20, .description = sMetronomeDesc, @@ -5517,7 +5517,7 @@ const struct Item gItems[] = { .name = _("Iron Ball"), .itemId = ITEM_IRON_BALL, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_IRON_BALL, .description = sIronBallDesc, .pocket = POCKET_ITEMS, @@ -5530,7 +5530,7 @@ const struct Item gItems[] = { .name = _("Lagging Tail"), .itemId = ITEM_LAGGING_TAIL, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_LAGGING_TAIL, .description = sLaggingTailDesc, .pocket = POCKET_ITEMS, @@ -5543,7 +5543,7 @@ const struct Item gItems[] = { .name = _("Destiny Knot"), .itemId = ITEM_DESTINY_KNOT, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_DESTINY_KNOT, .description = sDestinyKnotDesc, .pocket = POCKET_ITEMS, @@ -5556,7 +5556,7 @@ const struct Item gItems[] = { .name = _("Black Sludge"), .itemId = ITEM_BLACK_SLUDGE, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_BLACK_SLUDGE, .description = sBlackSludgeDesc, .pocket = POCKET_ITEMS, @@ -5569,7 +5569,7 @@ const struct Item gItems[] = { .name = _("Icy Rock"), .itemId = ITEM_ICY_ROCK, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_ICY_ROCK, .description = sIcyRockDesc, .pocket = POCKET_ITEMS, @@ -5582,7 +5582,7 @@ const struct Item gItems[] = { .name = _("Smooth Rock"), .itemId = ITEM_SMOOTH_ROCK, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_SMOOTH_ROCK, .description = sSmoothRockDesc, .pocket = POCKET_ITEMS, @@ -5595,7 +5595,7 @@ const struct Item gItems[] = { .name = _("Heat Rock"), .itemId = ITEM_HEAT_ROCK, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_HEAT_ROCK, .description = sHeatRockDesc, .pocket = POCKET_ITEMS, @@ -5608,7 +5608,7 @@ const struct Item gItems[] = { .name = _("Damp Rock"), .itemId = ITEM_DAMP_ROCK, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_DAMP_ROCK, .description = sDampRockDesc, .pocket = POCKET_ITEMS, @@ -5621,7 +5621,7 @@ const struct Item gItems[] = { .name = _("Grip Claw"), .itemId = ITEM_GRIP_CLAW, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_GRIP_CLAW, .description = sGripClawDesc, .pocket = POCKET_ITEMS, @@ -5634,7 +5634,7 @@ const struct Item gItems[] = { .name = _("Choice Scarf"), .itemId = ITEM_CHOICE_SCARF, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_CHOICE_SCARF, .description = sChoiceScarfDesc, .pocket = POCKET_ITEMS, @@ -5647,7 +5647,7 @@ const struct Item gItems[] = { .name = _("Sticky Barb"), .itemId = ITEM_STICKY_BARB, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_STICKY_BARB, .description = sStickyBarbDesc, .pocket = POCKET_ITEMS, @@ -5660,7 +5660,7 @@ const struct Item gItems[] = { .name = _("Shed Shell"), .itemId = ITEM_SHED_SHELL, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_SHED_SHELL, .description = sShedShellDesc, .pocket = POCKET_ITEMS, @@ -5673,7 +5673,7 @@ const struct Item gItems[] = { .name = _("Big Root"), .itemId = ITEM_BIG_ROOT, - .price = 100, + .price = 4000, .holdEffect = HOLD_EFFECT_BIG_ROOT, .holdEffectParam = 30, .description = sBigRootDesc, @@ -5687,7 +5687,7 @@ const struct Item gItems[] = { .name = _("Choice Specs"), .itemId = ITEM_CHOICE_SPECS, - .price = 200, + .price = 4000, .holdEffect = HOLD_EFFECT_CHOICE_SPECS, .description = sChoiceSpecsDesc, .pocket = POCKET_ITEMS, @@ -6738,7 +6738,7 @@ const struct Item gItems[] = { .name = _("SafetyGoggles"), .itemId = ITEM_SAFETY_GOGGLES, - .price = 1000, + .price = 4000, .holdEffect = HOLD_EFFECT_SAFETY_GOOGLES, .description = sSafetyGogglesDesc, .pocket = POCKET_ITEMS,