ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-19 18:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1445 from LOuroboros/the_potion_seller

Browse Source 
Added a config for the amount of HP recovered by healing items
This commit is contained in:
ExpoSeed 2021-04-07 15:42:25 -05:00 committed by GitHub
commit f2ad600cdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 3 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_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_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_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 // Ball config
#define I_LURE_BALL_MODIFIER GEN_7 // In Gen7+, Lure Ball's catch multiplier is x5 instead of x3. #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] = { const u8 gItemEffect_HyperPotion[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
#if I_LEGACY_HEALING_ITEMS >= GEN_7
[6] = 120, // Amount of HP to recover [6] = 120, // Amount of HP to recover
#else
[6] = 200, // Amount of HP to recover
#endif
}; };
const u8 gItemEffect_SuperPotion[7] = { const u8 gItemEffect_SuperPotion[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
#if I_LEGACY_HEALING_ITEMS >= GEN_7
[6] = 60, // Amount of HP to recover [6] = 60, // Amount of HP to recover
#else
[6] = 50, // Amount of HP to recover
#endif
}; };
const u8 gItemEffect_FullHeal[6] = { const u8 gItemEffect_FullHeal[6] = {
@ -60,17 +68,29 @@ const u8 gItemEffect_MaxRevive[7] = {
const u8 gItemEffect_FreshWater[7] = { const u8 gItemEffect_FreshWater[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
#if I_LEGACY_HEALING_ITEMS >= GEN_7
[6] = 30, // Amount of HP to recover [6] = 30, // Amount of HP to recover
#else
[6] = 50, // Amount of HP to recover
#endif
}; };
const u8 gItemEffect_SodaPop[7] = { const u8 gItemEffect_SodaPop[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
#if I_LEGACY_HEALING_ITEMS >= GEN_7
[6] = 50, // Amount of HP to recover [6] = 50, // Amount of HP to recover
#else
[6] = 60, // Amount of HP to recover
#endif
}; };
const u8 gItemEffect_Lemonade[7] = { const u8 gItemEffect_Lemonade[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
#if I_LEGACY_HEALING_ITEMS >= GEN_7
[6] = 70, // Amount of HP to recover [6] = 70, // Amount of HP to recover
#else
[6] = 80, // Amount of HP to recover
#endif
}; };
const u8 gItemEffect_MoomooMilk[7] = { const u8 gItemEffect_MoomooMilk[7] = {
@ -81,7 +101,11 @@ const u8 gItemEffect_MoomooMilk[7] = {
const u8 gItemEffect_EnergyPowder[10] = { const u8 gItemEffect_EnergyPowder[10] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[5] = ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_FRIENDSHIP_ALL,
#if I_LEGACY_HEALING_ITEMS >= GEN_7
[6] = 60, // Amount of HP to recover [6] = 60, // Amount of HP to recover
#else
[6] = 50, // Amount of HP to recover
#endif
[7] = -5, // Friendship change, low [7] = -5, // Friendship change, low
[8] = -5, // Friendship change, mid [8] = -5, // Friendship change, mid
[9] = -10, // Friendship change, high [9] = -10, // Friendship change, high
@ -90,7 +114,11 @@ const u8 gItemEffect_EnergyPowder[10] = {
const u8 gItemEffect_EnergyRoot[10] = { const u8 gItemEffect_EnergyRoot[10] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[5] = ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_FRIENDSHIP_ALL,
#if I_LEGACY_HEALING_ITEMS >= GEN_7
[6] = 120, // Amount of HP to recover [6] = 120, // Amount of HP to recover
#else
[6] = 200, // Amount of HP to recover
#endif
[7] = -10, // Friendship change, low [7] = -10, // Friendship change, low
[8] = -10, // Friendship change, mid [8] = -10, // Friendship change, mid
[9] = -15, // Friendship change, high [9] = -15, // Friendship change, high