mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-03-08 08:27:52 +01:00
Merge pull request #2064 from AsparagusEduardo/PE_dexShinyGenderFix
Addressed inconsistency in behavior with Shiny mon with gender differences upon catch
This commit is contained in:
commit
909602ae58
@ -3989,10 +3989,7 @@ static void Task_DisplayCaughtMonDexPage(u8 taskId)
|
|||||||
gTasks[taskId].tState++;
|
gTasks[taskId].tState++;
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
if ((gBaseStats[dexNum].flags & FLAG_GENDER_DIFFERENCE))
|
spriteId = CreateMonPicSprite(dexNum, 0, ((u16)gTasks[taskId].tPersonalityHi << 16) | (u16)gTasks[taskId].tPersonalityLo, TRUE, MON_PAGE_X, MON_PAGE_Y, 0, TAG_NONE);
|
||||||
spriteId = CreateMonPicSprite(dexNum, 0, ((u16)gTasks[taskId].tPersonalityHi << 16) | (u16)gTasks[taskId].tPersonalityLo, TRUE, MON_PAGE_X, MON_PAGE_Y, 0, TAG_NONE);
|
|
||||||
else
|
|
||||||
spriteId = CreateMonSpriteFromNationalDexNumber(dexNum, MON_PAGE_X, MON_PAGE_Y, 0);
|
|
||||||
gSprites[spriteId].oam.priority = 0;
|
gSprites[spriteId].oam.priority = 0;
|
||||||
BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK);
|
BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK);
|
||||||
SetVBlankCallback(gPokedexVBlankCB);
|
SetVBlankCallback(gPokedexVBlankCB);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user