dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Use fixed point macros for math util

Browse Source
This commit is contained in:
GriffinR
2020-05-20 15:23:21 -04:00
committed by huderlem
parent c6205b3df4
commit f9e6f7540f
5 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/frontier_pass.c
View File

@@ -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);
}
}