Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong palette for types sprites in hgss dex after catching mon (#8153)

Browse Source 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
This commit is contained in:
FosterProgramming 2025-11-13 11:36:26 +01:00 committed by GitHub
parent d85f97b3f7
commit db9460c670
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pokedex_plus_hgss.c
View File

@ -4088,6 +4088,12 @@ static void UNUSED HighlightScreenSelectBarItem(u8 selectedScreen, u16 unused)
#define tPersonalityLo data[14] #define tPersonalityLo data[14]
#define tPersonalityHi data[15] #define tPersonalityHi data[15]
// Types palettes need to be loaded at a different slot than anticipated by gTypesInfo
// to avoid overlapping with caught mon sprite palette slot
// Normal type info palette slots: 13, 14 and 15
// Caught mon palette slot: 15
#define TYPE_INFO_PALETTE_NUM_OFFSET -1
void Task_DisplayCaughtMonDexPageHGSS(u8 taskId) void Task_DisplayCaughtMonDexPageHGSS(u8 taskId)
{ {
u8 spriteId; u8 spriteId;
@ -4349,9 +4355,9 @@ static void SetTypeIconPosAndPal(u8 typeId, u8 x, u8 y, u8 spriteArrayId)
sprite = &gSprites[sPokedexView->typeIconSpriteIds[spriteArrayId]]; sprite = &gSprites[sPokedexView->typeIconSpriteIds[spriteArrayId]];
StartSpriteAnim(sprite, typeId); StartSpriteAnim(sprite, typeId);
if (typeId < NUMBER_OF_MON_TYPES) if (typeId < NUMBER_OF_MON_TYPES)
sprite->oam.paletteNum = gTypesInfo[typeId].palette; sprite->oam.paletteNum = gTypesInfo[typeId].palette + TYPE_INFO_PALETTE_NUM_OFFSET;
else else
sprite->oam.paletteNum = sContestCategoryToOamPaletteNum[typeId - NUMBER_OF_MON_TYPES]; sprite->oam.paletteNum = sContestCategoryToOamPaletteNum[typeId - NUMBER_OF_MON_TYPES] + TYPE_INFO_PALETTE_NUM_OFFSET;
sprite->x = x + 16; sprite->x = x + 16;
sprite->y = y + 8; sprite->y = y + 8;
SetSpriteInvisibility(spriteArrayId, FALSE); SetSpriteInvisibility(spriteArrayId, FALSE);
@ -4392,7 +4398,8 @@ static void CreateTypeIconSprites(void)
u8 i; u8 i;
LoadCompressedSpriteSheet(&gSpriteSheet_MoveTypes); LoadCompressedSpriteSheet(&gSpriteSheet_MoveTypes);
LoadPalette(gMoveTypes_Pal, 0x1D0, 0x60); u32 paletteNum = gTypesInfo[TYPE_NORMAL].palette + TYPE_INFO_PALETTE_NUM_OFFSET;
LoadPalette(gMoveTypes_Pal, OBJ_PLTT_ID(paletteNum), 3 * PLTT_SIZE_4BPP);
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
if (sPokedexView->typeIconSpriteIds[i] == 0xFF) if (sPokedexView->typeIconSpriteIds[i] == 0xFF)
@ -4572,6 +4579,7 @@ static u16 CreateSizeScreenTrainerPic(u16 species, s16 x, s16 y, s8 paletteSlot)
return CreateTrainerPicSprite(species, TRUE, x, y, paletteSlot, TAG_NONE); return CreateTrainerPicSprite(species, TRUE, x, y, paletteSlot, TAG_NONE);
} }
#undef TYPE_INFO_PALETTE_NUM_OFFSET
//************************************ //************************************
//* * //* *