From 7ae30f891333f945ed489fc092d9c9ceea2c3ac2 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 17 Nov 2021 07:15:14 -0300 Subject: [PATCH] I_LEGACY_HEALING_ITEMS -> I_HEALTH_RECOVERY Also fixed its inaccurate description. --- include/constants/item_config.h | 2 +- src/data/pokemon/item_effects.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/constants/item_config.h b/include/constants/item_config.h index 8b6d82824..1b41fef6f 100644 --- a/include/constants/item_config.h +++ b/include/constants/item_config.h @@ -16,7 +16,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. +#define I_HEALTH_RECOVERY GEN_7 // In Gen7+, certain healing items recover a different amount of HP than they used to. #define I_SITRUS_BERRY_HEAL GEN_7 // In Gen4+, Sitrus Berry was changed from healing 30 HP to healing 25% of Max HP. #endif // GUARD_CONSTANTS_ITEM_CONFIG_H diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index 60e577238..5050367cf 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -36,7 +36,7 @@ const u8 gItemEffect_MaxPotion[7] = { const u8 gItemEffect_HyperPotion[7] = { [4] = ITEM4_HEAL_HP, -#if I_LEGACY_HEALING_ITEMS >= GEN_7 +#if I_HEALTH_RECOVERY >= GEN_7 [6] = 120, // Amount of HP to recover #else [6] = 200, // Amount of HP to recover @@ -45,7 +45,7 @@ const u8 gItemEffect_HyperPotion[7] = { const u8 gItemEffect_SuperPotion[7] = { [4] = ITEM4_HEAL_HP, -#if I_LEGACY_HEALING_ITEMS >= GEN_7 +#if I_HEALTH_RECOVERY >= GEN_7 [6] = 60, // Amount of HP to recover #else [6] = 50, // Amount of HP to recover @@ -68,7 +68,7 @@ const u8 gItemEffect_MaxRevive[7] = { const u8 gItemEffect_FreshWater[7] = { [4] = ITEM4_HEAL_HP, -#if I_LEGACY_HEALING_ITEMS >= GEN_7 +#if I_HEALTH_RECOVERY >= GEN_7 [6] = 30, // Amount of HP to recover #else [6] = 50, // Amount of HP to recover @@ -77,7 +77,7 @@ const u8 gItemEffect_FreshWater[7] = { const u8 gItemEffect_SodaPop[7] = { [4] = ITEM4_HEAL_HP, -#if I_LEGACY_HEALING_ITEMS >= GEN_7 +#if I_HEALTH_RECOVERY >= GEN_7 [6] = 50, // Amount of HP to recover #else [6] = 60, // Amount of HP to recover @@ -86,7 +86,7 @@ const u8 gItemEffect_SodaPop[7] = { const u8 gItemEffect_Lemonade[7] = { [4] = ITEM4_HEAL_HP, -#if I_LEGACY_HEALING_ITEMS >= GEN_7 +#if I_HEALTH_RECOVERY >= GEN_7 [6] = 70, // Amount of HP to recover #else [6] = 80, // Amount of HP to recover @@ -101,7 +101,7 @@ const u8 gItemEffect_MoomooMilk[7] = { const u8 gItemEffect_EnergyPowder[10] = { [4] = ITEM4_HEAL_HP, [5] = ITEM5_FRIENDSHIP_ALL, -#if I_LEGACY_HEALING_ITEMS >= GEN_7 +#if I_HEALTH_RECOVERY >= GEN_7 [6] = 60, // Amount of HP to recover #else [6] = 50, // Amount of HP to recover @@ -114,7 +114,7 @@ const u8 gItemEffect_EnergyPowder[10] = { const u8 gItemEffect_EnergyRoot[10] = { [4] = ITEM4_HEAL_HP, [5] = ITEM5_FRIENDSHIP_ALL, -#if I_LEGACY_HEALING_ITEMS >= GEN_7 +#if I_HEALTH_RECOVERY >= GEN_7 [6] = 120, // Amount of HP to recover #else [6] = 200, // Amount of HP to recover