dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #460 from Sewef/master

Browse Source 
Use SHINY_ODDS where necessary
This commit is contained in:
GriffinR
2021-08-19 13:37:01 -04:00
committed by GitHub
parent f77e1a9901 c7473dac0b
commit 9ad143bf24
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokedex_screen.c
+1 -1
View File
@@ -3100,7 +3100,7 @@ u8 DexScreen_DrawMonAreaPage(void)
if (monIsCaught) if (monIsCaught)
{ {
sPokedexScreenData->windowIds[14] = CreateMonPicSprite_HandleDeoxys(species, 8, DexScreen_GetDefaultPersonality(species), TRUE, 40, 104, 0, 0xFFFF); sPokedexScreenData->windowIds[14] = CreateMonPicSprite_HandleDeoxys(species, SHINY_ODDS, DexScreen_GetDefaultPersonality(species), TRUE, 40, 104, 0, 0xFFFF);
gSprites[sPokedexScreenData->windowIds[14]].oam.paletteNum = 2; gSprites[sPokedexScreenData->windowIds[14]].oam.paletteNum = 2;
gSprites[sPokedexScreenData->windowIds[14]].oam.affineMode = 1; gSprites[sPokedexScreenData->windowIds[14]].oam.affineMode = 1;
gSprites[sPokedexScreenData->windowIds[14]].oam.matrixNum = 2; gSprites[sPokedexScreenData->windowIds[14]].oam.matrixNum = 2;
src/pokemon.c
+4 -4
View File
@@ -1745,7 +1745,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
{ {
value = Random32(); value = Random32();
shinyValue = HIHALF(value) ^ LOHALF(value) ^ HIHALF(personality) ^ LOHALF(personality); shinyValue = HIHALF(value) ^ LOHALF(value) ^ HIHALF(personality) ^ LOHALF(personality);
} while (shinyValue < 8); } while (shinyValue < SHINY_ODDS);
} }
else if (otIdType == OT_ID_PRESET) //Pokemon has a preset OT ID else if (otIdType == OT_ID_PRESET) //Pokemon has a preset OT ID
{ {
@@ -5712,7 +5712,7 @@ const u32 *GetMonSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 p
return gMonPaletteTable[0].data; return gMonPaletteTable[0].data;
shinyValue = HIHALF(otId) ^ LOHALF(otId) ^ HIHALF(personality) ^ LOHALF(personality); shinyValue = HIHALF(otId) ^ LOHALF(otId) ^ HIHALF(personality) ^ LOHALF(personality);
if (shinyValue < 8) if (shinyValue < SHINY_ODDS)
return gMonShinyPaletteTable[species].data; return gMonShinyPaletteTable[species].data;
else else
return gMonPaletteTable[species].data; return gMonPaletteTable[species].data;
@@ -5731,7 +5731,7 @@ const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u
u32 shinyValue; u32 shinyValue;
shinyValue = HIHALF(otId) ^ LOHALF(otId) ^ HIHALF(personality) ^ LOHALF(personality); shinyValue = HIHALF(otId) ^ LOHALF(otId) ^ HIHALF(personality) ^ LOHALF(personality);
if (shinyValue < 8) if (shinyValue < SHINY_ODDS)
return &gMonShinyPaletteTable[species]; return &gMonShinyPaletteTable[species];
else else
return &gMonPaletteTable[species]; return &gMonPaletteTable[species];
@@ -5865,7 +5865,7 @@ static bool8 IsShinyOtIdPersonality(u32 otId, u32 personality)
{ {
bool8 retVal = FALSE; bool8 retVal = FALSE;
u32 shinyValue = HIHALF(otId) ^ LOHALF(otId) ^ HIHALF(personality) ^ LOHALF(personality); u32 shinyValue = HIHALF(otId) ^ LOHALF(otId) ^ HIHALF(personality) ^ LOHALF(personality);
if (shinyValue < 8) if (shinyValue < SHINY_ODDS)
retVal = TRUE; retVal = TRUE;
return retVal; return retVal;
} }