Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Made ScriptGiveMonParameterized recognize the state of P_FLAG_FORCE_SHINY and P_FLAG_FORCE_NO_SHINY #4256

Merged
merged 2 commits into from
Mar 8, 2024
Merged

Made ScriptGiveMonParameterized recognize the state of P_FLAG_FORCE_SHINY and P_FLAG_FORCE_NO_SHINY #4256

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18fb54e
Made ScriptGiveMonParameterized recognize the state of the P_FLAG_FOR…
LOuroboros Mar 7, 2024
7b140ba
And made it respect P_FLAG_FORCE_NO_SHINY too
LOuroboros Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/script_pokemon_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading