diff options
| author | Frogg <froggestspirit@gmail.com> | 2021-04-10 19:04:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-10 19:04:59 -0400 |
| commit | ec6b1ea3735ff98a9714b219e4a999894ecc6010 (patch) | |
| tree | fff7823aa15ce633de1bc4132574c1d081a84a93 /src/field_screen_effect.c | |
| parent | 677b4fc394516deab5b5c86c94a2a1443cb52151 (diff) | |
| parent | 09a9efd5c57909c215a66b85f3255190c8882940 (diff) | |
Merge pull request #2 from pret/master
update
Diffstat (limited to 'src/field_screen_effect.c')
| -rw-r--r-- | src/field_screen_effect.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index db82d667c..fbe725c0b 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -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); |