From ff482957bd93415cd373a3638a6fcdcd52663ea8 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 8 Mar 2024 19:26:25 -0300 Subject: [PATCH] Made ScriptGiveMonParameterized recognize the state of P_FLAG_FORCE_SHINY and P_FLAG_FORCE_NO_SHINY (#4256) * Made ScriptGiveMonParameterized recognize the state of the P_FLAG_FORCE_SHINY * And made it respect P_FLAG_FORCE_NO_SHINY too --- src/script_pokemon_util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/script_pokemon_util.c b/src/script_pokemon_util.c index abe3efe1a2..37f0336f11 100644 --- a/src/script_pokemon_util.c +++ b/src/script_pokemon_util.c @@ -313,6 +313,10 @@ 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; + 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