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/wireless_communication_status_screen.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/wireless_communication_status_screen.c')
| -rw-r--r-- | src/wireless_communication_status_screen.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index cc80d37b6..1c355c3ba 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -329,37 +329,37 @@ void sub_814F46C(u8 taskId) void sub_814F65C(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 palIdx) { - struct TextColor textColor; + u8 textColor[3]; switch (palIdx) { case 0: - textColor.fgColor = 0; - textColor.bgColor = 2; - textColor.shadowColor = 3; + textColor[0] = 0; + textColor[1] = 2; + textColor[2] = 3; break; case 1: - textColor.fgColor = 0; - textColor.bgColor = 1; - textColor.shadowColor = 3; + textColor[0] = 0; + textColor[1] = 1; + textColor[2] = 3; break; case 2: - textColor.fgColor = 0; - textColor.bgColor = 4; - textColor.shadowColor = 5; + textColor[0] = 0; + textColor[1] = 4; + textColor[2] = 5; break; case 3: - textColor.fgColor = 0; - textColor.bgColor = 7; - textColor.shadowColor = 6; + textColor[0] = 0; + textColor[1] = 7; + textColor[2] = 6; break; case 4: - textColor.fgColor = 0; - textColor.bgColor = 1; - textColor.shadowColor = 2; + textColor[0] = 0; + textColor[1] = 1; + textColor[2] = 2; break; // default: UB } - AddTextPrinterParameterized4(windowId, fontId,x, y, fontId == 0 ? 0 : 1, 0, &textColor, -1, str); + AddTextPrinterParameterized4(windowId, fontId,x, y, fontId == 0 ? 0 : 1, 0, textColor, -1, str); } u32 sub_814F714(struct UnkStruct_x20 * unk20, u32 * arg1) |