diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-02-07 18:24:42 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-07 18:24:42 -0600 |
| commit | 250538fcae79e4d11c6efb4f4bfb34080f72bd48 (patch) | |
| tree | b81a93d022488ed5a71ce0ac80ee4dd1b5662ac9 /src/pokeblock.c | |
| parent | 48e63979c8a131bc059974194bd548f60dcdd24c (diff) | |
| parent | 772fd47564da4d2c4072b83e43a9cc28e62ce5bb (diff) | |
Merge pull request #205 from Diegoisawesome/menu
Decompile menu.s and new_menu_helpers.s
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) |