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

I_LEGACY_HEALING_ITEMS -> I_HEALTH_RECOVERY

Browse source 
Also fixed its inaccurate description.
This commit is contained in:
LOuroboros 2021-11-17 07:15:14 -03:00
parent 56565b029c
commit 7ae30f8913
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/constants/item_config.h
View file

@ -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

14
src/data/pokemon/item_effects.h
View file

@ -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