pallete -> palette

This commit is contained in:
Mateon1
2024-11-01 15:04:11 +01:00
parent db96148da7
commit 97048546c5
5 changed files with 14 additions and 14 deletions

View File

@@ -28,7 +28,7 @@ struct unk_203B250
struct TeamBadgeData
{
/* 0x0 */ u8 *pics; // probably a pointer to an arrays of pixels?
/* 0x4 */ Rgb32 *pallete; // Pics share common pallete
/* 0x4 */ Rgb32 *palette; // Pics share common palette
};
bool8 sub_801D014(PokemonStruct1 *);

View File

@@ -595,17 +595,17 @@ static void sub_801D894(void)
static void LoadTeamRankBadge(u32 a0, u32 a1, u32 a2)
{
OpenedFile *teamBadgeFile;
s32 palleteIndex;
s32 paletteIndex;
u8 rank;
Rgb32 *colorArray;
u8 *teamBadgePic;
teamBadgeFile = OpenFileAndGetFileDataPtr(sTeamRankBadgeFileName, &gTitleMenuFileArchive);
teamBadgePic = ((struct TeamBadgeData *)(teamBadgeFile->data))->pics;
colorArray = ((struct TeamBadgeData *)(teamBadgeFile->data))->pallete;
colorArray = ((struct TeamBadgeData *)(teamBadgeFile->data))->palette;
for (palleteIndex = 0; palleteIndex < 16; palleteIndex++) {
SetBGPaletteBufferColorArray(palleteIndex + 224, colorArray);
for (paletteIndex = 0; paletteIndex < 16; paletteIndex++) {
SetBGPaletteBufferColorArray(paletteIndex + 224, colorArray);
colorArray++;
}

View File

@@ -365,11 +365,11 @@ void DrawLoadScreenText(void)
sub_80073E0(0);
}
// Think structure of clmkFile is like Team Rank Badges except each pic has a diff pallete
// Think structure of clmkFile is like Team Rank Badges except each pic has a diff palette
struct ClmkFileData
{
/* 0x0 */ u32 *pics;
/* 0x4 */ Rgb32 *pallete;
/* 0x4 */ Rgb32 *palette;
};
void sub_80397B4(void)
@@ -383,7 +383,7 @@ void sub_80397B4(void)
for(index = 0; index < 64; index++)
{
SetBGPaletteBufferColorArray(index + 176, &((struct ClmkFileData *)(clmkFile->data))->pallete[index]);
SetBGPaletteBufferColorArray(index + 176, &((struct ClmkFileData *)(clmkFile->data))->palette[index]);
}
x = 8;

View File

@@ -384,7 +384,7 @@ static void PersonalityTest_DisplayStarterSprite(void)
{
s32 starterID;
struct OpenedFile *faceFile;
s32 palleteIndex;
s32 paletteIndex;
s32 emotionId;
const u8 *gfx;
UnkTextStruct2 stackArray[4];
@@ -400,8 +400,8 @@ static void PersonalityTest_DisplayStarterSprite(void)
faceFile = GetDialogueSpriteDataPtr(starterID);
gfx = ((struct PortraitGfx *)(faceFile->data))->sprites[EMOTION_HAPPY].gfx;
emotionId = EMOTION_HAPPY;
for (palleteIndex = 0; palleteIndex < 0x10; palleteIndex++) {
SetBGPaletteBufferColorArray(palleteIndex + 0xE0, &((struct PortraitGfx *)(faceFile->data))->sprites[emotionId].pal[palleteIndex]);
for (paletteIndex = 0; paletteIndex < 0x10; paletteIndex++) {
SetBGPaletteBufferColorArray(paletteIndex + 0xE0, &((struct PortraitGfx *)(faceFile->data))->sprites[emotionId].pal[paletteIndex]);
}
DisplayMonPortraitSpriteFlipped(1, gfx, 14);

View File

@@ -245,7 +245,7 @@ static void PersonalityTest_DisplayPartnerSprite(void)
{
s32 partnerID;
struct OpenedFile *faceFile;
s32 palleteIndex;
s32 paletteIndex;
const u8 *gfx;
s32 emotionId;
@@ -255,8 +255,8 @@ static void PersonalityTest_DisplayPartnerSprite(void)
faceFile = GetDialogueSpriteDataPtr(partnerID);
gfx = ((struct PortraitGfx *)(faceFile->data))->sprites[EMOTION_NORMAL].gfx;
emotionId = EMOTION_NORMAL;
for (palleteIndex = 0; palleteIndex < 0x10; palleteIndex++) {
SetBGPaletteBufferColorArray(palleteIndex + 0xE0, &((struct PortraitGfx *)(faceFile->data))->sprites[emotionId].pal[palleteIndex]);
for (paletteIndex = 0; paletteIndex < 0x10; paletteIndex++) {
SetBGPaletteBufferColorArray(paletteIndex + 0xE0, &((struct PortraitGfx *)(faceFile->data))->sprites[emotionId].pal[paletteIndex]);
}
DisplayMonPortraitSpriteFlipped(1, gfx, 14);