From 18fb54ec1550251166e46b154bca1b3107bb6077 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 7 Mar 2024 19:14:17 -0300 Subject: [PATCH 1/2] Made ScriptGiveMonParameterized recognize the state of the P_FLAG_FORCE_SHINY --- src/script_pokemon_util.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/script_pokemon_util.c b/src/script_pokemon_util.c index abe3efe1a28b..cad41c83a57f 100644 --- a/src/script_pokemon_util.c +++ b/src/script_pokemon_util.c @@ -313,6 +313,8 @@ u32 ScriptGiveMonParameterized(u16 species, u8 level, u16 item, u8 ball, u8 natu CreateMonWithNature(&mon, species, level, 32, nature); // shininess + if (P_FLAG_FORCE_SHINY != 0 && FlagGet(P_FLAG_FORCE_SHINY)) + isShiny = TRUE; SetMonData(&mon, MON_DATA_IS_SHINY, &isShiny); // gigantamax factor From 7b140bab49b33f3e1bb16a0565ce1b18215475f3 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 7 Mar 2024 19:30:20 -0300 Subject: [PATCH 2/2] And made it respect P_FLAG_FORCE_NO_SHINY too --- src/script_pokemon_util.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/script_pokemon_util.c b/src/script_pokemon_util.c index cad41c83a57f..37f0336f114d 100644 --- a/src/script_pokemon_util.c +++ b/src/script_pokemon_util.c @@ -315,6 +315,8 @@ u32 ScriptGiveMonParameterized(u16 species, u8 level, u16 item, u8 ball, u8 natu // shininess if (P_FLAG_FORCE_SHINY != 0 && FlagGet(P_FLAG_FORCE_SHINY)) isShiny = TRUE; + else if (P_FLAG_FORCE_NO_SHINY != 0 && FlagGet(P_FLAG_FORCE_NO_SHINY)) + isShiny = FALSE; SetMonData(&mon, MON_DATA_IS_SHINY, &isShiny); // gigantamax factor