From 32b6993d91ba8ea3603b617567f4fda448387850 Mon Sep 17 00:00:00 2001 From: tom-overton Date: Tue, 2 Nov 2021 00:29:08 -0700 Subject: [PATCH] func_80AB34CC OK --- src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c | 8 +++++++- 1 file changed, 7 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 201fbcc0d0..1227fc26a7 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -304,7 +304,13 @@ void func_80AB3240(ObjTokeidai* this, GlobalContext* globalCtx) { #pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB3370.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokeidai/func_80AB34CC.s") +void func_80AB34CC(ObjTokeidai* this, GlobalContext* globalCtx) { + if (func_800EE29C(globalCtx, 0x84) != 0 && globalCtx->csCtx.npcActions[func_800EE200(globalCtx, 0x84)]->unk0 == 1) { + this->actionFunc = func_80AB3370; + this->unk_154 = 0; + this->unk_156 = -0xD; + } +} void func_80AB3544(ObjTokeidai* this, GlobalContext* globalCtx) { if (this->actor.world.pos.y < 0.0f) {