mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 23:10:22 +00:00
Code Issues Projects Releases Wiki Activity

Some actor.c docs (in preparation for en_test) (#820)

Browse source 
* renames

* format

* format functions.h

* clean

* arg name

* remove asm
This commit is contained in:
fig02 2021-06-21 19:51:04 -04:00 • committed by GitHub
parent 7984c1c514
commit 0a35c752e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
109 changed files with 424 additions and 359 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Fd/z_en_fd.c
View file

@ -293,7 +293,7 @@ s32 EnFd_ColliderCheck(EnFd* this, GlobalContext* globalCtx) {
this->invincibilityTimer = 30;
this->actor.flags &= ~1;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLAME_DAMAGE);
func_80032C7C(globalCtx, &this->actor);
Enemy_StartFinishingBlow(globalCtx, &this->actor);
return true;
} else if (DECR(this->attackTimer) == 0 && this->collider.base.atFlags & AT_HIT) {
this->collider.base.atFlags &= ~AT_HIT;
@ -666,7 +666,7 @@ void EnFd_Update(Actor* thisx, GlobalContext* globalCtx) {
this->actor.flags &= ~1;
this->invincibilityTimer = 30;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLAME_DAMAGE);
func_80032C7C(globalCtx, &this->actor);
Enemy_StartFinishingBlow(globalCtx, &this->actor);
} else {
this->actor.flags &= ~0x2000;
}