diff --git a/src/data/items.h b/src/data/items.h index e39d84166d..6d69de9c89 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -552,7 +552,7 @@ const struct Item gItemsInfo[] = [ITEM_SPORT_BALL] = { .name = ITEM_NAME("Sport Ball"), - .price = (I_PRICE < GEN_3 || I_PRICE >= GEN_9) ? 0 : 300, + .price = (I_PRICE <= GEN_3 || I_PRICE >= GEN_9) ? 0 : 300, .description = COMPOUND_STRING( "A special Ball\n" "used in the Bug-\n" @@ -833,7 +833,6 @@ const struct Item gItemsInfo[] = [ITEM_MOOMOO_MILK] = { .name = ITEM_NAME("Moomoo Milk"), - .pluralName = ITEM_PLURAL_NAME("Moomoo Milk"), .price = (I_PRICE >= GEN_7) ? 600 : 500, .holdEffectParam = 100, .description = COMPOUND_STRING( @@ -854,7 +853,6 @@ const struct Item gItemsInfo[] = [ITEM_ENERGY_POWDER] = { .name = ITEM_NAME("Energy Powder"), - .pluralName = ITEM_PLURAL_NAME("Energy Powder"), .price = 500, .description = COMPOUND_STRING( "A bitter powder\n" @@ -901,7 +899,6 @@ const struct Item gItemsInfo[] = [ITEM_HEAL_POWDER] = { .name = ITEM_NAME("Heal Powder"), - .pluralName = ITEM_PLURAL_NAME("Heal Powder"), .price = (I_PRICE >= GEN_7) ? 300 : 450, .description = COMPOUND_STRING( "A bitter powder\n" @@ -976,7 +973,13 @@ const struct Item gItemsInfo[] = [ITEM_BURN_HEAL] = { .name = ITEM_NAME("Burn Heal"), - .price = (I_PRICE == GEN_7) ? 300 : ((I_PRICE <= GEN_7) ? 250 : 200), + #if I_PRICE >= GEN_8 + .price = 200, + #elif I_PRICE == GEN_7 + .price = 300, + #else + .price = 250, + #endif .description = COMPOUND_STRING( "Heals Pokémon\n" "of a burn."), @@ -994,7 +997,13 @@ const struct Item gItemsInfo[] = [ITEM_ICE_HEAL] = { .name = ITEM_NAME("Ice Heal"), - .price = (I_PRICE == GEN_7) ? 100 : ((I_PRICE <= GEN_7) ? 250 : 200), + #if I_PRICE >= GEN_8 + .price = 200, + #elif I_PRICE == GEN_7 + .price = 100, + #else + .price = 250, + #endif .description = COMPOUND_STRING( "Defrosts a frozen\n" "Pokémon."), @@ -1012,7 +1021,13 @@ const struct Item gItemsInfo[] = [ITEM_AWAKENING] = { .name = ITEM_NAME("Awakening"), - .price = (I_PRICE >= GEN_2 && I_PRICE <= GEN_6) ? 250 : ((I_PRICE == GEN_7) ? 100 : 200), + #if (I_PRICE >= GEN_8 || I_PRICE == GEN_1) + .price = 200, + #elif I_PRICE == GEN_7 + .price = 100, + #else + .price = 250, + #endif .description = COMPOUND_STRING( "Awakens a sleeping\n" "Pokémon."), @@ -1125,7 +1140,6 @@ const struct Item gItemsInfo[] = [ITEM_BERRY_JUICE] = { .name = ITEM_NAME("Berry Juice"), - .pluralName = ITEM_PLURAL_NAME("Berry Juice"), .price = 100, .holdEffect = HOLD_EFFECT_RESTORE_HP, .holdEffectParam = 20, @@ -1448,7 +1462,13 @@ const struct Item gItemsInfo[] = [ITEM_PP_UP] = { .name = ITEM_NAME("PP Up"), - .price = (I_PRICE == GEN_1) ? 1 : ((I_PRICE >= GEN_7) ? 10000 : 9800), + #if I_PRICE >= GEN_7 + .price = 10000, + #elif I_PRICE >= GEN_2 + .price = 9800, + #else + .price = 1, + #endif .description = COMPOUND_STRING( "Raises the maximum\n" "PP of a selected\n" @@ -1579,7 +1599,13 @@ const struct Item gItemsInfo[] = [ITEM_ABILITY_CAPSULE] = { .name = ITEM_NAME("Ability Capsule"), - .price = (I_PRICE < GEN_7) ? 1000 : ((I_PRICE < GEN_9) ? 10000 : 100000), + #if I_PRICE >= GEN_9 + .price = 100000, + #elif I_PRICE >= GEN_7 + .price = 10000, + #else + .price = 1000, + #endif .holdEffectParam = 0, .description = COMPOUND_STRING( "Switches a Poké-\n" @@ -2567,7 +2593,13 @@ const struct Item gItemsInfo[] = [ITEM_POKE_DOLL] = { .name = ITEM_NAME("Poké Doll"), - .price = (I_PRICE < GEN_7) ? 1000 : ((I_PRICE == GEN_7) ? 100 : 300), + #if I_PRICE >= GEN_8 + .price = 300, + #elif I_PRICE == GEN_7 + .price = 100, + #else + .price = 1000, + #endif .description = sPokeDollDesc, .pocket = POCKET_ITEMS, .sortType = ITEM_TYPE_BATTLE_ITEM, @@ -2684,7 +2716,13 @@ const struct Item gItemsInfo[] = [ITEM_BIG_NUGGET] = { .name = ITEM_NAME("Big Nugget"), - .price = (I_PRICE >= GEN_7) ? (40000 * TREASURE_FACTOR) : 20000, + #if I_PRICE >= GEN_7 + .price = 40000 * TREASURE_FACTOR, + #elif I_PRICE == GEN_6 + .price = 20000, + #else + .price = 0, + #endif .description = COMPOUND_STRING( "A big nugget made\n" "of gold, sellable\n" @@ -2693,7 +2731,7 @@ const struct Item gItemsInfo[] = .sortType = ITEM_TYPE_SELLABLE, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .flingPower = 130, + .flingPower = B_UPDATED_MOVE_DATA >= GEN_8 ? 130 : 80, .iconPic = gItemIcon_BigNugget, .iconPalette = gItemIconPalette_BigNugget, }, @@ -2732,7 +2770,13 @@ const struct Item gItemsInfo[] = [ITEM_BALM_MUSHROOM] = { .name = ITEM_NAME("Balm Mushroom"), - .price = (I_PRICE >= GEN_7) ? 15000 * TREASURE_FACTOR: 12500, + #if I_PRICE >= GEN_7 + .price = 15000 * TREASURE_FACTOR, + #elif I_PRICE == GEN_6 + .price = 12500, + #else + .price = 0, + #endif .description = sBigMushroomDesc, .pocket = POCKET_ITEMS, .sortType = ITEM_TYPE_SELLABLE, @@ -2780,7 +2824,15 @@ const struct Item gItemsInfo[] = [ITEM_PEARL_STRING] = { .name = ITEM_NAME("Pearl String"), - .price = (I_PRICE >= GEN_8) ? 15000 * TREASURE_FACTOR: ((I_PRICE == GEN_7) ? 30000 : 15000), + #if I_PRICE >= GEN_8 + .price = 20000 * TREASURE_FACTOR, + #elif I_PRICE == GEN_7 + .price = 30000, + #elif I_PRICE == GEN_6 + .price = 15000, + #else + .price = 0, + #endif .description = COMPOUND_STRING( "Very large pearls\n" "that would sell at a\n" @@ -2797,7 +2849,6 @@ const struct Item gItemsInfo[] = [ITEM_STARDUST] = { .name = ITEM_NAME("Stardust"), - .pluralName = ITEM_PLURAL_NAME("Stardust"), .price = (I_PRICE >= GEN_7) ? 3000 * TREASURE_FACTOR: 2000, .description = COMPOUND_STRING( "Beautiful red sand.\n" @@ -2832,7 +2883,15 @@ const struct Item gItemsInfo[] = [ITEM_COMET_SHARD] = { .name = ITEM_NAME("Comet Shard"), - .price = (I_PRICE <= GEN_5) ? 0 : ((I_PRICE == GEN_6) ? 30000 : ((I_PRICE == GEN_7) ? 60000 : 25000 * TREASURE_FACTOR)), + #if I_PRICE >= GEN_8 + .price = 25000 * TREASURE_FACTOR, + #elif I_PRICE == GEN_7 + .price = 60000, + #elif I_PRICE == GEN_6 + .price = 30000, + #else + .price = 0, + #endif .description = COMPOUND_STRING( "A comet's shard.\n" "It would sell for a\n" @@ -2849,7 +2908,6 @@ const struct Item gItemsInfo[] = [ITEM_SHOAL_SALT] = { .name = ITEM_NAME("Shoal Salt"), - .pluralName = ITEM_PLURAL_NAME("Shoal Salt"), .price = 20, .description = COMPOUND_STRING( "Salt obtained from\n" @@ -2958,7 +3016,13 @@ const struct Item gItemsInfo[] = { .name = ITEM_NAME("Honey"), .pluralName = ITEM_PLURAL_NAME("Honey"), - .price = (I_PRICE < GEN_5) ? 100 : ((I_PRICE < GEN_8) ? 300 : 900), + #if I_PRICE >= GEN_8 + .price = 900, + #elif I_PRICE == GEN_7 + .price = 300, + #else + .price = 100, + #endif .description = COMPOUND_STRING( "Sweet honey that\n" "attracts wild\n" @@ -3060,7 +3124,7 @@ const struct Item gItemsInfo[] = [ITEM_RELIC_GOLD] = { .name = ITEM_NAME("Relic Gold"), - .price = 0, + .price = (I_PRICE >= GEN_6) ? 60000 : 0, .description = COMPOUND_STRING( "A gold coin used\n" "long ago. It sells\n" @@ -3392,7 +3456,7 @@ const struct Item gItemsInfo[] = [ITEM_FOSSILIZED_FISH] = { .name = ITEM_NAME("Fossilized Fish"), - .pluralName = ITEM_PLURAL_NAME("Fossilized Fishes"), + .pluralName = ITEM_PLURAL_NAME("Fossilized Fish"), .price = 5000, .description = sFossilizedFishDesc, .pocket = POCKET_ITEMS, @@ -3622,11 +3686,18 @@ const struct Item gItemsInfo[] = }, // Apricorns + #if (I_PRICE >= GEN_8 || I_PRICE <= GEN_2) + #define APRICORN_PRICE 200 + #elif I_PRICE >= GEN_5 + #define APRICORN_PRICE 20 + #else + #define APRICORN_PRICE 0 + #endif [ITEM_RED_APRICORN] = { .name = ITEM_NAME("Red Apricorn"), - .price = (I_PRICE == GEN_4) ? 0 : ((I_PRICE >= GEN_5 && I_PRICE <= GEN_7) ? 20 : 200), + .price = APRICORN_PRICE, .description = COMPOUND_STRING( "A red apricorn.\n" "It assails your\n" @@ -3642,7 +3713,7 @@ const struct Item gItemsInfo[] = [ITEM_BLUE_APRICORN] = { .name = ITEM_NAME("Blue Apricorn"), - .price = (I_PRICE == GEN_4) ? 0 : ((I_PRICE >= GEN_5 && I_PRICE <= GEN_7) ? 20 : 200), + .price = APRICORN_PRICE, .description = COMPOUND_STRING( "A blue apricorn.\n" "It smells a bit\n" @@ -3658,7 +3729,7 @@ const struct Item gItemsInfo[] = [ITEM_YELLOW_APRICORN] = { .name = ITEM_NAME("Yellow Apricorn"), - .price = (I_PRICE == GEN_4) ? 0 : ((I_PRICE >= GEN_5 && I_PRICE <= GEN_7) ? 20 : 200), + .price = APRICORN_PRICE, .description = COMPOUND_STRING( "A yellow apricorn.\n" "It has an invigor-\n" @@ -3674,7 +3745,7 @@ const struct Item gItemsInfo[] = [ITEM_GREEN_APRICORN] = { .name = ITEM_NAME("Green Apricorn"), - .price = (I_PRICE == GEN_4) ? 0 : ((I_PRICE >= GEN_5 && I_PRICE <= GEN_7) ? 20 : 200), + .price = APRICORN_PRICE, .description = COMPOUND_STRING( "A green apricorn.\n" "It has a strange,\n" @@ -3690,7 +3761,7 @@ const struct Item gItemsInfo[] = [ITEM_PINK_APRICORN] = { .name = ITEM_NAME("Pink Apricorn"), - .price = (I_PRICE == GEN_4) ? 0 : ((I_PRICE >= GEN_5 && I_PRICE <= GEN_7) ? 20 : 200), + .price = APRICORN_PRICE, .description = COMPOUND_STRING( "A pink apricorn.\n" "It has a nice,\n" @@ -3706,7 +3777,7 @@ const struct Item gItemsInfo[] = [ITEM_WHITE_APRICORN] = { .name = ITEM_NAME("White Apricorn"), - .price = (I_PRICE == GEN_4) ? 0 : ((I_PRICE >= GEN_5 && I_PRICE <= GEN_7) ? 20 : 200), + .price = APRICORN_PRICE, .description = COMPOUND_STRING( "A white apricorn.\n" "It doesn't smell\n" @@ -3722,7 +3793,7 @@ const struct Item gItemsInfo[] = [ITEM_BLACK_APRICORN] = { .name = ITEM_NAME("Black Apricorn"), - .price = (I_PRICE == GEN_4) ? 0 : ((I_PRICE >= GEN_5 && I_PRICE <= GEN_7) ? 20 : 200), + .price = APRICORN_PRICE, .description = COMPOUND_STRING( "A black apricorn.\n" "It has an inde-\n" @@ -4112,7 +4183,15 @@ const struct Item gItemsInfo[] = [ITEM_MOON_STONE] = { .name = ITEM_NAME("Moon Stone"), - .price = (I_PRICE >= GEN_7) ? 3000 : 2100, + #if I_PRICE >= GEN_7 + .price = 3000, + #elif I_PRICE >= GEN_4 + .price = 2100, + #elif I_PRICE == GEN_3 + .price = 0, + #else + .price = 1, + #endif .description = sEvolutionStoneDesc, .pocket = POCKET_ITEMS, .sortType = ITEM_TYPE_EVOLUTION_STONE, @@ -4262,7 +4341,6 @@ const struct Item gItemsInfo[] = [ITEM_GALARICA_WREATH] = { .name = ITEM_NAME("Galarica Wreath"), - .pluralName = ITEM_PLURAL_NAME("Galarica Wreathes"), .price = (I_PRICE >= GEN_9) ? 3000 : 6000, .description = COMPOUND_STRING( "A wreath made in\n" @@ -4391,7 +4469,6 @@ const struct Item gItemsInfo[] = [ITEM_REAPER_CLOTH] = { .name = ITEM_NAME("Reaper Cloth"), - .pluralName = ITEM_PLURAL_NAME("Reaper Cloths"), .price = (I_PRICE >= GEN_7) ? 2000 * TREASURE_FACTOR : 2100, .description = COMPOUND_STRING( "Loved by a certain\n" @@ -4410,7 +4487,13 @@ const struct Item gItemsInfo[] = [ITEM_PRISM_SCALE] = { .name = ITEM_NAME("Prism Scale"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 2000 : 500), + #if I_PRICE >= GEN_9 + .price = 3000, + #elif I_PRICE >= GEN_7 + .price = 2000, + #else + .price = 500, + #endif .description = COMPOUND_STRING( "A mysterious scale\n" "that evolves a\n" @@ -4428,7 +4511,6 @@ const struct Item gItemsInfo[] = [ITEM_WHIPPED_DREAM] = { .name = ITEM_NAME("Whipped Dream"), - .pluralName = ITEM_PLURAL_NAME("Whipped Dream"), .price = (I_PRICE >= GEN_7) ? 2000 * TREASURE_FACTOR : 2100, .description = COMPOUND_STRING( "A soft and sweet\n" @@ -5549,7 +5631,6 @@ const struct Item gItemsInfo[] = [ITEM_CHARIZARDITE_X] = { .name = ITEM_NAME("Charizardite X"), - .pluralName = ITEM_PLURAL_NAME("Charizardites X"), .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sCharizarditeDesc, @@ -5565,7 +5646,6 @@ const struct Item gItemsInfo[] = [ITEM_CHARIZARDITE_Y] = { .name = ITEM_NAME("Charizardite Y"), - .pluralName = ITEM_PLURAL_NAME("Charizardites Y"), .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sCharizarditeDesc, @@ -5761,7 +5841,6 @@ const struct Item gItemsInfo[] = [ITEM_MEWTWONITE_X] = { .name = ITEM_NAME("Mewtwonite X"), - .pluralName = ITEM_PLURAL_NAME("Mewtwonites X"), .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sMewtwoniteDesc, @@ -5777,7 +5856,6 @@ const struct Item gItemsInfo[] = [ITEM_MEWTWONITE_Y] = { .name = ITEM_NAME("Mewtwonite Y"), - .pluralName = ITEM_PLURAL_NAME("Mewtwonites Y"), .price = 0, .holdEffect = HOLD_EFFECT_MEGA_STONE, .description = sMewtwoniteDesc, @@ -6835,11 +6913,18 @@ const struct Item gItemsInfo[] = }, // Gems + #if I_PRICE >= GEN_9 + #define GEM_PRICE 15000 + #elif I_PRICE >= GEN_7 + #define GEM_PRICE 4000 + #else + #define GEM_PRICE 200 + #endif [ITEM_NORMAL_GEM] = { .name = ITEM_NAME("Normal Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -6858,7 +6943,7 @@ const struct Item gItemsInfo[] = [ITEM_FIRE_GEM] = { .name = ITEM_NAME("Fire Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -6877,7 +6962,7 @@ const struct Item gItemsInfo[] = [ITEM_WATER_GEM] = { .name = ITEM_NAME("Water Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -6896,7 +6981,7 @@ const struct Item gItemsInfo[] = [ITEM_ELECTRIC_GEM] = { .name = ITEM_NAME("Electric Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -6915,7 +7000,7 @@ const struct Item gItemsInfo[] = [ITEM_GRASS_GEM] = { .name = ITEM_NAME("Grass Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -6934,7 +7019,7 @@ const struct Item gItemsInfo[] = [ITEM_ICE_GEM] = { .name = ITEM_NAME("Ice Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -6953,7 +7038,7 @@ const struct Item gItemsInfo[] = [ITEM_FIGHTING_GEM] = { .name = ITEM_NAME("Fighting Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -6972,7 +7057,7 @@ const struct Item gItemsInfo[] = [ITEM_POISON_GEM] = { .name = ITEM_NAME("Poison Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -6991,7 +7076,7 @@ const struct Item gItemsInfo[] = [ITEM_GROUND_GEM] = { .name = ITEM_NAME("Ground Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -7010,7 +7095,7 @@ const struct Item gItemsInfo[] = [ITEM_FLYING_GEM] = { .name = ITEM_NAME("Flying Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -7029,7 +7114,7 @@ const struct Item gItemsInfo[] = [ITEM_PSYCHIC_GEM] = { .name = ITEM_NAME("Psychic Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -7048,7 +7133,7 @@ const struct Item gItemsInfo[] = [ITEM_BUG_GEM] = { .name = ITEM_NAME("Bug Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -7067,7 +7152,7 @@ const struct Item gItemsInfo[] = [ITEM_ROCK_GEM] = { .name = ITEM_NAME("Rock Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -7086,7 +7171,7 @@ const struct Item gItemsInfo[] = [ITEM_GHOST_GEM] = { .name = ITEM_NAME("Ghost Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -7105,7 +7190,7 @@ const struct Item gItemsInfo[] = [ITEM_DRAGON_GEM] = { .name = ITEM_NAME("Dragon Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -7124,7 +7209,7 @@ const struct Item gItemsInfo[] = [ITEM_DARK_GEM] = { .name = ITEM_NAME("Dark Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -7143,7 +7228,7 @@ const struct Item gItemsInfo[] = [ITEM_STEEL_GEM] = { .name = ITEM_NAME("Steel Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -7162,7 +7247,7 @@ const struct Item gItemsInfo[] = [ITEM_FAIRY_GEM] = { .name = ITEM_NAME("Fairy Gem"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + .price = GEM_PRICE, .holdEffect = HOLD_EFFECT_GEMS, .holdEffectParam = GEM_BOOST_PARAM, .description = COMPOUND_STRING( @@ -7888,7 +7973,6 @@ const struct Item gItemsInfo[] = [ITEM_METAL_POWDER] = { .name = ITEM_NAME("Metal Powder"), - .pluralName = ITEM_PLURAL_NAME("Metal Powder"), .price = (I_PRICE >= GEN_7) ? 1000 : 10, .holdEffect = HOLD_EFFECT_METAL_POWDER, .description = COMPOUND_STRING( @@ -7907,7 +7991,6 @@ const struct Item gItemsInfo[] = [ITEM_QUICK_POWDER] = { .name = ITEM_NAME("Quick Powder"), - .pluralName = ITEM_PLURAL_NAME("Quick Powder"), .price = (I_PRICE >= GEN_7) ? 1000 : 10, .holdEffect = HOLD_EFFECT_QUICK_POWDER, .description = COMPOUND_STRING( @@ -8430,12 +8513,19 @@ const struct Item gItemsInfo[] = }, // Type-boosting Held Items + #if I_PRICE >= GEN_9 + #define TYPE_BOOSTING_PRICE 3000 + #elif I_PRICE >= GEN_7 + #define TYPE_BOOSTING_PRICE 1000 + #else + #define TYPE_BOOSTING_PRICE 100 + #endif [ITEM_SILK_SCARF] = { .name = ITEM_NAME("Silk Scarf"), .pluralName = ITEM_PLURAL_NAME("Silk Scarves"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100), + .price = TYPE_BOOSTING_PRICE, .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = COMPOUND_STRING( @@ -8455,7 +8545,13 @@ const struct Item gItemsInfo[] = [ITEM_CHARCOAL] = { .name = ITEM_NAME("Charcoal"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 9800), + #if I_PRICE >= GEN_9 + .price = 3000, + #elif I_PRICE >= GEN_7 + .price = 1000, + #else + .price = 9800, + #endif .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = COMPOUND_STRING( @@ -8475,8 +8571,7 @@ const struct Item gItemsInfo[] = [ITEM_MYSTIC_WATER] = { .name = ITEM_NAME("Mystic Water"), - .pluralName = ITEM_PLURAL_NAME("Mystic Water"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100), + .price = TYPE_BOOSTING_PRICE, .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = COMPOUND_STRING( @@ -8496,7 +8591,7 @@ const struct Item gItemsInfo[] = [ITEM_MAGNET] = { .name = ITEM_NAME("Magnet"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100), + .price = TYPE_BOOSTING_PRICE, .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = COMPOUND_STRING( @@ -8516,7 +8611,7 @@ const struct Item gItemsInfo[] = [ITEM_MIRACLE_SEED] = { .name = ITEM_NAME("Miracle Seed"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100), + .price = TYPE_BOOSTING_PRICE, .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = sRoseIncenseDesc, @@ -8533,8 +8628,7 @@ const struct Item gItemsInfo[] = [ITEM_NEVER_MELT_ICE] = { .name = ITEM_NAME("Never-Melt Ice"), - .pluralName = ITEM_PLURAL_NAME("Never-Melt Ice"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100), + .price = TYPE_BOOSTING_PRICE, .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = COMPOUND_STRING( @@ -8554,7 +8648,7 @@ const struct Item gItemsInfo[] = [ITEM_BLACK_BELT] = { .name = ITEM_NAME("Black Belt"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100), + .price = TYPE_BOOSTING_PRICE, .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = COMPOUND_STRING( @@ -8574,7 +8668,7 @@ const struct Item gItemsInfo[] = [ITEM_POISON_BARB] = { .name = ITEM_NAME("Poison Barb"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100), + .price = TYPE_BOOSTING_PRICE, .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = COMPOUND_STRING( @@ -8595,7 +8689,7 @@ const struct Item gItemsInfo[] = { .name = ITEM_NAME("Soft Sand"), .pluralName = ITEM_PLURAL_NAME("Soft Sand"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100), + .price = TYPE_BOOSTING_PRICE, .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = COMPOUND_STRING( @@ -8615,7 +8709,7 @@ const struct Item gItemsInfo[] = [ITEM_SHARP_BEAK] = { .name = ITEM_NAME("Sharp Beak"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100), + .price = TYPE_BOOSTING_PRICE, .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = COMPOUND_STRING( @@ -8635,7 +8729,7 @@ const struct Item gItemsInfo[] = [ITEM_TWISTED_SPOON] = { .name = ITEM_NAME("Twisted Spoon"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100), + .price = TYPE_BOOSTING_PRICE, .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = sOddIncenseDesc, @@ -8652,8 +8746,7 @@ const struct Item gItemsInfo[] = [ITEM_SILVER_POWDER] = { .name = ITEM_NAME("Silver Powder"), - .pluralName = ITEM_PLURAL_NAME("Silver Powder"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100), + .price = TYPE_BOOSTING_PRICE, .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = COMPOUND_STRING( @@ -8673,7 +8766,7 @@ const struct Item gItemsInfo[] = [ITEM_HARD_STONE] = { .name = ITEM_NAME("Hard Stone"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100), + .price = TYPE_BOOSTING_PRICE, .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = sRockIncenseDesc, @@ -8690,7 +8783,7 @@ const struct Item gItemsInfo[] = [ITEM_SPELL_TAG] = { .name = ITEM_NAME("Spell Tag"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100), + .price = TYPE_BOOSTING_PRICE, .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = COMPOUND_STRING( @@ -8710,7 +8803,7 @@ const struct Item gItemsInfo[] = [ITEM_DRAGON_FANG] = { .name = ITEM_NAME("Dragon Fang"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100), + .price = TYPE_BOOSTING_PRICE, .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = COMPOUND_STRING( @@ -8731,7 +8824,7 @@ const struct Item gItemsInfo[] = { .name = ITEM_NAME("Black Glasses"), .pluralName = ITEM_PLURAL_NAME("Black Glasses"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 1000 : 100), + .price = TYPE_BOOSTING_PRICE, .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = COMPOUND_STRING( @@ -8751,7 +8844,13 @@ const struct Item gItemsInfo[] = [ITEM_METAL_COAT] = { .name = ITEM_NAME("Metal Coat"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 2000 : 100), + #if I_PRICE >= GEN_9 + .price = 3000, + #elif I_PRICE >= GEN_7 + .price = 2000, + #else + .price = 100, + #endif .holdEffect = HOLD_EFFECT_TYPE_POWER, .holdEffectParam = TYPE_BOOST_PARAM, .description = COMPOUND_STRING( @@ -8774,7 +8873,13 @@ const struct Item gItemsInfo[] = [ITEM_CHOICE_BAND] = { .name = ITEM_NAME("Choice Band"), - .price = (I_PRICE >= GEN_9) ? 100000 : ((I_PRICE >= GEN_7) ? 4000 : 100), + #if I_PRICE >= GEN_9 + .price = 100000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 100, + #endif .holdEffect = HOLD_EFFECT_CHOICE_BAND, .description = COMPOUND_STRING( "Boosts Attack, but\n" @@ -8793,7 +8898,13 @@ const struct Item gItemsInfo[] = { .name = ITEM_NAME("Choice Specs"), .pluralName = ITEM_PLURAL_NAME("Choice Specs"), - .price = (I_PRICE >= GEN_9) ? 100000 : ((I_PRICE >= GEN_7) ? 4000 : 100), + #if I_PRICE >= GEN_9 + .price = 100000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 100, + #endif .holdEffect = HOLD_EFFECT_CHOICE_SPECS, .description = COMPOUND_STRING( "Boosts Sp. Atk, but\n" @@ -8812,7 +8923,13 @@ const struct Item gItemsInfo[] = { .name = ITEM_NAME("Choice Scarf"), .pluralName = ITEM_PLURAL_NAME("Choice Scarves"), - .price = (I_PRICE >= GEN_9) ? 100000 : ((I_PRICE >= GEN_7) ? 4000 : 100), + #if I_PRICE >= GEN_9 + .price = 100000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 100, + #endif .holdEffect = HOLD_EFFECT_CHOICE_SCARF, .description = COMPOUND_STRING( "Boosts Speed, but\n" @@ -8832,7 +8949,13 @@ const struct Item gItemsInfo[] = [ITEM_FLAME_ORB] = { .name = ITEM_NAME("Flame Orb"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 15000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_FLAME_ORB, .description = COMPOUND_STRING( "A bizarre orb that\n" @@ -8850,7 +8973,13 @@ const struct Item gItemsInfo[] = [ITEM_TOXIC_ORB] = { .name = ITEM_NAME("Toxic Orb"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 15000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_TOXIC_ORB, .description = COMPOUND_STRING( "A bizarre orb that\n" @@ -8870,7 +8999,13 @@ const struct Item gItemsInfo[] = [ITEM_DAMP_ROCK] = { .name = ITEM_NAME("Damp Rock"), - .price = (I_PRICE >= GEN_9) ? 8000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 8000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_DAMP_ROCK, .description = COMPOUND_STRING( "Extends the length\n" @@ -8888,7 +9023,13 @@ const struct Item gItemsInfo[] = [ITEM_HEAT_ROCK] = { .name = ITEM_NAME("Heat Rock"), - .price = (I_PRICE >= GEN_9) ? 8000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 8000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_HEAT_ROCK, .description = COMPOUND_STRING( "Extends the length\n" @@ -8906,7 +9047,13 @@ const struct Item gItemsInfo[] = [ITEM_SMOOTH_ROCK] = { .name = ITEM_NAME("Smooth Rock"), - .price = (I_PRICE >= GEN_9) ? 8000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 8000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_SMOOTH_ROCK, .description = COMPOUND_STRING( "Extends the length\n" @@ -8924,7 +9071,13 @@ const struct Item gItemsInfo[] = [ITEM_ICY_ROCK] = { .name = ITEM_NAME("Icy Rock"), - .price = (I_PRICE >= GEN_9) ? 8000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 8000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_ICY_ROCK, #if B_PREFERRED_ICE_WEATHER == B_ICE_WEATHER_HAIL .description = COMPOUND_STRING( @@ -9034,7 +9187,13 @@ const struct Item gItemsInfo[] = [ITEM_ABSORB_BULB] = { .name = ITEM_NAME("Absorb Bulb"), - .price = (I_PRICE >= GEN_9) ? 5000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 5000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_ABSORB_BULB, .holdEffectParam = 0, .description = COMPOUND_STRING( @@ -9054,7 +9213,13 @@ const struct Item gItemsInfo[] = { .name = ITEM_NAME("Cell Battery"), .pluralName = ITEM_PLURAL_NAME("Cell Batteries"), - .price = (I_PRICE >= GEN_9) ? 5000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 5000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_CELL_BATTERY, .holdEffectParam = 0, .description = COMPOUND_STRING( @@ -9074,7 +9239,13 @@ const struct Item gItemsInfo[] = { .name = ITEM_NAME("Luminous Moss"), .pluralName = ITEM_PLURAL_NAME("Luminous Moss"), - .price = (I_PRICE >= GEN_9) ? 5000 : ((I_PRICE >= GEN_7) ? 4000 : 1000), + #if I_PRICE >= GEN_9 + .price = 5000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 1000, + #endif .holdEffect = HOLD_EFFECT_LUMINOUS_MOSS, .holdEffectParam = 0, .description = COMPOUND_STRING( @@ -9093,7 +9264,13 @@ const struct Item gItemsInfo[] = [ITEM_SNOWBALL] = { .name = ITEM_NAME("Snowball"), - .price = (I_PRICE >= GEN_9) ? 5000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 5000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_SNOWBALL, .holdEffectParam = 0, .description = COMPOUND_STRING( @@ -9114,8 +9291,13 @@ const struct Item gItemsInfo[] = [ITEM_BRIGHT_POWDER] = { .name = ITEM_NAME("Bright Powder"), - .pluralName = ITEM_PLURAL_NAME("Bright Powder"), - .price = (I_PRICE >= GEN_9) ? 30000 : ((I_PRICE >= GEN_7) ? 4000 : 10), + #if I_PRICE >= GEN_9 + .price = 30000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 10, + #endif .holdEffect = HOLD_EFFECT_EVASION_UP, .holdEffectParam = 10, .description = COMPOUND_STRING( @@ -9134,7 +9316,13 @@ const struct Item gItemsInfo[] = [ITEM_WHITE_HERB] = { .name = ITEM_NAME("White Herb"), - .price = (I_PRICE >= GEN_9) ? 20000 : ((I_PRICE >= GEN_7) ? 4000 : 100), + #if I_PRICE >= GEN_9 + .price = 20000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 100, + #endif .holdEffect = HOLD_EFFECT_WHITE_HERB, .description = COMPOUND_STRING( "A hold item that\n" @@ -9155,18 +9343,20 @@ const struct Item gItemsInfo[] = .holdEffect = HOLD_EFFECT_EXP_SHARE, #if I_EXP_SHARE_ITEM >= GEN_6 .price = 0, + .importance = 1, .description = COMPOUND_STRING( "This device gives\n" "exp. to other\n" "party members."), + .pocket = POCKET_KEY_ITEMS, #else - .price = 3000, + .price = (I_PRICE == GEN_1) ? 1 : 3000, .description = COMPOUND_STRING( "A hold item that\n" "gets Exp. points\n" "from battles."), + .pocket = POCKET_ITEMS, #endif - .pocket = I_EXP_SHARE_ITEM >= GEN_6 ? POCKET_KEY_ITEMS : POCKET_ITEMS, .sortType = ITEM_TYPE_HELD_ITEM, .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_ExpShare, @@ -9178,7 +9368,13 @@ const struct Item gItemsInfo[] = [ITEM_QUICK_CLAW] = { .name = ITEM_NAME("Quick Claw"), - .price = (I_PRICE >= GEN_9) ? 8000 : ((I_PRICE >= GEN_7) ? 4000 : 100), + #if I_PRICE >= GEN_9 + .price = 8000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 100, + #endif .holdEffect = HOLD_EFFECT_QUICK_CLAW, .holdEffectParam = 20, .description = COMPOUND_STRING( @@ -9197,7 +9393,13 @@ const struct Item gItemsInfo[] = [ITEM_SOOTHE_BELL] = { .name = ITEM_NAME("Soothe Bell"), - .price = (I_PRICE >= GEN_9) ? 5000 : ((I_PRICE >= GEN_7) ? 4000 : 100), + #if I_PRICE >= GEN_9 + .price = 5000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 100, + #endif .holdEffect = HOLD_EFFECT_FRIENDSHIP_UP, .description = COMPOUND_STRING( "A hold item that\n" @@ -9215,7 +9417,13 @@ const struct Item gItemsInfo[] = [ITEM_MENTAL_HERB] = { .name = ITEM_NAME("Mental Herb"), - .price = (I_PRICE >= GEN_9) ? 10000 : ((I_PRICE >= GEN_7) ? 4000 : 100), + #if I_PRICE >= GEN_9 + .price = 10000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 100, + #endif .holdEffect = HOLD_EFFECT_MENTAL_HERB, .description = COMPOUND_STRING( #if B_MENTAL_HERB >= GEN_5 @@ -9239,7 +9447,13 @@ const struct Item gItemsInfo[] = [ITEM_KINGS_ROCK] = { .name = ITEM_NAME("King's Rock"), - .price = (I_PRICE >= GEN_9) ? 10000 : ((I_PRICE >= GEN_7) ? 5000 : 100), + #if I_PRICE >= GEN_9 + .price = 10000, + #elif I_PRICE >= GEN_7 + .price = 5000, + #else + .price = 100, + #endif .holdEffect = HOLD_EFFECT_FLINCH, .holdEffectParam = 10, .description = sKingsRockDesc, @@ -9256,7 +9470,13 @@ const struct Item gItemsInfo[] = [ITEM_AMULET_COIN] = { .name = ITEM_NAME("Amulet Coin"), - .price = (I_PRICE >= GEN_9) ? 30000 : ((I_PRICE >= GEN_7) ? 10000 : 100), + #if I_PRICE >= GEN_9 + .price = 30000, + #elif I_PRICE >= GEN_7 + .price = 10000, + #else + .price = 100, + #endif .holdEffect = HOLD_EFFECT_DOUBLE_PRIZE, .description = sLuckIncenseDesc, .pocket = POCKET_ITEMS, @@ -9286,7 +9506,13 @@ const struct Item gItemsInfo[] = [ITEM_SMOKE_BALL] = { .name = ITEM_NAME("Smoke Ball"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 15000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_CAN_ALWAYS_RUN, .description = COMPOUND_STRING( "A hold item that\n" @@ -9304,7 +9530,13 @@ const struct Item gItemsInfo[] = [ITEM_FOCUS_BAND] = { .name = ITEM_NAME("Focus Band"), - .price = (I_PRICE >= GEN_9) ? 10000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 10000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_FOCUS_BAND, .holdEffectParam = 10, .description = COMPOUND_STRING( @@ -9342,7 +9574,13 @@ const struct Item gItemsInfo[] = { .name = ITEM_NAME("Scope Lens"), .pluralName = ITEM_PLURAL_NAME("Scope Lenses"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 100), + #if I_PRICE >= GEN_9 + .price = 15000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 100, + #endif .holdEffect = HOLD_EFFECT_SCOPE_LENS, .description = COMPOUND_STRING( "A hold item that\n" @@ -9361,7 +9599,13 @@ const struct Item gItemsInfo[] = { .name = ITEM_NAME("Leftovers"), .pluralName = ITEM_PLURAL_NAME("Leftovers"), - .price = (I_PRICE >= GEN_9) ? 20000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 20000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_LEFTOVERS, .holdEffectParam = 10, .description = COMPOUND_STRING( @@ -9380,7 +9624,13 @@ const struct Item gItemsInfo[] = [ITEM_SHELL_BELL] = { .name = ITEM_NAME("Shell Bell"), - .price = (I_PRICE >= GEN_9) ? 20000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 20000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_SHELL_BELL, .holdEffectParam = 8, .description = COMPOUND_STRING( @@ -9400,7 +9650,13 @@ const struct Item gItemsInfo[] = { .name = ITEM_NAME("Wide Lens"), .pluralName = ITEM_PLURAL_NAME("Wide Lenses"), - .price = (I_PRICE >= GEN_9) ? 20000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 20000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_WIDE_LENS, .holdEffectParam = 10, .description = COMPOUND_STRING( @@ -9419,7 +9675,13 @@ const struct Item gItemsInfo[] = [ITEM_MUSCLE_BAND] = { .name = ITEM_NAME("Muscle Band"), - .price = (I_PRICE >= GEN_9) ? 8000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 8000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_MUSCLE_BAND, .holdEffectParam = 10, .description = COMPOUND_STRING( @@ -9439,7 +9701,13 @@ const struct Item gItemsInfo[] = { .name = ITEM_NAME("Wise Glasses"), .pluralName = ITEM_PLURAL_NAME("Wise Glasses"), - .price = (I_PRICE >= GEN_9) ? 8000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 8000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_WISE_GLASSES, .holdEffectParam = 10, .description = COMPOUND_STRING( @@ -9458,7 +9726,13 @@ const struct Item gItemsInfo[] = [ITEM_EXPERT_BELT] = { .name = ITEM_NAME("Expert Belt"), - .price = (I_PRICE >= GEN_9) ? 30000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 30000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_EXPERT_BELT, .holdEffectParam = 20, .description = COMPOUND_STRING( @@ -9477,8 +9751,13 @@ const struct Item gItemsInfo[] = [ITEM_LIGHT_CLAY] = { .name = ITEM_NAME("Light Clay"), - .pluralName = ITEM_PLURAL_NAME("Light Clay"), - .price = (I_PRICE >= GEN_9) ? 20000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 20000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_LIGHT_CLAY, .description = COMPOUND_STRING( "Extends the length\n" @@ -9496,7 +9775,13 @@ const struct Item gItemsInfo[] = [ITEM_LIFE_ORB] = { .name = ITEM_NAME("Life Orb"), - .price = (I_PRICE >= GEN_9) ? 50000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 50000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_LIFE_ORB, .description = COMPOUND_STRING( "Boosts move power\n" @@ -9514,7 +9799,13 @@ const struct Item gItemsInfo[] = [ITEM_POWER_HERB] = { .name = ITEM_NAME("Power Herb"), - .price = (I_PRICE >= GEN_9) ? 30000 : ((I_PRICE >= GEN_7) ? 4000 : 100), + #if I_PRICE >= GEN_9 + .price = 30000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 100, + #endif .holdEffect = HOLD_EFFECT_POWER_HERB, .description = COMPOUND_STRING( "Allows immediate\n" @@ -9533,7 +9824,13 @@ const struct Item gItemsInfo[] = { .name = ITEM_NAME("Focus Sash"), .pluralName = ITEM_PLURAL_NAME("Focus Sashes"), - .price = (I_PRICE >= GEN_9) ? 50000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 50000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_FOCUS_SASH, .description = COMPOUND_STRING( "If the holder has\n" @@ -9552,7 +9849,13 @@ const struct Item gItemsInfo[] = { .name = ITEM_NAME("Zoom Lens"), .pluralName = ITEM_PLURAL_NAME("Zoom Lenses"), - .price = (I_PRICE >= GEN_9) ? 10000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 10000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_ZOOM_LENS, .holdEffectParam = 20, .description = COMPOUND_STRING( @@ -9571,7 +9874,13 @@ const struct Item gItemsInfo[] = [ITEM_METRONOME] = { .name = ITEM_NAME("Metronome"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 15000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_METRONOME, .holdEffectParam = 20, .description = COMPOUND_STRING( @@ -9590,7 +9899,13 @@ const struct Item gItemsInfo[] = [ITEM_IRON_BALL] = { .name = ITEM_NAME("Iron Ball"), - .price = (I_PRICE >= GEN_9) ? 20000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 20000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_IRON_BALL, .description = COMPOUND_STRING( "Cuts Speed and\n" @@ -9608,7 +9923,13 @@ const struct Item gItemsInfo[] = [ITEM_LAGGING_TAIL] = { .name = ITEM_NAME("Lagging Tail"), - .price = (I_PRICE >= GEN_9) ? 20000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 20000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_LAGGING_TAIL, .description = sFullIncenseDesc, .pocket = POCKET_ITEMS, @@ -9623,7 +9944,13 @@ const struct Item gItemsInfo[] = [ITEM_DESTINY_KNOT] = { .name = ITEM_NAME("Destiny Knot"), - .price = (I_PRICE >= GEN_9) ? 20000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 20000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_DESTINY_KNOT, .description = COMPOUND_STRING( "If the holder falls\n" @@ -9641,8 +9968,13 @@ const struct Item gItemsInfo[] = [ITEM_BLACK_SLUDGE] = { .name = ITEM_NAME("Black Sludge"), - .pluralName = ITEM_PLURAL_NAME("Black Sludge"), - .price = (I_PRICE >= GEN_9) ? 10000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 10000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_BLACK_SLUDGE, .description = COMPOUND_STRING( "Restores HP for\n" @@ -9660,7 +9992,13 @@ const struct Item gItemsInfo[] = [ITEM_GRIP_CLAW] = { .name = ITEM_NAME("Grip Claw"), - .price = (I_PRICE >= GEN_9) ? 10000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 10000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_GRIP_CLAW, .description = COMPOUND_STRING( "A held item that\n" @@ -9678,7 +10016,13 @@ const struct Item gItemsInfo[] = [ITEM_STICKY_BARB] = { .name = ITEM_NAME("Sticky Barb"), - .price = (I_PRICE >= GEN_9) ? 10000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 10000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_STICKY_BARB, .description = COMPOUND_STRING( "Damages the holder\n" @@ -9696,7 +10040,13 @@ const struct Item gItemsInfo[] = [ITEM_SHED_SHELL] = { .name = ITEM_NAME("Shed Shell"), - .price = (I_PRICE >= GEN_9) ? 20000 : ((I_PRICE >= GEN_7) ? 4000 : 100), + #if I_PRICE >= GEN_9 + .price = 20000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 100, + #endif .holdEffect = HOLD_EFFECT_SHED_SHELL, .description = COMPOUND_STRING( "Allows the holder\n" @@ -9714,7 +10064,13 @@ const struct Item gItemsInfo[] = [ITEM_BIG_ROOT] = { .name = ITEM_NAME("Big Root"), - .price = (I_PRICE >= GEN_9) ? 10000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 10000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_BIG_ROOT, .holdEffectParam = 30, .description = COMPOUND_STRING( @@ -9733,7 +10089,13 @@ const struct Item gItemsInfo[] = [ITEM_RAZOR_CLAW] = { .name = ITEM_NAME("Razor Claw"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 5000 : 2100), + #if I_PRICE >= GEN_9 + .price = 15000, + #elif I_PRICE >= GEN_7 + .price = 5000, + #else + .price = 2100, + #endif .holdEffect = HOLD_EFFECT_SCOPE_LENS, .description = COMPOUND_STRING( "A hooked claw that\n" @@ -9752,7 +10114,13 @@ const struct Item gItemsInfo[] = [ITEM_RAZOR_FANG] = { .name = ITEM_NAME("Razor Fang"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 5000 : 2100), + #if I_PRICE >= GEN_9 + .price = 15000, + #elif I_PRICE >= GEN_7 + .price = 5000, + #else + .price = 2100, + #endif .holdEffect = HOLD_EFFECT_FLINCH, .holdEffectParam = 10, .description = sKingsRockDesc, @@ -9769,7 +10137,13 @@ const struct Item gItemsInfo[] = [ITEM_EVIOLITE] = { .name = ITEM_NAME("Eviolite"), - .price = (I_PRICE >= GEN_9) ? 50000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 50000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_EVIOLITE, .holdEffectParam = 50, .description = COMPOUND_STRING( @@ -9788,7 +10162,13 @@ const struct Item gItemsInfo[] = [ITEM_FLOAT_STONE] = { .name = ITEM_NAME("Float Stone"), - .price = (I_PRICE >= GEN_9) ? 10000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 10000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_FLOAT_STONE, .description = COMPOUND_STRING( "It's so light that\n" @@ -9806,7 +10186,13 @@ const struct Item gItemsInfo[] = [ITEM_ROCKY_HELMET] = { .name = ITEM_NAME("Rocky Helmet"), - .price = (I_PRICE >= GEN_9) ? 50000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 50000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_ROCKY_HELMET, .holdEffectParam = 0, .description = COMPOUND_STRING( @@ -9825,7 +10211,13 @@ const struct Item gItemsInfo[] = [ITEM_AIR_BALLOON] = { .name = ITEM_NAME("Air Balloon"), - .price = (I_PRICE >= GEN_9) ? 15000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 15000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_AIR_BALLOON, .holdEffectParam = 0, .description = COMPOUND_STRING( @@ -9844,7 +10236,13 @@ const struct Item gItemsInfo[] = [ITEM_RED_CARD] = { .name = ITEM_NAME("Red Card"), - .price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 3000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_RED_CARD, .holdEffectParam = 0, .description = COMPOUND_STRING( @@ -9863,7 +10261,13 @@ const struct Item gItemsInfo[] = [ITEM_RING_TARGET] = { .name = ITEM_NAME("Ring Target"), - .price = (I_PRICE >= GEN_9) ? 10000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 10000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_RING_TARGET, .holdEffectParam = 0, .description = COMPOUND_STRING( @@ -9882,7 +10286,13 @@ const struct Item gItemsInfo[] = [ITEM_BINDING_BAND] = { .name = ITEM_NAME("Binding Band"), - .price = (I_PRICE >= GEN_9) ? 20000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 20000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_BINDING_BAND, .description = COMPOUND_STRING( "Increases the\n" @@ -9900,7 +10310,13 @@ const struct Item gItemsInfo[] = [ITEM_EJECT_BUTTON] = { .name = ITEM_NAME("Eject Button"), - .price = (I_PRICE >= GEN_9) ? 30000 : ((I_PRICE >= GEN_7) ? 4000 : 200), + #if I_PRICE >= GEN_9 + .price = 30000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 200, + #endif .holdEffect = HOLD_EFFECT_EJECT_BUTTON, .holdEffectParam = 0, .description = COMPOUND_STRING( @@ -9959,7 +10375,13 @@ const struct Item gItemsInfo[] = { .name = ITEM_NAME("Safety Goggles"), .pluralName = ITEM_PLURAL_NAME("Safety Goggles"), - .price = (I_PRICE >= GEN_9) ? 20000 : ((I_PRICE >= GEN_7) ? 4000 : 1000), + #if I_PRICE >= GEN_9 + .price = 20000, + #elif I_PRICE >= GEN_7 + .price = 4000, + #else + .price = 1000, + #endif .holdEffect = HOLD_EFFECT_SAFETY_GOGGLES, .description = COMPOUND_STRING( "Protect from\n" @@ -9977,7 +10399,13 @@ const struct Item gItemsInfo[] = [ITEM_ADRENALINE_ORB] = { .name = ITEM_NAME("Adrenaline Orb"), - .price = (I_PRICE >= GEN_9) ? 5000 : ((I_PRICE >= GEN_8) ? 4000 : 300), + #if I_PRICE >= GEN_9 + .price = 5000, + #elif I_PRICE == GEN_8 + .price = 4000, + #else + .price = 300, + #endif .holdEffect = HOLD_EFFECT_ADRENALINE_ORB, .description = COMPOUND_STRING( "This orb boosts\n" @@ -13035,6 +13463,7 @@ const struct Item gItemsInfo[] = { .name = ITEM_NAME("Dynamax Band"), .price = 0, + .importance = 1, .description = COMPOUND_STRING( "A band carrying a\n" "Wishing Star that\n" @@ -13050,7 +13479,7 @@ const struct Item gItemsInfo[] = [ITEM_BICYCLE] = { - .name = ITEM_NAME("Bicycle"), + .name = ITEM_NAME("Bike"), .price = 0, .description = COMPOUND_STRING( "A folding bicycle\n" @@ -14766,8 +15195,8 @@ const struct Item gItemsInfo[] = [ITEM_FRESH_START_MOCHI] = { - .name = ITEM_NAME("Fresh Start Mochi"), - .pluralName = ITEM_PLURAL_NAME("Fresh Start Mochi"), + .name = ITEM_NAME("Fresh-Start Mochi"), + .pluralName = ITEM_PLURAL_NAME("Fresh-Start Mochi"), .price = 300, .description = COMPOUND_STRING( "An item that resets\n" @@ -14848,6 +15277,7 @@ const struct Item gItemsInfo[] = [ITEM_REMEDY] = { .name = ITEM_NAME("Remedy"), + .pluralName = ITEM_PLURAL_NAME("Remedies"), .price = 150, .description = COMPOUND_STRING( "A bitter powder\n" @@ -14867,6 +15297,7 @@ const struct Item gItemsInfo[] = [ITEM_FINE_REMEDY] = { .name = ITEM_NAME("Fine Remedy"), + .pluralName = ITEM_PLURAL_NAME("Fine Remedies"), .price = 150, .description = COMPOUND_STRING( "A bitter powder\n" @@ -14890,6 +15321,7 @@ const struct Item gItemsInfo[] = [ITEM_SUPERB_REMEDY] = { .name = ITEM_NAME("Superb Remedy"), + .pluralName = ITEM_PLURAL_NAME("Superb Remedies"), .price = 750, .description = COMPOUND_STRING( "A bitter powder\n" @@ -15032,6 +15464,7 @@ const struct Item gItemsInfo[] = [ITEM_TWICE_SPICED_RADISH] = { .name = ITEM_NAME("Twice-Spiced Radish"), + .pluralName = ITEM_PLURAL_NAME("Twice-Spiced Radishes"), .price = 1600, .description = sQuestionMarksDesc, .pocket = POCKET_ITEMS,