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
+12 -12
View File
@@ -120,7 +120,7 @@ static const struct WindowTemplate sShopMenuWindowTemplates[] =
.tilemapTop = 1,
.width = 9,
.height = 6,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x0008,
},
{
@@ -129,7 +129,7 @@ static const struct WindowTemplate sShopMenuWindowTemplates[] =
.tilemapTop = 1,
.width = 9,
.height = 4,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x0008,
}
};
@@ -204,7 +204,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] =
.tilemapTop = 1,
.width = 10,
.height = 2,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x001E,
},
{
@@ -213,7 +213,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] =
.tilemapTop = 2,
.width = 15,
.height = 16,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x0032,
},
{
@@ -222,7 +222,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] =
.tilemapTop = 13,
.width = 14,
.height = 6,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x0122,
},
{
@@ -231,7 +231,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] =
.tilemapTop = 11,
.width = 12,
.height = 2,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x0176,
},
{
@@ -240,7 +240,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] =
.tilemapTop = 11,
.width = 10,
.height = 2,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x018E,
},
{
@@ -249,7 +249,7 @@ static const struct WindowTemplate sShopBuyMenuWindowTemplates[] =
.tilemapTop = 15,
.width = 27,
.height = 4,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x01A2,
},
DUMMY_WIN_TEMPLATE
@@ -262,7 +262,7 @@ static const struct WindowTemplate sShopBuyMenuYesNoWindowTemplates =
.tilemapTop = 9,
.width = 5,
.height = 4,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x020E,
};
@@ -676,15 +676,15 @@ static void BuyMenuDecompressBgGraphics(void)
{
DecompressAndCopyTileDataToVram(1, gShopMenu_Gfx, 0x3A0, 0x3E3, 0);
LZDecompressWram(gShopMenu_Tilemap, sShopData->tilemapBuffers[0]);
LoadCompressedPalette(gShopMenu_Pal, BG_PLTT_ID(0xC), PLTT_SIZE_4BPP);
LoadCompressedPalette(gShopMenu_Pal, BG_PLTT_ID(12), PLTT_SIZE_4BPP);
}
static void BuyMenuInitWindows(void)
{
InitWindows(sShopBuyMenuWindowTemplates);
DeactivateAllTextPrinters();
LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(0xD));
LoadMessageBoxGfx(0, 0xA, BG_PLTT_ID(0xE));
LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(13));
LoadMessageBoxGfx(0, 0xA, BG_PLTT_ID(14));
PutWindowTilemap(0);
PutWindowTilemap(1);
PutWindowTilemap(2);