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 ObjMure2_Update

Browse Source
This commit is contained in:
Nicholas Sturgeon
2023-02-05 13:13:06 -05:00
parent 19d65e745d
commit e872fdb129
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c
+9 -1
View File
@@ -80,4 +80,12 @@ void func_809613B0(ObjMure2* this) {
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Mure2/func_80961490.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Mure2/ObjMure2_Update.s")
void ObjMure2_Update(Actor* thisx, PlayState* play) {
ObjMure2* this = THIS;
if (play->csCtx.state == 0) {
this->unk_17C = 1.0f;
} else {
this->unk_17C = 4.0f;
}
this->actionFunc(this, play);
}
src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h
+3 -2
View File
@@ -10,7 +10,8 @@ typedef void (*ObjMure2ActionFunc)(struct ObjMure2*, PlayState*);
typedef struct ObjMure2 {
/* 0x000 */ Actor actor;
/* 0x144 */ ObjMure2ActionFunc actionFunc;
/* 0x148 */ char unk_148[0x38];
} ObjMure2; // size = 0x180
/* 0x148 */ char pad_148[0x34]; /* maybe part of actionFunc[0xE]? */
/* 0x17C */ f32 unk_17C; /* inferred */
} ObjMure2; /* size = 0x180 */
#endif // Z_OBJ_MURE2_H