Write palette IDs in hex
This commit is contained in:
+4
-4
@@ -1235,7 +1235,7 @@ static const struct WindowTemplate sMatchCallTextWindow =
|
||||
.tilemapTop = 15,
|
||||
.width = 28,
|
||||
.height = 4,
|
||||
.paletteNum = 15,
|
||||
.paletteNum = 0xF,
|
||||
.baseBlock = 0x200
|
||||
};
|
||||
|
||||
@@ -1267,8 +1267,8 @@ static bool32 MatchCall_LoadGfx(u8 taskId)
|
||||
}
|
||||
|
||||
FillWindowPixelBuffer(tWindowId, PIXEL_FILL(8));
|
||||
LoadPalette(sMatchCallWindow_Pal, 0xE0, sizeof(sMatchCallWindow_Pal));
|
||||
LoadPalette(sPokenavIcon_Pal, 0xF0, sizeof(sPokenavIcon_Pal));
|
||||
LoadPalette(sMatchCallWindow_Pal, BG_PLTT_ID(0xE), sizeof(sMatchCallWindow_Pal));
|
||||
LoadPalette(sPokenavIcon_Pal, BG_PLTT_ID(0xF), sizeof(sPokenavIcon_Pal));
|
||||
ChangeBgY(0, -0x2000, BG_COORD_SET);
|
||||
return TRUE;
|
||||
}
|
||||
@@ -2102,7 +2102,7 @@ void LoadMatchCallWindowGfx(u32 windowId, u32 destOffset, u32 paletteId)
|
||||
{
|
||||
u8 bg = GetWindowAttribute(windowId, WINDOW_BG);
|
||||
LoadBgTiles(bg, sMatchCallWindow_Gfx, 0x100, destOffset);
|
||||
LoadPalette(sMatchCallWindow_Pal, paletteId << 4, sizeof(sMatchCallWindow_Pal));
|
||||
LoadPalette(sMatchCallWindow_Pal, BG_PLTT_ID(paletteId), sizeof(sMatchCallWindow_Pal));
|
||||
}
|
||||
|
||||
void DrawMatchCallTextBoxBorder(u32 windowId, u32 tileOffset, u32 paletteId)
|
||||
|
||||
Reference in New Issue
Block a user