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
+3 -3
View File
@@ -43,7 +43,7 @@ static const struct WindowTemplate sWindowTemplates[] = {
.tilemapTop = 15,
.width = 24,
.height = 4,
.paletteNum = 0xE,
.paletteNum = 14,
.baseBlock = 0x014
},
DUMMY_WIN_TEMPLATE
@@ -130,8 +130,8 @@ void CB2_UnionRoomBattle(void)
FillWindowPixelBuffer(0, PIXEL_FILL(0));
FillWindowPixelBuffer(0, PIXEL_FILL(1));
FillBgTilemapBufferRect(0, 0, 0, 0, 30, 20, 0xF);
LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xD));
LoadUserWindowBorderGfx_(0, 1, BG_PLTT_ID(0xD));
LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(13));
LoadUserWindowBorderGfx_(0, 1, BG_PLTT_ID(13));
Menu_LoadStdPal();
SetVBlankCallback(VBlankCB_UnionRoomBattle);
gMain.state++;