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

Minor misc field doc

Browse Source
This commit is contained in:
GriffinR
2021-04-06 17:17:41 -04:00
parent 7d2a94282a
commit 0dc7ff8994
6 changed files with 39 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/field_screen_effect.c
View File

@@ -1087,7 +1087,7 @@ static void LoadOrbEffectPalette(bool8 blueOrb)
}
}
static bool8 sub_80B02C8(u16 shakeDir)
static bool8 UpdateOrbEffectBlend(u16 shakeDir)
{
u8 lo = REG_BLDALPHA & 0xFF;
u8 hi = REG_BLDALPHA >> 8;
@@ -1095,21 +1095,17 @@ static bool8 sub_80B02C8(u16 shakeDir)
if (shakeDir != 0)
{
if (lo)
{
lo--;
}
}
else
{
if (hi < 0x10)
{
if (hi < 16)
hi++;
}
}
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(lo, hi));
if (lo == 0 && hi == 0x10)
if (lo == 0 && hi == 16)
return TRUE;
else
return FALSE;
@@ -1193,7 +1189,7 @@ static void Task_OrbEffect(u8 taskId)
{
tShakeDelay = 8;
tShakeDir ^= 1;
if (sub_80B02C8(tShakeDir) == TRUE)
if (UpdateOrbEffectBlend(tShakeDir) == TRUE)
{
tState = 5;
sub_8199DF0(0, PIXEL_FILL(0), 0, 1);