dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Write palette IDs in hex

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_pyramid_bag.c
+15 -15
View File
@@ -214,7 +214,7 @@ static const struct WindowTemplate sWindowTemplates[] =
.tilemapTop = 2,
.width = 15,
.height = 16,
.paletteNum = 15,
.paletteNum = 0xF,
.baseBlock = 30
},
[WIN_INFO] = {
@@ -223,7 +223,7 @@ static const struct WindowTemplate sWindowTemplates[] =
.tilemapTop = 13,
.width = 14,
.height = 6,
.paletteNum = 15,
.paletteNum = 0xF,
.baseBlock = 270
},
[WIN_MSG] = {
@@ -232,7 +232,7 @@ static const struct WindowTemplate sWindowTemplates[] =
.tilemapTop = 15,
.width = 27,
.height = 4,
.paletteNum = 15,
.paletteNum = 0xF,
.baseBlock = 354
},
[WIN_TOSS_NUM] = {
@@ -241,7 +241,7 @@ static const struct WindowTemplate sWindowTemplates[] =
.tilemapTop = 17,
.width = 5,
.height = 2,
.paletteNum = 15,
.paletteNum = 0xF,
.baseBlock = 462
},
DUMMY_WIN_TEMPLATE,
@@ -263,7 +263,7 @@ static const struct WindowTemplate sWindowTemplates_MenuActions[] =
.tilemapTop = 17,
.width = 7,
.height = 2,
.paletteNum = 15,
.paletteNum = 0xF,
.baseBlock = 472
},
[MENU_WIN_1x2] = {
@@ -272,7 +272,7 @@ static const struct WindowTemplate sWindowTemplates_MenuActions[] =
.tilemapTop = 15,
.width = 7,
.height = 4,
.paletteNum = 15,
.paletteNum = 0xF,
.baseBlock = 472
},
[MENU_WIN_2x2] = {
@@ -281,7 +281,7 @@ static const struct WindowTemplate sWindowTemplates_MenuActions[] =
.tilemapTop = 15,
.width = 14,
.height = 4,
.paletteNum = 15,
.paletteNum = 0xF,
.baseBlock = 472
},
[MENU_WIN_2x3] = { // Unused
@@ -290,7 +290,7 @@ static const struct WindowTemplate sWindowTemplates_MenuActions[] =
.tilemapTop = 13,
.width = 14,
.height = 6,
.paletteNum = 15,
.paletteNum = 0xF,
.baseBlock = 472
},
[MENU_WIN_YESNO] = {
@@ -299,7 +299,7 @@ static const struct WindowTemplate sWindowTemplates_MenuActions[] =
.tilemapTop = 15,
.width = 5,
.height = 4,
.paletteNum = 15,
.paletteNum = 0xF,
.baseBlock = 472
},
};
@@ -578,7 +578,7 @@ static bool8 LoadPyramidBagGfx(void)
}
break;
case 2:
LoadCompressedPalette(gBattlePyramidBagInterface_Pal, 0, 32);
LoadCompressedPalette(gBattlePyramidBagInterface_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP);
gPyramidBagMenu->state++;
break;
case 3:
@@ -1439,9 +1439,9 @@ static void InitPyramidBagWindows(void)
InitWindows(sWindowTemplates);
DeactivateAllTextPrinters();
LoadUserWindowBorderGfx(0, 0x1, 0xE0);
LoadMessageBoxGfx(0, 0xA, 0xD0);
LoadPalette(gStandardMenuPalette, 0xF0, 0x20);
LoadUserWindowBorderGfx(0, 0x1, BG_PLTT_ID(0xE));
LoadMessageBoxGfx(0, 0xA, BG_PLTT_ID(0xD));
LoadPalette(gStandardMenuPalette, BG_PLTT_ID(0xF), PLTT_SIZE_4BPP);
for (i = 0; i < ARRAY_COUNT(sWindowTemplates); i++)
FillWindowPixelBuffer(i, PIXEL_FILL(0));
@@ -1537,10 +1537,10 @@ static void FreeItemIconSprite(u8 spriteArrId)
static void LoadPyramidBagPalette(void)
{
struct SpritePalette spritePalette;
u16 *palPtr = Alloc(0x40);
u16 *palPtr = Alloc(2 * PLTT_SIZE_4BPP);
LZDecompressWram(gBattlePyramidBag_Pal, palPtr);
spritePalette.data = palPtr + (gSaveBlock2Ptr->frontier.lvlMode * 16);
spritePalette.data = palPtr + PLTT_ID(gSaveBlock2Ptr->frontier.lvlMode);
spritePalette.tag = TAG_PYRAMID_BAG;
LoadSpritePalette(&spritePalette);
Free(palPtr);