Decimal paletteNums

This commit is contained in:
Martin Griffin
2022-08-19 16:32:00 +01:00
parent 5719a7f7bc
commit d57442a511
103 changed files with 1032 additions and 1032 deletions

View File

@@ -76,7 +76,7 @@ static const struct WindowTemplate sWindowTemplates[] = {
.tilemapTop = 0,
.width = 24,
.height = 3,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x0001
}, {
.bg = 0,
@@ -84,7 +84,7 @@ static const struct WindowTemplate sWindowTemplates[] = {
.tilemapTop = 4,
.width = 21,
.height = 15,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x0049
}, {
.bg = 0,
@@ -92,7 +92,7 @@ static const struct WindowTemplate sWindowTemplates[] = {
.tilemapTop = 4,
.width = 3,
.height = 15,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x0184
}, DUMMY_WIN_TEMPLATE
};
@@ -193,10 +193,10 @@ static void CB2_InitWirelessCommunicationScreen(void)
ChangeBgY(0, 0, BG_COORD_SET);
ChangeBgX(1, 0, BG_COORD_SET);
ChangeBgY(1, 0, BG_COORD_SET);
LoadPalette(sBgTiles_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP);
LoadPalette(sBgTiles_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
Menu_LoadStdPalAt(0xF0);
DynamicPlaceholderTextUtil_Reset();
FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0xF);
FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 15);
CopyBgTilemapBufferToVram(1);
SetMainCallback2(CB2_RunWirelessCommunicationScreen);
RunTasks();
@@ -227,7 +227,7 @@ static void WCSS_CyclePalette(s16 * counter, s16 * palIdx)
*counter = 0;
}
LoadPalette(sBgTiles_Pal + 16 * (*palIdx + 2), BG_PLTT_ID(0x0), PLTT_SIZEOF(8));
LoadPalette(sBgTiles_Pal + 16 * (*palIdx + 2), BG_PLTT_ID(0), PLTT_SIZEOF(8));
}
static void PrintHeaderTexts(void)