diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-09 00:43:07 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-09 00:43:07 +0100 |
| commit | bce01bc518b3a5f36841f1d9d6649cc15d4a94b6 (patch) | |
| tree | 8c398bf570547e3c43db6ba6930e5b38fefee177 /src/berry_tag_screen.c | |
| parent | 9df5e16343a7540a18607d13e098cf8ff8e252e3 (diff) | |
| parent | 387dbf48d0bbb22dc16158a1ee0d373c166c8438 (diff) | |
battle labels merge with master
Diffstat (limited to 'src/berry_tag_screen.c')
| -rw-r--r-- | src/berry_tag_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index 1e029bece..f86f350bf 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -93,7 +93,7 @@ static const struct BgTemplate sBackgroundTemplates[] = static const u16 sFontPalette[] = INCBIN_U16("graphics/interface/berry_tag_screen.gbapal"); -static const struct TextColor sTextColors[] = +static const u8 sTextColors[2][3] = { {0, 2, 3}, {15, 14, 13} @@ -343,7 +343,7 @@ static void HandleInitWindows(void) static void PrintTextInBerryTagScreen(u8 windowId, const u8 *text, u8 x, u8 y, s32 speed, u8 colorStructId) { - AddTextPrinterParameterized2(windowId, 1, x, y, 0, 0, &sTextColors[colorStructId], speed, text); + AddTextPrinterParameterized2(windowId, 1, x, y, 0, 0, sTextColors[colorStructId], speed, text); } static void AddBerryTagTextToBg0(void) |