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
+6 -6
View File
@@ -73,7 +73,7 @@ static const struct WindowTemplate sWindowTemplates[] =
.tilemapTop = 15,
.width = 24,
.height = 4,
.paletteNum = 14,
.paletteNum = 0xE,
.baseBlock = 0x0200
},
DUMMY_WIN_TEMPLATE,
@@ -86,7 +86,7 @@ static const struct WindowTemplate sWindowTemplate_ConfirmStarter =
.tilemapTop = 9,
.width = 5,
.height = 4,
.paletteNum = 14,
.paletteNum = 0xE,
.baseBlock = 0x0260
};
@@ -97,7 +97,7 @@ static const struct WindowTemplate sWindowTemplate_StarterLabel =
.tilemapTop = 0,
.width = 13,
.height = 4,
.paletteNum = 14,
.paletteNum = 0xE,
.baseBlock = 0x0274
};
@@ -411,7 +411,7 @@ void CB2_ChooseStarter(void)
InitWindows(sWindowTemplates);
DeactivateAllTextPrinters();
LoadUserWindowBorderGfx(0, 0x2A8, 0xD0);
LoadUserWindowBorderGfx(0, 0x2A8, BG_PLTT_ID(0xD));
ClearScheduledBgCopiesToVram();
ScanlineEffect_Stop();
ResetTasks();
@@ -420,8 +420,8 @@ void CB2_ChooseStarter(void)
FreeAllSpritePalettes();
ResetAllPicSprites();
LoadPalette(GetOverworldTextboxPalettePtr(), 0xE0, 0x20);
LoadPalette(gBirchBagGrassPal, 0, 0x40);
LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(0xE), PLTT_SIZE_4BPP);
LoadPalette(gBirchBagGrassPal, BG_PLTT_ID(0x0), 2 * PLTT_SIZE_4BPP);
LoadCompressedSpriteSheet(&sSpriteSheet_PokeballSelect[0]);
LoadCompressedSpriteSheet(&sSpriteSheet_StarterCircle[0]);
LoadSpritePalettes(sSpritePalettes_StarterChoose);