ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use SHINY_ODDS macro where intended

Browse Source 
The 3 locations where SHINY_ODDS was added generate mon sprites for
display in the dex, at game start and on starter choice.
The arguments are intended for otId but in this case they are set to the
same value as SHINY_ODDS to prevent the pictures created from using the
shiny palette.
This commit is contained in:
Sebastian Gabl 2020-01-15 14:48:17 +01:00 committed by huderlem
parent 69833181d9
commit 5fff2f2234
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main_menu.c
View File

@ -1884,7 +1884,7 @@ static void SpriteCB_MovePlayerDownWhileShrinking(struct Sprite *sprite)
static u8 NewGameBirchSpeech_CreateLotadSprite(u8 a, u8 b) static u8 NewGameBirchSpeech_CreateLotadSprite(u8 a, u8 b)
{ {
return CreatePicSprite2(SPECIES_LOTAD, 8, 0, 1, a, b, 14, -1); return CreatePicSprite2(SPECIES_LOTAD, SHINY_ODDS, 0, 1, a, b, 14, -1);
} }
static void AddBirchSpeechObjects(u8 taskId) static void AddBirchSpeechObjects(u8 taskId)

2
src/pokedex.c
View File

@ -4674,7 +4674,7 @@ u32 sub_80C0E68(u16 a)
u16 CreateMonSpriteFromNationalDexNumber(u16 nationalNum, s16 x, s16 y, u16 paletteSlot) u16 CreateMonSpriteFromNationalDexNumber(u16 nationalNum, s16 x, s16 y, u16 paletteSlot)
{ {
nationalNum = NationalPokedexNumToSpecies(nationalNum); nationalNum = NationalPokedexNumToSpecies(nationalNum);
return CreateMonPicSprite_HandleDeoxys(nationalNum, 8, sub_80C0E68(nationalNum), TRUE, x, y, paletteSlot, 0xFFFF); return CreateMonPicSprite_HandleDeoxys(nationalNum, SHINY_ODDS, sub_80C0E68(nationalNum), TRUE, x, y, paletteSlot, 0xFFFF);
} }
u16 sub_80C0EF8(u16 species, s16 x, s16 y, s8 paletteSlot) u16 sub_80C0EF8(u16 species, s16 x, s16 y, s8 paletteSlot)

2
src/starter_choose.c
View File

@ -640,7 +640,7 @@ static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y)
{ {
u8 spriteId; u8 spriteId;
spriteId = CreatePicSprite2(species, 8, 0, 1, x, y, 0xE, 0xFFFF); spriteId = CreatePicSprite2(species, SHINY_ODDS, 0, 1, x, y, 0xE, 0xFFFF);
gSprites[spriteId].oam.priority = 0; gSprites[spriteId].oam.priority = 0;
return spriteId; return spriteId;
} }