diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index d968c089e..c47c87e72 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -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); +} diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h index f70d45f1e..b5c5b1329 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h @@ -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