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

Match func_80A74398

Browse source
This commit is contained in:
Sirius902 2020-09-30 20:24:29 -07:00
parent bcacb5b148
commit 0c92f891ba
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -143,7 +143,6 @@ void EnIk_SetupAction(EnIk* this, EnIkActionFunc actionFunc) {
this->actionFunc = actionFunc; this->actionFunc = actionFunc;
} }
#ifdef NON_MATCHING
void func_80A74398(Actor* thisx, GlobalContext* globalCtx) { void func_80A74398(Actor* thisx, GlobalContext* globalCtx) {
EnIk* this = THIS; EnIk* this = THIS;
s32 pad; s32 pad;
@ -162,11 +161,11 @@ void func_80A74398(Actor* thisx, GlobalContext* globalCtx) {
this->actor.colChkInfo.damageTable = &D_80A78444; this->actor.colChkInfo.damageTable = &D_80A78444;
this->actor.colChkInfo.mass = 0xFE; this->actor.colChkInfo.mass = 0xFE;
this->actor.colChkInfo.health = 30;
this->unk_2FC = 0; this->unk_2FC = 0;
this->actor.params &= 0xFF; this->actor.colChkInfo.health = 30;
this->switchFlags = (this->actor.params >> 8) & 0xFF;
this->actor.gravity = -1.0f; this->actor.gravity = -1.0f;
this->switchFlags = (thisx->params >> 8) & 0xFF;
this->actor.params &= 0xFF;
if (thisx->params == 0) { if (thisx->params == 0) {
this->actor.colChkInfo.health += 20; this->actor.colChkInfo.health += 20;
@ -201,9 +200,6 @@ void func_80A74398(Actor* thisx, GlobalContext* globalCtx) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} }
} }
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74398.s")
#endif
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A745E4.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A745E4.s")