diff options
author | golem galvanize <golemgalvanize@github.com> | 2018-02-08 16:03:53 -0500 |
---|---|---|
committer | golem galvanize <golemgalvanize@github.com> | 2018-02-08 16:03:53 -0500 |
commit | de95a703b0350996ca26f245392c3a1dae34ea63 (patch) | |
tree | b9737d91ea96c51c1d09ad3a071092acdd76ddf5 /src/battle_interface.c | |
parent | caf5d136b97c17c614d7186a5524d6ea7a1b142b (diff) | |
parent | 387dbf48d0bbb22dc16158a1ee0d373c166c8438 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu
Diffstat (limited to 'src/battle_interface.c')
-rw-r--r-- | src/battle_interface.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_interface.c b/src/battle_interface.c index debbc8eb7..ce37564b7 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -2566,17 +2566,17 @@ u8 GetHPBarLevel(s16 hp, s16 maxhp) static u8* AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y, u32 arg3, u32 *windowId) { u16 winId; - struct TextColor color; + u8 color[3]; struct WindowTemplate winTemplate = sHealthboxWindowTemplate; winId = AddWindow(&winTemplate); FillWindowPixelBuffer(winId, (arg3 << 4) | (arg3)); - color.fgColor = arg3; - color.bgColor = 1; - color.shadowColor = 3; + color[0] = arg3; + color[1] = 1; + color[2] = 3; - AddTextPrinterParameterized2(winId, 0, x, y, 0, 0, &color, -1, str); + AddTextPrinterParameterized2(winId, 0, x, y, 0, 0, color, -1, str); *windowId = winId; return (u8*)(GetWindowAttribute(winId, WINDOW_TILE_DATA)); |