From cc1d748b47b3599c3bda3d03efc7b63bda6864a7 Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Sat, 30 Sep 2023 18:34:52 -0500 Subject: [PATCH] Fixed Shiny Charm doing too many rerolls by default (#3327) Co-authored-by: Eduardo Quezada D'Ottone --- include/config/item.h | 2 +- src/pokemon.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/config/item.h b/include/config/item.h index 0cd89b612..c0575a352 100644 --- a/include/config/item.h +++ b/include/config/item.h @@ -2,7 +2,7 @@ #define GUARD_CONFIG_ITEM_H // Item config -#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_ADDITIONAL_ROLLS 2 // Amount of additional shiny rolls if the player has the Shiny Charm. Set it to 0 to disable Shiny Charm's effects. #define I_KEY_FOSSILS GEN_LATEST // In Gen4+, all Gen 3 fossils became regular items. #define I_KEY_ESCAPE_ROPE GEN_LATEST // In Gen8, Escape Rope became a Key Item. Keep in mind, this will make it free to buy in marts. #define I_HEALTH_RECOVERY GEN_LATEST // In Gen7+, certain healing items recover a different amount of HP than they used to. diff --git a/src/pokemon.c b/src/pokemon.c index 1320774f1..a360feb0b 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3488,7 +3488,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, { u32 totalRerolls = 0; if (CheckBagHasItem(ITEM_SHINY_CHARM, 1)) - totalRerolls += I_SHINY_CHARM_REROLLS; + totalRerolls += I_SHINY_CHARM_ADDITIONAL_ROLLS; if (LURE_STEP_COUNT != 0) totalRerolls += 1;