From 67f12ef7820444e6ea9ae827b2d09872c6c1b2a0 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Sat, 13 Nov 2021 11:56:17 -0300 Subject: [PATCH 1/6] Fixed Hold Effect file spacing --- include/constants/hold_effects.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index 955a78204..d15e50d5f 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -67,7 +67,7 @@ #define HOLD_EFFECT_LUCKY_PUNCH 63 #define HOLD_EFFECT_METAL_POWDER 64 #define HOLD_EFFECT_THICK_CLUB 65 -#define HOLD_EFFECT_LEEK 66 +#define HOLD_EFFECT_LEEK 66 // Gen4 hold effects. #define HOLD_EFFECT_CHOICE_SCARF 67 From 70609ac742df03e2f6e1afc2c1131df2f95dc8f7 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Sun, 14 Nov 2021 00:41:00 -0300 Subject: [PATCH 2/6] Fixed Jacoba Berry Tree not using its own palette --- src/data/object_events/berry_tree_graphics_tables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/object_events/berry_tree_graphics_tables.h b/src/data/object_events/berry_tree_graphics_tables.h index 2ed2afccd..3f8dbbc9f 100755 --- a/src/data/object_events/berry_tree_graphics_tables.h +++ b/src/data/object_events/berry_tree_graphics_tables.h @@ -766,7 +766,7 @@ const u8 *const gBerryTreePaletteSlotTablePointers[] = { [ITEM_ROSELI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Roseli, [ITEM_MICLE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Micle, [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_KEE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha, [ITEM_MARANGA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Occa, From f62ec0630ae989ed79fb20261eed225ce62e9a5f Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 16 Nov 2021 18:16:13 -0300 Subject: [PATCH 3/6] Updated Vitamins cap --- include/constants/item_config.h | 1 + include/constants/pokemon.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/include/constants/item_config.h b/include/constants/item_config.h index 8b6d82824..1b271d44c 100644 --- a/include/constants/item_config.h +++ b/include/constants/item_config.h @@ -18,5 +18,6 @@ #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_SITRUS_BERRY_HEAL GEN_7 // In Gen4+, Sitrus Berry was changed from healing 30 HP to healing 25% of Max HP. +#define I_NEW_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 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 8769390c3..ad3274353 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -278,7 +278,11 @@ #define USE_RANDOM_IVS (MAX_PER_STAT_IVS + 1) #define MAX_PER_STAT_EVS 255 #define MAX_TOTAL_EVS 510 +#if I_NEW_VITAMIN_EV_CAP >= GEN_8 +#define EV_ITEM_RAISE_LIMIT MAX_PER_STAT_EVS +#elif #define EV_ITEM_RAISE_LIMIT 100 +#endif // Battle move flags #define FLAG_MAKES_CONTACT (1 << 0) From 7d71fe6ce826ab3f26cfab75ed8e25aa126cca05 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Tue, 16 Nov 2021 21:25:03 -0300 Subject: [PATCH 4/6] I_NEW_VITAMIN_EV_CAP -> I_VITAMIN_EV_CAP --- include/constants/item_config.h | 2 +- include/constants/pokemon.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/constants/item_config.h b/include/constants/item_config.h index 1b271d44c..82152f3d9 100644 --- a/include/constants/item_config.h +++ b/include/constants/item_config.h @@ -18,6 +18,6 @@ #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_SITRUS_BERRY_HEAL GEN_7 // In Gen4+, Sitrus Berry was changed from healing 30 HP to healing 25% of Max HP. -#define I_NEW_VITAMIN_EV_CAP GEN_8 // In Gen8, the Vitamins no longer have a cap of 100 EV per stat. +#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 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index ad3274353..9f223c9b1 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -278,7 +278,7 @@ #define USE_RANDOM_IVS (MAX_PER_STAT_IVS + 1) #define MAX_PER_STAT_EVS 255 #define MAX_TOTAL_EVS 510 -#if I_NEW_VITAMIN_EV_CAP >= GEN_8 +#if I_VITAMIN_EV_CAP >= GEN_8 #define EV_ITEM_RAISE_LIMIT MAX_PER_STAT_EVS #elif #define EV_ITEM_RAISE_LIMIT 100 From 7ae30f891333f945ed489fc092d9c9ceea2c3ac2 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 17 Nov 2021 07:15:14 -0300 Subject: [PATCH 5/6] 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 From ad8582064bf18b1cc554fe4ff8b147c1c329a72d Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 19 Nov 2021 18:49:30 -0300 Subject: [PATCH 6/6] #elif without condition bad, #else good --- include/constants/pokemon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 9f223c9b1..1b7c1ab71 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -280,7 +280,7 @@ #define MAX_TOTAL_EVS 510 #if I_VITAMIN_EV_CAP >= GEN_8 #define EV_ITEM_RAISE_LIMIT MAX_PER_STAT_EVS -#elif +#else #define EV_ITEM_RAISE_LIMIT 100 #endif