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/pokeblock.c | |
| parent | 9df5e16343a7540a18607d13e098cf8ff8e252e3 (diff) | |
| parent | 387dbf48d0bbb22dc16158a1ee0d373c166c8438 (diff) | |
battle labels merge with master
Diffstat (limited to 'src/pokeblock.c')
| -rw-r--r-- | src/pokeblock.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/pokeblock.c b/src/pokeblock.c index 472b030e0..b9d1d94c6 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -6,7 +6,6 @@ #include "menu.h" #include "task.h" #include "menu_helpers.h" -#include "new_menu_helpers.h" #include "pokemon.h" #include "graphics.h" #include "malloc.h" @@ -284,7 +283,7 @@ static const struct SpriteTemplate sSpriteTemplate_PokeblockCase = SpriteCallbackDummy }; -static const struct TextColor sTextColorInPokeblockMenu = {0, 2, 3}; +static const u8 sTextColorInPokeblockMenu[3] = {0, 2, 3}; static const struct Pokeblock sFavoritePokeblocksTable[] = { @@ -583,7 +582,7 @@ static void HandleInitWindows(void) static void PrintOnPokeblockWindow(u8 windowId, const u8 *string, s32 x) { - AddTextPrinterParameterized2(windowId, 1, x, 1, 0, 0, &sTextColorInPokeblockMenu, 0, string); + AddTextPrinterParameterized2(windowId, 1, x, 1, 0, 0, sTextColorInPokeblockMenu, 0, string); } static void PutPokeblockInfoText(void) |