diff --git a/include/constants/item_config.h b/include/constants/item_config.h index e78f748fa9..0311491e65 100644 --- a/include/constants/item_config.h +++ b/include/constants/item_config.h @@ -14,6 +14,7 @@ #define I_SHINY_CHARM_REROLLS 3 // Amount of re-rolls if the player has the Shiny Charm. Set to 0 to disable Shiny Charm's effects. #define I_KEY_FOSSILS GEN_7 // In Gen4+, all Gen 3 fossils became regular items. #define I_KEY_ESCAPE_ROPE GEN_7 // In Gen8, Escape Rope became a Key Item. Keep in mind, this will make it free to buy in marts. +#define I_LEGACY_HEALING_ITEMS GEN_7 // In Gen7+, certain healing items recover less HP than they used to. // Ball config #define I_LURE_BALL_MODIFIER GEN_7 // In Gen7+, Lure Ball's catch multiplier is x5 instead of x3. diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index c07a70071f..e8b791c775 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -36,12 +36,20 @@ const u8 gItemEffect_MaxPotion[7] = { const u8 gItemEffect_HyperPotion[7] = { [4] = ITEM4_HEAL_HP, +#if I_LEGACY_HEALING_ITEMS >= GEN_7 [6] = 120, // Amount of HP to recover +#else + [6] = 200, // Amount of HP to recover +#endif }; const u8 gItemEffect_SuperPotion[7] = { [4] = ITEM4_HEAL_HP, +#if I_LEGACY_HEALING_ITEMS >= GEN_7 [6] = 60, // Amount of HP to recover +#else + [6] = 50, // Amount of HP to recover +#endif }; const u8 gItemEffect_FullHeal[6] = { @@ -60,17 +68,29 @@ const u8 gItemEffect_MaxRevive[7] = { const u8 gItemEffect_FreshWater[7] = { [4] = ITEM4_HEAL_HP, +#if I_LEGACY_HEALING_ITEMS >= GEN_7 [6] = 30, // Amount of HP to recover +#else + [6] = 50, // Amount of HP to recover +#endif }; const u8 gItemEffect_SodaPop[7] = { [4] = ITEM4_HEAL_HP, +#if I_LEGACY_HEALING_ITEMS >= GEN_7 [6] = 50, // Amount of HP to recover +#else + [6] = 60, // Amount of HP to recover +#endif }; const u8 gItemEffect_Lemonade[7] = { [4] = ITEM4_HEAL_HP, +#if I_LEGACY_HEALING_ITEMS >= GEN_7 [6] = 70, // Amount of HP to recover +#else + [6] = 80, // Amount of HP to recover +#endif }; const u8 gItemEffect_MoomooMilk[7] = { @@ -81,16 +101,24 @@ const u8 gItemEffect_MoomooMilk[7] = { const u8 gItemEffect_EnergyPowder[10] = { [4] = ITEM4_HEAL_HP, [5] = ITEM5_FRIENDSHIP_ALL, - [6] = 60, // Amount of HP to recover - [7] = -5, // Friendship change, low - [8] = -5, // Friendship change, mid +#if I_LEGACY_HEALING_ITEMS >= GEN_7 + [6] = 60, // Amount of HP to recover +#else + [6] = 50, // Amount of HP to recover +#endif + [7] = -5, // Friendship change, low + [8] = -5, // Friendship change, mid [9] = -10, // Friendship change, high }; const u8 gItemEffect_EnergyRoot[10] = { [4] = ITEM4_HEAL_HP, [5] = ITEM5_FRIENDSHIP_ALL, +#if I_LEGACY_HEALING_ITEMS >= GEN_7 [6] = 120, // Amount of HP to recover +#else + [6] = 200, // Amount of HP to recover +#endif [7] = -10, // Friendship change, low [8] = -10, // Friendship change, mid [9] = -15, // Friendship change, high