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:
ghoulslash 2022-04-27 08:49:49 -04:00 committed by GitHub
commit 909602ae58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3989,10 +3989,7 @@ static void Task_DisplayCaughtMonDexPage(u8 taskId)
gTasks[taskId].tState++;
break;
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);
else
spriteId = CreateMonSpriteFromNationalDexNumber(dexNum, MON_PAGE_X, MON_PAGE_Y, 0);
spriteId = CreateMonPicSprite(dexNum, 0, ((u16)gTasks[taskId].tPersonalityHi << 16) | (u16)gTasks[taskId].tPersonalityLo, TRUE, MON_PAGE_X, MON_PAGE_Y, 0, TAG_NONE);
gSprites[spriteId].oam.priority = 0;
BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK);
SetVBlankCallback(gPokedexVBlankCB);