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/bag.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/bag.c')
-rw-r--r-- | src/bag.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -14,7 +14,7 @@ extern const u8 gText_DepositItem[]; const u16 gUnknown_8453098[] = INCBIN_U16("data/bag/bag_window_pal.gbapal"); -const struct TextColor gUnknown_84530B8[] = { +const u8 gUnknown_84530B8[][3] = { {0, 1, 2}, {0, 2, 3}, {0, 3, 2}, @@ -229,13 +229,13 @@ void sub_810B858(void) void sub_810B8F0(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, s8 speed, u8 colorIdx) { - AddTextPrinterParameterized4(windowId, fontId, x, y, letterSpacing, lineSpacing, &gUnknown_84530B8[colorIdx], speed, str); + AddTextPrinterParameterized4(windowId, fontId, x, y, letterSpacing, lineSpacing, gUnknown_84530B8[colorIdx], speed, str); } void sub_810B958(const u8 * str) { u32 x = 0x48 - GetStringWidth(1, str, 0); - AddTextPrinterParameterized3(2, 1, x / 2, 1, &gUnknown_84530B8[0], 0, str); + AddTextPrinterParameterized3(2, 1, x / 2, 1, gUnknown_84530B8[0], 0, str); } void sub_810B994(void) |