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

Fix merge error that broke some hgss palette (#8411)

Browse Source
This commit is contained in:
FosterProgramming 2025-12-02 15:59:10 +01:00 committed by GitHub
parent 1a6d03344a
commit 126fdd554f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pokedex_plus_hgss.c
View File

@ -4351,7 +4351,7 @@ static void SetTypeIconPosAndPal(u8 typeId, u8 x, u8 y, u8 spriteArrayId)
if (typeId < NUMBER_OF_MON_TYPES) if (typeId < NUMBER_OF_MON_TYPES)
sprite->oam.paletteNum = gTypesInfo[typeId].palette + TYPE_INFO_PALETTE_NUM_OFFSET; sprite->oam.paletteNum = gTypesInfo[typeId].palette + TYPE_INFO_PALETTE_NUM_OFFSET;
else 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->x = x + 16;
sprite->y = y + 8; sprite->y = y + 8;
SetSpriteInvisibility(spriteArrayId, FALSE); SetSpriteInvisibility(spriteArrayId, FALSE);
@ -4862,7 +4862,6 @@ static void Task_LoadStatsScreen(u8 taskId)
sPokedexView->typeIconSpriteIds[1] = 0xFF; sPokedexView->typeIconSpriteIds[1] = 0xFF;
CreateTypeIconSprites(); CreateTypeIconSprites();
sPokedexView->categoryIconSpriteId = 0xFF; sPokedexView->categoryIconSpriteId = 0xFF;
LoadPalette(gMoveTypes_Pal, 0x1D0, 0x60);
LoadCompressedSpriteSheet(&gSpriteSheet_CategoryIcons); LoadCompressedSpriteSheet(&gSpriteSheet_CategoryIcons);
LoadSpritePalette(&gSpritePal_CategoryIcons); LoadSpritePalette(&gSpritePal_CategoryIcons);
gMain.state++; gMain.state++;