From 19d65e745df695af1430bc23ecdb25191f0c208c Mon Sep 17 00:00:00 2001 From: Nicholas Sturgeon Date: Sun, 5 Feb 2023 13:08:17 -0500 Subject: [PATCH] Implement ObjMure2_Init --- src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 be522ae51..d968c089e 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -57,7 +57,14 @@ extern InitChainEntry D_809615F4[]; #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Mure2/func_809612BC.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Mure2/ObjMure2_Init.s") +void ObjMure2_Init(Actor* thisx, PlayState* play) { + ObjMure2* this = THIS; + Actor_ProcessInitChain(&this->actor, D_809615F4); + if (play->csCtx.state != 0) { + this->actor.uncullZoneForward += 1200.0f; + } + func_809613B0(this); +} void func_809613B0(ObjMure2* this) { this->actionFunc = func_809613C4;