diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-07 19:31:33 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-07 19:31:33 -0500 |
| commit | 03f8d0d6ce48a302a21d7ef99eed9825800a6394 (patch) | |
| tree | cb0240ef6e2468ee49730a3b620d440e5e88d4bc /src/pokeblock.c | |
| parent | 4a903279df847024148b823990a317e79bc23c9f (diff) | |
| parent | 250538fcae79e4d11c6efb4f4bfb34080f72bd48 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_main_menu
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) |