ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-31 08:23:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved Shiny Charm rerolls into config file

Browse Source
This commit is contained in:
Eduardo Quezada 2020-10-17 01:26:51 -03:00
parent 137d9801c0
commit 7fbd64ec37
3 changed files with 2 additions and 2 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 @@
#endif #endif
// Item config // Item config
#define P_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 P_KEY_FOSSILS GEN_7 // In Gen4+, all Gen 3 fossils became regular items. #define P_KEY_FOSSILS GEN_7 // In Gen4+, all Gen 3 fossils became regular items.
#define P_KEY_ESCAPE_ROPE GEN_7 // In Gen8, Escape Rope became a Key Item. #define P_KEY_ESCAPE_ROPE GEN_7 // In Gen8, Escape Rope became a Key Item.

1
include/constants/pokemon.h
View File

@ -91,7 +91,6 @@
// Shiny odds // Shiny odds
#define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536 #define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536
#define SHINY_CHARM_REROLLS 3 // Amount of re-rolls if has Shiny Charm.
// Flags for Get(Box)MonData / Set(Box)MonData // Flags for Get(Box)MonData / Set(Box)MonData
#define MON_DATA_PERSONALITY 0 #define MON_DATA_PERSONALITY 0

2
src/pokemon.c
View File

@ -2233,7 +2233,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
personality = Random32(); personality = Random32();
shinyValue = HIHALF(value) ^ LOHALF(value) ^ HIHALF(personality) ^ LOHALF(personality); shinyValue = HIHALF(value) ^ LOHALF(value) ^ HIHALF(personality) ^ LOHALF(personality);
rolls++; rolls++;
} while (shinyValue >= SHINY_ODDS && rolls < SHINY_CHARM_REROLLS); } while (shinyValue >= SHINY_ODDS && rolls < P_SHINY_CHARM_REROLLS);
} }
} }