diff options
author | SatoMew <SatoMew@users.noreply.github.com> | 2019-10-08 22:46:32 +0100 |
---|---|---|
committer | SatoMew <SatoMew@users.noreply.github.com> | 2019-10-08 22:46:32 +0100 |
commit | 2c254082de042dde46cee9d2da2d9bb1bc340905 (patch) | |
tree | af99bcac2c6fece9523b12dbabe4128ec26f6fc9 /src/slot_machine.c | |
parent | 78558b07b0983b6b8b06085933fdf66b801658e9 (diff) | |
parent | 2a7205dec677c98d087cb8ba191370de464c8bf0 (diff) |
Merge branch 'master' of https://github.com/pret/pokefirered
Diffstat (limited to 'src/slot_machine.c')
-rw-r--r-- | src/slot_machine.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/slot_machine.c b/src/slot_machine.c index 740234d95..28292902f 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -2074,7 +2074,7 @@ static bool32 sub_8141180(u8 a0) static bool8 sub_8141198(u8 * state, struct SlotMachineSetupTaskData * ptr) { u16 pal; - struct TextColor textColor; + u8 textColor[3]; u32 x; switch (*state) @@ -2125,10 +2125,10 @@ static bool8 sub_8141198(u8 * state, struct SlotMachineSetupTaskData * ptr) PutWindowTilemap(1); x = 0xEC - GetStringWidth(0, gString_SlotMachineControls, 0); - textColor.fgColor = 15; - textColor.bgColor = 1; - textColor.shadowColor = 2; - AddTextPrinterParameterized3(1, 0, x, 0, &textColor, 0, gString_SlotMachineControls); + textColor[0] = 15; + textColor[1] = 1; + textColor[2] = 2; + AddTextPrinterParameterized3(1, 0, x, 0, textColor, 0, gString_SlotMachineControls); CopyBgTilemapBufferToVram(0); SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | 0x20 | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON); |