izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Implement func_80961490

Browse Source
This commit is contained in:
Nicholas Sturgeon
2023-02-05 13:22:52 -05:00
parent 070579049d
commit 657d02a4e0
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c
+18 -4
View File
@@ -17,9 +17,14 @@ void func_809613C4(ObjMure2* this, PlayState* play);
void func_809613FC(ObjMure2* this, PlayState* play);
void func_80961490(ObjMure2* this, PlayState* play);
void func_809613B0(ObjMure2* this);
void func_809613E8(ObjMure2* this);
void func_8096147C(ObjMure2* this);
void func_809613B0(ObjMure2*);
void func_809613E8(ObjMure2*);
void func_8096104C(ObjMure2*, PlayState*);
void func_8096147C(ObjMure2*);
void func_809611BC(ObjMure2*, PlayState*);
void func_809612BC(ObjMure2*);
extern f32 D_8096159C[];
#if 0
ActorInit Obj_Mure2_InitVars = {
@@ -86,7 +91,16 @@ void func_8096147C(ObjMure2* this) {
this->actionFunc = func_80961490;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Mure2/func_80961490.s")
void func_80961490(ObjMure2* this, PlayState* play) {
func_809612BC(this);
if ((D_8096159C[this->actor.params & 3] * this->unk_17C) <=
Math3D_XZLengthSquared(this->actor.projectedPos.x, this->actor.projectedPos.z)) {
this->actor.flags &= ~0x10;
func_809611BC(this, play);
func_809613E8(this);
}
}
void ObjMure2_Update(Actor* thisx, PlayState* play) {
ObjMure2* this = THIS;