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

Added a config for the amount of HP recovered by healing items

Browse source
This commit is contained in:
LOuroboros 2021-04-02 20:34:57 -03:00
parent ac9828d016
commit f04f35f5c3
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/constants/item_config.h
View file

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

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

@ -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,
#else
[6] = 200,
#endif
};
const u8 gItemEffect_SuperPotion[7] = {
[4] = ITEM4_HEAL_HP,
#if I_LEGACY_HEALING_ITEMS >= GEN_7
[6] = 60,
#else
[6] = 50,
#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,
#else
[6] = 50,
#endif
};
const u8 gItemEffect_SodaPop[7] = {
[4] = ITEM4_HEAL_HP,
#if I_LEGACY_HEALING_ITEMS >= GEN_7
[6] = 50,
#else
[6] = 60,
#endif
};
const u8 gItemEffect_Lemonade[7] = {
[4] = ITEM4_HEAL_HP,
#if I_LEGACY_HEALING_ITEMS >= GEN_7
[6] = 70,
#else
[6] = 80,
#endif
};
const u8 gItemEffect_MoomooMilk[7] = {
@ -81,7 +101,11 @@ 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
[6] = 60,
#else
[6] = 50,
#endif
[7] = -5,
[8] = -5,
[9] = -10,
@ -90,7 +114,11 @@ 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
[6] = 120,
#else
[6] = 200,
#endif
[7] = -10,
[8] = -10,
[9] = -15,