Write palette IDs in hex

This commit is contained in:
Martin Griffin
2022-08-19 15:29:35 +01:00
parent cce9918908
commit 6fed961ed6
129 changed files with 1262 additions and 1240 deletions
+5 -5
View File
@@ -46,7 +46,7 @@ static const struct WindowTemplate sWindowTemplates[] =
.tilemapTop = 15,
.width = 22,
.height = 4,
.paletteNum = 14,
.paletteNum = 0xE,
.baseBlock = 20
},
{
@@ -55,7 +55,7 @@ static const struct WindowTemplate sWindowTemplates[] =
.tilemapTop = 6,
.width = 16,
.height = 4,
.paletteNum = 14,
.paletteNum = 0xE,
.baseBlock = 0x6C
},
DUMMY_WIN_TEMPLATE
@@ -91,8 +91,8 @@ void CB2_InitMysteryEventMenu(void)
FillWindowPixelBuffer(i, PIXEL_FILL(0));
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14);
LoadUserWindowBorderGfx(0, 1u, 0xD0u);
Menu_LoadStdPalAt(0xE0);
LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xD));
Menu_LoadStdPalAt(BG_PLTT_ID(0xE));
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON);
SetGpuReg(REG_OFFSET_BLDCNT, 0);
CreateTask(Task_DestroySelf, 0);
@@ -102,7 +102,7 @@ void CB2_InitMysteryEventMenu(void)
BuildOamBuffer();
RunTextPrinters();
UpdatePaletteFade();
FillPalette(RGB_BLACK, 0, 2);
SetBackdropFromColor(RGB_BLACK);
SetMainCallback2(CB2_MysteryEventMenu);
}
}