mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 15:30:14 +00:00
Code Issues Projects Releases Wiki Activity

Armos and object_am OK (#652)

Browse source 
* 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
This commit is contained in:
fig02 2021-02-15 13:41:55 -05:00 • committed by GitHub
parent 79c8accfab
commit 982c645167
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
131 changed files with 1077 additions and 2585 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Crow/z_en_crow.c
View file

@ -161,7 +161,7 @@ void EnCrow_SetupDamaged(EnCrow* this, GlobalContext* globalCtx) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_KAICHO_DEAD);
if (this->actor.colChkInfo.damageEffect == 3) { // Ice arrows
func_8003426C(&this->actor, 0, 255, 0, 40);
Actor_SetColorFilter(&this->actor, 0, 255, 0, 40);
for (i = 0; i < 8; i++) {
iceParticlePos.x = ((i & 1 ? 7.0f : -7.0f) * scale) + this->actor.world.pos.x;
iceParticlePos.y = ((i & 2 ? 7.0f : -7.0f) * scale) + this->actor.world.pos.y;
@ -170,13 +170,13 @@ void EnCrow_SetupDamaged(EnCrow* this, GlobalContext* globalCtx) {
((Rand_ZeroOne() * 0.15f) + 0.85f) * scale);
}
} else if (this->actor.colChkInfo.damageEffect == 2) { // Fire arrows and Din's Fire
func_8003426C(&this->actor, 0x4000, 255, 0, 40);
Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 40);
for (i = 0; i < 4; i++) {
EffectSsEnFire_SpawnVec3f(globalCtx, &this->actor, &this->actor.world.pos, 50.0f * scale, 0, 0, i);
}
} else {
func_8003426C(&this->actor, 0x4000, 255, 0, 40);
Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 40);
}
if (this->actor.flags & 0x8000) {
@ -200,7 +200,7 @@ void EnCrow_SetupTurnAway(EnCrow* this) {
this->aimRotX = -0x1000;
this->aimRotY = this->actor.yawTowardsPlayer + 0x8000;
this->skelAnime.playSpeed = 2.0f;
func_8003426C(&this->actor, 0, 255, 0, 5);
Actor_SetColorFilter(&this->actor, 0, 255, 0, 5);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
this->actionFunc = EnCrow_TurnAway;
}