No shinies in EV training

This commit is contained in:
resetes12
2023-10-26 11:37:56 +02:00
parent caf2d1ee8a
commit 15418ec5f2
4 changed files with 43 additions and 2 deletions

View File

@@ -46,10 +46,12 @@ BattleFrontier_Lounge9_EV_HP_Yes::
waitmessage
setflag FLAG_SYS_NO_CATCHING
setflag FLAG_SYS_SET_BATTLE_BGM
setflag FLAG_NO_SHINY
setvar VAR_TEMP_F, MUS_RG_VS_WILD
setwildbattle SPECIES_WAILORD, 1, ITEM_NONE
dowildbattle
clearflag FLAG_SYS_NO_CATCHING
clearflag FLAG_NO_SHINY
release
end
@@ -69,10 +71,12 @@ BattleFrontier_Lounge9_EV_ATK_Yes::
waitmessage
setflag FLAG_SYS_NO_CATCHING
setflag FLAG_SYS_SET_BATTLE_BGM
setflag FLAG_NO_SHINY
setvar VAR_TEMP_F, MUS_RG_VS_WILD
setwildbattle SPECIES_GALLADE, 1, ITEM_NONE
dowildbattle
clearflag FLAG_SYS_NO_CATCHING
clearflag FLAG_NO_SHINY
release
end
@@ -92,10 +96,12 @@ BattleFrontier_Lounge9_EV_SATK_Yes::
waitmessage
setflag FLAG_SYS_NO_CATCHING
setflag FLAG_SYS_SET_BATTLE_BGM
setflag FLAG_NO_SHINY
setvar VAR_TEMP_F, MUS_RG_VS_WILD
setwildbattle SPECIES_GARDEVOIR, 1, ITEM_NONE
dowildbattle
clearflag FLAG_SYS_NO_CATCHING
clearflag FLAG_NO_SHINY
release
end
@@ -115,10 +121,12 @@ BattleFrontier_Lounge9_EV_DEF_Yes::
waitmessage
setflag FLAG_SYS_NO_CATCHING
setflag FLAG_SYS_SET_BATTLE_BGM
setflag FLAG_NO_SHINY
setvar VAR_TEMP_F, MUS_RG_VS_WILD
setwildbattle SPECIES_AGGRON, 1, ITEM_NONE
dowildbattle
clearflag FLAG_SYS_NO_CATCHING
clearflag FLAG_NO_SHINY
release
end
@@ -138,10 +146,12 @@ BattleFrontier_Lounge9_EV_SDEF_Yes::
waitmessage
setflag FLAG_SYS_NO_CATCHING
setflag FLAG_SYS_SET_BATTLE_BGM
setflag FLAG_NO_SHINY
setvar VAR_TEMP_F, MUS_RG_VS_WILD
setwildbattle SPECIES_LUDICOLO, 1, ITEM_NONE
dowildbattle
clearflag FLAG_SYS_NO_CATCHING
clearflag FLAG_NO_SHINY
release
end
@@ -161,10 +171,12 @@ BattleFrontier_Lounge9_EV_SPD_Yes::
waitmessage
setflag FLAG_SYS_NO_CATCHING
setflag FLAG_SYS_SET_BATTLE_BGM
setflag FLAG_NO_SHINY
setvar VAR_TEMP_F, MUS_RG_VS_WILD
setwildbattle SPECIES_SCEPTILE, 1, ITEM_NONE
dowildbattle
clearflag FLAG_SYS_NO_CATCHING
clearflag FLAG_NO_SHINY
release
end

View File

@@ -456,7 +456,7 @@
#define FLAG_REMATCH_WALLACE 0x1A9
#define FLAG_DIFFICULTY_HARD 0x1AA
#define FLAG_UNUSED_0x1AB 0x1AB //Unused
#define FLAG_NO_SHINY 0x1AB
#define FLAG_DEFEATED_DEOXYS 0x1AC
#define FLAG_BATTLED_DEOXYS 0x1AD

23
install-devkitpro-pacman Executable file
View File

@@ -0,0 +1,23 @@
#!/usr/bin/env bash
if ! [ $(id -u) = 0 ]; then
echo "Need root privilege to install!"
exit 1
fi
# ensure apt is set up to work with https sources
apt-get install apt-transport-https
# Store devkitPro gpg key locally if we don't have it already
if ! [ -f /usr/local/share/keyring/devkitpro-pub.gpg ]; then
mkdir -p /usr/local/share/keyring/
wget -O /usr/local/share/keyring/devkitpro-pub.gpg https://apt.devkitpro.org/devkitpro-pub.gpg
fi
# Add the devkitPro apt repository if we don't have it set up already
if ! [ -f /etc/apt/sources.list.d/devkitpro.list ]; then
echo "deb [signed-by=/usr/local/share/keyring/devkitpro-pub.gpg] https://apt.devkitpro.org stable main" > /etc/apt/sources.list.d/devkitpro.list
fi
# Finally install devkitPro pacman
apt-get update
apt-get install devkitpro-pacman

View File

@@ -4927,7 +4927,13 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
if (otIdType == OT_ID_RANDOM_NO_SHINY)
{
u32 shinyValue;
if (gSaveBlock2Ptr->optionsShinyChance == 0) // 1/8192
if (FlagGet(FLAG_NO_SHINY) == TRUE) // No shiny
do
{
value = Random32();
shinyValue = GET_SHINY_VALUE(value, personality);
} while (shinyValue = 0);
else if (gSaveBlock2Ptr->optionsShinyChance == 0) // 1/8192
do
{
// Choose random OT IDs until one that results in a non-shiny Pokémon