diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-05-20 15:23:21 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-05-24 08:28:02 -0500 |
| commit | f9e6f7540fed38b3ee36db7aad01d65831ca6dd9 (patch) | |
| tree | 54dd6c2cee93726a0d3d1b9554aec26233b5fe65 /src/frontier_pass.c | |
| parent | c6205b3df45273af953ec7318834b558a30ed930 (diff) | |
Use fixed point macros for math util
Diffstat (limited to 'src/frontier_pass.c')
| -rw-r--r-- | src/frontier_pass.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/frontier_pass.c b/src/frontier_pass.c index 75893322f..6b38f0607 100644 --- a/src/frontier_pass.c +++ b/src/frontier_pass.c @@ -1016,16 +1016,16 @@ static void Task_DoFadeEffect(u8 taskId) if (!data[0]) { sub_80C5F58(TRUE, FALSE); - data[1] = 0x100; - data[2] = 0x100; + data[1] = Q_8_8(1); + data[2] = Q_8_8(1); data[3] = 0x15; data[4] = 0x15; BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_WHITE); } else { - data[1] = 0x1FC; - data[2] = 0x1FC; + data[1] = Q_8_8(1.984375); // 1 and 63/64 + data[2] = Q_8_8(1.984375); data[3] = -0x15; data[4] = -0x15; SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); @@ -1049,12 +1049,12 @@ static void Task_DoFadeEffect(u8 taskId) sPassGfx->unk30 = MathUtil_Inv16(data[2]); if (!data[0]) { - if (data[1] <= 0x1FC) + if (data[1] <= Q_8_8(1.984375)) return; } else { - if (data[1] != 0x100) + if (data[1] != Q_8_8(1)) return; } break; @@ -1154,8 +1154,8 @@ static void sub_80C5F58(bool8 arg0, bool8 arg1) gUnknown_085713E0[sPassData->unkE - 1][1] << 8, gUnknown_085713E0[sPassData->unkE - 1][0], gUnknown_085713E0[sPassData->unkE - 1][1], - MathUtil_Inv16(0x1FC), - MathUtil_Inv16(0x1FC), + MathUtil_Inv16(Q_8_8(1.984375)), // 1 and 63/64 + MathUtil_Inv16(Q_8_8(1.984375)), 0); } else @@ -1165,8 +1165,8 @@ static void sub_80C5F58(bool8 arg0, bool8 arg1) gUnknown_085713E0[sPassData->unkE - 1][1] << 8, gUnknown_085713E0[sPassData->unkE - 1][0], gUnknown_085713E0[sPassData->unkE - 1][1], - MathUtil_Inv16(0x100), - MathUtil_Inv16(0x100), + MathUtil_Inv16(Q_8_8(1)), + MathUtil_Inv16(Q_8_8(1)), 0); } } |