diff options
| author | fig02 <fig02srl@gmail.com> | 2021-02-15 13:41:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-15 19:41:55 +0100 |
| commit | 982c645167262f98869f05ee6b422010d0d2b60d (patch) | |
| tree | b796eb17a978826750b584852dabdbf9362024cd /src/code | |
| parent | 79c8accfaba2b7ca0bd0acdd8aa65d3805cb2ed8 (diff) | |
Armos and object_am OK (#652)
* started
* all but 2
* OK
* docs progress
* lots of docs
* add gitkeep back
* all funcs named
* small fix
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "0305ec2c2"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "0305ec2c2"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* object_am
* change
* ready i think
* last thing
* asm
* progress
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index ccab8a9f1..08a17b6ad 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3566,13 +3566,13 @@ void func_8003424C(GlobalContext* globalCtx, Vec3f* arg1) { CollisionCheck_SpawnShieldParticlesMetal(globalCtx, arg1); } -void func_8003426C(Actor* actor, s16 arg1, s16 arg2, s16 arg3, s16 arg4) { - if ((arg1 == 0x8000) && !(arg2 & 0x8000)) { +void Actor_SetColorFilter(Actor* actor, s16 colorFlag, s16 colorIntensityMax, s16 xluFlag, s16 duration) { + if ((colorFlag == 0x8000) && !(colorIntensityMax & 0x8000)) { Audio_PlayActorSound2(actor, NA_SE_EN_LIGHT_ARROW_HIT); } - actor->colorFilterParams = arg1 | arg3 | ((arg2 & 0xF8) << 5) | arg4; - actor->colorFilterTimer = arg4; + actor->colorFilterParams = colorFlag | xluFlag | ((colorIntensityMax & 0xF8) << 5) | duration; + actor->colorFilterTimer = duration; } Hilite* func_800342EC(Vec3f* object, GlobalContext* globalCtx) { |