ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 20:24:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'rhh/item_expansion' into item_expansion_sync

Browse Source
This commit is contained in:
ultima-soul 2021-12-03 17:31:02 -08:00
commit 349262ebc3
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/hold_effects.h
View File

@ -67,7 +67,7 @@
#define HOLD_EFFECT_LUCKY_PUNCH 63 #define HOLD_EFFECT_LUCKY_PUNCH 63
#define HOLD_EFFECT_METAL_POWDER 64 #define HOLD_EFFECT_METAL_POWDER 64
#define HOLD_EFFECT_THICK_CLUB 65 #define HOLD_EFFECT_THICK_CLUB 65
#define HOLD_EFFECT_LEEK 66 #define HOLD_EFFECT_LEEK 66
// Gen4 hold effects. // Gen4 hold effects.
#define HOLD_EFFECT_CHOICE_SCARF 67 #define HOLD_EFFECT_CHOICE_SCARF 67

3
include/constants/item_config.h
View File

@ -16,7 +16,8 @@
#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. #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. #define I_SITRUS_BERRY_HEAL GEN_7 // In Gen4+, Sitrus Berry was changed from healing 30 HP to healing 25% of Max HP.
#define I_VITAMIN_EV_CAP GEN_8 // In Gen8, the Vitamins no longer have a cap of 100 EV per stat.
#endif // GUARD_CONSTANTS_ITEM_CONFIG_H #endif // GUARD_CONSTANTS_ITEM_CONFIG_H

4
include/constants/pokemon.h
View File

@ -280,7 +280,11 @@
#define USE_RANDOM_IVS (MAX_PER_STAT_IVS + 1) #define USE_RANDOM_IVS (MAX_PER_STAT_IVS + 1)
#define MAX_PER_STAT_EVS 255 #define MAX_PER_STAT_EVS 255
#define MAX_TOTAL_EVS 510 #define MAX_TOTAL_EVS 510
#if I_VITAMIN_EV_CAP >= GEN_8
#define EV_ITEM_RAISE_LIMIT MAX_PER_STAT_EVS
#else
#define EV_ITEM_RAISE_LIMIT 100 #define EV_ITEM_RAISE_LIMIT 100
#endif
// Battle move flags // Battle move flags
#define FLAG_MAKES_CONTACT (1 << 0) #define FLAG_MAKES_CONTACT (1 << 0)

2
src/data/object_events/berry_tree_graphics_tables.h
View File

@ -766,7 +766,7 @@ const u8 *const gBerryTreePaletteSlotTablePointers[] = {
[ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Roseli, [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Roseli,
[ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Micle, [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Micle,
[ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Custap, [ITEM_CUSTAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Custap,
[ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Custap, [ITEM_JABOCA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Jaboca,
[ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rowap, [ITEM_ROWAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rowap,
[ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha, [ITEM_KEE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha,
[ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Occa, [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Occa,

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

@ -36,7 +36,7 @@ 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 #if I_HEALTH_RECOVERY >= GEN_7
[6] = 120, // Amount of HP to recover [6] = 120, // Amount of HP to recover
#else #else
[6] = 200, // Amount of HP to recover [6] = 200, // Amount of HP to recover
@ -45,7 +45,7 @@ const u8 gItemEffect_HyperPotion[7] = {
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 #if I_HEALTH_RECOVERY >= GEN_7
[6] = 60, // Amount of HP to recover [6] = 60, // Amount of HP to recover
#else #else
[6] = 50, // Amount of HP to recover [6] = 50, // Amount of HP to recover
@ -68,7 +68,7 @@ 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 #if I_HEALTH_RECOVERY >= GEN_7
[6] = 30, // Amount of HP to recover [6] = 30, // Amount of HP to recover
#else #else
[6] = 50, // Amount of HP to recover [6] = 50, // Amount of HP to recover
@ -77,7 +77,7 @@ const u8 gItemEffect_FreshWater[7] = {
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 #if I_HEALTH_RECOVERY >= GEN_7
[6] = 50, // Amount of HP to recover [6] = 50, // Amount of HP to recover
#else #else
[6] = 60, // Amount of HP to recover [6] = 60, // Amount of HP to recover
@ -86,7 +86,7 @@ const u8 gItemEffect_SodaPop[7] = {
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 #if I_HEALTH_RECOVERY >= GEN_7
[6] = 70, // Amount of HP to recover [6] = 70, // Amount of HP to recover
#else #else
[6] = 80, // Amount of HP to recover [6] = 80, // Amount of HP to recover
@ -101,7 +101,7 @@ 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 #if I_HEALTH_RECOVERY >= GEN_7
[6] = 60, // Amount of HP to recover [6] = 60, // Amount of HP to recover
#else #else
[6] = 50, // Amount of HP to recover [6] = 50, // Amount of HP to recover
@ -114,7 +114,7 @@ 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 #if I_HEALTH_RECOVERY >= GEN_7
[6] = 120, // Amount of HP to recover [6] = 120, // Amount of HP to recover
#else #else
[6] = 200, // Amount of HP to recover [6] = 200, // Amount of HP to recover