From 7a868aff079b5d3cfba181cc83e74eb93c46fe71 Mon Sep 17 00:00:00 2001 From: tom-overton Date: Tue, 2 Nov 2021 00:23:42 -0700 Subject: [PATCH] func_80AB365C OK --- src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c index f6f2a996a5..1c221588ff 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -316,7 +316,11 @@ void func_80AB363C(ObjTokeidai* this, GlobalContext* globalCtx) { } } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB365C.s") +void func_80AB365C(ObjTokeidai* this, GlobalContext* globalCtx) { + if (func_800EE29C(globalCtx, 0x84) != 0 && globalCtx->csCtx.npcActions[func_800EE200(globalCtx, 0x84)]->unk0 == 1) { + this->actionFunc = func_80AB363C; + } +} void func_80AB36C4(ObjTokeidai* this, GlobalContext* globalCtx) { if (func_800EE29C(globalCtx, 0x84) != 0 && globalCtx->csCtx.npcActions[func_800EE200(globalCtx, 0x84)]->unk0 == 5) {