diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-08-28 14:56:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-28 14:56:08 -0400 |
| commit | 6c0fd9884cfa7eca6c2b2f0394efea1140d0feb1 (patch) | |
| tree | a8743c0093dee3a30b0f4624bd690183620bc0d8 /src/buy_menu_helpers.c | |
| parent | 634fe80e9dcaffc9b1cf622b3132e686e926e97f (diff) | |
| parent | 1e8b809ff231a255837dbf711d976895354062e1 (diff) | |
Merge pull request #95 from PikalaxALT/no_struct_textcolor
Eliminate `struct TextColor` definition and use
Diffstat (limited to 'src/buy_menu_helpers.c')
| -rw-r--r-- | src/buy_menu_helpers.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/buy_menu_helpers.c b/src/buy_menu_helpers.c index 4cdf90e4e..cf8072977 100644 --- a/src/buy_menu_helpers.c +++ b/src/buy_menu_helpers.c @@ -148,23 +148,11 @@ static const struct WindowTemplate sShopBuyMenuYesNoWindowTemplate = .baseBlock = 0xC1, }; -static const struct TextColor sShopBuyMenuTextColors[] = +static const u8 sShopBuyMenuTextColors[][3] = { - { - .fgColor = 0, - .bgColor = 1, - .shadowColor = 2, - }, - { - .fgColor = 0, - .bgColor = 2, - .shadowColor = 3, - }, - { - .fgColor = 0, - .bgColor = 3, - .shadowColor = 2, - }, + {0, 1, 2}, + {0, 2, 3}, + {0, 3, 2} }; void BuyMenuInitWindows(bool32 isSellingTM) @@ -191,7 +179,7 @@ void BuyMenuDrawMoneyBox(void) void BuyMenuPrint(u8 windowId, u8 font, const u8 *text, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, s8 speed, u8 color) { - AddTextPrinterParameterized4(windowId, font, x, y, letterSpacing, lineSpacing, &sShopBuyMenuTextColors[color], speed, text); + AddTextPrinterParameterized4(windowId, font, x, y, letterSpacing, lineSpacing, sShopBuyMenuTextColors[color], speed, text); } void BuyMenuDisplayMessage(u8 taskId, const u8 *text, TaskFunc callback) |