mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-15 06:06:04 +00:00
Code Issues Projects Releases Wiki Activity

Work on func_80A74398

Browse source
This commit is contained in:
Sirius902 2020-09-30 19:57:47 -07:00
parent 8e5db49a8d
commit bcacb5b148
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/overlays/actors/ovl_En_Ik/z_en_ik.c
View file

@ -29,7 +29,7 @@ void func_80A77ED0(EnIk* this, GlobalContext* globalCtx);
void func_80A77EDC(EnIk* this, GlobalContext* globalCtx); void func_80A77EDC(EnIk* this, GlobalContext* globalCtx);
void func_80A77844(EnIk* this, GlobalContext* globalCtx); void func_80A77844(EnIk* this, GlobalContext* globalCtx);
void func_80A74398(EnIk* this, GlobalContext* globalCtx); void func_80A74398(Actor* thisx, GlobalContext* globalCtx);
void func_80A74714(EnIk* this); void func_80A74714(EnIk* this);
void func_80A7489C(EnIk* this); void func_80A7489C(EnIk* this);
void func_80A7492C(EnIk* this, GlobalContext* globalCtx); void func_80A7492C(EnIk* this, GlobalContext* globalCtx);
@ -144,7 +144,9 @@ void EnIk_SetupAction(EnIk* this, EnIkActionFunc actionFunc) {
} }
#ifdef NON_MATCHING #ifdef NON_MATCHING
void func_80A74398(EnIk* this, GlobalContext* globalCtx) { void func_80A74398(Actor* thisx, GlobalContext* globalCtx) {
EnIk* this = THIS;
s32 pad;
EffectBlureInit1 blureInit; EffectBlureInit1 blureInit;
this->actor.update = func_80A75FA0; this->actor.update = func_80A75FA0;
@ -159,14 +161,14 @@ void func_80A74398(EnIk* this, GlobalContext* globalCtx) {
Collider_SetQuad(globalCtx, &this->unk_36C, &this->actor, &D_80A783F4); Collider_SetQuad(globalCtx, &this->unk_36C, &this->actor, &D_80A783F4);
this->actor.colChkInfo.damageTable = &D_80A78444; this->actor.colChkInfo.damageTable = &D_80A78444;
this->actor.params &= 0xFF;
this->actor.colChkInfo.mass = 0xFE; this->actor.colChkInfo.mass = 0xFE;
this->unk_2FC = 0;
this->actor.colChkInfo.health = 30; this->actor.colChkInfo.health = 30;
this->unk_2FC = 0;
this->actor.params &= 0xFF;
this->switchFlags = (this->actor.params >> 8) & 0xFF; this->switchFlags = (this->actor.params >> 8) & 0xFF;
this->actor.gravity = -1.0f; this->actor.gravity = -1.0f;
if (this->actor.params == 0) { if (thisx->params == 0) {
this->actor.colChkInfo.health += 20; this->actor.colChkInfo.health += 20;
this->actor.naviEnemyId = 52; this->actor.naviEnemyId = 52;
} else { } else {
@ -191,8 +193,10 @@ void func_80A74398(EnIk* this, GlobalContext* globalCtx) {
Effect_Add(globalCtx, &this->blureIdx, EFFECT_BLURE1, 0, 0, &blureInit); Effect_Add(globalCtx, &this->blureIdx, EFFECT_BLURE1, 0, 0, &blureInit);
func_80A74714(this); func_80A74714(this);
if (this->switchFlags != 0xFF && Flags_GetSwitch(globalCtx, this->switchFlags)) { if (this->switchFlags != 0xFF) {
if (Flags_GetSwitch(globalCtx, this->switchFlags)) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
}
} else if (this->actor.params != 0 && Flags_GetClear(globalCtx, globalCtx->roomCtx.curRoom.num)) { } else if (this->actor.params != 0 && Flags_GetClear(globalCtx, globalCtx->roomCtx.curRoom.num)) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} }
@ -397,7 +401,7 @@ void EnIk_Init(Actor* thisx, GlobalContext* globalCtx) {
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f);
SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0601E178, &D_0600C114, this->limbDrawTable, SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0601E178, &D_0600C114, this->limbDrawTable,
this->transitionDrawTable, 30); this->transitionDrawTable, 30);
func_80A74398(this, globalCtx); func_80A74398(&this->actor, globalCtx);
func_80A780D0(this, globalCtx); func_80A780D0(this, globalCtx);
} }
} }