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

Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows

Browse Source
This commit is contained in:
GriffinR
2023-02-01 14:59:45 -05:00
parent c91b13a12b 603d870ea0
commit 4328ed8b19
259 changed files with 4375 additions and 5702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/easy_chat.c
View File

@@ -879,17 +879,17 @@ static const u8 *const sEasyChatKeyboardAlphabet[NUM_ALPHABET_ROWS] =
static const struct SpriteSheet sSpriteSheets[] = {
{
.data = sTriangleCursor_Gfx,
.size = 0x20,
.size = sizeof(sTriangleCursor_Gfx),
.tag = GFXTAG_TRIANGLE_CURSOR
},
{
.data = sScrollIndicator_Gfx,
.size = 0x100,
.size = sizeof(sScrollIndicator_Gfx),
.tag = GFXTAG_SCROLL_INDICATOR
},
{
.data = sStartSelectButtons_Gfx,
.size = 0x100,
.size = sizeof(sStartSelectButtons_Gfx),
.tag = GFXTAG_START_SELECT_BUTTONS
},
{0}
@@ -3929,13 +3929,13 @@ static void InitEasyChatBgs(void)
static void LoadEasyChatPalettes(void)
{
ResetPaletteFade();
LoadPalette(gEasyChatMode_Pal, 0, 32);
LoadPalette(sTextInputFrameOrange_Pal, 1 * 16, 32);
LoadPalette(sTextInputFrameGreen_Pal, 4 * 16, 32);
LoadPalette(sTitleText_Pal, 10 * 16, 8);
LoadPalette(sText_Pal, 11 * 16, 12);
LoadPalette(sText_Pal, 15 * 16, 12);
LoadPalette(sText_Pal, 3 * 16, 12);
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)
@@ -3969,7 +3969,7 @@ static void PrintEasyChatTextWithColors(u8 windowId, u8 fontId, const u8 *str, u
static void PrintInitialInstructions(void)
{
FillBgTilemapBufferRect(0, 0, 0, 0, 32, 20, 17);
LoadUserWindowBorderGfx(WIN_MSG, 1, 0xE0);
LoadUserWindowBorderGfx(WIN_MSG, 1, BG_PLTT_ID(14));
DrawTextBorderOuter(WIN_MSG, 1, 14);
PrintEasyChatStdMessage(MSG_INSTRUCTIONS);
PutWindowTilemap(WIN_MSG);