From 126fdd554f2b7a3be3d3d7a7c0151e28306e80da Mon Sep 17 00:00:00 2001 From: FosterProgramming Date: Tue, 2 Dec 2025 15:59:10 +0100 Subject: [PATCH] Fix merge error that broke some hgss palette (#8411) --- src/pokedex_plus_hgss.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index ea96e764c3..2adf0d57a1 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -4351,7 +4351,7 @@ static void SetTypeIconPosAndPal(u8 typeId, u8 x, u8 y, u8 spriteArrayId) if (typeId < NUMBER_OF_MON_TYPES) sprite->oam.paletteNum = gTypesInfo[typeId].palette + TYPE_INFO_PALETTE_NUM_OFFSET; else - sprite->oam.paletteNum = gContestCategoryInfo[typeId - NUMBER_OF_MON_TYPES].palette; + sprite->oam.paletteNum = gContestCategoryInfo[typeId - NUMBER_OF_MON_TYPES].palette + TYPE_INFO_PALETTE_NUM_OFFSET; sprite->x = x + 16; sprite->y = y + 8; SetSpriteInvisibility(spriteArrayId, FALSE); @@ -4862,7 +4862,6 @@ static void Task_LoadStatsScreen(u8 taskId) sPokedexView->typeIconSpriteIds[1] = 0xFF; CreateTypeIconSprites(); sPokedexView->categoryIconSpriteId = 0xFF; - LoadPalette(gMoveTypes_Pal, 0x1D0, 0x60); LoadCompressedSpriteSheet(&gSpriteSheet_CategoryIcons); LoadSpritePalette(&gSpritePal_CategoryIcons); gMain.state++;