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

Decimal paletteNums

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/easy_chat.c
+15 -15
View File
@@ -820,7 +820,7 @@ static const struct WindowTemplate sEasyChatWindowTemplates[] = {
.tilemapTop = 0,
.width = 18,
.height = 2,
.paletteNum = 0xA,
.paletteNum = 10,
.baseBlock = 0x10,
},
{
@@ -829,7 +829,7 @@ static const struct WindowTemplate sEasyChatWindowTemplates[] = {
.tilemapTop = 15,
.width = 24,
.height = 4,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0xA,
},
{
@@ -838,7 +838,7 @@ static const struct WindowTemplate sEasyChatWindowTemplates[] = {
.tilemapTop = 0,
.width = 28,
.height = 32,
.paletteNum = 0x3,
.paletteNum = 3,
.baseBlock = 0,
},
DUMMY_WIN_TEMPLATE,
@@ -850,7 +850,7 @@ static const struct WindowTemplate sEasyChatYesNoWindowTemplate = {
.tilemapTop = 9,
.width = 5,
.height = 4,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x6A,
};
@@ -3911,13 +3911,13 @@ static void InitEasyChatBgs(void)
static void LoadEasyChatPalettes(void)
{
ResetPaletteFade();
LoadPalette(gEasyChatMode_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP);
LoadPalette(sTextInputFrameOrange_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP);
LoadPalette(sTextInputFrameGreen_Pal, BG_PLTT_ID(0x4), PLTT_SIZE_4BPP);
LoadPalette(sTitleText_Pal, BG_PLTT_ID(0xA), PLTT_SIZEOF(4));
LoadPalette(sText_Pal, BG_PLTT_ID(0xB), PLTT_SIZEOF(6));
LoadPalette(sText_Pal, BG_PLTT_ID(0xF), PLTT_SIZEOF(6));
LoadPalette(sText_Pal, BG_PLTT_ID(0x3), PLTT_SIZEOF(6));
LoadPalette(gEasyChatMode_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
LoadPalette(sTextInputFrameOrange_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP);
LoadPalette(sTextInputFrameGreen_Pal, BG_PLTT_ID(4), PLTT_SIZE_4BPP);
LoadPalette(sTitleText_Pal, BG_PLTT_ID(10), PLTT_SIZEOF(4));
LoadPalette(sText_Pal, BG_PLTT_ID(11), PLTT_SIZEOF(6));
LoadPalette(sText_Pal, BG_PLTT_ID(15), PLTT_SIZEOF(6));
LoadPalette(sText_Pal, BG_PLTT_ID(3), PLTT_SIZEOF(6));
}
static void PrintTitle(void)
@@ -3951,8 +3951,8 @@ static void PrintEasyChatTextWithColors(u8 windowId, u8 fontId, const u8 *str, u
static void PrintInitialInstructions(void)
{
FillBgTilemapBufferRect(0, 0, 0, 0, 32, 20, 17);
LoadUserWindowBorderGfx(1, 1, BG_PLTT_ID(0xE));
DrawTextBorderOuter(1, 1, 0xE);
LoadUserWindowBorderGfx(1, 1, BG_PLTT_ID(14));
DrawTextBorderOuter(1, 1, 14);
PrintEasyChatStdMessage(MSG_INSTRUCTIONS);
PutWindowTilemap(1);
CopyBgTilemapBufferToVram(0);
@@ -4024,7 +4024,7 @@ static void AddPhraseWindow(void)
template.tilemapTop = sPhraseFrameDimensions[frameId].top;
template.width = sPhraseFrameDimensions[frameId].width;
template.height = sPhraseFrameDimensions[frameId].height;
template.paletteNum = 0xB;
template.paletteNum = 11;
template.baseBlock = 0x6C;
sScreenControl->windowId = AddWindow(&template);
PutWindowTilemap(sScreenControl->windowId);
@@ -5069,7 +5069,7 @@ static void AddMainScreenButtonWindow(void)
template.tilemapTop = 11;
template.width = 28;
template.height = 2;
template.paletteNum = 0xB;
template.paletteNum = 11;
template.baseBlock = 0x34;
windowId = AddWindow(&template);
FillWindowPixelBuffer(windowId, PIXEL_FILL(1));